woothemes / sensei

includes/class-sensei-emails.php

Doc Comments +5 added lines, -1 removed lines

@@ -40,6 +40,7 @@ 
 	 * Constructor for the email class hooks in all emails that can be sent.
 	 *
 	 * @access public
+	 * @param string $file
 	 * @return void
 	 */
 	function __construct( $file ) {
@@ -140,7 +141,7 @@ 
 	 * Wraps a message in the sensei mail template.
 	 *
 	 * @access public
-	 * @param mixed $content
+	 * @param null|string $content
 	 * @return string
 	 */
 	function wrap_message( $content ) {
@@ -198,6 +199,9 @@ 
 		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
 	}
 
+	/**
+	 * @param string $email_template
+	 */
 	function get_content( $email_template ) {
 
 		$message = $this->load_template( $email_template );

Indentation +48 added lines, -48 removed lines

@@ -45,7 +45,7 @@ 
 		add_action( 'sensei_course_status_updated', array( $this, 'learner_completed_course' ), 10, 4 );
 		add_action( 'sensei_course_status_updated', array( $this, 'teacher_completed_course' ), 10, 4 );
 		add_action( 'sensei_user_course_start', array( $this, 'teacher_started_course' ), 10, 2 );
-        add_action( 'sensei_user_lesson_end', array( $this, 'teacher_completed_lesson' ), 10, 2 );
+		add_action( 'sensei_user_lesson_end', array( $this, 'teacher_completed_lesson' ), 10, 2 );
 		add_action( 'sensei_user_quiz_submitted', array( $this, 'teacher_quiz_submitted' ), 10, 5 );
 		add_action( 'sensei_new_private_message', array( $this, 'teacher_new_message' ), 10, 1 );
 		add_action( 'sensei_private_message_reply', array( $this, 'new_message_reply' ), 10, 2 );
@@ -62,9 +62,9 @@ 
 		$this->emails['learner-graded-quiz'] = include( 'emails/class-woothemes-sensei-email-learner-graded-quiz.php' );
 		$this->emails['learner-completed-course'] = include( 'emails/class-woothemes-sensei-email-learner-completed-course.php' );
 		$this->emails['teacher-completed-course'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-course.php' );
-        $this->emails['teacher-started-course'] = include( 'emails/class-woothemes-sensei-email-teacher-started-course.php' );
-        $this->emails['teacher-completed-lesson'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-lesson.php' );
-        $this->emails['teacher-quiz-submitted'] = include( 'emails/class-woothemes-sensei-email-teacher-quiz-submitted.php' );
+		$this->emails['teacher-started-course'] = include( 'emails/class-woothemes-sensei-email-teacher-started-course.php' );
+		$this->emails['teacher-completed-lesson'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-lesson.php' );
+		$this->emails['teacher-quiz-submitted'] = include( 'emails/class-woothemes-sensei-email-teacher-quiz-submitted.php' );
 		$this->emails['teacher-new-message'] = include( 'emails/class-woothemes-sensei-email-teacher-new-message.php' );
 		$this->emails['new-message-reply'] = include( 'emails/class-woothemes-sensei-email-new-message-reply.php' );
 		$this->emails = apply_filters( 'sensei_email_classes', $this->emails );
@@ -171,20 +171,20 @@ 
 		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
 		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
 
-        // Send
-        $send_email = true;
+		// Send
+		$send_email = true;
 
-        /**
-         * Filter Sensei's ability to send out emails.
-         *
-         * @since 1.8.0
-         * @param bool $send_email default true
-         */
-        if( apply_filters('sensei_send_emails', $send_email,$to, $subject, $message )  ){
+		/**
+		 * Filter Sensei's ability to send out emails.
+		 *
+		 * @since 1.8.0
+		 * @param bool $send_email default true
+		 */
+		if( apply_filters('sensei_send_emails', $send_email,$to, $subject, $message )  ){
 
-            wp_mail( $to, $subject, $message, $headers, $attachments );
+			wp_mail( $to, $subject, $message, $headers, $attachments );
 
-        }
+		}
 
 		// Unhook filters
 		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
@@ -326,44 +326,44 @@ 
 		}
 	}
 
-    /**
-     * teacher_completed_lesson()
-     *
-     * Send email to teacher on student completing lesson
-     *
-     * @access public
-     * @return void
-     * @since 1.9.0
-     */
-    function teacher_completed_lesson( $learner_id = 0, $lesson_id = 0 ) {
-
-
-        $send = false;
-
-        if( isset( Sensei()->settings->settings[ 'email_teachers' ] ) ) {
-            if( in_array( 'teacher-completed-lesson', (array) Sensei()->settings->settings[ 'email_teachers' ]) ) {
-                $send = true;
-            }
-        } else {
-            $send = true;
-        }
-
-        if( $send ) {
-            $email = $this->emails['teacher-completed-lesson'];
-            $email->trigger( $learner_id, $lesson_id );
-        }
-    }
+	/**
+	 * teacher_completed_lesson()
+	 *
+	 * Send email to teacher on student completing lesson
+	 *
+	 * @access public
+	 * @return void
+	 * @since 1.9.0
+	 */
+	function teacher_completed_lesson( $learner_id = 0, $lesson_id = 0 ) {
+
+
+		$send = false;
+
+		if( isset( Sensei()->settings->settings[ 'email_teachers' ] ) ) {
+			if( in_array( 'teacher-completed-lesson', (array) Sensei()->settings->settings[ 'email_teachers' ]) ) {
+				$send = true;
+			}
+		} else {
+			$send = true;
+		}
+
+		if( $send ) {
+			$email = $this->emails['teacher-completed-lesson'];
+			$email->trigger( $learner_id, $lesson_id );
+		}
+	}
 
 	/**
 	 * Send email to teacher on quiz submission
 	 *
 	 *
-     * @param int $learner_id
-     * @param int $quiz_id
-     * @param int $grade
-     * @param int $passmark
-     * @param string $quiz_grade_type
-     */
+	 * @param int $learner_id
+	 * @param int $quiz_id
+	 * @param int $grade
+	 * @param int $passmark
+	 * @param string $quiz_grade_type
+	 */
 	function teacher_quiz_submitted( $learner_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0, $quiz_grade_type = 'manual' ) {
 
 		$send = false;

includes/class-sensei-grading.php

Doc Comments +5 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 	 * Constructor
 	 * @since  1.3.0
      *
-     * @param $file
+     * @param string $file
 	 */
 	public function __construct ( $file ) {
 		$this->name = __( 'Grading', 'woothemes-sensei' );
@@ -330,6 +330,7 @@ 
 	/**
 	 * Return array of valid statuses for either Course or Lesson
 	 * @since  1.7.0
+	 * @param string $type
 	 * @return array
 	 */
 	public function get_stati( $type ) {
@@ -529,7 +530,7 @@ 
      * the grades as the Grader selected theme and saves the total grade and
      * individual question grades.
      *
-     * @return bool
+     * @return false|null
      */
     public function admin_process_grading_submission() {
 
@@ -906,8 +907,8 @@ 
      * Grading logic specifically for the gap fill questions
      *
      * @since 1.9.0
-     * @param $question_id
-     * @param $user_answer
+     * @param integer $question_id
+     * @param string $user_answer
      *
      * @return bool | int false or the grade given to the user answer
      */

Indentation +327 added lines, -327 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,283 +706,283 @@ 
 		} // 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 ) {
+
+		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 );
 
-            return $question_grade;
+		if ( false !== $question_grade ) {
 
-        }
+			return $question_grade;
 
-        // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+		}
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+		// auto grading core
+		if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
 
-            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 );
-                }
-            }
+			$right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
 
-        } elseif( 'gap-fill' == $question_type ){
+			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 );
+				}
+			}
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
+		} elseif( 'gap-fill' == $question_type ){
 
-        } else{
+			$question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-            /**
-             * 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 );
+		} else{
 
-        } // end if $question_type
+			/**
+			 * 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 );
 
-        return $question_grade;
-    } // end grade_question_auto
+		} // end if $question_type
 
-    /**
-     * 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 $question_grade;
+	} // end grade_question_auto
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+	/**
+	 * 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 ){
 
-        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 = get_post_meta( $question_id, '_question_right_answer', true );
+		$gapfill_array = explode( '||', $right_answer );
 
-        /**
-         * 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() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
+			$user_answer = wp_unslash( $user_answer );
+		}
+
+		/**
+		 * 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( $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 ) ) {
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given 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);
+					return Sensei()->question->get_question_grade($question_id);
 
-                }else{
+				}else{
 
-                    return false;
+					return false;
 
-                }
+				}
 
-            }else{
+			}else{
 
-                return false;
+				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 )) ) {
+			// 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 );
+			   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;
+					return false;
 
-                }
+				}
 
-            }else{
+			}else{
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 } // End Class
 

includes/class-sensei-list-table.php

Doc Comments +1 added lines

@@ -44,6 +44,7 @@
 	/**
 	 * Constructor
 	 * @since  1.2.0
+	 * @param string $token
 	 * @return  void
 	 */
 	public function __construct ( $token ) {

Indentation +11 added lines, -11 removed lines

@@ -40,16 +40,16 @@ 
 	public $total_items = 0;
 
 
-    /**
-     * @var array $sortable_columns
-     *
-     */
-    public $sortable_columns = array();
+	/**
+	 * @var array $sortable_columns
+	 *
+	 */
+	public $sortable_columns = array();
 
-    /**
-     * @var array columns
-     */
-    public $columns = array();
+	/**
+	 * @var array columns
+	 */
+	public $columns = array();
 
 	/**
 	 * Constructor
@@ -175,8 +175,8 @@ 
 			$sortable[$id] = $data;
 		}
 
-        $primary = $this->get_primary_column_name();
-        $this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$primary = $this->get_primary_column_name();
+		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
 
 		return $this->_column_headers;
 	}

includes/class-sensei-messages.php

Doc Comments +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
      * @param  integer $sender_id   ID of sender
      * @param  integer $receiver_id ID of receiver
      * @param  string  $message     Message content
-     * @param  string  $post_id     ID of post related to message
+     * @param  integer  $post_id     ID of post related to message
      * @return mixed                Message ID on success, boolean false on failure
      */
     private function save_new_message_post( $sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0 ) {

Indentation +222 added lines, -222 removed lines

@@ -21,7 +21,7 @@ 
 	 * @since  1.6.0
 	 */
 	public function __construct () {
-        $this->token = 'messages';
+		$this->token = 'messages';
 		$this->post_type = 'sensei_message';
 		$this->meta_fields = array( 'sender', 'receiver' );
 
@@ -36,11 +36,11 @@ 
 		// Monitor when new reply is posted
 		add_action( 'comment_post', array( $this, 'message_reply_received' ), 10, 1 );
 
-        // Block WordPress from sending comment update emails for the messages post type
-        add_filter('comment_notification_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
+		// Block WordPress from sending comment update emails for the messages post type
+		add_filter('comment_notification_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
 
-        // Block WordPress from sending comment moderator emails on the sensei messages post types
-        add_filter('comment_moderation_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
+		// Block WordPress from sending comment moderator emails on the sensei messages post types
+		add_filter('comment_moderation_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
 
 		// Process saving of message posts
 		add_action( 'save_post', array( $this, 'save_message' ) );
@@ -48,20 +48,20 @@ 
 		// Add message links to courses & lessons
 		add_action( 'sensei_single_course_content_inside_before', array( $this, 'send_message_link' ), 35 );
 
-        // add message link to lesson
-        add_action( 'sensei_single_lesson_content_inside_before', array( $this, 'send_message_link' ), 30, 2 );
+		// add message link to lesson
+		add_action( 'sensei_single_lesson_content_inside_before', array( $this, 'send_message_link' ), 30, 2 );
 
-        // add message link to lesson
-        add_action( 'sensei_single_quiz_questions_before', array( $this, 'send_message_link' ), 10, 2 );
+		// add message link to lesson
+		add_action( 'sensei_single_quiz_questions_before', array( $this, 'send_message_link' ), 10, 2 );
 
 		// Hide messages and replies from users who do not have access
-        add_action( 'template_redirect', array( $this, 'message_login' ), 10, 1 );
-        add_action( 'pre_get_posts', array( $this, 'message_list' ), 10, 1 );
-        add_filter( 'the_title', array( $this, 'message_title' ), 10, 2 );
-        add_filter( 'the_content', array( $this, 'message_content' ), 10, 1 );
-        add_filter( 'comments_array', array( $this, 'message_replies' ), 100, 1 );
-        add_filter( 'get_comments_number', array( $this, 'message_reply_count' ), 100, 2 );
-        add_filter( 'comments_open', array( $this, 'message_replies_open' ), 100, 2 );
+		add_action( 'template_redirect', array( $this, 'message_login' ), 10, 1 );
+		add_action( 'pre_get_posts', array( $this, 'message_list' ), 10, 1 );
+		add_filter( 'the_title', array( $this, 'message_title' ), 10, 2 );
+		add_filter( 'the_content', array( $this, 'message_content' ), 10, 1 );
+		add_filter( 'comments_array', array( $this, 'message_replies' ), 100, 1 );
+		add_filter( 'get_comments_number', array( $this, 'message_reply_count' ), 100, 2 );
+		add_filter( 'comments_open', array( $this, 'message_replies_open' ), 100, 2 );
 	} // End __construct()
 
 	public function add_menu_item() {
@@ -162,8 +162,8 @@ 
 	public function send_message_link( $post_id = 0, $user_id = 0 ) {
 		global  $post;
 
-        // only show the link for the allowed post types:
-        $allowed_post_types = array('lesson', 'course', 'quiz');
+		// only show the link for the allowed post types:
+		$allowed_post_types = array('lesson', 'course', 'quiz');
 		if ( ! in_array( get_post_type() , $allowed_post_types ) ) {
 
 			return;
@@ -186,8 +186,8 @@ 
 				} elseif( 'course' == $post->post_type ) {
 					$contact_button_text = __( 'Contact Course Teacher', 'woothemes-sensei' );
 				}else{
-                    $contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
-                }
+					$contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
+				}
 
 				$html .= '<p><a class="button send-message-button" href="' . esc_url($href) . '#private_message">' . $contact_button_text . '</a></p>';
 			}
@@ -212,19 +212,19 @@ 
 
 		if( ! isset( $post->ID ) ) return $html;
 
-        //confirm private message
-        $confirmation = '';
-        if( isset( $_GET[ 'send' ] ) && 'complete' == $_GET[ 'send' ] ) {
+		//confirm private message
+		$confirmation = '';
+		if( isset( $_GET[ 'send' ] ) && 'complete' == $_GET[ 'send' ] ) {
 
-            $confirmation_message = __('Your private message has been sent.', 'woothemes-sensei');
-            $confirmation = '<div class="sensei-message tick">' . $confirmation_message . '</div>';
+			$confirmation_message = __('Your private message has been sent.', 'woothemes-sensei');
+			$confirmation = '<div class="sensei-message tick">' . $confirmation_message . '</div>';
 
-        }
+		}
 
 		$html .= '<h3 id="private_message">' . __( 'Send Private Message', 'woothemes-sensei' ) . '</h3>';
-        $html .= '<p>';
-        $html .=  $confirmation;
-        $html .= '</p>';
+		$html .= '<p>';
+		$html .=  $confirmation;
+		$html .= '</p>';
 		$html .= '<form name="contact-teacher" action="" method="post" class="contact-teacher">';
 			$html .= '<p class="form-row form-row-wide">';
 				$html .= '<textarea name="contact_message" placeholder="' . __( 'Enter your private message.', 'woothemes-sensei' ) . '"></textarea>';
@@ -255,7 +255,7 @@ 
 	public function message_reply_received( $comment_id = 0 ) {
 
 		// Get comment object
-    	$comment = get_comment( $comment_id );
+		$comment = get_comment( $comment_id );
 
 		if( is_null( $comment ) ) return;
 
@@ -270,87 +270,87 @@ 
 		do_action( 'sensei_private_message_reply', $comment, $message );
 	}
 
-    /**
-     * This function stops WordPress from sending the default comment update emails.
-     *
-     * This function is hooked into comment_notification_recipients. It will simply return
-     * an empty array if the current passed in comment is on a message post type.
-     *
-     * @param array $emails
-     * @param int $comment_id
-     * @return array;
-     */
-    public function stop_wp_comment_emails( $emails , $comment_id ){
+	/**
+	 * This function stops WordPress from sending the default comment update emails.
+	 *
+	 * This function is hooked into comment_notification_recipients. It will simply return
+	 * an empty array if the current passed in comment is on a message post type.
+	 *
+	 * @param array $emails
+	 * @param int $comment_id
+	 * @return array;
+	 */
+	public function stop_wp_comment_emails( $emails , $comment_id ){
 
-        $comment = get_comment( $comment_id );
-        if( isset( $comment->comment_post_ID ) &&
-            'sensei_message' == get_post_type( $comment->comment_post_ID )  ){
+		$comment = get_comment( $comment_id );
+		if( isset( $comment->comment_post_ID ) &&
+			'sensei_message' == get_post_type( $comment->comment_post_ID )  ){
 
-            // empty the emails array to ensure no emails are sent for this comment
-            $emails = array();
+			// empty the emails array to ensure no emails are sent for this comment
+			$emails = array();
 
-        }
-        return $emails;
+		}
+		return $emails;
 
-    }// end stop_wp_comment_emails
+	}// end stop_wp_comment_emails
 
 	/**
-     * Save new message post
-     * @param  integer $sender_id   ID of sender
-     * @param  integer $receiver_id ID of receiver
-     * @param  string  $message     Message content
-     * @param  string  $post_id     ID of post related to message
-     * @return mixed                Message ID on success, boolean false on failure
-     */
-    private function save_new_message_post( $sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0 ) {
+	 * Save new message post
+	 * @param  integer $sender_id   ID of sender
+	 * @param  integer $receiver_id ID of receiver
+	 * @param  string  $message     Message content
+	 * @param  string  $post_id     ID of post related to message
+	 * @return mixed                Message ID on success, boolean false on failure
+	 */
+	private function save_new_message_post( $sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0 ) {
 
-    	$message_id = false;
+		$message_id = false;
 
-    	if( $sender_id && $receiver_id && $message && $post_id ) {
+		if( $sender_id && $receiver_id && $message && $post_id ) {
 
-    		$title = wp_trim_words( $message, 8, '...' );
+			$title = wp_trim_words( $message, 8, '...' );
 
-    		// Set up post data for message
-	    	$message_data = array(
-	            'post_type'      => $this->post_type,
-	            'post_title'     => esc_html( $title ),
-	            'post_content'   => esc_html( $message ),
-	            'post_status'    => 'publish',
-	            'ping_status'    => 'closed',
-	            'comment_status' => 'open',
-	            'post_excerpt'   => '',
-	            'post_author'	 => intval( $sender_id )
-	        );
+			// Set up post data for message
+			$message_data = array(
+				'post_type'      => $this->post_type,
+				'post_title'     => esc_html( $title ),
+				'post_content'   => esc_html( $message ),
+				'post_status'    => 'publish',
+				'ping_status'    => 'closed',
+				'comment_status' => 'open',
+				'post_excerpt'   => '',
+				'post_author'	 => intval( $sender_id )
+			);
 
-	    	// Insert post
-	        $message_id = wp_insert_post( $message_data );
+			// Insert post
+			$message_id = wp_insert_post( $message_data );
 
-	        if( ! is_wp_error( $message_id ) ) {
+			if( ! is_wp_error( $message_id ) ) {
 
-	        	// Add sender to message meta
-	        	$sender = get_userdata( $sender_id );
-	        	add_post_meta( $message_id, '_sender', $sender->user_login );
+				// Add sender to message meta
+				$sender = get_userdata( $sender_id );
+				add_post_meta( $message_id, '_sender', $sender->user_login );
 
-	        	// Add receiver to message meta
-	        	$receiver = get_userdata( $receiver_id );
-		        add_post_meta( $message_id, '_receiver', $receiver->user_login );
+				// Add receiver to message meta
+				$receiver = get_userdata( $receiver_id );
+				add_post_meta( $message_id, '_receiver', $receiver->user_login );
 
-		        // Add lesson/course ID to message meta
-		        $post = get_post( $post_id );
-		        add_post_meta( $message_id, '_posttype', $post->post_type );
-		        add_post_meta( $message_id, '_post', $post->ID );
+				// Add lesson/course ID to message meta
+				$post = get_post( $post_id );
+				add_post_meta( $message_id, '_posttype', $post->post_type );
+				add_post_meta( $message_id, '_post', $post->ID );
 
-		        do_action( 'sensei_new_private_message', $message_id );
+				do_action( 'sensei_new_private_message', $message_id );
 
-		    } else {
+			} else {
 
-		    	$message_id = false;
+				$message_id = false;
 
-		    }
-	    }
+			}
+		}
 
-	    return $message_id;
-    }
+		return $message_id;
+	}
 
 	/**
 	 * Check if user has access to view this message
@@ -389,56 +389,56 @@ 
 		remove_meta_box('commentstatusdiv', $this->post_type, 'normal');
 	}
 
-    /**
-     * Function message_login()
-     *
-     * Only show /messages/* to logged in users, and
-     * redirect logged out users to wp-login.php
-     *
-     * @since 1.9.0
-     * @param  none
-     * @return void
-     */
+	/**
+	 * Function message_login()
+	 *
+	 * Only show /messages/* to logged in users, and
+	 * redirect logged out users to wp-login.php
+	 *
+	 * @since 1.9.0
+	 * @param  none
+	 * @return void
+	 */
 
-    public function message_login () {
+	public function message_login () {
 
-        if ( is_user_logged_in() ) {
+		if ( is_user_logged_in() ) {
 
-            return;
-        }
+			return;
+		}
 
-        $settings = Sensei()->settings->get_settings();
-        if( isset( $settings[ 'my_course_page' ] )
-            && 0 < intval( $settings[ 'my_course_page' ] ) ){
+		$settings = Sensei()->settings->get_settings();
+		if( isset( $settings[ 'my_course_page' ] )
+			&& 0 < intval( $settings[ 'my_course_page' ] ) ){
 
-            $my_courses_page_id = $settings[ 'my_course_page' ];
+			$my_courses_page_id = $settings[ 'my_course_page' ];
 
-            $my_courses_url = get_permalink($my_courses_page_id);
+			$my_courses_url = get_permalink($my_courses_page_id);
 
-        }
+		}
 
-        if ( is_single() && is_singular( $this->post_type )
-            || is_post_type_archive( $this->post_type ) ) {
+		if ( is_single() && is_singular( $this->post_type )
+			|| is_post_type_archive( $this->post_type ) ) {
 
-            if ( isset($my_courses_url) ) {
+			if ( isset($my_courses_url) ) {
 
-                wp_redirect($my_courses_url, 303);
-                exit;
-            }
+				wp_redirect($my_courses_url, 303);
+				exit;
+			}
 
-            else {
+			else {
 
-                wp_redirect(home_url('/wp-login.php'), 303);
-                exit;
-            }
+				wp_redirect(home_url('/wp-login.php'), 303);
+				exit;
+			}
 
-        }
-    }
+		}
+	}
 	/**
-     * Only show allowed messages in messages archive
-     * @param  WP_Query $query Original query
-     * @return void
-     */
+	 * Only show allowed messages in messages archive
+	 * @param  WP_Query $query Original query
+	 * @return void
+	 */
 	public function message_list( $query ) {
 		global $current_user;
 
@@ -555,17 +555,17 @@ 
 		return $open;
 	}
 
-    /**
-     * Print outthe message was sent by $sender_username on the
-     *
-     * @since 1.9.0
-     */
-    public static function the_message_sent_by_title(){
+	/**
+	 * Print outthe message was sent by $sender_username on the
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_message_sent_by_title(){
 
-        $sender_username = get_post_meta( get_the_ID() , '_sender', true );
-        if( $sender_username ) {
+		$sender_username = get_post_meta( get_the_ID() , '_sender', true );
+		if( $sender_username ) {
 
-            $sender = get_user_by( 'login', $sender_username ); ?>
+			$sender = get_user_by( 'login', $sender_username ); ?>
 
             <p class="message-meta">
                 <small>
@@ -577,41 +577,41 @@ 
 
         <?php }
 
-    }
+	}
 
-    /**
-     * sensei_single_title output for single page title
-     * @since  1.1.0
-     * @return void
-     * @deprecate
-     */
-    public static function the_title() {
+	/**
+	 * sensei_single_title output for single page title
+	 * @since  1.1.0
+	 * @return void
+	 * @deprecate
+	 */
+	public static function the_title() {
 
-        global $post;
+		global $post;
 
-        $content_post_id = get_post_meta( $post->ID, '_post', true );
-        if( $content_post_id ) {
-            $title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), '<a href="' . get_permalink( $content_post_id ) . '">' . get_the_title( $content_post_id ) . '</a>' );
-        } else {
-            $title = get_the_title( $post->ID );
-        }
+		$content_post_id = get_post_meta( $post->ID, '_post', true );
+		if( $content_post_id ) {
+			$title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), '<a href="' . get_permalink( $content_post_id ) . '">' . get_the_title( $content_post_id ) . '</a>' );
+		} else {
+			$title = get_the_title( $post->ID );
+		}
 
-        ?>
+		?>
         <header>
 
             <h1>
 
                 <?php
-                /**
-                 * Filter Sensei single title
-                 *
-                 * @since 1.8.0
-                 * @param string $title
-                 * @param string $template
-                 * @param string $post_type
-                 */
-                echo apply_filters( 'sensei_single_title', $title, $post->post_type );
-                ?>
+				/**
+				 * Filter Sensei single title
+				 *
+				 * @since 1.8.0
+				 * @param string $title
+				 * @param string $template
+				 * @param string $post_type
+				 */
+				echo apply_filters( 'sensei_single_title', $title, $post->post_type );
+				?>
 
             </h1>
 
@@ -619,52 +619,52 @@ 
 
         <?php
 
-    } // End sensei_single_title()
+	} // End sensei_single_title()
 
-    /**
-     * Generates the my messages
-     * archive header.
-     *
-     * @since 1.9.0
-     *
-     * @return string
-     */
-    public static function the_archive_header( ){
+	/**
+	 * Generates the my messages
+	 * archive header.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return string
+	 */
+	public static function the_archive_header( ){
 
-        $html = '';
-        $html .= '<header class="archive-header"><h1>';
-        $html .= __( 'My Messages', 'woothemes-sensei' );
-        $html .= '</h1></header>';
+		$html = '';
+		$html .= '<header class="archive-header"><h1>';
+		$html .= __( 'My Messages', 'woothemes-sensei' );
+		$html .= '</h1></header>';
 
-        /**
-         * Filter the sensei messages archive title.
-         * @since 1.0.0
-         */
-        echo apply_filters( 'sensei_message_archive_title', $html );
+		/**
+		 * Filter the sensei messages archive title.
+		 * @since 1.0.0
+		 */
+		echo apply_filters( 'sensei_message_archive_title', $html );
 
-    } // get_archive_header()
+	} // get_archive_header()
 
-    /**
-     * Output the title for a message given the post_id.
-     *
-     * @since 1.9.0
-     * @param $post_id
-     */
-    public static function the_message_title( $message_post_id ){
+	/**
+	 * Output the title for a message given the post_id.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
+	public static function the_message_title( $message_post_id ){
 
-        $content_post_id = get_post_meta( $message_post_id, '_post', true );
+		$content_post_id = get_post_meta( $message_post_id, '_post', true );
 
-        if( $content_post_id ) {
+		if( $content_post_id ) {
 
-            $title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), get_the_title( $content_post_id ) );
+			$title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), get_the_title( $content_post_id ) );
 
-        } else {
+		} else {
 
-            $title = get_the_title( $message_post_id );
+			$title = get_the_title( $message_post_id );
 
-        }
+		}
 
-        ?>
+		?>
         <h2>
             <a href="<?php esc_url( get_permalink( $message_post_id ) );?>">
                 <?php echo  $title; ?>
@@ -673,21 +673,21 @@ 
         </h2>
 
         <?php
-    } //end the_message_header
+	} //end the_message_header
 
-    /**
-     * Output the message sender given the post id.
-     *
-     * @param $message_post_id
-     */
-    public  static function the_message_sender( $message_post_id ){
+	/**
+	 * Output the message sender given the post id.
+	 *
+	 * @param $message_post_id
+	 */
+	public  static function the_message_sender( $message_post_id ){
 
-        $sender_username = get_post_meta( $message_post_id, '_sender', true );
-        $sender = get_user_by( 'login', $sender_username );
+		$sender_username = get_post_meta( $message_post_id, '_sender', true );
+		$sender = get_user_by( 'login', $sender_username );
 
-        if( $sender_username && $sender instanceof WP_User ) {
-            $sender_display_name = sprintf( __( 'Sent by %1$s on %2$s.', 'woothemes-sensei' ), $sender->display_name, get_the_date() );
-            ?>
+		if( $sender_username && $sender instanceof WP_User ) {
+			$sender_display_name = sprintf( __( 'Sent by %1$s on %2$s.', 'woothemes-sensei' ), $sender->display_name, get_the_date() );
+			?>
             <p class="message-meta">
                 <small>
                     <em> <?php echo $sender_display_name; ?> </em>
@@ -695,18 +695,18 @@ 
             </p>
 
             <?php
-        } // end if
-
-    } // end the_message_archive_sender
-
-    /**
-     * Link to the users my messages page
-     *
-     * @since 1.9.0
-     */
-    public static function the_my_messages_link(){
-        if( ! Sensei()->settings->get('messages_disable')  ) {
-            ?>
+		} // end if
+
+	} // end the_message_archive_sender
+
+	/**
+	 * Link to the users my messages page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_my_messages_link(){
+		if( ! Sensei()->settings->get('messages_disable')  ) {
+			?>
             <p class="my-messages-link-container">
                 <a class="my-messages-link" href="<?php echo get_post_type_archive_link( 'sensei_message' ); ?>"
                    title="<?php _e( 'View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei' ); ?>">
@@ -714,8 +714,8 @@ 
                 </a>
             </p>
             <?php
-        }
-    }
+		}
+	}
 
 } // End Class
 

includes/class-sensei-question.php

Doc Comments +2 added lines, -2 removed lines

@@ -402,7 +402,7 @@ 
      * This function simply loads the question type template
      *
      * @since 1.9.0
-     * @param $question_type
+     * @param string $question_type
      */
     public static function load_question_template( $question_type ){
 
@@ -487,7 +487,7 @@ 
      * Get the questions media markup
      *
      * @since 1.9.0
-     * @param $question_id
+     * @param string $question_id
      * @return string
      */
     public static function get_the_question_media( $question_id ){

Indentation +567 added lines, -567 removed lines

@@ -20,7 +20,7 @@ 
 	 * @since  1.0.0
 	 */
 	public function __construct () {
-        $this->token = 'question';
+		$this->token = 'question';
 		$this->question_types = $this->question_types();
 		$this->meta_fields = array( 'question_right_answer', 'question_wrong_answers' );
 		if ( is_admin() ) {
@@ -117,7 +117,7 @@ 
 
 			if( isset( $post->ID ) ) {
 
-                $question_type = Sensei()->question->get_question_type( $post->ID );
+				$question_type = Sensei()->question->get_question_type( $post->ID );
 
 				if( $question_type ) {
 					$type = $this->question_types[ $question_type ];
@@ -237,15 +237,15 @@ 
 	public function save_question( $post_id = 0 ) {
 
 		if( ! isset( $_POST['post_type']
-            ) || 'question' != $_POST['post_type'] ) {
-            return;
-        }
+			) || 'question' != $_POST['post_type'] ) {
+			return;
+		}
 
 
 
-        //setup the data for saving
+		//setup the data for saving
 		$data = $_POST ;
-        $data['quiz_id'] = 0;
+		$data['quiz_id'] = 0;
 		$data['question_id'] = $post_id;
 
 		if ( ! wp_is_post_revision( $post_id ) ){
@@ -339,34 +339,34 @@ 
 		return $request;
 	}
 
-    /**
-     * Get the type of question by id
-     *
-     * This function uses the post terms to determine which question type
-     * the passed question id belongs to.
-     *
-     * @since 1.7.4
-     *
-     * @param int $question_id
-     *
-     * @return string $question_type | bool
-     */
-    public function get_question_type( $question_id ){
-
-        if( empty( $question_id ) || ! intval( $question_id ) > 0
-            || 'question' != get_post_type( $question_id )   ){
-            return false;
-        }
-
-        $question_type = 'multiple-choice';
-        $question_types = wp_get_post_terms( $question_id, 'question-type' );
-        foreach( $question_types as $type ) {
-            $question_type = $type->slug;
-        }
-
-        return $question_type;
-
-    }// end get_question_type
+	/**
+	 * Get the type of question by id
+	 *
+	 * This function uses the post terms to determine which question type
+	 * the passed question id belongs to.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param int $question_id
+	 *
+	 * @return string $question_type | bool
+	 */
+	public function get_question_type( $question_id ){
+
+		if( empty( $question_id ) || ! intval( $question_id ) > 0
+			|| 'question' != get_post_type( $question_id )   ){
+			return false;
+		}
+
+		$question_type = 'multiple-choice';
+		$question_types = wp_get_post_terms( $question_id, 'question-type' );
+		foreach( $question_types as $type ) {
+			$question_type = $type->slug;
+		}
+
+		return $question_type;
+
+	}// end get_question_type
 
 	/**
 	 * Given a question ID, return the grade that can be achieved.
@@ -398,317 +398,317 @@ 
 	} // end get_question_grade
 
 
-    /**
-     * This function simply loads the question type template
-     *
-     * @since 1.9.0
-     * @param $question_type
-     */
-    public static function load_question_template( $question_type ){
-
-        Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
-    }
-
-    /**
-     * Echo the sensei question title.
-     *
-     * @uses WooThemes_Sensei_Question::get_the_question_title
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function the_question_title( $question_id ){
-
-        echo self::get_the_question_title( $question_id );
-
-    }// end the_question_title
-
-    /**
-     * Generate the question title with it's grade.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_title( $question_id ){
-
-        /**
-         * Filter the sensei question title
-         *
-         * @since 1.3.0
-         * @param $question_title
-         */
-        $title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
-
-        /**
-         * hook document in class-woothemes-sensei-message.php the_title()
-         */
-        $title = apply_filters( 'sensei_single_title', $title, 'question');
-
-        $title_html  = '<span class="question question-title">';
-        $title_html .= $title;
-        $title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
-        $title_html .='</span>';
-
-        return $title_html;
-    }
-
-    /**
-     * Tech the question description
-     *
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_description( $question_id ){
-
-        $question = get_post( $question_id );
-
-        /**
-         * Already documented within WordPress Core
-         */
-        return apply_filters( 'the_content', $question->post_content );
-
-    }
-
-    /**
-     * Output the question description
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function the_question_description( $question_id  ){
-
-        echo self::get_the_question_description( $question_id );
-
-    }
-
-    /**
-     * Get the questions media markup
-     *
-     * @since 1.9.0
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_media( $question_id ){
-
-        $question_media = get_post_meta( $question_id, '_question_media', true );
-        $question_media_link = '';
-        if( 0 < intval( $question_media ) ) {
-            $mimetype = get_post_mime_type( $question_media );
-            if( $mimetype ) {
-                $mimetype_array = explode( '/', $mimetype);
-                if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
-                    $question_media_type = $mimetype_array[0];
-                    $question_media_url = wp_get_attachment_url( $question_media );
-                    $attachment = get_post( $question_media );
-                    $question_media_title = $attachment->post_title;
-                    $question_media_description = $attachment->post_content;
-                    switch( $question_media_type ) {
-                        case 'image':
-                            $image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
-                            $attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
-                            break;
-
-                        case 'audio':
-                            $question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
-                            break;
-
-                        case 'video':
-                            $question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
-                            break;
-
-                        default:
-                            $question_media_filename = basename( $question_media_url );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
-                            break;
-                    }
-                }
-            }
-        }
-
-        $output = '';
-        if( $question_media_link ) {
-
-                $output .= '<div class="question_media_display">';
-                $output .=      $question_media_link;
-                $output .= '<dl>';
-
-                if( $question_media_title ) {
-
-                   $output .= '<dt>'. $question_media_title. '</dt>';
-
-                 }
-
-                if( $question_media_description ) {
-
-                    $output .= '<dd>' . $question_media_description . '</dd>';
-
-                }
-
-                $output .= '</dl>';
-                $output .= '</div>';
+	/**
+	 * This function simply loads the question type template
+	 *
+	 * @since 1.9.0
+	 * @param $question_type
+	 */
+	public static function load_question_template( $question_type ){
+
+		Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
+	}
+
+	/**
+	 * Echo the sensei question title.
+	 *
+	 * @uses WooThemes_Sensei_Question::get_the_question_title
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function the_question_title( $question_id ){
+
+		echo self::get_the_question_title( $question_id );
+
+	}// end the_question_title
+
+	/**
+	 * Generate the question title with it's grade.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_title( $question_id ){
+
+		/**
+		 * Filter the sensei question title
+		 *
+		 * @since 1.3.0
+		 * @param $question_title
+		 */
+		$title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
+
+		/**
+		 * hook document in class-woothemes-sensei-message.php the_title()
+		 */
+		$title = apply_filters( 'sensei_single_title', $title, 'question');
+
+		$title_html  = '<span class="question question-title">';
+		$title_html .= $title;
+		$title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
+		$title_html .='</span>';
+
+		return $title_html;
+	}
+
+	/**
+	 * Tech the question description
+	 *
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_description( $question_id ){
+
+		$question = get_post( $question_id );
+
+		/**
+		 * Already documented within WordPress Core
+		 */
+		return apply_filters( 'the_content', $question->post_content );
+
+	}
+
+	/**
+	 * Output the question description
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function the_question_description( $question_id  ){
+
+		echo self::get_the_question_description( $question_id );
+
+	}
+
+	/**
+	 * Get the questions media markup
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_media( $question_id ){
+
+		$question_media = get_post_meta( $question_id, '_question_media', true );
+		$question_media_link = '';
+		if( 0 < intval( $question_media ) ) {
+			$mimetype = get_post_mime_type( $question_media );
+			if( $mimetype ) {
+				$mimetype_array = explode( '/', $mimetype);
+				if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
+					$question_media_type = $mimetype_array[0];
+					$question_media_url = wp_get_attachment_url( $question_media );
+					$attachment = get_post( $question_media );
+					$question_media_title = $attachment->post_title;
+					$question_media_description = $attachment->post_content;
+					switch( $question_media_type ) {
+						case 'image':
+							$image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
+							$attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
+							$question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
+							break;
+
+						case 'audio':
+							$question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
+							break;
+
+						case 'video':
+							$question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
+							break;
+
+						default:
+							$question_media_filename = basename( $question_media_url );
+							$question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
+							break;
+					}
+				}
+			}
+		}
+
+		$output = '';
+		if( $question_media_link ) {
 
+				$output .= '<div class="question_media_display">';
+				$output .=      $question_media_link;
+				$output .= '<dl>';
 
-         }
-
-        return $output;
-
-    } // end get_the_question_media
-
+				if( $question_media_title ) {
 
-    /**
-     * Output the question media
-     *
-     * @since 1.9.0
-     * @param string $question_id
-     */
-    public static function the_question_media( $question_id ){
+				   $output .= '<dt>'. $question_media_title. '</dt>';
 
-        echo self::get_the_question_media( $question_id );
+				 }
 
-    }
+				if( $question_media_description ) {
 
-    /**
-     * Output a special field for the question needed for question submission.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_id
-     */
-    public static function the_question_hidden_fields( $question_id ){
-        ?>
+					$output .= '<dd>' . $question_media_description . '</dd>';
+
+				}
+
+				$output .= '</dl>';
+				$output .= '</div>';
+
+
+		 }
+
+		return $output;
+
+	} // end get_the_question_media
+
+
+	/**
+	 * Output the question media
+	 *
+	 * @since 1.9.0
+	 * @param string $question_id
+	 */
+	public static function the_question_media( $question_id ){
+
+		echo self::get_the_question_media( $question_id );
+
+	}
+
+	/**
+	 * Output a special field for the question needed for question submission.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_id
+	 */
+	public static function the_question_hidden_fields( $question_id ){
+		?>
 
             <input type="hidden" name="question_id_<?php $question_id;?>" value="<?php $question_id;?>" />
             <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e( $question_id ); ?>" />
 
         <?php
-    }
+	}
 
-    /**
-     * This function can only be run withing the single quiz question loop
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function answer_feedback_notes( $question_id ){
+	/**
+	 * This function can only be run withing the single quiz question loop
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function answer_feedback_notes( $question_id ){
 
-        //IDS
-        $quiz_id = get_the_ID();
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+		//IDS
+		$quiz_id = get_the_ID();
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
 
-        // Data to check before showing feedback
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $not_empty_user_quiz_grade = !empty( $user_quiz_grade );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+		// Data to check before showing feedback
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
+		$user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$not_empty_user_quiz_grade = !empty( $user_quiz_grade );
+		$reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
+		$lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
+		$quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
 
-        if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
-            ||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
-            || ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
+		if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
+			||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
+			|| ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
 
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
+			$answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
 
-            if( $answer_notes ) { ?>
+			if( $answer_notes ) { ?>
 
                 <div class="sensei-message info info-special answer-feedback">
 
                     <?php
 
-                        /**
-                         * Filter the answer feedback
-                         * Since 1.9.0
-                         *
-                         * @param string $answer_notes
-                         * @param string $question_id
-                         * @param string $lesson_id
-                         */
-                        echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
+						/**
+						 * Filter the answer feedback
+						 * Since 1.9.0
+						 *
+						 * @param string $answer_notes
+						 * @param string $question_id
+						 * @param string $lesson_id
+						 */
+						echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
 
-                    ?>
+					?>
 
                 </div>
 
             <?php }
 
-        }// end if we can show answer feedback
+		}// end if we can show answer feedback
 
-    }// end answer_feedback_notes
+	}// end answer_feedback_notes
 
