woothemes / sensei

includes/class-sensei-grading.php

Indentation +419 added lines, -419 removed lines

@@ -20,8 +20,8 @@ 
 	/**
 	 * Constructor
 	 * @since  1.3.0
-     *
-     * @param $file
+	 *
+	 * @param $file
 	 */
 	public function __construct ( $file ) {
 		$this->name = __( 'Grading', 'woothemes-sensei' );
@@ -230,7 +230,7 @@ 
 	/**
 	 * Outputs Grading general headers
 	 * @since  1.3.0
-     * @param array $args
+	 * @param array $args
 	 * @return void
 	 */
 	public function grading_headers( $args = array( 'nav' => 'default' ) ) {
@@ -282,7 +282,7 @@ 
 		}
 		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -316,7 +316,7 @@ 
 		}
 		if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -365,15 +365,15 @@ 
 	public function count_statuses( $args = array() ) {
 		global  $wpdb;
 
-        /**
-         * Filter fires inside Sensei_Grading::count_statuses
-         *
-         * Alter the the post_in array to determine which posts the
-         * comment query should be limited to.
-         * @since 1.8.0
-         * @param array $args
-         */
-        $args = apply_filters( 'sensei_count_statuses_args', $args );
+		/**
+		 * Filter fires inside Sensei_Grading::count_statuses
+		 *
+		 * Alter the the post_in array to determine which posts the
+		 * comment query should be limited to.
+		 * @since 1.8.0
+		 * @param array $args
+		 */
+		$args = apply_filters( 'sensei_count_statuses_args', $args );
 
 		if ( 'course' == $args['type'] ) {
 			$type = 'sensei_course_status';
@@ -385,7 +385,7 @@ 
 
 		$query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s ";
 
-        // Restrict to specific posts
+		// Restrict to specific posts
 		if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) {
 			$query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')';
 		}
@@ -520,148 +520,148 @@ 
 		return $html;
 	} // End lessons_drop_down_html()
 
-    /**
-     * The process grading function handles admin grading submissions.
-     *
-     * This function is hooked on to admin_init. It simply accepts
-     * the grades as the Grader selected theme and saves the total grade and
-     * individual question grades.
-     *
-     * @return bool
-     */
-    public function admin_process_grading_submission() {
+	/**
+	 * The process grading function handles admin grading submissions.
+	 *
+	 * This function is hooked on to admin_init. It simply accepts
+	 * the grades as the Grader selected theme and saves the total grade and
+	 * individual question grades.
+	 *
+	 * @return bool
+	 */
+	public function admin_process_grading_submission() {
 
-        // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
-        if( ! isset( $_POST['sensei_manual_grade'] )
-            || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
-            || ! isset( $_GET['quiz_id'] )
-            || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
+		// NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
+		if( ! isset( $_POST['sensei_manual_grade'] )
+			|| ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
+			|| ! isset( $_GET['quiz_id'] )
+			|| $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
 
-            return false; //exit and do not grade
+			return false; //exit and do not grade
 
-        }
+		}
 
-        $quiz_id = $_GET['quiz_id'];
-        $user_id = $_GET['user'];
+		$quiz_id = $_GET['quiz_id'];
+		$user_id = $_GET['user'];
 
 
-        $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-        $quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $quiz_grade = 0;
-        $count = 0;
-        $quiz_grade_total = $_POST['quiz_grade_total'];
-        $all_question_grades = array();
-        $all_answers_feedback = array();
+		$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
+		$quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$quiz_grade = 0;
+		$count = 0;
+		$quiz_grade_total = $_POST['quiz_grade_total'];
+		$all_question_grades = array();
+		$all_answers_feedback = array();
 
-        foreach( $questions as $question ) {
+		foreach( $questions as $question ) {
 
-            ++$count;
-            $question_id = $question->ID;
+			++$count;
+			$question_id = $question->ID;
 
-            if( isset( $_POST[ 'question_' . $question_id ] ) ) {
+			if( isset( $_POST[ 'question_' . $question_id ] ) ) {
 
-                $question_grade = 0;
-                if( $_POST[ 'question_' . $question_id ] == 'right' ) {
+				$question_grade = 0;
+				if( $_POST[ 'question_' . $question_id ] == 'right' ) {
 
-                    $question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
+					$question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
 
-                }
+				}
 
-                // add data to the array that will, after the loop, be stored on the lesson status
-                $all_question_grades[ $question_id ] = $question_grade;
+				// add data to the array that will, after the loop, be stored on the lesson status
+				$all_question_grades[ $question_id ] = $question_grade;
 
-                // tally up the total quiz grade
-                $quiz_grade += $question_grade;
+				// tally up the total quiz grade
+				$quiz_grade += $question_grade;
 
-            } // endif
+			} // endif
 
-            // Question answer feedback / notes
-            $question_feedback = '';
-            if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
+			// Question answer feedback / notes
+			$question_feedback = '';
+			if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
 
-                $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
+				$question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
 
-            }
-            $all_answers_feedback[ $question_id ] = $question_feedback;
+			}
+			$all_answers_feedback[ $question_id ] = $question_feedback;
 
-        } // end for each $questions
+		} // end for each $questions
 
-        //store all question grades on the lesson status
-        Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
+		//store all question grades on the lesson status
+		Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
 
-        //store the feedback from grading
-        Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
+		//store the feedback from grading
+		Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
 
-        // $_POST['all_questions_graded'] is set when all questions have been graded
-        // in the class sensei grading user quiz -> display()
-        if( $_POST['all_questions_graded'] == 'yes' ) {
+		// $_POST['all_questions_graded'] is set when all questions have been graded
+		// in the class sensei grading user quiz -> display()
+		if( $_POST['all_questions_graded'] == 'yes' ) {
 
-            // set the users total quiz grade
+			// set the users total quiz grade
 			if ( 0 < intval( $quiz_grade_total ) ) {
-            $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
-
-            // Duplicating what Frontend->sensei_complete_quiz() does
-            $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-            $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
-            $lesson_metadata = array();
-            if ( $pass_required ) {
-                // Student has reached the pass mark and lesson is complete
-                if ( $quiz_passmark <= $grade ) {
-                    $lesson_status = 'passed';
-                }
-                else {
-                    $lesson_status = 'failed';
-                } // End If Statement
-            }
-            // Student only has to partake the quiz
-            else {
-                $lesson_status = 'graded';
-            }
-            $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
+
+			// Duplicating what Frontend->sensei_complete_quiz() does
+			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+			$quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+			$lesson_metadata = array();
+			if ( $pass_required ) {
+				// Student has reached the pass mark and lesson is complete
+				if ( $quiz_passmark <= $grade ) {
+					$lesson_status = 'passed';
+				}
+				else {
+					$lesson_status = 'failed';
+				} // End If Statement
+			}
+			// Student only has to partake the quiz
+			else {
+				$lesson_status = 'graded';
+			}
+			$lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
 
-            Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
+			Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
 
-            if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
+			if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
 
-                /**
-                 * Summary.
-                 *
-                 * Description.
-                 *
-                 * @since 1.7.0
-                 *
-                 * @param int  $user_id
-                 * @param int $quiz_lesson_id
-                 */
-                do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
+				/**
+				 * Summary.
+				 *
+				 * Description.
+				 *
+				 * @since 1.7.0
+				 *
+				 * @param int  $user_id
+				 * @param int $quiz_lesson_id
+				 */
+				do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
 
-            } // end if in_array
+			} // end if in_array
 
-        }// end if $_POST['all_que...
+		}// end if $_POST['all_que...
 
-        if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
+		if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        } elseif ( isset( $_POST['_wp_http_referer'] ) ) {
+		} elseif ( isset( $_POST['_wp_http_referer'] ) ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
+			$load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
 
-        } else {
+		} else {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        }
+		}
 
-        wp_safe_redirect( esc_url_raw( $load_url ) );
-        exit;
+		wp_safe_redirect( esc_url_raw( $load_url ) );
+		exit;
 
-    } // end admin_process_grading_submission
+	} // end admin_process_grading_submission
 
 	public function get_redirect_url() {
 		// Parse POST data
@@ -706,398 +706,398 @@ 
 		} // End If Statement
 	} // End sensei_grading_notices()
 
-    /**
-     * Grade quiz automatically
-     *
-     * This function grades each question automatically if there all questions are auto gradable. If not
-     * the quiz will not be auto gradable.
-     *
-     * @since 1.7.4
-     *
-     * @param  integer $quiz_id         ID of quiz
-     * @param  array $submitted questions id ans answers {
-     *          @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
-     *
-     * @return int $quiz_grade total sum of all question grades
-     */
-    public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
-
-        if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
-            || $quiz_grade_type != 'auto' ) {
-            return false; // exit early
-        }
-
-
-        $user_id = get_current_user_id();
-        $lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
-        $quiz_autogradable = true;
-
-        /**
-         * Filter the types of question types that can be automatically graded.
-         *
-         * This filter fires inside the auto grade quiz function and provides you with the default list.
-         *
-         * @param array {
-         *      'multiple-choice',
-         *      'boolean',
-         *      'gap-fill'.
-         * }
-         */
-        $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
-
-        $grade_total = 0;
-        $all_question_grades = array();
-        foreach( $submitted as $question_id => $answer ) {
-
-            // check if the question is autogradable, either by type, or because the grade is 0
-            $question_type = Sensei()->question->get_question_type( $question_id );
+	/**
+	 * Grade quiz automatically
+	 *
+	 * This function grades each question automatically if there all questions are auto gradable. If not
+	 * the quiz will not be auto gradable.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param  integer $quiz_id         ID of quiz
+	 * @param  array $submitted questions id ans answers {
+	 *          @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
+	 *
+	 * @return int $quiz_grade total sum of all question grades
+	 */
+	public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+
+		if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
+			|| $quiz_grade_type != 'auto' ) {
+			return false; // exit early
+		}
+
+
+		$user_id = get_current_user_id();
+		$lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
+		$quiz_autogradable = true;
+
+		/**
+		 * Filter the types of question types that can be automatically graded.
+		 *
+		 * This filter fires inside the auto grade quiz function and provides you with the default list.
+		 *
+		 * @param array {
+		 *      'multiple-choice',
+		 *      'boolean',
+		 *      'gap-fill'.
+		 * }
+		 */
+		$autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
+
+		$grade_total = 0;
+		$all_question_grades = array();
+		foreach( $submitted as $question_id => $answer ) {
+
+			// check if the question is autogradable, either by type, or because the grade is 0
+			$question_type = Sensei()->question->get_question_type( $question_id );
 			$achievable_grade = Sensei()->question->get_question_grade( $question_id );
 			// Question has a zero grade, so skip grading
 			if ( 0 == $achievable_grade ) {
 				$all_question_grades[ $question_id ] = $achievable_grade;
 			}
-            elseif ( in_array( $question_type, $autogradable_question_types ) ) {
-                // Get user question grade
-                $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
-                $all_question_grades[ $question_id ] = $question_grade;
-                $grade_total += $question_grade;
+			elseif ( in_array( $question_type, $autogradable_question_types ) ) {
+				// Get user question grade
+				$question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
+				$all_question_grades[ $question_id ] = $question_grade;
+				$grade_total += $question_grade;
 
-            } else {
+			} else {
 
-                // There is a question that cannot be autograded
-                $quiz_autogradable = false;
+				// There is a question that cannot be autograded
+				$quiz_autogradable = false;
 
-            } // end if in_array( $question_type...
+			} // end if in_array( $question_type...
 
-        }// end for each question
+		}// end for each question
 
