woothemes / sensei

includes/class-sensei-utils.php

Indentation +492 added lines, -492 removed lines

@@ -25,8 +25,8 @@ 
 
 	/**
 	 * Check if WooCommerce is present.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -34,14 +34,14 @@ 
 	 */
 	public static function sensei_is_woocommerce_present () {
 
-        return Sensei_WC::is_woocommerce_present();
+		return Sensei_WC::is_woocommerce_present();
 
 	} // End sensei_is_woocommerce_present()
 
 	/**
 	 * Check if WooCommerce is active.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -186,15 +186,15 @@ 
 			add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
 		}
 
-        //Get the comments
-        /**
-         * This filter runs inside Sensei_Utils::sensei_check_for_activity
-         *
-         * It runs while getting the comments for the given request.
-         *
-         * @param int|array $comments
-         */
-        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
+		//Get the comments
+		/**
+		 * This filter runs inside Sensei_Utils::sensei_check_for_activity
+		 *
+		 * It runs while getting the comments for the given request.
+		 *
+		 * @param int|array $comments
+		 */
+		$comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
 
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
@@ -279,18 +279,18 @@ 
 		return $dataset_changes;
 	} // End sensei_delete_activities()
 
-    /**
-     * Delete all activity for specified user
-     * @access public
+	/**
+	 * Delete all activity for specified user
+	 * @access public
 	 * @since  1.5.0
-     * @param  integer $user_id User ID
-     * @return boolean
-     */
-    public static function delete_all_user_activity( $user_id = 0 ) {
+	 * @param  integer $user_id User ID
+	 * @return boolean
+	 */
+	public static function delete_all_user_activity( $user_id = 0 ) {
 
-    	$dataset_changes = false;
+		$dataset_changes = false;
 
-    	if( $user_id ) {
+		if( $user_id ) {
 
 			$activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true );
 
@@ -334,35 +334,35 @@ 
 		return $activity_value;
 	} // End sensei_get_activity_value()
 
-    /**
-     * Checks if a user (by email) has bought an item.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::has_customer_bought_product($user_id, $product_id)
-     * @access public
-     * @since  1.0.0
-     * @param  string $customer_email
-     * @param  int $user_id
-     * @param  int $product_id
-     * @return bool
-     */
-    public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
+	/**
+	 * Checks if a user (by email) has bought an item.
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::has_customer_bought_product($user_id, $product_id)
+	 * @access public
+	 * @since  1.0.0
+	 * @param  string $customer_email
+	 * @param  int $user_id
+	 * @param  int $product_id
+	 * @return bool
+	 */
+	public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
 
-        $emails = array();
+		$emails = array();
 
-        if ( $user_id ) {
-            $user = get_user_by( 'id', intval( $user_id ) );
-            $emails[] = $user->user_email;
-        }
+		if ( $user_id ) {
+			$user = get_user_by( 'id', intval( $user_id ) );
+			$emails[] = $user->user_email;
+		}
 
-        if ( is_email( $customer_email ) )
-            $emails[] = $customer_email;
+		if ( is_email( $customer_email ) )
+			$emails[] = $customer_email;
 
-        if ( sizeof( $emails ) == 0 )
-            return false;
+		if ( sizeof( $emails ) == 0 )
+			return false;
 
-        return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
+		return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
 
-    } // End sensei_customer_bought_product()
+	} // End sensei_customer_bought_product()
 
 	/**
 	 * Load the WordPress rich text editor
@@ -398,7 +398,7 @@ 
 	/**
 	 * Save quiz answers submitted by users
 	 * @param  array $submitted User's quiz answers
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean            Whether the answers were saved or not
 	 */
 	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) {
@@ -467,72 +467,72 @@ 
 
 		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 
-        /**
-         * Filter the data array for the Sensei wp_handle_upload function call
-         *
-         * This filter was mainly added for Unit Testing purposes.
-         *
-         * @since 1.7.4
-         *
-         * @param array  $file_upload_args {
-         *      array of current values
-         *
-         *     @type string test_form set to false by default
-         * }
-         */
-        $file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) );
-
-        $file_return = wp_handle_upload( $file, $file_upload_args );
-
-        if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
-            return false;
-        } else {
+		/**
+		 * Filter the data array for the Sensei wp_handle_upload function call
+		 *
+		 * This filter was mainly added for Unit Testing purposes.
+		 *
+		 * @since 1.7.4
+		 *
+		 * @param array  $file_upload_args {
+		 *      array of current values
+		 *
+		 *     @type string test_form set to false by default
+		 * }
+		 */
+		$file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) );
+
+		$file_return = wp_handle_upload( $file, $file_upload_args );
+
+		if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
+			return false;
+		} else {
 
-            $filename = $file_return['file'];
+			$filename = $file_return['file'];
 
-            $attachment = array(
-                'post_mime_type' => $file_return['type'],
-                'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
-                'post_content' => '',
-                'post_status' => 'inherit',
-                'guid' => $file_return['url']
-            );
+			$attachment = array(
+				'post_mime_type' => $file_return['type'],
+				'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
+				'post_content' => '',
+				'post_status' => 'inherit',
+				'guid' => $file_return['url']
+			);
 
-            $attachment_id = wp_insert_attachment( $attachment, $filename );
+			$attachment_id = wp_insert_attachment( $attachment, $filename );
 
-            require_once(ABSPATH . 'wp-admin/includes/image.php');
-            $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-            wp_update_attachment_metadata( $attachment_id, $attachment_data );
+			require_once(ABSPATH . 'wp-admin/includes/image.php');
+			$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+			wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-            if( 0 < intval( $attachment_id ) ) {
-            	return $attachment_id;
-            }
-        }
+			if( 0 < intval( $attachment_id ) ) {
+				return $attachment_id;
+			}
+		}
 
-        return false;
+		return false;
 	}
 
 	/**
 	 * Grade quiz automatically
-     *
-     * This function grades each question automatically if the are auto gradable.
-     * It store all question grades.
-     *
-     * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_quiz_auto instead
-     *
+	 *
+	 * This function grades each question automatically if the are auto gradable.
+	 * It store all question grades.
+	 *
+	 * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_quiz_auto instead
+	 *
 	 * @param  integer $quiz_id         ID of quiz
 	 * @param  array $submitted questions id ans answers {
-     *          @type int $question_id
-     *          @type mixed $answer
-     * }
+	 *          @type int $question_id
+	 *          @type mixed $answer
+	 * }
 	 * @param  integer $total_questions Total questions in quiz (not used)
-     * @param string $quiz_grade_type Optional defaults to auto
-     *
+	 * @param string $quiz_grade_type Optional defaults to auto
+	 *
 	 * @return int $quiz_grade total sum of all question grades
 	 */
 	public static function sensei_grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
 
-        return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type );
+		return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type );
 
 	} // End sensei_grade_quiz_auto()
 
@@ -541,7 +541,7 @@ 
 	 * @param  integer $quiz_id ID of quiz
 	 * @param  integer $grade   Grade received
 	 * @param  integer $user_id ID of user being graded
-     * @param  string $quiz_grade_type default 'auto'
+	 * @param  string $quiz_grade_type default 'auto'
 	 * @return boolean
 	 */
 	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) {
@@ -565,21 +565,21 @@ 
 
 	/**
 	 * Grade question automatically
-     *
-     * This function checks the question typ and then grades it accordingly.
-     *
-     * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_question_auto instead
-     *
+	 *
+	 * This function checks the question typ and then grades it accordingly.
+	 *
+	 * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_question_auto instead
+	 *
 	 * @param integer $question_id
-     * @param string $question_type of the standard Sensei question types
+	 * @param string $question_type of the standard Sensei question types
 	 * @param string $answer
-     * @param int $user_id
-     *
+	 * @param int $user_id
+	 *
 	 * @return int $question_grade
 	 */
 	public static function sensei_grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
 
-       return  WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id  );
+	   return  WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id  );
 
 	} // end sensei_grade_question_auto
 
@@ -587,7 +587,7 @@ 
 	 * Grade question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $grade       Grade received
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean
 	 */
 	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) {
@@ -626,35 +626,35 @@ 
 	}
 
 
-    /**
-     * Alias to Woothemes_Sensei_Utils::sensei_start_lesson
-     *
-     * @since 1.7.4
-     *
-     * @param integer $user_id
-     * @param integer $lesson_id
-     * @param bool $complete
-     *
-     * @return mixed boolean or comment_ID
-     */
-    public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
+	/**
+	 * Alias to Woothemes_Sensei_Utils::sensei_start_lesson
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param integer $user_id
+	 * @param integer $lesson_id
+	 * @param bool $complete
+	 *
+	 * @return mixed boolean or comment_ID
+	 */
+	public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
 
-        return self::sensei_start_lesson( $lesson_id, $user_id, $complete );
+		return self::sensei_start_lesson( $lesson_id, $user_id, $complete );
 
-    }// end user_start_lesson()
+	}// end user_start_lesson()
 
 	/**
 	 * Mark a lesson as started for user
-     *
-     * Will also start the lesson course for the user if the user hans't started taking it already.
-     *
-     * @since 1.6.0
-     *
+	 *
+	 * Will also start the lesson course for the user if the user hans't started taking it already.
+	 *
+	 * @since 1.6.0
+	 *
 	 * @param  integer $lesson_id ID of lesson
 	 * @param int| string $user_id default 0
-     * @param bool $complete default false
-     *
-     * @return mixed boolean or comment_ID
+	 * @param bool $complete default false
+	 *
+	 * @return mixed boolean or comment_ID
 	 */
 	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
 
@@ -700,21 +700,21 @@ 
 				$metadata['start'] = current_time('mysql');
 				$activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata );
 
-            } else {
+			} else {
 
-                // if users is already taking the lesson  and the status changes to complete update it
-                $current_user_activity = get_comment($activity_logged);
-                if( $status=='complete' &&
-                    $status != $current_user_activity->comment_approved  ){
+				// if users is already taking the lesson  and the status changes to complete update it
+				$current_user_activity = get_comment($activity_logged);
+				if( $status=='complete' &&
+					$status != $current_user_activity->comment_approved  ){
 
-                    $comment = array();
-                    $comment['comment_ID'] = $activity_logged;
-                    $comment['comment_approved'] = $status;
-                    wp_update_comment( $comment );
+					$comment = array();
+					$comment['comment_ID'] = $activity_logged;
+					$comment['comment_approved'] = $status;
+					wp_update_comment( $comment );
 
-                }
+				}
 
-            }
+			}
 
 			if ( $complete ) {
 				// Run this *after* the lesson status has been created/updated
@@ -860,7 +860,7 @@ 
 	/**
 	 * Returns the answer_notes for a specific question and user, or sensei_user_answer entry
 	 *
-     * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
+	 * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
 	 * @param mixed $question
 	 * @param int $user_id
 	 * @return string
@@ -920,7 +920,7 @@ 
 	 * Add answer notes to question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $user_id     ID of user
-     * @param string $notes
+	 * @param string $notes
 	 * @return boolean
 	 */
 	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) {
@@ -978,17 +978,17 @@ 
 	 * @return void
 	 */
 	public static function sort_array_by_key( $array, $key ) {
-	    $sorter = array();
-	    $ret = array();
-	    reset( $array );
-	    foreach ( $array as $ii => $va ) {
-	        $sorter[$ii] = $va[$key];
-	    } // End For Loop
-	    asort( $sorter );
-	    foreach ( $sorter as $ii => $va ) {
-	        $ret[$ii] = $array[$ii];
-	    } // End For Loop
-	    $array = $ret;
+		$sorter = array();
+		$ret = array();
+		reset( $array );
+		foreach ( $array as $ii => $va ) {
+			$sorter[$ii] = $va[$key];
+		} // End For Loop
+		asort( $sorter );
+		foreach ( $sorter as $ii => $va ) {
+			$ret[$ii] = $array[$ii];
+		} // End For Loop
+		$array = $ret;
 	} // End sort_array_by_key()
 
 	/**
@@ -1001,21 +1001,21 @@ 
 		$questions_array = array();
 		if ( 0 < $quiz_id ) {
 			$question_args = array( 'post_type'         => 'question',
-                                    'posts_per_page'       => -1,
-                                    'orderby'           => 'ID',
-                                    'order'             => 'ASC',
-                                    'meta_query'		=> array(
+									'posts_per_page'       => -1,
+									'orderby'           => 'ID',
+									'order'             => 'ASC',
+									'meta_query'		=> array(
 										array(
 											'key'       => '_quiz_id',
 											'value'     => $quiz_id,
 										)
 									),
-                                    'post_status'       => 'any',
-                                    'suppress_filters'  => 0
-                                );
-            $questions_array = get_posts( $question_args );
-        } // End If Statement
-        return $questions_array;
+									'post_status'       => 'any',
+									'suppress_filters'  => 0
+								);
+			$questions_array = get_posts( $question_args );
+		} // End If Statement
+		return $questions_array;
 	} // End lesson_quiz_questions()
 
 	/**
@@ -1175,7 +1175,7 @@ 
 	 * Set the status message displayed to the user for a quiz
 	 * @param  integer $lesson_id ID of quiz lesson
 	 * @param  integer $user_id   ID of user
-     * @param  bool $is_lesson
+	 * @param  bool $is_lesson
 	 * @return array              Status code and message
 	 */
 	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) {
@@ -1258,20 +1258,20 @@ 
 					}
 				}
 
-                // add next lesson button
-                $nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
-                $next_lesson_id = absint( $nav_id_array['next_lesson'] );
+				// add next lesson button
+				$nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
+				$next_lesson_id = absint( $nav_id_array['next_lesson'] );
 
-                // Output HTML
-                if ( ( 0 < $next_lesson_id ) ) {
-                    $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
-                                . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
-                                .'</a>';
+				// Output HTML
+				if ( ( 0 < $next_lesson_id ) ) {
+					$message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
+								. '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
+								.'</a>';
 
-                }
+				}
 
 			}
-            // Lesson/Quiz not complete
+			// Lesson/Quiz not complete
 			else {
 				// Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete)
 				if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) {
@@ -1329,7 +1329,7 @@ 
 		$message = apply_filters( 'sensei_user_quiz_status_' . $status, $message );
 
 		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) {
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 			$extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' .  __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' .  __( 'View the lesson quiz', 'woothemes-sensei' )  . '</a></p>';
 		}
 
@@ -1387,9 +1387,9 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            if( ! $user_id > 0 ){
-                return false;
-            }
+			if( ! $user_id > 0 ){
+				return false;
+			}
 
 			$user_course_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID' ) );
 			if( $user_course_status_id ) {
@@ -1513,7 +1513,7 @@ 
 	 * Check if a user has completed a course or not
 	 *
 	 * @param int | WP_Post | WP_Comment $course course_id or sensei_course_status entry
-     *
+	 *
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1540,14 +1540,14 @@ 
 					}
 				}
 
-                if( is_a( $course, 'WP_Post' ) ){
-                    $course =   $course->ID;
-                }
+				if( is_a( $course, 'WP_Post' ) ){
+					$course =   $course->ID;
+				}
 
 				$user_course_status = Sensei_Utils::user_course_status( $course , $user_id );
 				if( isset( $user_course_status->comment_approved ) ){
-                    $user_course_status = $user_course_status->comment_approved;
-                }
+					$user_course_status = $user_course_status->comment_approved;
+				}
 
 			}
 			if( $user_course_status && 'complete' == $user_course_status ) {
@@ -1572,11 +1572,11 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            $activity_args = array(
-                'post_id' => $lesson_id,
-                'user_id' => $user_id,
-                'type' => 'sensei_lesson_status',
-                'field' => 'comment_ID' );
+			$activity_args = array(
+				'post_id' => $lesson_id,
+				'user_id' => $user_id,
+				'type' => 'sensei_lesson_status',
+				'field' => 'comment_ID' );
 
 			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
 			if( $user_lesson_status_id ) {
@@ -1589,7 +1589,7 @@ 
 	/**
 	 * Check if a user has completed a lesson or not
 	 *
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @param mixed $lesson lesson_id or sensei_lesson_status entry
 	 * @param int $user_id
 	 * @return boolean
@@ -1610,10 +1610,10 @@ 
 					$user_id = get_current_user_id();
 				}
 
-                // the user is not logged in
-                if( ! $user_id > 0 ){
-                    return false;
-                }
+				// the user is not logged in
+				if( ! $user_id > 0 ){
+					return false;
+				}
 				$_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id );
 
 				if ( $_user_lesson_status ) {
@@ -1692,9 +1692,9 @@ 
 	 */
 	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
 
-        if( ! $user_id ) {
-            $user_id = get_current_user_id();
-        }
+		if( ! $user_id ) {
+			$user_id = get_current_user_id();
+		}
 
 		if( $lesson_id > 0 && $user_id > 0 ) {
 
@@ -1745,12 +1745,12 @@ 
 	 * Sets the status for the lesson
 	 *
 	 * @since  1.7.0
-     *
+	 *
 	 * @param int|string $user_id
 	 * @param int|string $lesson_id
 	 * @param string $status
 	 * @param array $metadata
-     *
+	 *
 	 * @return mixed false or comment_ID
 	 */
 	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
@@ -1866,7 +1866,7 @@ 
 	/**
 	 * Adjust the comment query to be faster on the database, used by Analysis admin
 	 * @since  1.7.0
-     * @param array $pieces
+	 * @param array $pieces
 	 * @return array $pieces
 	 */
 	public static function comment_total_sum_meta_value_filter( $pieces ) {
@@ -1901,360 +1901,360 @@ 
 		return $pieces;
 	}
 
-    /**
-     *
-     * Alias to Woothemes_Sensei_Utils::update_user_data
-     * @since 1.7.4
-     *
-     * @param string $data_key maximum 39 characters allowed
-     * @param int $post_id
-     * @param mixed $value
-     * @param int $user_id
-     *
-     * @return bool $success
-     */
-    public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){
-
-        return self::update_user_data( $data_key, $post_id, $value , $user_id );
-
-    }// end add_user_data
-
-    /**
-     * add user specific data to the passed in sensei post type id
-     *
-     * This function saves comment meta on the users current status. If no status is available
-     * status will be created. It only operates on the available sensei Post types: course, lesson, quiz.
-     *
-     * @since 1.7.4
-     *
-     * @param string $data_key maximum 39 characters allowed
-     * @param int $post_id
-     * @param mixed $value
-     * @param int $user_id
-     *
-     * @return bool $success
-     */
-    public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){
-
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
-
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || !get_userdata( $user_id )
-            || ! in_array( $post_type, $supported_post_types )  ){
-
-            return false;
-        }
-
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-
-            $start_function = 'user_start_'.$post_type;
-            $sensei_user_activity_id = self::$start_function( $user_id, $post_id );
-
-        }else{
-
-            $sensei_user_activity_id = $sensei_user_status->comment_ID;
-
-        }
-
-        // store the data
-        $success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
-
-       return $success;
-
-    }//update_user_data
-
-    /**
-     * Get the user data stored on the passed in post type
-     *
-     * This function gets the comment meta on the lesson or course status
-     *
-     * @since 1.7.4
-     *
-     * @param $data_key
-     * @param $post_id
-     * @param int $user_id
-     *
-     * @return mixed $user_data_value
-     */
-    public static function get_user_data( $data_key, $post_id, $user_id = 0  ){
-
-        $user_data_value = true;
-
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
-
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
-
-            return false;
-        }
-
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-            return false;
-        }
-
-        $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true );
-
-        return $user_data_value;
-
-    }// end get_user_data
-
-    /**
-     * Delete the Sensei user data for the given key, Sensei post type and user combination.
-     *
-     * @param int $data_key
-     * @param int $post_id
-     * @param int $user_id
-     *
-     * @return bool $deleted
-     */
-    public static function delete_user_data( $data_key, $post_id , $user_id ){
-        $deleted = true;
+	/**
+	 *
+	 * Alias to Woothemes_Sensei_Utils::update_user_data
+	 * @since 1.7.4
+	 *
+	 * @param string $data_key maximum 39 characters allowed
+	 * @param int $post_id
+	 * @param mixed $value
+	 * @param int $user_id
+	 *
+	 * @return bool $success
+	 */
+	public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+		return self::update_user_data( $data_key, $post_id, $value , $user_id );
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
+	}// end add_user_data
 
-            return false;
-        }
+	/**
+	 * add user specific data to the passed in sensei post type id
+	 *
+	 * This function saves comment meta on the users current status. If no status is available
+	 * status will be created. It only operates on the available sensei Post types: course, lesson, quiz.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param string $data_key maximum 39 characters allowed
+	 * @param int $post_id
+	 * @param mixed $value
+	 * @param int $user_id
+	 *
+	 * @return bool $success
+	 */
+	public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){
 
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-            return false;
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| !get_userdata( $user_id )
+			|| ! in_array( $post_type, $supported_post_types )  ){
 
-        return $deleted;
+			return false;
+		}
 
-    }// end delete_user_data
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
 
+			$start_function = 'user_start_'.$post_type;
+			$sensei_user_activity_id = self::$start_function( $user_id, $post_id );
 
-    /**
-     * The function creates a drop down. Never write up a Sensei select statement again.
-     *
-     * @since 1.8.0
-     *
-     * @param string $selected_value
-     * @param $options{
-     *    @type string $value the value saved in the database
-     *    @type string $option what the user will see in the list of items
-     * }
-     * @param array $attributes{
-     *   @type string $attribute  type such name or id etc.
-     *  @type string $value
-     * }
-     * @param bool $enable_none_option
-     *
-     * @return string $drop_down_element
-     */
-    public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) {
+		}else{
 
-        $drop_down_element = '';
+			$sensei_user_activity_id = $sensei_user_status->comment_ID;
 
-        // setup the basic attributes
-        if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
+		}
 
-            $attributes['name'] = 'sensei-options';
+		// store the data
+		$success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
 
-        }
+	   return $success;
 
-        if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
+	}//update_user_data
 
-            $attributes['id'] = 'sensei-options';
+	/**
+	 * Get the user data stored on the passed in post type
+	 *
+	 * This function gets the comment meta on the lesson or course status
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param $data_key
+	 * @param $post_id
+	 * @param int $user_id
+	 *
+	 * @return mixed $user_data_value
+	 */
+	public static function get_user_data( $data_key, $post_id, $user_id = 0  ){
 
-        }
+		$user_data_value = true;
 
-        if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-            $attributes['class'] ='chosen_select widefat';
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| ! get_userdata( $user_id )
+			|| !in_array( $post_type, $supported_post_types )  ){
 
-        }
+			return false;
+		}
 
-        // create element attributes
-        $combined_attributes = '';
-        foreach( $attributes as $attribute => $value ){
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
+			return false;
+		}
 
-            $combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+		$sensei_user_activity_id = $sensei_user_status->comment_ID;
+		$user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true );
 
-        }// end for each
+		return $user_data_value;
 
+	}// end get_user_data
 
-        // create the select element
-        $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
+	/**
+	 * Delete the Sensei user data for the given key, Sensei post type and user combination.
+	 *
+	 * @param int $data_key
+	 * @param int $post_id
+	 * @param int $user_id
+	 *
+	 * @return bool $deleted
+	 */
+	public static function delete_user_data( $data_key, $post_id , $user_id ){
+		$deleted = true;
 
-        // show the none option if the client requested
-        if( $enable_none_option ) {
-            $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        if ( count( $options ) > 0 ) {
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| ! get_userdata( $user_id )
+			|| !in_array( $post_type, $supported_post_types )  ){
 
-            foreach ($options as $value => $option ){
+			return false;
+		}
 
-                $element = '';
-                $element.= '<option value="' . esc_attr( $value ) . '"';
-                $element .= selected( $value, $selected_value, false ) . '>';
-                $element .= esc_html(  $option ) . '</option>' . "\n";
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
+			return false;
+		}
 
-                // add the element to the select html
-                $drop_down_element.= $element;
-            } // End For Loop
+		$sensei_user_activity_id = $sensei_user_status->comment_ID;
+		$deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
 
-        } // End If Statement
+		return $deleted;
 
-        $drop_down_element .= '</select>' . "\n";
+	}// end delete_user_data
 
-        return $drop_down_element;
 
-    }// generate_drop_down
+	/**
+	 * The function creates a drop down. Never write up a Sensei select statement again.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $selected_value
+	 * @param $options{
+	 *    @type string $value the value saved in the database
+	 *    @type string $option what the user will see in the list of items
+	 * }
+	 * @param array $attributes{
+	 *   @type string $attribute  type such name or id etc.
+	 *  @type string $value
+	 * }
+	 * @param bool $enable_none_option
+	 *
+	 * @return string $drop_down_element
+	 */
+	public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) {
+
+		$drop_down_element = '';
+
+		// setup the basic attributes
+		if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
+
+			$attributes['name'] = 'sensei-options';
 
-    /**
-     * Wrapper for the default php round() function.
-     * This allows us to give more control to a user on how they can round Sensei
-     * decimals passed through this function.
-     *
-     * @since 1.8.5
-     *
-     * @param double $val
-     * @param int $precision
-     * @param $mode
-     * @param string $context
-     *
-     * @return double $val
-     */
-    public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){
+		}
+
+		if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
+
+			$attributes['id'] = 'sensei-options';
+
+		}
 
-        /**å
+		if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+
+			$attributes['class'] ='chosen_select widefat';
+
+		}
+
+		// create element attributes
+		$combined_attributes = '';
+		foreach( $attributes as $attribute => $value ){
+
+			$combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+
+		}// end for each
+
+
+		// create the select element
+		$drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
+
+		// show the none option if the client requested
+		if( $enable_none_option ) {
+			$drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+		}
+
+		if ( count( $options ) > 0 ) {
+
+			foreach ($options as $value => $option ){
+
+				$element = '';
+				$element.= '<option value="' . esc_attr( $value ) . '"';
+				$element .= selected( $value, $selected_value, false ) . '>';
+				$element .= esc_html(  $option ) . '</option>' . "\n";
+
+				// add the element to the select html
+				$drop_down_element.= $element;
+			} // End For Loop
+
+		} // End If Statement
+
+		$drop_down_element .= '</select>' . "\n";
+
+		return $drop_down_element;
+
+	}// generate_drop_down
+
+	/**
+	 * Wrapper for the default php round() function.
+	 * This allows us to give more control to a user on how they can round Sensei
+	 * decimals passed through this function.
+	 *
+	 * @since 1.8.5
+	 *
+	 * @param double $val
+	 * @param int $precision
+	 * @param $mode
+	 * @param string $context
+	 *
+	 * @return double $val
+	 */
+	public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){
+
+		/**å
          * Change the precision for the Sensei_Utils::round function.
          * the precision given will be passed into the php round function
          * @since 1.8.5
          */
-        $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
-
-        /**
-         * Change the mode for the Sensei_Utils::round function.
-         * the mode given will be passed into the php round function
-         *
-         * This applies only to PHP version 5.3.0 and greater
-         *
-         * @since 1.8.5
-         */
-        $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
+		$precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
 
-        if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
+		/**
+		 * Change the mode for the Sensei_Utils::round function.
+		 * the mode given will be passed into the php round function
+		 *
+		 * This applies only to PHP version 5.3.0 and greater
+		 *
+		 * @since 1.8.5
+		 */
+		$mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
 
-            return round( $val, $precision, $mode );
+		if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
 
-        }else{
+			return round( $val, $precision, $mode );
+
+		}else{
 
-            return round( $val, $precision );
+			return round( $val, $precision );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Returns the current url with all the query vars
-     *
-     * @since 1.9.0
-     * @return string $url
-     */
-    public static function get_current_url(){
+	/**
+	 * Returns the current url with all the query vars
+	 *
+	 * @since 1.9.0
+	 * @return string $url
+	 */
+	public static function get_current_url(){
 
-        global $wp;
-        $current_url = trailingslashit( home_url( $wp->request ) );
-        if ( isset( $_GET ) ) {
+		global $wp;
+		$current_url = trailingslashit( home_url( $wp->request ) );
+		if ( isset( $_GET ) ) {
 
-            foreach ($_GET as $param => $val ) {
+			foreach ($_GET as $param => $val ) {
 
-                $current_url = add_query_arg( $param, $val , $current_url );
+				$current_url = add_query_arg( $param, $val , $current_url );
 
-            }
-        }
+			}
+		}
 
-        return $current_url;
-    }
+		return $current_url;
+	}
 
-    /**
-     * Restore the global WP_Query
-     *
-     * @since 1.9.0
-     */
-    public static function restore_wp_query() {
+	/**
+	 * Restore the global WP_Query
+	 *
+	 * @since 1.9.0
+	 */
+	public static function restore_wp_query() {
 
-        wp_reset_query();
+		wp_reset_query();
 
-    }
+	}
 
-    /**
-     * Merge two arrays in a zip like fashion.
-     * If one array is longer than the other the elements will be apended
-     * to the end of the resulting array.
-     *
-     * @since 1.9.0
-     *
-     * @param array $array_a
-     * @param array $array_b
-     * @return array $merged_array
-     */
-    public static function array_zip_merge( $array_a, $array_b ){
+	/**
+	 * Merge two arrays in a zip like fashion.
+	 * If one array is longer than the other the elements will be apended
+	 * to the end of the resulting array.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $array_a
+	 * @param array $array_b
+	 * @return array $merged_array
+	 */
+	public static function array_zip_merge( $array_a, $array_b ){
 
-        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
-            trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
-        }
+		if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
+			trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
+		}
 
-        $merged_array = array();
-        $total_elements = count( $array_a )  + count( $array_b );
+		$merged_array = array();
+		$total_elements = count( $array_a )  + count( $array_b );
 
-        // Zip arrays
-        for ( $i = 0; $i < $total_elements; $i++) {
+		// Zip arrays
+		for ( $i = 0; $i < $total_elements; $i++) {
 
-            // if has an element at current index push a on top
-            if( isset( $array_a[ $i ] ) ){
-                $merged_array[] = $array_a[ $i ]  ;
-            }
+			// if has an element at current index push a on top
+			if( isset( $array_a[ $i ] ) ){
+				$merged_array[] = $array_a[ $i ]  ;
+			}
 
-            // next if $array_b has an element at current index push a on top of the element
-            // from a if there was one, if not the element before that.
-            if( isset( $array_b[ $i ] ) ){
-                $merged_array[] = $array_b[ $i ]  ;
-            }
+			// next if $array_b has an element at current index push a on top of the element
+			// from a if there was one, if not the element before that.
+			if( isset( $array_b[ $i ] ) ){
+				$merged_array[] = $array_b[ $i ]  ;
+			}
 
-        }
+		}
 
-        return $merged_array;
-    }
+		return $merged_array;
+	}
 
 } // End Class
 

includes/class-sensei-wc.php

Indentation +1213 added lines, -1213 removed lines

@@ -12,745 +12,745 @@ 
  */
 
 Class Sensei_WC{
-    /**
-     * Load the files needed for the woocommerce integration.
-     *
-     * @since 1.9.0
-     */
-    public static function load_woocommerce_integration_hooks(){
+	/**
+	 * Load the files needed for the woocommerce integration.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function load_woocommerce_integration_hooks(){
 
-	    $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
-        require_once( $woocommerce_hooks_file_path );
+		$woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
+		require_once( $woocommerce_hooks_file_path );
 
-    }
-    /**
-     * check if WooCommerce plugin is loaded and allowed by Sensei
-     *
-     * @since 1.9.0
-     * @return bool
-     */
-    public static function is_woocommerce_active(){
+	}
+	/**
+	 * check if WooCommerce plugin is loaded and allowed by Sensei
+	 *
+	 * @since 1.9.0
+	 * @return bool
+	 */
+	public static function is_woocommerce_active(){
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
-        return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
+		$is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+		return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
-    } // end is_woocommerce_active
+	} // end is_woocommerce_active
 
-    /**
-     * Checks if the WooCommerce plugin is installed and activation.
-     *
-     * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
-     * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
-     *
-     * @since 1.9.0
-     *
-     * @return bool
-     */
-    public static function is_woocommerce_present(){
+	/**
+	 * Checks if the WooCommerce plugin is installed and activation.
+	 *
+	 * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
+	 * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return bool
+	 */
+	public static function is_woocommerce_present(){
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+		$active_plugins = (array) get_option( 'active_plugins', array() );
 
-        if ( is_multisite() ){
+		if ( is_multisite() ){
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
 
-        }
+		}
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+		$is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+		return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
 
-    }// end is_woocommerce_present
+	}// end is_woocommerce_present
 
-    /**
-     * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
-     *
-     * If multiple exist we will return the latest order.
-     *
-     * @param $user_id
-     * @param $course_id
-     * @return array $user_course_orders
-     */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+	/**
+	 * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
+	 *
+	 * If multiple exist we will return the latest order.
+	 *
+	 * @param $user_id
+	 * @param $course_id
+	 * @return array $user_course_orders
+	 */
+	public static function get_learner_course_active_order_id( $user_id, $course_id ){
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-        $orders_query = new WP_Query( array(
-            'post_type'   => 'shop_order',
-            'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
-            'meta_key'=> '_customer_user',
-            'meta_value'=> $user_id,
-        ) );
+		$orders_query = new WP_Query( array(
+			'post_type'   => 'shop_order',
+			'posts_per_page' => -1,
+			'post_status' => array( 'wc-processing', 'wc-completed' ),
+			'meta_key'=> '_customer_user',
+			'meta_value'=> $user_id,
+		) );
 
-        if( $orders_query->post_count == 0 ){
+		if( $orders_query->post_count == 0 ){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        foreach( $orders_query->get_posts() as $order ){
+		foreach( $orders_query->get_posts() as $order ){
 
-            $order = new WC_Order( $order->ID );
-            $items = $order->get_items();
+			$order = new WC_Order( $order->ID );
+			$items = $order->get_items();
 
-            $user_orders =  array();
+			$user_orders =  array();
 
-            foreach( $items as $item ){
+			foreach( $items as $item ){
 
-                // if the product id on the order and the one given to this function
-                // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+				// if the product id on the order and the one given to this function
+				// this order has been placed by the given user on the given course.
+				$product = wc_get_product( $item['product_id'] );
 
-                if ( is_object( $product ) && $product->is_type( 'variable' )) {
+				if ( is_object( $product ) && $product->is_type( 'variable' )) {
 
-                    $item_product_id = $item['variation_id'];
+					$item_product_id = $item['variation_id'];
 
-                } else {
+				} else {
 
-                    $item_product_id =  $item['product_id'];
+					$item_product_id =  $item['product_id'];
 
-                }
+				}
 
-                if( $course_product_id == $item_product_id ){
+				if( $course_product_id == $item_product_id ){
 
-                    return $order->id;
+					return $order->id;
 
-                }
+				}
 
 
-            }//end for each order item
+			}//end for each order item
 
-        } // end for each order
+		} // end for each order
 
-        // if we reach this place we found no order
-        return false;
+		// if we reach this place we found no order
+		return false;
 
-    } // end get_learner_course_active_order_ids
+	} // end get_learner_course_active_order_ids
 
-    /**
-     * Output WooCommerce specific course filters
-     * Removing the paged argument
-     *
-     * @since 1.9.0
-     * @param $filter_links
-     * @return mixed
-     */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+	/**
+	 * Output WooCommerce specific course filters
+	 * Removing the paged argument
+	 *
+	 * @since 1.9.0
+	 * @param $filter_links
+	 * @return mixed
+	 */
+	public static function add_course_archive_wc_filter_links( $filter_links ){
 
-        $free_courses = self::get_free_courses();
-        $paid_courses = self::get_paid_courses();
+		$free_courses = self::get_free_courses();
+		$paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
-            // do not show any WooCommerce filters if all courses are
-            // free or if all courses are paid
-            return $filter_links;
+		if ( empty( $free_courses ) || empty( $paid_courses )  ){
+			// do not show any WooCommerce filters if all courses are
+			// free or if all courses are paid
+			return $filter_links;
 
-        }
+		}
 
-        $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(
+			'id'=>'paid' ,
+			'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Paid', 'woothemes-sensei' )
+		);
 
-        $filter_links[] = array(
-            'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(
+			'id'=>'free',
+			'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Free', 'woothemes-sensei' )
+		);
 
-        return $filter_links;
+		return $filter_links;
 
-    }// end add_course_archive_wc_filter_links
+	}// end add_course_archive_wc_filter_links
 