-    /**
-     * This function has to be run inside the quiz question loop on the single quiz page.
-     *
-     *
-     * @since 1.9.0
-     * @param string $question_id
-     */
-    public static function the_answer_result_indication( $question_id ){
+	/**
+	 * This function has to be run inside the quiz question loop on the single quiz page.
+	 *
+	 *
+	 * @since 1.9.0
+	 * @param string $question_id
+	 */
+	public static function the_answer_result_indication( $question_id ){
 
-        global $post,  $current_user, $sensei_question_loop;
+		global $post,  $current_user, $sensei_question_loop;
 
-        // Post Data
-        $quiz_id = $sensei_question_loop['quiz_id'];
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $question_item = $sensei_question_loop['current_question'];
+		// Post Data
+		$quiz_id = $sensei_question_loop['quiz_id'];
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+		$question_item = $sensei_question_loop['current_question'];
 
-        // Setup variable needed to determine if the message should show and what it should show
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		// Setup variable needed to determine if the message should show and what it should show
+		$user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
+		$quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-        // retrieve the question total grade
-        $question_grade = Sensei()->question->get_question_grade( $question_id );
+		// retrieve the question total grade
+		$question_grade = Sensei()->question->get_question_grade( $question_id );
 
-        // retrieve grade the user achieved
-        $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
+		// retrieve grade the user achieved
+		$user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
 
-        // Question ID
-        $question_id = $question_item->ID;
+		// Question ID
+		$question_id = $question_item->ID;
 
-        // conditions to check
-        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
-        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
-        $grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
+		// conditions to check
+		$completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
+		$completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
+		$grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
 
-        if (  $completed_with_valid_grade
-            || $completed_with_valid_grade_and_reset_not_allowed
-            || $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
+		if (  $completed_with_valid_grade
+			|| $completed_with_valid_grade_and_reset_not_allowed
+			|| $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
 
-            $user_correct = false;
-            $answer_message = __( 'Incorrect', 'woothemes-sensei' );
-            $answer_message_class = 'user_wrong';
-            // For zero grade mark as 'correct' but add no classes
-            if ( 0 == $question_grade ) {
+			$user_correct = false;
+			$answer_message = __( 'Incorrect', 'woothemes-sensei' );
+			$answer_message_class = 'user_wrong';
+			// For zero grade mark as 'correct' but add no classes
+			if ( 0 == $question_grade ) {
 
-                $user_correct = true;
-                $answer_message = '';
-                $answer_message_class = '';
+				$user_correct = true;
+				$answer_message = '';
+				$answer_message_class = '';
 
-            } else if( $user_question_grade > 0 ) {
+			} else if( $user_question_grade > 0 ) {
 
-                $user_correct = true;
-                $answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
-                $answer_message_class = 'user_right';
+				$user_correct = true;
+				$answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
+				$answer_message_class = 'user_right';
 
-            }
+			}
 
-            // attach the correct answer if the question is auto gradable and user got it wrong
-            if( !$reset_quiz_allowed && !$user_correct ){
+			// attach the correct answer if the question is auto gradable and user got it wrong
+			if( !$reset_quiz_allowed && !$user_correct ){
 
-                $answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
+				$answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
 
-            }
+			}
 
-            // answer feedback
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
-            if( $answer_notes ) {
-                $answer_message_class .= ' has_notes';
-            }
-            ?>
+			// answer feedback
+			$answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
+			if( $answer_notes ) {
+				$answer_message_class .= ' has_notes';
+			}
+			?>
 
             <div class="answer_message <?php esc_attr_e( $answer_message_class ); ?>">
 
@@ -718,387 +718,387 @@ 
 
             <?php
 
-        } // end if user can see all the goodies
-
-    }// end the_answer_result_indication
-
-    /**
-     * Generate the question template data and return it as an array.
-     *
-     * @since 1.9.0
-     *
-     * @param string $question_id
-     * @param $quiz_id
-     * @return array $question_data
-     */
-    public static function get_template_data( $question_id, $quiz_id ){
-
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
-
-        $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
-
-        // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
-        $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        }
-
-        //setup the question data
-        $data[ 'ID' ]                     = $question_id;
-        $data[ 'title' ]                  = get_the_title( $question_id );
-        $data[ 'content' ]                = get_post( $question_id )->post_content;
-        $data[ 'quiz_id' ]                = $quiz_id;
-        $data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
-        $data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
-        $data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
-        $data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
-        $data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
-        $data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
-        $data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
-        $data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
-        $data[ 'reset_quiz_allowed' ]     = $reset_allowed;
-        $data[ 'lesson_complete' ]        = $user_lesson_complete;
-
-        /**
-         * Filter the question template data. This filter fires  in
-         * the get_template_data function
-         *
-         * @hooked self::boolean_load_question_data
-         *
-         * @since 1.9.0
-         *
-         * @param array $data
-         * @param string $question_id
-         * @param string $quiz_id
-         */
-        return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
+		} // end if user can see all the goodies
 
-    }
+	}// end the_answer_result_indication
 
