woothemes / sensei

includes/class-sensei-question.php

Indentation +567 added lines, -567 removed lines

@@ -21,7 +21,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() ) {
@@ -118,7 +118,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 ];
@@ -238,15 +238,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 ) ){
@@ -340,34 +340,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.
@@ -399,317 +399,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 ); ?>">
 
@@ -719,387 +719,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;
+						$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;
 
-                    $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-settings.php

Indentation +54 added lines, -54 removed lines

@@ -21,43 +21,43 @@ 
 	 * @return void
 	 */
 	public function __construct () {
-	    parent::__construct(); // Required in extended classes.
+		parent::__construct(); // Required in extended classes.
 
-        $this->token = 'woothemes-sensei-settings';
-        add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
+		$this->token = 'woothemes-sensei-settings';
+		add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
 
-        // Setup Admin Settings data
-        if ( is_admin() ) {
+		// Setup Admin Settings data
+		if ( is_admin() ) {
 
-            $this->has_tabs 	= true;
-            $this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->menu_label	= __( 'Settings', 'woothemes-sensei' );
-            $this->page_slug	= 'woothemes-sensei-settings';
+			$this->has_tabs 	= true;
+			$this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
+			$this->menu_label	= __( 'Settings', 'woothemes-sensei' );
+			$this->page_slug	= 'woothemes-sensei-settings';
 
-        } // End If Statement
+		} // End If Statement
 
-        $this->register_hook_listener();
-        $this->get_settings();
+		$this->register_hook_listener();
+		$this->get_settings();
 
 	} // End __construct()
 