-    /**
-     * Apply the free filter the the course query
-     * getting all course with no products or products with zero price
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_free( $query ){
+	/**
+	 * Apply the free filter the the course query
+	 * getting all course with no products or products with zero price
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_free( $query ){
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+		if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
 
-            // setup the course meta query
-            $meta_query = self::get_free_courses_meta_query_args();
+			// setup the course meta query
+			$meta_query = self::get_free_courses_meta_query_args();
 
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
 
-            // don't show any paid courses
-            $courses = self::get_paid_courses();
-            $ids = array();
-            foreach( $courses as $course ){
-                $ids[] = $course->ID;
-            }
-            $query->set( 'post__not_in', $ids );
+			// don't show any paid courses
+			$courses = self::get_paid_courses();
+			$ids = array();
+			foreach( $courses as $course ){
+				$ids[] = $course->ID;
+			}
+			$query->set( 'post__not_in', $ids );
 
-        }// end if course_filter
+		}// end if course_filter
 
-        return $query;
+		return $query;
 
-    }// course_archive_wc_filter_free
+	}// course_archive_wc_filter_free
 
-    /**
-     * Apply the paid filter to the course query on the courses page
-     * will include all course with a product attached with a price
-     * more than 0
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_paid( $query ){
+	/**
+	 * Apply the paid filter to the course query on the courses page
+	 * will include all course with a product attached with a price
+	 * more than 0
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_paid( $query ){
+
+		if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+
+			// setup the course meta query
+			$meta_query = self::get_paid_courses_meta_query_args();
+
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
+
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * Load the WooCommerce single product actions above
+	 * single courses if woocommerce is active allowing purchase
+	 * information and actions to be hooked from WooCommerce.
+	 */
+	public static function do_single_course_wc_single_product_action(){
+
+		/**
+		 * this hooks is documented within the WooCommerce plugin.
+		 */
+		if ( Sensei_WC::is_woocommerce_active() ) {
+
+			do_action( 'woocommerce_before_single_product' );
+
+		} // End If Statement
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
-
-            // setup the course meta query
-            $meta_query = self::get_paid_courses_meta_query_args();
-
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
-
-        }
-
-        return $query;
-
-    }
-
-    /**
-     * Load the WooCommerce single product actions above
-     * single courses if woocommerce is active allowing purchase
-     * information and actions to be hooked from WooCommerce.
-     */
-    public static function do_single_course_wc_single_product_action(){
-
-        /**
-         * this hooks is documented within the WooCommerce plugin.
-         */
-        if ( Sensei_WC::is_woocommerce_active() ) {
-
-            do_action( 'woocommerce_before_single_product' );
-
-        } // End If Statement
-
-    }// end do_single_course_wc_single_product_action
-
-    /**
-     * Hooking into the single lesson page to alter the
-     * user access permissions based on if they have purchased the
-     * course the lesson belongs to.
-     *
-     * This function will only return false or the passed in user_access value.
-     * It doesn't return true in order to avoid altering other options.
-     *
-     * @since 1.9.0
-     *
-     * @param $can_user_view_lesson
-     * @param $lesson_id
-     * @param $user_id
-     * @return bool
-     */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
-
-	    // do not override access to admins
-	    $course_id = Sensei()->lesson->get_course_id( $lesson_id );
-	    if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id )
-	         || Sensei_Utils::user_started_course( $course_id, $user_id )  ){
+	}// end do_single_course_wc_single_product_action
+
+	/**
+	 * Hooking into the single lesson page to alter the
+	 * user access permissions based on if they have purchased the
+	 * course the lesson belongs to.
+	 *
+	 * This function will only return false or the passed in user_access value.
+	 * It doesn't return true in order to avoid altering other options.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $can_user_view_lesson
+	 * @param $lesson_id
+	 * @param $user_id
+	 * @return bool
+	 */
+	public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+
+		// do not override access to admins
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id )
+			 || Sensei_Utils::user_started_course( $course_id, $user_id )  ){
 
 			return true;
 
-	    }
+		}
 
-        // check if the course has a valid product attached to it
-        // which the user should have purchased if they want to access
-        // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
+		// check if the course has a valid product attached to it
+		// which the user should have purchased if they want to access
+		// the current lesson
+		$course_id = get_post_meta( $lesson_id , '_lesson_course', true);
+		$wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
+		if( isset ($product) && is_object($product) ){
 
-            // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+			// valid product found
+			$order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
 
-            // product has a successful order so this user may access the content
-            // this function may only return false or the default
-            // returning true may override other negatives which we don't want
-            if( ! $order_id ){
+			// product has a successful order so this user may access the content
+			// this function may only return false or the default
+			// returning true may override other negatives which we don't want
+			if( ! $order_id ){
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
-        // return the passed in value
-        return $can_user_view_lesson;
+		// return the passed in value
+		return $can_user_view_lesson;
 
-    }
+	}
 
-    /**
-     * Add course link to order thank you and details pages.
-     *
-     * @since  1.4.5
-     * @access public
-     *
-     * @return void
-     */
-    public static function course_link_from_order( ) {
+	/**
+	 * Add course link to order thank you and details pages.
+	 *
+	 * @since  1.4.5
+	 * @access public
+	 *
+	 * @return void
+	 */
+	public static function course_link_from_order( ) {
 
-        if( ! is_order_received_page() ){
-            return;
-        }
+		if( ! is_order_received_page() ){
+			return;
+		}
 
-        $order_id = get_query_var( 'order-received' );
+		$order_id = get_query_var( 'order-received' );
 		$order = new WC_Order( $order_id );
 
 		// exit early if not wc-completed or wc-processing
 		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
 
-        $course_links = array(); // store the for links for courses purchased
+		$course_links = array(); // store the for links for courses purchased
 		foreach ( $order->get_items() as $item ) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                // If item has variation_id then its a variation of the product
-                $item_id = $item['variation_id'];
+				// If item has variation_id then its a variation of the product
+				$item_id = $item['variation_id'];
 
-            } else {
+			} else {
 
-                //If not its real product set its id to item_id
-                $item_id = $item['product_id'];
+				//If not its real product set its id to item_id
+				$item_id = $item['product_id'];
 
-            } // End If Statement
+			} // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+			$user_id = get_post_meta( $order->id, '_customer_user', true );
 
-            if( $user_id ) {
+			if( $user_id ) {
 
-                // Get all courses for product
-                $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
-                            'key' => '_course_woocommerce_product',
-                            'value' => $item_id
-                        ) );
-                $args['orderby'] = 'menu_order date';
-                $args['order'] = 'ASC';
+				// Get all courses for product
+				$args = Sensei_Course::get_default_query_args();
+				$args['meta_query'] = array( array(
+							'key' => '_course_woocommerce_product',
+							'value' => $item_id
+						) );
+				$args['orderby'] = 'menu_order date';
+				$args['order'] = 'ASC';
 
-                // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+				// loop through courses
+				$courses = get_posts( $args );
+				if( $courses && count( $courses ) > 0 ) {
 
-                    foreach( $courses as $course ) {
+					foreach( $courses as $course ) {
 
-                        $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+						$title = $course->post_title;
+						$permalink = get_permalink( $course->ID );
+						$course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
 
-                    } // end for each
+					} // end for each
 
-                    // close the message div
+					// close the message div
 
-                }// end if $courses check
-            }
-        }// end loop through orders
+				}// end if $courses check
+			}
+		}// end loop through orders
 
-        // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+		// add the courses to the WooCommerce notice
+		if( ! empty( $course_links) ){
 
-            $courses_html = _nx(
-                'You have purchased the following course:',
-                'You have purchased the following courses:',
-                count( $course_links ),
-                'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
-            );
+			$courses_html = _nx(
+				'You have purchased the following course:',
+				'You have purchased the following courses:',
+				count( $course_links ),
+				'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
+			);
 
-            foreach( $course_links as $link ){
+			foreach( $course_links as $link ){
 
-                $courses_html .= '<li>' . $link . '</li>';
+				$courses_html .= '<li>' . $link . '</li>';
 
-            }
+			}
 
-            $courses_html .= ' </ul>';
+			$courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
-        }
+			wc_add_notice( $courses_html, 'success' );
+		}
 
 	} // end course_link_order_form
 
-    /**
-     * Show the message that a user should complete
-     * their purchase if the course is in the cart
-     *
-     * This should be used within the course loop or single course page
-     *
-     * @since 1.9.0
-     */
-    public static function course_in_cart_message(){
+	/**
+	 * Show the message that a user should complete
+	 * their purchase if the course is in the cart
+	 *
+	 * This should be used within the course loop or single course page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_in_cart_message(){
 
-        global $post;
+		global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+		if( self::is_course_in_cart( $post->ID ) ){ ?>
 
             <div class="sensei-message info">
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+				$cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
+							  . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
+							  . __('complete the purchase', 'woothemes-sensei') . '</a>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+				echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
 
-                ?>
+				?>
             </div>
         <?php }
 
-    } // End sensei_woocommerce_in_cart_message()
+	} // End sensei_woocommerce_in_cart_message()
+
+	/**
+	 * Checks the cart to see if a course is in the cart.
+	 *
+	 * @param $course_id
+	 * @return bool
+	 */
+	public static function is_course_in_cart( $course_id ){
+
+		$wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
+		$user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+
+		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+
+			if ( self::is_product_in_cart( $wc_post_id ) ) {
+
+				return true;
+
+			}
+
+		}
+
+		return false;
+
+	}// is_course_in_cart
+
+	/**
+	 * Check the cart to see if the product is in the cart
+	 *
+	 * @param $product_id
+	 * @return bool
+	 */
+	public static function is_product_in_cart( $product_id ){
+
+		if ( 0 < $product_id ) {
+
+			$product = wc_get_product( $product_id );
+
+			$parent_id = '';
+			if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+				$wc_product_id = $product->parent->id;
+			}
+			foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+
+				$cart_product = $values['data'];
+				if( $product_id == $cart_product->id ) {
+
+					return true;
+
+				}
+
+			}
+		} // End If Statement
+
+		return false;
+
+	} // end is_product_in_car
+
+	/**
+	 * Get all free WooCommerce products
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $free_products{
+	 *  @type int $wp_post_id
+	 * }
+	 */
+	public static function get_free_product_ids(){
+
+		return  get_posts( array(
+			'post_type' => 'product',
+			'posts_per_page' => '1000',
+			'fields' => 'ids',
+			'meta_query'=> array(
+				'relation' => 'OR',
+				array(
+					'key'=> '_regular_price',
+					'value' => 0,
+				),
+				array(
+					'key'=> '_sale_price',
+					'value' => 0,
+				),
+			),
+		));
+
+	}// end get free product query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_meta_query_param
+	 */
+	public static function get_free_courses_meta_query_args(){
+
+		return array(
+			'relation' => 'OR',
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => '-',
+				'compare' => '=',
+			),
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => self::get_free_product_ids(),
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_query_meta_query_args_param
+	 */
+	public static function get_paid_courses_meta_query_args(){
+
+		$paid_product_ids = self::get_paid_product_ids();
+
+		return array(
+			array(
+				'key'     => '_course_woocommerce_product',
+				// when empty we give a false post_id to ensure the caller doesn't get any courses for their
+				// query
+				'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The WordPress Query args
+	 * for paid products on sale
+	 *
+	 * @since 1.9.0
+	 * @return array $product_query_args
+	 */
+	public static function get_paid_products_on_sale_query_args(){
+
+		$args = array(
+				   'post_type' 		=> 'product',
+				   'posts_per_page' 		=> 1000,
+				   'orderby'         	=> 'date',
+				   'order'           	=> 'DESC',
+				   'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+		);
+
+		return $args;
+
+	} // get_paid_products_on_sale_query_args
+
+
+	/**
+	 * Return the WordPress query args for
+	 * products not on sale but that is not a free
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_paid_products_not_on_sale_query_args(){
+
+		$args = array(
+			'post_type' 		=> 'product',
+			'posts_per_page' 		=> 1000,
+			'orderby'         	=> 'date',
+			'order'           	=> 'DESC',
+			'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '=',
+				'value' => '',
+			),
+		);
+
+		return $args;
+
+
+	} // get_paid_courses_meta_query
+
+	/**
+	 * Get all WooCommerce non-free product id's
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $woocommerce_paid_product_ids
+	 */
+	public static function get_paid_product_ids(){
+
+		// get all the paid WooCommerce products that has regular
+		// and sale price greater than 0
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+
+		// get all the paid WooCommerce products that has regular price
+		// greater than 0 without a sale price
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+
+		// combine products ID's with regular and sale price grater than zero and those without
+		// sale but regular price greater than zero
+		$woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+
+		// if
+		if( empty($woocommerce_paid_product_ids) ){
+			return array( );
+		}
+		return $woocommerce_paid_product_ids;
+
+	}
+
+	/**
+	 * Get all free courses.
+	 *
+	 * This course that have a WC product attached
+	 * that has a price or sale price of zero and
+	 * other courses with no WooCommerce products
+	 * attached.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_free_courses(){
+
+		$free_course_query_args = Sensei_Course::get_default_query_args();
+		$free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+
+		// don't show any paid courses
+		$courses = self::get_paid_courses();
+		$ids = array();
+		foreach( $courses as $course ){
+			$ids[] = $course->ID;
+		}
+		$free_course_query_args[ 'post__not_in' ] =  $ids;
+
+		return get_posts( $free_course_query_args );
+
+	}
+
+	/**
+	 * Return all products that are not free
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_paid_courses(){
+
+		$paid_course_query_args = Sensei_Course::get_default_query_args();
 
-    /**
-     * Checks the cart to see if a course is in the cart.
-     *
-     * @param $course_id
-     * @return bool
-     */
-    public static function is_course_in_cart( $course_id ){
-
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
-
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
-
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
-
-                return true;
-
-            }
-
-        }
-
-        return false;
-
-    }// is_course_in_cart
-
-    /**
-     * Check the cart to see if the product is in the cart
-     *
-     * @param $product_id
-     * @return bool
-     */
-    public static function is_product_in_cart( $product_id ){
-
-        if ( 0 < $product_id ) {
-
-            $product = wc_get_product( $product_id );
-
-            $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
-                $wc_product_id = $product->parent->id;
-            }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
-
-                $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
-
-                    return true;
-
-                }
-
-            }
-        } // End If Statement
-
-        return false;
-
-    } // end is_product_in_car
-
-    /**
-     * Get all free WooCommerce products
-     *
-     * @since 1.9.0
-     *
-     * @return array $free_products{
-     *  @type int $wp_post_id
-     * }
-     */
-    public static function get_free_product_ids(){
-
-        return  get_posts( array(
-            'post_type' => 'product',
-            'posts_per_page' => '1000',
-            'fields' => 'ids',
-            'meta_query'=> array(
-                'relation' => 'OR',
-                array(
-                    'key'=> '_regular_price',
-                    'value' => 0,
-                ),
-                array(
-                    'key'=> '_sale_price',
-                    'value' => 0,
-                ),
-            ),
-        ));
-
-    }// end get free product query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_meta_query_param
-     */
-    public static function get_free_courses_meta_query_args(){
-
-        return array(
-            'relation' => 'OR',
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => '-',
-                'compare' => '=',
-            ),
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => self::get_free_product_ids(),
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_query_meta_query_args_param
-     */
-    public static function get_paid_courses_meta_query_args(){
-
-        $paid_product_ids = self::get_paid_product_ids();
-
-        return array(
-            array(
-                'key'     => '_course_woocommerce_product',
-                // when empty we give a false post_id to ensure the caller doesn't get any courses for their
-                // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The WordPress Query args
-     * for paid products on sale
-     *
-     * @since 1.9.0
-     * @return array $product_query_args
-     */
-    public static function get_paid_products_on_sale_query_args(){
-
-        $args = array(
-                   'post_type' 		=> 'product',
-                   'posts_per_page' 		=> 1000,
-                   'orderby'         	=> 'date',
-                   'order'           	=> 'DESC',
-                   'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-        );
-
-        return $args;
-
-    } // get_paid_products_on_sale_query_args
-
-
-    /**
-     * Return the WordPress query args for
-     * products not on sale but that is not a free
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_paid_products_not_on_sale_query_args(){
-
-        $args = array(
-            'post_type' 		=> 'product',
-            'posts_per_page' 		=> 1000,
-            'orderby'         	=> 'date',
-            'order'           	=> 'DESC',
-            'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '=',
-                'value' => '',
-            ),
-        );
-
-        return $args;
-
-
-    } // get_paid_courses_meta_query
-
-    /**
-     * Get all WooCommerce non-free product id's
-     *
-     * @since 1.9.0
-     *
-     * @return array $woocommerce_paid_product_ids
-     */
-    public static function get_paid_product_ids(){
-
-        // get all the paid WooCommerce products that has regular
-        // and sale price greater than 0
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
-
-        // get all the paid WooCommerce products that has regular price
-        // greater than 0 without a sale price
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
-
-        // combine products ID's with regular and sale price grater than zero and those without
-        // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
-
-        // if
-        if( empty($woocommerce_paid_product_ids) ){
-            return array( );
-        }
-        return $woocommerce_paid_product_ids;
-
-    }
-
-    /**
-     * Get all free courses.
-     *
-     * This course that have a WC product attached
-     * that has a price or sale price of zero and
-     * other courses with no WooCommerce products
-     * attached.
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_free_courses(){
-
-        $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
-
-        // don't show any paid courses
-        $courses = self::get_paid_courses();
-        $ids = array();
-        foreach( $courses as $course ){
-            $ids[] = $course->ID;
-        }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
-
-        return get_posts( $free_course_query_args );
-
-    }
-
-    /**
-     * Return all products that are not free
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_paid_courses(){
-
-        $paid_course_query_args = Sensei_Course::get_default_query_args();
-
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
-
-        return get_posts(  $paid_course_query_args );
-    }
-
-    /**
-     * Show the WooCommerce add to cart button for the  current course
-     *
-     * The function will only show the button if
-     * 1- the user can buy the course
-     * 2- if they have completed their pre-requisite
-     * 3- if the course has a valid product attached
-     *
-     * @since 1.9.0
-     * @param int $course_id
-     * @return string $html markup for the button or nothing if user not allowed to buy
-     */
-    public static function the_add_to_cart_button_html( $course_id ){
-
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
-            return '';
-        }
-
-        $wc_post_id = self::get_course_product_id( $course_id );
-
-        // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        // based on simple.php in WC templates/single-product/add-to-cart/
-        // Get the product
-        $product = self::get_product_object( $wc_post_id );
-
-        // do not show the button for invalid products, non purchasable products, out
-        // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
-            || ! $product->is_purchasable()
-            || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        //
-        // button  output:
-        //
-        ?>
+		$paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+
+		return get_posts(  $paid_course_query_args );
+	}
+
+	/**
+	 * Show the WooCommerce add to cart button for the  current course
+	 *
+	 * The function will only show the button if
+	 * 1- the user can buy the course
+	 * 2- if they have completed their pre-requisite
+	 * 3- if the course has a valid product attached
+	 *
+	 * @since 1.9.0
+	 * @param int $course_id
+	 * @return string $html markup for the button or nothing if user not allowed to buy
+	 */
+	public static function the_add_to_cart_button_html( $course_id ){
+
+		if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+			return '';
+		}
+
+		$wc_post_id = self::get_course_product_id( $course_id );
+
+		// Check if customer purchased the product
+		if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
+			|| empty( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		// based on simple.php in WC templates/single-product/add-to-cart/
+		// Get the product
+		$product = self::get_product_object( $wc_post_id );
+
+		// do not show the button for invalid products, non purchasable products, out
+		// of stock product or if course is already in cart
+		if ( ! isset ( $product )
+			|| ! is_object( $product )
+			|| ! $product->is_purchasable()
+			|| ! $product->is_in_stock()
+			|| self::is_course_in_cart( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		//
+		// button  output:
+		//
+		?>
 
         <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
               class="cart"
@@ -779,83 +779,83 @@ 
             <button type="submit" class="single_add_to_cart_button button alt">
                 <?php $button_text = $product->get_price_html() . ' - ' . __( 'Purchase this Course', 'woothemes-sensei' ); ?>
                 <?php
-                /**
-                 * Filter Add to Cart button text
-                 *
-                 * @since 1.9.1
-                 *
-                 * @param string $button_text
-                 */
-                echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
-                ?>
+				/**
+				 * Filter Add to Cart button text
+				 *
+				 * @since 1.9.1
+				 *
+				 * @param string $button_text
+				 */
+				echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
+				?>
             </button>
 
         </form>
 
         <?php
-    } // end the_add_to_cart_button_html
+	} // end the_add_to_cart_button_html
 
-    /**
-     * Alter the no permissions message on the single course page
-     * Changes the message to a WooCommerce specific message.
-     *
-     * @since 1.9.0
-     *
-     * @param $message
-     * @param $post_id
-     *
-     * @return string $message
-     */
-    public static function alter_no_permissions_message( $message, $post_id ){
+	/**
+	 * Alter the no permissions message on the single course page
+	 * Changes the message to a WooCommerce specific message.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $message
+	 * @param $post_id
+	 *
+	 * @return string $message
+	 */
+	public static function alter_no_permissions_message( $message, $post_id ){
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
-            return  $message;
-        }
+		if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+			return  $message;
+		}
 
-        $product_id = self::get_course_product_id( $post_id );
+		$product_id = self::get_course_product_id( $post_id );
 
-        if( ! $product_id
-            || ! self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+		if( ! $product_id
+			|| ! self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
 
-            return $message;
+			return $message;
 
-        }
+		}
 
-        ob_start();
-        self::the_course_no_permissions_message( $post_id );
-        $woocommerce_course_no_permissions_message = ob_get_clean();
+		ob_start();
+		self::the_course_no_permissions_message( $post_id );
+		$woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+		return $woocommerce_course_no_permissions_message ;
 
-    }
-    /**
-     * Show the no permissions message when a user is logged in
-     * and have not yet purchased the current course
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_no_permissions_message( $course_id ){
+	}
+	/**
+	 * Show the no permissions message when a user is logged in
+	 * and have not yet purchased the current course
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_no_permissions_message( $course_id ){
 
-        // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-	    $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
-	    $wc_product_id =  self::get_course_product_id( $course_id );
+		// login link
+		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+		$wc_product_id =  self::get_course_product_id( $course_id );
 
-	    if ( self::is_product_in_cart( $wc_product_id ) ) {
+		if ( self::is_product_in_cart( $wc_product_id ) ) {
 
-		    $cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
+			$cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
 
-		    $message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
-		    ?>
+			$message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
+			?>
 		    <span class="add-to-cart-login">
 		            <?php echo $message; ?>
 		        </span>
 
 		    <?php
 
-	    } elseif ( is_user_logged_in() ) {
+		} elseif ( is_user_logged_in() ) {
 
-		    ?>
+			?>
 		    <style>
 			    .sensei-message.alert {
 				    display: none;
@@ -864,345 +864,345 @@ 
 
 		    <?php
 
-	    } else {
-		    $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
-	        ?>
+		} else {
+			$message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
+			?>
 		        <span class="add-to-cart-login">
 		            <?php echo $message; ?>
 		        </span>
 
 	        <?php
-	    }
-    }
+		}
+	}
 
-    /**
-     * Checks if a user has bought a product item.
-     *
-     * @since  1.9.0
-     *
-     * @param  int $user_id
-     * @param  int $product_id
-     *
-     * @return bool
-     */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
-
-        $orders = self::get_user_product_orders( $user_id, $product_id );
-
-        foreach ( $orders as $order_id ) {
-
-            $order = new WC_Order( $order_id->ID );
-
-            // wc-active is the subscriptions complete status
-            if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) )
-                || ! ( 0 < sizeof( $order->get_items() ) )  ){
-
-                continue;
+	/**
+	 * Checks if a user has bought a product item.
+	 *
+	 * @since  1.9.0
+	 *
+	 * @param  int $user_id
+	 * @param  int $product_id
+	 *
+	 * @return bool
+	 */
+	public static function has_customer_bought_product ( $user_id, $product_id ){
 
-            }
+		$orders = self::get_user_product_orders( $user_id, $product_id );
 
-            foreach( $order->get_items() as $item ) {
+		foreach ( $orders as $order_id ) {
 
-                // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+			$order = new WC_Order( $order_id->ID );
 
-                    // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = wcs_get_subscription( $order );
-                        if( $sub_key ) {
-                            $sub = wcs_get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
-                                    return true;
-                                } else {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
+			// wc-active is the subscriptions complete status
+			if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) )
+				|| ! ( 0 < sizeof( $order->get_items() ) )  ){
 
-                    // Customer has bought product
-                    return true;
-                } // End If Statement
+				continue;
 
-            } // End For each item
+			}
 
-        } // End For each order
+			foreach( $order->get_items() as $item ) {
 
-	    // default is no order
-	    return false;
+				// Check if user has bought product
+				if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
 
-    } // end has customer bought product
+					// Check if user has an active subscription for product
+					if( class_exists( 'WC_Subscriptions_Manager' ) ) {
+						$sub_key = wcs_get_subscription( $order );
+						if( $sub_key ) {
+							$sub = wcs_get_subscription( $sub_key );
+							if( $sub && isset( $sub['status'] ) ) {
+								if( 'active' == $sub['status'] ) {
+									return true;
+								} else {
+									return false;
+								}
+							}
+						}
+					}
 
-    /**
-     * Return the product id for the given course
-     *
-     * @since 1.9.0
-     *
-     * @param int $course_id
-     *
-     * @return string $woocommerce_product_id or false if none exist
-     *
-     */
-    public static function get_course_product_id( $course_id ){
+					// Customer has bought product
+					return true;
+				} // End If Statement
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+			} // End For each item
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
-            return false;
-        }
+		} // End For each order
 
-        return $product_id;
+		// default is no order
+		return false;
 
-    }
+	} // end has customer bought product
+
+	/**
+	 * Return the product id for the given course
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int $course_id
+	 *
+	 * @return string $woocommerce_product_id or false if none exist
+	 *
+	 */
+	public static function get_course_product_id( $course_id ){
+
+		$product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+
+		if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+			return false;
+		}
+
+		return $product_id;
+
+	}
 
-    /**
-     * Alter the body classes adding WooCommerce to the body
-     *
-     * Speciall cases where this is needed is template no-permissions.php
-     *
-     * @param array $classes
-     * @return array
-     */
-    public static function add_woocommerce_body_class( $classes ){
+	/**
+	 * Alter the body classes adding WooCommerce to the body
+	 *
+	 * Speciall cases where this is needed is template no-permissions.php
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public static function add_woocommerce_body_class( $classes ){
 
-        if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
+		if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
 
-            $classes[] ='woocommerce';
+			$classes[] ='woocommerce';
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }
+	}
 
-    /**
-     * Responds to when a subscription product is purchased
-     *
-     * @since   1.2.0
-     * @since  1.9.0 move to class Sensei_WC
-     *
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public static function activate_subscription(  $order ) {
+	/**
+	 * Responds to when a subscription product is purchased
+	 *
+	 * @since   1.2.0
+	 * @since  1.9.0 move to class Sensei_WC
+	 *
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public static function activate_subscription(  $order ) {
 
-        $order_user = get_user_by('id', $order->user_id);
-        $user['ID'] = $order_user->ID;
-        $user['user_login'] = $order_user->user_login;
-        $user['user_email'] = $order_user->user_email;
-        $user['user_url'] = $order_user->user_url;
+		$order_user = get_user_by('id', $order->user_id);
+		$user['ID'] = $order_user->ID;
+		$user['user_login'] = $order_user->user_login;
+		$user['user_email'] = $order_user->user_email;
+		$user['user_url'] = $order_user->user_url;
 
-        // Run through each product ordered
-        if ( ! sizeof($order->get_items() )>0 ) {
+		// Run through each product ordered
+		if ( ! sizeof($order->get_items() )>0 ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        foreach($order->get_items() as $item) {
+		foreach($order->get_items() as $item) {
 
-            $product_type = '';
+			$product_type = '';
 
-            if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+			if (isset($item['variation_id']) && $item['variation_id'] > 0) {
 
-                $item_id = $item['variation_id'];
-                $product_type = 'subscription_variation';
+				$item_id = $item['variation_id'];
+				$product_type = 'subscription_variation';
 
-            } else {
+			} else {
 
-                $item_id = $item['product_id'];
+				$item_id = $item['product_id'];
 
-            } // End If Statement
+			} // End If Statement
 
-            $_product = self::get_product_object( $item_id, $product_type );
+			$_product = self::get_product_object( $item_id, $product_type );
 
-            // Get courses that use the WC product
-            $courses = array();
+			// Get courses that use the WC product
+			$courses = array();
 
-            if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
+			if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
 
-                $courses = Sensei()->course->get_product_courses( $item_id );
+				$courses = Sensei()->course->get_product_courses( $item_id );
 
-            } // End If Statement
+			} // End If Statement
 
-            // Loop and add the user to the course.
-            foreach ( $courses as $course_item ){
+			// Loop and add the user to the course.
+			foreach ( $courses as $course_item ){
 
-                Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
+				Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End For Loop
+		} // End For Loop
 
-    } // End activate_subscription()
+	} // End activate_subscription()
 
-    /**
-     * Adds detail to to the WooCommerce order
-     *
-     * @since   1.4.5
-     * @since 1.9.0 function moved to class Sensei_WC and renamed from sensei_woocommerce_email_course_details to email_course_details
-     *
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public static function email_course_details(  $order ){
+	/**
+	 * Adds detail to to the WooCommerce order
+	 *
+	 * @since   1.4.5
+	 * @since 1.9.0 function moved to class Sensei_WC and renamed from sensei_woocommerce_email_course_details to email_course_details
+	 *
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public static function email_course_details(  $order ){
 
-        global $woocommerce;
+		global $woocommerce;
 
-        // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
+		// exit early if not wc-completed or wc-processing
+		if( 'wc-completed' != $order->post_status
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
 
-        $order_items = $order->get_items();
-        $order_id = $order->id;
+		$order_items = $order->get_items();
+		$order_id = $order->id;
 
-        //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+		//If object have items go through them all to find course
+		if ( 0 < sizeof( $order_items ) ) {
 
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
-            $order_contains_courses = false;
+			$course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+			$order_contains_courses = false;
 
 
-            foreach ( $order_items as $item ) {
+			foreach ( $order_items as $item ) {
 
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    // If item has variation_id then its from variation
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    // If not its real product set its id to item_id
-                    $item_id = $item['product_id'];
-                } // End If Statement
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					// If item has variation_id then its from variation
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					// If not its real product set its id to item_id
+					$item_id = $item['product_id'];
+				} // End If Statement
 
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
+				$user_id = get_post_meta( $order_id, '_customer_user', true );
 
-                if( $user_id ) {
+				if( $user_id ) {
 
-                    // Get all courses for product
-                    $args = array(
-                        'posts_per_page' => -1,
-                        'post_type' => 'course',
-                        'meta_query' => array(
-                            array(
-                                'key' => '_course_woocommerce_product',
-                                'value' => $item_id
-                            )
-                        ),
-                        'orderby' => 'menu_order date',
-                        'order' => 'ASC',
-                    );
-                    $courses = get_posts( $args );
+					// Get all courses for product
+					$args = array(
+						'posts_per_page' => -1,
+						'post_type' => 'course',
+						'meta_query' => array(
+							array(
+								'key' => '_course_woocommerce_product',
+								'value' => $item_id
+							)
+						),
+						'orderby' => 'menu_order date',
+						'order' => 'ASC',
+					);
+					$courses = get_posts( $args );
 
-                    if( $courses && count( $courses ) > 0 ) {
+					if( $courses && count( $courses ) > 0 ) {
 
-                        foreach( $courses as $course ) {
+						foreach( $courses as $course ) {
 
-                            $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
-                            $order_contains_courses = true;
-                            $course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
-                        }
+							$title = $course->post_title;
+							$permalink = get_permalink( $course->ID );
+							$order_contains_courses = true;
+							$course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+						}
 
 
-                    } // end if has courses
+					} // end if has courses
 
-                } // end if $userPid
+				} // end if $userPid
 
-            } // end for each order item
+			} // end for each order item
 
-            // Output Course details
-            if( $order_contains_courses ){
+			// Output Course details
+			if( $order_contains_courses ){
 
-                echo $course_details_html;
+				echo $course_details_html;
 
-            }
+			}
 
 
-        } // end if  order items not empty
+		} // end if  order items not empty
 
-    }// end email_course_details
+	}// end email_course_details
 
-    /**
-     * sensei_woocommerce_complete_order description
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     * @return  void
-     */
-    public static function complete_order ( $order_id = 0 ) {
+	/**
+	 * sensei_woocommerce_complete_order description
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 * @return  void
+	 */
+	public static function complete_order ( $order_id = 0 ) {
 
-        $order_user = array();
+		$order_user = array();
 
-        // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
-            // Get order object
-            $order = new WC_Order( $order_id );
+		// Check for WooCommerce
+		if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+			// Get order object
+			$order = new WC_Order( $order_id );
 
-	        if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) {
+			if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) {
 
-		        return;
+				return;
 
-	        }
+			}
 
-            $user = get_user_by( 'id', $order->get_user_id() );
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
+			$user = get_user_by( 'id', $order->get_user_id() );
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if ( 0 < sizeof( $order->get_items() ) ) {
 
-                foreach( $order->get_items() as $item ) {
+				foreach( $order->get_items() as $item ) {
 
-                    $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					$product_type = '';
+					if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                        $item_id = $item['variation_id'];
-                        $product_type = 'variation';
+						$item_id = $item['variation_id'];
+						$product_type = 'variation';
 
-                    } else {
+					} else {
 
-                        $item_id = $item['product_id'];
+						$item_id = $item['product_id'];
 
-                    } // End If Statement
+					} // End If Statement
 
-                    $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+					$_product = Sensei_WC::get_product_object( $item_id, $product_type );
 
-                    // Get courses that use the WC product
-                    $courses = Sensei()->course->get_product_courses( $_product->id );
+					// Get courses that use the WC product
+					$courses = Sensei()->course->get_product_courses( $_product->id );
 
-                    // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
+					// Loop and update those courses
+					foreach ( $courses as $course_item ) {
 
-                        $update_course = self::course_update( $course_item->ID, $order_user );
+						$update_course = self::course_update( $course_item->ID, $order_user );
 
-                    } // End For Loop
+					} // End For Loop
 
-                } // End For Loop
+				} // End For Loop
 
-            } // End If Statement
-            // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+			} // End If Statement
+			// Add meta to indicate that payment has been completed successfully
+			update_post_meta( $order_id, 'sensei_payment_complete', '1' );
 
-        } // End If Statement
+		} // End If Statement
 
-    } // End sensei_woocommerce_complete_order()
+	} // End sensei_woocommerce_complete_order()
 
-    /**
-     * Responds to when an order is cancelled.
-     *
-     * @since   1.2.0
-     * @since   1.9.0 Move function to the Sensei_WC class
-     * @param   integer| WC_Order $order_id order ID
-     * @return  void
-     */
-    public static function cancel_order ( $order_id ) {
+	/**
+	 * Responds to when an order is cancelled.
+	 *
+	 * @since   1.2.0
+	 * @since   1.9.0 Move function to the Sensei_WC class
+	 * @param   integer| WC_Order $order_id order ID
+	 * @return  void
+	 */
+	public static function cancel_order ( $order_id ) {
 
 		// Get order object
 		if( is_object( $order_id ) ){
@@ -1220,428 +1220,428 @@ 
 
 		}
 
-        // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+		// Run through each product ordered
+		if ( 0 < sizeof( $order->get_items() ) ) {
 
-            // Get order user
-            $user_id = $order->__get( 'user_id' );
+			// Get order user
+			$user_id = $order->__get( 'user_id' );
 
-            foreach( $order->get_items() as $item ) {
+			foreach( $order->get_items() as $item ) {
 
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
 
-                } else {
+				} else {
 
-                    $item_id = $item['product_id'];
+					$item_id = $item['product_id'];
 
-                } // End If Statement
+				} // End If Statement
 
-                $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+				$_product = Sensei_WC::get_product_object( $item_id, $product_type );
 
-                // Get courses that use the WC product
-                $courses = array();
-                $courses = Sensei()->course->get_product_courses( $item_id );
+				// Get courses that use the WC product
+				$courses = array();
+				$courses = Sensei()->course->get_product_courses( $item_id );
 
-                // Loop and update those courses
-                foreach ($courses as $course_item){
+				// Loop and update those courses
+				foreach ($courses as $course_item){
 
-	                if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){
-		                continue;
-	                }
-                    // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+					if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){
+						continue;
+					}
+					// Check and Remove course from courses user meta
+					$dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
 
-                } // End For Loop
+				} // End For Loop
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-    } // End sensei_woocommerce_cancel_order()
+	} // End sensei_woocommerce_cancel_order()
 
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @since   1.1.1
-     * @access  public
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     * @return   WC_Product $wc_product_object
-     */
-    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @since   1.1.1
+	 * @access  public
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 * @return   WC_Product $wc_product_object
+	 */
+	public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
 
-        $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+		$wc_product_object = false;
+		if ( 0 < intval( $wc_product_id ) ) {
 
-            // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
+			// Get the product
+			if ( function_exists( 'wc_get_product' ) ) {
 
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+				$wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
 
-            } elseif ( function_exists( 'get_product' ) ) {
+			} elseif ( function_exists( 'get_product' ) ) {
 
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+				$wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
 
-            } else {
+			} else {
 
-                // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+				// Pre WC 2.0
+				if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
 
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
+					$wc_product_object = new WC_Product_Variation( $wc_product_id );
 
-                } else {
+				} else {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+					$wc_product_object = new WC_Product( $wc_product_id );
 
-                } // End If Statement
+				} // End If Statement
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
+		} // End If Statement
 