-    /**
-     * Load multiple choice question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
+	/**
+	 * Generate the question template data and return it as an array.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param string $question_id
+	 * @param $quiz_id
+	 * @return array $question_data
+	 */
+	public static function get_template_data( $question_id, $quiz_id ){
 
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
 
-        if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
+		$reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		//backwards compatibility
+		if( 'on' == $reset_allowed ) {
+			$reset_allowed = 1;
+		}
 
-            // Get uploaded file
-            $attachment_id = $question_data[ 'user_answer_entry' ];
-            $answer_media_url = $answer_media_filename = '';
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		}
 
+		//setup the question data
+		$data[ 'ID' ]                     = $question_id;
+		$data[ 'title' ]                  = get_the_title( $question_id );
+		$data[ 'content' ]                = get_post( $question_id )->post_content;
+		$data[ 'quiz_id' ]                = $quiz_id;
+		$data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
+		$data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
+		$data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
+		$data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
+		$data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
+		$data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
+		$data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
+		$data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
+		$data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+		$data[ 'reset_quiz_allowed' ]     = $reset_allowed;
+		$data[ 'lesson_complete' ]        = $user_lesson_complete;
+
+		/**
+		 * Filter the question template data. This filter fires  in
+		 * the get_template_data function
+		 *
+		 * @hooked self::boolean_load_question_data
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param array $data
+		 * @param string $question_id
+		 * @param string $quiz_id
+		 */
+		return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
 