-    /**
-     * Get settings value
-     *
-     * @since 1.9.0
-     * @param string $setting_name
-     * @return mixed
-     */
-    public function get( $setting_name ){
+	/**
+	 * Get settings value
+	 *
+	 * @since 1.9.0
+	 * @param string $setting_name
+	 * @return mixed
+	 */
+	public function get( $setting_name ){
 
-        if( isset( $this->settings[ $setting_name ] ) ){
+		if( isset( $this->settings[ $setting_name ] ) ){
 
-            return $this->settings[ $setting_name ];
+			return $this->settings[ $setting_name ];
 
-        }
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	/**
 	 * Register the settings screen within the WordPress admin.
@@ -145,7 +145,7 @@ 
 		$complete_settings = array( 'passed' => __( 'Once all the course lessons have been completed', 'woothemes-sensei' ), 'complete' => __( 'At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei' ) );
 		$course_display_settings = array( 'excerpt' => __( 'Course Excerpt', 'woothemes-sensei' ), 'full' => __( 'Full Course Content', 'woothemes-sensei' ) );
 
-	    $fields = array();
+		$fields = array();
 
 		$fields['access_permission'] = array(
 								'name' => __( 'Access Permissions', 'woothemes-sensei' ),
@@ -207,9 +207,9 @@ 
 								'section' => 'default-settings'
 								);
 
-    	// Course Settings
+		// Course Settings
 
-    	$fields['course_completion'] = array(
+		$fields['course_completion'] = array(
 								'name' => __( 'Courses are complete:', 'woothemes-sensei' ),
 								'description' => __( 'This will determine when courses are marked as complete.', 'woothemes-sensei' ),
 								'type' => 'select',
@@ -219,7 +219,7 @@ 
 								'options' => $complete_settings
 								);
 
-    	$fields['course_author'] = array(
+		$fields['course_author'] = array(
 								'name' => __( 'Display Course Author', 'woothemes-sensei' ),
 								'description' => __( 'Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei' ),
 								'type' => 'checkbox',
@@ -447,10 +447,10 @@ 
 		);
 
 		$teacher_email_options = array(
-            'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
-            'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
-            'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
-            'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
+			'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
+			'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
+			'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
+			'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
 			'teacher-new-message' => __( 'A learner sends a private message to a teacher', 'woothemes-sensei' ),
 		);
 
@@ -559,7 +559,7 @@ 
 
 		if ( Sensei_WC::is_woocommerce_active() ) {
 			// WooCommerce Settings
-    		$fields['woocommerce_enabled'] = array(
+			$fields['woocommerce_enabled'] = array(
 									'name' => __( 'Enable WooCommerce Courses', 'woothemes-sensei' ),
 									'description' => __( 'Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei' ),
 									'type' => 'checkbox',
@@ -647,14 +647,14 @@ 
 		$page_items[] = __( 'Select a Page:', 'woothemes-sensei' );
 
 		foreach ( $pages_split as $k => $v ) {
-		    $id = '';
-		    // Get the ID value.
-		    preg_match( '/value="(.*?)"/i', $v, $matches );
-
-		    if ( isset( $matches[1] ) ) {
-		        $id = $matches[1];
-		        $page_items[$id] = trim( strip_tags( $v ) );
-		    } // End If Statement
+			$id = '';
+			// Get the ID value.
+			preg_match( '/value="(.*?)"/i', $v, $matches );
+
+			if ( isset( $matches[1] ) ) {
+				$id = $matches[1];
+				$page_items[$id] = trim( strip_tags( $v ) );
+			} // End If Statement
 		} // End For Loop
 
 		$pages_array = $page_items;
@@ -671,22 +671,22 @@ 
 		Sensei_Language_Pack_Manager::messages();
 	}
 
-    /**
-     * Flush the rewrite rules after the settings have been updated.
-     * This is to ensure that the
-     *
-     * @since 1.9.0
-     */
-    public static function flush_rewrite_rules(){
+	/**
+	 * Flush the rewrite rules after the settings have been updated.
+	 * This is to ensure that the
+	 *
+	 * @since 1.9.0
+	 */
+	public static function flush_rewrite_rules(){
 
-        if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
-            && isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
+		if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
+			&& isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
 
-            Sensei()->initiate_rewrite_rules_flush();
+			Sensei()->initiate_rewrite_rules_flush();
 
-        }
+		}
 
-    }//end  flush_cache
+	}//end  flush_cache
 } // End Class
 
 /**

includes/class-sensei-admin.php

Indentation +245 added lines, -245 removed lines

@@ -20,11 +20,11 @@ 
 	 */
 	public function __construct () {
 
-        //register admin styles
+		//register admin styles
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles_global' ) );
 
-        //register admin scripts
-        add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
+		//register admin scripts
+		add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
 
 		add_action( 'admin_print_styles', array( $this, 'admin_notices_styles' ) );
 		add_action( 'settings_before_form', array( $this, 'install_pages_output' ) );
@@ -33,7 +33,7 @@ 
 		add_action( 'admin_head', array( $this, 'admin_menu_highlight' ) );
 		add_action( 'admin_init', array( $this, 'page_redirect' ) );
 		add_action( 'admin_init', array( $this, 'sensei_add_custom_menu_items' ) );
-        add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
+		add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
 
 		// Duplicate lesson & courses
 		add_filter( 'post_row_actions', array( $this, 'duplicate_action_link' ), 10, 2 );
@@ -84,7 +84,7 @@ 
 
 		if( $menu_cap ) {
 			$menu[] = array( '', 'read', 'separator-sensei', '', 'wp-menu-separator sensei' );
-            add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
+			add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
 		}
 
 		add_submenu_page( 'edit.php?post_type=course', __( 'Order Courses', 'woothemes-sensei' ), __( 'Order Courses', 'woothemes-sensei' ), 'manage_sensei', 'course-order', array( $this, 'course_order_screen' ) );
@@ -141,14 +141,14 @@ 
 			$submenu_file = 'edit-tags.php?taxonomy=course-category&post_type=course';
 			$parent_file  = 'edit.php?post_type=course';
 
-        } elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
+		} elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
 
-            $submenu_file = 'edit-tags.php?taxonomy=module';
-            $parent_file  = 'edit.php?post_type=course';
+			$submenu_file = 'edit-tags.php?taxonomy=module';
+			$parent_file  = 'edit.php?post_type=course';
 
 		} elseif ( in_array( $screen->id, array( 'sensei_message', 'edit-sensei_message' ) ) ) {
 
-            $submenu_file = 'edit.php?post_type=sensei_message';
+			$submenu_file = 'edit.php?post_type=sensei_message';
 			$parent_file  = 'sensei';
 
 		}
@@ -176,9 +176,9 @@ 
 	 */
 	function install_pages_output() {
 
-        if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
+		if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
 
-            ?>
+			?>
             <div id="message" class="updated sensei-message sensei-connect">
                 <p><?php _e( '<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei' ); ?></p>
                 <p><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/sensei/" data-text="A premium Learning Management plugin for #WordPress that helps you create courses. Beautifully." data-via="WooThemes" data-size="large" data-hashtags="Sensei">Tweet</a>
@@ -186,7 +186,7 @@ 
             </div>
             <?php
 
-        }
+		}
 
 	} // End install_pages_output()
 