-        return $wc_product_object;
+		return $wc_product_object;
 
-    } // End sensei_get_woocommerce_product_object()
+	} // End sensei_get_woocommerce_product_object()
 
-    /**
-     * If customer has purchased the course, update Sensei to indicate that they are taking the course.
-     *
-     * @since  1.0.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param  int 			$course_id  (default: 0)
-     * @param  array/Object $order_user (default: array()) Specific user's data.
-     *
-     * @return bool|int
-     */
-    public static function course_update ( $course_id = 0, $order_user = array()  ) {
+	/**
+	 * If customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 *
+	 * @since  1.0.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param  int 			$course_id  (default: 0)
+	 * @param  array/Object $order_user (default: array()) Specific user's data.
+	 *
+	 * @return bool|int
+	 */
+	public static function course_update ( $course_id = 0, $order_user = array()  ) {
 
-        global $current_user;
+		global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+		if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
 
-        $data_update = false;
+		$data_update = false;
 
-        // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+		// Get the product ID
+		$wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
 
-        // Check if in the admin
-        if ( is_admin() ) {
+		// Check if in the admin
+		if ( is_admin() ) {
 
-            $user_login = $order_user['user_login'];
-            $user_email = $order_user['user_email'];
-            $user_url = $order_user['user_url'];
-            $user_id = $order_user['ID'];
+			$user_login = $order_user['user_login'];
+			$user_email = $order_user['user_email'];
+			$user_url = $order_user['user_url'];
+			$user_id = $order_user['ID'];
 
-        } else {
+		} else {
 
-            $user_login = $current_user->user_login;
-            $user_email = $current_user->user_email;
-            $user_url = $current_user->user_url;
-            $user_id = $current_user->ID;
+			$user_login = $current_user->user_login;
+			$user_email = $current_user->user_email;
+			$user_url = $current_user->user_url;
+			$user_id = $current_user->ID;
 
-        } // End If Statement
+		} // End If Statement
 
-        // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
+		// This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
+		$course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
+		if( 0 < absint( $course_prerequisite_id ) ) {
 
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
+			$prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
+			if ( ! $prereq_course_complete ) {
 
-                // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+				// Remove all course user meta
+				return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
 
-            }
-        }
+			}
+		}
 
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
 
-        if ( ! $is_user_taking_course
-            && Sensei_WC::is_woocommerce_active()
-            && 0 < $wc_post_id
-            && Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) {
+		if ( ! $is_user_taking_course
+			&& Sensei_WC::is_woocommerce_active()
+			&& 0 < $wc_post_id
+			&& Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) {
 
-	            $activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) );
+				$activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) );
 
-	            if ( true == $activity_logged ) {
+				if ( true == $activity_logged ) {
 
-		            $is_user_taking_course = true;
+					$is_user_taking_course = true;
 
-	            } // End If Statement
+				} // End If Statement
 
-        }// end if is user taking course
+		}// end if is user taking course
 
-        return $is_user_taking_course;
+		return $is_user_taking_course;
 
-    } // End course_update()
+	} // End course_update()
 
-    /**
-     * Disable guest checkout if a course product is in the cart
-     *
-     * @since 1.1.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param  boolean $guest_checkout Current guest checkout setting
-     *
-     * @return boolean                 Modified guest checkout setting
-     */
-    public static function disable_guest_checkout( $guest_checkout ) {
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 *
+	 * @since 1.1.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 *
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public static function disable_guest_checkout( $guest_checkout ) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
 
-            if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
+			if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
 
-                foreach( WC()->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
+				foreach( WC()->cart->cart_contents as $cart_key => $product ) {
+					if( isset( $product['product_id'] ) ) {
 
-                        $args = array(
-                            'posts_per_page' => -1,
-                            'post_type' => 'course',
-                            'meta_query' => array(
-                                array(
-                                    'key' => '_course_woocommerce_product',
-                                    'value' => $product['product_id']
-                                )
-                            )
-                        );
+						$args = array(
+							'posts_per_page' => -1,
+							'post_type' => 'course',
+							'meta_query' => array(
+								array(
+									'key' => '_course_woocommerce_product',
+									'value' => $product['product_id']
+								)
+							)
+						);
 
-                        $posts = get_posts( $args );
+						$posts = get_posts( $args );
 
-                        if( $posts && count( $posts ) > 0 ) {
+						if( $posts && count( $posts ) > 0 ) {
 
-                            foreach( $posts as $course ) {
-                                $guest_checkout = '';
-                                break;
+							foreach( $posts as $course ) {
+								$guest_checkout = '';
+								break;
 
-                            }
-                        }
+							}
+						}
 
-                    }
+					}
 
-                }
+				}
 
-            }
-        }
+			}
+		}
 
-        return $guest_checkout;
+		return $guest_checkout;
 
-    }// end disable_guest_checkout
+	}// end disable_guest_checkout
 
-    /**
-     * Change order status with virtual products to completed
-     *
-     * @since  1.1.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param string $order_status
-     * @param int $order_id
-     *
-     * @return string
-     **/
-    public static function virtual_order_payment_complete( $order_status, $order_id ) {
+	/**
+	 * Change order status with virtual products to completed
+	 *
+	 * @since  1.1.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param string $order_status
+	 * @param int $order_id
+	 *
+	 * @return string
+	 **/
+	public static function virtual_order_payment_complete( $order_status, $order_id ) {
 
-        $order = new WC_Order( $order_id );
+		$order = new WC_Order( $order_id );
 
-        if ( ! isset ( $order ) ) return '';
+		if ( ! isset ( $order ) ) return '';
 
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+		if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
 
-            $virtual_order = true;
+			$virtual_order = true;
 
-            if ( count( $order->get_items() ) > 0 ) {
+			if ( count( $order->get_items() ) > 0 ) {
 
-                foreach( $order->get_items() as $item ) {
+				foreach( $order->get_items() as $item ) {
 
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
+					if ( $item['product_id'] > 0 ) {
+						$_product = $order->get_product_from_item( $item );
+						if ( ! $_product->is_virtual() ) {
 
-                            $virtual_order = false;
-                            break;
+							$virtual_order = false;
+							break;
 
-                        } // End If Statement
+						} // End If Statement
 
-                    } // End If Statement
+					} // End If Statement
 
-                } // End For Loop
+				} // End For Loop
 
-            } // End If Statement
+			} // End If Statement
 
-            // virtual order, mark as completed
-            if ( $virtual_order ) {
+			// virtual order, mark as completed
+			if ( $virtual_order ) {
 
-                return 'completed';
+				return 'completed';
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
+		} // End If Statement
 
-        return $order_status;
+		return $order_status;
 
-    }// end virtual_order_payment_complete
+	}// end virtual_order_payment_complete
 
 
-    /**
-     * Determine if the user has and active subscription to give them access
-     * to the requested resource.
-     *
-     * @since 1.9.0
-     *
-     * @param  boolean$user_access_permission
-     * @param  integer $user_id
-     * @return boolean $user_access_permission
-     */
-    public static function get_subscription_permission( $user_access_permission, $user_id ){
+	/**
+	 * Determine if the user has and active subscription to give them access
+	 * to the requested resource.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param  boolean$user_access_permission
+	 * @param  integer $user_id
+	 * @return boolean $user_access_permission
+	 */
+	public static function get_subscription_permission( $user_access_permission, $user_id ){
 
-        global $post;
+		global $post;
 
-        // ignore the current case if the following conditions are met
-        if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
-            || ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
-            || ! wcs_user_has_subscription( $user_id) ){
+		// ignore the current case if the following conditions are met
+		if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
+			|| ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
+			|| ! wcs_user_has_subscription( $user_id) ){
 
-            return $user_access_permission;
+			return $user_access_permission;
 
-        }
+		}
 
-        // at this user has a subscription
-        // is the subscription on the the current course?
+		// at this user has a subscription
+		// is the subscription on the the current course?
 
-        $course_id = 0;
-        if ( 'course' == $post->post_type ){
+		$course_id = 0;
+		if ( 'course' == $post->post_type ){
 
-            $course_id = $post->ID;
+			$course_id = $post->ID;
 
-        } elseif ( 'lesson' == $post->post_type ) {
+		} elseif ( 'lesson' == $post->post_type ) {
 
-            $course_id = Sensei()->lesson->get_course_id( $post->ID );
+			$course_id = Sensei()->lesson->get_course_id( $post->ID );
 
-        } else {
+		} else {
 
-            $lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+			$lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
+			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        }
+		}
 
-        // if the course has no subscription WooCommerce product attached to return the permissions as is
-        $product_id = Sensei_WC::get_course_product_id( $course_id );
-        $product = wc_get_product( $product_id );
-        if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
+		// if the course has no subscription WooCommerce product attached to return the permissions as is
+		$product_id = Sensei_WC::get_course_product_id( $course_id );
+		$product = wc_get_product( $product_id );
+		if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
 
-            return $user_access_permission;
+			return $user_access_permission;
 
-        }
+		}
 
-        // give access if user has active subscription on the product otherwise restrict it.
-        // also check if the user was added to the course directly after the subscription started.
-        if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-            || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-            || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
+		// give access if user has active subscription on the product otherwise restrict it.
+		// also check if the user was added to the course directly after the subscription started.
+		if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
+			|| wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
+			|| self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
 
-            $user_access_permission = true;
+			$user_access_permission = true;
 
-        }else{
+		}else{
 
-            $user_access_permission = false;
-            // do not show the WC permissions message
-            remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
-            Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
-            Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
-        }
+			$user_access_permission = false;
+			// do not show the WC permissions message
+			remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
+			Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
+			Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
+		}
 
-        return $user_access_permission;
+		return $user_access_permission;
 
-    } // end get_subscription_permission
+	} // end get_subscription_permission
 
-    /**
-     * Get all the valid subscription types.
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_subscription_types(){
+	/**
+	 * Get all the valid subscription types.
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_subscription_types(){
 
-        return array( 'subscription','subscription_variation','variable-subscription' );
+		return array( 'subscription','subscription_variation','variable-subscription' );
 
-    }
+	}
 
-    /**
-     * Compare the user's subscriptions end date with the date
-     * the user was added to the course. If the user was added after
-     * the subscription ended they were manually added and this will return
-     * true.
-     *
-     * Important to note that all subscriptions for the user is compared.
-     *
-     * @since 1.9.0
-     *
-     * @param $user_id
-     * @param $product_id
-     * @param $course_id
-     *
-     * @return bool
-     */
-    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
+	/**
+	 * Compare the user's subscriptions end date with the date
+	 * the user was added to the course. If the user was added after
+	 * the subscription ended they were manually added and this will return
+	 * true.
+	 *
+	 * Important to note that all subscriptions for the user is compared.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $user_id
+	 * @param $product_id
+	 * @param $course_id
+	 *
+	 * @return bool
+	 */
+	public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
 
-        $course_start_date = '';
-        $subscription_start_date = '';
-        $is_a_subscription ='';
-        $was_user_added_without_subscription = true;
+		$course_start_date = '';
+		$subscription_start_date = '';
+		$is_a_subscription ='';
+		$was_user_added_without_subscription = true;
 
-        // if user is not on the course they were not added
-        if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+		// if user is not on the course they were not added
+		if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        // if user doesn't have a subscription and is taking the course
-        // they were added manually
-        if ( ! wcs_user_has_subscription($user_id, $product_id)
-            && Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
+		// if user doesn't have a subscription and is taking the course
+		// they were added manually
+		if ( ! wcs_user_has_subscription($user_id, $product_id)
+			&& Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
 
-            return true;
+			return true;
 
-        }
+		}
 
-        $course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
+		$course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
 
-        // comparing dates setup data
-        $course_start_date = date_create( $course_status->comment_date );
-        $subscriptions = wcs_get_users_subscriptions( $user_id );
+		// comparing dates setup data
+		$course_start_date = date_create( $course_status->comment_date );
+		$subscriptions = wcs_get_users_subscriptions( $user_id );
 
-        // comparing every subscription
-        foreach( $subscriptions as $subscription ){
+		// comparing every subscription
+		foreach( $subscriptions as $subscription ){
 
-            // for the following statuses we know the user was not added
-            // manually
-            $status = $subscription->get_status();
-            if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
+			// for the following statuses we know the user was not added
+			// manually
+			$status = $subscription->get_status();
+			if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
 
-                continue;
+				continue;
 
-            }
+			}
 
-            $current_subscription_start_date = date_create( $subscription->modified_date );
+			$current_subscription_start_date = date_create( $subscription->modified_date );
 
-            // is the last updated subscription date newer than course start date
-            if (  $current_subscription_start_date > $course_start_date   ) {
+			// is the last updated subscription date newer than course start date
+			if (  $current_subscription_start_date > $course_start_date   ) {
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
-        return $was_user_added_without_subscription;
-    }
+		return $was_user_added_without_subscription;
+	}
 
 	/**
 	 * Get all the orders for a specific user and product combination

includes/class-sensei.php

Indentation +1007 added lines, -1007 removed lines

@@ -10,910 +10,910 @@ 
  */
 class Sensei_Main {
 
-    /**
-     * @var string
-     * Reference to the main plugin file
-     */
-    private $file;
-
-    /**
-     * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
-     * @since 1.8.0
-     */
-    protected static $_instance = null;
-
-    /**
-     * Main reference to the plugins current version
-     */
-    public $version;
-
-    /**
-     * Public token, referencing for the text domain.
-     */
-    public $token = 'woothemes-sensei';
-
-    /**
-     * Plugin url and path for use when access resources.
-     */
-    public $plugin_url;
-    public $plugin_path;
-    public $template_url;
-
-    /**
-     * @var Sensei_PostTypes
-     * All Sensei sub classes. Currently used to access functionality contained within
-     * within Sensei sub classes e.g. Sensei()->course->all_courses()
-     */
-    public $post_types;
-
-    /**
-     * @var WooThemes_Sensei_Settings
-     */
-    public $settings;
-
-    /**
-     * @var WooThemes_Sensei_Course_Results
-     */
-    public $course_results;
-
-    /**
-     * @var Sensei_Updates
-     */
-    public $updates;
-    /**
-     * @var WooThemes_Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var WooThemes_Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var WooThemes_Sensei_Quiz
-     */
-    public $quiz;
-
-    /**
-     * @var WooThemes_Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var WooThemes_Sensei_Admin
-     */
-    public $admin;
-
-    /**
-     * @var WooThemes_Sensei_Frontend
-     */
-    public $frontend;
-
-    /**
-     * @var Sensei_Notices
-     */
-    public $notices;
-
-    /**
-     * @var WooThemes_Sensei_Grading
-     */
-    public $grading;
-
-    /**
-     * @var WooThemes_Sensei_Emails
-     */
-    public $emails;
-
-    /**
-     * @var WooThemes_Sensei_Learner_Profiles
-     */
-    public $learner_profiles;
-
-    /**
-     * @var Sensei_Teacher
-     */
-    public $teacher;
-
-    /**
-     * @var WooThemes_Sensei_Learners
-     */
-    public $learners;
-
-    /**
-     * @var array
-     * Global instance for access to the permissions message shown
-     * when users do not have the right privileges to access resources.
-     */
-    public $permissions_message;
-
-    /**
-     * @var Sensei_Core_Modules Sensei Modules functionality
-     */
-    public $modules;
-
-    /**
-     * @var Sensei_Analysis
-     */
-    public $analysis;
-
-    /**
-     * Constructor method.
-     * @param  string $file The base file of the plugin.
-     * @since  1.0.0
-     */
-    public function __construct ( $file ) {
-
-        // Setup object data
-        $this->file = $file;
-        $this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
-        $this->plugin_path = trailingslashit( dirname( $file ) );
-        $this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
-
-        // Initialize the core Sensei functionality
-        $this->init();
-
-        // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
-
-        // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
-
-        // Image Sizes
-        $this->init_image_sizes();
-
-        // load all hooks
-        $this->load_hooks();
-
-    } // End __construct()
-
-    /**
-     * Load the foundations of Sensei.
-     * @since 1.9.0
-     */
-    protected function init(){
-
-        // Localisation
-        $this->load_plugin_textdomain();
-        add_action( 'init', array( $this, 'load_localisation' ), 0 );
-
-        // Setup settings
-        $this->settings = new Sensei_Settings();
-
-        // load the shortcode loader into memory, so as to listen to all for
-        // all shortcodes on the front end
-        new Sensei_Shortcode_Loader();
-
-    }
-
-    /**
-     * Global Sensei Instance
-     *
-     * Ensure that only one instance of the main Sensei class can be loaded.
-     *
-     * @since 1.8.0
-     * @static
-     * @see WC()
-     * @return WooThemes_Sensei Instance.
-     */
-    public static function instance() {
+	/**
+	 * @var string
+	 * Reference to the main plugin file
+	 */
+	private $file;
+
+	/**
+	 * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
+	 * @since 1.8.0
+	 */
+	protected static $_instance = null;
+
+	/**
+	 * Main reference to the plugins current version
+	 */
+	public $version;
+
+	/**
+	 * Public token, referencing for the text domain.
+	 */
+	public $token = 'woothemes-sensei';
+
+	/**
+	 * Plugin url and path for use when access resources.
+	 */
+	public $plugin_url;
+	public $plugin_path;
+	public $template_url;
+
+	/**
+	 * @var Sensei_PostTypes
+	 * All Sensei sub classes. Currently used to access functionality contained within
+	 * within Sensei sub classes e.g. Sensei()->course->all_courses()
+	 */
+	public $post_types;
+
+	/**
+	 * @var WooThemes_Sensei_Settings
+	 */
+	public $settings;
+
+	/**
+	 * @var WooThemes_Sensei_Course_Results
+	 */
+	public $course_results;
+
+	/**
+	 * @var Sensei_Updates
+	 */
+	public $updates;
+	/**
+	 * @var WooThemes_Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var WooThemes_Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var WooThemes_Sensei_Quiz
+	 */
+	public $quiz;
+
+	/**
+	 * @var WooThemes_Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var WooThemes_Sensei_Admin
+	 */
+	public $admin;
+
+	/**
+	 * @var WooThemes_Sensei_Frontend
+	 */
+	public $frontend;
+
+	/**
+	 * @var Sensei_Notices
+	 */
+	public $notices;
+
+	/**
+	 * @var WooThemes_Sensei_Grading
+	 */
+	public $grading;
+
+	/**
+	 * @var WooThemes_Sensei_Emails
+	 */
+	public $emails;
+
+	/**
+	 * @var WooThemes_Sensei_Learner_Profiles
+	 */
+	public $learner_profiles;
+
+	/**
+	 * @var Sensei_Teacher
+	 */
+	public $teacher;
+
+	/**
+	 * @var WooThemes_Sensei_Learners
+	 */
+	public $learners;
+
+	/**
+	 * @var array
+	 * Global instance for access to the permissions message shown
+	 * when users do not have the right privileges to access resources.
+	 */
+	public $permissions_message;
+
+	/**
+	 * @var Sensei_Core_Modules Sensei Modules functionality
+	 */
+	public $modules;
+
+	/**
+	 * @var Sensei_Analysis
+	 */
+	public $analysis;
+
+	/**
+	 * Constructor method.
+	 * @param  string $file The base file of the plugin.
+	 * @since  1.0.0
+	 */
+	public function __construct ( $file ) {
+
+		// Setup object data
+		$this->file = $file;
+		$this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
+		$this->plugin_path = trailingslashit( dirname( $file ) );
+		$this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
+
+		// Initialize the core Sensei functionality
+		$this->init();
+
+		// Installation
+		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+
+		// Run this on activation.
+		register_activation_hook( $this->file, array( $this, 'activation' ) );
+
+		// Image Sizes
+		$this->init_image_sizes();
+
+		// load all hooks
+		$this->load_hooks();
+
+	} // End __construct()
+
+	/**
+	 * Load the foundations of Sensei.
+	 * @since 1.9.0
+	 */
+	protected function init(){
+
+		// Localisation
+		$this->load_plugin_textdomain();
+		add_action( 'init', array( $this, 'load_localisation' ), 0 );
+
+		// Setup settings
+		$this->settings = new Sensei_Settings();
+
+		// load the shortcode loader into memory, so as to listen to all for
+		// all shortcodes on the front end
+		new Sensei_Shortcode_Loader();
+
+	}
+
+	/**
+	 * Global Sensei Instance
+	 *
+	 * Ensure that only one instance of the main Sensei class can be loaded.
+	 *
+	 * @since 1.8.0
+	 * @static
+	 * @see WC()
+	 * @return WooThemes_Sensei Instance.
+	 */
+	public static function instance() {
 
-        if ( is_null( self::$_instance ) ) {
+		if ( is_null( self::$_instance ) ) {
 
-            //Sensei requires a reference to the main Sensei plugin file
-            $sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
+			//Sensei requires a reference to the main Sensei plugin file
+			$sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
 
-            self::$_instance = new self( $sensei_main_plugin_file  );
+			self::$_instance = new self( $sensei_main_plugin_file  );
 
-            // load the global class objects needed throughout Sensei
-            self::$_instance->initialize_global_objects();
+			// load the global class objects needed throughout Sensei
+			self::$_instance->initialize_global_objects();
 
-        }
+		}
 
-        return self::$_instance;
+		return self::$_instance;
 
-    } // end instance()
+	} // end instance()
 
-    /**
-     * This function is linked into the activation
-     * hook to reset flush the urls to ensure Sensei post types show up.
-     *
-     * @since 1.9.0
-     *
-     * @param $plugin
-     */
-    public static function activation_flush_rules( $plugin ){
+	/**
+	 * This function is linked into the activation
+	 * hook to reset flush the urls to ensure Sensei post types show up.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $plugin
+	 */
+	public static function activation_flush_rules( $plugin ){
 
-        if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
+		if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
 
-            flush_rewrite_rules(true);
+			flush_rewrite_rules(true);
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Cloning is forbidden.
-     * @since 1.8.0
-     */
-    public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
-    }
+	/**
+	 * Cloning is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __clone() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
+	}
 
-    /**
-     * Unserializing instances of this class is forbidden.
-     * @since 1.8.0
-     */
-    public function __wakeup() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
-    }
+	/**
+	 * Unserializing instances of this class is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __wakeup() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
+	}
 
-    /**
-     * Load the properties for the main Sensei object
-     *
-     * @since 1.9.0
-     */
-    public function initialize_global_objects(){
+	/**
+	 * Load the properties for the main Sensei object
+	 *
+	 * @since 1.9.0
+	 */
+	public function initialize_global_objects(){
 
-        // Setup post types.
-        $this->post_types = new Sensei_PostTypes();
+		// Setup post types.
+		$this->post_types = new Sensei_PostTypes();
 
-        // Lad the updates class
-        $this->updates = new Sensei_Updates( $this );
+		// Lad the updates class
+		$this->updates = new Sensei_Updates( $this );
 
-        // Load Course Results Class
-        $this->course_results = new Sensei_Course_Results();
+		// Load Course Results Class
+		$this->course_results = new Sensei_Course_Results();
 
-        // Load the teacher role
-        $this->teacher = new Sensei_Teacher();
+		// Load the teacher role
+		$this->teacher = new Sensei_Teacher();
 
-        // Add the Course class
-        $this->course = $this->post_types->course;
+		// Add the Course class
+		$this->course = $this->post_types->course;
 
-        // Add the lesson class
-        $this->lesson = $this->post_types->lesson;
+		// Add the lesson class
+		$this->lesson = $this->post_types->lesson;
 
-        // Add the question class
-        $this->question = $this->post_types->question;
+		// Add the question class
+		$this->question = $this->post_types->question;
 
-        //Add the quiz class
-        $this->quiz = $this->post_types->quiz;
+		//Add the quiz class
+		$this->quiz = $this->post_types->quiz;
 
-        // load the modules class after all plugsin are loaded
-	    $this->load_modules_class();
+		// load the modules class after all plugsin are loaded
+		$this->load_modules_class();
 
-        // Load Learner Management Functionality
-        $this->learners = new Sensei_Learner_Management( $this->file );
+		// Load Learner Management Functionality
+		$this->learners = new Sensei_Learner_Management( $this->file );
 
-        // Differentiate between administration and frontend logic.
-        if ( is_admin() ) {
+		// Differentiate between administration and frontend logic.
+		if ( is_admin() ) {
 
-            // Load Admin Welcome class
-            new Sensei_Welcome();
+			// Load Admin Welcome class
+			new Sensei_Welcome();
 
-            // Load Admin Class
-            $this->admin = new Sensei_Admin( $this->file );
+			// Load Admin Class
+			$this->admin = new Sensei_Admin( $this->file );
 
-            // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $this->file );
+			// Load Analysis Reports
+			$this->analysis = new Sensei_Analysis( $this->file );
 
-        } else {
+		} else {
 
-            // Load Frontend Class
-            $this->frontend = new Sensei_Frontend();
+			// Load Frontend Class
+			$this->frontend = new Sensei_Frontend();
 
-            // Load notice Class
-            $this->notices = new Sensei_Notices();
+			// Load notice Class
+			$this->notices = new Sensei_Notices();
 
-            // Load built in themes support integration
-            new Sensei_Theme_Integration_Loader();
+			// Load built in themes support integration
+			new Sensei_Theme_Integration_Loader();
 
 
-        }
+		}
 
-        // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $this->file );
+		// Load Grading Functionality
+		$this->grading = new Sensei_Grading( $this->file );
 
-        // Load Email Class
-        $this->emails = new Sensei_Emails( $this->file );
+		// Load Email Class
+		$this->emails = new Sensei_Emails( $this->file );
 
-        // Load Learner Profiles Class
-        $this->learner_profiles = new Sensei_Learner_Profiles();
+		// Load Learner Profiles Class
+		$this->learner_profiles = new Sensei_Learner_Profiles();
 
-    }
+	}
 
-    /**
-     * Initialize all Sensei hooks
-     *
-     * @since 1.9.0
-     */
-    public function load_hooks(){
+	/**
+	 * Initialize all Sensei hooks
+	 *
+	 * @since 1.9.0
+	 */
+	public function load_hooks(){
 
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+		add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
 
-        // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
+		// Filter comment counts
+		add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
 
-        add_action( 'body_class', array( $this, 'body_class' ) );
+		add_action( 'body_class', array( $this, 'body_class' ) );
 
-        // Check for and activate JetPack LaTeX support
-        add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules
+		// Check for and activate JetPack LaTeX support
+		add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules
 
-        // check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
-        add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
+		// check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
+		add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
 
-    }
+	}
 
-    /**
-     * Run Sensei updates.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function run_updates() {
-        // Run updates if administrator
-        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
+	/**
+	 * Run Sensei updates.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function run_updates() {
+		// Run updates if administrator
+		if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
 
-            $this->updates->update();
+			$this->updates->update();
 
-        } // End If Statement
-    } // End run_updates()
+		} // End If Statement
+	} // End run_updates()
 
-    /**
-     * Register the widgets.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function register_widgets () {
-        // Widget List (key => value is filename => widget class).
-        $widget_list = apply_filters( 'sensei_registered_widgets_list', array( 	'course-component' 	=> 'Course_Component',
-                'lesson-component' 	=> 'Lesson_Component',
-                'course-categories' => 'Course_Categories',
-                'category-courses' 	=> 'Category_Courses' )
-        );
-        foreach ( $widget_list as $key => $value ) {
-            if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
-            }
-        } // End For Loop
+	/**
+	 * Register the widgets.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function register_widgets () {
+		// Widget List (key => value is filename => widget class).
+		$widget_list = apply_filters( 'sensei_registered_widgets_list', array( 	'course-component' 	=> 'Course_Component',
+				'lesson-component' 	=> 'Lesson_Component',
+				'course-categories' => 'Course_Categories',
+				'category-courses' 	=> 'Category_Courses' )
+		);
+		foreach ( $widget_list as $key => $value ) {
+			if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) {
+				require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
+				register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+			}
+		} // End For Loop
 
-        do_action( 'sensei_register_widgets' );
+		do_action( 'sensei_register_widgets' );
 
-    } // End register_widgets()
+	} // End register_widgets()
 
-    /**
-     * Load the plugin's localisation file.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function load_localisation () {
+	/**
+	 * Load the plugin's localisation file.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function load_localisation () {
 
-        load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+		load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
 
-    } // End load_localisation()
+	} // End load_localisation()
 
-    /**
-     * Load the plugin textdomain from the main WordPress "languages" folder.
-     * @access  public
-     * @since   1.0.0
-     * @return  void
-     */
-    public function load_plugin_textdomain () {
-
-        $domain = 'woothemes-sensei';
-        // The "plugin_locale" filter is also used in load_plugin_textdomain()
-        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
-        load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' );
-        load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' );
-
-    } // End load_plugin_textdomain()
-
-    /**
-     * Run on activation.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function activation () {
-
-        $this->register_plugin_version();
-
-    } // End activation()
-
-
-    /**
-     * Register activation hooks.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function install () {
-
-        register_activation_hook( $this->file, array( $this, 'activate_sensei' ) );
-        register_activation_hook( $this->file, 'flush_rewrite_rules' );
-
-    } // End install()
-
-
-    /**
-     * Run on activation of the plugin.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function activate_sensei () {
-
-        update_option( 'skip_install_sensei_pages', 0 );
-        update_option( 'sensei_installed', 1 );
-
-    } // End activate_sensei()
-
-    /**
-     * Register the plugin's version.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    private function register_plugin_version () {
-        if ( $this->version != '' ) {
-
-            update_option( 'woothemes-sensei-version', $this->version );
-
-        }
-    } // End register_plugin_version()
-
-    /**
-     * Ensure that "post-thumbnails" support is available for those themes that don't register it.
-     * @access  public
-     * @since   1.0.1
-     * @return  void
-     */
-    public function ensure_post_thumbnails_support () {
+	/**
+	 * Load the plugin textdomain from the main WordPress "languages" folder.
+	 * @access  public
+	 * @since   1.0.0
+	 * @return  void
+	 */
+	public function load_plugin_textdomain () {
+
+		$domain = 'woothemes-sensei';
+		// The "plugin_locale" filter is also used in load_plugin_textdomain()
+		$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+		load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' );
+		load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+
+	} // End load_plugin_textdomain()
+
+	/**
+	 * Run on activation.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function activation () {
+
+		$this->register_plugin_version();
+
+	} // End activation()
+
+
+	/**
+	 * Register activation hooks.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function install () {
+
+		register_activation_hook( $this->file, array( $this, 'activate_sensei' ) );
+		register_activation_hook( $this->file, 'flush_rewrite_rules' );
+
+	} // End install()
+
+
+	/**
+	 * Run on activation of the plugin.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function activate_sensei () {
+
+		update_option( 'skip_install_sensei_pages', 0 );
+		update_option( 'sensei_installed', 1 );
+
+	} // End activate_sensei()
+
+	/**
+	 * Register the plugin's version.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	private function register_plugin_version () {
+		if ( $this->version != '' ) {
+
+			update_option( 'woothemes-sensei-version', $this->version );
+
+		}
+	} // End register_plugin_version()
+
+	/**
+	 * Ensure that "post-thumbnails" support is available for those themes that don't register it.
+	 * @access  public
+	 * @since   1.0.1
+	 * @return  void
+	 */
+	public function ensure_post_thumbnails_support () {
 
-        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
+		if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
 
-    } // End ensure_post_thumbnails_support()
+	} // End ensure_post_thumbnails_support()
 
-    /**
-     * template_loader function.
-     *
-     * @access public
-     * @param mixed $template
-     * @return void
-     * @deprecated
-     */
-    public function template_loader ( $template = '' ) {
+	/**
+	 * template_loader function.
+	 *
+	 * @access public
+	 * @param mixed $template
+	 * @return void
+	 * @deprecated
+	 */
+	public function template_loader ( $template = '' ) {
 
-        _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
-        Sensei_Templates::template_loader( $template );
+		_deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
+		Sensei_Templates::template_loader( $template );
 
-    } // End template_loader()
+	} // End template_loader()
 
-    /**
-     * Determine the relative path to the plugin's directory.
-     * @access public
-     * @since  1.0.0
-     * @return string $sensei_plugin_path
-     */
-    public function plugin_path () {
+	/**
+	 * Determine the relative path to the plugin's directory.
+	 * @access public
+	 * @since  1.0.0
+	 * @return string $sensei_plugin_path
+	 */
+	public function plugin_path () {
 
-        if ( $this->plugin_path ) {
+		if ( $this->plugin_path ) {
 
-            $sensei_plugin_path =  $this->plugin_path;
+			$sensei_plugin_path =  $this->plugin_path;
 
-        }else{
+		}else{
 
-            $sensei_plugin_path = plugin_dir_path( __FILE__ );
+			$sensei_plugin_path = plugin_dir_path( __FILE__ );
 
-        }
+		}
 
-        return $sensei_plugin_path;
+		return $sensei_plugin_path;
 
-    } // End plugin_path()
+	} // End plugin_path()
 
-    /**
-     * Retrieve the ID of a specified page setting.
-     * @access public
-     * @since  1.0.0
-     * @param  string $page
-     * @return int
-     */
-    public function get_page_id ( $page ) {
-        $page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
-        return ( $page ) ? $page : -1;
-    } // End get_page_id()
+	/**
+	 * Retrieve the ID of a specified page setting.
+	 * @access public
+	 * @since  1.0.0
+	 * @param  string $page
+	 * @return int
+	 */
+	public function get_page_id ( $page ) {
+		$page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
+		return ( $page ) ? $page : -1;
+	} // End get_page_id()
 
-    /**
-     * check_user_permissions function.
-     *
-     * @access public
-     * @param string $page (default: '')
-     *
-     * @return bool
-     */
-    public function check_user_permissions ( $page = '' ) {
+	/**
+	 * check_user_permissions function.
+	 *
+	 * @access public
+	 * @param string $page (default: '')
+	 *
+	 * @return bool
+	 */
+	public function check_user_permissions ( $page = '' ) {
 
-        global $current_user, $post;
+		global $current_user, $post;
 
-        $user_allowed = false;
+		$user_allowed = false;
 
-        switch ( $page ) {
-	        case 'course-single':
-		        // check for prerequisite course or lesson,
-		        $course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true );
-		        $update_course          = Sensei_WC::course_update( $post->ID );
+		switch ( $page ) {
+			case 'course-single':
+				// check for prerequisite course or lesson,
+				$course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true );
+				$update_course          = Sensei_WC::course_update( $post->ID );
 
-		        // Count completed lessons
-		        if ( 0 < absint( $course_prerequisite_id ) ) {
+				// Count completed lessons
+				if ( 0 < absint( $course_prerequisite_id ) ) {
 
-			        $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
+					$prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
 
-		        } else {
-			        $prerequisite_complete = true;
-		        } // End If Statement
+				} else {
+					$prerequisite_complete = true;
+				} // End If Statement
 
-		        // Handles restrictions on the course
-		        if ( ( ! $prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) ) {
+				// Handles restrictions on the course
+				if ( ( ! $prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) ) {
 
-			        $user_allowed = false;
-			        $course_link  = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-			        $this->notices->add_notice( sprintf( __( 'Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link ), 'info' );
+					$user_allowed = false;
+					$course_link  = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->notices->add_notice( sprintf( __( 'Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link ), 'info' );
 
-		        } elseif( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $post->ID ) && ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
+				} elseif( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $post->ID ) && ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
 
-			        $message = sprintf( __( 'Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei' ), '<a href="'.sensei_user_login_url().'">', '</a>' );
-			        $this->notices->add_notice( $message, 'info' );
+					$message = sprintf( __( 'Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei' ), '<a href="'.sensei_user_login_url().'">', '</a>' );
+					$this->notices->add_notice( $message, 'info' );
 
 
-		        } elseif ( ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
+				} elseif ( ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
 
 					// users who haven't started the course are allowed to view it
-			        $user_allowed                         = true;
-
-
-
-		        } else  {
-
-                    $user_allowed = true;
-
-                } // End If Statement
-                break;
-            case 'lesson-single':
-                // Check for WC purchase
-                $lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
-
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                $is_preview = Sensei_Utils::is_preview_lesson( $post->ID );
-
-                if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
-                    $user_allowed = true;
-                } elseif( $this->access_settings() && false == $is_preview ) {
-
-                    $user_allowed = true;
-
-                } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                    if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            $this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link );
-                        }
-                    } else {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            /** This filter is documented in class-woothemes-sensei-frontend.php */
-                            $this->permissions_message['message'] =  sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
-                        }
-                    } // End If Statement
-                } // End If Statement
-                break;
-            case 'quiz-single':
-                $lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true );
-                $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true );
-
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
-
-                    // Check for prerequisite lesson for this quiz
-                    $lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true);
-                    $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID);
-
-                    // Handle restrictions
-                    if( sensei_all_access() ) {
-
-                        $user_allowed = true;
-
-                    } else {
-
-                        if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) {
-
-                            $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                            $lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>';
-                            $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link );
-
-                        } else {
-
-                            $user_allowed = true;
-
-                        } // End If Statement
-                    } // End If Statement
-                } elseif( $this->access_settings() ) {
-                    // Check if the user has started the course
-
-                    if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) {
-
-                        $user_allowed = false;
-                        $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                        $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                        $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                            $this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
-                        } // End If Statement
-                    } else {
-                        $user_allowed = true;
-                    } // End If Statement
-                } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link );
-                } // End If Statement
-                break;
-            default:
-                $user_allowed = true;
-                break;
-
-        } // End Switch Statement
-
-        /**
-         * filter the permissions message shown on sensei post types.
-         *
-         * @since 1.8.7
-         *
-         * @param array $permissions_message{
-         *
-         *   @type string $title
-         *   @type string $message
-         *
-         * }
-         * @param string $post_id
-         */
-        $this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
+					$user_allowed                         = true;
+
+
+
+				} else  {
+
+					$user_allowed = true;
+
+				} // End If Statement
+				break;
+			case 'lesson-single':
+				// Check for WC purchase
+				$lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
+
+				$update_course = Sensei_WC::course_update( $lesson_course_id );
+				$is_preview = Sensei_Utils::is_preview_lesson( $post->ID );
+
+				if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+					$user_allowed = true;
+				} elseif( $this->access_settings() && false == $is_preview ) {
+
+					$user_allowed = true;
+
+				} else {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
+					if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
+						if ( $is_preview ) {
+							$this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+						} else {
+							$this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link );
+						}
+					} else {
+						if ( $is_preview ) {
+							$this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+						} else {
+							/** This filter is documented in class-woothemes-sensei-frontend.php */
+							$this->permissions_message['message'] =  sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
+						}
+					} // End If Statement
+				} // End If Statement
+				break;
+			case 'quiz-single':
+				$lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true );
+				$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true );
+
+				$update_course = Sensei_WC::course_update( $lesson_course_id );
+				if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
+
+					// Check for prerequisite lesson for this quiz
+					$lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true);
+					$user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID);
+
+					// Handle restrictions
+					if( sensei_all_access() ) {
+
+						$user_allowed = true;
+
+					} else {
+
+						if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) {
+
+							$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+							$lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>';
+							$this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link );
+
+						} else {
+
+							$user_allowed = true;
+
+						} // End If Statement
+					} // End If Statement
+				} elseif( $this->access_settings() ) {
+					// Check if the user has started the course
+
+					if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) {
+
+						$user_allowed = false;
+						$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+						$course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+						$wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
+						if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
+							$this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+						} else {
+							$this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+						} // End If Statement
+					} else {
+						$user_allowed = true;
+					} // End If Statement
+				} else {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link );
+				} // End If Statement
+				break;
+			default:
+				$user_allowed = true;
+				break;
+
+		} // End Switch Statement
+
+		/**
+		 * filter the permissions message shown on sensei post types.
+		 *
+		 * @since 1.8.7
+		 *
+		 * @param array $permissions_message{
+		 *
+		 *   @type string $title
+		 *   @type string $message
+		 *
+		 * }
+		 * @param string $post_id
+		 */
+		$this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
 
 		// add the permissions message to the stack
 