-            $question_helptext = '';
-            if( isset( $question_data['question_wrong_answers'][0] ) ) {
+	}
 
-                $question_helptext =  $question_data['question_wrong_answers'][0];
+	/**
+	 * Load multiple choice question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
 
-            }
 
+		if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            if( 0 < intval( $attachment_id ) ) {
+			// Get uploaded file
+			$attachment_id = $question_data[ 'user_answer_entry' ];
+			$answer_media_url = $answer_media_filename = '';
 
-                $answer_media_url = wp_get_attachment_url( $attachment_id );
-                $answer_media_filename = basename( $answer_media_url );
 
-            }
+			$question_helptext = '';
+			if( isset( $question_data['question_wrong_answers'][0] ) ) {
 
+				$question_helptext =  $question_data['question_wrong_answers'][0];
 
-            // Get max upload file size, formatted for display
-            // Code copied from wp-admin/includes/media.php:1515
-            $upload_size_unit = $max_upload_size = wp_max_upload_size();
-            $sizes = array( 'KB', 'MB', 'GB' );
-            for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
-                $upload_size_unit /= 1024;
-            }
-            if ( $u < 0 ) {
+			}
 
-                $upload_size_unit = 0;
-                $u = 0;
 
-            } else {
+			if( 0 < intval( $attachment_id ) ) {
 
-                $upload_size_unit = (int) $upload_size_unit;
+				$answer_media_url = wp_get_attachment_url( $attachment_id );
+				$answer_media_filename = basename( $answer_media_url );
 
-            }
-            $max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
+			}
 
-            // Assemble all the data needed by the file upload template
-            $question_data[ 'answer_media_url' ]      = $answer_media_url;
-            $question_data[ 'answer_media_filename' ] = $answer_media_filename;
-            $question_data[ 'max_upload_size' ]       = $max_upload_size;
 
-            $question_data[ 'question_helptext' ]     = $question_helptext;
+			// Get max upload file size, formatted for display
+			// Code copied from wp-admin/includes/media.php:1515
+			$upload_size_unit = $max_upload_size = wp_max_upload_size();
+			$sizes = array( 'KB', 'MB', 'GB' );
+			for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+				$upload_size_unit /= 1024;
+			}
+			if ( $u < 0 ) {
 
-        }// end if is file upload type
+				$upload_size_unit = 0;
+				$u = 0;
 
-        return $question_data;
+			} else {
 
-    }// end file_upload_load_question_data
+				$upload_size_unit = (int) $upload_size_unit;
 
-    /**
-     * Load multiple choice question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
+			}
+			$max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
 
-        if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
+			// Assemble all the data needed by the file upload template
+			$question_data[ 'answer_media_url' ]      = $answer_media_url;
+			$question_data[ 'answer_media_filename' ] = $answer_media_filename;
+			$question_data[ 'max_upload_size' ]       = $max_upload_size;
 
+			$question_data[ 'question_helptext' ]     = $question_helptext;
 
-            $answer_type = 'radio';
-            if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
+		}// end if is file upload type
 
-                $answer_type = 'checkbox';
+		return $question_data;
 
-            }
+	}// end file_upload_load_question_data
 
-            // Merge right and wrong answers
-            if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
+	/**
+	 * Load multiple choice question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
 
-                $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+		if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            }  else {
 
-                array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
-                $merged_options = $question_data[ 'question_wrong_answers' ];
+			$answer_type = 'radio';
+			if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
 
-            }
+				$answer_type = 'checkbox';
 
-            // Setup answer options array.
-            $question_answers_options = array();
-            $count = 0;
+			}
 
-            foreach( $merged_options as $answer ) {
+			// Merge right and wrong answers
+			if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
 
-                $count++;
-                $question_option = array();
+				$merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
 
-                if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
+			}  else {
 
-                    $user_correct = false;
+				array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+				$merged_options = $question_data[ 'question_wrong_answers' ];
 
+			}
 
-                    // For zero grade mark as 'correct' but add no classes
-                    if ( 0 == $question_data[ 'question_grade' ] ) {
+			// Setup answer options array.
+			$question_answers_options = array();
+			$count = 0;
 
-                        $user_correct = true;
+			foreach( $merged_options as $answer ) {
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+				$count++;
+				$question_option = array();
 
-                        $user_correct = true;
+				if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
+					|| ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
+					|| ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
 
-                    }
+					$user_correct = false;
 
-                }
 
-                // setup the option specific classes
-                $answer_class = '';
-                if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
-                    if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
+					// For zero grade mark as 'correct' but add no classes
+					if ( 0 == $question_data[ 'question_grade' ] ) {
 
-                        $answer_class .= ' right_answer';
+						$user_correct = true;
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+					}  else if( $question_data[ 'user_question_grade' ] > 0 ) {
 
-                        $answer_class .= ' right_answer';
+						$user_correct = true;
 
-                    } elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
-                        ||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
+					}
 
-                        $answer_class = 'user_wrong';
-                        if( $user_correct ) {
+				}
 
-                            $answer_class = 'user_right';
+				// setup the option specific classes
+				$answer_class = '';
+				if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
+					if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
 
-                        }
+						$answer_class .= ' right_answer';
 
-                    }
+					}  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
 
-                }
+						$answer_class .= ' right_answer';
 
-                // determine if the current option must be checked
-                $checked = '';
-                if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
-                    if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
+					} elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
+						||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
 
-                        $checked = 'checked="checked"';
+						$answer_class = 'user_wrong';
+						if( $user_correct ) {
 
-                    } elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
+							$answer_class = 'user_right';
 
-                        $checked = checked( $answer, $question_data['user_answer_entry'] , false );
+						}
 
-                    }
+					}
 
-                } // End If Statement
+				}
 
-                //Load the answer option data
-                $question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
-                $question_option[ 'answer' ]      = $answer;
-                $question_option[ 'option_class'] = $answer_class;
-                $question_option[ 'checked']      = $checked;
-                $question_option[ 'count' ]       = $count;
-                $question_option[ 'type' ] = $answer_type;
+				// determine if the current option must be checked
+				$checked = '';
+				if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
+					if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
 
-                // add the speci  fic option to the list of options for this question
-                $question_answers_options[$question_option[ 'ID' ]] = $question_option;
+						$checked = 'checked="checked"';
 
-            } // end for each option
+					} elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
 
+						$checked = checked( $answer, $question_data['user_answer_entry'] , false );
 
-            // Shuffle the array depending on the settings
-            $answer_options_sorted = array();
-            $random_order = get_post_meta( $question_data['ID'], '_random_order', true );
-            if(  $random_order && $random_order == 'yes' ) {
+					}
 
-                $answer_options_sorted = $question_answers_options;
-                shuffle( $answer_options_sorted );
+				} // End If Statement
 
-            } else {
+				//Load the answer option data
+				$question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
+				$question_option[ 'answer' ]      = $answer;
+				$question_option[ 'option_class'] = $answer_class;
+				$question_option[ 'checked']      = $checked;
+				$question_option[ 'count' ]       = $count;
+				$question_option[ 'type' ] = $answer_type;
 
-                $answer_order = array();
-                $answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
-                if( $answer_order_string ) {
+				// add the speci  fic option to the list of options for this question
+				$question_answers_options[$question_option[ 'ID' ]] = $question_option;
 
-                    $answer_order = array_filter( explode( ',', $answer_order_string ) );
-                    if( count( $answer_order ) > 0 ) {
+			} // end for each option
 
-                        foreach( $answer_order as $answer_id ) {
 
-                            if( isset( $question_answers_options[ $answer_id ] ) ) {
+			// Shuffle the array depending on the settings
+			$answer_options_sorted = array();
+			$random_order = get_post_meta( $question_data['ID'], '_random_order', true );
+			if(  $random_order && $random_order == 'yes' ) {
 
-                                $answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
-                                unset( $question_answers_options[ $answer_id ] );
+				$answer_options_sorted = $question_answers_options;
+				shuffle( $answer_options_sorted );
 
-                            }
+			} else {
 
-                        }
+				$answer_order = array();
+				$answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
+				if( $answer_order_string ) {
 
-                        if( count( $question_answers_options ) > 0 ) {
-                            foreach( $question_answers_options as $id => $answer ) {
+					$answer_order = array_filter( explode( ',', $answer_order_string ) );
+					if( count( $answer_order ) > 0 ) {
 
-                                $answer_options_sorted[ $id ] = $answer;
+						foreach( $answer_order as $answer_id ) {
 
-                            }
-                        }
+							if( isset( $question_answers_options[ $answer_id ] ) ) {
 
-                    }else{
+								$answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
+								unset( $question_answers_options[ $answer_id ] );
 
-                        $answer_options_sorted = $question_answers_options;
+							}
 
-                    }
+						}
 
-                }else{
+						if( count( $question_answers_options ) > 0 ) {
+							foreach( $question_answers_options as $id => $answer ) {
 
-                    $answer_options_sorted = $question_answers_options;
+								$answer_options_sorted[ $id ] = $answer;
 
-                } // end if $answer_order_string
+							}
+						}
 
-            } // end if random order
+					}else{
 
+						$answer_options_sorted = $question_answers_options;
 
-            // assemble and setup the data for the templates data array
-            $question_data[ 'answer_options' ]    =  $answer_options_sorted;
+					}
 
-        }
+				}else{
 
-        return $question_data;
+					$answer_options_sorted = $question_answers_options;
 
-    }//  end multiple_choice_load_question_data
+				} // end if $answer_order_string
 
-    /**
-     * Load the gap fill question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+			} // end if random order
 
-        if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            $gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
-            $question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
-            $question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
-            $question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+			// assemble and setup the data for the templates data array
+			$question_data[ 'answer_options' ]    =  $answer_options_sorted;
 
-        }
+		}
 
-        return $question_data;
+		return $question_data;
 
-    }//  end gap_fill_load_question_data
+	}//  end multiple_choice_load_question_data
+
+	/**
+	 * Load the gap fill question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+
+		if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
+
+			$gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
+			$question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
+			$question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
+			$question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+
+		}
+
+		return $question_data;
+
+	}//  end gap_fill_load_question_data
 
 
-    /**
-     * Get the correct answer for a question
-     *
-     * @param $question_id
-     * @return string $correct_answer or empty
-     */
-    public static function get_correct_answer( $question_id ){
+	/**
+	 * Get the correct answer for a question
+	 *
+	 * @param $question_id
+	 * @return string $correct_answer or empty
+	 */
+	public static function get_correct_answer( $question_id ){
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $type = Sensei()->question->get_question_type( $question_id );
-        $type_name = __( 'Multiple Choice', 'woothemes-sensei' );
-        $grade_type = 'manual-grade';
+		$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
+		$type = Sensei()->question->get_question_type( $question_id );
+		$type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+		$grade_type = 'manual-grade';
 
-        if ('boolean'== $type ) {
+		if ('boolean'== $type ) {
 
-            $right_answer = ucfirst($right_answer);
+			$right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+		}elseif( 'multiple-choice' == $type ) {
 
-            $right_answer = (array) $right_answer;
-            $right_answer = implode( ', ', $right_answer );
+			$right_answer = (array) $right_answer;
+			$right_answer = implode( ', ', $right_answer );
 
-        }elseif( 'gap-fill' == $type ) {
+		}elseif( 'gap-fill' == $type ) {
 
-            $right_answer_array = explode( '||', $right_answer );
-            if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-            if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-            if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+			$right_answer_array = explode( '||', $right_answer );
+			if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+			if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+			if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-            $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
+			$right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
 
-        }else{
+		}else{
 
-            // for non auto gradable question types no answer should be returned.
-            $right_answer = '';
+			// for non auto gradable question types no answer should be returned.
+			$right_answer = '';
 
-        }
+		}
 
-        return $right_answer;
+		return $right_answer;
 
-    } // get_correct_answer
+	} // get_correct_answer
 
 } // End Class
 

