Review Changes

Author: sanjana4khan

classes/Icon.php

@@ -412,4 +412,31 @@ final class Icon {
 	const ZIP                        = 'zip';
 	const ZOOM                       = 'zoom';
 	const ZOOM_COLORIZE              = 'zoom-colorize';
+
+
+	/**
+	 * Get the icon constant based on the given post type.
+	 *
+	 * @since 4.0.0
+	 *
+	 * @param string $post_type The post type slug.
+	 *
+	 * @return string Icon constant associated with the post type.
+	 */
+	public static function get_icon_by_post_type( $post_type ): string {
+		switch ( $post_type ) {
+			case 'tutor_assignments':
+				return self::ASSIGNMENT;
+			case 'tutor-google-meet':
+				return self::GOOGLE_MEET_COLORIZE;
+			case 'tutor_quiz':
+				return self::QUIZ;
+			case 'tutor_zoom_meeting':
+				return self::ZOOM_COLORIZE;
+			case 'lesson':
+				return self::LESSON;
+			default:
+				return '';
+		}
+	}
 }

models/OrderModel.php

@@ -1930,6 +1930,12 @@ private static function should_active_pay_button( $order, $show_pay_button ) {
 	public function get_statements( $post_type_in_clause, $course_query, $date_query, $user_id, $offset, $limit, $order_by, $order ): array {
 		global $wpdb;
 
+		$order_clause = '';
+
+		if ( sanitize_sql_orderby( $order ) ) {
+			$order_clause = "ORDER BY {$order_by} {$order}";
+		}
+
 		//phpcs:disable
 		$statements = $wpdb->get_results(
 			$wpdb->prepare(
@@ -1951,7 +1957,7 @@ public function get_statements( $post_type_in_clause, $course_query, $date_query
 				WHERE statements.user_id = %d
 				{$course_query}
 				{$date_query}
-				ORDER BY {$order_by} {$order}
+				{$order_clause}
 				LIMIT %d, %d",
 				$user_id,
 				$offset,

templates/dashboard/instructor/analytics/stat-card-hover.php

@@ -8,20 +8,20 @@
 
 defined( 'ABSPATH' ) || exit;
 
-$start_date          = $data['start_date'];
-$end_date            = $data['end_date'];
+$start_date          = $data['start_date'] ?? '';
+$end_date            = $data['end_date'] ?? '';
 $hover_content       = $data['hover_content'];
 $hover_amount        = $data['hover_amount'];
 $time_zone           = wp_timezone();
-$previous_start_date = $hover_content['previous_start_date'];
-$previous_end_date   = $hover_content['previous_end_date'];
+$previous_start_date = $hover_content['previous_start_date'] ?? '';
+$previous_end_date   = $hover_content['previous_end_date'] ?? '';
 
 ?>
 
 <div class="tutor-stat-card-hover tutor-m-1">
 	<div class="tutor-stat-card-hover-wrap">
-		<span class="stat-hover-trigger <?php echo $hover_content['class'] ?? ''; //phpcs:ignore ?>">
-			<?php echo $hover_content['percentage']; //phpcs:ignore ?>
+		<span class="stat-hover-trigger <?php echo esc_attr( $hover_content['class'] ?? '' ); ?>">
+			<?php echo esc_html( $hover_content['percentage'] ); ?>
 			<?php tutor_utils()->render_svg_icon( $hover_content['icon'], 16, 16, array( 'class' => $hover_content['icon_class'] ?? '' ) ); ?>
 		</span>
 
@@ -31,7 +31,7 @@
 					<?php echo esc_html( tutor_i18n_get_formated_date( $previous_start_date, 'M j' ) ); ?> -
 					<?php echo esc_html( tutor_i18n_get_formated_date( $previous_end_date, 'M j Y' ) ); ?>
 				</span>
-				<span class="tutor-text-subdued"><?php echo __( 'vs', 'tutor-pro' ); ?></span>
+				<span class="tutor-text-subdued"><?php echo esc_html_e( 'vs', 'tutor' ); ?></span>
 				<span>
 					<?php echo esc_html( tutor_i18n_get_formated_date( $start_date, 'M j' ) ); ?> -
 					<?php echo esc_html( tutor_i18n_get_formated_date( $end_date, 'M j Y' ) ); ?>
@@ -41,8 +41,8 @@
 				<span class="tutor-font-semibold tutor-text-primary tutor-tiny">
 					<?php echo esc_html( $hover_amount ); ?>
 				</span>
-				<span class="stat-hover-trigger <?php echo $hover_content['class'] ?? ''; //phpcs:ignore ?>">
-					<?php echo $hover_content['percentage']; ?>
+				<span class="stat-hover-trigger <?php echo esc_attr( $hover_content['class'] ?? '' ); ?>">
+					<?php echo esc_html( $hover_content['percentage'] ); ?>
 					<?php tutor_utils()->render_svg_icon( $hover_content['icon'], 16, 16, array( 'class' => $hover_content['icon_class'] ?? '' ) ); ?>
 				</span>
 			</div>

templates/dashboard/instructor/home/upcoming-task-item.php

@@ -54,8 +54,9 @@
 		</div>
 		<div class="tutor-dashboard-home-task-live-tag" data-meta>
 			<div class="tutor-dashboard-home-task-live-tag-badge">
-				<?php Badge::make()
-					->icon( $get_icon_by_post_type( $item['post_type'] ) )
+				<?php
+				Badge::make()
+					->icon( Icon::get_icon_by_post_type( $item['post_type'] ) )
 					->label( $label )
 					->rounded()
 					->render();

templates/dashboard/instructor/profile-statistics.php

@@ -8,7 +8,6 @@
  * @since 4.0.0
  */
 
-use TUTOR\Icon;
 ?>	
 
 <h5 class="tutor-statistic-title">