-        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
-            $user_allowed = true;
-        }
-
-        /**
-         * Filter the permissions check final result. Which determines if the user has
-         * access to the given page.
-         *
-         * @since 1.0
-         *
-         * @param boolean $user_allowed
-         * @param integer $user_id
-         *
-         */
-        return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID );
-
-    } // End get_placeholder_image()
-
-
-    /**
-     * Check if visitors have access permission. If the "access_permission" setting is active, do a log in check.
-     * @since  1.0.0
-     * @access public
-     * @return bool
-     */
-    public function access_settings () {
-
-        if( sensei_all_access() ) return true;
-
-        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
-            if ( is_user_logged_in() ) {
-                return true;
-            } else {
-                return false;
-            } // End If Statement
-        } else {
-            return true;
-        } // End If Statement
-    } // End access_settings()
-
-    /**
-     * load_class loads in class files
-     * @since   1.2.0
-     * @access  public
-     * @return  void
-     */
-    public function load_class ( $class_name = '' ) {
-        if ( '' != $class_name && '' != $this->token ) {
-            require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' );
-        } // End If Statement
-    } // End load_class()
-
-    /**
-     * Filtering wp_count_comments to ensure that Sensei comments are ignored
-     * @since   1.4.0
-     * @access  public
-     * @param  array   $comments
-     * @param  integer $post_id
-     * @return array
-     */
-    public function sensei_count_comments( $comments, $post_id ) {
-        global $wpdb;
-
-        $post_id = (int) $post_id;
-
-        $count = wp_cache_get("comments-{$post_id}", 'counts');
-
-        if ( false !== $count ) {
-            return $count;
-        }
-
-        $statuses = array( '' ); // Default to the WP normal comments
-        $stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A );
-        foreach ( (array) $stati AS $status ) {
-            if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) {
-                $statuses[] = $status['comment_type'];
-            }
-        }
-        $where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
-
-        if ( $post_id > 0 )
-            $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
-
-        $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
-
-        $total = 0;
-        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
-        foreach ( (array) $count as $row ) {
-            // Don't count post-trashed toward totals
-            if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
-                $total += $row['num_comments'];
-            if ( isset( $approved[$row['comment_approved']] ) )
-                $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
-        }
-
-        $stats['total_comments'] = $total;
-        foreach ( $approved as $key ) {
-            if ( empty($stats[$key]) )
-                $stats[$key] = 0;
-        }
-
-        $stats = (object) $stats;
-        wp_cache_set("comments-{$post_id}", $stats, 'counts');
-
-        return $stats;
-    }
-
-    /**
-     * Init images.
-     *
-     * @since 1.4.5
-     * @access public
-     * @return void
-     */
-    public function init_image_sizes() {
-        $course_archive_thumbnail 	= $this->get_image_size( 'course_archive_image' );
-        $course_single_thumbnail	= $this->get_image_size( 'course_single_image' );
-        $lesson_archive_thumbnail 	= $this->get_image_size( 'lesson_archive_image' );
-        $lesson_single_thumbnail	= $this->get_image_size( 'lesson_single_image' );
-
-        add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] );
-        add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] );
-        add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] );
-        add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] );
-    }
-
-    /**
-     * Get an image size.
-     *
-     * Variable is filtered by sensei_get_image_size_{image_size}
-     *
-     * @since 1.4.5
-     * @access public
-     * @param mixed $image_size
-     * @return string
-     */
-    public function get_image_size( $image_size ) {
-
-        // Only return sizes we define in settings
-        if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) )
-            return apply_filters( 'sensei_get_image_size_' . $image_size, '' );
-
-        if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) {
-            $this->settings->settings[ $image_size . '_width' ] = false;
-        }
-        if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) {
-            $this->settings->settings[ $image_size . '_height' ] = false;
-        }
-        if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) {
-            $this->settings->settings[ $image_size . '_hard_crop' ] = false;
-        }
-
-        $size = array_filter( array(
-            'width' => $this->settings->settings[ $image_size . '_width' ],
-            'height' => $this->settings->settings[ $image_size . '_height' ],
-            'crop' => $this->settings->settings[ $image_size . '_hard_crop' ]
-        ) );
-
-        $size['width'] 	= isset( $size['width'] ) ? $size['width'] : '100';
-        $size['height'] = isset( $size['height'] ) ? $size['height'] : '100';
-        $size['crop'] 	= isset( $size['crop'] ) ? $size['crop'] : 0;
-
-        return apply_filters( 'sensei_get_image_size_' . $image_size, $size );
-    }
-
-    public function body_class( $classes ) {
-        if( is_sensei() ) {
-            $classes[] = 'sensei';
-        }
-        return $classes;
-    }
-
-    /**
-     * Checks that the Jetpack Beautiful Maths module has been activated to support LaTeX within question titles and answers
-     *
-     * @return null
-     * @since 1.7.0
-     */
-    public function jetpack_latex_support() {
-        if ( function_exists( 'latex_markup') ) {
-            add_filter( 'sensei_question_title', 'latex_markup' );
-            add_filter( 'sensei_answer_text', 'latex_markup' );
-        }
-    }
-
-    /**
-     * Load the module functionality.
-     *
-     * This function is hooked into plugins_loaded to avoid conflicts with
-     * the retired modules extension.
-     *
-     * @since 1.8.0
-     */
-    public function load_modules_class(){
-        global $sensei_modules;
-
-        if( !class_exists( 'Sensei_Modules' )
-            &&  'Sensei_Modules' != get_class( $sensei_modules ) ) {
-
-            //Load the modules class
-            require_once( 'class-sensei-modules.php');
-            Sensei()->modules = new Sensei_Core_Modules( $this->file );
-
-        }else{
-            // fallback for people still using the modules extension.
-            global $sensei_modules;
-            Sensei()->modules = $sensei_modules;
-            add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 );
-        }
-    }
-
-    /**
-     * Tell the user to that the modules extension is no longer needed.
-     *
-     * @since 1.8.0
-     */
-    public function disable_sensei_modules_extension(){ ?>
+		if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
+			$user_allowed = true;
+		}
+
+		/**
+		 * Filter the permissions check final result. Which determines if the user has
+		 * access to the given page.
+		 *
+		 * @since 1.0
+		 *
+		 * @param boolean $user_allowed
+		 * @param integer $user_id
+		 *
+		 */
+		return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID );
+
+	} // End get_placeholder_image()
+
+
+	/**
+	 * Check if visitors have access permission. If the "access_permission" setting is active, do a log in check.
+	 * @since  1.0.0
+	 * @access public
+	 * @return bool
+	 */
+	public function access_settings () {
+
+		if( sensei_all_access() ) return true;
+
+		if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
+			if ( is_user_logged_in() ) {
+				return true;
+			} else {
+				return false;
+			} // End If Statement
+		} else {
+			return true;
+		} // End If Statement
+	} // End access_settings()
+
+	/**
+	 * load_class loads in class files
+	 * @since   1.2.0
+	 * @access  public
+	 * @return  void
+	 */
+	public function load_class ( $class_name = '' ) {
+		if ( '' != $class_name && '' != $this->token ) {
+			require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' );
+		} // End If Statement
+	} // End load_class()
+
+	/**
+	 * Filtering wp_count_comments to ensure that Sensei comments are ignored
+	 * @since   1.4.0
+	 * @access  public
+	 * @param  array   $comments
+	 * @param  integer $post_id
+	 * @return array
+	 */
+	public function sensei_count_comments( $comments, $post_id ) {
+		global $wpdb;
+
+		$post_id = (int) $post_id;
+
+		$count = wp_cache_get("comments-{$post_id}", 'counts');
+
+		if ( false !== $count ) {
+			return $count;
+		}
+
+		$statuses = array( '' ); // Default to the WP normal comments
+		$stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A );
+		foreach ( (array) $stati AS $status ) {
+			if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) {
+				$statuses[] = $status['comment_type'];
+			}
+		}
+		$where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
+
+		if ( $post_id > 0 )
+			$where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+
+		$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
+
+		$total = 0;
+		$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
+		foreach ( (array) $count as $row ) {
+			// Don't count post-trashed toward totals
+			if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+				$total += $row['num_comments'];
+			if ( isset( $approved[$row['comment_approved']] ) )
+				$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
+		}
+
+		$stats['total_comments'] = $total;
+		foreach ( $approved as $key ) {
+			if ( empty($stats[$key]) )
+				$stats[$key] = 0;
+		}
+
+		$stats = (object) $stats;
+		wp_cache_set("comments-{$post_id}", $stats, 'counts');
+
+		return $stats;
+	}
+
+	/**
+	 * Init images.
+	 *
+	 * @since 1.4.5
+	 * @access public
+	 * @return void
+	 */
+	public function init_image_sizes() {
+		$course_archive_thumbnail 	= $this->get_image_size( 'course_archive_image' );
+		$course_single_thumbnail	= $this->get_image_size( 'course_single_image' );
+		$lesson_archive_thumbnail 	= $this->get_image_size( 'lesson_archive_image' );
+		$lesson_single_thumbnail	= $this->get_image_size( 'lesson_single_image' );
+
+		add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] );
+		add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] );
+		add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] );
+		add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] );
+	}
+
+	/**
+	 * Get an image size.
+	 *
+	 * Variable is filtered by sensei_get_image_size_{image_size}
+	 *
+	 * @since 1.4.5
+	 * @access public
+	 * @param mixed $image_size
+	 * @return string
+	 */
+	public function get_image_size( $image_size ) {
+
+		// Only return sizes we define in settings
+		if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) )
+			return apply_filters( 'sensei_get_image_size_' . $image_size, '' );
+
+		if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) {
+			$this->settings->settings[ $image_size . '_width' ] = false;
+		}
+		if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) {
+			$this->settings->settings[ $image_size . '_height' ] = false;
+		}
+		if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) {
+			$this->settings->settings[ $image_size . '_hard_crop' ] = false;
+		}
+
+		$size = array_filter( array(
+			'width' => $this->settings->settings[ $image_size . '_width' ],
+			'height' => $this->settings->settings[ $image_size . '_height' ],
+			'crop' => $this->settings->settings[ $image_size . '_hard_crop' ]
+		) );
+
+		$size['width'] 	= isset( $size['width'] ) ? $size['width'] : '100';
+		$size['height'] = isset( $size['height'] ) ? $size['height'] : '100';
+		$size['crop'] 	= isset( $size['crop'] ) ? $size['crop'] : 0;
+
+		return apply_filters( 'sensei_get_image_size_' . $image_size, $size );
+	}
+
+	public function body_class( $classes ) {
+		if( is_sensei() ) {
+			$classes[] = 'sensei';
+		}
+		return $classes;
+	}
+
+	/**
+	 * Checks that the Jetpack Beautiful Maths module has been activated to support LaTeX within question titles and answers
+	 *
+	 * @return null
+	 * @since 1.7.0
+	 */
+	public function jetpack_latex_support() {
+		if ( function_exists( 'latex_markup') ) {
+			add_filter( 'sensei_question_title', 'latex_markup' );
+			add_filter( 'sensei_answer_text', 'latex_markup' );
+		}
+	}
+
+	/**
+	 * Load the module functionality.
+	 *
+	 * This function is hooked into plugins_loaded to avoid conflicts with
+	 * the retired modules extension.
+	 *
+	 * @since 1.8.0
+	 */
+	public function load_modules_class(){
+		global $sensei_modules;
+
+		if( !class_exists( 'Sensei_Modules' )
+			&&  'Sensei_Modules' != get_class( $sensei_modules ) ) {
+
+			//Load the modules class
+			require_once( 'class-sensei-modules.php');
+			Sensei()->modules = new Sensei_Core_Modules( $this->file );
+
+		}else{
+			// fallback for people still using the modules extension.
+			global $sensei_modules;
+			Sensei()->modules = $sensei_modules;
+			add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 );
+		}
+	}
+
+	/**
+	 * Tell the user to that the modules extension is no longer needed.
+	 *
+	 * @since 1.8.0
+	 */
+	public function disable_sensei_modules_extension(){ ?>
         <div class="notice updated fade">
             <p>
                 <?php
-                $plugin_manage_url = admin_url().'plugins.php#sensei-modules';
-                $plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> ';
-                ?>
+				$plugin_manage_url = admin_url().'plugins.php#sensei-modules';
+				$plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> ';
+				?>
                 <strong> Modules are now included in Sensei,</strong> so you no longer need the Sensei Modules extension.
                 Please deactivate and delete it from your <?php echo $plugin_link_element; ?>. (This will not affect your existing modules).
             </p>
@@ -921,200 +921,200 @@ 
 
     <?php }// end function
 
-    /**
-     * Sensei wide rewrite flush call.
-     *
-     * To use this simply update the option 'sensei_flush_rewrite_rules' to 1
-     *
-     * After the option is one the Rules will be flushed.
-     *
-     * @since 1.9.0
-     */
-    public function flush_rewrite_rules(){
-
-        // ensures that the rewrite rules are flushed on the second
-        // attempt. This ensure that the settings for any other process
-        // have been completed and saved to the database before we refresh the
-        // rewrite rules.
-        $option =  get_option('sensei_flush_rewrite_rules');
-        if( '1' == $option ) {
-
-            update_option('sensei_flush_rewrite_rules', '2');
-
-        }elseif( '2' == $option ) {
-
-            flush_rewrite_rules();
-            update_option('sensei_flush_rewrite_rules', '0');
-
-        }
-
-    } // end flush_rewrite_rules
-
-    /**
-     * Calling this function will tell Sensei to flush rewrite
-     * rules on the next load.
-     *
-     * @since 1.9.0
-     */
-    public function initiate_rewrite_rules_flush(){
-
-        update_option('sensei_flush_rewrite_rules', '1');
-
-    }
-
-    /**
-     * sensei_woocommerce_email_course_details adds detail to email
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::email_course_details
-     *
-     * @since   1.4.5
-     * @access  public
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public function sensei_woocommerce_email_course_details( $order ) {
-
-        Sensei_WC::email_course_details( $order );
-
-    } // end func email course details
-
-    /**
-     * @deprecated since 1.9.0, movde to the Sensei_WC class
-     * @param $user_id
-     * @param $subscription_key
-     */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){
-
-        Sensei_WC::reactivate_subscription( $user_id, $subscription_key );
-    }
-
-    /**
-     * @deprecated since 1.9.0, movde to the Sensei_WC class
-     * @param $user_id
-     * @param $subscription_key
-     */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){
-
-        Sensei_WC::end_subscription( $user_id, $subscription_key );
-    }
-
-    /**
-     * sensei_woocommerce_complete_order description
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::complete_order( $order_id );
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     *
-     * @return  void
-     */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
-
-        Sensei_WC::complete_order( $order_id );
-
-    } // End sensei_woocommerce_complete_order()
-
-    /**
-     * Runs when an order is cancelled.
-     *
-     * @deprecated since 1.9.0
-     *
-     * @since   1.2.0
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
-
-        Sensei_WC::cancel_order( $order_id );
-
-    } // End sensei_woocommerce_cancel_order()
-
-    /**
-     * sensei_activate_subscription runs when a subscription product is purchased
-     * @deprecated since 1.9.0
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
-
-        Sensei_WC::activate_subscription( $order_id );
-
-    } // End sensei_activate_subscription()
-
-    /**
-     * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
-     * @deprecated since 1.9.0
-     * @since  1.0.0
-     * @param  int 			$course_id  (default: 0)
-     * @param  array/Object $order_user (default: array()) Specific user's data.
-     * @return bool|int
-     */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
-
-        return Sensei_WC::course_update( $course_id, $order_user );
-
-    } // End woocommerce_course_update()
-
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @deprecated since 1.9.0
-     * @since   1.1.1
-     *
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     *
-     * @return   WC_Product $wc_product_object
-     */
-    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
-
-        return Sensei_WC::get_product_object( $wc_product_id, $product_type );
-
-    } // End sensei_get_woocommerce_product_object()
-
-    /**
-     * Setup required WooCommerce settings.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function set_woocommerce_functionality() {
-
-        _deprecated_function('Sensei()->set_woocommerce_functionality', 'Sensei 1.9.0');
-
-    } // End set_woocommerce_functionality()
-
-    /**
-     * Disable guest checkout if a course product is in the cart
-     * @deprecated since 1.9.0
-     * @param  boolean $guest_checkout Current guest checkout setting
-     * @return boolean                 Modified guest checkout setting
-     */
-    public function disable_guest_checkout( $guest_checkout ) {
-
-        return Sensei_WC::disable_guest_checkout( $guest_checkout );
-
-    }// end disable_guest_checkout
-
-    /**
-     * Change order status with virtual products to completed
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::virtual_order_payment_complete( $order_status, $order_id )
-     *
-     * @since  1.1.0
-     * @param string $order_status
-     * @param int $order_id
-     * @return string
-     **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
-
-        return  Sensei_WC::virtual_order_payment_complete( $order_status, $order_id );
-    }
+	/**
+	 * Sensei wide rewrite flush call.
+	 *
+	 * To use this simply update the option 'sensei_flush_rewrite_rules' to 1
+	 *
+	 * After the option is one the Rules will be flushed.
+	 *
+	 * @since 1.9.0
+	 */
+	public function flush_rewrite_rules(){
+
+		// ensures that the rewrite rules are flushed on the second
+		// attempt. This ensure that the settings for any other process
+		// have been completed and saved to the database before we refresh the
+		// rewrite rules.
+		$option =  get_option('sensei_flush_rewrite_rules');
+		if( '1' == $option ) {
+
+			update_option('sensei_flush_rewrite_rules', '2');
+
+		}elseif( '2' == $option ) {
+
+			flush_rewrite_rules();
+			update_option('sensei_flush_rewrite_rules', '0');
+
+		}
+
+	} // end flush_rewrite_rules
+
+	/**
+	 * Calling this function will tell Sensei to flush rewrite
+	 * rules on the next load.
+	 *
+	 * @since 1.9.0
+	 */
+	public function initiate_rewrite_rules_flush(){
+
+		update_option('sensei_flush_rewrite_rules', '1');
+
+	}
+
+	/**
+	 * sensei_woocommerce_email_course_details adds detail to email
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::email_course_details
+	 *
+	 * @since   1.4.5
+	 * @access  public
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public function sensei_woocommerce_email_course_details( $order ) {
+
+		Sensei_WC::email_course_details( $order );
+
+	} // end func email course details
+
+	/**
+	 * @deprecated since 1.9.0, movde to the Sensei_WC class
+	 * @param $user_id
+	 * @param $subscription_key
+	 */
+	public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){
+
+		Sensei_WC::reactivate_subscription( $user_id, $subscription_key );
+	}
+
+	/**
+	 * @deprecated since 1.9.0, movde to the Sensei_WC class
+	 * @param $user_id
+	 * @param $subscription_key
+	 */
+	public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){
+
+		Sensei_WC::end_subscription( $user_id, $subscription_key );
+	}
+
+	/**
+	 * sensei_woocommerce_complete_order description
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::complete_order( $order_id );
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 *
+	 * @return  void
+	 */
+	public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+
+		Sensei_WC::complete_order( $order_id );
+
+	} // End sensei_woocommerce_complete_order()
+
+	/**
+	 * Runs when an order is cancelled.
+	 *
+	 * @deprecated since 1.9.0
+	 *
+	 * @since   1.2.0
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_cancel_order ( $order_id ) {
+
+		Sensei_WC::cancel_order( $order_id );
+
+	} // End sensei_woocommerce_cancel_order()
+
+	/**
+	 * sensei_activate_subscription runs when a subscription product is purchased
+	 * @deprecated since 1.9.0
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_activate_subscription(  $order_id = 0 ) {
+
+		Sensei_WC::activate_subscription( $order_id );
+
+	} // End sensei_activate_subscription()
+
+	/**
+	 * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 * @deprecated since 1.9.0
+	 * @since  1.0.0
+	 * @param  int 			$course_id  (default: 0)
+	 * @param  array/Object $order_user (default: array()) Specific user's data.
+	 * @return bool|int
+	 */
+	public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+
+		return Sensei_WC::course_update( $course_id, $order_user );
+
+	} // End woocommerce_course_update()
+
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @deprecated since 1.9.0
+	 * @since   1.1.1
+	 *
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 *
+	 * @return   WC_Product $wc_product_object
+	 */
+	public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
+
+		return Sensei_WC::get_product_object( $wc_product_id, $product_type );
+
+	} // End sensei_get_woocommerce_product_object()
+
+	/**
+	 * Setup required WooCommerce settings.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function set_woocommerce_functionality() {
+
+		_deprecated_function('Sensei()->set_woocommerce_functionality', 'Sensei 1.9.0');
+
+	} // End set_woocommerce_functionality()
+
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 * @deprecated since 1.9.0
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public function disable_guest_checkout( $guest_checkout ) {
+
+		return Sensei_WC::disable_guest_checkout( $guest_checkout );
+
+	}// end disable_guest_checkout
+
+	/**
+	 * Change order status with virtual products to completed
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::virtual_order_payment_complete( $order_status, $order_id )
+	 *
+	 * @since  1.1.0
+	 * @param string $order_status
+	 * @param int $order_id
+	 * @return string
+	 **/
+	public function virtual_order_payment_complete( $order_status, $order_id ) {
+
+		return  Sensei_WC::virtual_order_payment_complete( $order_status, $order_id );
+	}
 
 } // End Class
 

includes/shortcodes/class-sensei-shortcode-unpurchased-courses.php

Indentation +115 added lines, -115 removed lines

@@ -16,148 +16,148 @@
  */
 class Sensei_Shortcode_Unpurchased_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
-
-    /**
-     * @var string number of items to show on the current page
-     * Default: all.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
-
-            $this->order =  'ASC';
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: all.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
 
-        // course query parameters to be used for all courses
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            // the number specified by the user will be used later in this function
-            'posts_per_page' => 1000,
-            'orderby'          => $this->orderby,
-            'order'            => $this->order
-        );
+		// course query parameters to be used for all courses
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			// the number specified by the user will be used later in this function
+			'posts_per_page' => 1000,
+			'orderby'          => $this->orderby,
+			'order'            => $this->order
+		);
 
-        // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
+		// get all the courses that has a product attached
+		$all_courses_query = new WP_Query( $query_args );
 
-        $paid_courses_not_taken = array();
-        // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
+		$paid_courses_not_taken = array();
+		// look through all course and find the purchasable ones that user has not purchased
+		foreach( $all_courses_query->posts as $course ){
 
-            // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
-                &&
-                ! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
+			// only keep the courses with a product including only  courses that the user not taking
+			$course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
+			if( is_numeric( $course_product_id )
+				&&
+				! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
+			){
 
-                    $paid_courses_not_taken[] = $course->ID;
+					$paid_courses_not_taken[] = $course->ID;
 
-                }
+				}
 
-        } // end foreach
+		} // end foreach
 
-        // setup the course query again and only use the course the user has not purchased.
-        // this query will be loaded into the global WP_Query in the render function.
-        $query_args[ 'post__in' ] = $paid_courses_not_taken;
-        $query_args[ 'posts_per_page' ] = $this->number;
+		// setup the course query again and only use the course the user has not purchased.
+		// this query will be loaded into the global WP_Query in the render function.
+		$query_args[ 'post__in' ] = $paid_courses_not_taken;
+		$query_args[ 'posts_per_page' ] = $this->number;
 
-        $this->query = new WP_Query( $query_args );
+		$this->query = new WP_Query( $query_args );
 
-    }// end setup _course_query
+	}// end setup _course_query
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in() ) {
 
-            $anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
-            $anchor_after = '</a>';
-            $notice = sprintf(
-                __('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
-                $anchor_before,
-                $anchor_after
-            );
+			$anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
+			$anchor_after = '</a>';
+			$notice = sprintf(
+				__('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
+				$anchor_before,
+				$anchor_after
+			);
 
-            Sensei()->notices->add_notice( $notice, 'info' );
-            Sensei()->notices->maybe_print_notices();
+			Sensei()->notices->add_notice( $notice, 'info' );
+			Sensei()->notices->maybe_print_notices();
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        ob_start();
-        Sensei()->notices->maybe_print_notices();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+		ob_start();
+		Sensei()->notices->maybe_print_notices();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }
\ No newline at end of file

includes/shortcodes/class-sensei-shortcode-user-messages.php

Indentation +86 added lines, -86 removed lines

@@ -17,91 +17,91 @@
  */
 class Sensei_Shortcode_User_Messages implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query
-     * messages for the current user
-     */
-    protected $messages_query;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        $this->setup_messages_query();
-
-    }
-
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_messages_query(){
-
-        $user = wp_get_current_user();
-
-        $args = array(
-            'post_type' => 'sensei_message',
-            'posts_per_page' => 500,
-            'orderby' => 'date',
-            'order' => 'DESC',
-            'post_status' => 'publish',
-            'meta_query' => array(
-                array(
-                    'key'     => '_sender',
-                    'value'   => $user->user_login,
-                    'compare' => '=',
-                ),
-            ),
-        );
-
-        $this->messages_query  = new WP_Query( $args );
-    }
-
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
-
-        if( !is_user_logged_in() ){
-
-            Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
-
-        } elseif( 0 == $this->messages_query->post_count ){
-
-            Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
-        }
-
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
-
-        // don't show anything if messages are disable
-        if( $messages_disabled_in_settings ){
-            return '';
-        }
-
-        //set the wp_query to the current messages query
-        global $wp_query;
-        $wp_query = $this->messages_query;
-
-        ob_start();
-        Sensei()->notices->maybe_print_notices();
-        Sensei_Templates::get_part('loop', 'message');
-        $messages_html = ob_get_clean();
-
-        // set back the global query
-        wp_reset_query();
-
-        return $messages_html;
-
-    }// end render
+	/**
+	 * @var WP_Query
+	 * messages for the current user
+	 */
+	protected $messages_query;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		$this->setup_messages_query();
+
+	}
+
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_messages_query(){
+
+		$user = wp_get_current_user();
+
+		$args = array(
+			'post_type' => 'sensei_message',
+			'posts_per_page' => 500,
+			'orderby' => 'date',
+			'order' => 'DESC',
+			'post_status' => 'publish',
+			'meta_query' => array(
+				array(
+					'key'     => '_sender',
+					'value'   => $user->user_login,
+					'compare' => '=',
+				),
+			),
+		);
+
+		$this->messages_query  = new WP_Query( $args );
+	}
+
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
+
+		if( !is_user_logged_in() ){
+
+			Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
+
+		} elseif( 0 == $this->messages_query->post_count ){
+
+			Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
+		}
+
+		$messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
+											|| ! Sensei()->settings->settings['messages_disable'] ) ;
+
+		// don't show anything if messages are disable
+		if( $messages_disabled_in_settings ){
+			return '';
+		}
+
+		//set the wp_query to the current messages query
+		global $wp_query;
+		$wp_query = $this->messages_query;
+
+		ob_start();
+		Sensei()->notices->maybe_print_notices();
+		Sensei_Templates::get_part('loop', 'message');
+		$messages_html = ob_get_clean();
+
+		// set back the global query
+		wp_reset_query();
+
+		return $messages_html;
+
+	}// end render
 
 }// end class
\ No newline at end of file

templates/single-quiz.php

Indentation +74 added lines, -74 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * The Template for displaying all Quiz Questions.
- *
- * Override this template by copying it to yourtheme/sensei/single-quiz.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all Quiz Questions.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/single-quiz.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php  get_sensei_header();  ?>
@@ -17,19 +17,19 @@ 
 
     <?php
 
-        /**
-         * Hook inside the single quiz post above the content
-         *
-         * @since 1.9.0
-         *
-         * @hooked Sensei_Quiz::the_title               - 20
-         * @hooked Sensei_Quiz::the_user_status_message - 40
-         * @param integer $quiz_id
-         *
-         */
-        do_action( 'sensei_single_quiz_content_inside_before', get_the_ID() );
+		/**
+		 * Hook inside the single quiz post above the content
+		 *
+		 * @since 1.9.0
+		 *
+		 * @hooked Sensei_Quiz::the_title               - 20
+		 * @hooked Sensei_Quiz::the_user_status_message - 40
+		 * @param integer $quiz_id
+		 *
+		 */
+		do_action( 'sensei_single_quiz_content_inside_before', get_the_ID() );
 
-    ?>
+	?>
 
 	<?php if ( sensei_can_user_view_lesson() ) : ?>
 
@@ -41,16 +41,16 @@ 
 
 	                <?php
 
-	                    /**
-	                     * Action inside before the question content on single-quiz page
-	                     *
-	                     * @hooked WooThemes_Sensei_Quiz::the_user_status_message  - 10
-	                     *
-	                     * @param string $the_quiz_id
-	                     */
-	                    do_action( 'sensei_single_quiz_questions_before', get_the_id() );
+						/**
+						 * Action inside before the question content on single-quiz page
+						 *
+						 * @hooked WooThemes_Sensei_Quiz::the_user_status_message  - 10
+						 *
+						 * @param string $the_quiz_id
+						 */
+						do_action( 'sensei_single_quiz_questions_before', get_the_id() );
 
-	                ?>
+					?>
 
 
 
@@ -62,35 +62,35 @@ 
 
 	                        <?php
 
-	                            /**
-	                             * Action inside before the question content on single-quiz page
-	                             *
-	                             * @hooked WooThemes_Sensei_Question::the_question_title        - 10
-	                             * @hooked WooThemes_Sensei_Question::the_question_description  - 20
-	                             * @hooked WooThemes_Sensei_Question::the_question_media        - 30
-	                             * @hooked WooThemes_Sensei_Question::the_question_hidden_field - 40
-	                             *
-	                             * @since 1.9.0
-	                             * @param string $the_question_id
-	                             */
-	                            do_action( 'sensei_quiz_question_inside_before', sensei_get_the_question_id() );
-
-	                        ?>
+								/**
+								 * Action inside before the question content on single-quiz page
+								 *
+								 * @hooked WooThemes_Sensei_Question::the_question_title        - 10
+								 * @hooked WooThemes_Sensei_Question::the_question_description  - 20
+								 * @hooked WooThemes_Sensei_Question::the_question_media        - 30
+								 * @hooked WooThemes_Sensei_Question::the_question_hidden_field - 40
+								 *
+								 * @since 1.9.0
+								 * @param string $the_question_id
+								 */
+								do_action( 'sensei_quiz_question_inside_before', sensei_get_the_question_id() );
+
+							?>
 
 	                        <?php sensei_the_question_content(); ?>
 
 	                        <?php
 
-	                            /**
-	                             * Action inside before the question content on single-quiz page
-	                             *
-	                             * @hooked WooThemes_Sensei_Question::answer_feedback_notes
-	                             *
-	                             * @param string $the_question_id
-	                             */
-	                            do_action( 'sensei_quiz_question_inside_after', sensei_get_the_question_id() );
+								/**
+								 * Action inside before the question content on single-quiz page
+								 *
+								 * @hooked WooThemes_Sensei_Question::answer_feedback_notes
+								 *
+								 * @param string $the_question_id
+								 */
+								do_action( 'sensei_quiz_question_inside_after', sensei_get_the_question_id() );
 
-	                        ?>
+							?>
 
 	                    </li>
 
@@ -100,14 +100,14 @@ 
 
 	                <?php
 
-	                    /**
-	                     * Action inside before the question content on single-quiz page
-	                     *
-	                     * @param string $the_quiz_id
-	                     */
-	                    do_action( 'sensei_single_quiz_questions_after', get_the_id() );
+						/**
+						 * Action inside before the question content on single-quiz page
+						 *
+						 * @param string $the_quiz_id
+						 */
+						do_action( 'sensei_single_quiz_questions_after', get_the_id() );
 
-	                ?>
+					?>
 
 	            </form>
 	        <?php else:  ?>
@@ -118,9 +118,9 @@ 
 
 
 	        <?php
-	            $quiz_lesson = Sensei()->quiz->data->quiz_lesson;
-	            do_action( 'sensei_quiz_back_link', $quiz_lesson  );
-	        ?>
+				$quiz_lesson = Sensei()->quiz->data->quiz_lesson;
+				do_action( 'sensei_quiz_back_link', $quiz_lesson  );
+			?>
 
         </section>
 
@@ -128,17 +128,17 @@ 
 
     <?php
 
-    /**
-     * Hook inside the single quiz post above the content
-     *
-     * @since 1.9.0
-     *
-     * @param integer $quiz_id
-     *
-     */
-    do_action( 'sensei_single_quiz_content_inside_after', get_the_ID() );
-
-    ?>
+	/**
+	 * Hook inside the single quiz post above the content
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $quiz_id
+	 *
+	 */
+	do_action( 'sensei_single_quiz_content_inside_after', get_the_ID() );
+
+	?>
 
 </article><!-- .quiz -->
 

includes/class-sensei-quiz.php

Indentation +884 added lines, -884 removed lines

@@ -24,69 +24,69 @@ 
 	 */
 	public function __construct ( $file = __FILE__ ) {
 		$this->file = $file;
-        $this->token = 'quiz';
+		$this->token = 'quiz';
 		$this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' );
 		add_action( 'save_post', array( $this, 'update_author' ));
 
 		// listen to the reset button click
 		add_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
 
-        // fire the complete quiz button submit for grading action
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
+		// fire the complete quiz button submit for grading action
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
 
 		// fire the save user answers quiz button click responder
 		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_save_quiz_answers_listener' ) );
 
-        // fire the load global data function
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
+		// fire the load global data function
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
 
-        add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
+		add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
 
 
-    } // End __construct()
+	} // End __construct()
 
 	/**
-	* Update the quiz author when the lesson post type is save
-	*
-	* @param int $post_id
-	* @return void
-	*/
+	 * Update the quiz author when the lesson post type is save
+	 *
+	 * @param int $post_id
+	 * @return void
+	 */
 	public function update_author( $post_id ){
 
 		// If this isn't a 'lesson' post, don't update it.
-        // if this is a revision don't save it
-	    if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
-            || wp_is_post_revision( $post_id ) ) {
+		// if this is a revision don't save it
+		if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
+			|| wp_is_post_revision( $post_id ) ) {
 
-                return;
+				return;
 
-        }
-	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+		}
+		// get the lesson author id to be use late
+		$saved_post = get_post( $post_id );
+		$new_lesson_author_id =  $saved_post->post_author;
 