includes/class-sensei-quiz.php

Doc Comments +4 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
      *
      * This function hooks into the quiz page and accepts the answer form save post.
      * @since 1.7.3
-     * @return bool $saved;
+     * @return boolean|null $saved;
      */
     public function user_save_quiz_answers_listener(){
 
@@ -214,7 +214,7 @@ 
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
-	 * @return array $answers or false
+	 * @return boolean $answers or false
 	 */
 	public function get_user_answers( $lesson_id, $user_id ){
 
@@ -707,7 +707,7 @@ 
       *      @type int $question_id
       *      @type int $question_grade
       * }
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return bool
@@ -754,7 +754,7 @@ 
       *
       * @since 1.7.4
       *
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return array $user_quiz_grades or false if none exists for this users
@@ -1090,7 +1090,6 @@ 
       * Filter the single title and add the Quiz to it.
       *
       * @param string $title
-      * @param int $id title post id
       * @return string $quiz_title
       */
      public static function single_quiz_title( $title, $post_id ){

Indentation +884 added lines, -884 removed lines

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

includes/sensei-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
  *
  * @since 1.9.0
  *
- * @param $hook_tag
- * @param $version
+ * @param string $hook_tag
+ * @param string $version
  * @param $alternative
  * @param array $args
  */

Indentation +56 added lines, -56 removed lines

@@ -45,16 +45,16 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
-
-    /**
-     * Filter sensei_all_access function result
-     * which determinse if the current user
-     * can access all of Sensei without restrictions
-     *
-     * @since 1.4.0
-     * @param bool $access
-     */
+	$access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+
+	/**
+	 * Filter sensei_all_access function result
+	 * which determinse if the current user
+	 * can access all of Sensei without restrictions
+	 *
+	 * @since 1.4.0
+	 * @param bool $access
+	 */
 	return apply_filters( 'sensei_all_access', $access );
 
 } // End sensei_all_access()
@@ -72,7 +72,7 @@ 
 	 */
 	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
 
-	    $hex = str_replace( '#', '', $color );
+		$hex = str_replace( '#', '', $color );
 
 		$c_r = hexdec( substr( $hex, 0, 2 ) );
 		$c_g = hexdec( substr( $hex, 2, 2 ) );
@@ -119,15 +119,15 @@ 
 		$color = '#';
 
 		foreach ($base as $k => $v) :
-	        $amount = $v / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v - $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+			$amount = $v / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v - $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 		endforeach;
 
 		return $color;
@@ -148,17 +148,17 @@ 
 		$base = sensei_rgb_from_hex( $color );
 		$color = '#';
 
-	    foreach ($base as $k => $v) :
-	        $amount = 255 - $v;
-	        $amount = $amount / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v + $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+		foreach ($base as $k => $v) :
+			$amount = 255 - $v;
+			$amount = $amount / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v + $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 	   	endforeach;
 
 	   	return $color;
@@ -172,14 +172,14 @@ 
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
 if ( ! function_exists( 'is_woocommerce_active' ) ) {
-    function is_woocommerce_active() {
-        // calling is present instead of is active here
-        // as this function can override other is_woocommerce_active
-        // function in other woo plugins and Sensei_WC::is_woocommerce_active
-        // also check the sensei settings for enable WooCommerce support, which
-        // other plugins should not check against.
-        return Sensei_WC::is_woocommerce_present();
-    }
+	function is_woocommerce_active() {
+		// calling is present instead of is active here
+		// as this function can override other is_woocommerce_active
+		// function in other woo plugins and Sensei_WC::is_woocommerce_active
+		// also check the sensei settings for enable WooCommerce support, which
+		// other plugins should not check against.
+		return Sensei_WC::is_woocommerce_present();
+	}
 }
 
 /**
@@ -195,20 +195,20 @@ 
  */
 function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
 
-    if( has_action( $hook_tag ) ){
+	if( has_action( $hook_tag ) ){
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+		$error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
 
-        if( !empty( $alternative ) ){
+		if( !empty( $alternative ) ){
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+			$error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
 
-        }
+		}
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+		trigger_error( $error_message );
+		do_action( $hook_tag , $args );
 
-    }
+	}
 
 }// end sensei_do_deprecated_action
 