@@ -218,18 +218,18 @@ 
 		endif;
 
 		$page_data = array(
-	        'post_status' 		=> 'publish',
-	        'post_type' 		=> 'page',
-	        'post_author' 		=> 1,
-	        'post_name' 		=> $slug,
-	        'post_title' 		=> $page_title,
-	        'post_content' 		=> $page_content,
-	        'post_parent' 		=> $post_parent,
-	        'comment_status' 	=> 'closed'
-	    );
-	    $page_id = wp_insert_post( $page_data );
-
-	    update_option( $option, $page_id );
+			'post_status' 		=> 'publish',
+			'post_type' 		=> 'page',
+			'post_author' 		=> 1,
+			'post_name' 		=> $slug,
+			'post_title' 		=> $page_title,
+			'post_content' 		=> $page_content,
+			'post_parent' 		=> $post_parent,
+			'comment_status' 	=> 'closed'
+		);
+		$page_id = wp_insert_post( $page_data );
+
+		update_option( $option, $page_id );
 	} // End create_page()
 
 
@@ -242,10 +242,10 @@ 
 	function create_pages() {
 
 		// Courses page
-	    $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_courses_page_id', __('Courses', 'woothemes-sensei'), '[newcourses][featuredcourses][freecourses][paidcourses]' );
+		$this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_courses_page_id', __('Courses', 'woothemes-sensei'), '[newcourses][featuredcourses][freecourses][paidcourses]' );
 
 		// User Dashboard page
-	    $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_user_dashboard_page_id', __('My Courses', 'woothemes-sensei'), '[usercourses]' );
+		$this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_user_dashboard_page_id', __('My Courses', 'woothemes-sensei'), '[usercourses]' );
 
 	} // End create_pages()
 
@@ -266,8 +266,8 @@ 
 		wp_register_style( 'woothemes-sensei-global', Sensei()->plugin_url . 'assets/css/global.css', '', Sensei()->version, 'screen' );
 		wp_enqueue_style( 'woothemes-sensei-global' );
 
-        // Select 2 styles
-        wp_enqueue_style( 'select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
+		// Select 2 styles
+		wp_enqueue_style( 'select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
 
 		// Test for Write Panel Pages
 		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
@@ -280,32 +280,32 @@ 
 	} // End admin_styles_global()
 
 
-    /**
-     * Globally register all scripts needed in admin.
-     *
-     * The script users should enqueue the script when needed.
-     *
-     * @since 1.8.2
-     * @access public
-     */
-    public function register_scripts( $hook ){
+	/**
+	 * Globally register all scripts needed in admin.
+	 *
+	 * The script users should enqueue the script when needed.
+	 *
+	 * @since 1.8.2
+	 * @access public
+	 */
+	public function register_scripts( $hook ){
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        // Allow developers to load non-minified versions of scripts
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		// Allow developers to load non-minified versions of scripts
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
-        // Select2 script used to enhance all select boxes
-        wp_register_script( 'select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+		// Select2 script used to enhance all select boxes
+		wp_register_script( 'select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
 
-        // load edit module scripts
-        if( 'edit-module' ==  $screen->id ){
+		// load edit module scripts
+		if( 'edit-module' ==  $screen->id ){
 
-            wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
+			wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
 
-        }
+		}
 
-    }
+	}
 
 
 	/**
@@ -315,7 +315,7 @@ 
 	 * @return void
 	 */
 	function admin_install_notice() {
-	    ?>
+		?>
 	    <div id="message" class="updated sensei-message sensei-connect">
 
             <p>
@@ -350,7 +350,7 @@ 
 	 * @return void
 	 */
 	function admin_installed_notice() {
-	    ?>
+		?>
 	    <div id="message" class="updated sensei-message sensei-connect">
 
 	    	<p>
@@ -378,8 +378,8 @@ 
 	    </div>
 	    <?php
 
-	    // Set installed option
-	    update_option('sensei_installed', 0);
+		// Set installed option
+		update_option('sensei_installed', 0);
 	} // End admin_installed_notice()
 
 
@@ -411,21 +411,21 @@ 
 	function admin_notices_styles() {
 
 		// Installed notices
-	    if ( 1 == get_option( 'sensei_installed' ) ) {
+		if ( 1 == get_option( 'sensei_installed' ) ) {
 
-	    	wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
+			wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
 
-	    	if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
-	    		add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
-	    	} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
-	    		add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
-	    	} // End If Statement
+			if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
+				add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
+			} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
+				add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
+			} // End If Statement
 
-	    } // End If Statement
+		} // End If Statement
 
-	    if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
-	    	add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
-	    }
+		if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
+			add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
+		}
 
 	} // End admin_notices_styles()
 