-	    //get the lessons quiz
+		//get the lessons quiz
 		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		foreach ( (array) $lesson_quizzes as $quiz_item ) {
 
-	    	if( ! $quiz_item ) {
-	    		continue;
-	    	}
+			if( ! $quiz_item ) {
+				continue;
+			}
 
-		    // setup the quiz items new author value
+			// setup the quiz items new author value
 			$my_post = array(
-			      'ID'           => $quiz_item,
-			      'post_author' =>  $new_lesson_author_id
+				  'ID'           => $quiz_item,
+				  'post_author' =>  $new_lesson_author_id
 			);
 
-            // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+			// remove the action so that it doesn't fire again
+			remove_action( 'save_post', array( $this, 'update_author' ));
 
 			// Update the post into the database
 		  	wp_update_post( $my_post );
-	    }
+		}
 
-	    return;
+		return;
 	}// end update_author
 
 
@@ -117,32 +117,32 @@ 
 	} // end lesson
 
 
-    /**
-     * user_save_quiz_answers_listener
-     *
-     * This function hooks into the quiz page and accepts the answer form save post.
-     * @since 1.7.3
-     * @return bool $saved;
-     */
-    public function user_save_quiz_answers_listener(){
+	/**
+	 * user_save_quiz_answers_listener
+	 *
+	 * This function hooks into the quiz page and accepts the answer form save post.
+	 * @since 1.7.3
+	 * @return bool $saved;
+	 */
+	public function user_save_quiz_answers_listener(){
 
-        if( ! isset( $_POST[ 'quiz_save' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		if( ! isset( $_POST[ 'quiz_save' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
-        // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+		global $post;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
+		// call the save function
+		self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
 
-        // remove the hook as it should only fire once per click
-        remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
+		// remove the hook as it should only fire once per click
+		remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
 
-    } // end user_save_quiz_answers_listener
+	} // end user_save_quiz_answers_listener
 
 	/**
 	 * Save the user answers for the given lesson's quiz
@@ -153,7 +153,7 @@ 
 	 * @access public
 	 *
 	 * @param array $quiz_answers
-     * @param array $files from global $_FILES
+	 * @param array $files from global $_FILES
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
@@ -161,11 +161,11 @@ 
 	 */
 	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        // make sure the parameters are valid before continuing
+		// make sure the parameters are valid before continuing
 		if( empty( $lesson_id ) || empty( $user_id )
 			|| 'lesson' != get_post_type( $lesson_id )
 			||!get_userdata( $user_id )
@@ -176,25 +176,25 @@ 
 		}
 
 
-        // start the lesson before saving the data in case the user has not started the lesson
-        $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		// start the lesson before saving the data in case the user has not started the lesson
+		$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
 
 		//prepare the answers
 		$prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files );
 
 		// save the user data
-        $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
+		$answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
 
 		// were the answers saved correctly?
 		if( intval( $answers_saved ) > 0){
 
-            // save transient to make retrieval faster
-            $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+			// save transient to make retrieval faster
+			$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+			set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
 
-            // update the message showed to user
-            Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
-        }
+			// update the message showed to user
+			Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+		}
 
 		return $answers_saved;
 
@@ -202,9 +202,9 @@ 
 
 	/**
 	 * Get the user answers for the given lesson's quiz.
-     *
-     * This function returns the data that is stored on the lesson as meta and is not compatible with
-     * retrieving data for quiz answer before sensei 1.7.4
+	 *
+	 * This function returns the data that is stored on the lesson as meta and is not compatible with
+	 * retrieving data for quiz answer before sensei 1.7.4
 	 *
 	 *
 	 * @since 1.7.4
@@ -224,27 +224,27 @@ 
 			return false;
 		}
 
-        // save some time and get the transient cached data
-        $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $transient_cached_answers = get_transient( $transient_key );
+		// save some time and get the transient cached data
+		$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$transient_cached_answers = get_transient( $transient_key );
 
-        // return the transient or get the values get the values from the comment meta
-        if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
+		// return the transient or get the values get the values from the comment meta
+		if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
 
-            $encoded_user_answers = $transient_cached_answers;
+			$encoded_user_answers = $transient_cached_answers;
 
-        }else{
+		}else{
 
-            $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
+			$encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
 
-        } // end if transient check
+		} // end if transient check
 
 		if( ! is_array( $encoded_user_answers ) ){
 			return false;
 		}
 
-        //set the transient with the new valid data for faster retrieval in future
-        set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
+		//set the transient with the new valid data for faster retrieval in future
+		set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
 
 		// decode an unserialize all answers
 		foreach( $encoded_user_answers as $question_id => $encoded_answer ) {
@@ -278,8 +278,8 @@ 
 		$current_quiz_id = $post->ID;
 		$lesson_id = $this->get_lesson_id( $current_quiz_id );
 
-        // reset all user data
-        $this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
+		// reset all user data
+		$this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
 
 		//this function should only run once
 		remove_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
@@ -290,7 +290,7 @@ 
 	 * Complete/ submit  quiz hooked function
 	 *
 	 * This function listens to the complete button submit action and processes the users submitted answers
-     * not that this function submits the given users quiz answers for grading.
+	 * not that this function submits the given users quiz answers for grading.
 	 *
 	 * @since  1.7.4
 	 * @access public
@@ -300,90 +300,90 @@ 
 	 */
 	public function user_quiz_submit_listener() {
 
-        // only respond to valid quiz completion submissions
-        if( ! isset( $_POST[ 'quiz_complete' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		// only respond to valid quiz completion submissions
+		if( ! isset( $_POST[ 'quiz_complete' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+		global $post, $current_user;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
 
-        self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
+		self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
 
 	} // End sensei_complete_quiz()
 
-    /**
-     * This function set's up the data need for the quiz page
-     *
-     * This function hooks into sensei_complete_quiz and load the global data for the
-     * current quiz.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     */
-    public function load_global_quiz_data(){
+	/**
+	 * This function set's up the data need for the quiz page
+	 *
+	 * This function hooks into sensei_complete_quiz and load the global data for the
+	 * current quiz.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 */
+	public function load_global_quiz_data(){
 
-        global  $post, $current_user;
-        $this->data = new stdClass();
+		global  $post, $current_user;
+		$this->data = new stdClass();
 
-        // Default grade
-        $grade = 0;
+		// Default grade
+		$grade = 0;
 
-        // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+		// Get Quiz Questions
+		$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
 
-        $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
+		$quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
 
-        // Get quiz grade type
-        $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
+		// Get quiz grade type
+		$quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
 
-        // Get quiz pass setting
-        $pass_required = get_post_meta( $post->ID, '_pass_required', true );
+		// Get quiz pass setting
+		$pass_required = get_post_meta( $post->ID, '_pass_required', true );
 
-        // Get quiz pass mark
-        $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
+		// Get quiz pass mark
+		$quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
 
-        // Get latest quiz answers and grades
-        $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
-        $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
-        $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-        }
+		// Get latest quiz answers and grades
+		$lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
+		$user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
+		$user_quiz_grade = 0;
+		if( isset( $user_lesson_status->comment_ID ) ) {
+			$user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		}
 
-        if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
+		if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
 
-        // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
-        $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        } // End If Statement
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		} // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
+		$reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+		//backwards compatibility
+		if( 'on' == $reset_allowed ) {
+			$reset_allowed = 1;
+		}
 
-        // Build frontend data object for backwards compatibility
-        // using this is no longer recommended
-        $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $this->data->quiz_passmark = $quiz_passmark;
-        $this->data->quiz_lesson = $quiz_lesson_id;
-        $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
-        $this->data->user_lesson_end = $user_lesson_end;
-        $this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $this->data->lesson_quiz_questions = $lesson_quiz_questions;
-        $this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
+		// Build frontend data object for backwards compatibility
+		// using this is no longer recommended
+		$this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$this->data->quiz_passmark = $quiz_passmark;
+		$this->data->quiz_lesson = $quiz_lesson_id;
+		$this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		$this->data->user_lesson_end = $user_lesson_end;
+		$this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$this->data->lesson_quiz_questions = $lesson_quiz_questions;
+		$this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
 
-    } // end load_global_quiz_data
+	} // end load_global_quiz_data
 
 
 	/**
@@ -413,25 +413,25 @@ 
 		foreach( $unprepared_answers as $question_id => $answer ) {
 
 			//get the current questions question type
-            $question_type = Sensei()->question->get_question_type( $question_id );
+			$question_type = Sensei()->question->get_question_type( $question_id );
 
 			// Sanitise answer
 			if( 0 == get_magic_quotes_gpc() ) {
 				$answer = wp_unslash( $answer );
 			}
 
-            // compress the answer for saving
+			// compress the answer for saving
 			if( 'multi-line' == $question_type ) {
-                $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
-                $file_key = 'file_upload_' . $question_id;
-                if( isset( $files[ $file_key ] ) ) {
-                        $attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
-                        if( $attachment_id ) {
-                            $answer = $attachment_id;
-                        }
-                    }
-            } // end if
+				$answer = esc_html( $answer );
+			}elseif( 'file-upload' == $question_type  ){
+				$file_key = 'file_upload_' . $question_id;
+				if( isset( $files[ $file_key ] ) ) {
+						$attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
+						if( $attachment_id ) {
+							$answer = $attachment_id;
+						}
+					}
+			} // end if
 
 			$prepared_answers[ $question_id ] =  base64_encode( maybe_serialize( $answer ) );
 
@@ -440,813 +440,813 @@ 
 		return $prepared_answers;
 	} // prepare_form_submitted_answers
 
-    /**
-     * Reset user submitted questions
-     *
-     * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
-     * the save_user_answers as currently the saved and submitted answers are stored differently.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     * @return bool $reset_success
-     * @param int $user_id
-     * @param int $lesson_id
-     */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+	/**
+	 * Reset user submitted questions
+	 *
+	 * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
+	 * the save_user_answers as currently the saved and submitted answers are stored differently.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 * @return bool $reset_success
+	 * @param int $user_id
+	 * @param int $lesson_id
+	 */
+	public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+
+		//make sure the parameters are valid
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			|| ! get_userdata( $user_id ) ){
+			return false;
+		}
+
+
+
+		//get the users lesson status to make
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		if( ! isset( $user_lesson_status->comment_ID ) ) {
+			// this user is not taking this lesson so this process is not needed
+			return false;
+		}
+
+		//get the lesson quiz and course
+		$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+
+		// reset the transients
+		$answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+		$answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		delete_transient( $answers_transient_key );
+		delete_transient( $grades_transient_key );
+		delete_transient( $answers_feedback_transient_key );
+
+		// reset the quiz answers and feedback notes
+		$deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
+		$deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
+		$deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+		// Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
+		Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+
+		Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+
+		// Update course completion
+		Sensei_Utils::update_course_status( $user_id, $course_id );
 
-        //make sure the parameters are valid
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            || ! get_userdata( $user_id ) ){
-            return false;
-        }
-
-
-
-        //get the users lesson status to make
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-        if( ! isset( $user_lesson_status->comment_ID ) ) {
-            // this user is not taking this lesson so this process is not needed
-            return false;
-        }
+		// Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
+		do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
+		Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
 
-        //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		return ( $deleted_answers && $deleted_grades ) ;
 
-        // reset the transients
-        $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
-        $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-        delete_transient( $answers_transient_key );
-        delete_transient( $grades_transient_key );
-        delete_transient( $answers_feedback_transient_key );
+	} // end reset_user_lesson_data
 
-        // reset the quiz answers and feedback notes
-        $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
-        $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
-        $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+	 /**
+	  * Submit the users quiz answers for grading
+	  *
+	  * This function accepts users answers and stores it but also initiates the grading
+	  * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
+	  *
+	  * @since 1.7.4
+	  * @access public
+	  *
+	  * @param array $quiz_answers
+	  * @param array $files from $_FILES
+	  * @param int $user_id
+	  * @param int $lesson_id
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
 
-        // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-        Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+		 $answers_submitted = false;
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-        // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_id );
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_answers ) ){
 
-        // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
-        do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
-        Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+			 return false;
 
-        return ( $deleted_answers && $deleted_grades ) ;
+		 }
 
-    } // end reset_user_lesson_data
+		 // Default grade
+		 $grade = 0;
 
-     /**
-      * Submit the users quiz answers for grading
-      *
-      * This function accepts users answers and stores it but also initiates the grading
-      * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
-      *
-      * @since 1.7.4
-      * @access public
-      *
-      * @param array $quiz_answers
-      * @param array $files from $_FILES
-      * @param int $user_id
-      * @param int $lesson_id
-      *
-      * @return bool $answers_submitted
-      */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+		 // Get Quiz ID
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 
-         $answers_submitted = false;
+		 // Get quiz grade type
+		 $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
+		 // Get quiz pass setting
+		 $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
 
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_answers ) ){
+		 // Get the minimum percentage need to pass this quiz
+		 $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
 
-             return false;
+		 // Handle Quiz Questions asked
+		 // This is to ensure we save the questions that we've asked this user and that this can't be change unless
+		 // the quiz is reset by admin or user( user: only if the setting is enabled ).
+		 // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
+		 if( empty( $questions_asked ) ){
 
-         }
+			 $questions_asked = array_keys( $quiz_answers );
+			 $questions_asked_string = implode( ',', $questions_asked );
 
-         // Default grade
-         $grade = 0;
+			 // Save questions that were asked in this quiz
+			 update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
 
-         // Get Quiz ID
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		 }
 
-         // Get quiz grade type
-         $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		 // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
+		 self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
 
-         // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+		 // Grade quiz
+		 $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
 
-         // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+		 // Get Lesson Grading Setting
+		 $lesson_metadata = array();
+		 $lesson_status = 'ungraded'; // Default when completing a quiz
 
-         // Handle Quiz Questions asked
-         // This is to ensure we save the questions that we've asked this user and that this can't be change unless
-         // the quiz is reset by admin or user( user: only if the setting is enabled ).
-         // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
-         if( empty( $questions_asked ) ){
+		 // At this point the answers have been submitted
+		 $answers_submitted = true;
 
-             $questions_asked = array_keys( $quiz_answers );
-             $questions_asked_string = implode( ',', $questions_asked );
-
-             // Save questions that were asked in this quiz
-             update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
+		 // if this condition is false the quiz should manually be graded by admin
+		 if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
 
-         }
+			 // Quiz has been automatically Graded
+			 if ( 'on' == $pass_required ) {
 
-         // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
-         self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
+				 // Student has reached the pass mark and lesson is complete
+				 if ( $quiz_pass_percentage <= $grade ) {
 
-         // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+					 $lesson_status = 'passed';
 
-         // Get Lesson Grading Setting
-         $lesson_metadata = array();
-         $lesson_status = 'ungraded'; // Default when completing a quiz
+				 } else {
 
-         // At this point the answers have been submitted
-         $answers_submitted = true;
+					 $lesson_status = 'failed';
 
-         // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+				 } // End If Statement
 
-             // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+			 } else {
 
-                 // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+				 // Student only has to partake the quiz
+				 $lesson_status = 'graded';
+
+			 }
+
+			 $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
+
+		 } // end if ! is_wp_error( $grade ...
+
+		 Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
 
-                     $lesson_status = 'passed';
+		 if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
 
-                 } else {
+			 /**
+			  * Lesson end action hook
+			  *
+			  * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
+			  *
+			  * @param int $user_id
+			  * @param int $lesson_id
+			  */
+			 do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
 
-                     $lesson_status = 'failed';
+		 }
 
-                 } // End If Statement
+		 /**
+		  * User quiz has been submitted
+		  *
+		  * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
+		  * results.
+		  *
+		  * @param int $user_id
+		  * @param int $quiz_id
+		  * @param string $grade
+		  * @param string $quiz_pass_percentage
+		  * @param string $quiz_grade_type
+		  */
+		 do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
 
-             } else {
+		 return $answers_submitted;
 
-                 // Student only has to partake the quiz
-                 $lesson_status = 'graded';
-
-             }
-
-             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
-
-         } // end if ! is_wp_error( $grade ...
-
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+	 }// end submit_answers_for_grading
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+	 /**
+	  * Get the user question answer
+	  *
+	  * This function gets the the users saved answer on given quiz for the given question parameter
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool|null $answers_submitted
+	  */
+	 public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
 
-             /**
-              * Lesson end action hook
-              *
-              * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
-              *
-              * @param int $user_id
-              * @param int $lesson_id
-              */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-         }
+			 return false;
+		 }
+
+		 if( ! ( intval( $user_id ) > 0 )   ){
+			 $user_id = get_current_user_id();
+		 }
+
+		 $users_answers = $this->get_user_answers( $lesson_id, $user_id );
+
+		 if( !$users_answers || empty( $users_answers )
+		 ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
+
+			 //Fallback for pre 1.7.4 data
+			 $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
+
+			 if( ! isset( $comment->comment_content ) ){
+				 return NULL;
+			 }
+
+			 return maybe_unserialize( base64_decode( $comment->comment_content ) );
+		 }
+
+		 return $users_answers[ $question_id ];
+
+	 }// end get_user_question_answer
+
+	 /**
+	  * Saving the users quiz question grades
+	  *
+	  * This function save all the grades for all the question in a given quiz on the lesson
+	  * comment meta. It makes use of transients to save the grades for easier access at a later stage
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param array $quiz_grades{
+	  *      @type int $question_id
+	  *      @type int $question_grade
+	  * }
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return bool
+	  */
+	 public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_grades ) ){
+
+			 return false;
+
+		 }
+
+		 $success = false;
+
+		 // save that data for the user on the lesson comment meta
+		 $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
+
+		 // were the grades save successfully ?
+		 if( intval( $comment_meta_id ) > 0 ) {
+
+			 $success = true;
+			 // save transient
+			 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+			 set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
+		 }
+
+		 return $success;
+
+	 }// end set_user_grades
+
+	 /**
+	  * Retrieve the users quiz question grades
+	  *
+	  * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return array $user_quiz_grades or false if none exists for this users
+	  */
+	 public function get_user_grades( $lesson_id, $user_id = 0 ){
+
+		 $user_grades = array();
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // save some time and get the transient cached data
+		 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+		 $user_grades = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $user_grades  ) || false != $user_grades ){
+
+			 $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
+
+		 } // end if transient check
+
+		 // if there is no data for this user
+		 if( ! is_array( $user_grades ) ){
+			 return false;
+		 }
+
+		 return $user_grades;
+
+	 }// end  get_user_grades
+
+	 /**
+	  * Get the user question grade
+	  *
+	  * This function gets the grade on a quiz for the given question parameter
+	  * It does NOT do any grading. It simply retrieves the data that was stored during grading.
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $question_grade
+	  */
+	 public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
+
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
+
+			 return false;
+		 }
+
+		 $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+
+		 if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+
+			 //fallback to data pre 1.7.4
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 $fall_back_grade = false;
+			 if( isset( $question_activity->comment_ID ) ){
+				 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
+			 }
+
+			 return $fall_back_grade;
+
+		 } // end if $all_user_grades...
+
+		 return $all_user_grades[ $question_id ];
+
+	 }// end get_user_question_grade
+
+	 /**
+	  * Save the user's answers feedback
+	  *
+	  * For this function you must supply all three parameters. If will return false one is left out.
+	  * The data will be saved on the lesson ID supplied.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false or int $feedback_saved
+	  */
+	public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
+
+		// make sure the parameters are valid before continuing
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			||!get_userdata( $user_id )
+			|| !is_array( $answers_feedback ) ){
+
+			return false;
+
+		}
+
+
+		// check if the lesson is started before saving, if not start the lesson for the user
+		if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
+			Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		}
 
-         /**
-          * User quiz has been submitted
-          *
-          * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
-          * results.
-          *
-          * @param int $user_id
-          * @param int $quiz_id
-          * @param string $grade
-          * @param string $quiz_pass_percentage
-          * @param string $quiz_grade_type
-          */
-         do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
+		// encode the feedback
+		$encoded_answers_feedback =  array();
+		foreach( $answers_feedback as $question_id => $feedback ){
+			$encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
+		}
+
+		// save the user data
+		$feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
+
+		//Were the the question feedback save correctly?
+		if( intval( $feedback_saved ) > 0){
+
+			// save transient to make retrieval faster in future
+			 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+			 set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
 
-         return $answers_submitted;
+		}
+
+		return $feedback_saved;
+
+	} // end save_user_answers_feedback
+
+	 /**
+	  * Get the user's answers feedback.
+	  *
+	  * This function returns the feedback submitted by the teacher/admin
+	  * during grading. Grading occurs manually or automatically.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false | array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  */
+	 public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+
+		 $answers_feedback = array();
 
-     }// end submit_answers_for_grading
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-     /**
-      * Get the user question answer
-      *
-      * This function gets the the users saved answer on given quiz for the given question parameter
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool|null $answers_submitted
-      */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // first check the transient to save a few split seconds
+		 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		 $encoded_feedback = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $encoded_feedback  ) || !$encoded_feedback ){
+
+			 $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
+
+		 } // end if transient check
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // if there is no data for this user
+		 if( ! is_array( $encoded_feedback ) ){
+			 return false;
+		 }
 
-             return false;
-         }
-
-         if( ! ( intval( $user_id ) > 0 )   ){
-             $user_id = get_current_user_id();
-         }
-
-         $users_answers = $this->get_user_answers( $lesson_id, $user_id );
-
-         if( !$users_answers || empty( $users_answers )
-         ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
-
-             //Fallback for pre 1.7.4 data
-             $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
-
-             if( ! isset( $comment->comment_content ) ){
-                 return NULL;
-             }
-
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
-         }
-
-         return $users_answers[ $question_id ];
-
-     }// end get_user_question_answer
-
-     /**
-      * Saving the users quiz question grades
-      *
-      * This function save all the grades for all the question in a given quiz on the lesson
-      * comment meta. It makes use of transients to save the grades for easier access at a later stage
-      *
-      * @since 1.7.4
-      *
-      * @param array $quiz_grades{
-      *      @type int $question_id
-      *      @type int $question_grade
-      * }
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return bool
-      */
-     public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_grades ) ){
-
-             return false;
-
-         }
-
-         $success = false;
-
-         // save that data for the user on the lesson comment meta
-         $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
-
-         // were the grades save successfully ?
-         if( intval( $comment_meta_id ) > 0 ) {
-
-             $success = true;
-             // save transient
-             $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-             set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
-         }
-
-         return $success;
-
-     }// end set_user_grades
-
-     /**
-      * Retrieve the users quiz question grades
-      *
-      * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
-      *
-      * @since 1.7.4
-      *
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return array $user_quiz_grades or false if none exists for this users
-      */
-     public function get_user_grades( $lesson_id, $user_id = 0 ){
-
-         $user_grades = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // save some time and get the transient cached data
-         $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-         $user_grades = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
-
-             $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
-             return false;
-         }
-
-         return $user_grades;
-
-     }// end  get_user_grades
-
-     /**
-      * Get the user question grade
-      *
-      * This function gets the grade on a quiz for the given question parameter
-      * It does NOT do any grading. It simply retrieves the data that was stored during grading.
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $question_grade
-      */
-     public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
-
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
-
-             return false;
-         }
-
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
-
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
-
-             //fallback to data pre 1.7.4
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
-             $fall_back_grade = false;
-             if( isset( $question_activity->comment_ID ) ){
-                 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
-             }
-
-             return $fall_back_grade;
-
-         } // end if $all_user_grades...
-
-         return $all_user_grades[ $question_id ];
-
-     }// end get_user_question_grade
-
-     /**
-      * Save the user's answers feedback
-      *
-      * For this function you must supply all three parameters. If will return false one is left out.
-      * The data will be saved on the lesson ID supplied.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false or int $feedback_saved
-      */
-    public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
-
-        // make sure the parameters are valid before continuing
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            ||!get_userdata( $user_id )
-            || !is_array( $answers_feedback ) ){
-
-            return false;
-
-        }
-
-
-        // check if the lesson is started before saving, if not start the lesson for the user
-        if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
-            Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
-        }
-
-        // encode the feedback
-        $encoded_answers_feedback =  array();
-        foreach( $answers_feedback as $question_id => $feedback ){
-            $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
-        }
-
-        // save the user data
-        $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
-
-        //Were the the question feedback save correctly?
-        if( intval( $feedback_saved ) > 0){
-
-            // save transient to make retrieval faster in future
-             $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-             set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
-
-        }
-
-        return $feedback_saved;
-
-    } // end save_user_answers_feedback
-
-     /**
-      * Get the user's answers feedback.
-      *
-      * This function returns the feedback submitted by the teacher/admin
-      * during grading. Grading occurs manually or automatically.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false | array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      */
-     public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
-
-         $answers_feedback = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // first check the transient to save a few split seconds
-         $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-         $encoded_feedback = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
-
-             $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
-             return false;
-         }
-
-         foreach( $encoded_feedback as $question_id => $feedback ){
+		 foreach( $encoded_feedback as $question_id => $feedback ){
 
-             $answers_feedback[ $question_id ] = base64_decode( $feedback );
+			 $answers_feedback[ $question_id ] = base64_decode( $feedback );
 
-         }
+		 }
 
-         return $answers_feedback;
+		 return $answers_feedback;
 
-     } // end get_user_answers_feedback
+	 } // end get_user_answers_feedback
 
-     /**
-      * Get the user's answer feedback for a specific question.
-      *
-      * This function gives you a single answer note/feedback string
-      * for the user on the given question.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $question_id
-      * @param int $user_id
-      *
-      * @return string $feedback or bool if false
-      */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+	 /**
+	  * Get the user's answer feedback for a specific question.
+	  *
+	  * This function gives you a single answer note/feedback string
+	  * for the user on the given question.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $question_id
+	  * @param int $user_id
+	  *
+	  * @return string $feedback or bool if false
+	  */
+	 public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
 
-         $feedback = false;
+		 $feedback = false;
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-             return false;
-         }
+			 return false;
+		 }
 
-         // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+		 // get all the feedback for the user on the given lesson
+		 $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
 
-         if( !$all_feedback || empty( $all_feedback )
-             || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
+		 if( !$all_feedback || empty( $all_feedback )
+			 || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
 
-             //fallback to data pre 1.7.4
+			 //fallback to data pre 1.7.4
 
-             // setup the sensei data query
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 // setup the sensei data query
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
 
-             // set the default to false and return that if no old data is available.
-             if( isset( $question_activity->comment_ID ) ){
-                 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
-             }
+			 // set the default to false and return that if no old data is available.
+			 if( isset( $question_activity->comment_ID ) ){
+				 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
+			 }
 
-             // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
-             }
+			 // finally use the default question feedback
+			 if( empty( $feedback ) ){
+				 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+			 }
 
-             return $feedback;
+			 return $feedback;
 
-         }
+		 }
 
-         return $all_feedback[ $question_id ];
+		 return $all_feedback[ $question_id ];
 
-     } // end get_user_question_feedback
+	 } // end get_user_question_feedback
 
-     /**
-      * Check if a quiz has no questions, and redirect back to lesson.
-      *
-      * Though a quiz is created for each lesson, it should not be visible
-      * unless it has questions.
-      *
-      * @since 1.9.0
-      * @access public
-      * @param none
-      * @return void
-      */
+	 /**
+	  * Check if a quiz has no questions, and redirect back to lesson.
+	  *
+	  * Though a quiz is created for each lesson, it should not be visible
+	  * unless it has questions.
+	  *
+	  * @since 1.9.0
+	  * @access public
+	  * @param none
+	  * @return void
+	  */
 
-     public function quiz_has_no_questions() {
+	 public function quiz_has_no_questions() {
 
-         if( ! is_singular( 'quiz' ) )  {
-             return;
-         }
+		 if( ! is_singular( 'quiz' ) )  {
+			 return;
+		 }
 
-         global $post;
+		 global $post;
 
-         $lesson_id = $this->get_lesson_id($post->ID);
+		 $lesson_id = $this->get_lesson_id($post->ID);
 
-         $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+		 $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
 
-         $lesson = get_post($lesson_id);
+		 $lesson = get_post($lesson_id);
 
-         if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
+		 if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
 
-             wp_redirect(get_permalink($lesson->ID), 301);
-             exit;
+			 wp_redirect(get_permalink($lesson->ID), 301);
+			 exit;
 
-         }
+		 }
 
-     } // end quiz_has_no_questions
+	 } // end quiz_has_no_questions
 
 /**
-  * Deprecate the sensei_single_main_content on the single-quiz template.
-  *
-  * @deprecated since 1.9.0
-  */
+ * Deprecate the sensei_single_main_content on the single-quiz template.
+ *
+ * @deprecated since 1.9.0
+ */
  public static function deprecate_quiz_sensei_single_main_content_hook(){
 
-     sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
+	 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
  }
-    /*
+	/*
      * Deprecate the sensei_quiz_single_title on the single-quiz template.
      *
      * @deprecated since 1.9.0
      */
-     public static function deprecate_quiz_sensei_quiz_single_title_hook(){
+	 public static function deprecate_quiz_sensei_quiz_single_title_hook(){
 
-         sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
+		 sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
-     }
+	 }
 
-     /**
-      * Filter the single title and add the Quiz to it.
-      *
-      * @param string $title
-      * @param int $id title post id
-      * @return string $quiz_title
-      */
-     public static function single_quiz_title( $title, $post_id ){
+	 /**
+	  * Filter the single title and add the Quiz to it.
+	  *
+	  * @param string $title
+	  * @param int $id title post id
+	  * @return string $quiz_title
+	  */
+	 public static function single_quiz_title( $title, $post_id ){
 
-         if( 'quiz' == get_post_type( $post_id ) ){
+		 if( 'quiz' == get_post_type( $post_id ) ){
 
-             $title_with_no_quizzes = $title;
+			 $title_with_no_quizzes = $title;
 
-             // if the title has quiz, remove it: legacy titles have the word quiz stored.
-             if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
+			 // if the title has quiz, remove it: legacy titles have the word quiz stored.
+			 if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
 
-                 // remove all possible appearances of quiz
-                 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
-                 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
-                 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
+				 // remove all possible appearances of quiz
+				 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
+				 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
+				 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
 
-             }
+			 }
 
-             $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
-         }
+			 $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
+		 }
 
-         /**
-          * hook document in class-woothemes-sensei-message.php
-          */
-         return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
+		 /**
+		  * hook document in class-woothemes-sensei-message.php
+		  */
+		 return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
 
-     }
+	 }
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function start_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function start_quiz_questions_loop(){
 
-         global $sensei_question_loop;
+		 global $sensei_question_loop;
 
-         //intialize the questions loop object
-         $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
+		 //intialize the questions loop object
+		 $sensei_question_loop['current'] = -1;
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
 
 
-         $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
+		 $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
 
-         if( count( $questions  ) > 0  ){
+		 if( count( $questions  ) > 0  ){
 
-             $sensei_question_loop['total']   =  count( $questions );
-             $sensei_question_loop['questions'] = $questions;
-             $sensei_question_loop['quiz_id'] = get_the_ID();
+			 $sensei_question_loop['total']   =  count( $questions );
+			 $sensei_question_loop['questions'] = $questions;
+			 $sensei_question_loop['quiz_id'] = get_the_ID();
 
-         }
+		 }
 
-     }// static function
+	 }// static function
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function stop_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function stop_quiz_questions_loop(){
 
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
-         $sensei_question_loop['quiz_id'] = '';
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
+		 $sensei_question_loop['quiz_id'] = '';
 
-     }
+	 }
 
-     /**
-      * Output the title for the single quiz page
-      *
-      * @since 1.9.0
-      */
-     public static function the_title(){
-         ?>
+	 /**
+	  * Output the title for the single quiz page
+	  *
+	  * @since 1.9.0
+	  */
+	 public static function the_title(){
+		 ?>
          <header>
 
              <h1>
 
                  <?php
-                 /**
-                  * Filter documented in class-sensei-messages.php the_title
-                  */
-                 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
-                 ?>
+				 /**
+				  * Filter documented in class-sensei-messages.php the_title
+				  */
+				 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
+				 ?>
 
              </h1>
 
          </header>
 
          <?php
-     }//the_title
+	 }//the_title
 
-     /**
-      * Output the sensei quiz status message.
-      *
-      * @param $quiz_id
-      */
-    public static function  the_user_status_message( $quiz_id ){
+	 /**
+	  * Output the sensei quiz status message.
+	  *
+	  * @param $quiz_id
+	  */
+	public static function  the_user_status_message( $quiz_id ){
 
-        $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
-        echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+		$lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
+		echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
 
-    }
+	}
 
-     /**
-      * This functions runs the old sensei_quiz_action_buttons action
-      * for backwards compatiblity sake.
-      *
-      * @since 1.9.0
-      * @deprecated
-      */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+	 /**
+	  * This functions runs the old sensei_quiz_action_buttons action
+	  * for backwards compatiblity sake.
+	  *
+	  * @since 1.9.0
+	  * @deprecated
+	  */
+	 public static function deprecate_sensei_quiz_action_buttons_hook(){
 
-         sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
+		 sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
 
-     }
+	 }
 