@@ -238,18 +238,18 @@ 
  */
 function sensei_user_login_url(){
 
-    $my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
-    $page = get_post( $my_courses_page_id );
+	$my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
+	$page = get_post( $my_courses_page_id );
 
-    if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
+	if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
 
-        return get_permalink( $page->ID );
+		return get_permalink( $page->ID );
 
-    } else {
+	} else {
 
-        return wp_login_url();
+		return wp_login_url();
 
-    }
+	}
 
 }// end sensei_user_login_link
 
@@ -262,8 +262,8 @@ 
  */
 function sensei_is_login_required(){
 
-    $login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
+	$login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
 
-    return $login_required;
+	return $login_required;
 
 }
\ No newline at end of file

includes/shortcodes/class-sensei-legacy-shortcodes.php

Doc Comments +2 added lines, -2 removed lines

@@ -103,8 +103,8 @@
      *
      * @since 1.9.0
      *
-     * @param $title
-     * @param $shortcode_specific_override
+     * @param string $title
+     * @param string $shortcode_specific_override
      * @return string
      */
     public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){

Indentation +249 added lines, -249 removed lines

@@ -17,323 +17,323 @@ 
  */
 class Sensei_Legacy_Shortcodes {
 
-    /**
-     * Add the legacy shortcodes to WordPress
-     *
-     * @since 1.9.0
-     */
-    public static function init(){
-
-        add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
-        add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
-        add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
-        add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
-        add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
-        add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
-
-    }
-    /**
-     * all_courses shortcode output function.
-     *
-     * The function should only be called indirectly through do_shortcode()
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function all_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
-
-    } // all_courses()
-
-    /**
-     * paid_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function paid_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
-
-    } // End paid_courses()
-
-
-    /**
-     * featured_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function featured_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
+	/**
+	 * Add the legacy shortcodes to WordPress
+	 *
+	 * @since 1.9.0
+	 */
+	public static function init(){
+
+		add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
+		add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
+		add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
+		add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
+		add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
+		add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
+
+	}
+	/**
+	 * all_courses shortcode output function.
+	 *
+	 * The function should only be called indirectly through do_shortcode()
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function all_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
+
+	} // all_courses()
+
+	/**
+	 * paid_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function paid_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
+
+	} // End paid_courses()
+
+
+	/**
+	 * featured_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function featured_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
 
-    } // End featured_courses()
+	} // End featured_courses()
 
-    /**
-     * shortcode_free_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function free_courses( $atts, $content = null ) {
+	/**
+	 * shortcode_free_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function free_courses( $atts, $content = null ) {
 
-        return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
+		return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
 
-    } // End free_courses()
+	} // End free_courses()
 
-    /**
-     * shortcode_new_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function new_courses( $atts, $content = null ) {
+	/**
+	 * shortcode_new_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function new_courses( $atts, $content = null ) {
 
-        return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
+		return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
 
-    } // End new_courses()
+	} // End new_courses()
 
-    /**
-     * Generate courses adding a title.
-     *
-     * @since 1.9.0
-     *
-     * @param $title
-     * @param $shortcode_specific_override
-     * @return string
-     */
-    public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
+	/**
+	 * Generate courses adding a title.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $title
+	 * @param $shortcode_specific_override
+	 * @return string
+	 */
+	public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
 
-        global  $shortcode_override, $posts_array;
+		global  $shortcode_override, $posts_array;
 
-        $shortcode_override = $shortcode_specific_override;
+		$shortcode_override = $shortcode_specific_override;
 
-        // do not show this short code if there is a shortcode int he url and
-        // this specific shortcode is not the one requested in the ur.
-        $specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
-        if( ! empty( $specific_shortcode_requested) &&
-            $specific_shortcode_requested != $shortcode_override ){
+		// do not show this short code if there is a shortcode int he url and
+		// this specific shortcode is not the one requested in the ur.
+		$specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
+		if( ! empty( $specific_shortcode_requested) &&
+			$specific_shortcode_requested != $shortcode_override ){
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // loop and get all courses html
-        ob_start();
-        self::initialise_legacy_course_loop();
-        $courses = ob_get_clean();
+		// loop and get all courses html
+		ob_start();
+		self::initialise_legacy_course_loop();
+		$courses = ob_get_clean();
 
-        $content = '';
-        if( count( $posts_array ) > 0 ){
+		$content = '';
+		if( count( $posts_array ) > 0 ){
 
-            $before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
-            $before .= '<section id="main-course" class="course-container">';
+			$before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
+			$before .= '<section id="main-course" class="course-container">';
 
-            $after = '</section>';
+			$after = '</section>';
 
-            //assemble
-            $content = $before . $courses . $after;
+			//assemble
+			$content = $before . $courses . $after;
 
-        }
+		}
 
-        return $content;
+		return $content;
 
-    }// end generate_shortcode_courses
+	}// end generate_shortcode_courses
 
 
-    /**
-     * user_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function user_courses( $atts, $content = null ) {
-        global $shortcode_override;
-        extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
+	/**
+	 * user_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function user_courses( $atts, $content = null ) {
+		global $shortcode_override;
+		extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
 
-        $shortcode_override = 'usercourses';
+		$shortcode_override = 'usercourses';
 
-        ob_start();
+		ob_start();
 
-        if( is_user_logged_in() ){
+		if( is_user_logged_in() ){
 
-            Sensei_Templates::get_template( 'user/my-courses.php' );
+			Sensei_Templates::get_template( 'user/my-courses.php' );
 
-        }else{
+		}else{
 
-            Sensei()->frontend->sensei_login_form();
+			Sensei()->frontend->sensei_login_form();
 
-        }
+		}
 
-        $content = ob_get_clean();
-        return $content;
+		$content = ob_get_clean();
+		return $content;
 
-    } // End user_courses()
+	} // End user_courses()
 
-    /**
-     * This function is simply to honor the legacy
-     * loop-course.php for the old shortcodes.
-     * @since 1.9.0
-     */
-    public static function initialise_legacy_course_loop(){
+	/**
+	 * This function is simply to honor the legacy
+	 * loop-course.php for the old shortcodes.
+	 * @since 1.9.0
+	 */
+	public static function initialise_legacy_course_loop(){
 
-        global  $post, $wp_query, $shortcode_override, $course_excludes;
+		global  $post, $wp_query, $shortcode_override, $course_excludes;
 
-        // Handle Query Type
-        $query_type = '';
+		// Handle Query Type
+		$query_type = '';
 
-        if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
-            $query_type = esc_html( $_GET[ 'action' ] );
-        } // End If Statement
+		if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
+			$query_type = esc_html( $_GET[ 'action' ] );
+		} // End If Statement
 
-        if ( '' != $shortcode_override ) {
-            $query_type = $shortcode_override;
-        } // End If Statement
+		if ( '' != $shortcode_override ) {
+			$query_type = $shortcode_override;
+		} // End If Statement
 
-        if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
+		if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
 
-        // Check that query returns results
-        // Handle Pagination
-        $paged = $wp_query->get( 'paged' );
-        $paged = empty( $paged ) ? 1 : $paged;
+		// Check that query returns results
+		// Handle Pagination
+		$paged = $wp_query->get( 'paged' );
+		$paged = empty( $paged ) ? 1 : $paged;
 
 
-        // Check for pagination settings
-        if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
+		// Check for pagination settings
+		if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
 
-            $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
 
-        } else {
+		} else {
 
-            $amount = $wp_query->get( 'posts_per_page' );
+			$amount = $wp_query->get( 'posts_per_page' );
 
-        } // End If Statement
+		} // End If Statement
 