-        // Only if the whole quiz was autogradable do we set a grade
-        if ( $quiz_autogradable ) {
+		// Only if the whole quiz was autogradable do we set a grade
+		if ( $quiz_autogradable ) {
 
-            $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
+			$quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
 			// Check for zero total from grades
 			if ( 0 < $quiz_total ) {
-            $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
 
-        } else {
+		} else {
 
-            $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
+			$grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
 
-        }
-
-        // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
-        // when doing manual grading.
-        Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
+		}
 
-        return $grade;
+		// store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
+		// when doing manual grading.
+		Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
 
-    } // End grade_quiz_auto()
+		return $grade;
 
-    /**
-     * Grade question automatically
-     *
-     * This function checks the question typ and then grades it accordingly.
-     *
-     * @since 1.7.4
-     *
-     * @param integer $question_id
-     * @param string $question_type of the standard Sensei question types
-     * @param string $answer
-     * @param int $user_id
-     *
-     * @return int $question_grade
-     */
-    public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
-
-        if( intval( $user_id ) == 0 ) {
-
-            $user_id = get_current_user_id();
-
-        }
-
-        if( ! ( intval( $question_id ) > 0 ) ) {
-
-            return false;
-
-        }
-
-
-        Sensei()->question->get_question_type( $question_id );
-
-        /**
-         * Applying a grade before the auto grading takes place.
-         *
-         * This filter is applied just before the question is auto graded. It fires in the context of a single question
-         * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
-         * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
-         *
-         * @param int $question_grade default false
-         * @param int $question_id
-         * @param string $question_type one of the Sensei question type.
-         * @param string $answer user supplied question answer
-         */
-        $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
+	} // End grade_quiz_auto()
 
-        if ( false !== $question_grade ) {
+	/**
+	 * Grade question automatically
+	 *
+	 * This function checks the question typ and then grades it accordingly.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param integer $question_id
+	 * @param string $question_type of the standard Sensei question types
+	 * @param string $answer
+	 * @param int $user_id
+	 *
+	 * @return int $question_grade
+	 */
+	public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
 
-            return $question_grade;
+		if( intval( $user_id ) == 0 ) {
 
-        }
+			$user_id = get_current_user_id();
 
-        // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+		}
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+		if( ! ( intval( $question_id ) > 0 ) ) {
 
-            if( 0 == get_magic_quotes_gpc() ) {
-                $answer = wp_unslash( $answer );
-            }
-            $answer = (array) $answer;
-            if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
-                // Loop through all answers ensure none are 'missing'
-                $all_correct = true;
-                foreach ( $answer as $check_answer ) {
-                    if ( !in_array( $check_answer, $right_answer ) ) {
-                        $all_correct = false;
-                    }
-                }
-                // If all correct then grade
-                if ( $all_correct ) {
-                    $question_grade = Sensei()->question->get_question_grade( $question_id );
-                }
-            }
+			return false;
 
-        } elseif( 'gap-fill' == $question_type ){
+		}
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-        } else{
+		Sensei()->question->get_question_type( $question_id );
 
-            /**
-             * Grading questions that are not auto gradable.
-             *
-             * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
-             * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
-             *
-             * @param int $question_grade default zero
-             * @param int $question_id
-             * @param string $question_type one of the Sensei question type.
-             * @param string $answer user supplied question answer
-             */
-            $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
+		/**
+		 * Applying a grade before the auto grading takes place.
+		 *
+		 * This filter is applied just before the question is auto graded. It fires in the context of a single question
+		 * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
+		 * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
+		 *
+		 * @param int $question_grade default false
+		 * @param int $question_id
+		 * @param string $question_type one of the Sensei question type.
+		 * @param string $answer user supplied question answer
+		 */
+		$question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
 
-        } // end if $question_type
+		if ( false !== $question_grade ) {
 
-        return $question_grade;
-    } // end grade_question_auto
+			return $question_grade;
 
-    /**
-     * Grading logic specifically for the gap fill questions
-     *
-     * @since 1.9.0
-     * @param $question_id
-     * @param $user_answer
-     *
-     * @return bool | int false or the grade given to the user answer
-     */
-    public static function grade_gap_fill_question( $question_id, $user_answer ){
+		}
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+		// auto grading core
+		if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
 
-        if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
-            $user_answer = wp_unslash( $user_answer );
-        }
+			$right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
 
-        /**
-         * case sensitive grading filter
-         *
-         * alter the value simply use this code in your plugin or the themes functions.php
-         * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
-         *
-         * @param bool $do_case_sensitive_comparison default false.
-         *
-         * @since 1.9.0
-         */
-        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
+			if( 0 == get_magic_quotes_gpc() ) {
+				$answer = wp_unslash( $answer );
+			}
+			$answer = (array) $answer;
+			if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
+				// Loop through all answers ensure none are 'missing'
+				$all_correct = true;
+				foreach ( $answer as $check_answer ) {
+					if ( !in_array( $check_answer, $right_answer ) ) {
+						$all_correct = false;
+					}
+				}
+				// If all correct then grade
+				if ( $all_correct ) {
+					$question_grade = Sensei()->question->get_question_grade( $question_id );
+				}
+			}
 
-        if( $do_case_sensitive_comparison ){
+		} elseif( 'gap-fill' == $question_type ){
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
+			$question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-                return Sensei()->question->get_question_grade( $question_id );
+		} else{
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+			/**
+			 * Grading questions that are not auto gradable.
+			 *
+			 * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
+			 * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
+			 *
+			 * @param int $question_grade default zero
+			 * @param int $question_id
+			 * @param string $question_type one of the Sensei question type.
+			 * @param string $answer user supplied question answer
+			 */
+			$question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+		} // end if $question_type
 
-                    return Sensei()->question->get_question_grade($question_id);
+		return $question_grade;
+	} // end grade_question_auto
 
-                }else{
+	/**
+	 * Grading logic specifically for the gap fill questions
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 * @param $user_answer
+	 *
+	 * @return bool | int false or the grade given to the user answer
+	 */
+	public static function grade_gap_fill_question( $question_id, $user_answer ){
 
-                    return false;
+		$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
+		$gapfill_array = explode( '||', $right_answer );
 
-                }
+		if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
+			$user_answer = wp_unslash( $user_answer );
+		}
 
-            }else{
+		/**
+		 * case sensitive grading filter
+		 *
+		 * alter the value simply use this code in your plugin or the themes functions.php
+		 * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
+		 *
+		 * @param bool $do_case_sensitive_comparison default false.
+		 *
+		 * @since 1.9.0
+		 */
+		$do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
 
-                return false;
+		if( $do_case_sensitive_comparison ){
 
-            }
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
 
-        }else{
+				return Sensei()->question->get_question_grade( $question_id );
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
 
-               return Sensei()->question->get_question_grade( $question_id );
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+					return Sensei()->question->get_question_grade($question_id);
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+				}else{
 
-                    return  Sensei()->question->get_question_grade( $question_id );
+					return false;
 
-                }else{
+				}
 
-                    return false;
+			}else{
 
-                }
+				return false;
 
-            }else{
+			}
+
+		}else{
+
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+
+			   return Sensei()->question->get_question_grade( $question_id );
+
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+
+					return  Sensei()->question->get_question_grade( $question_id );
+
+				}else{
+
+					return false;
+
+				}
 
-                return false;
+			}else{
+
+				return false;
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Counts the lessons that have been graded manually and automatically
+	 *
+	 * @since 1.9.0
+	 * @return int $number_of_graded_lessons
+	 */
+	public static function get_graded_lessons_count(){
 
-            }
+		global $wpdb;
 
-        }
+		$comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Counts the lessons that have been graded manually and automatically
-     *
-     * @since 1.9.0
-     * @return int $number_of_graded_lessons
-     */
-    public static function get_graded_lessons_count(){
+		return $number_of_graded_lessons;
+	}
 