-     /**
-      * The quiz action buttons needed to ouput quiz
-      * action such as reset complete and save.
-      *
-      * @since 1.3.0
-      */
-     public static function action_buttons() {
+	 /**
+	  * The quiz action buttons needed to ouput quiz
+	  * action such as reset complete and save.
+	  *
+	  * @since 1.3.0
+	  */
+	 public static function action_buttons() {
 
-         global $post, $current_user;
+		 global $post, $current_user;
 
-         $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
-         $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-         $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
-         $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+		 $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
+		 $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
+		 $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+		 $show_actions = true;
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
 
-         //setup quiz grade
-         $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
+		 //setup quiz grade
+		 $user_quiz_grade = '';
+		 if( ! empty( $user_lesson_status  ) ){
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
 
 
-         if( intval( $lesson_prerequisite ) > 0 ) {
+		 if( intval( $lesson_prerequisite ) > 0 ) {
 
-             // If the user hasn't completed the prereq then hide the current actions
-             $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
+			 // If the user hasn't completed the prereq then hide the current actions
+			 $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
 
-         }
-         if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+		 }
+		 if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
 
-             // Get Reset Settings
-             $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
+			 // Get Reset Settings
+			 $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
 
              <!-- Action Nonce's -->
              <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce"
@@ -1273,55 +1273,55 @@ 
 
          <?php }
 
-     } // End sensei_quiz_action_buttons()
-
-     /**
-      * Fetch the quiz grade
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return double $user_quiz_grade
-      */
-     public static function get_user_quiz_grade( $lesson_id, $user_id ){
-
-         // get the quiz grade
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $user_quiz_grade = 0;
-         if( isset( $user_lesson_status->comment_ID ) ) {
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
-
-         return (double) $user_quiz_grade;
-
-     }
-
-     /**
-      * Check the quiz reset property for a given lesson's quiz.
-      *
-      * The data is stored on the quiz but going forward the quiz post
-      * type will be retired, hence the lesson_id is a require parameter.
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @return bool
-      */
-     public static function is_reset_allowed( $lesson_id ){
-
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-         //backwards compatibility
-         if( 'on' == $reset_allowed ) {
-             $reset_allowed = 1;
-         }
-
-         return (bool) $reset_allowed;
-
-     }
+	 } // End sensei_quiz_action_buttons()
+
+	 /**
+	  * Fetch the quiz grade
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return double $user_quiz_grade
+	  */
+	 public static function get_user_quiz_grade( $lesson_id, $user_id ){
+
+		 // get the quiz grade
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $user_quiz_grade = 0;
+		 if( isset( $user_lesson_status->comment_ID ) ) {
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
+
+		 return (double) $user_quiz_grade;
+
+	 }
+
+	 /**
+	  * Check the quiz reset property for a given lesson's quiz.
+	  *
+	  * The data is stored on the quiz but going forward the quiz post
+	  * type will be retired, hence the lesson_id is a require parameter.
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @return bool
+	  */
+	 public static function is_reset_allowed( $lesson_id ){
+
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+
+		 $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		 //backwards compatibility
+		 if( 'on' == $reset_allowed ) {
+			 $reset_allowed = 1;
+		 }
+
+		 return (bool) $reset_allowed;
+
+	 }
 
  } // End Class WooThemes_Sensei_Quiz
 

includes/class-sensei-lesson.php

Indentation +1078 added lines, -1078 removed lines

@@ -21,12 +21,12 @@ 
 	 */
 	public function __construct () {
 
-        $this->token = 'lesson';
+		$this->token = 'lesson';
 
 		// Setup meta fields for this post type
 		$this->meta_fields = array( 'lesson_prerequisite', 'lesson_course', 'lesson_preview', 'lesson_length', 'lesson_complexity', 'lesson_video_embed' );
 
-        $this->question_order = '';
+		$this->question_order = '';
 
 		// Admin actions
 		if ( is_admin() ) {
@@ -84,18 +84,18 @@ 
 			add_action( 'wp_ajax_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) );
 			add_action( 'wp_ajax_nopriv_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) );
 
-            // output bulk edit fields
-            add_action( 'bulk_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
-            add_action( 'quick_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
+			// output bulk edit fields
+			add_action( 'bulk_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
+			add_action( 'quick_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
 
-            // load quick edit default values
-            add_action('manage_lesson_posts_custom_column', array( $this, 'set_quick_edit_admin_defaults'), 11, 2);
+			// load quick edit default values
+			add_action('manage_lesson_posts_custom_column', array( $this, 'set_quick_edit_admin_defaults'), 11, 2);
 
-            // save bulk edit fields
-            add_action( 'wp_ajax_save_bulk_edit_book', array( $this, 'save_all_lessons_edit_fields' ) );
+			// save bulk edit fields
+			add_action( 'wp_ajax_save_bulk_edit_book', array( $this, 'save_all_lessons_edit_fields' ) );
 
-            // flush rewrite rules when saving a lesson
-            add_action('save_post', array( __CLASS__, 'flush_rewrite_rules' ) );
+			// flush rewrite rules when saving a lesson
+			add_action('save_post', array( __CLASS__, 'flush_rewrite_rules' ) );
 
 		} else {
 			// Frontend actions
@@ -189,8 +189,8 @@ 
 		$post_args = array(	'post_type' 		=> 'lesson',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'ASC',
-    						'exclude' 			=> $post->ID,
+							'order'           	=> 'ASC',
+							'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
 		$posts_array = get_posts( $post_args );
@@ -226,7 +226,7 @@ 
 
 		$checked = '';
 		if ( isset( $lesson_preview ) && ( '' != $lesson_preview ) ) {
-	 	    $checked = checked( 'preview', $lesson_preview, false );
+	 		$checked = checked( 'preview', $lesson_preview, false );
 	 	} // End If Statement
 
 	 	$html .= '<label for="lesson_preview">';
@@ -275,7 +275,7 @@ 
 
 
 	/**
-     * Update the lesson quiz and all the post meta
+	 * Update the lesson quiz and all the post meta
 	 *
 	 * @access public
 	 * @return integer|boolean $post_id or false
@@ -296,7 +296,7 @@ 
 		}
 
 		// Temporarily disable the filter
-        remove_action( 'save_post', array( $this, 'quiz_update' ) );
+		remove_action( 'save_post', array( $this, 'quiz_update' ) );
 		// Save the Quiz
 		$quiz_id = $this->lesson_quizzes( $post_id, 'any');
 
@@ -311,11 +311,11 @@ 
 
 		// Setup Query Arguments
 		$post_type_args = array(	'post_content' => $post_content,
-  		    						'post_status' => $post_status,
-  		    						'post_title' => $post_title,
-  		    						'post_type' => 'quiz',
-                                    'post_parent' => $post_id,
-  		    						);
+  									'post_status' => $post_status,
+  									'post_title' => $post_title,
+  									'post_type' => 'quiz',
+									'post_parent' => $post_id,
+  									);
 
 		$settings = $this->get_quiz_settings();
 
@@ -323,48 +323,48 @@ 
 		if ( 0 < $quiz_id ) {
 			// Update the Quiz
 			$post_type_args[ 'ID' ] = $quiz_id;
-		    wp_update_post($post_type_args);
-
-		    // Update the post meta data
-		    update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
-
-		    foreach( $settings as $field ) {
-		    	if( 'random_question_order' != $field['id'] ) {
-			    	$value = $this->get_submitted_setting_value( $field );
-			    	if( isset( $value ) ) {
-			    		update_post_meta( $quiz_id, '_' . $field['id'], $value );
-			    	}
-			    }
-		    }
-
-		    // Set the post terms for quiz-type
-		    wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
+			wp_update_post($post_type_args);
+
+			// Update the post meta data
+			update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
+
+			foreach( $settings as $field ) {
+				if( 'random_question_order' != $field['id'] ) {
+					$value = $this->get_submitted_setting_value( $field );
+					if( isset( $value ) ) {
+						update_post_meta( $quiz_id, '_' . $field['id'], $value );
+					}
+				}
+			}
+
+			// Set the post terms for quiz-type
+			wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
 		} else {
 			// Create the Quiz
-		    $quiz_id = wp_insert_post($post_type_args);
-
-		    // Add the post meta data WP will add it if it doesn't exist
-            update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
-
-		    foreach( $settings as $field ) {
-		    	if( 'random_question_order' != $field['id'] ) {
-
-                    //ignore values not posted to avoid
-                    // overwriting with empty or default values
-                    // when the values are posted from bulk edit or quick edit
-                    if( !isset( $_POST[ $field['id'] ] ) ){
-                        continue;
-                    }
-
-			    	$value = $this->get_submitted_setting_value( $field );
-			    	if( isset( $value ) ) {
-			    		add_post_meta( $quiz_id, '_' . $field['id'], $value );
-			    	}
-			    }
-		    }
-
-		    // Set the post terms for quiz-type
-		    wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
+			$quiz_id = wp_insert_post($post_type_args);
+
+			// Add the post meta data WP will add it if it doesn't exist
+			update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
+
+			foreach( $settings as $field ) {
+				if( 'random_question_order' != $field['id'] ) {
+
+					//ignore values not posted to avoid
+					// overwriting with empty or default values
+					// when the values are posted from bulk edit or quick edit
+					if( !isset( $_POST[ $field['id'] ] ) ){
+						continue;
+					}
+
+					$value = $this->get_submitted_setting_value( $field );
+					if( isset( $value ) ) {
+						add_post_meta( $quiz_id, '_' . $field['id'], $value );
+					}
+				}
+			}
+
+			// Set the post terms for quiz-type
+			wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
 		} // End If Statement
 
 		// Add default lesson order meta value
@@ -386,7 +386,7 @@ 
 		}
 
 		// Restore the previously disabled filter
-        add_action( 'save_post', array( $this, 'quiz_update' ) );
+		add_action( 'save_post', array( $this, 'quiz_update' ) );
 
 	} // End post_updated()
 
@@ -426,22 +426,22 @@ 
 		// Get the meta key.
 		$meta_key = '_' . $post_key;
 
-        //ignore fields are not posted
+		//ignore fields are not posted
 
-        if( !isset( $_POST[ $post_key ] ) ){
+		if( !isset( $_POST[ $post_key ] ) ){
 
-            // except for lesson preview checkbox field
-            if( 'lesson_preview' == $post_key ){
+			// except for lesson preview checkbox field
+			if( 'lesson_preview' == $post_key ){
 
-                $_POST[ $post_key ] = '';
+				$_POST[ $post_key ] = '';
 
-            } else {
+			} else {
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
 		// Get the posted data and sanitize it for use as an HTML class.
 		if ( 'lesson_video_embed' == $post_key) {
@@ -450,10 +450,10 @@ 
 			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
 		} // End If Statement
 
-        // update field with the new value
-        if( -1 != $new_meta_value  ){
-            return update_post_meta( $post_id, $meta_key, $new_meta_value );
-        }
+		// update field with the new value
+		if( -1 != $new_meta_value  ){
+			return update_post_meta( $post_id, $meta_key, $new_meta_value );
+		}
 
 	} // End save_post_meta()
 
@@ -478,9 +478,9 @@ 
 		$post_args = array(	'post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'ASC',
-    						'post_status'      	=> 'any',
-    						'suppress_filters' 	=> 0,
+							'order'           	=> 'ASC',
+							'post_status'      	=> 'any',
+							'suppress_filters' 	=> 0,
 							);
 		$posts_array = get_posts( $post_args );
 		// Buid the HTML to Output
@@ -488,20 +488,20 @@ 
 		// Nonce
 		$html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false  );
 
-        // Select the course for the lesson
-        $drop_down_args = array(
-            'name'=>'lesson_course',
-            'id' => 'lesson-course-options'
-        );
+		// Select the course for the lesson
+		$drop_down_args = array(
+			'name'=>'lesson_course',
+			'id' => 'lesson-course-options'
+		);
 
-        $courses = WooThemes_Sensei_Course::get_all_courses();
-        $courses_options = array();
-        foreach( $courses as $course ){
-            $courses_options[ $course->ID ] = get_the_title( $course ) ;
-        }
-        $html .= Sensei_Utils::generate_drop_down( $selected_lesson_course, $courses_options, $drop_down_args );
+		$courses = WooThemes_Sensei_Course::get_all_courses();
+		$courses_options = array();
+		foreach( $courses as $course ){
+			$courses_options[ $course->ID ] = get_the_title( $course ) ;
+		}
+		$html .= Sensei_Utils::generate_drop_down( $selected_lesson_course, $courses_options, $drop_down_args );
 
-        // Course Actions Panel
+		// Course Actions Panel
 		if ( current_user_can( 'publish_courses' )) {
 				$html .= '<div id="lesson-course-actions">';
 					$html .= '<p>';
@@ -527,16 +527,16 @@ 
 							} // End For Loop
 						$html .= '</select>' . "\n";
 						// Course Product
-                        if ( Sensei_WC::is_woocommerce_active() ) {
+						if ( Sensei_WC::is_woocommerce_active() ) {
 	  						// Get the Products
 							$select_course_woocommerce_product = get_post_meta( $post_item->ID, '_course_woocommerce_product', true );
 
 							$product_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
 													'posts_per_page' 		=> -1,
 													'orderby'         	=> 'title',
-	    											'order'           	=> 'DESC',
-	    											'post_status'		=> array( 'publish', 'private', 'draft' ),
-	    											'tax_query'			=> array(
+													'order'           	=> 'DESC',
+													'post_status'		=> array( 'publish', 'private', 'draft' ),
+													'tax_query'			=> array(
 														array(
 															'taxonomy'	=> 'product_type',
 															'field'		=> 'slug',
@@ -544,7 +544,7 @@ 
 															'operator'	=> 'NOT IN'
 														)
 													),
-	    											'suppress_filters' 	=> 0
+													'suppress_filters' 	=> 0
 													);
 							$products_array = get_posts( $product_args );
 							$html .= '<label>' . __( 'WooCommerce Product' , 'woothemes-sensei' ) . '</label> ';
@@ -872,58 +872,58 @@ 
 					$html .= '<tr class="question-quick-edit ' . esc_attr( $edit_class ) . '">';
 						$html .= '<td colspan="5">';
 							$html .= '<span class="hidden question_original_counter">' . $question_counter . '</span>';
-					    	$html .= '<div class="question_required_fields">';
-
-						    	// Question title
-						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '">' . __( 'Question:', 'woothemes-sensei' ) . '</label> ';
-							    	$html .= '<input type="text" id="question_' . $question_counter . '" name="question" value="' . esc_attr( htmlspecialchars( $question->post_title ) ) . '" size="25" class="widefat" />';
-						    	$html .= '</div>';
-
-						    	// Question description
-						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> ';
-						    	$html .= '</div>';
-							    	$html .= '<textarea id="question_' . $question_counter . '_desc" name="question_description" class="widefat" rows="4">' . esc_textarea( $question->post_content ) . '</textarea>';
-
-						    	// Question grade
-						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_grade">' . __( 'Question grade:', 'woothemes-sensei' ) . '</label> ';
-							    	$html .= '<input type="number" id="question_' . $question_counter . '_grade" class="question_grade small-text" name="question_grade" min="0" value="' . $question_grade . '" />';
-						    	$html .= '</div>';
-
-						    	// Random order
-						    	if( $question_type == 'multiple-choice' ) {
-						    		$html .= '<div>';
-						    			$html .= '<label for="' . $question_counter . '_random_order"><input type="checkbox" name="random_order" class="random_order" id="' . $question_counter . '_random_order" value="yes" ' . checked( $random_order, 'yes', false ) . ' /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
-						    		$html .= '</div>';
-						    	}
-
-						    	// Question media
-						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
-							    	$html .= '<button id="question_' . $question_counter . '_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . $question_media_add_button . '</button>';
-							    	$html .= '<button id="question_' . $question_counter . '_media_button_delete" class="delete_media_file_button button-secondary ' . $question_media_delete_class . '">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
-							    	$html .= '<span id="question_' . $question_counter . '_media_link" class="question_media_link ' . $question_media_link_class . '">' . $question_media_link . '</span>';
-							    	$html .= '<br/><img id="question_' . $question_counter . '_media_preview" class="question_media_preview ' . $question_media_thumb_class . '" src="' . $question_media_thumb . '" /><br/>';
-							    	$html .= '<input type="hidden" id="question_' . $question_counter . '_media" class="question_media" name="question_media" value="' . $question_media . '" />';
-						    	$html .= '</div>';
-
-						    $html .= '</div>';
-
-						    $html .= $this->quiz_panel_question_field( $question_type, $question_id, $question_counter );
-
-						    $html .= '<input type="hidden" id="question_' . $question_counter . '_question_type" class="question_type" name="question_type" value="' . $question_type . '" />';
+							$html .= '<div class="question_required_fields">';
+
+								// Question title
+								$html .= '<div>';
+									$html .= '<label for="question_' . $question_counter . '">' . __( 'Question:', 'woothemes-sensei' ) . '</label> ';
+									$html .= '<input type="text" id="question_' . $question_counter . '" name="question" value="' . esc_attr( htmlspecialchars( $question->post_title ) ) . '" size="25" class="widefat" />';
+								$html .= '</div>';
+
+								// Question description
+								$html .= '<div>';
+									$html .= '<label for="question_' . $question_counter . '_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> ';
+								$html .= '</div>';
+									$html .= '<textarea id="question_' . $question_counter . '_desc" name="question_description" class="widefat" rows="4">' . esc_textarea( $question->post_content ) . '</textarea>';
+
+								// Question grade
+								$html .= '<div>';
+									$html .= '<label for="question_' . $question_counter . '_grade">' . __( 'Question grade:', 'woothemes-sensei' ) . '</label> ';
+									$html .= '<input type="number" id="question_' . $question_counter . '_grade" class="question_grade small-text" name="question_grade" min="0" value="' . $question_grade . '" />';
+								$html .= '</div>';
+
+								// Random order
+								if( $question_type == 'multiple-choice' ) {
+									$html .= '<div>';
+										$html .= '<label for="' . $question_counter . '_random_order"><input type="checkbox" name="random_order" class="random_order" id="' . $question_counter . '_random_order" value="yes" ' . checked( $random_order, 'yes', false ) . ' /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
+									$html .= '</div>';
+								}
+
+								// Question media
+								$html .= '<div>';
+									$html .= '<label for="question_' . $question_counter . '_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
+									$html .= '<button id="question_' . $question_counter . '_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . $question_media_add_button . '</button>';
+									$html .= '<button id="question_' . $question_counter . '_media_button_delete" class="delete_media_file_button button-secondary ' . $question_media_delete_class . '">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
+									$html .= '<span id="question_' . $question_counter . '_media_link" class="question_media_link ' . $question_media_link_class . '">' . $question_media_link . '</span>';
+									$html .= '<br/><img id="question_' . $question_counter . '_media_preview" class="question_media_preview ' . $question_media_thumb_class . '" src="' . $question_media_thumb . '" /><br/>';
+									$html .= '<input type="hidden" id="question_' . $question_counter . '_media" class="question_media" name="question_media" value="' . $question_media . '" />';
+								$html .= '</div>';
+
+							$html .= '</div>';
+
+							$html .= $this->quiz_panel_question_field( $question_type, $question_id, $question_counter );
+
+							$html .= '<input type="hidden" id="question_' . $question_counter . '_question_type" class="question_type" name="question_type" value="' . $question_type . '" />';
 							$html .= '<input type="hidden" name="question_id" class="row_question_id" id="question_' . $question_counter . '_id" value="' . $question_id . '" />';
 
 							if( 'quiz' == $context ) {
-					    		$html .= '<div class="update-question">';
-						    		$html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="' . esc_attr( __( 'Cancel', 'woothemes-sensei' ) ) . '">' . __( 'Cancel', 'woothemes-sensei' ) . '</a> ';
-						    		$html .= '<a title="' . esc_attr( __( 'Update Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_save button button-highlighted">' . esc_html( __( 'Update', 'woothemes-sensei' ) ) . '</a>';
-					    		$html .= '</div>';
-					    	}
+								$html .= '<div class="update-question">';
+									$html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="' . esc_attr( __( 'Cancel', 'woothemes-sensei' ) ) . '">' . __( 'Cancel', 'woothemes-sensei' ) . '</a> ';
+									$html .= '<a title="' . esc_attr( __( 'Update Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_save button button-highlighted">' . esc_html( __( 'Update', 'woothemes-sensei' ) ) . '</a>';
+								$html .= '</div>';
+							}
 
-			    		$html .= '</td>';
+						$html .= '</td>';
 					$html .= '</tr>';
 				}
 
@@ -944,20 +944,20 @@ 
 			$question_cats = get_terms( 'question-category', array( 'hide_empty' => false ) );
 
 			if( 'quiz' == $context ) {
-	    		$html .= '<h2 class="nav-tab-wrapper add-question-tabs">';
-	    			$html .= '<a id="tab-new" class="nav-tab nav-tab-active">' . __( 'New Question'  , 'woothemes-sensei' ) . '</a>';
-	    			$html .= '<a id="tab-existing" class="nav-tab">' . __( 'Existing Questions'  , 'woothemes-sensei' ) . '</a>';
-                    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats )  && ! Sensei()->teacher->is_admin_teacher() ) {
-	    				$html .= '<a id="tab-multiple" class="nav-tab">' . __( 'Category Questions'  , 'woothemes-sensei' ) . '</a>';
-	    			}
-	    		$html .= '</h2>';
-	    	}
+				$html .= '<h2 class="nav-tab-wrapper add-question-tabs">';
+					$html .= '<a id="tab-new" class="nav-tab nav-tab-active">' . __( 'New Question'  , 'woothemes-sensei' ) . '</a>';
+					$html .= '<a id="tab-existing" class="nav-tab">' . __( 'Existing Questions'  , 'woothemes-sensei' ) . '</a>';
+					if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats )  && ! Sensei()->teacher->is_admin_teacher() ) {
+						$html .= '<a id="tab-multiple" class="nav-tab">' . __( 'Category Questions'  , 'woothemes-sensei' ) . '</a>';
+					}
+				$html .= '</h2>';
+			}
 
-	    	$html .= '<div class="tab-content" id="tab-new-content">';
+			$html .= '<div class="tab-content" id="tab-new-content">';
 
-	    		if( 'quiz' == $context ) {
-	    			$html .= '<p><em>' . sprintf( __( 'Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
-	    		}
+				if( 'quiz' == $context ) {
+					$html .= '<p><em>' . sprintf( __( 'Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
+				}
 
 				$html .= '<div class="question">';
 					$html .= '<div class="question_required_fields">';
@@ -999,18 +999,18 @@ 
 
 						// Random order
 						$html .= '<p class="add_question_random_order">';
-			    			$html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
-			    		$html .= '</p>';
+							$html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
+						$html .= '</p>';
 
-			    		// Question media
+						// Question media
 						$html .= '<p>';
-					    	$html .= '<label for="question_add_new_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
-					    	$html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . __( 'Add file', 'woothemes-sensei' ) . '</button>';
-					    	$html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
-					    	$html .= '<span id="question_add_new_media_link" class="question_media_link hidden"></span>';
-					    	$html .= '<br/><img id="question_add_new_media_preview" class="question_media_preview hidden" src="" /><br/>';
-					    	$html .= '<input type="hidden" id="question_add_new_media" class="question_media" name="question_media" value="" />';
-				    	$html .= '</p>';
+							$html .= '<label for="question_add_new_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
+							$html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . __( 'Add file', 'woothemes-sensei' ) . '</button>';
+							$html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
+							$html .= '<span id="question_add_new_media_link" class="question_media_link hidden"></span>';
+							$html .= '<br/><img id="question_add_new_media_preview" class="question_media_preview hidden" src="" /><br/>';
+							$html .= '<input type="hidden" id="question_add_new_media" class="question_media" name="question_media" value="" />';
+						$html .= '</p>';
 
 					$html .= '</div>';
 				$html .= '</div>';
@@ -1021,19 +1021,19 @@ 
 
 				if( 'quiz' == $context ) {
 					$html .= '<div class="add-question">';
-			    		$html .= '<a title="' . esc_attr( __( 'Add Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">' . esc_html( __( 'Add Question', 'woothemes-sensei' ) ) . '</a>';
-		    		$html .= '</div>';
-		    	}
+						$html .= '<a title="' . esc_attr( __( 'Add Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">' . esc_html( __( 'Add Question', 'woothemes-sensei' ) ) . '</a>';
+					$html .= '</div>';
+				}
 
-		    $html .= '</div>';
+			$html .= '</div>';
 
-		    if( 'quiz' == $context ) {
+			if( 'quiz' == $context ) {
 
-			    $html .= '<div class="tab-content hidden" id="tab-existing-content">';
+				$html .= '<div class="tab-content hidden" id="tab-existing-content">';
 
-			    	$html .= '<p><em>' . sprintf( __( 'Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
+					$html .= '<p><em>' . sprintf( __( 'Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
 
-			    	$html .= '<div id="existing-filters" class="alignleft actions">
+					$html .= '<div id="existing-filters" class="alignleft actions">
 			    				<select id="existing-status">
 			    					<option value="all">' . __( 'All', 'woothemes-sensei' ) . '</option>
 			    					<option value="unused">' . __( 'Unused', 'woothemes-sensei' ) . '</option>
@@ -1041,23 +1041,23 @@ 
 			    				</select>
 			    				<select id="existing-type">
 			    					<option value="">' . __( 'All Types', 'woothemes-sensei' ) . '</option>';
-							    	foreach ( $question_types as $type => $label ) {
+									foreach ( $question_types as $type => $label ) {
 										$html .= '<option value="' . esc_attr( $type ) . '">' . esc_html( $label ) . '</option>';
 									}
-    				$html .= '</select>
+					$html .= '</select>
     							<select id="existing-category">
 			    					<option value="">' . __( 'All Categories', 'woothemes-sensei' ) . '</option>';
-				    				foreach( $question_cats as $cat ) {
+									foreach( $question_cats as $cat ) {
 										$html .= '<option value="' . esc_attr( $cat->slug ) . '">' . esc_html( $cat->name ) . '</option>';
 									}
-    				$html .= '</select>
+					$html .= '</select>
     							<input type="text" id="existing-search" placeholder="' . __( 'Search', 'woothemes-sensei' ) . '" />
     							<a class="button" id="existing-filter-button">' . __( 'Filter', 'woothemes-sensei' ) . '</a>
 			    			</div>';
 
-			    	$html .= '<table id="existing-table" class="widefat">';
+					$html .= '<table id="existing-table" class="widefat">';
 
-			    		$html .= '<thead>
+						$html .= '<thead>
 									    <tr>
 									        <th scope="col" class="column-cb check-column"><input type="checkbox" /></th>
 									        <th scope="col">' . __( 'Question', 'woothemes-sensei' ) . '</th>
@@ -1085,28 +1085,28 @@ 
 
 						$html .= '</tbody>';
 
-			    	$html .= '</table>';
+					$html .= '</table>';
 
-			    	$next_class = '';
-			    	if( $questions['count'] <= 10 ) {
-			    		$next_class = 'hidden';
-			    	}
+					$next_class = '';
+					if( $questions['count'] <= 10 ) {
+						$next_class = 'hidden';
+					}
 
-			    	$html .= '<div id="existing-pagination">';
-			    		$html .= '<input type="hidden" id="existing-page" value="1" />';
-			    		$html .= '<a class="prev no-paging">&larr; ' . __( 'Previous', 'woothemes-sensei') . '</a> <a class="next ' . esc_attr( $next_class ) . '">' . __( 'Next', 'woothemes-sensei') . ' &rarr;</a>';
-			    	$html .= '</div>';
+					$html .= '<div id="existing-pagination">';
+						$html .= '<input type="hidden" id="existing-page" value="1" />';
+						$html .= '<a class="prev no-paging">&larr; ' . __( 'Previous', 'woothemes-sensei') . '</a> <a class="next ' . esc_attr( $next_class ) . '">' . __( 'Next', 'woothemes-sensei') . ' &rarr;</a>';
+					$html .= '</div>';
 
-			    	$html .= '<div class="existing-actions">';
-			    		$html .= '<a title="' . esc_attr( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '" class="add_existing_save button button-primary button-highlighted">' . esc_html( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '</a></p>';
-			    	$html .= '</div>';
+					$html .= '<div class="existing-actions">';
+						$html .= '<a title="' . esc_attr( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '" class="add_existing_save button button-primary button-highlighted">' . esc_html( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '</a></p>';
+					$html .= '</div>';
 
-			    $html .= '</div>';
+				$html .= '</div>';
 
-			    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) {
-				    $html .= '<div class="tab-content hidden" id="tab-multiple-content">';
+				if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) {
+					$html .= '<div class="tab-content hidden" id="tab-multiple-content">';
 
-				    	$html .= '<p><em>' . sprintf( __( 'Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=question-category&post_type=question' ) . '">', '</a>' ) . '</em></p>';
+						$html .= '<p><em>' . sprintf( __( 'Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=question-category&post_type=question' ) . '">', '</a>' ) . '</em></p>';
 
 						$html .= '<p><select id="add-multiple-question-category-options" name="multiple_category" class="chosen_select widefat question-category-select">' . "\n";
 						$html .= '<option value="">' . __( 'Select a Question Category', 'woothemes-sensei' ) . '</option>' . "\n";
@@ -1119,7 +1119,7 @@ 
 
 						$html .= '<a title="' . esc_attr( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '" class="add_multiple_save button button-primary button-highlighted">' . esc_html( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '</a></p>';
 
-				    $html .= '</div>';
+					$html .= '</div>';
 				}
 			}
 
@@ -1192,14 +1192,14 @@ 
 
 		$qry = new WP_Query( $args );
 
-        /**
-         * Filter existing questions query
-         *
-         * @since 1.8.0
-         *
-         * @param WP_Query $wp_query
-         */
-        $qry = apply_filters( 'sensei_existing_questions_query_results', $qry );
+		/**
+		 * Filter existing questions query
+		 *
+		 * @since 1.8.0
+		 *
+		 * @param WP_Query $wp_query
+		 */
+		$qry = apply_filters( 'sensei_existing_questions_query_results', $qry );
 
 		$questions['questions'] = $qry->posts;
 		$questions['count'] = intval( $qry->found_posts );
@@ -1214,14 +1214,14 @@ 
 
 		if( ! $question_id ) {
 
-            return;
+			return;
 
-        }
+		}
 
 		$existing_class = '';
 		if( $row % 2 ) {
-            $existing_class = 'alternate';
-        }
+			$existing_class = 'alternate';
+		}
 
 		$question_type = Sensei()->question->get_question_type( $question_id );
 
@@ -1355,67 +1355,67 @@ 
 							}
 						}
 
-				    	// Calculate total wrong answers available (defaults to 4)
-				    	$total_wrong = 0;
-				    	if( $question_id ) {
-				    		$total_wrong = get_post_meta( $question_id, '_wrong_answer_count', true );
-				    	}
-				    	if( 0 == intval( $total_wrong ) ) {
-				    		$total_wrong = 1;
-				    	}
+						// Calculate total wrong answers available (defaults to 4)
+						$total_wrong = 0;
+						if( $question_id ) {
+							$total_wrong = get_post_meta( $question_id, '_wrong_answer_count', true );
+						}
+						if( 0 == intval( $total_wrong ) ) {
+							$total_wrong = 1;
+						}
 
-                        // Setup Wrong Answer HTML
-                        foreach ( $wrong_answers as $i => $answer ){
+						// Setup Wrong Answer HTML
+						foreach ( $wrong_answers as $i => $answer ){
 
-                            $answer_id = $this->get_answer_id( $answer );
-                            $wrong_answer = '<label class="answer" for="question_' . $question_counter . '_wrong_answer_' . $i . '"><span>' . __( 'Wrong:' , 'woothemes-sensei' ) ;
-                            $wrong_answer .= '</span> <input rel="' . esc_attr( $answer_id ) . '" type="text" id="question_' . $question_counter . '_wrong_answer_' . $i ;
-                            $wrong_answer .= '" name="question_wrong_answers[]" value="' . esc_attr( $answer ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
-                            if( $question_id ) {
+							$answer_id = $this->get_answer_id( $answer );
+							$wrong_answer = '<label class="answer" for="question_' . $question_counter . '_wrong_answer_' . $i . '"><span>' . __( 'Wrong:' , 'woothemes-sensei' ) ;
+							$wrong_answer .= '</span> <input rel="' . esc_attr( $answer_id ) . '" type="text" id="question_' . $question_counter . '_wrong_answer_' . $i ;
+							$wrong_answer .= '" name="question_wrong_answers[]" value="' . esc_attr( $answer ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
+							if( $question_id ) {
 
-                                $answers[ $answer_id ] = $wrong_answer;
+								$answers[ $answer_id ] = $wrong_answer;
 
-                            } else {
+							} else {
 
-                                $answers[] = $wrong_answer;
+								$answers[] = $wrong_answer;
 
-                            }
+							}
 
-                        } // end for each
+						} // end for each
 
-				    	$answers_sorted = $answers;
-				    	if( $question_id && count( $answer_order ) > 0 ) {
-				    		$answers_sorted = array();
-				    		foreach( $answer_order as $answer_id ) {
-				    			if( isset( $answers[ $answer_id ] ) ) {
-				    				$answers_sorted[ $answer_id ] = $answers[ $answer_id ];
-				    				unset( $answers[ $answer_id ] );
-				    			}
-				    		}
+						$answers_sorted = $answers;
+						if( $question_id && count( $answer_order ) > 0 ) {
+							$answers_sorted = array();
+							foreach( $answer_order as $answer_id ) {
+								if( isset( $answers[ $answer_id ] ) ) {
+									$answers_sorted[ $answer_id ] = $answers[ $answer_id ];
+									unset( $answers[ $answer_id ] );
+								}
+							}
 
-				    		if( count( $answers ) > 0 ) {
-						    	foreach( $answers as $id => $answer ) {
-						    		$answers_sorted[ $id ] = $answer;
-						    	}
-						    }
-				    	}
+							if( count( $answers ) > 0 ) {
+								foreach( $answers as $id => $answer ) {
+									$answers_sorted[ $id ] = $answer;
+								}
+							}
+						}
 
 						foreach( $answers_sorted as $id => $answer ) {
-				    		$html .= $answer;
-				    	}
+							$html .= $answer;
+						}
 
-				    	$html .= '<input type="hidden" class="answer_order" name="answer_order" value="' . $answer_order_string . '" />';
-				    	$html .= '<span class="hidden right_answer_count">' . $total_right . '</span>';
-				    	$html .= '<span class="hidden wrong_answer_count">' . $total_wrong . '</span>';
+						$html .= '<input type="hidden" class="answer_order" name="answer_order" value="' . $answer_order_string . '" />';
+						$html .= '<span class="hidden right_answer_count">' . $total_right . '</span>';
+						$html .= '<span class="hidden wrong_answer_count">' . $total_wrong . '</span>';
 
-				    	$html .= '<div class="add_answer_options">';
-					    	$html .= '<a class="add_right_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add right answer', 'woothemes-sensei' ) . '</a>';
-					    	$html .= '<a class="add_wrong_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add wrong answer', 'woothemes-sensei' ) . '</a>';
-				    	$html .= '</div>';
+						$html .= '<div class="add_answer_options">';
+							$html .= '<a class="add_right_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add right answer', 'woothemes-sensei' ) . '</a>';
+							$html .= '<a class="add_wrong_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add wrong answer', 'woothemes-sensei' ) . '</a>';
+						$html .= '</div>';
 
-                        $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id , 'multiple-choice' );
+						$html .= $this->quiz_panel_question_feedback( $question_counter, $question_id , 'multiple-choice' );
 
-			    	$html .= '</div>';
+					$html .= '</div>';
 				break;
 				case 'boolean':
 					$html .= '<div class="question_boolean_fields ' . $question_class . '">';
@@ -1428,7 +1428,7 @@ 
 						$html .= '<label for="question_' . $question_id . '_boolean_true"><input id="question_' . $question_id . '_boolean_true" type="radio" name="' . $field_name . '" value="true" '. checked( $right_answer, 'true', false ) . ' /> ' . __( 'True', 'woothemes-sensei' ) . '</label>';
 						$html .= '<label for="question_' . $question_id . '_boolean_false"><input id="question_' . $question_id . '_boolean_false" type="radio" name="' . $field_name . '" value="false" '. checked( $right_answer, 'false', false ) . ' /> ' . __( 'False', 'woothemes-sensei' ) . '</label>';
 
-                    $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id, 'boolean' );
+					$html .= $this->quiz_panel_question_feedback( $question_counter, $question_id, 'boolean' );
 
 					$html .= '</div>';
 				break;
@@ -1503,17 +1503,17 @@ 
 
 	public function quiz_panel_question_feedback( $question_counter = 0, $question_id = 0, $question_type = '' ) {
 
-        // default field name
-        $field_name = 'answer_feedback';
-        if( 'boolean' == $question_type ){
+		// default field name
+		$field_name = 'answer_feedback';
+		if( 'boolean' == $question_type ){
 
-            $field_name = 'answer_feedback_boolean';
+			$field_name = 'answer_feedback_boolean';
 
-        }elseif( 'multiple-choice' == $question_type ){
+		}elseif( 'multiple-choice' == $question_type ){
 
-            $field_name = 'answer_feedback_multiple_choice';
+			$field_name = 'answer_feedback_multiple_choice';
 
-        }// end if
+		}// end if
 
 		if( $question_counter ) {
 			$field_name = 'answer_' . $question_counter . '_feedback';
@@ -1718,15 +1718,15 @@ 
 			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
 			// Load the lessons script
-            wp_enqueue_media();
+			wp_enqueue_media();
 			wp_enqueue_script( 'sensei-lesson-metadata', Sensei()->plugin_url . 'assets/js/lesson-metadata' . $suffix . '.js', array( 'jquery', 'sensei-core-select2' ,'jquery-ui-sortable' ), Sensei()->version, true );
 			wp_enqueue_script( 'sensei-lesson-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
 			wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-lesson-chosen' ), Sensei()->version, true );
 
-            // Load the bulk edit screen script
-            if( 'edit.php' == $hook && 'lesson'==$_GET['post_type'] ) {
-                wp_enqueue_script( 'sensei-lessons-bulk-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-bulk-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
-            }
+			// Load the bulk edit screen script
+			if( 'edit.php' == $hook && 'lesson'==$_GET['post_type'] ) {
+				wp_enqueue_script( 'sensei-lessons-bulk-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-bulk-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
+			}
 
 			// Localise script
 			$translation_strings = array( 'right_colon' => __( 'Right:', 'woothemes-sensei' ), 'wrong_colon' => __( 'Wrong:', 'woothemes-sensei' ), 'add_file' => __( 'Add file', 'woothemes-sensei' ), 'change_file' => __( 'Change file', 'woothemes-sensei' ), 'confirm_remove' => __( 'Are you sure you want to remove this question?', 'woothemes-sensei' ), 'confirm_remove_multiple' => __( 'Are you sure you want to remove these questions?', 'woothemes-sensei' ), 'too_many_for_cat' => __( 'You have selected more questions than this category contains - please reduce the number of questions that you are adding.', 'woothemes-sensei' ) );
@@ -1827,7 +1827,7 @@ 
 			$nonce = esc_html( $_POST['lesson_add_course_nonce'] );
 		} // End If Statement
 		if ( ! wp_verify_nonce( $nonce, 'lesson_add_course_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+			|| ! current_user_can( 'edit_lessons' ) ) {
 			die('');
 		} // End If Statement
 		// Parse POST data
@@ -1856,7 +1856,7 @@ 
 			$nonce = esc_html( $_POST['lesson_update_question_nonce'] );
 		} // End If Statement
 		if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_nonce' )
-            ||  ! current_user_can( 'edit_questions' )) {
+			||  ! current_user_can( 'edit_questions' )) {
 
 			die('');
 
@@ -1909,7 +1909,7 @@ 
 		} // End If Statement
 
 		if( ! wp_verify_nonce( $nonce, 'lesson_add_multiple_questions_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+			|| ! current_user_can( 'edit_lessons' ) ) {
 			die( $return );
 		} // End If Statement
 
@@ -1965,7 +1965,7 @@ 
 		} // End If Statement
 
 		if( ! wp_verify_nonce( $nonce, 'lesson_remove_multiple_questions_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		|| ! current_user_can( 'edit_lessons' ) ) {
 			die('');
 		} // End If Statement
 
@@ -2012,7 +2012,7 @@ 
 		} // End If Statement
 
 		if( ! wp_verify_nonce( $nonce, 'lesson_add_existing_questions_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		|| ! current_user_can( 'edit_lessons' ) ) {
 			die('');
 		} // End If Statement
 
@@ -2037,12 +2037,12 @@ 
 
 					$quizzes = get_post_meta( $question_id, '_quiz_id', false );
 					if( ! in_array( $quiz_id, $quizzes ) ) {
-			    		add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
+						add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
 						$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
 						update_post_meta( $lesson_id, '_quiz_has_questions', '1' );
-			    	}
+					}
 
-			    	add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
+					add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
 					$question_type = Sensei()->question->get_question_type( $question_id );
 
 					$return .= $this->quiz_panel_question( $question_type, $question_count, $question_id );
@@ -2064,7 +2064,7 @@ 
 		} // End If Statement
 
 		if ( ! wp_verify_nonce( $nonce, 'lesson_update_grade_type_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		|| ! current_user_can( 'edit_lessons' ) ) {
 
 			die('');
 
@@ -2084,8 +2084,8 @@ 
 			$nonce = esc_html( $_POST['lesson_update_question_order_nonce'] );
 		} // End If Statement
 
-        if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_nonce' )
-            ||! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_nonce' )
+			||! current_user_can( 'edit_lessons' ) ) {
 			die('');
 		} // End If Statement
 
@@ -2111,7 +2111,7 @@ 
 			$nonce = esc_html( $_POST['lesson_update_question_order_random_nonce'] );
 		} // End If Statement
 		if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_random_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+			|| ! current_user_can( 'edit_lessons' ) ) {
 
 			die('');
 
@@ -2161,34 +2161,34 @@ 
 		$post_content = $course_content;
 		// Course Query Arguments
 		$post_type_args = array(	'post_content' => $post_content,
-  		    						'post_status' => $post_status,
-  		    						'post_title' => $post_title,
-  		    						'post_type' => $post_type
-  		    						);
+  									'post_status' => $post_status,
+  									'post_title' => $post_title,
+  									'post_type' => $post_type
+  									);
   		// Only save if there is a valid title
   		if ( $post_title != '' ) {
-  		    // Check for prerequisite courses & product id
-  		    $course_prerequisite_id = absint( $data[ 'course_prerequisite' ] );
-  		    $course_woocommerce_product_id = absint( $data[ 'course_woocommerce_product' ] );
-  		    $course_category_id = absint( $data[ 'course_category' ] );
-  		    if ( 0 == $course_woocommerce_product_id ) { $course_woocommerce_product_id = '-'; }
-  		    // Insert or Update the Lesson Quiz
-		    if ( 0 < $course_id ) {
-		    	$post_type_args[ 'ID' ] = $course_id;
-		    	$course_id = wp_update_post($post_type_args);
-		    	update_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
-		    	update_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
-		    	if ( 0 < $course_category_id ) {
-		    		wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
-		    	} // End If Statement
-		    } else {
-		    	$course_id = wp_insert_post($post_type_args);
-		    	add_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
-		    	add_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
-		    	if ( 0 < $course_category_id ) {
-		    		wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
-		    	} // End If Statement
-		    } // End If Statement
+  			// Check for prerequisite courses & product id
+  			$course_prerequisite_id = absint( $data[ 'course_prerequisite' ] );
+  			$course_woocommerce_product_id = absint( $data[ 'course_woocommerce_product' ] );
+  			$course_category_id = absint( $data[ 'course_category' ] );
+  			if ( 0 == $course_woocommerce_product_id ) { $course_woocommerce_product_id = '-'; }
+  			// Insert or Update the Lesson Quiz
+			if ( 0 < $course_id ) {
+				$post_type_args[ 'ID' ] = $course_id;
+				$course_id = wp_update_post($post_type_args);
+				update_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
+				update_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
+				if ( 0 < $course_category_id ) {
+					wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
+				} // End If Statement
+			} else {
+				$course_id = wp_insert_post($post_type_args);
+				add_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
+				add_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
+				if ( 0 < $course_category_id ) {
+					wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
+				} // End If Statement
+			} // End If Statement
 		} // End If Statement
   		// Check that the insert or update saved by testing the post id
   		if ( 0 < $course_id ) {
@@ -2279,17 +2279,17 @@ 
 		$answer_feedback = '';
 		if ( isset( $data[ 'answer_feedback_boolean' ] ) && !empty( $data[ 'answer_feedback_boolean' ] ) ) {
 
-            $answer_feedback = $data[ 'answer_feedback_boolean' ];
+			$answer_feedback = $data[ 'answer_feedback_boolean' ];
 
 		}elseif( isset( $data[ 'answer_feedback_multiple_choice' ] ) && !empty( $data[ 'answer_feedback_multiple_choice' ] ) ){
 
-            $answer_feedback = $data[ 'answer_feedback_multiple_choice' ];
+			$answer_feedback = $data[ 'answer_feedback_multiple_choice' ];
 
-        }elseif( isset( $data[ 'answer_feedback' ] )  ){
+		}elseif( isset( $data[ 'answer_feedback' ] )  ){
 
-            $answer_feedback = $data[ 'answer_feedback' ];
+			$answer_feedback = $data[ 'answer_feedback' ];
 
-        } // End If Statement
+		} // End If Statement
 
 		$post_title = $question_text;
 		$post_author = $data[ 'post_author' ];
@@ -2304,10 +2304,10 @@ 
 		}
 		// Question Query Arguments
 		$post_type_args = array(	'post_content' => $post_content,
-  		    						'post_status' => $post_status,
-  		    						'post_title' => $post_title,
-  		    						'post_type' => $post_type
-  		    						);
+  									'post_status' => $post_status,
+  									'post_title' => $post_title,
+  									'post_type' => $post_type
+  									);
 
   		// Remove empty values and reindex the array
   		if ( is_array( $question_right_answers ) && 0 < count($question_right_answers) ) {
@@ -2343,14 +2343,14 @@ 
   		if ( $post_title != '' ) {
 
   			// Get Quiz ID for the question
-  		    $quiz_id = $data['quiz_id'];
+  			$quiz_id = $data['quiz_id'];
 
-  		    // Get question media
+  			// Get question media
 			$question_media = $data['question_media'];
 
-  		    // Get answer order
-  		    $answer_order = '';
-  		    if( isset( $data['answer_order'] ) ) {
+  			// Get answer order
+  			$answer_order = '';
+  			if( isset( $data['answer_order'] ) ) {
 				$answer_order = $data['answer_order'];
 			}
 
@@ -2360,38 +2360,38 @@ 
 				$random_order = $data['random_order'];
 			}
 
-  		    // Insert or Update the question
-  		    if ( 0 < $question_id ) {
-
-  		    	$post_type_args[ 'ID' ] = $question_id;
-		    	$question_id = wp_update_post( $post_type_args );
-
-		    	// Update poast meta
-		    	if( 'quiz' == $context ) {
-		    		$quizzes = get_post_meta( $question_id, '_quiz_id', false );
-		    		if( ! in_array( $quiz_id, $quizzes ) ) {
-			    		add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
-			    	}
-		    	}
-
-		    	update_post_meta( $question_id, '_question_grade', $question_grade );
-		    	update_post_meta( $question_id, '_question_right_answer', $question_right_answer );
-		    	update_post_meta( $question_id, '_right_answer_count', $right_answer_count );
-		    	update_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
-		    	update_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
-		    	update_post_meta( $question_id, '_question_media', $question_media );
-		    	update_post_meta( $question_id, '_answer_order', $answer_order );
-		    	update_post_meta( $question_id, '_random_order', $random_order );
-
-		    	if( 'quiz' != $context ) {
-		    		wp_set_post_terms( $question_id, array( $question_type ), 'question-type', false );
-		    	}
+  			// Insert or Update the question
+  			if ( 0 < $question_id ) {
+
+  				$post_type_args[ 'ID' ] = $question_id;
+				$question_id = wp_update_post( $post_type_args );
+
+				// Update poast meta
+				if( 'quiz' == $context ) {
+					$quizzes = get_post_meta( $question_id, '_quiz_id', false );
+					if( ! in_array( $quiz_id, $quizzes ) ) {
+						add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
+					}
+				}
+
+				update_post_meta( $question_id, '_question_grade', $question_grade );
+				update_post_meta( $question_id, '_question_right_answer', $question_right_answer );
+				update_post_meta( $question_id, '_right_answer_count', $right_answer_count );
+				update_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
+				update_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
+				update_post_meta( $question_id, '_question_media', $question_media );
+				update_post_meta( $question_id, '_answer_order', $answer_order );
+				update_post_meta( $question_id, '_random_order', $random_order );
+
+				if( 'quiz' != $context ) {
+					wp_set_post_terms( $question_id, array( $question_type ), 'question-type', false );
+				}
 				// Don't store empty value, no point
 				if ( !empty($answer_feedback) ) {
 					update_post_meta( $question_id, '_answer_feedback', $answer_feedback );
 				}
 
-		    } else {
+			} else {
 				$question_id = wp_insert_post( $post_type_args );
 				$question_count = intval( $data['question_count'] );
 				++$question_count;
@@ -2404,29 +2404,29 @@ 
 				}
 
 				if( isset( $question_grade ) ) {
-		    		add_post_meta( $question_id, '_question_grade', $question_grade );
-		    	}
-		    	add_post_meta( $question_id, '_question_right_answer', $question_right_answer );
-		    	add_post_meta( $question_id, '_right_answer_count', $right_answer_count );
-		    	add_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
-		    	add_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
-		    	add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
-		    	add_post_meta( $question_id, '_question_media', $question_media );
-		    	add_post_meta( $question_id, '_answer_order', $answer_order );
-		    	add_post_meta( $question_id, '_random_order', $random_order );
+					add_post_meta( $question_id, '_question_grade', $question_grade );
+				}
+				add_post_meta( $question_id, '_question_right_answer', $question_right_answer );
+				add_post_meta( $question_id, '_right_answer_count', $right_answer_count );
+				add_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
+				add_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
+				add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
+				add_post_meta( $question_id, '_question_media', $question_media );
+				add_post_meta( $question_id, '_answer_order', $answer_order );
+				add_post_meta( $question_id, '_random_order', $random_order );
 				// Don't store empty value, no point
 				if ( !empty($answer_feedback) ) {
 					add_post_meta( $question_id, '_answer_feedback', $answer_feedback );
 				}
 
-		    	// Set the post terms for question-type
-			    wp_set_post_terms( $question_id, array( $question_type ), 'question-type' );
+				// Set the post terms for question-type
+				wp_set_post_terms( $question_id, array( $question_type ), 'question-type' );
 
-			    if( $question_category ) {
-	    			wp_set_post_terms( $question_id, array( $question_category ), 'question-category' );
-	    		}
+				if( $question_category ) {
+					wp_set_post_terms( $question_id, array( $question_category ), 'question-category' );
+				}
 
-		    } // End If Statement
+			} // End If Statement
 		} // End If Statement
   		// Check that the insert or update saved by testing the post id
   		if ( 0 < $question_id ) {
@@ -2475,7 +2475,7 @@ 
 	public function lesson_complexities() {
 
 		// V2 - make filter for this array
-        $lesson_complexities = array( 	'easy' => __( 'Easy', 'woothemes-sensei' ),
+		$lesson_complexities = array( 	'easy' => __( 'Easy', 'woothemes-sensei' ),
 									'std' => __( 'Standard', 'woothemes-sensei' ),
 									'hard' => __( 'Hard', 'woothemes-sensei' )
 									);
@@ -2542,14 +2542,14 @@ 
 		$post_args = array(	'post_type' 		=> 'quiz',
 							'posts_per_page' 		=> 1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'DESC',
-    						'post_parent'      	=> $lesson_id,
-    						'post_status'		=> $post_status,
+							'order'           	=> 'DESC',
+							'post_parent'      	=> $lesson_id,
+							'post_status'		=> $post_status,
 							'suppress_filters' 	=> 0,
 							'fields'            => $fields
 							);
 		$posts_array = get_posts( $post_args );
-        $quiz_id = array_shift($posts_array);
+		$quiz_id = array_shift($posts_array);
 
 		return $quiz_id;
 	} // End lesson_quizzes()
@@ -2557,34 +2557,34 @@ 
 
 	/**
 	 * Fetches all the questions for a quiz depending on certain conditions.
-     *
-     * Determine which questions should be shown depending on:
-     * - admin/teacher selected questions to be shown
-     * - questions shown to a user previously (saved as asked questions)
-     * - limit number of questions lesson setting
 	 *
-     * @since 1.0
+	 * Determine which questions should be shown depending on:
+	 * - admin/teacher selected questions to be shown
+	 * - questions shown to a user previously (saved as asked questions)
+	 * - limit number of questions lesson setting
+	 *
+	 * @since 1.0
 	 * @param int $quiz_id (default: 0)
 	 * @param string $post_status (default: 'publish')
 	 * @param string $orderby (default: 'meta_value_num title')
 	 * @param string $order (default: 'ASC')
-     *
+	 *
 	 * @return array $questions { $question type WP_Post }
 	 */
 	public function lesson_quiz_questions( $quiz_id = 0, $post_status = 'any', $orderby = 'meta_value_num title', $order = 'ASC' ) {
 
 		$quiz_id = (string) $quiz_id;
-        $quiz_lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+		$quiz_lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
 
-        // setup the user id
-        if( is_admin() ) {
-            $user_id = isset( $_GET['user'] ) ? $_GET['user'] : '' ;
-        } else {
-            $user_id = get_current_user_id();
-        }
+		// setup the user id
+		if( is_admin() ) {
+			$user_id = isset( $_GET['user'] ) ? $_GET['user'] : '' ;
+		} else {
+			$user_id = get_current_user_id();
+		}
 
-        // get the users current status on the lesson
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $user_id );
+		// get the users current status on the lesson
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $user_id );
 
 		// Set the default question order if it has not already been set for this quiz
 		$this->set_default_question_order( $quiz_id );
@@ -2614,14 +2614,14 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-        //query the questions
+		//query the questions
 		$questions_query = new WP_Query( $question_query_args );
 
-        // Set return array to initially include all items
-        $questions = $questions_query->posts;
+		// Set return array to initially include all items
+		$questions = $questions_query->posts;
 
-        // set the questions array that will be manipulated within this function
-        $questions_array = $questions_query->posts;
+		// set the questions array that will be manipulated within this function
+		$questions_array = $questions_query->posts;
 
 		// If viewing quiz on frontend or in grading then only single questions must be shown
 		$selected_questions = false;
@@ -2734,36 +2734,36 @@ 
 			}
 		}
 