-        // This is not a paginated page (or it's simply the first page of a paginated page/post)
+		// This is not a paginated page (or it's simply the first page of a paginated page/post)
 
-        global $posts_array;
-        $course_includes   = array();
+		global $posts_array;
+		$course_includes   = array();
 
-        $query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
-        $course_query = new WP_Query( $query_args );
-        $posts_array = $course_query->get_posts();
+		$query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
+		$course_query = new WP_Query( $query_args );
+		$posts_array = $course_query->get_posts();
 
-        // output the courses
-        if( ! empty( $posts_array ) ) {
+		// output the courses
+		if( ! empty( $posts_array ) ) {
 
-            //output all courses for current query
-            self::loop_courses( $course_query, $amount );
+			//output all courses for current query
+			self::loop_courses( $course_query, $amount );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Loop through courses in the query and output the infomration needed
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $course_query
-     */
-    public static function loop_courses( $course_query, $amount ){
+	/**
+	 * Loop through courses in the query and output the infomration needed
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $course_query
+	 */
+	public static function loop_courses( $course_query, $amount ){
 
-        global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
+		global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
 
-        if ( count( $course_query->get_posts() ) > 0 ) {
+		if ( count( $course_query->get_posts() ) > 0 ) {
 
-            do_action( 'sensei_course_archive_header', $shortcode_override );
+			do_action( 'sensei_course_archive_header', $shortcode_override );
 
-            foreach ( $course_query->get_posts() as $course){
+			foreach ( $course_query->get_posts() as $course){
 
-                // Make sure the other loops dont include the same post twice!
-                array_push( $course_excludes, $course->ID );
+				// Make sure the other loops dont include the same post twice!
+				array_push( $course_excludes, $course->ID );
 
-                // output the course markup
-                self::the_course( $course->ID );
+				// output the course markup
+				self::the_course( $course->ID );
 
-            } // End For Loop
+			} // End For Loop
 
-            // More and Prev links
-            $posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
-            $posts_array       = $posts_array_query->get_posts();
-            $max_pages = $course_query->found_posts / $amount;
-            if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
+			// More and Prev links
+			$posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
+			$posts_array       = $posts_array_query->get_posts();
+			$max_pages = $course_query->found_posts / $amount;
+			if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
 
-                switch( $shortcode_override ){
-                    case 'paidcourses':
-                        $filter = 'paid';
-                        break;
-                    case 'featuredcourses':
-                        $filter = 'featured';
-                        break;
-                    case 'freecourses':
-                        $filter = 'free';
-                        break;
-                    default:
-                        $filter = '';
-                        break;
-                }
+				switch( $shortcode_override ){
+					case 'paidcourses':
+						$filter = 'paid';
+						break;
+					case 'featuredcourses':
+						$filter = 'featured';
+						break;
+					case 'freecourses':
+						$filter = 'free';
+						break;
+					default:
+						$filter = '';
+						break;
+				}
 
-                $quer_args = array();
-                $quer_args[ 'paged' ] = '2';
-                if( !empty( $filter ) ){
-                    $quer_args[ 'course_filter' ] = $filter;
-                }
+				$quer_args = array();
+				$quer_args[ 'paged' ] = '2';
+				if( !empty( $filter ) ){
+					$quer_args[ 'course_filter' ] = $filter;
+				}
 
-                $course_pagination_link = get_post_type_archive_link( 'course' );
-                $more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
-                $more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
+				$course_pagination_link = get_post_type_archive_link( 'course' );
+				$more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
+				$more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
 
-                // next/more
-                $html  = '<div class="navigation"><div class="nav-next">';
-                $html .= '<a href="' . $more_link_url . '">';
-                $html .= $more_link_text;
-                $html .= '<span class="meta-nav"></span></a></div>';
+				// next/more
+				$html  = '<div class="navigation"><div class="nav-next">';
+				$html .= '<a href="' . $more_link_url . '">';
+				$html .= $more_link_text;
+				$html .= '<span class="meta-nav"></span></a></div>';
 
-                echo apply_filters( 'course_archive_next_link', $html );
+				echo apply_filters( 'course_archive_next_link', $html );
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
-    }
+		} // End If Statement
+	}
 
-    /**
-     * Print a single course markup
-     *
-     * @param $course_id
-     */
-    public static function the_course( $course_id ){
+	/**
+	 * Print a single course markup
+	 *
+	 * @param $course_id
+	 */
+	public static function the_course( $course_id ){
 
-        // Get meta data
-        $course =  get_post( $course_id );
-        $user_info = get_userdata( absint( $course->post_author ) );
-        $author_link = get_author_posts_url( absint( $course->post_author ) );
-        $author_display_name = $user_info->display_name;
-        $author_id = $course->post_author;
-        $category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
-        ?>
+		// Get meta data
+		$course =  get_post( $course_id );
+		$user_info = get_userdata( absint( $course->post_author ) );
+		$author_link = get_author_posts_url( absint( $course->post_author ) );
+		$author_display_name = $user_info->display_name;
+		$author_id = $course->post_author;
+		$category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
+		$preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+		?>
 
         <article class="<?php echo esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_id ) ) ); ?>">
             <?php
-            // so that legacy shortcodes work with the party plugins that wants to hook in
-            do_action('sensei_course_content_before',$course->ID );
-            ?>
+			// so that legacy shortcodes work with the party plugins that wants to hook in
+			do_action('sensei_course_content_before',$course->ID );
+			?>
             <div class="course-content">
 
                 <?php Sensei()->course->course_image($course_id); ?>
@@ -369,7 +369,7 @@ 
                     </p>
 
                     <?php if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-                        $preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
+						$preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
                         <p class="sensei-free-lessons">
                             <a href="<?php echo get_permalink( $course_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
                             </a> - <?php echo $preview_lessons; ?>
@@ -380,15 +380,15 @@ 
 
             </div>
             <?php
-            // so that legacy shortcodes work with thir party plugins that wants to hook in
-            do_action('sensei_course_content_after', $course->ID);
-            ?>
+			// so that legacy shortcodes work with thir party plugins that wants to hook in
+			do_action('sensei_course_content_after', $course->ID);
+			?>
 
         </article>
 
         <?php
 
 
-    } // end the_course
+	} // end the_course
 
 }// end class legacy shortcodes
\ No newline at end of file

includes/shortcodes/class-sensei-shortcode-course-categories.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
      *
      * @since 1.9.0
      *
-     * @param array $category_ids
+     * @param array $categories
      * @return array
      */
     public function generate_term_ids( $categories = array() ){

Indentation +92 added lines, -92 removed lines

@@ -24,135 +24,135 @@
  */
 class Sensei_Shortcode_Course_Categories implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array list of taxonomy terms.
-     */
-    protected $sensei_course_taxonomy_terms;
+	/**
+	 * @var array list of taxonomy terms.
+	 */
+	protected $sensei_course_taxonomy_terms;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
-        $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
-        $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
+		$this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
+		$this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
 
-        $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
-        $this->include = $this->generate_term_ids( $include );
+		$include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
+		$this->include = $this->generate_term_ids( $include );
 
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
-        $this->exclude = $this->generate_term_ids( $exclude );
+		$exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
+		$this->exclude = $this->generate_term_ids( $exclude );
 
-        // make sure we handle string true/false values correctly with respective defaults
-        $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
-        $this->hide_empty = 'true' == $hide_empty ? true: false;
+		// make sure we handle string true/false values correctly with respective defaults
+		$hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
+		$this->hide_empty = 'true' == $hide_empty ? true: false;
 
-        $this->setup_course_categories();
+		$this->setup_course_categories();
 
-    }
+	}
 
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_course_categories(){
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_course_categories(){
 
-        $args = array(
-            'orderby'       => $this->orderby,
-            'order'         => $this->order,
-            'exclude'       => $this->exclude,
-            'include'       => $this->include,
-            'number'        => $this->number,
-            'parent'        => $this->parent,
-            'hide_empty'    => $this->hide_empty,
-            'fields'        => 'all',
-        );
+		$args = array(
+			'orderby'       => $this->orderby,
+			'order'         => $this->order,
+			'exclude'       => $this->exclude,
+			'include'       => $this->include,
+			'number'        => $this->number,
+			'parent'        => $this->parent,
+			'hide_empty'    => $this->hide_empty,
+			'fields'        => 'all',
+		);
 
-        $this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
+		$this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
 
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        if( empty(  $this->sensei_course_taxonomy_terms  ) ){
+		if( empty(  $this->sensei_course_taxonomy_terms  ) ){
 
-            return __( 'No course categories found.', 'woothemes-sensei' );
+			return __( 'No course categories found.', 'woothemes-sensei' );
 
-        }
+		}
 
-        $terms_html = '';
+		$terms_html = '';
 
-        //set the wp_query to the current messages query
-        $terms_html .= '<ul class="sensei course-categories">';
-        foreach( $this->sensei_course_taxonomy_terms as $category ){
+		//set the wp_query to the current messages query
+		$terms_html .= '<ul class="sensei course-categories">';
+		foreach( $this->sensei_course_taxonomy_terms as $category ){
 
-            $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
-            $terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
+			$category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
+			$terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
 
-        }
-        $terms_html .= '<ul>';
+		}
+		$terms_html .= '<ul>';
 
-        return $terms_html;
+		return $terms_html;
 
-    }// end render
+	}// end render
 
-    /**
-     * Convert an array of mixed ids, slugs or names to only the id's of those terms
-     *
-     * @since 1.9.0
-     *
-     * @param array $category_ids
-     * @return array
-     */
-    public function generate_term_ids( $categories = array() ){
+	/**
+	 * Convert an array of mixed ids, slugs or names to only the id's of those terms
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $category_ids
+	 * @return array
+	 */
+	public function generate_term_ids( $categories = array() ){
 
-        $cat_ids = array();
+		$cat_ids = array();
 
-        if ( is_array($categories) ) {
-            foreach ($categories as $cat) {
+		if ( is_array($categories) ) {
+			foreach ($categories as $cat) {
 
-                if (!is_numeric($cat)) {
+				if (!is_numeric($cat)) {
 
-                    // try the slug
-                    $term = get_term_by('slug', $cat, 'course-category');
+					// try the slug
+					$term = get_term_by('slug', $cat, 'course-category');
 
-                    // if the slug didn't work try the name
-                    if (!$term) {
+					// if the slug didn't work try the name
+					if (!$term) {
 
-                        $term = get_term_by('name', $cat, 'course-category');
+						$term = get_term_by('name', $cat, 'course-category');
 
-                    }
+					}
 
-                    if ($term) {
-                        $cat_ids[] = $term->term_id;
-                    }
+					if ($term) {
+						$cat_ids[] = $term->term_id;
+					}
 
-                } else {
+				} else {
 
-                    $cat_ids[] = $cat;
+					$cat_ids[] = $cat;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        return $cat_ids;
+		return $cat_ids;
 
-    }// end generate_term_ids
+	}// end generate_term_ids
 
 }// end class