-        global $wpdb;
+	/**
+	 * Add together all the graded lesson grades
+	 *
+	 * @since 1.9.0
+	 * @return double $sum_of_all_grades
+	 */
+	public static function get_graded_lessons_sum(){
 
-        $comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $number_of_graded_lessons;
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Add together all the graded lesson grades
-     *
-     * @since 1.9.0
-     * @return double $sum_of_all_grades
-     */
-    public static function get_graded_lessons_sum(){
+		return $sum_of_all_grades;
 
-        global $wpdb;
+	}
 
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+	/**
+	 * Get the sum of all grades for the given user.
+	 *
+	 * @since 1.9.0
+	 * @param $user_id
+	 * @return double
+	 */
+	public static function get_user_graded_lessons_sum( $user_id ){
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$clean_user_id = esc_sql( $user_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $sum_of_all_grades;
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    }
+		return $sum_of_all_grades;
+	}
 
-    /**
-     * Get the sum of all grades for the given user.
-     *
-     * @since 1.9.0
-     * @param $user_id
-     * @return double
-     */
-    public static function get_user_graded_lessons_sum( $user_id ){
-        global $wpdb;
+	/**
+	 * Get the sum of all user grades for the given lesson.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int lesson_id
+	 * @return double
+	 */
+	public static function get_lessons_users_grades_sum( $lesson_id ){
 
-        $clean_user_id = esc_sql( $user_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$clean_lesson_id = esc_sql( $lesson_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $sum_of_all_grades;
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Get the sum of all user grades for the given lesson.
-     *
-     * @since 1.9.0
-     *
-     * @param int lesson_id
-     * @return double
-     */
-    public static function get_lessons_users_grades_sum( $lesson_id ){
+		return $sum_of_all_grades;
 
-        global $wpdb;
+	}//get_lessons_user_grades_sum
 
-        $clean_lesson_id = esc_sql( $lesson_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+	/**
+	 * Get the sum of all user grades for the given course.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int $course_id
+	 * @return double
+	 */
+	public static function get_course_users_grades_sum( $course_id ){
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		global $wpdb;
 
-        return $sum_of_all_grades;
+		$clean_course_id = esc_sql( $course_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-    }//get_lessons_user_grades_sum
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Get the sum of all user grades for the given course.
-     *
-     * @since 1.9.0
-     *
-     * @param int $course_id
-     * @return double
-     */
-    public static function get_course_users_grades_sum( $course_id ){
-
-        global $wpdb;
-
-        $clean_course_id = esc_sql( $course_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		return $sum_of_all_grades;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
-
-        return $sum_of_all_grades;
-
-    }//get_lessons_user_grades_sum
+	}//get_lessons_user_grades_sum
 
 } // End Class
 

Spacing +280 added lines, -280 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Grading Class
@@ -23,30 +23,30 @@ 
      *
      * @param $file
 	 */
-	public function __construct ( $file ) {
-		$this->name = __( 'Grading', 'woothemes-sensei' );
+	public function __construct($file) {
+		$this->name = __('Grading', 'woothemes-sensei');
 		$this->file = $file;
 		$this->page_slug = 'sensei_grading';
 
 		// Admin functions
-		if ( is_admin() ) {
-			add_action( 'admin_menu', array( $this, 'grading_admin_menu' ), 20);
-			add_action( 'grading_wrapper_container', array( $this, 'wrapper_container'  ) );
-			if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-				add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-				add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (is_admin()) {
+			add_action('admin_menu', array($this, 'grading_admin_menu'), 20);
+			add_action('grading_wrapper_container', array($this, 'wrapper_container'));
+			if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+				add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+				add_action('admin_print_styles', array($this, 'enqueue_styles'));
 			}
 
-			add_action( 'admin_init', array( $this, 'admin_process_grading_submission' ) );
+			add_action('admin_init', array($this, 'admin_process_grading_submission'));
 
-			add_action( 'admin_notices', array( $this, 'add_grading_notices' ) );
+			add_action('admin_notices', array($this, 'add_grading_notices'));
 //			add_action( 'sensei_grading_notices', array( $this, 'sensei_grading_notices' ) );
 		} // End If Statement
 
 		// Ajax functions
-		if ( is_admin() ) {
-			add_action( 'wp_ajax_get_lessons_dropdown', array( $this, 'get_lessons_dropdown' ) );
-			add_action( 'wp_ajax_get_redirect_url', array( $this, 'get_redirect_url' ) );
+		if (is_admin()) {
+			add_action('wp_ajax_get_lessons_dropdown', array($this, 'get_lessons_dropdown'));
+			add_action('wp_ajax_get_redirect_url', array($this, 'get_redirect_url'));
 		} // End If Statement
 	} // End __construct()
 
@@ -59,8 +59,8 @@ 
 	public function grading_admin_menu() {
 		global $menu;
 
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
-			$grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'),  __('Grading', 'woothemes-sensei') , 'manage_sensei_grades', $this->page_slug, array( $this, 'grading_page' ) );
+		if (current_user_can('manage_sensei_grades')) {
+			$grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'), __('Grading', 'woothemes-sensei'), 'manage_sensei_grades', $this->page_slug, array($this, 'grading_page'));
 		}
 
 	} // End grading_admin_menu()
@@ -73,12 +73,12 @@ 
 	 * @since 1.3.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// Load Grading JS
-		wp_enqueue_script( 'sensei-grading-general', Sensei()->plugin_url . 'assets/js/grading-general' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+		wp_enqueue_script('sensei-grading-general', Sensei()->plugin_url.'assets/js/grading-general'.$suffix.'.js', array('jquery'), Sensei()->version);
 
 	} // End enqueue_scripts()
 
@@ -90,11 +90,11 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( Sensei()->token . '-admin' );
+		wp_enqueue_style(Sensei()->token.'-admin');
 
-		wp_enqueue_style( 'woothemes-sensei-settings-api', Sensei()->plugin_url . 'assets/css/settings.css', '', Sensei()->version );
+		wp_enqueue_style('woothemes-sensei-settings-api', Sensei()->plugin_url.'assets/css/settings.css', '', Sensei()->version);
 
 	} // End enqueue_styles()
 
@@ -106,12 +106,12 @@ 
 	public function load_data_table_files() {
 
 		// Load Grading Classes
-		$classes_to_load = array(	'list-table',
+		$classes_to_load = array('list-table',
 									'grading-main',
 									'grading-user-quiz'
 									);
-		foreach ( $classes_to_load as $class_file ) {
-			Sensei()->load_class( $class_file );
+		foreach ($classes_to_load as $class_file) {
+			Sensei()->load_class($class_file);
 		} // End For Loop
 	} // End load_data_table_files()
 
@@ -123,16 +123,16 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_data_object( $name = '', $data = 0, $optional_data = null ) {
+	public function load_data_object($name = '', $data = 0, $optional_data = null) {
 		// Load Analysis data
-		$object_name = 'WooThemes_Sensei_Grading_' . $name;
-		if ( is_null($optional_data) ) {
-			$sensei_grading_object = new $object_name( $data );
+		$object_name = 'WooThemes_Sensei_Grading_'.$name;
+		if (is_null($optional_data)) {
+			$sensei_grading_object = new $object_name($data);
 		}
 		else {
-			$sensei_grading_object = new $object_name( $data, $optional_data );
+			$sensei_grading_object = new $object_name($data, $optional_data);
 		} // End If Statement
-		if ( 'Main' == $name ) {
+		if ('Main' == $name) {
 			$sensei_grading_object->prepare_items();
 		} // End If Statement
 		return $sensei_grading_object;
@@ -146,7 +146,7 @@ 
 	 */
 	public function grading_page() {
 
-		if ( isset( $_GET['quiz_id'] ) && 0 < intval( $_GET['quiz_id'] ) && isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
+		if (isset($_GET['quiz_id']) && 0 < intval($_GET['quiz_id']) && isset($_GET['user']) && 0 < intval($_GET['user'])) {
 			$this->grading_user_quiz_view();
 		}
 		else {
@@ -162,23 +162,23 @@ 
 	public function grading_default_view() {
 
 		// Load Grading data
-		if( !empty( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
+		if ( ! empty($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
 		}
-		if( !empty( $_GET['lesson_id'] ) ) {
-			$lesson_id = intval( $_GET['lesson_id'] );
+		if ( ! empty($_GET['lesson_id'])) {
+			$lesson_id = intval($_GET['lesson_id']);
 		}
-		if( !empty( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
+		if ( ! empty($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
 		}
-		if( !empty( $_GET['view'] ) ) {
-			$view = esc_html( $_GET['view'] );
+		if ( ! empty($_GET['view'])) {
+			$view = esc_html($_GET['view']);
 		}
-		$sensei_grading_overview = $this->load_data_object( 'Main', compact( 'course_id', 'lesson_id', 'user_id', 'view' ) );
+		$sensei_grading_overview = $this->load_data_object('Main', compact('course_id', 'lesson_id', 'user_id', 'view'));
 
 		// Wrappers
-		do_action( 'grading_before_container' );
-		do_action( 'grading_wrapper_container', 'top' );
+		do_action('grading_before_container');
+		do_action('grading_wrapper_container', 'top');
 		$this->grading_headers();
 		?>
 		<div id="poststuff" class="sensei-grading-wrap">
@@ -186,12 +186,12 @@ 
 				<?php $sensei_grading_overview->display(); ?>
 			</div>
 			<div class="sensei-grading-extra">
-				<?php do_action( 'sensei_grading_extra' ); ?>
+				<?php do_action('sensei_grading_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'grading_wrapper_container', 'bottom' );
-		do_action( 'grading_after_container' );
+		do_action('grading_wrapper_container', 'bottom');
+		do_action('grading_after_container');
 	} // End grading_default_view()
 
 	/**
@@ -204,17 +204,17 @@ 
 		// Load Grading data
 		$user_id = 0;
 		$quiz_id = 0;
-		if( isset( $_GET['user'] ) ) {
-			$user_id = intval( $_GET['user'] );
+		if (isset($_GET['user'])) {
+			$user_id = intval($_GET['user']);
 		}
-		if( isset( $_GET['quiz_id'] ) ) {
-			$quiz_id = intval( $_GET['quiz_id'] );
+		if (isset($_GET['quiz_id'])) {
+			$quiz_id = intval($_GET['quiz_id']);
 		}
-		$sensei_grading_user_profile = $this->load_data_object( 'User_Quiz', $user_id, $quiz_id );
+		$sensei_grading_user_profile = $this->load_data_object('User_Quiz', $user_id, $quiz_id);
 		// Wrappers
-		do_action( 'grading_before_container' );
-		do_action( 'grading_wrapper_container', 'top' );
-		$this->grading_headers( array( 'nav' => 'user_quiz' ) );
+		do_action('grading_before_container');
+		do_action('grading_wrapper_container', 'top');
+		$this->grading_headers(array('nav' => 'user_quiz'));
 		?>
 		<div id="poststuff" class="sensei-grading-wrap user-profile">
 			<div class="sensei-grading-main">
@@ -223,8 +223,8 @@ 
 			</div>
 		</div>
 		<?php
-		do_action( 'grading_wrapper_container', 'bottom' );
-		do_action( 'grading_after_container' );
+		do_action('grading_wrapper_container', 'bottom');
+		do_action('grading_after_container');
 	} // End grading_user_quiz_view()
 
 	/**
@@ -233,14 +233,14 @@ 
      * @param array $args
 	 * @return void
 	 */
-	public function grading_headers( $args = array( 'nav' => 'default' ) ) {
+	public function grading_headers($args = array('nav' => 'default')) {
 
-		$function = 'grading_' . $args['nav'] . '_nav';
+		$function = 'grading_'.$args['nav'].'_nav';
 		$this->$function();
 		?>
-			<p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
+			<p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
 		<?php
-		do_action( 'sensei_grading_after_headers' );
+		do_action('sensei_grading_after_headers');
 	} // End grading_headers()
 
 	/**
@@ -249,10 +249,10 @@ 
 	 * @param $which string
 	 * @return void
 	 */
-	public function wrapper_container( $which ) {
-		if ( 'top' == $which ) {
+	public function wrapper_container($which) {
+		if ('top' == $which) {
 			?><div id="woothemes-sensei" class="wrap woothemes-sensei"><?php
-		} elseif ( 'bottom' == $which ) {
+		} elseif ('bottom' == $which) {
 			?></div><!--/#woothemes-sensei--><?php
 		} // End If Statement
 	} // End wrapper_container()
@@ -265,29 +265,29 @@ 
 	public function grading_default_nav() {
 		global  $wp_version;
 
-		$title = sprintf( '<a href="%s">%s</a>', esc_url(add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 			}
 			else {
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title( $course_id ) ); 
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title($course_id)); 
 			}
 		}
-		if ( isset( $_GET['lesson_id'] ) ) { 
-			$lesson_id = intval( $_GET['lesson_id'] );
-			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;' . get_the_title( intval( $lesson_id ) ) . '</span>'; 
+		if (isset($_GET['lesson_id'])) { 
+			$lesson_id = intval($_GET['lesson_id']);
+			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;'.get_the_title(intval($lesson_id)).'</span>'; 
 		}
-		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
+		if (isset($_GET['user_id']) && 0 < intval($_GET['user_id'])) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
-			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
+            $user_name = Sensei_Learner::get_full_name($_GET['user_id']);
+			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;'.$user_name.'</span>';
 
 		} // End If Statement
 		?>
-			<h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2>
+			<h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2>
 		<?php
 	} // End grading_default_nav()
 
@@ -299,29 +299,29 @@ 
 	public function grading_user_quiz_nav() {
 		global  $wp_version;
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['quiz_id'] ) ) { 
-			$quiz_id = intval( $_GET['quiz_id'] );
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['quiz_id'])) { 
+			$quiz_id = intval($_GET['quiz_id']);
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 			}
 			else {
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title( $course_id ) ); 
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title($course_id)); 
 			}
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $lesson_id ) );
+			$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($lesson_id));
 		}
-		if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
+		if (isset($_GET['user']) && 0 < intval($_GET['user'])) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user'] );
-			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
+            $user_name = Sensei_Learner::get_full_name($_GET['user']);
+			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;'.$user_name.'</span>';
 
 		} // End If Statement
 		?>
-			<h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2>
+			<h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2>
 		<?php
 	} // End grading_user_quiz_nav()
 
@@ -330,9 +330,9 @@ 
 	 * @since  1.7.0
 	 * @return array
 	 */
-	public function get_stati( $type ) {
+	public function get_stati($type) {
 		$statuses = array();
-		switch( $type ) {
+		switch ($type) {
 			case 'course' :
 				$statuses = array(
 					'in-progress',
@@ -362,7 +362,7 @@ 
 	 * @param  array $args (default: array())
 	 * @return object
 	 */
-	public function count_statuses( $args = array() ) {
+	public function count_statuses($args = array()) {
 		global  $wpdb;
 
         /**
@@ -373,71 +373,71 @@ 
          * @since 1.8.0
          * @param array $args
          */
-        $args = apply_filters( 'sensei_count_statuses_args', $args );
+        $args = apply_filters('sensei_count_statuses_args', $args);
 
-		if ( 'course' == $args['type'] ) {
+		if ('course' == $args['type']) {
 			$type = 'sensei_course_status';
 		}
 		else {
 			$type = 'sensei_lesson_status';
 		}
-		$cache_key = 'sensei-' . $args['type'] . '-statuses';
+		$cache_key = 'sensei-'.$args['type'].'-statuses';
 
 		$query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s ";
 
         // Restrict to specific posts
-		if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) {
-			$query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')';
+		if (isset($args['post__in']) && ! empty($args['post__in']) && is_array($args['post__in'])) {
+			$query .= ' AND comment_post_ID IN ('.implode(',', array_map('absint', $args['post__in'])).')';
 		}
-		elseif ( !empty( $args['post_id'] ) ) {
-			$query .= $wpdb->prepare( ' AND comment_post_ID = %d', $args['post_id'] );
+		elseif ( ! empty($args['post_id'])) {
+			$query .= $wpdb->prepare(' AND comment_post_ID = %d', $args['post_id']);
 		}
 		// Restrict to specific users
-		if ( isset( $args['user_id'] ) && is_array( $args['user_id'] ) ) {
-			$query .= ' AND user_id IN (' . implode( ',', array_map( 'absint', $args['user_id'] ) ) . ')';
+		if (isset($args['user_id']) && is_array($args['user_id'])) {
+			$query .= ' AND user_id IN ('.implode(',', array_map('absint', $args['user_id'])).')';
 		}
-		elseif ( !empty( $args['user_id'] ) ) {
-			$query .= $wpdb->prepare( ' AND user_id = %d', $args['user_id'] );
+		elseif ( ! empty($args['user_id'])) {
+			$query .= $wpdb->prepare(' AND user_id = %d', $args['user_id']);
 		}
 		$query .= ' GROUP BY comment_approved';
 
-		$counts = wp_cache_get( $cache_key, 'counts' );
-		if ( false === $counts ) {
-			$sql = $wpdb->prepare( $query, $type );
-			$results = (array) $wpdb->get_results( $sql, ARRAY_A );
-			$counts = array_fill_keys( $this->get_stati( $type ), 0 );
+		$counts = wp_cache_get($cache_key, 'counts');
+		if (false === $counts) {
+			$sql = $wpdb->prepare($query, $type);
+			$results = (array) $wpdb->get_results($sql, ARRAY_A);
+			$counts = array_fill_keys($this->get_stati($type), 0);
 
-			foreach ( $results as $row ) {
-				$counts[ $row['comment_approved'] ] = $row['total'];
+			foreach ($results as $row) {
+				$counts[$row['comment_approved']] = $row['total'];
 			}
-			wp_cache_set( $cache_key, $counts, 'counts' );
+			wp_cache_set($cache_key, $counts, 'counts');
 		}
 
-		if( ! isset( $counts['graded'] ) ) {
+		if ( ! isset($counts['graded'])) {
 			$counts['graded'] = 0;
 		}
 
-		if( ! isset( $counts['ungraded'] ) ) {
+		if ( ! isset($counts['ungraded'])) {
 			$counts['ungraded'] = 0;
 		}
 
-		if( ! isset( $counts['passed'] ) ) {
+		if ( ! isset($counts['passed'])) {
 			$counts['passed'] = 0;
 		}
 
-		if( ! isset( $counts['failed'] ) ) {
+		if ( ! isset($counts['failed'])) {
 			$counts['failed'] = 0;
 		}
 
-		if( ! isset( $counts['in-progress'] ) ) {
+		if ( ! isset($counts['in-progress'])) {
 			$counts['in-progress'] = 0;
 		}
 
-		if( ! isset( $counts['complete'] ) ) {
+		if ( ! isset($counts['complete'])) {
 			$counts['complete'] = 0;
 		}
 
-		return apply_filters( 'sensei_count_statuses', $counts, $type );
+		return apply_filters('sensei_count_statuses', $counts, $type);
 	} // End sensei_count_statuses()
 
 	/**
@@ -445,11 +445,11 @@ 
 	 * @since  1.7.0
 	 * @return string
 	 */
-	public function courses_drop_down_html( $selected_course_id = 0 ) {
+	public function courses_drop_down_html($selected_course_id = 0) {
 
 		$html = '';
 
-		$course_args = array(   'post_type'         => 'course',
+		$course_args = array('post_type'         => 'course',
 								'posts_per_page'       => -1,
 								'orderby'           => 'title',
 								'order'             => 'ASC',
@@ -457,12 +457,12 @@ 
 								'suppress_filters'  => 0,
 								'fields'            => 'ids',
 							);
-		$courses = get_posts( apply_filters( 'sensei_grading_filter_courses', $course_args ) );
+		$courses = get_posts(apply_filters('sensei_grading_filter_courses', $course_args));
 
-		$html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>';
-		if ( count( $courses ) > 0 ) {
-			foreach ($courses as $course_id){
-				$html .= '<option value="' . esc_attr( absint( $course_id ) ) . '" ' . selected( $course_id, $selected_course_id, false ) . '>' . esc_html( get_the_title( $course_id ) ) . '</option>' . "\n";
+		$html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>';
+		if (count($courses) > 0) {
+			foreach ($courses as $course_id) {
+				$html .= '<option value="'.esc_attr(absint($course_id)).'" '.selected($course_id, $selected_course_id, false).'>'.esc_html(get_the_title($course_id)).'</option>'."\n";
 			} // End For Loop
 		} // End If Statement
 
@@ -483,20 +483,20 @@ 
 		$course_data = array();
 		parse_str($data, $course_data);
 
-		$course_id = intval( $course_data['course_id'] );
+		$course_id = intval($course_data['course_id']);
 
-		$html = $this->lessons_drop_down_html( $course_id );
+		$html = $this->lessons_drop_down_html($course_id);
 
 		echo $html;
 		die(); // WordPress may print out a spurious zero without this can be particularly bad if using JSON
 	}
 
-	public function lessons_drop_down_html( $course_id = 0, $selected_lesson_id = 0 ) {
+	public function lessons_drop_down_html($course_id = 0, $selected_lesson_id = 0) {
 
 		$html = '';
-		if ( 0 < intval( $course_id ) ) {
+		if (0 < intval($course_id)) {
 
-			$lesson_args = array( 'post_type'       => 'lesson',
+			$lesson_args = array('post_type'       => 'lesson',
 								'posts_per_page'       => -1,
 								'orderby'           => 'title',
 								'order'             => 'ASC',
@@ -506,12 +506,12 @@ 
 								'suppress_filters'  => 0,
 								'fields'            => 'ids',
 								);
-			$lessons = get_posts( apply_filters( 'sensei_grading_filter_lessons', $lesson_args ) );
+			$lessons = get_posts(apply_filters('sensei_grading_filter_lessons', $lesson_args));
 
-			$html .= '<option value="">' . __( 'Select a lesson', 'woothemes-sensei' ) . '</option>';
-			if ( count( $lessons ) > 0 ) {
-				foreach ( $lessons as $lesson_id ){
-					$html .= '<option value="' . esc_attr( absint( $lesson_id ) ) . '" ' . selected( $lesson_id, $selected_lesson_id, false ) . '>' . esc_html( get_the_title( $lesson_id ) ) . '</option>' . "\n";
+			$html .= '<option value="">'.__('Select a lesson', 'woothemes-sensei').'</option>';
+			if (count($lessons) > 0) {
+				foreach ($lessons as $lesson_id) {
+					$html .= '<option value="'.esc_attr(absint($lesson_id)).'" '.selected($lesson_id, $selected_lesson_id, false).'>'.esc_html(get_the_title($lesson_id)).'</option>'."\n";
 				} // End For Loop
 			} // End If Statement
 
@@ -532,10 +532,10 @@ 
     public function admin_process_grading_submission() {
 
         // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
-        if( ! isset( $_POST['sensei_manual_grade'] )
-            || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
-            || ! isset( $_GET['quiz_id'] )
-            || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
+        if ( ! isset($_POST['sensei_manual_grade'])
+            || ! wp_verify_nonce($_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading')
+            || ! isset($_GET['quiz_id'])
+            || $_GET['quiz_id'] != $_POST['sensei_manual_grade']) {
 
             return false; //exit and do not grade
 
@@ -545,30 +545,30 @@ 
         $user_id = $_GET['user'];
 
 
-        $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-        $quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+        $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+        $quiz_lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $quiz_grade = 0;
         $count = 0;
         $quiz_grade_total = $_POST['quiz_grade_total'];
         $all_question_grades = array();
         $all_answers_feedback = array();
 
-        foreach( $questions as $question ) {
+        foreach ($questions as $question) {
 
             ++$count;
             $question_id = $question->ID;
 
-            if( isset( $_POST[ 'question_' . $question_id ] ) ) {
+            if (isset($_POST['question_'.$question_id])) {
 
                 $question_grade = 0;
-                if( $_POST[ 'question_' . $question_id ] == 'right' ) {
+                if ($_POST['question_'.$question_id] == 'right') {
 
-                    $question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
+                    $question_grade = $_POST['question_'.$question_id.'_grade'];
 
                 }
 
                 // add data to the array that will, after the loop, be stored on the lesson status
-                $all_question_grades[ $question_id ] = $question_grade;
+                $all_question_grades[$question_id] = $question_grade;
 
                 // tally up the total quiz grade
                 $quiz_grade += $question_grade;
@@ -577,41 +577,41 @@ 
 
             // Question answer feedback / notes
             $question_feedback = '';
-            if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
+            if (isset($_POST['questions_feedback'][$question_id])) {
 
-                $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
+                $question_feedback = wp_unslash($_POST['questions_feedback'][$question_id]);
 
             }
-            $all_answers_feedback[ $question_id ] = $question_feedback;
+            $all_answers_feedback[$question_id] = $question_feedback;
 
         } // end for each $questions
 
         //store all question grades on the lesson status
-        Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
+        Sensei()->quiz->set_user_grades($all_question_grades, $quiz_lesson_id, $user_id);
 
         //store the feedback from grading
-        Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
+        Sensei()->quiz->save_user_answers_feedback($all_answers_feedback, $quiz_lesson_id, $user_id);
 
         // $_POST['all_questions_graded'] is set when all questions have been graded
         // in the class sensei grading user quiz -> display()
-        if( $_POST['all_questions_graded'] == 'yes' ) {
+        if ($_POST['all_questions_graded'] == 'yes') {
 
             // set the users total quiz grade
-			if ( 0 < intval( $quiz_grade_total ) ) {
-            $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
+			if (0 < intval($quiz_grade_total)) {
+            $grade = abs(round((doubleval($quiz_grade) * 100) / ($quiz_grade_total), 2));
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
+            Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id);
 
             // Duplicating what Frontend->sensei_complete_quiz() does
-            $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-            $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+            $pass_required = get_post_meta($quiz_id, '_pass_required', true);
+            $quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
             $lesson_metadata = array();
-            if ( $pass_required ) {
+            if ($pass_required) {
                 // Student has reached the pass mark and lesson is complete
-                if ( $quiz_passmark <= $grade ) {
+                if ($quiz_passmark <= $grade) {
                     $lesson_status = 'passed';
                 }
                 else {
@@ -624,9 +624,9 @@ 
             }
             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
 
-            Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
+            Sensei_Utils::update_lesson_status($user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata);
 
-            if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
+            if (in_array($lesson_status, array('passed', 'graded'))) {
 
                 /**
                  * Summary.
@@ -638,27 +638,27 @@ 
                  * @param int  $user_id
                  * @param int $quiz_lesson_id
                  */
-                do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
+                do_action('sensei_user_lesson_end', $user_id, $quiz_lesson_id);
 
             } // end if in_array
 
         }// end if $_POST['all_que...
 
-        if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
+        if (isset($_POST['sensei_grade_next_learner']) && strlen($_POST['sensei_grade_next_learner']) > 0) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+            $load_url = add_query_arg(array('message' => 'graded'));
 
-        } elseif ( isset( $_POST['_wp_http_referer'] ) ) {
+        } elseif (isset($_POST['_wp_http_referer'])) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
+            $load_url = add_query_arg(array('message' => 'graded'), $_POST['_wp_http_referer']);
 
         } else {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+            $load_url = add_query_arg(array('message' => 'graded'));
 
         }
 
-        wp_safe_redirect( esc_url_raw( $load_url ) );
+        wp_safe_redirect(esc_url_raw($load_url));
         exit;
 
     } // end admin_process_grading_submission
@@ -669,13 +669,13 @@ 
 		$lesson_data = array();
 		parse_str($data, $lesson_data);
 
-		$lesson_id = intval( $lesson_data['lesson_id'] );
-		$course_id = intval( $lesson_data['course_id'] );
-		$grading_view = sanitize_text_field( $lesson_data['view'] );
+		$lesson_id = intval($lesson_data['lesson_id']);
+		$course_id = intval($lesson_data['course_id']);
+		$grading_view = sanitize_text_field($lesson_data['view']);
 
 		$redirect_url = '';
-		if ( 0 < $lesson_id && 0 < $course_id ) {
-			$redirect_url = esc_url_raw( apply_filters( 'sensei_ajax_redirect_url', add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view ), admin_url( 'admin.php' ) ) ) );
+		if (0 < $lesson_id && 0 < $course_id) {
+			$redirect_url = esc_url_raw(apply_filters('sensei_ajax_redirect_url', add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view), admin_url('admin.php'))));
 		} // End If Statement
 
 		echo $redirect_url;
@@ -683,11 +683,11 @@ 
 	}
 
 	public function add_grading_notices() {
-		if( isset( $_GET['page'] ) && $this->page_slug == $_GET['page'] && isset( $_GET['message'] ) && $_GET['message'] ) {
-			if( 'graded' == $_GET['message'] ) {
+		if (isset($_GET['page']) && $this->page_slug == $_GET['page'] && isset($_GET['message']) && $_GET['message']) {
+			if ('graded' == $_GET['message']) {
 				$msg = array(
 					'updated',
-					__( 'Quiz Graded Successfully!', 'woothemes-sensei' ),
+					__('Quiz Graded Successfully!', 'woothemes-sensei'),
 				);
 			}
 			?>
@@ -699,9 +699,9 @@ 
 	}
 
 	public function sensei_grading_notices() {
-		if ( isset( $_GET['action'] ) && 'graded' == $_GET['action'] ) {
+		if (isset($_GET['action']) && 'graded' == $_GET['action']) {
 			echo '<div class="grading-notice updated">';
-				echo '<p>' . __( 'Quiz Graded Successfully!', 'woothemes-sensei' ) . '</p>';
+				echo '<p>'.__('Quiz Graded Successfully!', 'woothemes-sensei').'</p>';
 			echo '</div>';
 		} // End If Statement
 	} // End sensei_grading_notices()
@@ -724,16 +724,16 @@ 
      *
      * @return int $quiz_grade total sum of all question grades
      */
-    public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+    public static function grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') {
 
-        if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
-            || $quiz_grade_type != 'auto' ) {
+        if ( ! (intval($quiz_id) > 0) || ! $submitted
+            || $quiz_grade_type != 'auto') {
             return false; // exit early
         }
 
 
         $user_id = get_current_user_id();
-        $lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $quiz_autogradable = true;
 
         /**
@@ -747,23 +747,23 @@ 
          *      'gap-fill'.
          * }
          */
-        $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
+        $autogradable_question_types = apply_filters('sensei_autogradable_question_types', array('multiple-choice', 'boolean', 'gap-fill'));
 
         $grade_total = 0;
         $all_question_grades = array();
-        foreach( $submitted as $question_id => $answer ) {
+        foreach ($submitted as $question_id => $answer) {
 
             // check if the question is autogradable, either by type, or because the grade is 0
-            $question_type = Sensei()->question->get_question_type( $question_id );
-			$achievable_grade = Sensei()->question->get_question_grade( $question_id );
+            $question_type = Sensei()->question->get_question_type($question_id);
+			$achievable_grade = Sensei()->question->get_question_grade($question_id);
 			// Question has a zero grade, so skip grading
-			if ( 0 == $achievable_grade ) {
-				$all_question_grades[ $question_id ] = $achievable_grade;
+			if (0 == $achievable_grade) {
+				$all_question_grades[$question_id] = $achievable_grade;
 			}
-            elseif ( in_array( $question_type, $autogradable_question_types ) ) {
+            elseif (in_array($question_type, $autogradable_question_types)) {
                 // Get user question grade
-                $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
-                $all_question_grades[ $question_id ] = $question_grade;
+                $question_grade = Sensei_Utils::sensei_grade_question_auto($question_id, $question_type, $answer, $user_id);
+                $all_question_grades[$question_id] = $question_grade;
                 $grade_total += $question_grade;
 
             } else {
@@ -776,27 +776,27 @@ 
         }// end for each question
 
         // Only if the whole quiz was autogradable do we set a grade
-        if ( $quiz_autogradable ) {
+        if ($quiz_autogradable) {
 
-            $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
+            $quiz_total = Sensei_Utils::sensei_get_quiz_total($quiz_id);
 			// Check for zero total from grades
-			if ( 0 < $quiz_total ) {
-            $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
+			if (0 < $quiz_total) {
+            $grade = abs(round((doubleval($grade_total) * 100) / ($quiz_total), 2));
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
+            Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id, $quiz_grade_type);
 
         } else {
 
-            $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
+            $grade = new WP_Error('autograde', __('This quiz is not able to be automatically graded.', 'woothemes-sensei'));
 
         }
 
         // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
         // when doing manual grading.
-        Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
+        Sensei()->quiz-> set_user_grades($all_question_grades, $lesson_id, $user_id);
 
         return $grade;
 
@@ -816,22 +816,22 @@ 
      *
      * @return int $question_grade
      */
-    public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
+    public static function grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) {
 
-        if( intval( $user_id ) == 0 ) {
+        if (intval($user_id) == 0) {
 
             $user_id = get_current_user_id();
 
         }
 
-        if( ! ( intval( $question_id ) > 0 ) ) {
+        if ( ! (intval($question_id) > 0)) {
 
             return false;
 
         }
 
 
-        Sensei()->question->get_question_type( $question_id );
+        Sensei()->question->get_question_type($question_id);
 
         /**
          * Applying a grade before the auto grading takes place.
@@ -845,42 +845,42 @@ 
          * @param string $question_type one of the Sensei question type.
          * @param string $answer user supplied question answer
          */
-        $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
+        $question_grade = apply_filters('sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer);
 
-        if ( false !== $question_grade ) {
+        if (false !== $question_grade) {
 
             return $question_grade;
 
         }
 
         // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+        if (in_array($question_type, array('multiple-choice', 'boolean'))) {
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+            $right_answer = (array) get_post_meta($question_id, '_question_right_answer', true);
 
-            if( 0 == get_magic_quotes_gpc() ) {
-                $answer = wp_unslash( $answer );
+            if (0 == get_magic_quotes_gpc()) {
+                $answer = wp_unslash($answer);
             }
             $answer = (array) $answer;
-            if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
+            if (is_array($right_answer) && count($right_answer) == count($answer)) {
                 // Loop through all answers ensure none are 'missing'
                 $all_correct = true;
-                foreach ( $answer as $check_answer ) {
-                    if ( !in_array( $check_answer, $right_answer ) ) {
+                foreach ($answer as $check_answer) {
+                    if ( ! in_array($check_answer, $right_answer)) {
                         $all_correct = false;
                     }
                 }
                 // If all correct then grade
-                if ( $all_correct ) {
-                    $question_grade = Sensei()->question->get_question_grade( $question_id );
+                if ($all_correct) {
+                    $question_grade = Sensei()->question->get_question_grade($question_id);
                 }
             }
 
-        } elseif( 'gap-fill' == $question_type ){
+        } elseif ('gap-fill' == $question_type) {
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
+            $question_grade = self::grade_gap_fill_question($question_id, $answer);
 
-        } else{
+        } else {
 
             /**
              * Grading questions that are not auto gradable.
@@ -893,7 +893,7 @@ 
              * @param string $question_type one of the Sensei question type.
              * @param string $answer user supplied question answer
              */
-            $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
+            $question_grade = (int) apply_filters('sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer);
 
         } // end if $question_type
 
@@ -909,13 +909,13 @@ 
      *
      * @return bool | int false or the grade given to the user answer
      */
-    public static function grade_gap_fill_question( $question_id, $user_answer ){
+    public static function grade_gap_fill_question($question_id, $user_answer) {
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+        $right_answer = get_post_meta($question_id, '_question_right_answer', true);
+        $gapfill_array = explode('||', $right_answer);
 
-        if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
-            $user_answer = wp_unslash( $user_answer );
+        if (0 == get_magic_quotes_gpc()) { // deprecated from PHP 5.4 but we still support PHP 5.2
+            $user_answer = wp_unslash($user_answer);
         }
 
         /**
@@ -928,53 +928,53 @@ 
          *
          * @since 1.9.0
          */
-        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
+        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false);
 
-        if( $do_case_sensitive_comparison ){
+        if ($do_case_sensitive_comparison) {
 
             // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
+            if (trim(($gapfill_array[1])) == trim($user_answer)) {
 
-                return Sensei()->question->get_question_grade( $question_id );
+                return Sensei()->question->get_question_grade($question_id);
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+            } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+                if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) {
 
                     return Sensei()->question->get_question_grade($question_id);
 
-                }else{
+                } else {
 
                     return false;
 
                 }
 
-            }else{
+            } else {
 
                 return false;
 
             }
 
-        }else{
+        } else {
 
             // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+            if (trim(strtolower($gapfill_array[1])) == trim(strtolower($user_answer))) {
 
-               return Sensei()->question->get_question_grade( $question_id );
+               return Sensei()->question->get_question_grade($question_id);
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+            } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+                if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) {
 
-                    return  Sensei()->question->get_question_grade( $question_id );
+                    return  Sensei()->question->get_question_grade($question_id);
 
-                }else{
+                } else {
 
                     return false;
 
                 }
 
-            }else{
+            } else {
 
                 return false;
 
@@ -990,17 +990,17 @@ 
      * @since 1.9.0
      * @return int $number_of_graded_lessons
      */
-    public static function get_graded_lessons_count(){
+    public static function get_graded_lessons_count() {
 
         global $wpdb;
 
-        $comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $comment_query_piece['select']  = "SELECT   COUNT(*) AS total";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $number_of_graded_lessons = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $number_of_graded_lessons;
     }
@@ -1011,17 +1011,17 @@ 
      * @since 1.9.0
      * @return double $sum_of_all_grades
      */
-    public static function get_graded_lessons_sum(){
+    public static function get_graded_lessons_sum() {
 
         global $wpdb;
 
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1034,17 +1034,17 @@ 
      * @param $user_id
      * @return double
      */
-    public static function get_user_graded_lessons_sum( $user_id ){
+    public static function get_user_graded_lessons_sum($user_id) {
         global $wpdb;
 
-        $clean_user_id = esc_sql( $user_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_user_id = esc_sql($user_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
     }
@@ -1057,18 +1057,18 @@ 
      * @param int lesson_id
      * @return double
      */
-    public static function get_lessons_users_grades_sum( $lesson_id ){
+    public static function get_lessons_users_grades_sum($lesson_id) {
 
         global $wpdb;
 
-        $clean_lesson_id = esc_sql( $lesson_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_lesson_id = esc_sql($lesson_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1082,18 +1082,18 @@ 
      * @param int $course_id
      * @return double
      */
-    public static function get_course_users_grades_sum( $course_id ){
+    public static function get_course_users_grades_sum($course_id) {
 
         global $wpdb;
 
-        $clean_course_id = esc_sql( $course_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_course_id = esc_sql($course_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1106,4 +1106,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Grading extends Sensei_Grading{}
+class WooThemes_Sensei_Grading extends Sensei_Grading {}

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 );
+
+	}
+	/**
+	 * check if WooCommerce plugin is loaded and allowed by Sensei
+	 *
+	 * @since 1.9.0
+	 * @return bool
+	 */
+	public static function is_woocommerce_active(){
 
-	    $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
-        require_once( $woocommerce_hooks_file_path );
+		$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;
 
-    }
-    /**
-     * check if WooCommerce plugin is loaded and allowed by Sensei
-     *
-     * @since 1.9.0
-     * @return bool
-     */
-    public static function is_woocommerce_active(){
+	} // end 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;
+	/**
+	 * 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(){
 
-    } // end is_woocommerce_active
+		$active_plugins = (array) get_option( 'active_plugins', array() );
 
-    /**
-     * 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(){
+		if ( is_multisite() ){
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
 
-        if ( is_multisite() ){
+		}
+
+		$is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
 
-        }
+	}// end is_woocommerce_present
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+	/**
+	 * 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 ){
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+		$course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-    }// end is_woocommerce_present
+		$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,
+		) );
 
-    /**
-     * 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 ){
+		if( $orders_query->post_count == 0 ){
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+			return false;
 
-        $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 ){
+		foreach( $orders_query->get_posts() as $order ){
 
-            return false;
+			$order = new WC_Order( $order->ID );
+			$items = $order->get_items();
 
-        }
+			$user_orders =  array();
 
-        foreach( $orders_query->get_posts() as $order ){
+			foreach( $items as $item ){
 
-            $order = new WC_Order( $order->ID );
-            $items = $order->get_items();
+				// 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'] );
 
-            $user_orders =  array();
+				if ( is_object( $product ) && $product->is_type( 'variable' )) {
 
-            foreach( $items as $item ){
+					$item_product_id = $item['variation_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'] );
+				} else {
 
-                if ( is_object( $product ) && $product->is_type( 'variable' )) {
+					$item_product_id =  $item['product_id'];
 
-                    $item_product_id = $item['variation_id'];
+				}
 
-                } else {
+				if( $course_product_id == $item_product_id ){
 
-                    $item_product_id =  $item['product_id'];
+					return $order->id;
 
-                }
+				}
 
-                if( $course_product_id == $item_product_id ){
 
-                    return $order->id;
+			}//end for each order item
 
-                }
+		} // end for each order
 
+		// if we reach this place we found no order
+		return false;
 
-            }//end for each order item
+	} // end get_learner_course_active_order_ids
 
-        } // end for each order
+	/**
+	 * 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 ){
 
-        // if we reach this place we found no order
-        return false;
+		$free_courses = self::get_free_courses();
+		$paid_courses = self::get_paid_courses();
 
-    } // end get_learner_course_active_order_ids
+		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;
 
-    /**
-     * 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();
+		$filter_links[] = array(
+			'id'=>'paid' ,
+			'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Paid', 'woothemes-sensei' )
+		);
 
-        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'=>'free',
+			'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Free', 'woothemes-sensei' )
+		);
 
-        }
+		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' )
-        );
+	}// end add_course_archive_wc_filter_links
 
-        $filter_links[] = array(
-            'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
-        );
+	/**
+	 * 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 ){
 
-        return $filter_links;
+		if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
 
-    }// end add_course_archive_wc_filter_links
+			// setup the course meta query
+			$meta_query = self::get_free_courses_meta_query_args();
 
-    /**
-     * 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 ){
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_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 );
 
-            // setup the course meta query
-            $meta_query = self::get_free_courses_meta_query_args();
+		}// end if course_filter
 
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+		return $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 );
+	}// course_archive_wc_filter_free
 
-        }// end if course_filter
+	/**
+	 * 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 ){
 
-        return $query;
+		if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query() ){
 
-    }// course_archive_wc_filter_free
+			// setup the course meta query
+			$meta_query = self::get_paid_courses_meta_query_args();
 
-    /**
-     * 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 ){
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_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
-
-    }// 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 $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 )  ){
 
 			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();
-
-        $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:
-        //
-        ?>
+	/**
+	 * 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:
+		//
+		?>
 
         <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,346 +864,346 @@ 
 
 		    <?php
 
-	    } else {
+		} else {
 
-		    $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
-	        ?>
+			$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
 
-    /**
-     * 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 ){
+	/**
+	 * 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 ){
 
-        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 ) ){
@@ -1221,428 +1221,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

Spacing +298 added lines, -298 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 
 /**
  * Sensei WooCommerce class
@@ -11,16 +11,16 @@ 
  * @since 1.9.0
  */
 
-Class Sensei_WC{
+Class Sensei_WC {
     /**
      * Load the files needed for the woocommerce integration.
      *
      * @since 1.9.0
      */
-    public static function load_woocommerce_integration_hooks(){
+    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);
 
     }
     /**
@@ -29,9 +29,9 @@ 
      * @since 1.9.0
      * @return bool
      */
-    public static function is_woocommerce_active(){
+    public static function is_woocommerce_active() {
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+        $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
@@ -46,19 +46,19 @@ 
      *
      * @return bool
      */
-    public static function is_woocommerce_present(){
+    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
 
@@ -71,48 +71,48 @@ 
      * @param $course_id
      * @return array $user_course_orders
      */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+    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(
+        $orders_query = new WP_Query(array(
             'post_type'   => 'shop_order',
             'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
+            '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;
 
         }
 
-        foreach( $orders_query->get_posts() as $order ){
+        foreach ($orders_query->get_posts() as $order) {
 
-            $order = new WC_Order( $order->ID );
+            $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'] );
+                $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'];
 
                 } 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;
 
@@ -136,12 +136,12 @@ 
      * @param $filter_links
      * @return mixed
      */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+    public static function add_course_archive_wc_filter_links($filter_links) {
 
         $free_courses = self::get_free_courses();
         $paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $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;
@@ -149,15 +149,15 @@ 
         }
 
         $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
+            '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' )
+            'url'=> add_query_arg(array('course_filter'=>'free'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Free', 'woothemes-sensei')
         );
 
         return $filter_links;
@@ -174,24 +174,24 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_free( $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();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
             // don't show any paid courses
             $courses = self::get_paid_courses();
             $ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
                 $ids[] = $course->ID;
             }
-            $query->set( 'post__not_in', $ids );
+            $query->set('post__not_in', $ids);
 
         }// end if course_filter
 
@@ -210,16 +210,16 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_paid( $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() ){
+        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 );
+            $query->set('meta_query', $meta_query);
 
         }
 
@@ -232,14 +232,14 @@ 
      * 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(){
+    public static function do_single_course_wc_single_product_action() {
 
         /**
          * this hooks is documented within the WooCommerce plugin.
          */
-        if ( Sensei_WC::is_woocommerce_active() ) {
+        if (Sensei_WC::is_woocommerce_active()) {
 
-            do_action( 'woocommerce_before_single_product' );
+            do_action('woocommerce_before_single_product');
 
         } // End If Statement
 
@@ -260,12 +260,12 @@ 
      * @param $user_id
      * @return bool
      */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+    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 )  ){
+	    $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;
 
@@ -274,18 +274,18 @@ 
         // 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 );
+        $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) ){
+        if (isset ($product) && is_object($product)) {
 
             // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+            $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 ){
+            if ( ! $order_id) {
 
                 return false;
 
@@ -308,23 +308,23 @@ 
      */
     public static function course_link_from_order( ) {
 
-        if( ! is_order_received_page() ){
+        if ( ! is_order_received_page()) {
             return;
         }
 
-        $order_id = get_query_var( 'order-received' );
-		$order = new WC_Order( $order_id );
+        $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  ) {
+		if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
         $course_links = array(); // store the for links for courses purchased
-		foreach ( $order->get_items() as $item ) {
+		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'];
@@ -336,28 +336,28 @@ 
 
             } // 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(
+                $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 ) {
+                $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> ';
+                        $permalink = get_permalink($course->ID);
+                        $course_links[] .= '<a href="'.esc_url($permalink).'" >'.$title.'</a> ';
 
                     } // end for each
 
@@ -368,24 +368,24 @@ 
         }// end loop through orders
 
         // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+        if ( ! empty($course_links)) {
 
             $courses_html = _nx(
                 'You have purchased the following course:',
                 'You have purchased the following courses:',
-                count( $course_links ),
+                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>';
 
-            wc_add_notice( $courses_html, 'success' );
+            wc_add_notice($courses_html, 'success');
         }
 
 	} // end course_link_order_form
@@ -398,20 +398,20 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_in_cart_message(){
+    public static function course_in_cart_message() {
 
         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>
@@ -425,14 +425,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_course_in_cart( $course_id ){
+    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() );
+        $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 (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
+            if (self::is_product_in_cart($wc_post_id)) {
 
                 return true;
 
@@ -450,20 +450,20 @@ 
      * @param $product_id
      * @return bool
      */
-    public static function is_product_in_cart( $product_id ){
+    public static function is_product_in_cart($product_id) {
 
-        if ( 0 < $product_id ) {
+        if (0 < $product_id) {
 
-            $product = wc_get_product( $product_id );
+            $product = wc_get_product($product_id);
 
             $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_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 ) {
+            foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
 
                 $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
+                if ($product_id == $cart_product->id) {
 
                     return true;
 
@@ -485,9 +485,9 @@ 
      *  @type int $wp_post_id
      * }
      */
-    public static function get_free_product_ids(){
+    public static function get_free_product_ids() {
 
-        return  get_posts( array(
+        return  get_posts(array(
             'post_type' => 'product',
             'posts_per_page' => '1000',
             'fields' => 'ids',
@@ -512,7 +512,7 @@ 
      * @since 1.9.0
      * @return array $wp_meta_query_param
      */
-    public static function get_free_courses_meta_query_args(){
+    public static function get_free_courses_meta_query_args() {
 
         return array(
             'relation' => 'OR',
@@ -536,7 +536,7 @@ 
      * @since 1.9.0
      * @return array $wp_query_meta_query_args_param
      */
-    public static function get_paid_courses_meta_query_args(){
+    public static function get_paid_courses_meta_query_args() {
 
         $paid_product_ids = self::get_paid_product_ids();
 
@@ -545,7 +545,7 @@ 
                 '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,
+                'value' => empty($paid_product_ids) ? '-1000' : $paid_product_ids,
                 'compare' => 'IN',
             ),
         );
@@ -559,7 +559,7 @@ 
      * @since 1.9.0
      * @return array $product_query_args
      */
-    public static function get_paid_products_on_sale_query_args(){
+    public static function get_paid_products_on_sale_query_args() {
 
         $args = array(
                    'post_type' 		=> 'product',
@@ -569,9 +569,9 @@ 
                    'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
+        $args['fields']     = 'ids';
 
-        $args[ 'meta_query' ] = array(
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -598,7 +598,7 @@ 
      *
      * @return array
      */
-    public static function get_paid_products_not_on_sale_query_args(){
+    public static function get_paid_products_not_on_sale_query_args() {
 
         $args = array(
             'post_type' 		=> 'product',
@@ -608,8 +608,8 @@ 
             'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
+        $args['fields']     = 'ids';
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -635,24 +635,24 @@ 
      *
      * @return array $woocommerce_paid_product_ids
      */
-    public static function get_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() );
+        $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() );
+        $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 );
+        $woocommerce_paid_product_ids = array_merge($paid_product_ids_with_sale, $paid_product_ids_without_sale);
 
         // if
-        if( empty($woocommerce_paid_product_ids) ){
+        if (empty($woocommerce_paid_product_ids)) {
             return array( );
         }
         return $woocommerce_paid_product_ids;
@@ -671,20 +671,20 @@ 
      *
      * @return array
      */
-    public static function get_free_courses(){
+    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();
+        $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 ){
+        foreach ($courses as $course) {
             $ids[] = $course->ID;
         }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
+        $free_course_query_args['post__not_in'] = $ids;
 
-        return get_posts( $free_course_query_args );
+        return get_posts($free_course_query_args);
 
     }
 
@@ -694,13 +694,13 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_paid_courses(){
+    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();
+        $paid_course_query_args['meta_query'] = self::get_paid_courses_meta_query_args();
 
-        return get_posts(  $paid_course_query_args );
+        return get_posts($paid_course_query_args);
     }
 
     /**
@@ -715,17 +715,17 @@ 
      * @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 ){
+    public static function the_add_to_cart_button_html($course_id) {
 
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+        if ( ! Sensei_Course::is_prerequisite_complete($course_id)) {
             return '';
         }
 
-        $wc_post_id = self::get_course_product_id( $course_id );
+        $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 ) ) {
+        if (self::has_customer_bought_product(get_current_user_id(), $wc_post_id)
+            || empty($wc_post_id)) {
 
             return '';
 
@@ -733,15 +733,15 @@ 
 
         // based on simple.php in WC templates/single-product/add-to-cart/
         // Get the product
-        $product = self::get_product_object( $wc_post_id );
+        $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 )
+        if ( ! isset ($product)
+            || ! is_object($product)
             || ! $product->is_purchasable()
             || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
+            || self::is_course_in_cart($wc_post_id)) {
 
             return '';
 
@@ -752,23 +752,23 @@ 
         //
         ?>
 
-        <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
+        <form action="<?php echo esc_url($product->add_to_cart_url()); ?>"
               class="cart"
               method="post"
               enctype="multipart/form-data">
 
-            <input type="hidden" name="product_id" value="<?php echo esc_attr( $product->id ); ?>" />
+            <input type="hidden" name="product_id" value="<?php echo esc_attr($product->id); ?>" />
 
             <input type="hidden" name="quantity" value="1" />
 
-            <?php if ( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { ?>
+            <?php if (isset($product->variation_id) && 0 < intval($product->variation_id)) { ?>
 
                 <input type="hidden" name="variation_id" value="<?php echo $product->variation_id; ?>" />
-                <?php if( isset( $product->variation_data ) && is_array( $product->variation_data ) && count( $product->variation_data ) > 0 ) { ?>
+                <?php if (isset($product->variation_data) && is_array($product->variation_data) && count($product->variation_data) > 0) { ?>
 
-                    <?php foreach( $product->variation_data as $att => $val ) { ?>
+                    <?php foreach ($product->variation_data as $att => $val) { ?>
 
-                        <input type="hidden" name="<?php echo esc_attr( $att ); ?>" id="<?php echo esc_attr( str_replace( 'attribute_', '', $att ) ); ?>" value="<?php echo esc_attr( $val ); ?>" />
+                        <input type="hidden" name="<?php echo esc_attr($att); ?>" id="<?php echo esc_attr(str_replace('attribute_', '', $att)); ?>" value="<?php echo esc_attr($val); ?>" />
 
                     <?php } ?>
 
@@ -777,7 +777,7 @@ 
             <?php } ?>
 
             <button type="submit" class="single_add_to_cart_button button alt">
-                <?php $button_text = $product->get_price_html() . ' - ' . __( 'Purchase this Course', 'woothemes-sensei' ); ?>
+                <?php $button_text = $product->get_price_html().' - '.__('Purchase this Course', 'woothemes-sensei'); ?>
                 <?php
                 /**
                  * Filter Add to Cart button text
@@ -786,7 +786,7 @@ 
                  *
                  * @param string $button_text
                  */
-                echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
+                echo apply_filters('sensei_wc_single_add_to_cart_button_text', $button_text);
                 ?>
             </button>
 
@@ -806,26 +806,26 @@ 
      *
      * @return string $message
      */
-    public static function alter_no_permissions_message( $message, $post_id ){
+    public static function alter_no_permissions_message($message, $post_id) {
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+        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;
 
         }
 
         ob_start();
-        self::the_course_no_permissions_message( $post_id );
+        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;
 
     }
     /**
@@ -834,18 +834,18 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_no_permissions_message( $course_id ){
+    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 );
+        $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; ?>
@@ -853,7 +853,7 @@ 
 
 		    <?php
 
-	    } elseif ( is_user_logged_in() ) {
+	    } elseif (is_user_logged_in()) {
 
 		    ?>
 		    <style>
@@ -866,7 +866,7 @@ 
 
 	    } else {
 
-		    $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
+		    $message = sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link);
 	        ?>
 		        <span class="add-to-cart-login">
 		            <?php echo $message; ?>
@@ -886,34 +886,34 @@ 
      *
      * @return bool
      */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+    public static function has_customer_bought_product($user_id, $product_id) {
 
-        $orders = self::get_user_product_orders( $user_id, $product_id );
+        $orders = self::get_user_product_orders($user_id, $product_id);
 
-        foreach ( $orders as $order_id ) {
+        foreach ($orders as $order_id) {
 
-            $order = new WC_Order( $order_id->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() ) )  ){
+            if ( ! in_array($order->post_status, array('wc-processing', 'wc-completed'))
+                || ! (0 < sizeof($order->get_items()))) {
 
                 continue;
 
             }
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+                if ($item['product_id'] == $product_id || $item['variation_id'] == $product_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'] ) {
+                    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;
@@ -945,11 +945,11 @@ 
      * @return string $woocommerce_product_id or false if none exist
      *
      */
-    public static function get_course_product_id( $course_id ){
+    public static function get_course_product_id($course_id) {
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+        if (empty($product_id) || 'product' != get_post_type($product_id)) {
             return false;
         }
 
@@ -965,11 +965,11 @@ 
      * @param array $classes
      * @return array
      */
-    public static function add_woocommerce_body_class( $classes ){
+    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';
 
         }
 
@@ -987,7 +987,7 @@ 
      *
      * @return  void
      */
-    public static function activate_subscription(  $order ) {
+    public static function activate_subscription($order) {
 
         $order_user = get_user_by('id', $order->user_id);
         $user['ID'] = $order_user->ID;
@@ -996,13 +996,13 @@ 
         $user['user_url'] = $order_user->user_url;
 
         // Run through each product ordered
-        if ( ! sizeof($order->get_items() )>0 ) {
+        if ( ! sizeof($order->get_items()) > 0) {
 
             return;
 
         }
 
-        foreach($order->get_items() as $item) {
+        foreach ($order->get_items() as $item) {
 
             $product_type = '';
 
@@ -1017,21 +1017,21 @@ 
 
             } // 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();
 
-            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
 
             // Loop and add the user to the course.
-            foreach ( $courses as $course_item ){
+            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
 
@@ -1049,13 +1049,13 @@ 
      *
      * @return  void
      */
-    public static function email_course_details(  $order ){
+    public static function email_course_details($order) {
 
         global $woocommerce;
 
         // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+        if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
@@ -1063,16 +1063,16 @@ 
         $order_id = $order->id;
 
         //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+        if (0 < sizeof($order_items)) {
 
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+            $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 (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';
@@ -1081,9 +1081,9 @@ 
                     $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(
@@ -1098,16 +1098,16 @@ 
                         'orderby' => 'menu_order date',
                         'order' => 'ASC',
                     );
-                    $courses = get_posts( $args );
+                    $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 );
+                            $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>';
+                            $course_details_html .= '<p><strong>'.sprintf(__('View course: %1$s', 'woothemes-sensei'), '</strong><a href="'.esc_url($permalink).'">'.$title.'</a>').'</p>';
                         }
 
 
@@ -1118,7 +1118,7 @@ 
             } // end for each order item
 
             // Output Course details
-            if( $order_contains_courses ){
+            if ($order_contains_courses) {
 
                 echo $course_details_html;
 
@@ -1136,33 +1136,33 @@ 
      * @param   int $order_id WC order ID
      * @return  void
      */
-    public static function complete_order ( $order_id = 0 ) {
+    public static function complete_order($order_id = 0) {
 
         $order_user = array();
 
         // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+        if (Sensei_WC::is_woocommerce_active() && (0 < $order_id)) {
             // Get order object
-            $order = new WC_Order( $order_id );
+            $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;
 
 	        }
 
-            $user = get_user_by( 'id', $order->get_user_id() );
+            $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() ) ) {
+            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'] ) ) {
+                    if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                         $item_id = $item['variation_id'];
                         $product_type = 'variation';
@@ -1173,15 +1173,15 @@ 
 
                     } // 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 );
+                    $courses = Sensei()->course->get_product_courses($_product->id);
 
                     // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
+                    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
 
@@ -1189,7 +1189,7 @@ 
 
             } // End If Statement
             // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+            update_post_meta($order_id, 'sensei_payment_complete', '1');
 
         } // End If Statement
 
@@ -1203,34 +1203,34 @@ 
      * @param   integer| WC_Order $order_id order ID
      * @return  void
      */
-    public static function cancel_order ( $order_id ) {
+    public static function cancel_order($order_id) {
 
 		// Get order object
-		if( is_object( $order_id ) ){
+		if (is_object($order_id)) {
 
 			$order = $order_id;
 
-		}else{
+		} else {
 
-			$order = new WC_Order( $order_id );
+			$order = new WC_Order($order_id);
 		}
 
-		if ( ! in_array( $order->get_status(), array( 'cancelled', 'refunded' ) ) ) {
+		if ( ! in_array($order->get_status(), array('cancelled', 'refunded'))) {
 
 			return;
 
 		}
 
         // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+        if (0 < sizeof($order->get_items())) {
 
             // Get order user
-            $user_id = $order->__get( 'user_id' );
+            $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'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1241,20 +1241,20 @@ 
 
                 } // 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 );
+                $courses = Sensei()->course->get_product_courses($item_id);
 
                 // Loop and update those courses
-                foreach ($courses as $course_item){
+                foreach ($courses as $course_item) {
 
-	                if( self::has_customer_bought_product( $user_id, $course_item->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 );
+                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course($course_item->ID, $user_id);
 
                 } // End For Loop
 
@@ -1275,30 +1275,30 @@ 
      * @param   string  $product_type  '' or 'variation'
      * @return   WC_Product $wc_product_object
      */
-    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
+    public static function get_product_object($wc_product_id = 0, $product_type = '') {
 
         $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+        if (0 < intval($wc_product_id)) {
 
             // Get the product
-            if ( function_exists( 'wc_get_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 {
 
                 // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+                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 {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+                    $wc_product_object = new WC_Product($wc_product_id);
 
                 } // End If Statement
 
@@ -1321,19 +1321,19 @@ 
      *
      * @return bool|int
      */
-    public static function course_update ( $course_id = 0, $order_user = array()  ) {
+    public static function course_update($course_id = 0, $order_user = array()) {
 
         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;
 
         // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+        $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true);
 
         // Check if in the admin
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $user_login = $order_user['user_login'];
             $user_email = $order_user['user_email'];
@@ -1350,28 +1350,28 @@ 
         } // 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 ) ) {
+        $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 );
+                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 ) ) {
+            && 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;
 
@@ -1393,14 +1393,14 @@ 
      *
      * @return boolean                 Modified guest checkout setting
      */
-    public static function disable_guest_checkout( $guest_checkout ) {
+    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,
@@ -1413,11 +1413,11 @@ 
                             )
                         );
 
-                        $posts = get_posts( $args );
+                        $posts = get_posts($args);
 
-                        if( $posts && count( $posts ) > 0 ) {
+                        if ($posts && count($posts) > 0) {
 
-                            foreach( $posts as $course ) {
+                            foreach ($posts as $course) {
                                 $guest_checkout = '';
                                 break;
 
@@ -1446,23 +1446,23 @@ 
      *
      * @return string
      **/
-    public static function virtual_order_payment_complete( $order_status, $order_id ) {
+    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;
 
-            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;
@@ -1476,7 +1476,7 @@ 
             } // End If Statement
 
             // virtual order, mark as completed
-            if ( $virtual_order ) {
+            if ($virtual_order) {
 
                 return 'completed';
 
@@ -1499,14 +1499,14 @@ 
      * @param  integer $user_id
      * @return boolean $user_access_permission
      */
-    public static function get_subscription_permission( $user_access_permission, $user_id ){
+    public static function get_subscription_permission($user_access_permission, $user_id) {
 
         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) ){
+        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;
 
@@ -1516,25 +1516,25 @@ 
         // is the subscription on the the current course?
 
         $course_id = 0;
-        if ( 'course' == $post->post_type ){
+        if ('course' == $post->post_type) {
 
             $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 {
 
-            $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() ) ){
+        $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;
 
@@ -1542,19 +1542,19 @@ 
 
         // 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  ) ){
+        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;
 
-        }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' );
+            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;
@@ -1567,9 +1567,9 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_subscription_types(){
+    public static function get_subscription_types() {
 
-        return array( 'subscription','subscription_variation','variable-subscription' );
+        return array('subscription', 'subscription_variation', 'variable-subscription');
 
     }
 
@@ -1589,15 +1589,15 @@ 
      *
      * @return bool
      */
-    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
+    public static function was_user_added_without_subscription($user_id, $product_id, $course_id) {
 
         $course_start_date = '';
         $subscription_start_date = '';
-        $is_a_subscription ='';
+        $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 ( ! Sensei_Utils::user_started_course($course_id, $user_id)) {
 
             return false;
 
@@ -1606,34 +1606,34 @@ 
         // 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() )  ){
+            && Sensei_Utils::user_started_course($course_id, get_current_user_id())) {
 
             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 );
+        $course_start_date = date_create($course_status->comment_date);
+        $subscriptions = wcs_get_users_subscriptions($user_id);
 
         // comparing every subscription
-        foreach( $subscriptions as $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' ) ) ) {
+            if (in_array($status, array('pending-canceled', 'active', 'on-hold', 'pending'))) {
 
                 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   ) {
+            if ($current_subscription_start_date > $course_start_date) {
 
                 return false;
 
@@ -1652,15 +1652,15 @@ 
 	 *
 	 * @return array $orders
 	 */
-	public static function get_user_product_orders( $user_id =  0, $product_id ) {
+	public static function get_user_product_orders($user_id = 0, $product_id) {
 
-		return get_posts( array(
+		return get_posts(array(
 			'numberposts' => -1,
 			'post_type' => 'shop_order',
 			'meta_key'    => '_customer_user',
-			'meta_value'  => intval( $user_id ),
-			'post_status' => array( 'wc-processing', 'wc-completed' ),
-		) );
+			'meta_value'  => intval($user_id),
+			'post_status' => array('wc-processing', 'wc-completed'),
+		));
 
 	}