-        // Save the questions that will be asked for the current user
-        // this happens only once per user/quiz, unless the user resets the quiz
-        if( ! is_admin() ){
+		// Save the questions that will be asked for the current user
+		// this happens only once per user/quiz, unless the user resets the quiz
+		if( ! is_admin() ){
 
-            if( $user_lesson_status ) {
+			if( $user_lesson_status ) {
 
-                $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true);
-                if ( empty($questions_asked) && $user_lesson_status) {
+				$questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true);
+				if ( empty($questions_asked) && $user_lesson_status) {
 
-                    $questions_asked = array();
-                    foreach ($questions as $question) {
+					$questions_asked = array();
+					foreach ($questions as $question) {
 
-                        $questions_asked[] = $question->ID;
+						$questions_asked[] = $question->ID;
 
-                    }
+					}
 
-                    // save the questions asked id
-                    $questions_asked_csv = implode(',', $questions_asked);
-                    update_comment_meta($user_lesson_status->comment_ID, 'questions_asked', $questions_asked_csv);
+					// save the questions asked id
+					$questions_asked_csv = implode(',', $questions_asked);
+					update_comment_meta($user_lesson_status->comment_ID, 'questions_asked', $questions_asked_csv);
 
-                }
-            }
-        }
+				}
+			}
+		}
 
-        /**
-         * Filter the questions returned by Sensei_Lesson::lessons_quiz_questions
-         *
-         * @hooked Sensei_Teacher::allow_teacher_access_to_questions
-         * @since 1.8.0
-         */
+		/**
+		 * Filter the questions returned by Sensei_Lesson::lessons_quiz_questions
+		 *
+		 * @hooked Sensei_Teacher::allow_teacher_access_to_questions
+		 * @since 1.8.0
+		 */
 		return apply_filters( 'sensei_lesson_quiz_questions', $questions,  $quiz_id  );
 
 	} // End lesson_quiz_questions()
@@ -2867,7 +2867,7 @@ 
  			// Display Image Placeholder if none
 			if ( Sensei()->settings->settings[ 'placeholder_images_enable' ] ) {
 
-                $img_url = apply_filters( 'sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+				$img_url = apply_filters( 'sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
 
 			} // End If Statement
 
@@ -2879,418 +2879,418 @@ 
 
 	} // End lesson_image()
 
-    /**
-     * Ooutpu the lesson image
-     *
-     * @since 1.9.0
-     * @param integer $lesson_id
-     */
-    public static function the_lesson_image( $lesson_id = 0 ){
+	/**
+	 * Ooutpu the lesson image
+	 *
+	 * @since 1.9.0
+	 * @param integer $lesson_id
+	 */
+	public static function the_lesson_image( $lesson_id = 0 ){
 
-        echo Sensei()->lesson->lesson_image( $lesson_id );
+		echo Sensei()->lesson->lesson_image( $lesson_id );
 
-    }
+	}
 
 	/**
 	 * Returns the the lesson excerpt.
 	 *
 	 * @param WP_Post $lesson
-     * @param bool $add_p_tags should the excerpt be wrapped by calling wpautop()
+	 * @param bool $add_p_tags should the excerpt be wrapped by calling wpautop()
 	 * @return string
 	 */
 	public static function lesson_excerpt( $lesson = null, $add_p_tags = true ) {
 		$html = '';
 		if ( is_a( $lesson, 'WP_Post' ) && 'lesson' == $lesson->post_type ) {
 
-            $excerpt =  $lesson->post_excerpt;
+			$excerpt =  $lesson->post_excerpt;
 
-            // if $add_p_tags true wrap with <p> else return the excerpt as is
-            $html =  $add_p_tags ? wpautop( $excerpt ) : $excerpt;
+			// if $add_p_tags true wrap with <p> else return the excerpt as is
+			$html =  $add_p_tags ? wpautop( $excerpt ) : $excerpt;
 
 		}
 		return apply_filters( 'sensei_lesson_excerpt', $html );
 
 	} // End lesson_excerpt()
 
