Merge pull request #2703 from themeum/query-optimize

Query optimize

Author: shewa12

GDPR/Controllers/LegalConsent.php

@@ -97,13 +97,6 @@ public function __construct( $register_hooks = true ) {
 	private function register_hooks() {
 		add_action( 'wp_ajax_tutor_gdpr_legal_consents', array( $this, 'handle_legal_consent_ajax' ) );
 		add_filter( 'tutor_localize_data', array( $this, 'extend_localize_data' ) );
-		add_filter(
-			'safe_style_css',
-			function ( $styles ) {
-				$styles[] = 'display';
-				return $styles;
-			}
-		);
 		add_action( 'tutor_login_form_end', array( $this, 'show_consent_field_on_login_form' ) );
 	}
 
@@ -783,6 +776,14 @@ private static function render_constructed_label_text( object $consent ): void {
 			$message = str_replace( '{' . $key . '}', $anchor, $message );
 		}
 
+		add_filter(
+			'safe_style_css',
+			function ( $styles ) {
+				$styles[] = 'display';
+				return $styles;
+			}
+		);
+
 		echo wp_kses(
 			$message,
 			array(

GDPR/GDPR.php

@@ -63,7 +63,7 @@ public function __construct() {
 	 * @return void
 	 */
 	private function register_hooks() {
-		add_action( 'init', array( $this, 'init' ), 5 );
+		add_action( 'admin_init', array( $this, 'admin_init' ), 5 );
 	}
 
 	/**
@@ -73,7 +73,7 @@ private function register_hooks() {
 	 *
 	 * @return void
 	 */
-	public function init() {
+	public function admin_init() {
 		$this->maybe_install_db();
 
 		$this->legal_consent = new LegalConsent();

classes/Utils.php

@@ -7145,11 +7145,9 @@ public function array_only( $array = array(), $keys = null ) {
 	 * @param int  $course_id course id.
 	 * @param bool $is_approved is approved.
 	 *
-	 * @return bool|int
+	 * @return bool
 	 */
 	public function is_instructor_of_this_course( $instructor_id = 0, $course_id = 0, $is_approved = true ) {
-		global $wpdb;
-
 		$instructor_id = $this->get_user_id( $instructor_id );
 		$course_id     = $this->get_post_id( $course_id );
 
@@ -7161,46 +7159,42 @@ public function is_instructor_of_this_course( $instructor_id = 0, $course_id = 0
 		$instructor = TutorCache::get( $cache_key );
 
 		if ( false === $instructor ) {
+			$meta_query_args = array(
+				array(
+					'key'     => '_tutor_instructor_course_id',
+					'value'   => $course_id,
+					'compare' => '=',
+					'type'    => 'NUMERIC',
+				),
+			);
 
 			if ( $is_approved ) {
-				$is_approved_instructor = (int) $wpdb->get_var(
-					$wpdb->prepare(
-						"SELECT COUNT(umeta_id)
-						FROM   {$wpdb->usermeta}
-						WHERE  user_id = %d 
-							AND meta_key = %s 
-							AND meta_value = %s",
-						$instructor_id,
-						'_tutor_instructor_status',
-						'approved',
-					)
+				$meta_query_args[] = array(
+					'key'     => '_tutor_instructor_status',
+					'value'   => 'approved',
+					'compare' => '=',
 				);
-
-				if ( ! $is_approved_instructor ) {
-					return false;
-				}
 			}
 
-			//phpcs:disable
-			$instructor = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT umeta_id
-				FROM   {$wpdb->usermeta}
-				WHERE  user_id = %d
-					AND meta_key = '_tutor_instructor_course_id'
-					AND meta_value = %d
-				",
-				$instructor_id,
-				$course_id
-			)
+			$meta_query_args['relation'] = 'AND';
+			$meta_query                  = new \WP_Meta_Query( $meta_query_args );
+			$instructor_query            = new \WP_User_Query(
+				array(
+					'include'     => array( $instructor_id ),
+					'number'      => 1,
+					'fields'      => 'ID',
+					'count_total' => false,
+					'meta_query'  => $meta_query->queries,
+				)
 			);
-			//phpcs:enable
+
+			$instructor = $instructor_query->get_results();
 
 			TutorCache::set( $cache_key, $instructor );
 		}
 
-		if ( is_array( $instructor ) && count( $instructor ) ) {
-			return $instructor;
+		if ( $this->count( $instructor ) ) {
+			return true;
 		}
 
 		return false;

templates/learning-area/index.php

@@ -49,7 +49,7 @@
 $tutor_course_list_url      = tutor_utils()->course_archive_page_url();
 $tutor_is_enrolled          = EnrollmentModel::is_enrolled( $tutor_course_id );
 $tutor_is_public_course     = Course_List::is_public( $tutor_course_id );
-$tutor_is_course_instructor = tutor_utils()->has_user_course_content_access( $current_user_id, $tutor_course_id );
+$tutor_is_course_instructor = tutor_utils()->is_instructor_of_this_course( $current_user_id, $tutor_course_id, true );
 $tutor_is_course_completed  = tutor_utils()->is_completed_course( $tutor_course_id, $current_user_id );
 $tutor_can_complete_course  = CourseModel::can_complete_course( $tutor_course_id, $current_user_id ) && ! $tutor_is_course_completed;
 $tutor_course_progress      = tutor_utils()->get_course_completed_percent( $tutor_course_id, $current_user_id );