@@ -541,30 +541,30 @@ 
 	 */
 	private function duplicate_lesson_quizzes( $old_lesson_id, $new_lesson_id ) {
 
-        $old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
-        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
+		$old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
+		$old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
 
-        // duplicate the generic wp post information
+		// duplicate the generic wp post information
 		$new_quiz = $this->duplicate_post( get_post( $old_quiz_id ), '' );
 
 		//update the new lesson data
-        add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
+		add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
 
 		//update the new quiz data
-        add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
-        wp_update_post(
-            array(
-                'ID' => $new_quiz->ID,
-                'post_parent' => $new_lesson_id
-            )
-        );
+		add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
+		wp_update_post(
+			array(
+				'ID' => $new_quiz->ID,
+				'post_parent' => $new_lesson_id
+			)
+		);
 
 		foreach( $old_quiz_questions as $question ) {
 
 			// copy the question order over to the new quiz
 			$old_question_order = get_post_meta( $question->ID, '_quiz_question_order'. $old_quiz_id, true );
-            $new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
-            add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
+			$new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
+			add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
 
 			// Add question to quiz
 			add_post_meta( $question->ID, '_quiz_id', $new_quiz->ID, false );
@@ -886,21 +886,21 @@ 
 								break;
 
 								case 'checkbox':
-                                    //backwards compatibility
-                                    if( empty( $data ) || 'on' == $data ){
-                                        $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+									//backwards compatibility
+									if( empty( $data ) || 'on' == $data ){
+										$checked_value = 'on';
+									}elseif( 'yes' == $data  ) {
 
-                                        $checked_value = 'yes';
+										$checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+									}elseif( 'auto' == $data  ) {
 
-                                        $checked_value = 'auto';
+										$checked_value = 'auto';
 
-                                    } else {
-                                        $checked_value = 1;
-                                        $data = intval( $data );
-                                    }
+									} else {
+										$checked_value = 1;
+										$data = intval( $data );
+									}
 									$checked = checked( $checked_value, $data, false );
 									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" ' . $checked . ' ' . $disabled . '/>' . "\n";
 								break;
@@ -1004,26 +1004,26 @@ 
 
 		if( 0 < count( $courses ) ) {
 
-            // order the courses as set by the users
-            $all_course_ids = array();
-            foreach( $courses as $course ){
+			// order the courses as set by the users
+			$all_course_ids = array();
+			foreach( $courses as $course ){
 
-                $all_course_ids[] = (string)$course->ID;
+				$all_course_ids[] = (string)$course->ID;
 
-            }
-            $order_string = $this->get_course_order();
+			}
+			$order_string = $this->get_course_order();
 
-            if( !empty( $order_string ) ){
-                $ordered_course_ids = explode(',' , $order_string );
-                $all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
-            }
+			if( !empty( $order_string ) ){
+				$ordered_course_ids = explode(',' , $order_string );
+				$all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
+			}
 
 
 			$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
 			$html .= '<ul class="sortable-course-list">' . "\n";
 			$count = 0;
 			foreach ( $all_course_ids as $course_id ) {
-                $course = get_post( $course_id );
+				$course = get_post( $course_id );
 				$count++;
 				$class = 'course';
 				if ( $count == 1 ) { $class .= ' first'; }
@@ -1138,73 +1138,73 @@ 
 
 				$displayed_lessons = array();
 
-                $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
-
-                foreach( $modules as $module ) {
-
-                    $args = array(
-                        'post_type' => 'lesson',
-                        'post_status' => 'publish',
-                        'posts_per_page' => -1,
-                        'meta_query' => array(
-                            array(
-                                'key' => '_lesson_course',
-                                'value' => intval( $course_id ),
-                                'compare' => '='
-                            )
-                        ),
-                        'tax_query' => array(
-                            array(
-                                'taxonomy' => Sensei()->modules->taxonomy,
-                                'field' => 'id',
-                                'terms' => intval( $module->term_id )
-                            )
-                        ),
-                        'meta_key' => '_order_module_' . $module->term_id,
-                        'orderby' => 'meta_value_num date',
-                        'order' => 'ASC',
-                        'suppress_filters' => 0
-                    );
-
-                    $lessons = get_posts( $args );
-
-                    if( count( $lessons ) > 0 ) {
-                        $html .= '<h3>' . $module->name . '</h3>' . "\n";
-                        $html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
-
-                        $count = 0;
-                        foreach( $lessons as $lesson ) {
-                            $count++;
-                            $class = 'lesson';
-                            if ( $count == 1 ) { $class .= ' first'; }
-                            if ( $count == count( $lesson ) ) { $class .= ' last'; }
-                            if ( $count % 2 != 0 ) {
-                                $class .= ' alternate';
-                            }
-
-                            $html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
-
-                            $displayed_lessons[] = $lesson->ID;
-                        }
-
-                        $html .= '</ul>' . "\n";
-
-                        $html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
-                    }
-                }
-
-
-                $lessons = Sensei()->course->course_lessons( $course_id );
+				$modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+
+				foreach( $modules as $module ) {
+
+					$args = array(
+						'post_type' => 'lesson',
+						'post_status' => 'publish',
+						'posts_per_page' => -1,
+						'meta_query' => array(
+							array(
+								'key' => '_lesson_course',
+								'value' => intval( $course_id ),
+								'compare' => '='
+							)
+						),
+						'tax_query' => array(
+							array(
+								'taxonomy' => Sensei()->modules->taxonomy,
+								'field' => 'id',
+								'terms' => intval( $module->term_id )
+							)
+						),
+						'meta_key' => '_order_module_' . $module->term_id,
+						'orderby' => 'meta_value_num date',
+						'order' => 'ASC',
+						'suppress_filters' => 0
+					);
+
+					$lessons = get_posts( $args );
+
+					if( count( $lessons ) > 0 ) {
+						$html .= '<h3>' . $module->name . '</h3>' . "\n";
+						$html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
+
+						$count = 0;
+						foreach( $lessons as $lesson ) {
+							$count++;
+							$class = 'lesson';
+							if ( $count == 1 ) { $class .= ' first'; }
+							if ( $count == count( $lesson ) ) { $class .= ' last'; }
+							if ( $count % 2 != 0 ) {
+								$class .= ' alternate';
+							}
+
+							$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+
+							$displayed_lessons[] = $lesson->ID;
+						}
+
+						$html .= '</ul>' . "\n";
+
+						$html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
+					}
+				}
+
+
+				$lessons = Sensei()->course->course_lessons( $course_id );
 
 				if( 0 < count( $lessons ) ) {
 
-                    //get module term ids, will be used to exclude lessons
-                    $module_items_ids = array();
-                    if( ! empty( $modules ) ) {
-                        foreach ($modules as $module) {
-                            $module_items_ids[] = $module->term_id;
-                        }
-                    }
+					//get module term ids, will be used to exclude lessons
+					$module_items_ids = array();
+					if( ! empty( $modules ) ) {
+						foreach ($modules as $module) {
+							$module_items_ids[] = $module->term_id;
+						}
+					}
 
 					if( 0 < count( $displayed_lessons ) ) {
 						$html .= '<h3>' . __( 'Other Lessons', 'woothemes-sensei' ) . '</h3>' . "\n";
@@ -1214,13 +1214,13 @@ 
 					$count = 0;
 					foreach ( $lessons as $lesson ) {
 
-                        // if lesson belongs to one fo the course modules then exclude it here
-                        // as it is listed above
-                        if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
+						// if lesson belongs to one fo the course modules then exclude it here
+						// as it is listed above
+						if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
 
-                            continue;
+							continue;
 
-                        }
+						}
 
 						$count++;
 						$class = 'lesson';
@@ -1264,23 +1264,23 @@ 
 
 		if( $course_id ) {
 
-            $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+			$modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
 
-            foreach( $modules as $module ) {
+			foreach( $modules as $module ) {
 
-                $module_order_string = $_POST[ 'lesson-order-module-' . $module->term_id ];
+				$module_order_string = $_POST[ 'lesson-order-module-' . $module->term_id ];
 
-                if( $module_order_string ) {
-                    $order = explode( ',', $module_order_string );
-                    $i = 1;
-                    foreach( $order as $lesson_id ) {
-                        if( $lesson_id ) {
-                            update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
-                            ++$i;
-                        }
-                    }
-                }
-            }
+				if( $module_order_string ) {
+					$order = explode( ',', $module_order_string );
+					$i = 1;
+					foreach( $order as $lesson_id ) {
+						if( $lesson_id ) {
+							update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
+							++$i;
+						}
+					}
+				}
+			}
 
 
 			if( $order_string ) {
@@ -1363,47 +1363,47 @@ 
 
 	/**
 	 * Adding admin notice if the current
-     * installed theme is not compatible
-     *
+	 * installed theme is not compatible
+	 *
 	 * @return void
 	 */
 	public function theme_compatibility_notices() {
 
-        if( isset( $_GET['sensei_hide_notice'] ) ) {
-        	switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
+		if( isset( $_GET['sensei_hide_notice'] ) ) {
+			switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
 				case 'menu_settings': add_user_meta( get_current_user_id(), 'sensei_hide_menu_settings_notice', true ); break;
 				case 'theme_check': add_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true ); break;
 			}
-        }
+		}
 
-        // white list templates that are already support by default and do not show notice for them
-        $template = get_option( 'template' );
+		// white list templates that are already support by default and do not show notice for them
+		$template = get_option( 'template' );
 
-        $white_list = array(    'twentyeleven',
-                                'twentytwelve',
-                                'twentyfourteen',
-                                'twentyfifteen',
-                                'twentysixteen',
-                                'storefront',
-                                                );
+		$white_list = array(    'twentyeleven',
+								'twentytwelve',
+								'twentyfourteen',
+								'twentyfifteen',
+								'twentysixteen',
+								'storefront',
+												);
 
-        if ( in_array( $template, $white_list ) ) {
+		if ( in_array( $template, $white_list ) ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        // don't show the notice if the user chose to hide it
-        $hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
-        if(  $hide_theme_check_notice ) {
+		// don't show the notice if the user chose to hide it
+		$hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
+		if(  $hide_theme_check_notice ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        // show the notice for themes not supporting sensei
-	    if ( ! current_theme_supports( 'sensei' ) ) {
-            ?>
+		// show the notice for themes not supporting sensei
+		if ( ! current_theme_supports( 'sensei' ) ) {
+			?>
 
             <div id="message" class="error sensei-message sensei-connect">
                     <p>
@@ -1439,7 +1439,7 @@ 
 	public function reset_theme_check_notices() {
 		global $current_user;
 		wp_get_current_user();
-        $user_id = $current_user->ID;
+		$user_id = $current_user->ID;
 
 		delete_user_meta( $user_id, 'sensei_hide_theme_check_notice' );
 	}
@@ -1459,60 +1459,60 @@ 
 		return $prevent_access;
 	}
 
-    /**
-     * Hooked onto admin_init. Listens for install_sensei_pages and skip_install_sensei_pages query args
-     * on the sensei settings page.
-     *
-     * The function
-     *
-     * @since 1.8.7
-     */
-    public  static function install_pages(){
+	/**
+	 * Hooked onto admin_init. Listens for install_sensei_pages and skip_install_sensei_pages query args
+	 * on the sensei settings page.
+	 *
+	 * The function
+	 *
+	 * @since 1.8.7
+	 */
+	public  static function install_pages(){
 
-        // only fire on the settings page
-        if( ! isset( $_GET['page'] )
-            || 'woothemes-sensei-settings' != $_GET['page']
-            || 1 == get_option('skip_install_sensei_pages') ){
+		// only fire on the settings page
+		if( ! isset( $_GET['page'] )
+			|| 'woothemes-sensei-settings' != $_GET['page']
+			|| 1 == get_option('skip_install_sensei_pages') ){
 
-            return;
+			return;
 
-        }
+		}
 
-        // Install/page installer
-        $install_complete = false;
+		// Install/page installer
+		$install_complete = false;
 
-        // Add pages button
-        $settings_url = '';
-        if (isset($_GET['install_sensei_pages']) && $_GET['install_sensei_pages']) {
+		// Add pages button
+		$settings_url = '';
+		if (isset($_GET['install_sensei_pages']) && $_GET['install_sensei_pages']) {
 
-            Sensei()->admin->create_pages();
-            update_option('skip_install_sensei_pages', 1);
-            $install_complete = true;
-            $settings_url = remove_query_arg('install_sensei_pages');
+			Sensei()->admin->create_pages();
+			update_option('skip_install_sensei_pages', 1);
+			$install_complete = true;
+			$settings_url = remove_query_arg('install_sensei_pages');
 
-            // Skip button
-        } elseif (isset($_GET['skip_install_sensei_pages']) && $_GET['skip_install_sensei_pages']) {
+			// Skip button
+		} elseif (isset($_GET['skip_install_sensei_pages']) && $_GET['skip_install_sensei_pages']) {
 
-            update_option('skip_install_sensei_pages', 1);
-            $install_complete = true;
-            $settings_url = remove_query_arg('skip_install_sensei_pages');
+			update_option('skip_install_sensei_pages', 1);
+			$install_complete = true;
+			$settings_url = remove_query_arg('skip_install_sensei_pages');
 
-        }
+		}
 
-        if ($install_complete) {
+		if ($install_complete) {
 
-            // Flush rules after install
-            flush_rewrite_rules( true );
+			// Flush rules after install
+			flush_rewrite_rules( true );
 
-            // Set installed option
-            update_option('sensei_installed', 0);
+			// Set installed option
+			update_option('sensei_installed', 0);
 
-            $complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
-            wp_redirect( $complete_url );
+			$complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
+			wp_redirect( $complete_url );
 
-        }
+		}
 
-    }// end install_pages
+	}// end install_pages
 
 } // End Class
 

includes/theme-integrations/theme-integration-loader.php

Indentation +86 added lines, -86 removed lines

@@ -10,91 +10,91 @@
  */
 class Sensei_Theme_Integration_Loader {
 
-    /**
-     * @var array
-     * Holding a reference core supported themes
-     */
-    protected $themes;
-
-    /**
-     * @var string
-     * reference to the theme currently active on this site
-     */
-    protected $active_theme;
-
-    public function __construct() {
-
-        $this->setup_themes();
-        $this->setup_currently_active_theme();
-        $this->possibly_load_supported_theme_wrappers();
-
-    }
-
-    /**
-     * Setup the theme slugs supported by Sensei Core
-     *
-     * @since 1.9.0
-     */
-    private function setup_themes(){
-
-        $this->themes = array(
-            'twentyeleven',
-            'twentytwelve',
-            'twentythirteen',
-            'twentyfourteen',
-            'twentyfifteen',
-            'twentysixteen',
-            'storefront',
-        );
-
-    }// end setup themes
-
-    /**
-     * Setup the currently active theme
-     *
-     * @since 1.9.0
-     */
-    private function setup_currently_active_theme(){
-
-        $this->active_theme = get_option('template');
-
-    }
-
-    /**
-     * Remove default Sensei wrappers and load
-     * supported wrappers if the current theme is
-     * a theme we have an integration for within core.
-     *
-     * @since 1.9.0
-     */
-    private function possibly_load_supported_theme_wrappers(){
-
-        if ( in_array( $this->active_theme, $this->themes ) ){
-
-            // setup file and class names
-            $supported_theme_class_file = trailingslashit( Sensei()->plugin_path ) . 'includes/theme-integrations/' . $this->active_theme . '.php';
-            $supported_theme_class_name  = 'Sensei_'. ucfirst( $this->active_theme  );
-
-            // load the file or exit if there is no file for this theme
-            if( ! file_exists( $supported_theme_class_file ) ){
-                return;
-            }
-            include_once( $supported_theme_class_file );
-            include_once( 'twentytwelve.php' );
-            //initialize the class or exit if there is no class for this theme
-            if( ! class_exists( $supported_theme_class_name ) ){
-                return;
-            }
-            $supported_theme = new $supported_theme_class_name;
-
-            // remove default wrappers
-            remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
-            remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
-
-            // load the supported theme wrappers
-            add_action( 'sensei_before_main_content', array( $supported_theme, 'wrapper_start' ), 10 );
-            add_action( 'sensei_after_main_content', array( $supported_theme, 'wrapper_end' ), 10 );
-        }
-    }
+	/**
+	 * @var array
+	 * Holding a reference core supported themes
+	 */
+	protected $themes;
+
+	/**
+	 * @var string
+	 * reference to the theme currently active on this site
+	 */
+	protected $active_theme;
+
+	public function __construct() {
+
+		$this->setup_themes();
+		$this->setup_currently_active_theme();
+		$this->possibly_load_supported_theme_wrappers();
+
+	}
+
+	/**
+	 * Setup the theme slugs supported by Sensei Core
+	 *
+	 * @since 1.9.0
+	 */
+	private function setup_themes(){
+
+		$this->themes = array(
+			'twentyeleven',
+			'twentytwelve',
+			'twentythirteen',
+			'twentyfourteen',
+			'twentyfifteen',
+			'twentysixteen',
+			'storefront',
+		);
+
+	}// end setup themes
+
+	/**
+	 * Setup the currently active theme
+	 *
+	 * @since 1.9.0
+	 */
+	private function setup_currently_active_theme(){
+
+		$this->active_theme = get_option('template');
+
+	}
+
+	/**
+	 * Remove default Sensei wrappers and load
+	 * supported wrappers if the current theme is
+	 * a theme we have an integration for within core.
+	 *
+	 * @since 1.9.0
+	 */
+	private function possibly_load_supported_theme_wrappers(){
+
+		if ( in_array( $this->active_theme, $this->themes ) ){
+
+			// setup file and class names
+			$supported_theme_class_file = trailingslashit( Sensei()->plugin_path ) . 'includes/theme-integrations/' . $this->active_theme . '.php';
+			$supported_theme_class_name  = 'Sensei_'. ucfirst( $this->active_theme  );
+
+			// load the file or exit if there is no file for this theme
+			if( ! file_exists( $supported_theme_class_file ) ){
+				return;
+			}
+			include_once( $supported_theme_class_file );
+			include_once( 'twentytwelve.php' );
+			//initialize the class or exit if there is no class for this theme
+			if( ! class_exists( $supported_theme_class_name ) ){
+				return;
+			}
+			$supported_theme = new $supported_theme_class_name;
+
+			// remove default wrappers
+			remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
+			remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+
+			// load the supported theme wrappers
+			add_action( 'sensei_before_main_content', array( $supported_theme, 'wrapper_start' ), 10 );
+			add_action( 'sensei_after_main_content', array( $supported_theme, 'wrapper_end' ), 10 );
+		}
+	}
 
 } /// end class
\ No newline at end of file

includes/theme-integrations/twentyfourteen.php

Indentation +13 added lines, -13 removed lines

@@ -9,12 +9,12 @@ 
 */
 Class Sensei_Twentyfourteen {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){
-    ?>
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){
+	?>
 
         <div id="main-content" class="main-content">
             <div id="primary" class="content-area">
@@ -23,12 +23,12 @@ 
 
     <?php }
 
-    /**
-     * Output closing wrappers
-     *
-     * @since 1.9.0
-     */
-    public function wrapper_end(){ ?>
+	/**
+	 * Output closing wrappers
+	 *
+	 * @since 1.9.0
+	 */
+	public function wrapper_end(){ ?>
 
 
                     </div>
@@ -37,7 +37,7 @@ 
         </div>
 
         <?php
-        get_sidebar();
+		get_sidebar();
 	 }
 
 }

includes/theme-integrations/twentyfifteen.php

Indentation +17 added lines, -17 removed lines

@@ -9,28 +9,28 @@
 */
 Class Sensei_Twentyfifteen extends Sensei__S {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){
 
-        // output inline styles
-        $this->print_styles();
+		// output inline styles
+		$this->print_styles();
 
-        // call the parent starting wrappers
-        parent::wrapper_start();
+		// call the parent starting wrappers
+		parent::wrapper_start();
 
-    }
+	}
 
 
-    /**
-     * Output the style for the
-     * twenty fifteen theme integration.
-     *
-     * @since 1.9.0
-     */
-    private function print_styles(){?>
+	/**
+	 * Output the style for the
+	 * twenty fifteen theme integration.
+	 *
+	 * @since 1.9.0
+	 */
+	private function print_styles(){?>
 
         <style>
             @media screen and (min-width: 59.6875em){

includes/theme-integrations/_s.php

Indentation +13 added lines, -13 removed lines

@@ -9,29 +9,29 @@
 */
 Class Sensei__S {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){ ?>
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){ ?>
         <div id="primary" class="content-area">
             <main id="main" class="site-main" role="main">
 
     <?php }
 
-    /**
-     * Output closing wrappers
-     *
-     * @since 1.9.0
-     */
-    public function wrapper_end(){ ?>
+	/**
+	 * Output closing wrappers
+	 *
+	 * @since 1.9.0
+	 */
+	public function wrapper_end(){ ?>
 
             </main> <!-- main-site -->
           </div> <!-- content-area -->
 
 	    <?php
 
-        get_sidebar();
+		get_sidebar();
 
-    }
+	}
 } // end class

includes/theme-integrations/twentythirteen.php

Indentation +12 added lines, -12 removed lines

@@ -9,24 +9,24 @@
 */
 Class Sensei_Twentythirteen {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){
-    ?>
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){
+	?>
 
         <div id="primary" class="site-content">
             <div id="content" role="main" class="entry-content">
 
     <?php }
 
-    /**
-     * Output closing wrappers
-     *
-     * @since 1.9.0
-     */
-    public function wrapper_end(){ ?>
+	/**
+	 * Output closing wrappers
+	 *
+	 * @since 1.9.0
+	 */
+	public function wrapper_end(){ ?>
 
 			</div>
 		</div>

includes/theme-integrations/twentytwelve.php

Indentation +12 added lines, -12 removed lines

@@ -9,24 +9,24 @@
 */
 Class Sensei_Twentythirteen {
 
-    /**
-     * Output opening wrappers
-     * @since 1.9.0
-     */
-    public function wrapper_start(){
-    ?>
+	/**
+	 * Output opening wrappers
+	 * @since 1.9.0
+	 */
+	public function wrapper_start(){
+	?>
 
         <div id="primary" class="site-content">
             <div id="content" role="main" class="entry-content">
 
     <?php }
 
-    /**
-     * Output closing wrappers
-     *
-     * @since 1.9.0
-     */
-    public function wrapper_end(){ ?>
+	/**
+	 * Output closing wrappers
+	 *
+	 * @since 1.9.0
+	 */
+	public function wrapper_end(){ ?>
 
 			</div>
 		</div>