-    /**
-     * Returns the course for a given lesson
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     * @param int $lesson_id
-     * @return int|bool $course_id or bool when nothing is found.
-     */
-     public function get_course_id( $lesson_id ){
-
-         if( ! isset( $lesson_id ) || empty( $lesson_id )
-         ||  'lesson' != get_post_type( $lesson_id ) ){
-             return false;
-         }
-
-         $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true);
-
-         // make sure the course id is valid
-         if( empty( $lesson_course_id )
-             || is_array( $lesson_course_id )
-             || intval( $lesson_course_id ) < 1
-             || 'course' != get_post_type( $lesson_course_id ) ){
-
-             return false;
-
-         }
-
-         return $lesson_course_id;
-
-     }// en get_course_id
-
-    /**
-     * Add the admin all lessons screen edit options.
-     *
-     * The fields in this function work for both quick and bulk edit. The ID attributes is used
-     * by bulk edit javascript in the front end to retrieve the new values set byt the user. Then
-     * name attribute is will be used by the quick edit and submitted via standard POST. This
-     * will use this classes save_post_meta function to save the new field data.
-     *
-     * @hooked quick_edit_custom_box
-     * @hooked bulk_edit_custom_box
-     *
-     * @since 1.8.0
-     *
-     * @param string $column_name
-     * @param string $post_type
-     * @return void
-     */
-    public function all_lessons_edit_fields( $column_name, $post_type ) {
-
-        // only show these options ont he lesson post type edit screen
-        if( 'lesson' != $post_type || 'lesson-course' != $column_name
-            || ! current_user_can( 'edit_lessons' ) ) {
-            return;
-        }
-
-        ?>
+	/**
+	 * Returns the course for a given lesson
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 * @param int $lesson_id
+	 * @return int|bool $course_id or bool when nothing is found.
+	 */
+	 public function get_course_id( $lesson_id ){
+
+		 if( ! isset( $lesson_id ) || empty( $lesson_id )
+		 ||  'lesson' != get_post_type( $lesson_id ) ){
+			 return false;
+		 }
+
+		 $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true);
+
+		 // make sure the course id is valid
+		 if( empty( $lesson_course_id )
+			 || is_array( $lesson_course_id )
+			 || intval( $lesson_course_id ) < 1
+			 || 'course' != get_post_type( $lesson_course_id ) ){
+
+			 return false;
+
+		 }
+
+		 return $lesson_course_id;
+
+	 }// en get_course_id
+
+	/**
+	 * Add the admin all lessons screen edit options.
+	 *
+	 * The fields in this function work for both quick and bulk edit. The ID attributes is used
+	 * by bulk edit javascript in the front end to retrieve the new values set byt the user. Then
+	 * name attribute is will be used by the quick edit and submitted via standard POST. This
+	 * will use this classes save_post_meta function to save the new field data.
+	 *
+	 * @hooked quick_edit_custom_box
+	 * @hooked bulk_edit_custom_box
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $column_name
+	 * @param string $post_type
+	 * @return void
+	 */
+	public function all_lessons_edit_fields( $column_name, $post_type ) {
+
+		// only show these options ont he lesson post type edit screen
+		if( 'lesson' != $post_type || 'lesson-course' != $column_name
+			|| ! current_user_can( 'edit_lessons' ) ) {
+			return;
+		}
+
+		?>
         <fieldset class="sensei-edit-field-set inline-edit-lesson">
             <div class="sensei-inline-edit-col column-<?php echo $column_name ?>">
                     <?php
-                    echo '<h4>' . __('Lesson Information', 'woothemes-sensei') . '</h4>';
-                    // create a nonce field to be  used as a security measure when saving the data
-                    wp_nonce_field( 'bulk-edit-lessons', '_edit_lessons_nonce' );
-                    wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce'  );
-
-                    // unchanged option - we need this in because
-                    // the default option in bulk edit should not be empty. If it is
-                    // the user will erase data they didn't want to touch.
-                    $no_change_text = '-- ' . __('No Change', 'woothemes-sensei') . ' --';
-
-                    //
-                    //course selection
-                    //
-                    $courses =  WooThemes_Sensei_Course::get_all_courses();
-                    $course_options = array();
-                    if ( count( $courses ) > 0 ) {
-                        foreach ($courses as $course ){
-                            $course_options[ $course->ID ] = get_the_title( $course->ID );
-                        }
-                    }
-                    //pre-append the no change option
-                    $course_options['-1']=  $no_change_text;
-                    $course_attributes = array( 'name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course' , 'class'=>' ' );
-                    $course_field =  Sensei_Utils::generate_drop_down( '-1', $course_options, $course_attributes );
-                    echo $this->generate_all_lessons_edit_field( __('Lesson Course', 'woothemes-sensei'),   $course_field  );
-
-                    //
-                    // lesson complexity selection
-                    //
-                    $lesson_complexities =  $this->lesson_complexities();
-                    //pre-append the no change option
-                    $lesson_complexities['-1']=  $no_change_text;
-                    $complexity_dropdown_attributes = array( 'name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity' , 'class'=>' ');
-                    $complexity_filed =  Sensei_Utils::generate_drop_down( '-1', $lesson_complexities, $complexity_dropdown_attributes );
-                    echo $this->generate_all_lessons_edit_field( __('Lesson Complexity', 'woothemes-sensei'),   $complexity_filed  );
-
-                    ?>
+					echo '<h4>' . __('Lesson Information', 'woothemes-sensei') . '</h4>';
+					// create a nonce field to be  used as a security measure when saving the data
+					wp_nonce_field( 'bulk-edit-lessons', '_edit_lessons_nonce' );
+					wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce'  );
+
+					// unchanged option - we need this in because
+					// the default option in bulk edit should not be empty. If it is
+					// the user will erase data they didn't want to touch.
+					$no_change_text = '-- ' . __('No Change', 'woothemes-sensei') . ' --';
+
+					//
+					//course selection
+					//
+					$courses =  WooThemes_Sensei_Course::get_all_courses();
+					$course_options = array();
+					if ( count( $courses ) > 0 ) {
+						foreach ($courses as $course ){
+							$course_options[ $course->ID ] = get_the_title( $course->ID );
+						}
+					}
+					//pre-append the no change option
+					$course_options['-1']=  $no_change_text;
+					$course_attributes = array( 'name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course' , 'class'=>' ' );
+					$course_field =  Sensei_Utils::generate_drop_down( '-1', $course_options, $course_attributes );
+					echo $this->generate_all_lessons_edit_field( __('Lesson Course', 'woothemes-sensei'),   $course_field  );
+
+					//
+					// lesson complexity selection
+					//
+					$lesson_complexities =  $this->lesson_complexities();
+					//pre-append the no change option
+					$lesson_complexities['-1']=  $no_change_text;
+					$complexity_dropdown_attributes = array( 'name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity' , 'class'=>' ');
+					$complexity_filed =  Sensei_Utils::generate_drop_down( '-1', $lesson_complexities, $complexity_dropdown_attributes );
+					echo $this->generate_all_lessons_edit_field( __('Lesson Complexity', 'woothemes-sensei'),   $complexity_filed  );
+
+					?>
 
                     <h4><?php _e('Quiz Settings', 'woothemes-sensei'); ?> </h4>
 
                     <?php
 
-                    //
-                    // Lesson require pass to complete
-                    //
-                    $pass_required_options = array(
-                        '-1' => $no_change_text,
-                         '0' => __('No','woothemes'),
-                         '1' => __('Yes','woothemes'),
-                    );
-
-                    $pass_required_select_attributes = array( 'name'=> 'pass_required',
-                                                                'id'=> 'sensei-edit-lesson-pass-required',
-                                                                'class'=>' '   );
-                    $require_pass_field =  Sensei_Utils::generate_drop_down( '-1', $pass_required_options, $pass_required_select_attributes, false );
-                    echo $this->generate_all_lessons_edit_field( __('Pass required', 'woothemes-sensei'),   $require_pass_field  );
-
-                    //
-                    // Quiz pass percentage
-                    //
-                    $quiz_pass_percentage_field = '<input name="quiz_passmark" id="sensei-edit-quiz-pass-percentage" type="number" />';
-                    echo $this->generate_all_lessons_edit_field( __('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field  );
-
-                    //
-                    // Enable quiz reset button
-                    //
-                    $quiz_reset_select__options = array(
-                        '-1' => $no_change_text,
-                        '0' => __('No','woothemes'),
-                        '1' => __('Yes','woothemes'),
-                    );
-                    $quiz_reset_name_id = 'sensei-edit-enable-quiz-reset';
-                    $quiz_reset_select_attributes = array( 'name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' ' );
-                    $quiz_reset_field =  Sensei_Utils::generate_drop_down( '-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false );
-                    echo $this->generate_all_lessons_edit_field( __('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field  );
-
-                    ?>
+					//
+					// Lesson require pass to complete
+					//
+					$pass_required_options = array(
+						'-1' => $no_change_text,
+						 '0' => __('No','woothemes'),
+						 '1' => __('Yes','woothemes'),
+					);
+
+					$pass_required_select_attributes = array( 'name'=> 'pass_required',
+																'id'=> 'sensei-edit-lesson-pass-required',
+																'class'=>' '   );
+					$require_pass_field =  Sensei_Utils::generate_drop_down( '-1', $pass_required_options, $pass_required_select_attributes, false );
+					echo $this->generate_all_lessons_edit_field( __('Pass required', 'woothemes-sensei'),   $require_pass_field  );
+
+					//
+					// Quiz pass percentage
+					//
+					$quiz_pass_percentage_field = '<input name="quiz_passmark" id="sensei-edit-quiz-pass-percentage" type="number" />';
+					echo $this->generate_all_lessons_edit_field( __('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field  );
+
+					//
+					// Enable quiz reset button
+					//
+					$quiz_reset_select__options = array(
+						'-1' => $no_change_text,
+						'0' => __('No','woothemes'),
+						'1' => __('Yes','woothemes'),
+					);
+					$quiz_reset_name_id = 'sensei-edit-enable-quiz-reset';
+					$quiz_reset_select_attributes = array( 'name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' ' );
+					$quiz_reset_field =  Sensei_Utils::generate_drop_down( '-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false );
+					echo $this->generate_all_lessons_edit_field( __('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field  );
+
+					?>
             </div>
         </fieldset>
     <?php
-    }// all_lessons_edit_fields
-
-    /**
-     * Create the html for the edit field
-     *
-     * Wraps the passed in field and title combination with the correct html.
-     *
-     * @since 1.8.0
-     *
-     * @param string $title that will stand to the left of the field.
-     * @param string $field type markup for the field that must be wrapped.
-     * @return string $field_html
-     */
-    public function generate_all_lessons_edit_field( $title  ,$field ){
-
-        $html = '';
-        $html = '<div class="inline-edit-group" >';
-        $html .=  '<span class="title">'. $title .'</span> ';
-        $html .= '<span class="input-text-wrap">';
-        $html .= $field;
-        $html .= '</span>';
-        $html .= '</label></div>';
-
-        return $html ;
-
-    }//end generate_all_lessons_edit_field
-
-    /**
-     * Respond to the ajax call from the bulk edit save function. This comes
-     * from the admin all lesson screen.
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    function save_all_lessons_edit_fields() {
-
-        // verify all the data before attempting to save
-        if( ! isset( $_POST['security'] ) || ! check_ajax_referer( 'bulk-edit-lessons', 'security' )
-            ||  empty( $_POST[ 'post_ids' ] )  || ! is_array( $_POST[ 'post_ids' ] ) ) {
-            die();
-        }
-
-        // get our variables
-        $new_course = sanitize_text_field(  $_POST['sensei_edit_lesson_course'] );
-        $new_complexity = sanitize_text_field(  $_POST['sensei_edit_complexity'] );
-        $new_pass_required = sanitize_text_field(  $_POST['sensei_edit_pass_required'] );
-        $new_pass_percentage = sanitize_text_field(  $_POST['sensei_edit_pass_percentage'] );
-        $new_enable_quiz_reset = sanitize_text_field(  $_POST['sensei_edit_enable_quiz_reset'] );
-        // store the values for all selected posts
-        foreach( $_POST[ 'post_ids' ] as $lesson_id ) {
-
-            // get the quiz id needed for the quiz meta
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-
-            // do not save the items if the value is -1 as this
-            // means it was not changed
-
-            // update lesson course
-            if( -1 != $new_course ){
-                update_post_meta( $lesson_id, '_lesson_course', $new_course );
-            }
-            // update lesson complexity
-            if( -1 != $new_complexity ){
-                update_post_meta( $lesson_id, '_lesson_complexity', $new_complexity );
-            }
-
-            // Quiz Related settings
-            if( isset( $quiz_id) && 0 < intval( $quiz_id ) ) {
-
-                // update pass required
-                if (-1 != $new_pass_required) {
-
-                    $checked = $new_pass_required  ? 'on' : '';
-                    update_post_meta($quiz_id, '_pass_required', $checked);
-                    unset( $checked );
-                }
+	}// all_lessons_edit_fields
 
-                // update pass percentage
-                if( !empty( $new_pass_percentage) && is_numeric( $new_pass_percentage ) ){
+	/**
+	 * Create the html for the edit field
+	 *
+	 * Wraps the passed in field and title combination with the correct html.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $title that will stand to the left of the field.
+	 * @param string $field type markup for the field that must be wrapped.
+	 * @return string $field_html
+	 */
+	public function generate_all_lessons_edit_field( $title  ,$field ){
 
-                        update_post_meta($quiz_id, '_quiz_passmark', $new_pass_percentage);
+		$html = '';
+		$html = '<div class="inline-edit-group" >';
+		$html .=  '<span class="title">'. $title .'</span> ';
+		$html .= '<span class="input-text-wrap">';
+		$html .= $field;
+		$html .= '</span>';
+		$html .= '</label></div>';
 
-                }
+		return $html ;
 
-                //
-                // update enable quiz reset
-                //
-                if (-1 != $new_enable_quiz_reset ) {
+	}//end generate_all_lessons_edit_field
 
-                    $checked = $new_enable_quiz_reset ? 'on' : ''  ;
-                    update_post_meta($quiz_id, '_enable_quiz_reset', $checked);
-                    unset( $checked );
+	/**
+	 * Respond to the ajax call from the bulk edit save function. This comes
+	 * from the admin all lesson screen.
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	function save_all_lessons_edit_fields() {
 
-                }
+		// verify all the data before attempting to save
+		if( ! isset( $_POST['security'] ) || ! check_ajax_referer( 'bulk-edit-lessons', 'security' )
+			||  empty( $_POST[ 'post_ids' ] )  || ! is_array( $_POST[ 'post_ids' ] ) ) {
+			die();
+		}
 
+		// get our variables
+		$new_course = sanitize_text_field(  $_POST['sensei_edit_lesson_course'] );
+		$new_complexity = sanitize_text_field(  $_POST['sensei_edit_complexity'] );
+		$new_pass_required = sanitize_text_field(  $_POST['sensei_edit_pass_required'] );
+		$new_pass_percentage = sanitize_text_field(  $_POST['sensei_edit_pass_percentage'] );
+		$new_enable_quiz_reset = sanitize_text_field(  $_POST['sensei_edit_enable_quiz_reset'] );
+		// store the values for all selected posts
+		foreach( $_POST[ 'post_ids' ] as $lesson_id ) {
 
-            } // end if quiz
+			// get the quiz id needed for the quiz meta
+			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 
-        }// end for each
+			// do not save the items if the value is -1 as this
+			// means it was not changed
 
-        die();
+			// update lesson course
+			if( -1 != $new_course ){
+				update_post_meta( $lesson_id, '_lesson_course', $new_course );
+			}
+			// update lesson complexity
+			if( -1 != $new_complexity ){
+				update_post_meta( $lesson_id, '_lesson_complexity', $new_complexity );
+			}
 
-    } // end save_all_lessons_edit_fields
+			// Quiz Related settings
+			if( isset( $quiz_id) && 0 < intval( $quiz_id ) ) {
 
-    /**
-     * Loading the quick edit fields defaults.
-     *
-     * This function will localise the default values along with the script that will
-     * add these values to the inputs.
-     *
-     * NOTE: this function runs for each row in the edit column
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function set_quick_edit_admin_defaults( $column_name, $post_id ){
+				// update pass required
+				if (-1 != $new_pass_required) {
 
-        if( 'lesson-course' != $column_name ){
-            return;
-        }
-        // load the script
-        $suffix = defined( 'SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
-        wp_enqueue_script( 'sensei-lesson-quick-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-quick-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
+					$checked = $new_pass_required  ? 'on' : '';
+					update_post_meta($quiz_id, '_pass_required', $checked);
+					unset( $checked );
+				}
 
-        // setup the values for all meta fields
-        $data = array();
-        foreach( $this->meta_fields as $field ){
+				// update pass percentage
+				if( !empty( $new_pass_percentage) && is_numeric( $new_pass_percentage ) ){
 
-            $data[$field] =  get_post_meta( $post_id, '_'.$field, true );
+						update_post_meta($quiz_id, '_quiz_passmark', $new_pass_percentage);
 
-        }
-        // add quiz meta fields
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $post_id );
-        foreach( Sensei()->quiz->meta_fields as $field ){
+				}
+
+				//
+				// update enable quiz reset
+				//
+				if (-1 != $new_enable_quiz_reset ) {
+
+					$checked = $new_enable_quiz_reset ? 'on' : ''  ;
+					update_post_meta($quiz_id, '_enable_quiz_reset', $checked);
+					unset( $checked );
+
+				}
+
+
+			} // end if quiz
+
+		}// end for each
+
+		die();
+
+	} // end save_all_lessons_edit_fields
+
+	/**
+	 * Loading the quick edit fields defaults.
+	 *
+	 * This function will localise the default values along with the script that will
+	 * add these values to the inputs.
+	 *
+	 * NOTE: this function runs for each row in the edit column
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function set_quick_edit_admin_defaults( $column_name, $post_id ){
 
-            $data[$field] =  get_post_meta( $quiz_id, '_'.$field, true );
+		if( 'lesson-course' != $column_name ){
+			return;
+		}
+		// load the script
+		$suffix = defined( 'SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script( 'sensei-lesson-quick-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-quick-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
 
-        }
+		// setup the values for all meta fields
+		$data = array();
+		foreach( $this->meta_fields as $field ){
 
-        wp_localize_script( 'sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data );
+			$data[$field] =  get_post_meta( $post_id, '_'.$field, true );
 
-    }// end quick edit admin defaults
+		}
+		// add quiz meta fields
+		$quiz_id = Sensei()->lesson->lesson_quizzes( $post_id );
+		foreach( Sensei()->quiz->meta_fields as $field ){
 
-    /**
-     * Filter the classes for lessons on the single course page.
-     *
-     * Adds the nesecary classes depending on the user data
-     *
-     * @since 1.9.0
-     * @param array $classes
-     * @return array $classes
-     */
-    public static function single_course_lessons_classes( $classes ){
+			$data[$field] =  get_post_meta( $quiz_id, '_'.$field, true );
 
-        if(  is_singular('course') ){
+		}
 
-            global $post;
-            $course_id = $post->ID;
+		wp_localize_script( 'sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data );
 
-            $lesson_classes = array( 'course', 'post' );
-            if ( is_user_logged_in() ) {
+	}// end quick edit admin defaults
 
-                // Check if Lesson is complete
-                $single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
-                if ( $single_lesson_complete ) {
+	/**
+	 * Filter the classes for lessons on the single course page.
+	 *
+	 * Adds the nesecary classes depending on the user data
+	 *
+	 * @since 1.9.0
+	 * @param array $classes
+	 * @return array $classes
+	 */
+	public static function single_course_lessons_classes( $classes ){
 
-                    $lesson_classes[] = 'lesson-completed';
+		if(  is_singular('course') ){
 
-                } // End If Statement
+			global $post;
+			$course_id = $post->ID;
 
-            } // End If Statement
+			$lesson_classes = array( 'course', 'post' );
+			if ( is_user_logged_in() ) {
 
-            $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
-            if (  Sensei_Utils::is_preview_lesson( get_the_ID() ) && !$is_user_taking_course ) {
+				// Check if Lesson is complete
+				$single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+				if ( $single_lesson_complete ) {
 
-                $lesson_classes[] = 'lesson-preview';
+					$lesson_classes[] = 'lesson-completed';
 
-            }
+				} // End If Statement
 
-            $classes = array_merge( $classes, $lesson_classes  );
+			} // End If Statement
+
+			$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+			if (  Sensei_Utils::is_preview_lesson( get_the_ID() ) && !$is_user_taking_course ) {
+
+				$lesson_classes[] = 'lesson-preview';
+
+			}
+
+			$classes = array_merge( $classes, $lesson_classes  );
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end single_course_lessons_classes
+	}// end single_course_lessons_classes
 
-    /**
-     * Output the lesson meta for the given lesson
-     *
-     * @since 1.9.0
-     * @param $lesson_id
-     */
-    public static function the_lesson_meta( $lesson_id ){
+	/**
+	 * Output the lesson meta for the given lesson
+	 *
+	 * @since 1.9.0
+	 * @param $lesson_id
+	 */
+	public static function the_lesson_meta( $lesson_id ){
 
-        global $wp_query;
-        $loop_lesson_number = $wp_query->current_post + 1;
+		global $wp_query;
+		$loop_lesson_number = $wp_query->current_post + 1;
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
-        $single_lesson_complete = false;
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		$single_lesson_complete = false;
+		$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
 
-        // Get Lesson data
-        $complexity_array = Sensei()->lesson->lesson_complexities();
+		// Get Lesson data
+		$complexity_array = Sensei()->lesson->lesson_complexities();
 
-        $lesson_complexity = get_post_meta( $lesson_id, '_lesson_complexity', true );
-        if ( '' != $lesson_complexity ) {
+		$lesson_complexity = get_post_meta( $lesson_id, '_lesson_complexity', true );
+		if ( '' != $lesson_complexity ) {
 
-            $lesson_complexity = $complexity_array[$lesson_complexity];
+			$lesson_complexity = $complexity_array[$lesson_complexity];
 
-        }
-        $user_info = get_userdata( absint( get_post()->post_author ) );
-        $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id);
-        $preview_label = '';
-        if ( $is_preview && !$is_user_taking_course ) {
+		}
+		$user_info = get_userdata( absint( get_post()->post_author ) );
+		$is_preview = Sensei_Utils::is_preview_lesson( $lesson_id);
+		$preview_label = '';
+		if ( $is_preview && !$is_user_taking_course ) {
 
-            $preview_label = Sensei()->frontend->sensei_lesson_preview_title_text( $lesson_id);
-            $preview_label = '<span class="preview-heading">' . $preview_label . '</span>';
+			$preview_label = Sensei()->frontend->sensei_lesson_preview_title_text( $lesson_id);
+			$preview_label = '<span class="preview-heading">' . $preview_label . '</span>';
 
-        }
+		}
 
 
-        $count_markup= '';
-        /**
-         * Filter for if you want the $lesson_count to show next to the lesson.
-         *
-         * @since 1.0
-         * @param bool default false.
-         */
-        if( apply_filters( 'sensei_show_lesson_numbers', false ) ) {
+		$count_markup= '';
+		/**
+		 * Filter for if you want the $lesson_count to show next to the lesson.
+		 *
+		 * @since 1.0
+		 * @param bool default false.
+		 */
+		if( apply_filters( 'sensei_show_lesson_numbers', false ) ) {
 
-            $count_markup =  '<span class="lesson-number">' . $loop_lesson_number. '</span>';
+			$count_markup =  '<span class="lesson-number">' . $loop_lesson_number. '</span>';
 
-        }
+		}
 
-        $heading_link_title = sprintf( __( 'Start %s', 'woothemes-sensei' ), get_the_title( $lesson_id ) );
+		$heading_link_title = sprintf( __( 'Start %s', 'woothemes-sensei' ), get_the_title( $lesson_id ) );
 
-        ?>
+		?>
         <header>
             <h2>
                 <a href="<?php echo esc_url_raw( get_permalink( $lesson_id ) ) ?>"
@@ -3303,40 +3303,40 @@ 
 
                 <?php
 
-                $meta_html = '';
-                $user_lesson_status = Sensei_Utils::user_lesson_status( get_the_ID(), get_current_user_id() );
+				$meta_html = '';
+				$user_lesson_status = Sensei_Utils::user_lesson_status( get_the_ID(), get_current_user_id() );
 
-                $lesson_length = get_post_meta( $lesson_id, '_lesson_length', true );
-                if ( '' != $lesson_length ) {
+				$lesson_length = get_post_meta( $lesson_id, '_lesson_length', true );
+				if ( '' != $lesson_length ) {
 
-                    $meta_html .= '<span class="lesson-length">' .  __( 'Length: ', 'woothemes-sensei' ) . $lesson_length . __( ' minutes', 'woothemes-sensei' ) . '</span>';
+					$meta_html .= '<span class="lesson-length">' .  __( 'Length: ', 'woothemes-sensei' ) . $lesson_length . __( ' minutes', 'woothemes-sensei' ) . '</span>';
 
-                }
+				}
 
-                if ( Sensei()->settings->get( 'lesson_author' ) ) {
+				if ( Sensei()->settings->get( 'lesson_author' ) ) {
 
-                    $meta_html .= '<span class="lesson-author">' .  __( 'Author: ', 'woothemes-sensei' ) . '<a href="' . get_author_posts_url( absint( get_post()->post_author ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+					$meta_html .= '<span class="lesson-author">' .  __( 'Author: ', 'woothemes-sensei' ) . '<a href="' . get_author_posts_url( absint( get_post()->post_author ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
 
-                } // End If Statement
-                if ( '' != $lesson_complexity ) {
+				} // End If Statement
+				if ( '' != $lesson_complexity ) {
 
-                    $meta_html .= '<span class="lesson-complexity">' .  __( 'Complexity: ', 'woothemes-sensei' ) . $lesson_complexity .'</span>';
+					$meta_html .= '<span class="lesson-complexity">' .  __( 'Complexity: ', 'woothemes-sensei' ) . $lesson_complexity .'</span>';
 
-                }
+				}
 
-                if ( $single_lesson_complete ) {
+				if ( $single_lesson_complete ) {
 
-                    $meta_html .= '<span class="lesson-status complete">' .__( 'Complete', 'woothemes-sensei' ) .'</span>';
+					$meta_html .= '<span class="lesson-status complete">' .__( 'Complete', 'woothemes-sensei' ) .'</span>';
 
-                } elseif ( $user_lesson_status ) {
+				} elseif ( $user_lesson_status ) {
 
-                    $meta_html .= '<span class="lesson-status in-progress">' . __( 'In Progress', 'woothemes-sensei' ) .'</span>';
+					$meta_html .= '<span class="lesson-status in-progress">' . __( 'In Progress', 'woothemes-sensei' ) .'</span>';
 
-                } // End If Statement
+				} // End If Statement
 
-                echo $meta_html;
+				echo $meta_html;
 
-                ?>
+				?>
 
             </p> <!-- lesson meta -->
 
@@ -3344,206 +3344,206 @@ 
 
     <?php
 
-    } // end the_lesson_meta
+	} // end the_lesson_meta
 
-    /**
-     * Output the lessons thumbnail
-     *
-     * 1.9.0
-     *
-     * @param $lesson_id
-     */
-    public static function the_lesson_thumbnail( $lesson_id ){
+	/**
+	 * Output the lessons thumbnail
+	 *
+	 * 1.9.0
+	 *
+	 * @param $lesson_id
+	 */
+	public static function the_lesson_thumbnail( $lesson_id ){
 
-        if( empty( $lesson_id ) ){
+		if( empty( $lesson_id ) ){
 
-            $lesson_id = get_the_ID();
+			$lesson_id = get_the_ID();
 
-        }
+		}
 
-        if( 'lesson' != get_post_type( $lesson_id ) ){
-            return;
-        }
+		if( 'lesson' != get_post_type( $lesson_id ) ){
+			return;
+		}
 
-        echo Sensei()->lesson->lesson_image( $lesson_id );
-    }
+		echo Sensei()->lesson->lesson_image( $lesson_id );
+	}
 
 
-    /**
-     * Alter the sensei lesson excerpt.
-     *
-     * @since 1.9.0
-     * @param string $excerpt
-     * @return string $excerpt
-     */
-    public static function alter_the_lesson_excerpt( $excerpt ) {
+	/**
+	 * Alter the sensei lesson excerpt.
+	 *
+	 * @since 1.9.0
+	 * @param string $excerpt
+	 * @return string $excerpt
+	 */
+	public static function alter_the_lesson_excerpt( $excerpt ) {
 
-        if ('lesson' == get_post_type(get_the_ID())){
+		if ('lesson' == get_post_type(get_the_ID())){
 
-            // remove this hooks to avoid an infinite loop.
-            remove_filter( 'get_the_excerpt', array( 'WooThemes_Sensei_Lesson','alter_the_lesson_excerpt') );
+			// remove this hooks to avoid an infinite loop.
+			remove_filter( 'get_the_excerpt', array( 'WooThemes_Sensei_Lesson','alter_the_lesson_excerpt') );
 
-            return WooThemes_Sensei_Lesson::lesson_excerpt( get_post( get_the_ID() ) );
-        }
+			return WooThemes_Sensei_Lesson::lesson_excerpt( get_post( get_the_ID() ) );
+		}
 
-        return $excerpt;
+		return $excerpt;
 
-    }// end the_lesson_excerpt
+	}// end the_lesson_excerpt
 
-    /**
-     * Returns the lesson prerequisite for the given lesson id.
-     *
-     * @since 1.9.0
-     *
-     * @param $current_lesson_id
-     * @return mixed | bool | int $prerequisite_lesson_id or false
-     */
-    public static function get_lesson_prerequisite_id( $current_lesson_id  ){
+	/**
+	 * Returns the lesson prerequisite for the given lesson id.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $current_lesson_id
+	 * @return mixed | bool | int $prerequisite_lesson_id or false
+	 */
+	public static function get_lesson_prerequisite_id( $current_lesson_id  ){
 
-        $prerequisite_lesson_id = get_post_meta( $current_lesson_id , '_lesson_prerequisite', true );
+		$prerequisite_lesson_id = get_post_meta( $current_lesson_id , '_lesson_prerequisite', true );
 
-        // set ti to false if not a valid prerequisite lesson id
-        if(  empty( $prerequisite_lesson_id )
-            || 'lesson' != get_post_type( $prerequisite_lesson_id )
-            || $prerequisite_lesson_id == $current_lesson_id  ) {
+		// set ti to false if not a valid prerequisite lesson id
+		if(  empty( $prerequisite_lesson_id )
+			|| 'lesson' != get_post_type( $prerequisite_lesson_id )
+			|| $prerequisite_lesson_id == $current_lesson_id  ) {
 
-            $prerequisite_lesson_id = false;
+			$prerequisite_lesson_id = false;
 
-        }
+		}
 
-        return apply_filters( 'sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id );
+		return apply_filters( 'sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id );
 
-    }
+	}
 
-    /**
-     * This function requires that you pass in the lesson you would like to check for
-     * a pre-requisite and not the pre-requisite. It will check if the
-     * lesson has a pre-requiste and then check if it is completed.
-     *
-     * @since 1.9.0
-     *
-     * @param $lesson_id
-     * @param $user_id
-     * @return bool
-     */
-    public  static function is_prerequisite_complete( $lesson_id, $user_id  ){
+	/**
+	 * This function requires that you pass in the lesson you would like to check for
+	 * a pre-requisite and not the pre-requisite. It will check if the
+	 * lesson has a pre-requiste and then check if it is completed.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $lesson_id
+	 * @param $user_id
+	 * @return bool
+	 */
+	public  static function is_prerequisite_complete( $lesson_id, $user_id  ){
 
-        if( empty( $lesson_id ) || empty( $user_id )
-        || 'lesson' != get_post_type( $lesson_id )
-        ||  ! is_a( get_user_by( 'id', $user_id ), 'WP_User' )){
+		if( empty( $lesson_id ) || empty( $user_id )
+		|| 'lesson' != get_post_type( $lesson_id )
+		||  ! is_a( get_user_by( 'id', $user_id ), 'WP_User' )){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        $pre_requisite_id = (string) self::get_lesson_prerequisite_id( $lesson_id );
+		$pre_requisite_id = (string) self::get_lesson_prerequisite_id( $lesson_id );
 
-        // not a valid pre-requisite so pre-requisite is completed
-        if( 'lesson' != get_post_type( $pre_requisite_id )
-            || ! is_numeric( $pre_requisite_id ) ){
+		// not a valid pre-requisite so pre-requisite is completed
+		if( 'lesson' != get_post_type( $pre_requisite_id )
+			|| ! is_numeric( $pre_requisite_id ) ){
 
-            return true;
+			return true;
 
-        }
+		}
 
-        return  Sensei_Utils::user_completed_lesson( $pre_requisite_id, $user_id );
+		return  Sensei_Utils::user_completed_lesson( $pre_requisite_id, $user_id );
 
-    }// end is_prerequisite_complete
+	}// end is_prerequisite_complete
 
-    /**
-     * Show the user not taking course message if it is the case
-     *
-     * @since 1.9.0
-     */
-    public  static function user_not_taking_course_message(){
+	/**
+	 * Show the user not taking course message if it is the case
+	 *
+	 * @since 1.9.0
+	 */
+	public  static function user_not_taking_course_message(){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-        if( 'lesson' != get_post_type( $lesson_id ) ){
-            return;
-        }
+		if( 'lesson' != get_post_type( $lesson_id ) ){
+			return;
+		}
 
-        $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id );
-        $pre_requisite_complete = self::is_prerequisite_complete( $lesson_id , get_current_user_id() );
-        $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+		$is_preview = Sensei_Utils::is_preview_lesson( $lesson_id );
+		$pre_requisite_complete = self::is_prerequisite_complete( $lesson_id , get_current_user_id() );
+		$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+		$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
 
-        if ( $pre_requisite_complete && $is_preview && !$user_taking_course ) {
+		if ( $pre_requisite_complete && $is_preview && !$user_taking_course ) {
 
 
-        }// end if
+		}// end if
 
-    } // end user_not_taking_course_message
+	} // end user_not_taking_course_message
 
-    /**
-     * Outputs the lessons course signup lingk
-     *
-     * This hook runs inside the single lesson page.
-     *
-     * @since 1.9.0
-     */
-    public static function course_signup_link( ){
+	/**
+	 * Outputs the lessons course signup lingk
+	 *
+	 * This hook runs inside the single lesson page.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_signup_link( ){
 
-        $course_id =  Sensei()->lesson->get_course_id( get_the_ID() );
+		$course_id =  Sensei()->lesson->get_course_id( get_the_ID() );
 
-        if ( empty( $course_id ) || 'course' != get_post_type( $course_id ) || sensei_all_access() ) {
+		if ( empty( $course_id ) || 'course' != get_post_type( $course_id ) || sensei_all_access() ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        ?>
+		?>
 
         <section class="course-signup lesson-meta">
 
             <?php
 
-            global $current_user;
-            $wc_post_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
+			global $current_user;
+			$wc_post_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-            if ( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $course_id ) ) {
+			if ( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $course_id ) ) {
 
-                if( is_user_logged_in() ) {
+				if( is_user_logged_in() ) {
 
-                    if( Sensei_WC::has_customer_bought_product( get_current_user_id(), $wc_post_id ) ) {
+					if( Sensei_WC::has_customer_bought_product( get_current_user_id(), $wc_post_id ) ) {
 
-                        $prereq_course_id = get_post_meta( $course_id, '_course_prerequisite',true );
-                        $course_link = '<a href="' . esc_url( get_permalink( $prereq_course_id ) ) . '" title="' . esc_attr( get_the_title( $prereq_course_id ) ) . '">' . __( 'the previous course', 'woothemes-sensei' )  . '</a>';
-	                    $message = sprintf( __( 'Please complete %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
-	                    Sensei()->notices->add_notice( $message, 'alert' );
+						$prereq_course_id = get_post_meta( $course_id, '_course_prerequisite',true );
+						$course_link = '<a href="' . esc_url( get_permalink( $prereq_course_id ) ) . '" title="' . esc_attr( get_the_title( $prereq_course_id ) ) . '">' . __( 'the previous course', 'woothemes-sensei' )  . '</a>';
+						$message = sprintf( __( 'Please complete %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
+						Sensei()->notices->add_notice( $message, 'alert' );
 
-                     } else {
+					 } else {
 
-	                    if( ! Sensei_Utils::user_started_course( $course_id, $current_user->ID )  ) {
+						if( ! Sensei_Utils::user_started_course( $course_id, $current_user->ID )  ) {
 
 
-		                    $a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">';
-		                    $a_element .= __( 'course', 'woothemes-sensei' );
-		                    $a_element .= '</a>';
+							$a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">';
+							$a_element .= __( 'course', 'woothemes-sensei' );
+							$a_element .= '</a>';
 
-		                    if( Sensei_Utils::is_preview_lesson( get_the_ID()  ) ){
+							if( Sensei_Utils::is_preview_lesson( get_the_ID()  ) ){
 
-			                    $message = sprintf( __( 'This is a preview lesson. Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element );
+								$message = sprintf( __( 'This is a preview lesson. Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element );
 
-		                    }else{
+							}else{
 
-			                    $message = sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element );
+								$message = sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element );
 
-		                    }
+							}
 
-		                    Sensei()->notices->add_notice( $message, 'info' );
+							Sensei()->notices->add_notice( $message, 'info' );
 
-	                    } // end if user started course
+						} // end if user started course
 
-                    }// end
+					}// end
 
-	               } else {
+				   } else {
 
-	                $a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">';
-	                $a_element .= __( 'course', 'woothemes-sensei' );
-	                $a_element .= '</a>';
+					$a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">';
+					$a_element .= __( 'course', 'woothemes-sensei' );
+					$a_element .= '</a>';
 
-	                if( Sensei_Utils::is_preview_lesson( get_the_ID()  ) ){
+					if( Sensei_Utils::is_preview_lesson( get_the_ID()  ) ){
 
 						$message = sprintf( __( 'This is a preview lesson. Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element );
 
@@ -3555,19 +3555,19 @@ 
 
 					Sensei()->notices->add_notice( $message, 'alert' );
 
-                 }
+				 }
 
-            } else { ?>
+			} else { ?>
 
 	            <?php if( ! Sensei_Utils::user_started_course( $course_id, get_current_user_id() ) &&  sensei_is_login_required() )  : ?>
 
 	                <div class="sensei-message alert">
 	                    <?php
-	                    $course_link =  '<a href="'
-	                                        . esc_url( get_permalink( $course_id ) )
-	                                        . '" title="' . __( 'Sign Up', 'woothemes-sensei' )
-	                                        . '">' . __( 'course', 'woothemes-sensei' )
-	                                    . '</a>';
+						$course_link =  '<a href="'
+											. esc_url( get_permalink( $course_id ) )
+											. '" title="' . __( 'Sign Up', 'woothemes-sensei' )
+											. '">' . __( 'course', 'woothemes-sensei' )
+										. '</a>';
 
 						if ( Sensei_Utils::is_preview_lesson( get_the_ID( ) ) ) {
 
@@ -3579,7 +3579,7 @@ 
 
 						}
 
-	                    ?>
+						?>
 	                </div>
 
 	            <?php endif; ?>
@@ -3589,75 +3589,75 @@ 
         </section>
 
         <?php
-    }// end course_signup_link
+	}// end course_signup_link
 
-    /**
-     * Show a message telling the user to complete the previous message if they haven't done so yet
-     *
-     * @since 1.9.0
-     */
-    public  static function prerequisite_complete_message(){
+	/**
+	 * Show a message telling the user to complete the previous message if they haven't done so yet
+	 *
+	 * @since 1.9.0
+	 */
+	public  static function prerequisite_complete_message(){
 
-        $lesson_prerequisite =  WooThemes_Sensei_Lesson::get_lesson_prerequisite_id( get_the_ID() );
-        $lesson_has_pre_requisite = $lesson_prerequisite > 0;
-        if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(  get_the_ID(), get_current_user_id() ) && $lesson_has_pre_requisite ) {
+		$lesson_prerequisite =  WooThemes_Sensei_Lesson::get_lesson_prerequisite_id( get_the_ID() );
+		$lesson_has_pre_requisite = $lesson_prerequisite > 0;
+		if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(  get_the_ID(), get_current_user_id() ) && $lesson_has_pre_requisite ) {
 
-            $prerequisite_lesson_link  = '<a href="' . esc_url( get_permalink( $lesson_prerequisite ) ) . '" title="' . esc_attr(  sprintf( __( 'You must first complete: %1$s', 'woothemes-sensei' ), get_the_title( $lesson_prerequisite ) ) ) . '">' . get_the_title( $lesson_prerequisite ). '</a>';
-            echo sprintf( __( 'You must first complete %1$s before viewing this Lesson', 'woothemes-sensei' ), $prerequisite_lesson_link );
+			$prerequisite_lesson_link  = '<a href="' . esc_url( get_permalink( $lesson_prerequisite ) ) . '" title="' . esc_attr(  sprintf( __( 'You must first complete: %1$s', 'woothemes-sensei' ), get_the_title( $lesson_prerequisite ) ) ) . '">' . get_the_title( $lesson_prerequisite ). '</a>';
+			echo sprintf( __( 'You must first complete %1$s before viewing this Lesson', 'woothemes-sensei' ), $prerequisite_lesson_link );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Deprecate the sensei_lesson_archive_header hook but keep it
-     * active for backwards compatibility.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_archive_header_hook(){
+	/**
+	 * Deprecate the sensei_lesson_archive_header hook but keep it
+	 * active for backwards compatibility.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_archive_header_hook(){
 
-        sensei_do_deprecated_action('sensei_lesson_archive_header', '1.9.0', 'sensei_loop_lesson_inside_before');
+		sensei_do_deprecated_action('sensei_lesson_archive_header', '1.9.0', 'sensei_loop_lesson_inside_before');
 
-    }
+	}
 
-    /**
-     * Outputs the the lesson archive header.
-     *
-     * @since  1.9.0
-     * @return void
-     */
-    public function the_archive_header( ) {
+	/**
+	 * Outputs the the lesson archive header.
+	 *
+	 * @since  1.9.0
+	 * @return void
+	 */
+	public function the_archive_header( ) {
 
-        $before_html = '<header class="archive-header"><h1>';
-        $after_html = '</h1></header>';
-        $html = $before_html .  __( 'Lessons Archive', 'woothemes-sensei' ) . $after_html;
+		$before_html = '<header class="archive-header"><h1>';
+		$after_html = '</h1></header>';
+		$html = $before_html .  __( 'Lessons Archive', 'woothemes-sensei' ) . $after_html;
 
-        echo apply_filters( 'sensei_lesson_archive_title', $html );
+		echo apply_filters( 'sensei_lesson_archive_title', $html );
 
-    } // sensei_course_archive_header()
+	} // sensei_course_archive_header()
 
-    /**
-     * Output the title for the single lesson page
-     *
-     * @global $post
-     * @since 1.9.0
-     */
-    public static function the_title(){
+	/**
+	 * Output the title for the single lesson page
+	 *
+	 * @global $post
+	 * @since 1.9.0
+	 */
+	public static function the_title(){
 
-        global $post;
+		global $post;
 
-        ?>
+		?>
         <header>
 
             <h1>
 
                 <?php
-                /**
-                 * Filter documented in class-sensei-messages.php the_title
-                 */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
-                ?>
+				/**
+				 * Filter documented in class-sensei-messages.php the_title
+				 */
+				echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+				?>
 
             </h1>
 
@@ -3665,75 +3665,75 @@ 
 
         <?php
 
-    }//the_title
+	}//the_title
 
-    /**
-     * Flush the rewrite rules for a lesson post type
-     *
-     * @since 1.9.0
-     *
-     * @param $post_id
-     */
-    public static function flush_rewrite_rules( $post_id ){
+	/**
+	 * Flush the rewrite rules for a lesson post type
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $post_id
+	 */
+	public static function flush_rewrite_rules( $post_id ){
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
 
-            return;
+			return;
 
-        }
+		}
 
 
-        if( 'lesson' == get_post_type( $post_id )  ){
+		if( 'lesson' == get_post_type( $post_id )  ){
 
-            Sensei()->initiate_rewrite_rules_flush();
+			Sensei()->initiate_rewrite_rules_flush();
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Output the quiz specific buttons and messaging on the single lesson page
-     *
-     *
-     * @since 1.0.0 moved here from frontend class
-     *
-     * @param int $lesson_id
-     * @param int $user_id
-     */
-    public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0 ) {
+	/**
+	 * Output the quiz specific buttons and messaging on the single lesson page
+	 *
+	 *
+	 * @since 1.0.0 moved here from frontend class
+	 *
+	 * @param int $lesson_id
+	 * @param int $user_id
+	 */
+	public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0 ) {
 
 
-        $lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
-        $user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
+		$lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
+		$user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
 
 
-	    if ( ! sensei_can_user_view_lesson( $lesson_id, $user_id ) ) {
-		    return;
-	    }
+		if ( ! sensei_can_user_view_lesson( $lesson_id, $user_id ) ) {
+			return;
+		}
 
-        $lesson_prerequisite       = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
-        $lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-        $quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
-        $show_actions              = is_user_logged_in() ? true : false;
+		$lesson_prerequisite       = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+		$lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
+		$quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
+		$show_actions              = is_user_logged_in() ? true : false;
 
-        if( intval( $lesson_prerequisite ) > 0 ) {
+		if( intval( $lesson_prerequisite ) > 0 ) {
 
-            // If the user hasn't completed the prereq then hide the current actions
-            $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id );
+			// If the user hasn't completed the prereq then hide the current actions
+			$show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id );
 
-        }
+		}
 
-        ?>
+		?>
 
         <footer>
 
             <?php
-            if( $show_actions && $quiz_id && Sensei()->access_settings() ) {
+			if( $show_actions && $quiz_id && Sensei()->access_settings() ) {
 
-                $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
-                if( $has_quiz_questions ) {
-                    ?>
+				$has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+				if( $has_quiz_questions ) {
+					?>
 
                     <p>
 
@@ -3748,123 +3748,123 @@ 
                     </p>
 
                     <?php
-                }
+				}
 
-            } // End If Statement
+			} // End If Statement
 
-            if ( $show_actions && ! $has_user_completed_lesson ) {
+			if ( $show_actions && ! $has_user_completed_lesson ) {
 
-                sensei_complete_lesson_button();
+				sensei_complete_lesson_button();
 
-            } elseif( $show_actions ) {
+			} elseif( $show_actions ) {
 
-                sensei_reset_lesson_button();
+				sensei_reset_lesson_button();
 
-            } // End If Statement
-            ?>
+			} // End If Statement
+			?>
 
         </footer>
 
         <?php
-    } // End sensei_lesson_quiz_meta()
+	} // End sensei_lesson_quiz_meta()
 
-    /**
-     * Show the lesson comments. This should be used in the loop.
-     *
-     * @since 1.9.0
-     */
-    public static function output_comments(){
+	/**
+	 * Show the lesson comments. This should be used in the loop.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function output_comments(){
 
-        if( ! is_user_logged_in() ){
-            return;
-        }
+		if( ! is_user_logged_in() ){
+			return;
+		}
 
-        $pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete( get_the_ID(), get_current_user_id() );
-        $course_id = Sensei()->lesson->get_course_id( get_the_ID() );
-        $allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
-        $user_taking_course = Sensei_Utils::user_started_course($course_id );
+		$pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete( get_the_ID(), get_current_user_id() );
+		$course_id = Sensei()->lesson->get_course_id( get_the_ID() );
+		$allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
+		$user_taking_course = Sensei_Utils::user_started_course($course_id );
 
-        $lesson_allow_comments = $allow_comments && $pre_requisite_complete  && $user_taking_course;
+		$lesson_allow_comments = $allow_comments && $pre_requisite_complete  && $user_taking_course;
 
-        if (  $lesson_allow_comments || is_singular( 'sensei_message' ) ) {
+		if (  $lesson_allow_comments || is_singular( 'sensei_message' ) ) {
 
-            comments_template();
+			comments_template();
 
-        } // End If Statement
+		} // End If Statement
 
-    } //output_comments
+	} //output_comments
 
-    /**
-     * Display the leeson quiz status if it should be shown
-     *
-     * @param int $lesson_id defaults to the global lesson id
-     * @param int $user_id defaults to the current user id
-     *
-     * @since 1.9.0
-     */
-    public static function user_lesson_quiz_status_message( $lesson_id = 0, $user_id = 0){
+	/**
+	 * Display the leeson quiz status if it should be shown
+	 *
+	 * @param int $lesson_id defaults to the global lesson id
+	 * @param int $user_id defaults to the current user id
+	 *
+	 * @since 1.9.0
+	 */
+	public static function user_lesson_quiz_status_message( $lesson_id = 0, $user_id = 0){
 
-        $lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
-        $user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
-        $lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-        $quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
+		$lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
+		$user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
+		$lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
+		$quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
 
 
-        if ( $quiz_id && is_user_logged_in()
-            && Sensei_Utils::user_started_course( $lesson_course_id, $user_id ) ) {
+		if ( $quiz_id && is_user_logged_in()
+			&& Sensei_Utils::user_started_course( $lesson_course_id, $user_id ) ) {
 
-            $no_quiz_count = 0;
-            $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+			$no_quiz_count = 0;
+			$has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
 
-            // Display lesson quiz status message
-            if ( $has_user_completed_lesson || $has_quiz_questions ) {
-                $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id, $user_id, true );
-                echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
-                if( $has_quiz_questions ) {
-                   // echo $status['extra'];
-                } // End If Statement
-            } // End If Statement
+			// Display lesson quiz status message
+			if ( $has_user_completed_lesson || $has_quiz_questions ) {
+				$status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id, $user_id, true );
+				echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+				if( $has_quiz_questions ) {
+				   // echo $status['extra'];
+				} // End If Statement
+			} // End If Statement
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * On the lesson archive limit the number of words the show up if the access settings are enabled
-     *
-     * @since 1.9.0
-     * @param $content
-     * @return string
-     */
-    public static function limit_archive_content ( $content ){
+	/**
+	 * On the lesson archive limit the number of words the show up if the access settings are enabled
+	 *
+	 * @since 1.9.0
+	 * @param $content
+	 * @return string
+	 */
+	public static function limit_archive_content ( $content ){
 
-        if( is_archive('lesson') && Sensei()->settings->get('access_permission') ){
+		if( is_archive('lesson') && Sensei()->settings->get('access_permission') ){
 
-            return wp_trim_words( $content, $num_words = 30, $more = '…' );
-        }
+			return wp_trim_words( $content, $num_words = 30, $more = '…' );
+		}
 
-        return $content;
+		return $content;
 
-    } // end limit_archive_content
+	} // end limit_archive_content
 
-    /**
-     * Returns all publised lesson ID's
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_all_lesson_ids(){
+	/**
+	 * Returns all publised lesson ID's
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_all_lesson_ids(){
 
-        return get_posts( array(
-            'post_type'=>'lesson',
-            'fields'=>'ids',
-            'post_status' => 'publish',
-            'numberposts' => 4000, // legacy support
-            'post_per_page' => 4000
-        ));
+		return get_posts( array(
+			'post_type'=>'lesson',
+			'fields'=>'ids',
+			'post_status' => 'publish',
+			'numberposts' => 4000, // legacy support
+			'post_per_page' => 4000
+		));
 
-    }
+	}
 
 } // End Class
 

templates/course-results/lessons.php

Indentation +74 added lines, -74 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying all course lessons on the course results page.
- *
- * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+		 * The Template for displaying all course lessons on the course results page.
+		 *
+		 * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
+		 *
+		 * @author 		Automattic
+		 * @package 	Sensei
+		 * @category    Templates
+		 * @version     1.9.0
+		 */
 
 global $course;
 ?>
@@ -17,13 +17,13 @@ 
 <?php if ( is_user_logged_in() ): ?>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, just above the lessons header.
-     * @since 1.4.0
-     */
-    do_action( 'sensei_course_results_before_lessons', $course->ID );
-    ?>
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, just above the lessons header.
+	 * @since 1.4.0
+	 */
+	do_action( 'sensei_course_results_before_lessons', $course->ID );
+	?>
 
     <header>
 
@@ -36,38 +36,38 @@ 
         <?php
 
 		$displayed_lessons = array();
-        $modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
+		$modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
 
-        // List modules with lessons
-        $course_has_lessons_in_modules = false;
-        foreach( $modules as $module ) {
+		// List modules with lessons
+		$course_has_lessons_in_modules = false;
+		foreach( $modules as $module ) {
 
-            $lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
-            $lessons = $lessons_query->get_posts();
+			$lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
+			$lessons = $lessons_query->get_posts();
 
-            if( count( $lessons ) > 0 ) {
+			if( count( $lessons ) > 0 ) {
 
-	            $course_has_lessons_in_modules = true;
+				$course_has_lessons_in_modules = true;
 
-	            ?>
+				?>
 
                 <h3> <?php echo $module->name; ?></h3>
 
                 <?php
-                $count = 0;
-                foreach( $lessons as $lesson ) {
-
-                    $lesson_grade = 'n/a';
-                    $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                    if ( $has_questions ) {
-                        $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
-                        // Get user quiz grade
-                        $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                        if ( $lesson_grade ) {
-                            $lesson_grade .= '%';
-                        }
-                    }
-                    ?>
+				$count = 0;
+				foreach( $lessons as $lesson ) {
+
+					$lesson_grade = 'n/a';
+					$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+					if ( $has_questions ) {
+						$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
+						// Get user quiz grade
+						$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+						if ( $lesson_grade ) {
+							$lesson_grade .= '%';
+						}
+					}
+					?>
                     <h2>
 
                         <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ); ?>"
@@ -85,46 +85,46 @@ 
 
                 <?php
 
-                }// end for each
+				}// end for each
 
-            }// end if count lesson
+			}// end if count lesson
 
-        } // end for each module
-        ?>
+		} // end for each module
+		?>
 
         <?php
 
-        $lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
-        if( 0 < count( $lessons ) ): ?>
+		$lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
+		if( 0 < count( $lessons ) ): ?>
 
 			<h3>
 
                 <?php
-                // lesson title will already appear above
-                if ( $course_has_lessons_in_modules ) {
-	                _e( 'Other Lessons', 'woothemes-sensei' );
-                }
-                ?>
+				// lesson title will already appear above
+				if ( $course_has_lessons_in_modules ) {
+					_e( 'Other Lessons', 'woothemes-sensei' );
+				}
+				?>
 
             </h3>
 
             <?php foreach ( $lessons as $lesson ): ?>
 
                 <?php
-                $lesson_grade = 'n/a';
-                $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                if ( $has_questions ) {
-                    $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
-                    // Get user quiz grade
-	                $lesson_grade = '';
-	                if( ! empty( $lesson_status ) ) {
-		                $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-		                if ( $lesson_grade ) {
-			                $lesson_grade .= '%';
-		                }
-	                }
-                }
-                ?>
+				$lesson_grade = 'n/a';
+				$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+				if ( $has_questions ) {
+					$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
+					// Get user quiz grade
+					$lesson_grade = '';
+					if( ! empty( $lesson_status ) ) {
+						$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+						if ( $lesson_grade ) {
+							$lesson_grade .= '%';
+						}
+					}
+				}
+				?>
 
                 <h2>
 
@@ -150,10 +150,10 @@ 
 
                 <?php
 
-                    $course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
-                    echo $course_user_grade . '%';
+					$course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
+					echo $course_user_grade . '%';
 
-                ?>
+				?>
 
             </span>
 
@@ -162,13 +162,13 @@ 
     </article>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, at the bottom of all lessons.
-     *
-     * @since 1.4.0
-     */
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, at the bottom of all lessons.
+	 *
+	 * @since 1.4.0
+	 */
 	do_action( 'sensei_course_results_after_lessons', $course->ID );
-    ?>
+	?>
 
 <?php endif; //user logged in ?>
\ No newline at end of file