woothemes / sensei

templates/single-course.php

Indentation +38 added lines, -38 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * The Template for displaying all single courses.
- *
- * Override this template by copying it to yourtheme/sensei/single-course.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all single courses.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/single-course.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php  get_sensei_header();  ?>
@@ -17,24 +17,24 @@ 
 
     <?php
 
-    /**
-     * Hook inside the single course post above the content
-     *
-     * @since 1.9.0
-     *
-     * @param integer $course_id
-     *
-     * @hooked Sensei()->frontend->sensei_course_start     -  10
-     * @hooked Sensei_Course::the_title                    -  10
-     * @hooked Sensei()->course->course_image              -  20
-     * @hooked Sensei_WC::course_in_cart_message           -  20
-     * @hooked Sensei_Course::the_course_enrolment_actions -  30
-     * @hooked Sensei()->message->send_message_link        -  35
-     * @hooked Sensei_Course::the_course_video             -  40
-     */
-    do_action( 'sensei_single_course_content_inside_before', get_the_ID() );
-
-    ?>
+	/**
+	 * Hook inside the single course post above the content
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $course_id
+	 *
+	 * @hooked Sensei()->frontend->sensei_course_start     -  10
+	 * @hooked Sensei_Course::the_title                    -  10
+	 * @hooked Sensei()->course->course_image              -  20
+	 * @hooked Sensei_WC::course_in_cart_message           -  20
+	 * @hooked Sensei_Course::the_course_enrolment_actions -  30
+	 * @hooked Sensei()->message->send_message_link        -  35
+	 * @hooked Sensei_Course::the_course_video             -  40
+	 */
+	do_action( 'sensei_single_course_content_inside_before', get_the_ID() );
+
+	?>
 
     <section class="entry fix">
 
@@ -44,17 +44,17 @@ 
 
     <?php
 
-    /**
-     * Hook inside the single course post above the content
-     *
-     * @since 1.9.0
-     *
-     * @param integer $course_id
-     *
-     */
-    do_action( 'sensei_single_course_content_inside_after', get_the_ID() );
-
-    ?>
+	/**
+	 * Hook inside the single course post above the content
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $course_id
+	 *
+	 */
+	do_action( 'sensei_single_course_content_inside_after', get_the_ID() );
+
+	?>
 </article><!-- .post .single-course -->
 
 <?php get_sensei_footer(); ?>
\ No newline at end of file

includes/class-sensei-teacher.php

Indentation +1339 added lines, -1339 removed lines

@@ -12,251 +12,251 @@ 
  */
 class Sensei_Teacher {
 
-    /**
-     * $teacher_role
-     *
-     * Keeps a reference to the teacher role object
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    protected $teacher_role;
-
-    /**
-     * $token
-     *
-     * Keeps a reference to the global sensei token
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    public  $token;
-
-    /**
-     * Sensei_Teacher::__constructor
-     *
-     * Constructor Function
-     *
-     * @since 1.8.0
-     * @access public
-     */
-    public function __construct ( ) {
-
-        add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
-        add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
-        add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
-        add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
-        add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
-
-        add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
-
-        //filter the quiz submissions
-        add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
-
-        //grading totals count only those belonging to the teacher
-        add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
-
-        // show the courses owned by a user on his author archive page
-        add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
-
-        // notify admin when a teacher creates a course
-        add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
-
-        // limit the analysis view to only the users taking courses belong to this teacher
-        add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
-
-        // give teacher access to question post type
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
-
-        // Teacher column on the courses list on the admin edit screen
-        add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
-        add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
-
-        //admin edit messages query limit teacher
-        add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
-
-        //add filter by teacher on courses list
-        add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
-        add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
-
-        // Handle media library restrictions
-        add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
-        add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
-
-        // update lesson owner to course teacher when saved
-        add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
-
-        // If a Teacher logs in, redirect to /wp-admin/
-        add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
-
-
-        add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
-        add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
-
-
-    } // end __constructor()
-
-    /**
-     * Sensei_Teacher::create_teacher_role
-     *
-     * This function checks if the role exist, if not it creates it.
-     * for the teacher role
-     *
-     * @since 1.8.0
-     * @access public
-     * @return void
-     */
-    public function create_role ( ) {
-
-        // check if the role exists
-        $this->teacher_role = get_role( 'teacher' );
-
-        // if the the teacher is not a valid WordPress role create it
-       if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
-           // create the role
-           $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
-       }
-
-       // add the capabilities before returning
-        $this->add_capabilities();
-
-    }// end create_teacher_role
-
-    /**
-     * Sensei_Teacher::add_capabilities
-     *
-     * @since 1.8.0
-     * @access protected
-     */
-    protected function add_capabilities ( ) {
-
-        // if this is not a valid WP_Role object exit without adding anything
-        if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
-            return;
-        }
-
-        /**
-         * Sensei teachers capabilities array filter
-         *
-         * These capabilities will be applied to the teacher role
-         * @param array $capabilities
-         * keys: (string) $cap_name => (bool) $grant
-         */
-        $caps = apply_filters( 'sensei_teacher_role_capabilities', array(
-            // General access rules
-            'read' => true,
-            'manage_sensei_grades' => true,
-            'moderate_comments'=> true,
-            'upload_files'	=> true,
-            'edit_files'	=> true,
-
-            //Lessons
-            'publish_lessons'	 => true,
-            'manage_lesson_categories'	 => true,
-            'edit_lessons'	 => true,
-            'edit_published_lessons'  => true,
-            'edit_private_lessons' => true,
-            'read_private_lessons' => true,
-            'delete_published_lessons' => true,
-
-            // Courses
-            'create_courses' => true,
-            'publish_courses'	 => false,
-            'manage_course_categories'	 => true,
-            'edit_courses'	 => true,
-            'edit_published_courses'  => true,
-            'edit_private_courses' => true,
-            'read_private_courses' => true,
-            'delete_published_courses' => true,
-
-            // Quiz
-            'publish_quizzes'	 => true,
-            'edit_quizzes'	 => true,
-            'edit_published_quizzes'  => true,
-            'edit_private_quizzes' => true,
-            'read_private_quizzes' => true,
-
-            // Questions
-            'publish_questions'	 => true,
-            'edit_questions'	 => true,
-            'edit_published_questions'  => true,
-            'edit_private_questions' => true,
-            'read_private_questions' => true,
-
-            //messages
-            'publish_sensei_messages'	 => true,
-            'edit_sensei_messages'	 => true,
-            'edit_published_sensei_messages'  => true,
-            'edit_private_sensei_messages' => true,
-            'read_private_sensei_messages' => true,
-
-            // Comments -
-            // Necessary cap so Teachers can moderate comments
-            // on their own lessons. We restrict access to other
-            // post types in $this->restrict_posts_menu_page()
-
-            'edit_posts' => true,
-
-        ));
-
-        foreach ( $caps as $cap => $grant ) {
-
-            // load the capability on to the teacher role
-            $this->teacher_role->add_cap($cap, $grant);
-
-        } // end for each
-
-    }// end add_cap
-
-    /**
-     * Sensei_Teacher::teacher_meta_box
-     *
-     * Add the teacher metabox to the course post type edit screen
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameter string $post_type
-     * @parameter WP_Post $post
-     * @return void
-     */
-    public function add_teacher_meta_boxes ( $post ) {
-
-        if( !current_user_can('manage_options') ){
-            return;
-        }
-        add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
-            'course',
-            'side',
-            'core'
-        );
-
-    } // end teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::teacher_meta_box_content
-     *
-     * Render the teacher meta box markup
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     */
-    public function teacher_meta_box_content ( $post ) {
-
-        // get the current author
-        $current_author = $post->post_author;
-
-        //get the users authorised to author courses
-        $users = $this->get_teachers_and_authors();
-
-    ?>
+	/**
+	 * $teacher_role
+	 *
+	 * Keeps a reference to the teacher role object
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	protected $teacher_role;
+
+	/**
+	 * $token
+	 *
+	 * Keeps a reference to the global sensei token
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	public  $token;
+
+	/**
+	 * Sensei_Teacher::__constructor
+	 *
+	 * Constructor Function
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 */
+	public function __construct ( ) {
+
+		add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
+		add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
+		add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
+		add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
+		add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
+
+		add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
+
+		//filter the quiz submissions
+		add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
+
+		//grading totals count only those belonging to the teacher
+		add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
+
+		// show the courses owned by a user on his author archive page
+		add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
+
+		// notify admin when a teacher creates a course
+		add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
+
+		// limit the analysis view to only the users taking courses belong to this teacher
+		add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
+
+		// give teacher access to question post type
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
+
+		// Teacher column on the courses list on the admin edit screen
+		add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
+		add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
+
+		//admin edit messages query limit teacher
+		add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
+
+		//add filter by teacher on courses list
+		add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
+		add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
+
+		// Handle media library restrictions
+		add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
+		add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
+
+		// update lesson owner to course teacher when saved
+		add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+
+		// If a Teacher logs in, redirect to /wp-admin/
+		add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
+
+
+		add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
+		add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
+
+
+	} // end __constructor()
+
+	/**
+	 * Sensei_Teacher::create_teacher_role
+	 *
+	 * This function checks if the role exist, if not it creates it.
+	 * for the teacher role
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @return void
+	 */
+	public function create_role ( ) {
+
+		// check if the role exists
+		$this->teacher_role = get_role( 'teacher' );
+
+		// if the the teacher is not a valid WordPress role create it
+	   if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
+		   // create the role
+		   $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
+	   }
+
+	   // add the capabilities before returning
+		$this->add_capabilities();
+
+	}// end create_teacher_role
+
+	/**
+	 * Sensei_Teacher::add_capabilities
+	 *
+	 * @since 1.8.0
+	 * @access protected
+	 */
+	protected function add_capabilities ( ) {
+
+		// if this is not a valid WP_Role object exit without adding anything
+		if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
+			return;
+		}
+
+		/**
+		 * Sensei teachers capabilities array filter
+		 *
+		 * These capabilities will be applied to the teacher role
+		 * @param array $capabilities
+		 * keys: (string) $cap_name => (bool) $grant
+		 */
+		$caps = apply_filters( 'sensei_teacher_role_capabilities', array(
+			// General access rules
+			'read' => true,
+			'manage_sensei_grades' => true,
+			'moderate_comments'=> true,
+			'upload_files'	=> true,
+			'edit_files'	=> true,
+
+			//Lessons
+			'publish_lessons'	 => true,
+			'manage_lesson_categories'	 => true,
+			'edit_lessons'	 => true,
+			'edit_published_lessons'  => true,
+			'edit_private_lessons' => true,
+			'read_private_lessons' => true,
+			'delete_published_lessons' => true,
+
+			// Courses
+			'create_courses' => true,
+			'publish_courses'	 => false,
+			'manage_course_categories'	 => true,
+			'edit_courses'	 => true,
+			'edit_published_courses'  => true,
+			'edit_private_courses' => true,
+			'read_private_courses' => true,
+			'delete_published_courses' => true,
+
+			// Quiz
+			'publish_quizzes'	 => true,
+			'edit_quizzes'	 => true,
+			'edit_published_quizzes'  => true,
+			'edit_private_quizzes' => true,
+			'read_private_quizzes' => true,
+
+			// Questions
+			'publish_questions'	 => true,
+			'edit_questions'	 => true,
+			'edit_published_questions'  => true,
+			'edit_private_questions' => true,
+			'read_private_questions' => true,
+
+			//messages
+			'publish_sensei_messages'	 => true,
+			'edit_sensei_messages'	 => true,
+			'edit_published_sensei_messages'  => true,
+			'edit_private_sensei_messages' => true,
+			'read_private_sensei_messages' => true,
+
+			// Comments -
+			// Necessary cap so Teachers can moderate comments
+			// on their own lessons. We restrict access to other
+			// post types in $this->restrict_posts_menu_page()
+
+			'edit_posts' => true,
+
+		));
+
+		foreach ( $caps as $cap => $grant ) {
+
+			// load the capability on to the teacher role
+			$this->teacher_role->add_cap($cap, $grant);
+
+		} // end for each
+
+	}// end add_cap
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box
+	 *
+	 * Add the teacher metabox to the course post type edit screen
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameter string $post_type
+	 * @parameter WP_Post $post
+	 * @return void
+	 */
+	public function add_teacher_meta_boxes ( $post ) {
+
+		if( !current_user_can('manage_options') ){
+			return;
+		}
+		add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
+			'course',
+			'side',
+			'core'
+		);
+
+	} // end teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box_content
+	 *
+	 * Render the teacher meta box markup
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 */
+	public function teacher_meta_box_content ( $post ) {
+
+		// get the current author
+		$current_author = $post->post_author;
+
+		//get the users authorised to author courses
+		$users = $this->get_teachers_and_authors();
+
+	?>
         <select name="sensei-course-teacher-author" class="sensei course teacher">
 
             <?php foreach ( $users as $user_id ) { ?>
 
                     <?php
-                        $user = get_user_by('id', $user_id);
-                    ?>
+						$user = get_user_by('id', $user_id);
+					?>
                     <option <?php selected(  $current_author , $user_id , true ); ?> value="<?php echo $user_id; ?>" >
                         <?php echo  $user->display_name; ?>
                     </option>
@@ -267,1289 +267,1289 @@ 
 
         <?php
 
-    } // end render_teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::get_teachers_and_authors
-     *
-     * Get a list of users who can author courses, lessons and quizes.
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function get_teachers_and_authors ( ){
-
-        $author_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'who'          => 'authors'
-        );
-
-        $authors = get_users( $author_query_args );
-
-        $teacher_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'role'         => 'teacher',
-        );
-
-        $teachers = get_users( $teacher_query_args );
-
-        return  array_unique( array_merge( $teachers, $authors ) );
-
-    }// end get_teachers_and_authors
-
-    /**
-     * Sensei_Teacher::save_teacher_meta_box
-     *
-     * Save the new teacher / author to course and all lessons
-     *
-     * Hooked into admin_init
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function save_teacher_meta_box ( $course_id ){
+	} // end render_teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::get_teachers_and_authors
+	 *
+	 * Get a list of users who can author courses, lessons and quizes.
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function get_teachers_and_authors ( ){
+
+		$author_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'who'          => 'authors'
+		);
+
+		$authors = get_users( $author_query_args );
+
+		$teacher_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'role'         => 'teacher',
+		);
+
+		$teachers = get_users( $teacher_query_args );
+
+		return  array_unique( array_merge( $teachers, $authors ) );
+
+	}// end get_teachers_and_authors
+
+	/**
+	 * Sensei_Teacher::save_teacher_meta_box
+	 *
+	 * Save the new teacher / author to course and all lessons
+	 *
+	 * Hooked into admin_init
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function save_teacher_meta_box ( $course_id ){
 
-        // check if this is a post from saving the teacher, if not exit early
-        if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
-            return;
-        }
+		// check if this is a post from saving the teacher, if not exit early
+		if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
+			return;
+		}
 
-        //don't fire this hook again
-        remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
+		//don't fire this hook again
+		remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
 
-        // get the current post object
-        $post = get_post( $course_id );
+		// get the current post object
+		$post = get_post( $course_id );
 
-        // get the current teacher/author
-        $current_author = absint( $post->post_author );
-        $new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
+		// get the current teacher/author
+		$current_author = absint( $post->post_author );
+		$new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
 
-        // loop through all post lessons to update their authors as well
-        $this->update_course_lessons_author( $course_id , $new_author );
+		// loop through all post lessons to update their authors as well
+		$this->update_course_lessons_author( $course_id , $new_author );
 
-        // do not do any processing if the selected author is the same as the current author
-        if( $current_author == $new_author ){
-            return;
-        }
+		// do not do any processing if the selected author is the same as the current author
+		if( $current_author == $new_author ){
+			return;
+		}
 
-        // save the course  author
-        $post_updates = array(
-            'ID' => $post->ID ,
-            'post_author' => $new_author
-        );
-        wp_update_post( $post_updates );
+		// save the course  author
+		$post_updates = array(
+			'ID' => $post->ID ,
+			'post_author' => $new_author
+		);
+		wp_update_post( $post_updates );
 
-        // ensure the the modules are update so that then new teacher has access to them
-        Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
+		// ensure the the modules are update so that then new teacher has access to them
+		Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
 
-        // notify the new teacher
-        $this->teacher_course_assigned_notification( $new_author, $course_id );
+		// notify the new teacher
+		$this->teacher_course_assigned_notification( $new_author, $course_id );
 
-    } // end save_teacher_meta_box
+	} // end save_teacher_meta_box
 
-    /**
-     * Update all the course terms set(selected) on the given course. Moving course term ownership to
-     * the new author. Making sure the course terms are maintained.
-     *
-     * This function also checks if terms are shared, with other courses
-     *
-     * @param $course_id
-     * @param $new_teacher_id
-     * @return void
-     */
-    public static function update_course_modules_author( $course_id ,$new_teacher_id ){
+	/**
+	 * Update all the course terms set(selected) on the given course. Moving course term ownership to
+	 * the new author. Making sure the course terms are maintained.
+	 *
+	 * This function also checks if terms are shared, with other courses
+	 *
+	 * @param $course_id
+	 * @param $new_teacher_id
+	 * @return void
+	 */
+	public static function update_course_modules_author( $course_id ,$new_teacher_id ){
 
-        if( empty( $course_id ) || empty( $new_teacher_id ) ){
-            return;
-        }
+		if( empty( $course_id ) || empty( $new_teacher_id ) ){
+			return;
+		}
 
-        $terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
+		$terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
 
-        if( empty( $terms_selected_on_course ) ){
-            return;
-        }
+		if( empty( $terms_selected_on_course ) ){
+			return;
+		}
 
-        foreach( $terms_selected_on_course as $term ){
+		foreach( $terms_selected_on_course as $term ){
 
-            $term_author = Sensei_Core_Modules::get_term_author( $term->slug );
-            if( $new_teacher_id != $term_author->ID  ){
+			$term_author = Sensei_Core_Modules::get_term_author( $term->slug );
+			if( $new_teacher_id != $term_author->ID  ){
 
-                $new_term = '';
+				$new_term = '';
 
-                //if the new teacher is admin first check to see if the term with this name already exists
-                if( user_can( $new_teacher_id, 'manage_options' ) ){
+				//if the new teacher is admin first check to see if the term with this name already exists
+				if( user_can( $new_teacher_id, 'manage_options' ) ){
 
-                    $slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
-                    $term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
-                    $existing_admin_terms = get_terms( 'module', $term_args );
-                    if( !empty( $existing_admin_terms ) ){
-                        // insert it even if it exists
-                        $new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
-                    }
-                }
+					$slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
+					$term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
+					$existing_admin_terms = get_terms( 'module', $term_args );
+					if( !empty( $existing_admin_terms ) ){
+						// insert it even if it exists
+						$new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
+					}
+				}
 
-                if( empty ( $new_term ) ){
+				if( empty ( $new_term ) ){
 
-                   //setup the new slug
-                   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
-
-                   // create new term and set it
-                   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
-
-                }
+				   //setup the new slug
+				   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
+
+				   // create new term and set it
+				   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
+
+				}
 
 
 
-                // if term exists
-                if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
+				// if term exists
+				if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
 
-                    $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
-                    $term_id = $existing_term->term_id;
+					$existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
+					$term_id = $existing_term->term_id;
 
-                }else{
+				}else{
 
-                    // for a new term simply get the term from the returned value
-                    $term_id = $new_term['term_id'];
+					// for a new term simply get the term from the returned value
+					$term_id = $new_term['term_id'];
 
-                } // end if term exist
+				} // end if term exist
 
-                // set the terms selected on the course
-                wp_set_object_terms( $course_id, $term_id , 'module', true );
+				// set the terms selected on the course
+				wp_set_object_terms( $course_id, $term_id , 'module', true );
 
-                // remove old term
-                wp_remove_object_terms( $course_id, $term->term_id, 'module' );
+				// remove old term
+				wp_remove_object_terms( $course_id, $term->term_id, 'module' );
 
-                // update the lessons within the current module term
-                $lessons = Sensei()->course->course_lessons( $course_id );
-                foreach( $lessons as $lesson  ){
+				// update the lessons within the current module term
+				$lessons = Sensei()->course->course_lessons( $course_id );
+				foreach( $lessons as $lesson  ){
 
-                    if( has_term( $term->slug, 'module', $lesson ) ){
+					if( has_term( $term->slug, 'module', $lesson ) ){
 
-                        // add the new term, the false at the end says to replace all terms on this module
-                        // with the new term.
-                        wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
-                        update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
-                    }
+						// add the new term, the false at the end says to replace all terms on this module
+						// with the new term.
+						wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
+						update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
+					}
 
-                }// end for each
+				}// end for each
 
-            }
-        }
+			}
+		}
 
-    }// end update_course_module_terms_author
+	}// end update_course_module_terms_author
 
-    /**
-     * Sensei_Teacher::update_course_lessons_author
-     *
-     * Update all course lessons and their quiz with a new author
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function update_course_lessons_author ( $course_id, $new_author  ){
+	/**
+	 * Sensei_Teacher::update_course_lessons_author
+	 *
+	 * Update all course lessons and their quiz with a new author
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function update_course_lessons_author ( $course_id, $new_author  ){
 
 
-        if( empty( $course_id ) || empty( $new_author ) ){
-            return false;
-        }
+		if( empty( $course_id ) || empty( $new_author ) ){
+			return false;
+		}
 
-        //get a list of course lessons
-        $lessons = Sensei()->course->course_lessons( $course_id );
+		//get a list of course lessons
+		$lessons = Sensei()->course->course_lessons( $course_id );
 
-        if( empty( $lessons )  ||  ! is_array( $lessons )  ){
-            return false;
-        }
+		if( empty( $lessons )  ||  ! is_array( $lessons )  ){
+			return false;
+		}
 
-        // update each lesson and quiz author
-        foreach( $lessons as $lesson ){
+		// update each lesson and quiz author
+		foreach( $lessons as $lesson ){
 
-            // don't update if the author is tha same as the new author
-            if( $new_author == $lesson->post_author ){
-                continue;
-            }
+			// don't update if the author is tha same as the new author
+			if( $new_author == $lesson->post_author ){
+				continue;
+			}
 
-            // update lesson author
-            wp_update_post( array(
-                'ID'=> $lesson->ID,
-                'post_author' => $new_author
-                ) );
+			// update lesson author
+			wp_update_post( array(
+				'ID'=> $lesson->ID,
+				'post_author' => $new_author
+				) );
 
-            // update quiz author
-            //get the lessons quiz
-            $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-            if( is_array( $lesson_quizzes ) ){
-                foreach ( $lesson_quizzes as $quiz_id ) {
-                    // update quiz with new author
-                    wp_update_post( array(
-                        'ID'           => $quiz_id,
-                        'post_author' =>  $new_author
-                    ) );
-                }
-            }else{
-                wp_update_post( array(
-                    'ID'           => $lesson_quizzes,
-                    'post_author' =>  $new_author
-                ) );
-            }
+			// update quiz author
+			//get the lessons quiz
+			$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+			if( is_array( $lesson_quizzes ) ){
+				foreach ( $lesson_quizzes as $quiz_id ) {
+					// update quiz with new author
+					wp_update_post( array(
+						'ID'           => $quiz_id,
+						'post_author' =>  $new_author
+					) );
+				}
+			}else{
+				wp_update_post( array(
+					'ID'           => $lesson_quizzes,
+					'post_author' =>  $new_author
+				) );
+			}
 
-        } // end for each lessons
+		} // end for each lessons
 
-        return true;
+		return true;
 
-    }// end update_course_lessons_author
-
-
-
-    /**
-     * Sensei_Teacher::course_analysis_teacher_access_limit
-     *
-     * Alter the query so that users can only see their courses on the analysis page
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters $query
-     * @return array $users user id array
-     */
-    public function course_analysis_teacher_access_limit ( $query ) {
-
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-            return $query;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $query;
-        }
-
-        $screen = get_current_screen();
-        $sensei_post_types = array('course', 'lesson', 'question' );
-
-        // exit early for the following conditions
-        $limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
-
-        if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
-            || ! in_array( $query->query['post_type'], $sensei_post_types ) ){
-            return $query;
-        }
-
-        global $current_user;
-        // set the query author to the current user to only show those those posts
-        $query->set( 'author', $current_user->ID );
-        return $query;
-
-    }// end course_analysis_teacher_access_limit
-
-
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Determine if we're in admin and the current logged in use is a teacher
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return bool $is_admin_teacher
-     */
-    public function is_admin_teacher ( ){
-
-        if( ! is_user_logged_in()){
-            return false;
-        }
-        $is_admin_teacher = false;
-
-        if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
-
-            $is_admin_teacher = true;
-
-        }
-
-        return $is_admin_teacher;
-
-    } // end is_admin_teacher
-
-    /**
-     * Show correct post counts on list table for Sensei post types
-     *
-     * @since 1.8.0
-     *
-     * @param  object $counts Default status counts
-     * @param  string $type   Current post type
-     * @param  string $perm   User permission level
-     * @return object         Modified status counts
-     */
-    public function list_table_counts( $counts, $type, $perm ) {
-        global $current_user;
-
-        if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
-            return $counts;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $counts;
-        }
-
-        $args = array(
-            'post_type' => $type,
-            'author' => $current_user->ID,
-            'posts_per_page' => -1
-        );
-
-         // Get all available statuses
-        $stati = get_post_stati();
-
-        // Update count object
-        foreach( $stati as $status ) {
-            $args['post_status'] = $status;
-            $posts = get_posts( $args );
-            $counts->$status = count( $posts );
-        }
-
-        return $counts;
-    }
-
-    /**
-     * Filter the post queries to show
-     * only lesson /course and users that belong
-     * to the current logged teacher.
-     *
-     * @since 1.8.0
-     *
-     */
-    public function filter_queries ( $query ) {
-        global $current_user;
-
-        if( ! $this->is_admin_teacher() ) {
-            return;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return;
-        }
-
-        $screen = get_current_screen();
-        if( empty( $screen ) ) {
-            return $query;
-        }
-        switch( $screen->id ) {
-            case 'sensei_page_sensei_grading':
-            case 'sensei_page_sensei_analysis':
-            case 'sensei_page_sensei_learners':
-            case 'lesson':
-            case 'course':
-            case 'question':
-            case 'lesson_page_module-order':
-
-            /**
-             * sensei_filter_queries_set_author
-             * Filter the author Sensei set for queries
-             *
-             * @since 1.8.0
-             *
-             * @param int $user_id
-             * @param string $screen_id
-             *
-             */
-            $query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
-            break;
-        }
-    }
-
-    /**
-     * Limit grading quizzes to only those within courses belonging to the current teacher
-     * . This excludes the admin user.
-     *
-     * @since 1.8.0
-     * @hooked into the_comments
-     * @param array  $comments
-     *
-     * @return array $comments
-     */
-    public function filter_grading_activity_queries( $comments ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
-            return $comments ;
-        }
-
-        //check if we're on the grading screen
-        $screen = get_current_screen();
-
-        if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
-            return $comments;
-        }
-
-        // get the course and determine if the current teacher is the owner
-        // if not remove it from the list of comments to be returned
-        foreach( $comments as $key => $comment){
-            $lesson = get_post( $comment->comment_post_ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson->ID );
-            $course = get_post( $course_id );
-            if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
-                //remove this as the teacher should see this.
-                unset( $comments[ $key ] );
-            }
-        }
-        return $comments ;
-
-    }// end function filter grading
-
-    /**
-     * Limit the grading screen totals to only show lessons in the course
-     * belonging to the currently logged in teacher. This only applies to
-     * the teacher role.
-     *
-     * @since 1.8.0
-     *
-     * @hooked into sensei_count_statuses_args
-     * @param array $args
-     *
-     * @return array  $args
-     */
-    public function limit_grading_totals( $args ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
-            return $args ;
-        }
-
-        //get the teachers courses
-        // the query is already filtered to only the teacher
-        $courses =  Sensei()->course->get_all_courses();
-
-        if( empty(  $courses ) || ! is_array( $courses ) ){
-            return $args;
-        }
-
-        //setup the lessons quizzes  to limit the grading totals to
-        $quiz_scope = array();
-        foreach( $courses as $course ){
-
-            $course_lessons = Sensei()->course->course_lessons( $course->ID );
-
-            if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
-
-                foreach(  $course_lessons as $lesson ){
-
-                    $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-                    if( !empty( $quiz_id ) ) {
-
-                        array_push( $quiz_scope, $quiz_id );
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        $args['post__in'] = $quiz_scope;
-
-        return $args;
-    }
-
-    /**
-     * It ensures that the author archive shows course by the current user.
-     *
-     * This function is hooked into the pre_get_posts filter
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public function add_courses_to_author_archive( $query ) {
-
-        if ( is_admin() || ! $query->is_author() ){
-            return $query;
-        }
-
-        // this should only apply to users with the teacher role
-        $current_page_user = get_user_by('login', $query->get('author_name') );
-        if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
-
-            return $query;
-
-        }
-
-        // Change post types depending on what is set already
-        $current_post_types = $query->get( 'post_type' );
-        if( empty( $current_post_types  ) ){
-
-            // if empty it means post by default, so add post so that it also includes that for now
-            $new_post_types = array( 'post', 'course' );
-
-        } elseif( is_array( $current_post_types  ) ) {
-
-            // merge the post types instead of overwriting it
-            $new_post_types = array_merge( $current_post_types, array( 'course' ) );
-
-        }else{
-
-            // in this instance it is probably just one post type in string format
-            $new_post_types =  array( $current_post_types , 'course');
-
-        }
-
-        // change the query before returning it
-        $query->set('post_type', $new_post_types );
-
-        /**
-         * Change the query on the teacher author archive template
-         *
-         * @since 1.8.4
-         * @param WP_Query $query
-         */
-        return apply_filters( 'sensei_teacher_archive_query', $query );
-
-    }
-
-    /**
-     * Notify teacher when someone assigns a course to their account.
-     *
-     * @since 1.8.0
-     *
-     * @param $teacher_id
-     * @param $course_id
-     * @return bool
-     */
-    public function teacher_course_assigned_notification( $teacher_id, $course_id ){
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
-            return false;
-        }
-
-        // if new user is the same as the current logged user, they don't need an email
-        if( $teacher_id == get_current_user_id() ){
-            return true;
-        }
-
-        // load the email class
-        include('emails/class-sensei-email-teacher-new-course-assignment.php');
-        $email = new Sensei_Email_Teacher_New_Course_Assignment();
-        $email->trigger( $teacher_id, $course_id );
-
-        return true;
-    } // end  teacher_course_assigned_notification
-
-    /**
-     * Email the admin when a teacher creates a new course
-     *
-     * This function hooks into wp_insert_post
-     *
-     * @since 1.8.0
-     * @param int $course_id
-     * @return bool
-     */
-    public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
-
-        $course_id = $post->ID;
-
-        if( 'publish'== $old_status || 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
-            || 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
-
-            return false;
-
-        }
-
-        /**
-         * Filter the option to send admin notification emails when teachers creation
-         * course.
-         *
-         * @since 1.8.0
-         *
-         * @param bool $on default true
-         */
-        if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
-            return false;
-        }
-
-        // setting up the data needed by the email template
-        global $sensei_email_data;
-        $template = 'admin-teacher-new-course-created';
-        $course = get_post( $course_id );
-        $teacher = new WP_User( $course->post_author );
-        $recipient = get_option('admin_email', true);
-
-        // don't send if the course is created by admin
-        if( $recipient == $teacher->user_email || current_user_can( 'manage_options' )){
-            return false;
-        }
-
-        /**
-         * Filter the email Header for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $template
-         */
-        $heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
-
-        /**
-         * Filter the email subject for the the
-         * admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $subject default New course assigned to you
-         * @param string $template
-         */
-        $subject = apply_filters('sensei_email_subject',
-                                '['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
-                                $template );
-
-        //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
-
-        // Construct data array
-        $email_data = array(
-            'template'			=> $template,
-            'heading' =>  $heading,
-            'teacher'		=> $teacher,
-            'course_id'			=> $course_id,
-            'course_name'			=> $course->post_title,
-            'course_edit_link' => $course_edit_link,
-        );
-
-        /**
-         * Filter the sensei email data for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param array $email_data
-         * @param string $template
-         */
-        $sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
-
-        // Send mail
-        Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
-
-    }// end notify admin of course creation
-
-    /**
-     * Limit the analysis view to only the users taking courses belong to this teacher
-     *
-     * Hooked into sensei_analysis_get_learners
-     * @param array $args WP_User_Query arguments
-     * @return array $learners_query_results
-     */
-    public function limit_analysis_learners( $args ){
-
-        // show default for none teachers
-        if( ! Sensei()->teacher->is_admin_teacher() ) {
-                return $args;
-        }
-
-        // for teachers all courses only return those which belong to the teacher
-        // as they don't have access to course belonging to other users
-        $teacher_courses = Sensei()->course->get_all_courses();
+	}// end update_course_lessons_author
+
+
+
+	/**
+	 * Sensei_Teacher::course_analysis_teacher_access_limit
+	 *
+	 * Alter the query so that users can only see their courses on the analysis page
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters $query
+	 * @return array $users user id array
+	 */
+	public function course_analysis_teacher_access_limit ( $query ) {
+
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+			return $query;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $query;
+		}
+
+		$screen = get_current_screen();
+		$sensei_post_types = array('course', 'lesson', 'question' );
+
+		// exit early for the following conditions
+		$limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
+
+		if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
+			|| ! in_array( $query->query['post_type'], $sensei_post_types ) ){
+			return $query;
+		}
+
+		global $current_user;
+		// set the query author to the current user to only show those those posts
+		$query->set( 'author', $current_user->ID );
+		return $query;
+
+	}// end course_analysis_teacher_access_limit
+
+
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Determine if we're in admin and the current logged in use is a teacher
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return bool $is_admin_teacher
+	 */
+	public function is_admin_teacher ( ){
+
+		if( ! is_user_logged_in()){
+			return false;
+		}
+		$is_admin_teacher = false;
+
+		if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
+
+			$is_admin_teacher = true;
+
+		}
+
+		return $is_admin_teacher;
+
+	} // end is_admin_teacher
+
+	/**
+	 * Show correct post counts on list table for Sensei post types
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  object $counts Default status counts
+	 * @param  string $type   Current post type
+	 * @param  string $perm   User permission level
+	 * @return object         Modified status counts
+	 */
+	public function list_table_counts( $counts, $type, $perm ) {
+		global $current_user;
+
+		if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
+			return $counts;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $counts;
+		}
+
+		$args = array(
+			'post_type' => $type,
+			'author' => $current_user->ID,
+			'posts_per_page' => -1
+		);
+
+		 // Get all available statuses
+		$stati = get_post_stati();
+
+		// Update count object
+		foreach( $stati as $status ) {
+			$args['post_status'] = $status;
+			$posts = get_posts( $args );
+			$counts->$status = count( $posts );
+		}
+
+		return $counts;
+	}
+
+	/**
+	 * Filter the post queries to show
+	 * only lesson /course and users that belong
+	 * to the current logged teacher.
+	 *
+	 * @since 1.8.0
+	 *
+	 */
+	public function filter_queries ( $query ) {
+		global $current_user;
+
+		if( ! $this->is_admin_teacher() ) {
+			return;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return;
+		}
+
+		$screen = get_current_screen();
+		if( empty( $screen ) ) {
+			return $query;
+		}
+		switch( $screen->id ) {
+			case 'sensei_page_sensei_grading':
+			case 'sensei_page_sensei_analysis':
+			case 'sensei_page_sensei_learners':
+			case 'lesson':
+			case 'course':
+			case 'question':
+			case 'lesson_page_module-order':
+
+			/**
+			 * sensei_filter_queries_set_author
+			 * Filter the author Sensei set for queries
+			 *
+			 * @since 1.8.0
+			 *
+			 * @param int $user_id
+			 * @param string $screen_id
+			 *
+			 */
+			$query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
+			break;
+		}
+	}
+
+	/**
+	 * Limit grading quizzes to only those within courses belonging to the current teacher
+	 * . This excludes the admin user.
+	 *
+	 * @since 1.8.0
+	 * @hooked into the_comments
+	 * @param array  $comments
+	 *
+	 * @return array $comments
+	 */
+	public function filter_grading_activity_queries( $comments ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
+			return $comments ;
+		}
+
+		//check if we're on the grading screen
+		$screen = get_current_screen();
+
+		if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
+			return $comments;
+		}
+
+		// get the course and determine if the current teacher is the owner
+		// if not remove it from the list of comments to be returned
+		foreach( $comments as $key => $comment){
+			$lesson = get_post( $comment->comment_post_ID );
+			$course_id = Sensei()->lesson->get_course_id( $lesson->ID );
+			$course = get_post( $course_id );
+			if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
+				//remove this as the teacher should see this.
+				unset( $comments[ $key ] );
+			}
+		}
+		return $comments ;
+
+	}// end function filter grading
+
+	/**
+	 * Limit the grading screen totals to only show lessons in the course
+	 * belonging to the currently logged in teacher. This only applies to
+	 * the teacher role.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @hooked into sensei_count_statuses_args
+	 * @param array $args
+	 *
+	 * @return array  $args
+	 */
+	public function limit_grading_totals( $args ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
+			return $args ;
+		}
+
+		//get the teachers courses
+		// the query is already filtered to only the teacher
+		$courses =  Sensei()->course->get_all_courses();
+
+		if( empty(  $courses ) || ! is_array( $courses ) ){
+			return $args;
+		}
+
+		//setup the lessons quizzes  to limit the grading totals to
+		$quiz_scope = array();
+		foreach( $courses as $course ){
+
+			$course_lessons = Sensei()->course->course_lessons( $course->ID );
+
+			if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
+
+				foreach(  $course_lessons as $lesson ){
+
+					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+					if( !empty( $quiz_id ) ) {
+
+						array_push( $quiz_scope, $quiz_id );
+
+					}
+
+				}
+
+			}
+
+		}
+
+		$args['post__in'] = $quiz_scope;
+
+		return $args;
+	}
+
+	/**
+	 * It ensures that the author archive shows course by the current user.
+	 *
+	 * This function is hooked into the pre_get_posts filter
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public function add_courses_to_author_archive( $query ) {
+
+		if ( is_admin() || ! $query->is_author() ){
+			return $query;
+		}
+
+		// this should only apply to users with the teacher role
+		$current_page_user = get_user_by('login', $query->get('author_name') );
+		if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
+
+			return $query;
+
+		}
+
+		// Change post types depending on what is set already
+		$current_post_types = $query->get( 'post_type' );
+		if( empty( $current_post_types  ) ){
+
+			// if empty it means post by default, so add post so that it also includes that for now
+			$new_post_types = array( 'post', 'course' );
+
+		} elseif( is_array( $current_post_types  ) ) {
+
+			// merge the post types instead of overwriting it
+			$new_post_types = array_merge( $current_post_types, array( 'course' ) );
+
+		}else{
+
+			// in this instance it is probably just one post type in string format
+			$new_post_types =  array( $current_post_types , 'course');
+
+		}
+
+		// change the query before returning it
+		$query->set('post_type', $new_post_types );
+
+		/**
+		 * Change the query on the teacher author archive template
+		 *
+		 * @since 1.8.4
+		 * @param WP_Query $query
+		 */
+		return apply_filters( 'sensei_teacher_archive_query', $query );
+
+	}
+
+	/**
+	 * Notify teacher when someone assigns a course to their account.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $teacher_id
+	 * @param $course_id
+	 * @return bool
+	 */
+	public function teacher_course_assigned_notification( $teacher_id, $course_id ){
+
+		if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
+			return false;
+		}
+
+		// if new user is the same as the current logged user, they don't need an email
+		if( $teacher_id == get_current_user_id() ){
+			return true;
+		}
+
+		// load the email class
+		include('emails/class-sensei-email-teacher-new-course-assignment.php');
+		$email = new Sensei_Email_Teacher_New_Course_Assignment();
+		$email->trigger( $teacher_id, $course_id );
+
+		return true;
+	} // end  teacher_course_assigned_notification
+
+	/**
+	 * Email the admin when a teacher creates a new course
+	 *
+	 * This function hooks into wp_insert_post
+	 *
+	 * @since 1.8.0
+	 * @param int $course_id
+	 * @return bool
+	 */
+	public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
+
+		$course_id = $post->ID;
+
+		if( 'publish'== $old_status || 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
+			|| 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
+
+			return false;
+
+		}
+
+		/**
+		 * Filter the option to send admin notification emails when teachers creation
+		 * course.
+		 *
+		 * @since 1.8.0
+		 *
+		 * @param bool $on default true
+		 */
+		if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
+			return false;
+		}
+
+		// setting up the data needed by the email template
+		global $sensei_email_data;
+		$template = 'admin-teacher-new-course-created';
+		$course = get_post( $course_id );
+		$teacher = new WP_User( $course->post_author );
+		$recipient = get_option('admin_email', true);
+
+		// don't send if the course is created by admin
+		if( $recipient == $teacher->user_email || current_user_can( 'manage_options' )){
+			return false;
+		}
+
+		/**
+		 * Filter the email Header for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $template
+		 */
+		$heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
+
+		/**
+		 * Filter the email subject for the the
+		 * admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $subject default New course assigned to you
+		 * @param string $template
+		 */
+		$subject = apply_filters('sensei_email_subject',
+								'['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
+								$template );
+
+		//course edit link
+		$course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+
+		// Construct data array
+		$email_data = array(
+			'template'			=> $template,
+			'heading' =>  $heading,
+			'teacher'		=> $teacher,
+			'course_id'			=> $course_id,
+			'course_name'			=> $course->post_title,
+			'course_edit_link' => $course_edit_link,
+		);
+
+		/**
+		 * Filter the sensei email data for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param array $email_data
+		 * @param string $template
+		 */
+		$sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
+
+		// Send mail
+		Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
+
+	}// end notify admin of course creation
+
+	/**
+	 * Limit the analysis view to only the users taking courses belong to this teacher
+	 *
+	 * Hooked into sensei_analysis_get_learners
+	 * @param array $args WP_User_Query arguments
+	 * @return array $learners_query_results
+	 */
+	public function limit_analysis_learners( $args ){
+
+		// show default for none teachers
+		if( ! Sensei()->teacher->is_admin_teacher() ) {
+				return $args;
+		}
+
+		// for teachers all courses only return those which belong to the teacher
+		// as they don't have access to course belonging to other users
+		$teacher_courses = Sensei()->course->get_all_courses();
 
-        // if the user has no courses they should see no users
-        if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
-            // tell the query to return 0 students
-            $args[ 'include'] = array( 0 );
-            return $args;
-
-        }
-
-        $learner_ids_for_teacher_courses = array();
-        foreach( $teacher_courses as $course ){
-
-            $course_learner_ids = array();
-            $activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
-
-            if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
-                continue; // skip to the next course as there are no users on this course
-            }
-
-            // it could be an array of comments or a single comment
-            if( is_array( $activity_comments ) ){
+		// if the user has no courses they should see no users
+		if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
+			// tell the query to return 0 students
+			$args[ 'include'] = array( 0 );
+			return $args;
+
+		}
+
+		$learner_ids_for_teacher_courses = array();
+		foreach( $teacher_courses as $course ){
+
+			$course_learner_ids = array();
+			$activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
+
+			if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
+				continue; // skip to the next course as there are no users on this course
+			}
+
+			// it could be an array of comments or a single comment
+			if( is_array( $activity_comments ) ){
 
-                foreach( $activity_comments as $comment ){
+				foreach( $activity_comments as $comment ){
 
-                    $user = get_userdata( $comment->user_id );
+					$user = get_userdata( $comment->user_id );
 
-                    if( empty( $user ) ){
-                        // next comment in this array
-                        continue;
-                    }
+					if( empty( $user ) ){
+						// next comment in this array
+						continue;
+					}
 
-                    $course_learner_ids[] = $user->ID;
-                }
+					$course_learner_ids[] = $user->ID;
+				}
 
-            }else{
+			}else{
 
-                $user = get_userdata( $activity_comments->user_id );
-                $course_learner_ids[] = $user->ID;
+				$user = get_userdata( $activity_comments->user_id );
+				$course_learner_ids[] = $user->ID;
 
-            }
+			}
 
-            // add learners on this course to the all courses learner list
-            $learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
+			// add learners on this course to the all courses learner list
+			$learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
 
-        }
+		}
 
-        // if there are no students taking the courses by this teacher don't show them any of the other users
-        if( empty( $learner_ids_for_teacher_courses ) ){
+		// if there are no students taking the courses by this teacher don't show them any of the other users
+		if( empty( $learner_ids_for_teacher_courses ) ){
 
-            $args[ 'include'] = array( 0 );
+			$args[ 'include'] = array( 0 );
 
-        }else{
+		}else{
 
-            $args[ 'include'] = $learner_ids_for_teacher_courses;
+			$args[ 'include'] = $learner_ids_for_teacher_courses;
 
-        }
+		}
 
-        // return the WP_Use_Query arguments
-        return $args;
+		// return the WP_Use_Query arguments
+		return $args;
 
-    }// end limit_analysis_learners
+	}// end limit_analysis_learners
 
-    /**
-     * Give teacher full admin access to the question post type
-     * in certain cases.
-     *
-     * @since 1.8.0
-     * @param $questions
-     * @return mixed
-     */
-    public function allow_teacher_access_to_questions( $questions, $quiz_id ){
+	/**
+	 * Give teacher full admin access to the question post type
+	 * in certain cases.
+	 *
+	 * @since 1.8.0
+	 * @param $questions
+	 * @return mixed
+	 */
+	public function allow_teacher_access_to_questions( $questions, $quiz_id ){
 
-        if( ! $this->is_admin_teacher() ){
-            return $questions;
-        }
+		if( ! $this->is_admin_teacher() ){
+			return $questions;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        // don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
-        remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
+		// don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
+		remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
 
-        if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
+		if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
-                $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
+				$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
 
-                // set the teacher as the current use again
-                wp_set_current_user( $current_teacher_id );
-            }
+				// set the teacher as the current use again
+				wp_set_current_user( $current_teacher_id );
+			}
 
-        }
-        // attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
+		}
+		// attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
 
-        return $questions;
-    }
+		return $questions;
+	}
 
-    /**
-     * Give the teacher role access to questions from the question bank
-     *
-     * @since 1.8.0
-     * @param $wp_query
-     * @return mixed
-     */
-    public function give_access_to_all_questions( $wp_query ){
+	/**
+	 * Give the teacher role access to questions from the question bank
+	 *
+	 * @since 1.8.0
+	 * @param $wp_query
+	 * @return mixed
+	 */
+	public function give_access_to_all_questions( $wp_query ){
 
-        if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
+		if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
 
-            return $wp_query;
-        }
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
-        if( ( isset($screen->id) && 'lesson' == $screen->id )
-            || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
+		$screen = get_current_screen();
+		if( ( isset($screen->id) && 'lesson' == $screen->id )
+			|| ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
 
-                //run new query as admin
-                $wp_query = new WP_Query( $wp_query->query );
+				//run new query as admin
+				$wp_query = new WP_Query( $wp_query->query );
 
-                //set the teache as current use again
-                wp_set_current_user( $current_teacher_id );
+				//set the teache as current use again
+				wp_set_current_user( $current_teacher_id );
 
-            }
-        }
+			}
+		}
 
-        return $wp_query;
-    }// end give_access_to_all_questions
+		return $wp_query;
+	}// end give_access_to_all_questions
 
-    /**
-     * Add new column heading to the course admin edit list
-     *
-     * @since 1.8.0
-     * @param $columns
-     * @return array
-     */
-    public function course_column_heading($columns) {
+	/**
+	 * Add new column heading to the course admin edit list
+	 *
+	 * @since 1.8.0
+	 * @param $columns
+	 * @return array
+	 */
+	public function course_column_heading($columns) {
 
-        if( $this->is_admin_teacher() ){
-            return $columns;
-        }
-        $new_columns = array(
-            'teacher' => __('Teacher', 'woothemes-sensei'),
-        );
-        return array_merge($columns, $new_columns);
+		if( $this->is_admin_teacher() ){
+			return $columns;
+		}
+		$new_columns = array(
+			'teacher' => __('Teacher', 'woothemes-sensei'),
+		);
+		return array_merge($columns, $new_columns);
 
-    }// end teacher column add
+	}// end teacher column add
 
-    /**
-     * Print out  teacher column data
-     *
-     * @since 1.8.0
-     * @param $column
-     * @param $course_id
-     */
-    public function course_column_data( $column, $course_id  ){
+	/**
+	 * Print out  teacher column data
+	 *
+	 * @since 1.8.0
+	 * @param $column
+	 * @param $course_id
+	 */
+	public function course_column_data( $column, $course_id  ){
 
-        if( $this->is_admin_teacher() || 'teacher' != $column  ){
-            return;
-        }
+		if( $this->is_admin_teacher() || 'teacher' != $column  ){
+			return;
+		}
 
-        $course = get_post( $course_id );
-        $teacher = get_userdata( $course->post_author );
+		$course = get_post( $course_id );
+		$teacher = get_userdata( $course->post_author );
 
-        if( !$teacher ){
-            return;
-        }
+		if( !$teacher ){
+			return;
+		}
 
-        echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
+		echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
 
-    }// end course_column_ data
+	}// end course_column_ data
 
-    /**
-     * Return only courses belonging to the given teacher.
-     *
-     *
-     * @since 1.8.0
-     *
-     * @param int $teacher_id
-     * @param bool $return_ids_only
-     *
-     * @return array $teachers_courses
-     */
-    public function get_teacher_courses( $teacher_id, $return_ids_only= false){
+	/**
+	 * Return only courses belonging to the given teacher.
+	 *
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $teacher_id
+	 * @param bool $return_ids_only
+	 *
+	 * @return array $teachers_courses
+	 */
+	public function get_teacher_courses( $teacher_id, $return_ids_only= false){
 
-        $teachers_courses = array();
+		$teachers_courses = array();
 
-        if( empty( $teacher_id  ) ){
-            $teacher_id = get_current_user_id();
-        }
+		if( empty( $teacher_id  ) ){
+			$teacher_id = get_current_user_id();
+		}
 
-        $all_courses = Sensei()->course->get_all_courses();
+		$all_courses = Sensei()->course->get_all_courses();
 
-        if( empty( $all_courses ) ){
-            return $all_courses;
-        }
+		if( empty( $all_courses ) ){
+			return $all_courses;
+		}
 
-        foreach( $all_courses as $course ){
+		foreach( $all_courses as $course ){
 
-            if( $course->post_author != $teacher_id  ){
-                continue;
-            }
+			if( $course->post_author != $teacher_id  ){
+				continue;
+			}
 
-            if( $return_ids_only ){
+			if( $return_ids_only ){
 
-                $teachers_courses[] = $course->ID;
+				$teachers_courses[] = $course->ID;
 
-            }else{
+			}else{
 
-                $teachers_courses[] = $course;
+				$teachers_courses[] = $course;
 
-            }
+			}
 
-        }
+		}
 
-        return $teachers_courses;
+		return $teachers_courses;
 
-    }
+	}
 
-    /**
-     * Limit the message display to only those sent to the current teacher
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return mixed
-     */
-    public function limit_edit_messages_query( $query ){
-        if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
-            return $query;
-        }
-
-        $teacher = wp_get_current_user();
-
-        $query->set( 'meta_key', '_receiver' );
-        $meta_query_args = array(
-            'key'     => '_receiver',
-            'value'   => $teacher->get('user_login') ,
-            'compare' => '='
-        );
+	/**
+	 * Limit the message display to only those sent to the current teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return mixed
+	 */
+	public function limit_edit_messages_query( $query ){
+		if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
+			return $query;
+		}
+
+		$teacher = wp_get_current_user();
+
+		$query->set( 'meta_key', '_receiver' );
+		$meta_query_args = array(
+			'key'     => '_receiver',
+			'value'   => $teacher->get('user_login') ,
+			'compare' => '='
+		);
 
-        $query->set('meta_query', $meta_query_args  );
+		$query->set('meta_query', $meta_query_args  );
 
-        return $query;
-    }
+		return $query;
+	}
 
 
-    /**
-     * Add options to filter courses by teacher
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function course_teacher_filter_options() {
-        global $typenow;
+	/**
+	 * Add options to filter courses by teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function course_teacher_filter_options() {
+		global $typenow;
 
-        if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
-            return;
-        }
+		if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
+			return;
+		}
 
-        // get all roles
-        $roles = get_editable_roles();
+		// get all roles
+		$roles = get_editable_roles();
 
-        // get roles with the course edit capability
-        // and then get the users with those roles
-        $users_who_can_edit_courses = array();
-        foreach( $roles as $role_item ){
+		// get roles with the course edit capability
+		// and then get the users with those roles
+		$users_who_can_edit_courses = array();
+		foreach( $roles as $role_item ){
 
-            $role = get_role( strtolower( $role_item['name'] ) );
+			$role = get_role( strtolower( $role_item['name'] ) );
 
-            if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
+			if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
 
-                $user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
-                $role_users_who_can_edit_courses = get_users( $user_query_args );
+				$user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
+				$role_users_who_can_edit_courses = get_users( $user_query_args );
 
-                // add user from the current $user_role to all users
-                $users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
+				// add user from the current $user_role to all users
+				$users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
 
-            }
+			}
 
-        }
+		}
 
-        // Create the select element with the given users who can edit course
-        $selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-        $course_options = '';
-        foreach( $users_who_can_edit_courses as $user ) {
-            $course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
-        }
+		// Create the select element with the given users who can edit course
+		$selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+		$course_options = '';
+		foreach( $users_who_can_edit_courses as $user ) {
+			$course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
+		}
 
-        $output = '<select name="course_teacher" id="dropdown_course_teachers">';
-        $output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
-        $output .= $course_options;
-        $output .= '</select>';
+		$output = '<select name="course_teacher" id="dropdown_course_teachers">';
+		$output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
+		$output .= $course_options;
+		$output .= '</select>';
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Modify the main query on the admin course list screen
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return $query
-     */
-    public function teacher_filter_query_modify( $query ){
-        global $typenow;
+	/**
+	 * Modify the main query on the admin course list screen
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return $query
+	 */
+	public function teacher_filter_query_modify( $query ){
+		global $typenow;
 
-        if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
-            return $query;
-        }
-        $course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-
-        if( empty( $course_teacher ) ) {
-            return $query;
-        }
-
-        $query['author'] = $course_teacher;
-        return $query;
-    }
-
-    /**
-     * Only show current teacher's media in the media library
-     * @param  array $request Default request arguments
-     * @return array          Modified request arguments
-     */
-    public function restrict_media_library( $request = array() ) {
-
-        if( ! is_admin() ) {
-            return $request;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $request;
-        }
-
-        $screen = get_current_screen();
-
-        if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
-            $teacher = intval( get_current_user_id() );
-
-            if( $teacher ) {
-                $request['author__in'] = array( $teacher );
-            }
-        }
-
-        return $request;
-    } // End restrict_media_library()
-
-    /**
-     * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
-     * @param  array $query Default query arguments
-     * @return array        Modified query arguments
-     */
-    public function restrict_media_library_modal( $query = array() ) {
-
-        if( ! is_admin() ) {
-            return $query;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $query;
-        }
-
-        $teacher = intval( get_current_user_id() );
-
-        if( $teacher ) {
-            $query['author__in'] = array( $teacher );
-        }
-
-        return $query;
-    } // End restrict_media_library_modal()
-
-    /**
-     * When saving the lesson, update the teacher if the lesson belongs to a course
-     *
-     * @since 1.8.0
-     *
-     * @param int $lesson_id
-     */
-    public function update_lesson_teacher( $lesson_id ){
-
-        if( 'lesson'!= get_post_type() ){
-            return;
-        }
+		if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
+			return $query;
+		}
+		$course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+
+		if( empty( $course_teacher ) ) {
+			return $query;
+		}
+
+		$query['author'] = $course_teacher;
+		return $query;
+	}
+
+	/**
+	 * Only show current teacher's media in the media library
+	 * @param  array $request Default request arguments
+	 * @return array          Modified request arguments
+	 */
+	public function restrict_media_library( $request = array() ) {
+
+		if( ! is_admin() ) {
+			return $request;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $request;
+		}
+
+		$screen = get_current_screen();
+
+		if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
+			$teacher = intval( get_current_user_id() );
+
+			if( $teacher ) {
+				$request['author__in'] = array( $teacher );
+			}
+		}
+
+		return $request;
+	} // End restrict_media_library()
+
+	/**
+	 * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
+	 * @param  array $query Default query arguments
+	 * @return array        Modified query arguments
+	 */
+	public function restrict_media_library_modal( $query = array() ) {
+
+		if( ! is_admin() ) {
+			return $query;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $query;
+		}
+
+		$teacher = intval( get_current_user_id() );
+
+		if( $teacher ) {
+			$query['author__in'] = array( $teacher );
+		}
+
+		return $query;
+	} // End restrict_media_library_modal()
+
+	/**
+	 * When saving the lesson, update the teacher if the lesson belongs to a course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $lesson_id
+	 */
+	public function update_lesson_teacher( $lesson_id ){
+
+		if( 'lesson'!= get_post_type() ){
+			return;
+		}
 
-        // this should only run once per request cycle
-        remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+		// this should only run once per request cycle
+		remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        if(  empty( $course_id ) || ! $course_id ){
-            return;
-        }
+		if(  empty( $course_id ) || ! $course_id ){
+			return;
+		}
 
-        $course = get_post( $course_id );
+		$course = get_post( $course_id );
 
-        $lesson_update_args= array(
-            'ID' => $lesson_id ,
-            'post_author' => $course->post_author
-        );
-        wp_update_post( $lesson_update_args );
+		$lesson_update_args= array(
+			'ID' => $lesson_id ,
+			'post_author' => $course->post_author
+		);
+		wp_update_post( $lesson_update_args );
 
-    } // end update_lesson_teacher
+	} // end update_lesson_teacher
 
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Limit teachers to only see their courses, lessons and questions
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return WP_Query $wp_query
-     */
-    public function limit_teacher_edit_screen_post_types( $wp_query ) {
-        global $current_user;
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Limit teachers to only see their courses, lessons and questions
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return WP_Query $wp_query
+	 */
+	public function limit_teacher_edit_screen_post_types( $wp_query ) {
+		global $current_user;
 
-        //exit early
-        if( ! $this->is_admin_teacher() ){
-            return $wp_query;
-        }
+		//exit early
+		if( ! $this->is_admin_teacher() ){
+			return $wp_query;
+		}
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $wp_query;
-        }
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        if( empty( $screen ) ){
-            return $wp_query;
-        }
+		if( empty( $screen ) ){
+			return $wp_query;
+		}
 
-        // for any of these conditions limit what the teacher will see
-        $limit_screens = array(
-            'edit-lesson',
-            'edit-course',
-            'edit-question',
-            'course_page_course-order',
-            'lesson_page_lesson-order',
-        );
+		// for any of these conditions limit what the teacher will see
+		$limit_screens = array(
+			'edit-lesson',
+			'edit-course',
+			'edit-question',
+			'course_page_course-order',
+			'lesson_page_lesson-order',
+		);
 
-        if(  in_array($screen->id  , $limit_screens ) ) {
+		if(  in_array($screen->id  , $limit_screens ) ) {
 
-            // set the query author to the current user to only show those those posts
-            $wp_query->set( 'author', $current_user->ID );
-        }
+			// set the query author to the current user to only show those those posts
+			$wp_query->set( 'author', $current_user->ID );
+		}
 
-        return $wp_query;
+		return $wp_query;
 
-    } // end limit_teacher_edit_screen_post_types()
+	} // end limit_teacher_edit_screen_post_types()
 
 
-    /**
-     * Sensei_Teacher::teacher_login_redirect
-     *
-     * Redirect teachers to /wp-admin/ after login
-     *
-     * @since 1.8.7
-     * @access public
-     * @param string $user_login
-     * @param object $user
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::teacher_login_redirect
+	 *
+	 * Redirect teachers to /wp-admin/ after login
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @param string $user_login
+	 * @param object $user
+	 * @return void
+	 */
 
-    public function teacher_login_redirect( $user_login, $user  ) {
+	public function teacher_login_redirect( $user_login, $user  ) {
 
-        if (user_can($user, 'edit_courses')) {
+		if (user_can($user, 'edit_courses')) {
 
-            if (isset($_POST['redirect_to'])) {
+			if (isset($_POST['redirect_to'])) {
 
-                wp_redirect($_POST['redirect_to'], 303);
+				wp_redirect($_POST['redirect_to'], 303);
 
-                exit;
+				exit;
 
-            } else {
+			} else {
 
-                wp_redirect(admin_url(), 303);
+				wp_redirect(admin_url(), 303);
 
-                exit;
+				exit;
 
-            }
-        }
+			}
+		}
 
-    } // end teacher_login_redirect()
+	} // end teacher_login_redirect()
 
 
 
-    /**
-     * Sensei_Teacher::restrict_posts_menu_page()
-     *
-     * Remove the Posts menu page for teachers and restrict access to it.
-     * We have to do this because we give teachers the 'edit_posts' cap
-     * so they can 'moderate_comments' as well.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters void
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::restrict_posts_menu_page()
+	 *
+	 * Remove the Posts menu page for teachers and restrict access to it.
+	 * We have to do this because we give teachers the 'edit_posts' cap
+	 * so they can 'moderate_comments' as well.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters void
+	 * @return void
+	 */
 
-    public function restrict_posts_menu_page() {
+	public function restrict_posts_menu_page() {
 
-        global $pagenow, $typenow;
+		global $pagenow, $typenow;
 
-        $user = wp_get_current_user();
+		$user = wp_get_current_user();
 
-        /**
-         * Filter the option to hide the Posts menu page.
-         *
-         * @since 1.8.7
-         *
-         * @param bool $restrict default true
-         */
+		/**
+		 * Filter the option to hide the Posts menu page.
+		 *
+		 * @since 1.8.7
+		 *
+		 * @param bool $restrict default true
+		 */
 
-        $restrict = apply_filters('sensei_restrict_posts_menu_page', true );
+		$restrict = apply_filters('sensei_restrict_posts_menu_page', true );
 
-        if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
+		if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
 
-            remove_menu_page('edit.php');
+			remove_menu_page('edit.php');
 
-            if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
+			if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
 
-                if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
+				if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
 
-                    wp_die('You do not have sufficient permissions to access this page.');
+					wp_die('You do not have sufficient permissions to access this page.');
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    } // end restrict_posts_menu_page()
+	} // end restrict_posts_menu_page()
 
-    /**
-     * Sensei_Teacher::restrict_comment_moderation()
-     *
-     * Restrict commendation moderation for teachers
-     * so they can only moderate comments made to posts they own.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters obj $clauses
-     * @return WP_Comment_Query  $clauses
-     */
+	/**
+	 * Sensei_Teacher::restrict_comment_moderation()
+	 *
+	 * Restrict commendation moderation for teachers
+	 * so they can only moderate comments made to posts they own.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters obj $clauses
+	 * @return WP_Comment_Query  $clauses
+	 */
 
-    public function restrict_comment_moderation ( $clauses ) {
+	public function restrict_comment_moderation ( $clauses ) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
+		if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
 
-            $clauses->query_vars['post_author'] = get_current_user_id();
+			$clauses->query_vars['post_author'] = get_current_user_id();
 
-        }
+		}
 
-        return $clauses;
+		return $clauses;
 
-    }   // end restrict_comment_moderation()
+	}   // end restrict_comment_moderation()
 
-    /**
-     * Determine if a user is a teacher by ID
-     *
-     * @param int $user_id
-     *
-     * @return bool
-     */
-    public static function is_a_teacher( $user_id ){
+	/**
+	 * Determine if a user is a teacher by ID
+	 *
+	 * @param int $user_id
+	 *
+	 * @return bool
+	 */
+	public static function is_a_teacher( $user_id ){
 
-        $user = get_user_by('id', $user_id);
+		$user = get_user_by('id', $user_id);
 
-        if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
+		if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
 
-            return true;
+			return true;
 
-        }else{
+		}else{
 
-            return false;
+			return false;
 
-        }
+		}
 
-    }// end is_a_teacher
+	}// end is_a_teacher
 
-    /**
-     * The archive title on the teacher archive filter
-     *
-     * @since 1.9.0
-     */
-    public static function archive_title(){
+	/**
+	 * The archive title on the teacher archive filter
+	 *
+	 * @since 1.9.0
+	 */
+	public static function archive_title(){
 
-        $author = get_user_by( 'id', get_query_var( 'author' ) );
-        $author_name = $author->display_name;
-        ?>
+		$author = get_user_by( 'id', get_query_var( 'author' ) );
+		$author_name = $author->display_name;
+		?>
             <h2 class="teacher-archive-title">
 
                 <?php echo sprintf( __( 'All courses by %s', 'woothemes-sensei') , $author_name ); ?>
@@ -1557,17 +1557,17 @@ 
             </h2>
         <?php
 
-    }// archive title
+	}// archive title
 
-    /**
-     * Removing course meta on the teacher archive page
-     *
-     * @since 1.9.0
-     */
-    public static function remove_course_meta_on_teacher_archive(){
+	/**
+	 * Removing course meta on the teacher archive page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function remove_course_meta_on_teacher_archive(){
 
-        remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
+		remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
 
-    }
+	}
 
 } // End Class

includes/class-sensei-frontend.php

Indentation +310 added lines, -310 removed lines

@@ -69,10 +69,10 @@ 
 		// Only show course & lesson excerpts in search results
 		add_filter( 'the_content', array( $this, 'sensei_search_results_excerpt' ) );
 
-        //Use WooCommerce filter to show admin bar to Teachers.
-        add_action( 'init', array( $this, 'sensei_show_admin_bar') );
+		//Use WooCommerce filter to show admin bar to Teachers.
+		add_action( 'init', array( $this, 'sensei_show_admin_bar') );
 
-        // Remove course from active courses if an order is cancelled or refunded
+		// Remove course from active courses if an order is cancelled or refunded
 		add_action( 'woocommerce_order_status_processing_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
 		add_action( 'woocommerce_order_status_completed_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
 		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
@@ -133,13 +133,13 @@ 
 			wp_enqueue_script( Sensei()->token . '-user-dashboard' );
 
 
-            // Course Archive javascript
-            if( is_post_type_archive( 'course' ) ){
+			// Course Archive javascript
+			if( is_post_type_archive( 'course' ) ){
 
-                wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true );
-                wp_enqueue_script( 'sensei-course-archive-js' );
+				wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true );
+				wp_enqueue_script( 'sensei-course-archive-js' );
 
-            }
+			}
 
 
 			// Allow additional scripts to be loaded
@@ -180,7 +180,7 @@ 
 	/**
 	 * sensei_get_template_part function.
 	 *
-     * @deprecated sine 1.9.0
+	 * @deprecated sine 1.9.0
 	 * @access public
 	 * @param mixed $slug
 	 * @param string $name (default: '')
@@ -188,15 +188,15 @@ 
 	 */
 	function sensei_get_template_part( $slug, $name = '' ) {
 
-        _deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' );
-        Sensei_Templates::get_part( $slug, $name );
+		_deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' );
+		Sensei_Templates::get_part( $slug, $name );
 
 	} // End sensei_get_template_part()
 
 	/**
 	 * sensei_get_template function.
 	 *
-     * @deprecated since 1.9.0
+	 * @deprecated since 1.9.0
 	 * @access public
 	 * @param mixed $template_name
 	 * @param array $args (default: array())
@@ -206,8 +206,8 @@ 
 	 */
 	function sensei_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 
-        _deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' );
-        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path  );
+		_deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' );
+		Sensei_Templates::get_template($template_name, $args, $template_path, $default_path  );
 
 	} // End sensei_get_template()
 
@@ -223,33 +223,33 @@ 
 	 */
 	function sensei_locate_template( $template_name, $template_path = '', $default_path = '' ) {
 
-        _deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' );
-        Sensei_Templates::locate_template( $template_name, $template_path, $default_path );
+		_deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' );
+		Sensei_Templates::locate_template( $template_name, $template_path, $default_path );
 
 	} // End sensei_locate_template()
 
 
 	/**
 	 * sensei_output_content_wrapper function.
-     *
+	 *
 	 * @access public
 	 * @return void
 	 */
 	function sensei_output_content_wrapper() {
 
-	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-start.php',
-            'wrappers/wrapper-start.php'
-        );
+		// backwards compatibility check for old location under the wrappers directory of the active theme
+		$backwards_compatible_wrapper_location =   array(
+			Sensei()->template_url . 'wrappers/wrapper-start.php',
+			'wrappers/wrapper-start.php'
+		);
 
-        $template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $template ) ){
+		$template = locate_template( $backwards_compatible_wrapper_location );
+		if( !empty( $template ) ){
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
-            return;
+			Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
+			return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'globals/wrapper-start.php' );
 
@@ -258,25 +258,25 @@ 
 
 	/**
 	 * sensei_output_content_wrapper_end function.
-     *
+	 *
 	 * @access public
 	 * @return void
 	 */
 	function sensei_output_content_wrapper_end() {
 
-	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-end.php',
-            'wrappers/wrapper-end.php'
-        );
+		// backwards compatibility check for old location under the wrappers directory of the active theme
+		$backwards_compatible_wrapper_location =   array(
+			Sensei()->template_url . 'wrappers/wrapper-end.php',
+			'wrappers/wrapper-end.php'
+		);
 
-        $backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $backwards_compatible_template ) ){
+		$backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location );
+		if( !empty( $backwards_compatible_template ) ){
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
-            return;
+			Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
+			return;
 
-        }
+		}
 
 
 		Sensei_Templates::get_template( 'globals/wrapper-end.php' );
@@ -292,55 +292,55 @@ 
 	 */
 	public static function load_content_pagination() {
 
-        if( is_singular('course') ) {
+		if( is_singular('course') ) {
 
-            // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) );
-            if( !empty( $template ) ){
+			// backwards compatibility check for old location under the wrappers directory of the active theme
+			$template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) );
+			if( !empty( $template ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination-posts.php' );
 
 		} elseif( is_singular('lesson') ) {
 
-		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) );
-            if( !empty( $template ) ){
+			// backwards compatibility check for old location under the wrappers directory of the active theme
+			$template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) );
+			if( !empty( $template ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination-lesson.php' );
 
 		} elseif( is_singular('quiz') ) {
 
-		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) );
-            if( !empty( $template ) ){
+			// backwards compatibility check for old location under the wrappers directory of the active theme
+			$template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) );
+			if( !empty( $template ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination-quiz.php' );
 
 		} else {
 
-            // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) );
-            if( !empty( $template ) ){
+			// backwards compatibility check for old location under the wrappers directory of the active theme
+			$template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) );
+			if( !empty( $template ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination.php' );
 
@@ -397,13 +397,13 @@ 
 
 				case '#senseimymessages':
 					$item->url = $my_messages_url;
-                    // if no archive link exist for sensei_message
-                    // set it back to the place holder
-                    if( ! $item->url ){
+					// if no archive link exist for sensei_message
+					// set it back to the place holder
+					if( ! $item->url ){
 
-                        $item->url = '#senseimymessages';
+						$item->url = '#senseimymessages';
 
-                    }
+					}
 					break;
 
 				case '#senseilearnerprofile':
@@ -469,7 +469,7 @@ 
 
 			// Remove the My Messages link for logged out users or if Private Messages are disabled
 			if( ! get_post_type_archive_link( 'sensei_message' )
-                && '#senseimymessages' == $item->url ) {
+				&& '#senseimymessages' == $item->url ) {
 
 				if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) {
 
@@ -492,42 +492,42 @@ 
 
 	// add category nicenames in body and post class
 	function sensei_search_results_classes($classes) {
-	    global $post;
-	    // Handle Search Classes for Courses, Lessons, and WC Products
-	    if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) {
-	    	$classes[] = 'post';
+		global $post;
+		// Handle Search Classes for Courses, Lessons, and WC Products
+		if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) {
+			$classes[] = 'post';
 		} // End If Statement
-	    return $classes;
+		return $classes;
 	} // End sensei_search_results_classes()
 
-    /**
-     * sensei_single_title output for single page title
-     * @since  1.1.0
-     * @return void
-     * @deprecated
-     */
-    function the_single_title() {
+	/**
+	 * sensei_single_title output for single page title
+	 * @since  1.1.0
+	 * @return void
+	 * @deprecated
+	 */
+	function the_single_title() {
 
-        _deprecated_function(' WooThemes_Sensei_Frontend::the_single_title', '1.9.0');
+		_deprecated_function(' WooThemes_Sensei_Frontend::the_single_title', '1.9.0');
 
-    } // End sensei_single_title()
+	} // End sensei_single_title()
 
 	/**
 	 * sensei_course_image output for course image Please use Sensei()->course->course_image instead.
-     *
-     * @deprecated since 1.9.0
-     * @param $course_id
-     * @param string $width
-     * @param string $height
-     * @param bool|false $return
-     * @return string|void
+	 *
+	 * @deprecated since 1.9.0
+	 * @param $course_id
+	 * @param string $width
+	 * @param string $height
+	 * @param bool|false $return
+	 * @return string|void
 	 */
 	function sensei_course_image( $course_id, $width = '100', $height = '100', $return = false ) {
 
-    	if ( ! $return ) {
+		if ( ! $return ) {
 
 			echo Sensei()->course->course_image( $course_id, $width, $height );
-            return '';
+			return '';
 
 		} // End If Statement
 
@@ -538,31 +538,31 @@ 
 	/**
 	 * sensei_lesson_image output for lesson image
 	 * @since  1.2.0
-     * @deprecated since 1.9.0
-     * @param $lesson_id
-     * @param string $width
-     * @param string $height
-     * @param bool|false $return
-     * @param bool|false $widget
-     * @return string
+	 * @deprecated since 1.9.0
+	 * @param $lesson_id
+	 * @param string $width
+	 * @param string $height
+	 * @param bool|false $return
+	 * @param bool|false $widget
+	 * @return string
 	 */
 	function sensei_lesson_image( $lesson_id, $width = '100', $height = '100', $return = false, $widget = false ) {
 
-        if( ! $return ){
+		if( ! $return ){
 
-            echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
-            return '';
-        }
+			echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+			return '';
+		}
 
-        return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+		return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
 
 	} // End sensei_lesson_image()
 
-    /**
-     * @since 1.0.0
-     * @param WP_Query $query
-     */
-    function sensei_course_archive_pagination( $query ) {
+	/**
+	 * @since 1.0.0
+	 * @param WP_Query $query
+	 */
+	function sensei_course_archive_pagination( $query ) {
 
 		if( ! is_admin() && $query->is_main_query() && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'newcourses', 'featuredcourses', 'freecourses', 'paidcourses' ) ) ) {
 
@@ -585,50 +585,50 @@ 
 	 *
 	 * @access public
 	 * @since  1.2.0
-     * @deprecated since 1.9.0 use WooThemes_Sensei_Course::archive_header
+	 * @deprecated since 1.9.0 use WooThemes_Sensei_Course::archive_header
 	 * @return void
 	 */
 	function sensei_course_archive_header(  ) {
 
-        trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header ');
-        WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' );
+		trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header ');
+		WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' );
 
 	} // sensei_course_archive_header()
 
 	/**
 	 * sensei_lesson_archive_header function.
 	 *
-     * @deprecated since 1.9.0
+	 * @deprecated since 1.9.0
 	 * @access public
 	 * @since  1.2.1
 	 * @return void
 	 */
 	public function sensei_lesson_archive_header( ) {
-        _deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' );
-        Sensei()->lesson->the_archive_header();
+		_deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' );
+		Sensei()->lesson->the_archive_header();
 	} // sensei_course_archive_header()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_message_archive_header( ){
-        _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
-        Sensei_Messages::the_archive_header();
+		_deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
+		Sensei_Messages::the_archive_header();
 	} // sensei_message_archive_header()
 
 	/**
 	 * sensei_course_archive_course_title output for course archive page individual course title
 	 * @since  1.2.0
-     * @param WP_Post $post_item
+	 * @param WP_Post $post_item
 	 * @return void
 	 */
 	function sensei_course_archive_course_title( $post_item ) {
 		if ( isset( $post_item->ID ) && ( 0 < $post_item->ID ) ) {
 			$post_id = absint( $post_item->ID );
-    		$post_title = $post_item->post_title;
+			$post_title = $post_item->post_title;
 		} else {
 			$post_id = get_the_ID();
-    		$post_title = get_the_title();
+			$post_title = get_the_title();
 		} // End If Statement
 		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_course_archive_course_title()
@@ -640,7 +640,7 @@ 
 	 */
 	public function sensei_lesson_archive_lesson_title() {
 		$post_id = get_the_ID();
-    	$post_title = get_the_title();
+		$post_title = get_the_title();
 		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_lesson_archive_lesson_title()
 
@@ -657,9 +657,9 @@ 
 
 		if( empty( $id )  ){
 
-            $id = get_the_ID();
+			$id = get_the_ID();
 
-        }
+		}
 
 		$sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' );
 		$separator = apply_filters( 'sensei_breadcrumb_separator', '&gt;' );
@@ -672,31 +672,31 @@ 
 				return;
 			}
 			$html .= '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Back to the course', 'woothemes-sensei' ) . '">' . get_the_title( $course_id ) . '</a>';
-    	} // End If Statement
-    	// Quiz
+		} // End If Statement
+		// Quiz
 		if ( is_singular( 'quiz' ) && 0 < intval( $id ) ) {
 			$lesson_id = intval( get_post_meta( $id, '_quiz_lesson', true ) );
 			if( ! $lesson_id ) {
 				return;
 			}
 			 $html .= '<a href="' . esc_url( get_permalink( $lesson_id ) ) . '" title="' .  __( 'Back to the lesson', 'woothemes-sensei' ) . '">' . get_the_title( $lesson_id ) . '</a>';
-    	} // End If Statement
+		} // End If Statement
 
-    	// Allow other plugins to filter html
-    	$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
-    	$html .= '</section>';
+		// Allow other plugins to filter html
+		$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
+		$html .= '</section>';
 
-    	echo $html;
+		echo $html;
 	} // End sensei_breadcrumb()
 
 
-    /**
-     * @deprecated since 1.9.0 use WooThemes_Sensei_Lesson::course_signup_link instead
-     */
+	/**
+	 * @deprecated since 1.9.0 use WooThemes_Sensei_Lesson::course_signup_link instead
+	 */
 	public function sensei_lesson_course_signup_link( ) {
 
-        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' );
-        WooThemes_Sensei_Lesson::course_signup_link();
+		_deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' );
+		WooThemes_Sensei_Lesson::course_signup_link();
 	}
 
 	public function lesson_tags_display( $lesson_id = 0 ) {
@@ -715,27 +715,27 @@ 
 					?><section class="lesson-tags">
 		    			<?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?>
 		    		</section><?php
-		    	}
-	    	}
+				}
+			}
 		}
 	}
 
-    /**
-     * @param WP_Query $query
-     */
+	/**
+	 * @param WP_Query $query
+	 */
 	public function lesson_tag_archive_filter( $query ) {
-    	if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
-    		// Limit to lessons only
-    		$query->set( 'post_type', 'lesson' );
+		if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
+			// Limit to lessons only
+			$query->set( 'post_type', 'lesson' );
 
-    		// Set order of lessons
-    		$query->set( 'orderby', 'menu_order' );
-    		$query->set( 'order', 'ASC' );
+			// Set order of lessons
+			$query->set( 'orderby', 'menu_order' );
+			$query->set( 'order', 'ASC' );
 
-    	}
-    }
+		}
+	}
 
-    public function lesson_tag_archive_header( $title ) {
+	public function lesson_tag_archive_header( $title ) {
 		if( is_tax( 'lesson-tag' ) ) {
 			$title = sprintf( __( 'Lesson tag: %1$s', 'woothemes-sensei' ), apply_filters( 'sensei_lesson_tag_archive_title', get_queried_object()->name ) );
 		}
@@ -757,13 +757,13 @@ 
 			$sanitized_submit = esc_html( $_POST['quiz_action'] );
 
 			switch ($sanitized_submit) {
-                case 'lesson-complete':
+				case 'lesson-complete':
 
 					Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true );
 
 					break;
 
-                case 'lesson-reset':
+				case 'lesson-reset':
 
 					Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID );
 
@@ -875,13 +875,13 @@ 
 		if ( 0 < intval( $post_id ) ) {
 			$lesson_video_embed = get_post_meta( $post_id, '_lesson_video_embed', true );
 			if ( 'http' == substr( $lesson_video_embed, 0, 4) ) {
-        		// V2 - make width and height a setting for video embed
-        		$lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ );
-        	} // End If Statement
-        	if ( '' != $lesson_video_embed ) {
-        	?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
-        	} // End If Statement
-        } // End If Statement
+				// V2 - make width and height a setting for video embed
+				$lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ );
+			} // End If Statement
+			if ( '' != $lesson_video_embed ) {
+			?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_lesson_video()
 
 	public function sensei_complete_lesson_button() {
@@ -894,8 +894,8 @@ 
 		$pass_required = true;
 		if( $quiz_id ) {
 			// Get quiz pass setting
-	    	$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-	    }
+			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+		}
 		if( ! $quiz_id || ( $quiz_id && ! $pass_required ) ) {
 			?>
 			<form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
@@ -948,12 +948,12 @@ 
 		} // End If Statement
 	} // End sensei_reset_lesson_button()
 
-    /**
-     * @deprecated since 1.9.0
-     */
-    public function sensei_lesson_quiz_meta( ) {
+	/**
+	 * @deprecated since 1.9.0
+	 */
+	public function sensei_lesson_quiz_meta( ) {
 
-        Sensei_Lesson::footer_quiz_call_to_action();
+		Sensei_Lesson::footer_quiz_call_to_action();
 
 	} // End sensei_lesson_quiz_meta()
 
@@ -979,38 +979,38 @@ 
         	</p>
         	<p class="course-excerpt"><?php the_excerpt(); ?></p>
         	<?php if ( 0 < $free_lesson_count ) {
-                $free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?>
+				$free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?>
                 <p class="sensei-free-lessons"><a href="<?php echo get_permalink( $post_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?></a> - <?php echo $free_lessons; ?></p>
             <?php } ?>
 		</section><?php
 	} // End sensei_course_archive_meta()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_single_main_content() {
-	    _deprecated_function('Woothemes_Sensei_Frontend::sensei_single_main_content', '1.9.0');
+		_deprecated_function('Woothemes_Sensei_Frontend::sensei_single_main_content', '1.9.0');
 	} // End sensei_single_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_lesson_archive_main_content() {
-        _deprecated_function('Sensei_Frontend::sensei_lesson_archive_main_content', '1.9.0', 'Please include loop-lesson.php directly');
+		_deprecated_function('Sensei_Frontend::sensei_lesson_archive_main_content', '1.9.0', 'Please include loop-lesson.php directly');
 	} // End sensei_lesson_archive_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_message_archive_main_content() {
 		_deprecated_function( 'Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed' );
 	} // End sensei_lesson_archive_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_no_permissions_main_content() {
-        _deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' );
+		_deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' );
 	} // End sensei_no_permissions_main_content()
 
 	public function sensei_course_category_main_content() {
@@ -1058,7 +1058,7 @@ 
 				<div class="col-1">
 					<?php
 					// output the actual form markup
-                    Sensei_Templates::get_template( 'user/login-form.php');
+					Sensei_Templates::get_template( 'user/login-form.php');
 					?>
 				</div>
 
@@ -1139,12 +1139,12 @@ 
 
 		//if this is a paid course
 		if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	$preview_text = __( ' (Free Preview)', 'woothemes-sensei' );
-    	    } // End If Statement
-    	}
-    	return $preview_text;
+			$wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+			if ( 0 < $wc_post_id ) {
+				$preview_text = __( ' (Free Preview)', 'woothemes-sensei' );
+			} // End If Statement
+		}
+		return $preview_text;
 	}
 
 	public function sensei_lesson_preview_title( $title = '', $id = 0 ) {
@@ -1176,8 +1176,8 @@ 
 		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
 		// Handle user starting the course
 		if ( isset( $_POST['course_start'] )
-		    && wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' )
-		    && !$is_user_taking_course ) {
+			&& wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' )
+			&& !$is_user_taking_course ) {
 
 			// Start the course
 			$activity_logged = Sensei_Utils::user_start_course( $current_user->ID, $post->ID );
@@ -1196,35 +1196,35 @@ 
 		} // End If Statement
 	} // End sensei_course_start()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_course_meta() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' );
-        Sensei()->course->the_course_meta( get_post() );
+		_deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' );
+		Sensei()->course->the_course_meta( get_post() );
 	} // End sensei_course_meta()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_course_meta_video() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' );
-        Sensei_Course::the_course_video();
+		_deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' );
+		Sensei_Course::the_course_video();
 	} // End sensei_course_meta_video()
 
-    /**
-     * This function shows the WooCommerce cart notice if the user has
-     * added the current course to cart. It does not show if the user is already taking
-     * the course.
-     *
-     * @since 1.0.2
-     * @return void;
-     */
-    public function sensei_woocommerce_in_cart_message() {
+	/**
+	 * This function shows the WooCommerce cart notice if the user has
+	 * added the current course to cart. It does not show if the user is already taking
+	 * the course.
+	 *
+	 * @since 1.0.2
+	 * @return void;
+	 */
+	public function sensei_woocommerce_in_cart_message() {
 		global $post, $woocommerce;
 
 		$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() );
+		$user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() );
 		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
 
 			if ( Sensei_WC::is_product_in_cart( $wc_post_id ) ) {
@@ -1272,7 +1272,7 @@ 
 				$item_id = $item['product_id'];
 			} 
 
-            if ( $item_id > 0 ) {
+			if ( $item_id > 0 ) {
 
 				$user_id = get_post_meta( $order_id, '_customer_user', true );
 
@@ -1352,15 +1352,15 @@ 
 
 					$items = $order->get_items();
 					foreach( $items as $item ) {
-                                            if (isset($item['variation_id']) && $item['variation_id'] > 0) {
-                                                $item_id = $item['variation_id'];
-                                                $product_type = 'variation';
-                                            } else {
-                                                $item_id = $item['product_id'];
-                                            }
+											if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+												$item_id = $item['variation_id'];
+												$product_type = 'variation';
+											} else {
+												$item_id = $item['product_id'];
+											}
 
-                                            $product_ids[] = $item_id;
-                                            }
+											$product_ids[] = $item_id;
+											}
 
 					$order_ids[] = $post_id;
 				}
@@ -1468,32 +1468,32 @@ 
 				$items = $order->get_items();
 				foreach( $items as $item ) {
 
-                    $product = wc_get_product( $item['product_id'] );
+					$product = wc_get_product( $item['product_id'] );
 
-                    // handle product bundles
-                    if( is_object( $product ) &&  $product->is_type('bundle') ){
+					// handle product bundles
+					if( is_object( $product ) &&  $product->is_type('bundle') ){
 
-                        $bundled_product = new WC_Product_Bundle( $product->id );
-                        $bundled_items = $bundled_product->get_bundled_items();
+						$bundled_product = new WC_Product_Bundle( $product->id );
+						$bundled_items = $bundled_product->get_bundled_items();
 
-                        foreach( $bundled_items as $bundled_item ){
+						foreach( $bundled_items as $bundled_item ){
 
-                            if( $bundled_item->product_id == $course_product_id ) {
-                                Sensei_Utils::user_start_course( $user_id, $course_id );
-                                return;
-                            }
+							if( $bundled_item->product_id == $course_product_id ) {
+								Sensei_Utils::user_start_course( $user_id, $course_id );
+								return;
+							}
 
-                        }
+						}
 
-                    } else {
+					} else {
 
-                    // handle regular products
-                        if( $item['product_id'] == $course_product_id ) {
-                            Sensei_Utils::user_start_course( $user_id, $course_id );
-                            return;
-                        }
+					// handle regular products
+						if( $item['product_id'] == $course_product_id ) {
+							Sensei_Utils::user_start_course( $user_id, $course_id );
+							return;
+						}
 
-                    }
+					}
 				}
 			}
 
@@ -1524,21 +1524,21 @@ 
 
 		//if not posted from the sensei login form let
 		// WordPress or any other party handle the failed request
-	    if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form']  ){
+		if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form']  ){
 
-	    	return ;
+			return ;
 
-	    }
+		}
 
-    	// Get the reffering page, where did the post submission come from?
-    	$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
+		// Get the reffering page, where did the post submission come from?
+		$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
 
    		 // if there's a valid referrer, and it's not the default log-in screen
-	    if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){
-	        // let's append some information (login=failed) to the URL for the theme to use
-	        wp_redirect( esc_url_raw( add_query_arg('login', 'failed',  $referrer) ) );
-	    	exit;
-    	}
+		if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){
+			// let's append some information (login=failed) to the URL for the theme to use
+			wp_redirect( esc_url_raw( add_query_arg('login', 'failed',  $referrer) ) );
+			exit;
+		}
 	}// End sensei_login_fail_redirect_to_front_end_login
 
 	/**
@@ -1549,46 +1549,46 @@ 
 	function sensei_handle_login_request( ) {
 
 		// Check that it is a sensei login request and if it has a valid nonce
-	    if(  isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) {
+		if(  isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) {
 
-	    	// Validate the login request nonce
-		    if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
-		    	return;
-		    }
+			// Validate the login request nonce
+			if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
+				return;
+			}
 
-		    //get the page where the sensei log form is located
-		    $referrer = $_REQUEST['_wp_http_referer'];
-		    //$redirect = $_REQUEST['_sensei_redirect'];
+			//get the page where the sensei log form is located
+			$referrer = $_REQUEST['_wp_http_referer'];
+			//$redirect = $_REQUEST['_sensei_redirect'];
 
-		    if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) )
-		    	 && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){
+			if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) )
+				 && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){
 
-		    	// when the user has entered a password or username do the sensei login
-		    	$creds = array();
+				// when the user has entered a password or username do the sensei login
+				$creds = array();
 
-		    	// check if the requests login is an email address
-		    	if( is_email(  trim( $_REQUEST['log'] ) )  ){
-		    		// query wordpress for the users details
-		    		$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
+				// check if the requests login is an email address
+				if( is_email(  trim( $_REQUEST['log'] ) )  ){
+					// query wordpress for the users details
+					$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
 
-		    		// validate the user object
-		    		if( !$user ){
+					// validate the user object
+					if( !$user ){
 
-		    			// the email doesnt exist
-                        wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
-		        		exit;
+						// the email doesnt exist
+						wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+						exit;
 
-		    		}
+					}
 
-		    		//assigne the username to the creds array for further processing
-		    		$creds['user_login'] =  $user->user_login ;
+					//assigne the username to the creds array for further processing
+					$creds['user_login'] =  $user->user_login ;
 
-		    	}else{
+				}else{
 
-		    		// process this as a default username login
-		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
+					// process this as a default username login
+					$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
 
-		    	}
+				}
 
 				// get setup the rest of the creds array
 				$creds['user_password'] = sanitize_text_field( $_REQUEST['pwd'] );
@@ -1598,42 +1598,42 @@ 
 				$user = wp_signon( $creds, false );
 
 				if ( is_wp_error($user) ){ // on login failure
-                    wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
-                    exit;
+					wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+					exit;
 				}else{ // on login success
 
 					/**
-					* change the redirect url programatically
-					*
-					* @since 1.6.1
-					*
-					* @param string $referrer the page where the current url wheresensei login form was posted from
-					*/
+					 * change the redirect url programatically
+					 *
+					 * @since 1.6.1
+					 *
+					 * @param string $referrer the page where the current url wheresensei login form was posted from
+					 */
 
 					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg( 'login', $referrer ) );
 
 					wp_redirect( esc_url_raw( $success_redirect_url ) );
-		        	exit;
+					exit;
 
 				}	// end is_wp_error($user)
 
-		    }else{ // if username or password is empty
+			}else{ // if username or password is empty
 
-                wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
-		        exit;
+				wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
+				exit;
 
-		    } // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
+			} // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
 
-	    }elseif( ( isset( $_GET['login'] ) ) ) {
-	    	// else if this request is a redircect from a previously faile login request
-	    	$this->login_message_process();
+		}elseif( ( isset( $_GET['login'] ) ) ) {
+			// else if this request is a redircect from a previously faile login request
+			$this->login_message_process();
 
 			//exit the handle login request function
 			return;
-	    }
+		}
 
-	    // if none of the above
-	    return;
+		// if none of the above
+		return;
 
 	} // End  sensei_login_fail_redirect_to_front_end_login
 
@@ -1736,7 +1736,7 @@ 
 	 */
 	public function login_message_process(){
 
-            // setup the message variables
+			// setup the message variables
 			$message = '';
 
 			//only output message if the url contains login=failed and login=emptyfields
@@ -1755,22 +1755,22 @@ 
 	}// end login_message_process
 
 
-    /**
-     * sensei_show_admin_bar(). Use WooCommerce filter
-     * to show admin bar to Teachers as well.
-     *
-     * @return void redirect
-     *
-     */
-    public function sensei_show_admin_bar () {
+	/**
+	 * sensei_show_admin_bar(). Use WooCommerce filter
+	 * to show admin bar to Teachers as well.
+	 *
+	 * @return void redirect
+	 *
+	 */
+	public function sensei_show_admin_bar () {
 
-        if (current_user_can('edit_courses')) {
+		if (current_user_can('edit_courses')) {
 
-            add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1);
+			add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1);
 
-        }
+		}
 
-    }
+	}
 
 } // End Class
 

includes/class-sensei-posttypes.php

Indentation +245 added lines, -245 removed lines

@@ -16,25 +16,25 @@ 
 	public $slider_labels;
 	public $role_caps;
 
-    /**
-     * @var Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var Sensei_Quiz
-     */
-    public $quiz;
+	/**
+	 * @var Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var Sensei_Quiz
+	 */
+	public $quiz;
 
 	/**
 	 * Constructor
@@ -44,7 +44,7 @@ 
 
 		// Setup Post Types
 		$this->labels = array();
-        $this->token = 'woothemes-sensei-posttypes';
+		$this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
 		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
@@ -103,94 +103,94 @@ 
 	/**
 	 * Setup the "course" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_course_post_type () {
 
 		$args = array(
-		    'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
-		    'public'              => true,
-		    'publicly_queryable'  => true,
-		    'show_ui'             => true,
-		    'show_in_menu'        => true,
-		    'show_in_admin_bar'   => true,
-		    'query_var'           => true,
-		    'rewrite'             => array(
-                'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
-                'with_front' => true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap'        => true,
-		    'capability_type'     => 'course',
-            'has_archive'         => $this->get_course_post_type_archive_slug(),
-		    'hierarchical'        => false,
-		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+			'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
+			'public'              => true,
+			'publicly_queryable'  => true,
+			'show_ui'             => true,
+			'show_in_menu'        => true,
+			'show_in_admin_bar'   => true,
+			'query_var'           => true,
+			'rewrite'             => array(
+				'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
+				'with_front' => true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap'        => true,
+			'capability_type'     => 'course',
+			'has_archive'         => $this->get_course_post_type_archive_slug(),
+			'hierarchical'        => false,
+			'menu_position'       => 51,
+			'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Course post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Course post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
 
 	} // End setup_course_post_type()
 
-    /**
-     * Figure out of the course post type has an archive and what it should be.
-     *
-     * This function should return 'courses' or the page_uri for the course page setting.
-     *
-     * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
-     * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
-     * page slug will not be returned. For any other pages without it the page URI will be returned.
-     *
-     *
-     * @sine 1.9.0
-     *
-     *
-     * @return false|string
-     */
-    public function get_course_post_type_archive_slug(){
+	/**
+	 * Figure out of the course post type has an archive and what it should be.
+	 *
+	 * This function should return 'courses' or the page_uri for the course page setting.
+	 *
+	 * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
+	 * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
+	 * page slug will not be returned. For any other pages without it the page URI will be returned.
+	 *
+	 *
+	 * @sine 1.9.0
+	 *
+	 *
+	 * @return false|string
+	 */
+	public function get_course_post_type_archive_slug(){
 
-        $settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
+		$settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
 
-        // for a valid post that doesn't have any of the old short codes set the archive the same
-        // as the page URI
-        if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
+		// for a valid post that doesn't have any of the old short codes set the archive the same
+		// as the page URI
+		if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
 
-             return get_page_uri( $settings_course_page->ID );
+			 return get_page_uri( $settings_course_page->ID );
 
-        }else{
+		}else{
 
-            return 'courses';
+			return 'courses';
 
-        }
+		}
 
-    }// end course_post_type_determine_archive
+	}// end course_post_type_determine_archive
 
-    /**
-     * Check if given content has any of these old shortcodes:
-     * [newcourses][featuredcourses][freecourses][paidcourses]
-     *
-     * @since 1.9.0
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function has_old_shortcodes( $content ){
+	/**
+	 * Check if given content has any of these old shortcodes:
+	 * [newcourses][featuredcourses][freecourses][paidcourses]
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param string $content
+	 *
+	 * @return bool
+	 */
+	public function has_old_shortcodes( $content ){
 
-        return  ( has_shortcode( $content, 'newcourses')
-        || has_shortcode( $content, 'featuredcourses')
-        || has_shortcode( $content, 'freecourses')
-        || has_shortcode( $content, 'paidcourses') );
+		return  ( has_shortcode( $content, 'newcourses')
+		|| has_shortcode( $content, 'featuredcourses')
+		|| has_shortcode( $content, 'freecourses')
+		|| has_shortcode( $content, 'paidcourses') );
 
-    }// end has old shortcodes
+	}// end has old shortcodes
 
 
 	/**
@@ -211,32 +211,32 @@ 
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'query_var' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'lesson',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 52,
-		    'supports' => $supports_array
+			'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'query_var' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'lesson',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 52,
+			'supports' => $supports_array
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Lesson post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Lesson post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
 
 	} // End setup_lesson_post_type()
@@ -244,44 +244,44 @@ 
 	/**
 	 * Setup the "quiz" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_quiz_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(
-                $this->labels['quiz']['singular'],
-                $this->labels['quiz']['plural'],
-                $this->labels['quiz']['menu']
-            ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'quiz',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+			'labels' => $this->create_post_type_labels(
+				$this->labels['quiz']['singular'],
+				$this->labels['quiz']['plural'],
+				$this->labels['quiz']['menu']
+			),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'quiz',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 20, // Below "Pages"
+			'supports' => array( '' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Quiz post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Quiz post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
 
 	} // End setup_quiz_post_type()
@@ -295,34 +295,34 @@ 
 	public function setup_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+			'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Question post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Question post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
 
 	} // End setup_question_post_type()
@@ -335,26 +335,26 @@ 
 	public function setup_multiple_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => false,
-		    'show_ui' => false,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => false,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  false,
-                'feeds' => false,
-                'pages' => false
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+			'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => false,
+			'show_ui' => false,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => false,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  false,
+				'feeds' => false,
+				'pages' => false
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title', 'custom-fields' )
 		);
 
 		register_post_type( 'multiple_question', $args );
@@ -370,34 +370,34 @@ 
 		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
 
 			$args = array(
-			    'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
-			    'public' => true,
-			    'publicly_queryable' => true,
-			    'show_ui' => true,
-			    'show_in_menu' => 'admin.php?page=sensei',
-			    'show_in_nav_menus' => true,
-			    'query_var' => true,
-			    'exclude_from_search' => true,
-			    'rewrite' => array(
-                    'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                    'with_front' =>  false,
-                    'feeds' => false,
-                    'pages' => true
-                ),
-			    'map_meta_cap' => true,
-			    'capability_type' => 'question',
-			    'has_archive' => true,
-			    'hierarchical' => false,
-			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+				'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
+				'public' => true,
+				'publicly_queryable' => true,
+				'show_ui' => true,
+				'show_in_menu' => 'admin.php?page=sensei',
+				'show_in_nav_menus' => true,
+				'query_var' => true,
+				'exclude_from_search' => true,
+				'rewrite' => array(
+					'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+					'with_front' =>  false,
+					'feeds' => false,
+					'pages' => true
+				),
+				'map_meta_cap' => true,
+				'capability_type' => 'question',
+				'has_archive' => true,
+				'hierarchical' => false,
+				'menu_position' => 50,
+				'supports' => array( 'title', 'editor', 'comments' ),
 			);
 
-            /**
-             * Filter the arguments passed in when registering the Sensei sensei_message post type.
-             *
-             * @since 1.9.0
-             * @param array $args
-             */
+			/**
+			 * Filter the arguments passed in when registering the Sensei sensei_message post type.
+			 *
+			 * @since 1.9.0
+			 * @param array $args
+			 */
 			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
 		}
 	} // End setup_sensei_message_post_type()
@@ -430,11 +430,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_courses',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_courses',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_courses',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_courses',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_course_category_slug', _x( 'course-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -471,7 +471,7 @@ 
 			'show_ui' => true, /* TO DO - future releases */
 			'query_var' => true,
 			'show_in_nav_menus' => false,
-            'public' => false,
+			'public' => false,
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -544,11 +544,11 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_questions',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_questions',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_questions',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_questions',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_category_slug', _x( 'question-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -582,11 +582,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_lessons',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_lessons',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_lessons',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_lessons',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_lesson_tag_slug', _x( 'lesson-tag', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -620,19 +620,19 @@ 
 	 */
 	private function create_post_type_labels ( $singular, $plural, $menu ) {
 		$labels = array(
-		    'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
-		    'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
-		    'add_new' => __( 'Add New', 'woothemes-sensei' ),
-		    'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
-		    'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
-		    'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
-		    'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
-		    'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
-		    'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
-		    'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+			'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
+			'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
+			'add_new' => __( 'Add New', 'woothemes-sensei' ),
+			'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
+			'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
+			'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
+			'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
+			'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
+			'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
+			'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+			'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+			'parent_item_colon' => '',
+			'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
 		  );
 
 		return $labels;
@@ -705,7 +705,7 @@ 
 	 * Assigns the defaults for each user role capabilities.
 	 *
 	 * @since  1.1.0
-     *
+	 *
 	 * @param array $post_types
 	 * @return void
 	 */
@@ -773,7 +773,7 @@ 
 	 * Adds a 'Edit Quiz' link to the admin bar when viewing a Quiz linked to a corresponding Lesson
 	 * 
 	 * @since  1.7.0
-     * @param WP_Admin_Bar $bar
+	 * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
 	public function quiz_admin_bar_menu( $bar ) {

includes/admin/class-sensei-learner-management.php

Indentation +50 added lines, -50 removed lines

@@ -78,16 +78,16 @@ 
 
 		// Load Learners JS
 		wp_enqueue_script( 'sensei-learners-general',
-            Sensei()->plugin_url . 'assets/js/learners-general' . $suffix . '.js',
-                            array('jquery','sensei-core-select2','sensei-chosen-ajax' ), Sensei()->version, true );
+			Sensei()->plugin_url . 'assets/js/learners-general' . $suffix . '.js',
+							array('jquery','sensei-core-select2','sensei-chosen-ajax' ), Sensei()->version, true );
 
 		$data = array(
 			'remove_generic_confirm' => __( 'Are you sure you want to remove this user?', 'woothemes-sensei' ),
 			'remove_from_lesson_confirm' => __( 'Are you sure you want to remove the user from this lesson?', 'woothemes-sensei' ),
 			'remove_from_course_confirm' => __( 'Are you sure you want to remove the user from this course?', 'woothemes-sensei' ),
 			'remove_user_from_post_nonce' => wp_create_nonce( 'remove_user_from_post_nonce' ),
-            'search_users_nonce' => wp_create_nonce( 'search-users' ),
-            'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
+			'search_users_nonce' => wp_create_nonce( 'search-users' ),
+			'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
 		);
 
 		wp_localize_script( 'sensei-learners-general', 'woo_learners_general_data', $data );
@@ -186,7 +186,7 @@ 
 	/**
 	 * learners_headers outputs Learners general headers
 	 * @since  1.6.0
-     * @param array $args
+	 * @param array $args
 	 * @return void
 	 */
 	public function learners_headers( $args = array( 'nav' => 'default' ) ) {
@@ -252,38 +252,38 @@ 
 
 	public function remove_user_from_post() {
 
-        // Parse POST data
-        $data = sanitize_text_field( $_POST['data'] );
-        $action_data = array();
-        parse_str( $data, $action_data );
+		// Parse POST data
+		$data = sanitize_text_field( $_POST['data'] );
+		$action_data = array();
+		parse_str( $data, $action_data );
 
 		// Security checks
-        // ensure the current user may remove users from post
-        // only teacher or admin can remove users
+		// ensure the current user may remove users from post
+		// only teacher or admin can remove users
 
-        // check the nonce, valid post
+		// check the nonce, valid post
 		$nonce = '';
 		if ( isset($_POST['remove_user_from_post_nonce']) ) {
 			$nonce = esc_html( $_POST['remove_user_from_post_nonce'] );
 		}
-        $post =  get_post( intval( $action_data[ 'post_id' ] ) );
+		$post =  get_post( intval( $action_data[ 'post_id' ] ) );
 
-        // validate the user
-        $may_remove_user = false;
-        if( current_user_can('manage_sensei')
-            ||  $post->post_author == get_current_user_id() ){
+		// validate the user
+		$may_remove_user = false;
+		if( current_user_can('manage_sensei')
+			||  $post->post_author == get_current_user_id() ){
 
-            $may_remove_user = true;
+			$may_remove_user = true;
 
-        }
+		}
 
-        if( ! wp_verify_nonce( $nonce, 'remove_user_from_post_nonce' )
-            || ! is_a( $post ,'WP_Post' )
-            || ! $may_remove_user ){
+		if( ! wp_verify_nonce( $nonce, 'remove_user_from_post_nonce' )
+			|| ! is_a( $post ,'WP_Post' )
+			|| ! $may_remove_user ){
 
-            die('');
+			die('');
 
-        }
+		}
 
 		if( $action_data['user_id'] && $action_data['post_id'] && $action_data['post_type'] ) {
 
@@ -297,7 +297,7 @@ 
 
 				case 'course':
 
-                    $removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
+					$removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
 
 				break;
 
@@ -344,19 +344,19 @@ 
 
 		if ( $users ) {
 			foreach ( $users as $user ) {
-                $full_name = Sensei_Learner::get_full_name( $user->ID );
+				$full_name = Sensei_Learner::get_full_name( $user->ID );
 
-                if( trim($user->display_name ) == trim( $full_name ) ){
+				if( trim($user->display_name ) == trim( $full_name ) ){
 
-                    $name = $full_name;
+					$name = $full_name;
 
-                }else{
+				}else{
 
-                    $name = $full_name . ' ['. $user->display_name .']';
+					$name = $full_name . ' ['. $user->display_name .']';
 
-                }
+				}
 
-                $found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
+				$found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
 			}
 		}
 
@@ -400,7 +400,7 @@ 
 			break;
 
 			case 'lesson':
-                $lesson_id = absint( $_POST['add_lesson_id'] );
+				$lesson_id = absint( $_POST['add_lesson_id'] );
 				$complete = false;
 				if( isset( $_POST['add_complete_lesson'] ) && 'yes' == $_POST['add_complete_lesson'] ) {
 					$complete = true;
@@ -460,23 +460,23 @@ 
 		}
 	}
 
-    /**
-     * Return the full name and surname or the display name of the user.
-     *
-     * The user must have both name and surname otherwise display name will be returned.
-     *
-     * @deprecated since 1.9.0 use Se
-     * @since 1.8.0
-     *
-     * @param int $user_id | bool false for an invalid $user_id
-     *
-     * @return string $full_name
-     */
-    public function get_learner_full_name( $user_id ){
-
-        return Sensei_Learner::get_full_name( $user_id );
-
-    } // end get_learner_full_name
+	/**
+	 * Return the full name and surname or the display name of the user.
+	 *
+	 * The user must have both name and surname otherwise display name will be returned.
+	 *
+	 * @deprecated since 1.9.0 use Se
+	 * @since 1.8.0
+	 *
+	 * @param int $user_id | bool false for an invalid $user_id
+	 *
+	 * @return string $full_name
+	 */
+	public function get_learner_full_name( $user_id ){
+
+		return Sensei_Learner::get_full_name( $user_id );
+
+	} // end get_learner_full_name
 
 } // End Class
 

includes/class-sensei-modules.php

Indentation +1884 added lines, -1884 removed lines

@@ -14,265 +14,265 @@ 
  */
 class Sensei_Core_Modules
 {
-    private $dir;
-    private $file;
-    private $assets_dir;
-    private $assets_url;
-    private $order_page_slug;
-    public $taxonomy;
-
-    public function __construct( $file )
-    {
-        $this->file = $file;
-        $this->dir = dirname($this->file);
-        $this->assets_dir = trailingslashit($this->dir) . 'assets';
-        $this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
-        $this->taxonomy = 'module';
-        $this->order_page_slug = 'module-order';
-
-        // setup taxonomy
-        add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
-
-        // Manage lesson meta boxes for taxonomy
-        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
-
-        // Save lesson meta box
-        add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
-
-        //Reset the none modules lessons transient
-        add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
-
-        // Frontend styling
-        add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
-
-        // Admin styling
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
-
-        // Handle module completion record
-        add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
-        add_action('sensei_user_lesson_reset', array($this, 'save_lesson_module_progress'), 10, 2);
-        add_action('wp', array($this, 'save_module_progress'), 10);
-
-        // Handle module ordering
-        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
-        add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
-        add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
-
-        // Ensure modules always show under courses
-        add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
-
-        // Add course field to taxonomy
-        add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
-        add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
-        add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
-
-        // Manage module taxonomy archive page
-        add_filter('template_include', array($this, 'module_archive_template'), 10);
-        add_action('pre_get_posts', array($this, 'module_archive_filter'), 10, 1);
-        add_filter('sensei_lessons_archive_text', array($this, 'module_archive_title'));
-        add_action('sensei_content_lesson_inside_before', array($this, 'module_archive_description'), 11);
-        add_action('sensei_pagination', array($this, 'module_navigation_links'), 11);
-        add_filter('body_class', array($this, 'module_archive_body_class'));
-
-        // add modules to the single course template
-        add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
-
-        //Single Course modules actions. Add to single-course/course-modules.php
-        add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
-
-        // Set up display on single lesson page
-        add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
-
-        // Add 'Modules' columns to Analysis tables
-        add_filter('sensei_analysis_overview_columns', array($this, 'analysis_overview_column_title'), 10, 2);
-        add_filter('sensei_analysis_overview_column_data', array($this, 'analysis_overview_column_data'), 10, 3);
-        add_filter('sensei_analysis_course_columns', array($this, 'analysis_course_column_title'), 10, 2);
-        add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
-
-        // Manage module taxonomy columns
-        add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
-        add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
-        add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
-
-        //store new modules created on the course edit screen
-        add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
-
-        // for non admin users, only show taxonomies that belong to them
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
-        add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
-
-        // add the teacher name next to the module term in for admin users
-        add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
-
-        // remove the default modules  metabox
-        add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
-
-    } // end constructor
-
-    /**
-     * Alter a module term slug when a new taxonomy term is created
-     * This will add the creators user name to the slug for uniqueness.
-     *
-     * @since 1.8.0
-     *
-     * @param $term_id
-     * @param $tt_id
-     * @param $taxonomy
-     *
-     * @return void
-     * @deprecated since 1.9.0
-     */
-    public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
-
-        _deprecated_function('change_module_term_slug', '1.9.0' );
-
-    }// end add_module_term_group
-
-    /**
-     * Hook in all meta boxes related tot he modules taxonomy
-     *
-     * @since 1.8.0
-     *
-     * @param string $post_type
-     * @param WP_Post $post
-     *
-     * @return void
-     */
-    public function modules_metaboxes( $post_type, $post )
-    {
-        if ('lesson' == $post_type ) {
-
-            // Remove default taxonomy meta box from Lesson edit screen
-            remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
-
-            // Add custom meta box to limit module selection to one per lesson
-            add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
-        }
-
-        if( 'course' == $post_type ){
-            // Course modules selection metabox
-            add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
-        }
-    }
-
-    /**
-     * Build content for custom module meta box
-     *
-     * @since 1.8.0
-     * @param  object $post Current post object
-     * @return void
-     */
-    public function lesson_module_metabox($post)
-    {
-
-        // Get lesson course
-        $lesson_course = get_post_meta($post->ID, '_lesson_course', true);
-
-        $html = '';
-
-        // Only show module selection if this lesson is part of a course
-        if ($lesson_course && $lesson_course > 0) {
-
-            // Get existing lesson module
-            $lesson_module = 0;
-            $lesson_module_list = wp_get_post_terms($post->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = $single_module->term_id;
-                    break;
-                }
-            }
-
-            // Get the available modules for this lesson's course
-            $modules = $this->get_course_modules($lesson_course);
-
-            // Build the HTML to output
-            $html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
-            if (is_array($modules) && count($modules) > 0) {
-                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
-                $html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
-                foreach ($modules as $module) {
-                    $html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
-                }
-                $html .= '</select>' . "\n";
-            } else {
-                $course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
-                $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
-            } // End If Statement
-
-        } else {
-            $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
-        } // End If Statement
-
-        // Output the HTML
-        echo $html;
-    }
-
-    /**
-     * Save module to lesson
-     *
-     * @since 1.8.0
-     * @param  integer $post_id ID of post
-     * @return mixed            Post ID on permissions failure, boolean true on success
-     */
-    public function save_lesson_module($post_id)
-    {
-        global $post;
-
-        // Verify post type and nonce
-        if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
-            ||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
-            return $post_id;
-        }
-
-        // Check if user has permissions to edit lessons
-        $post_type = get_post_type_object($post->post_type);
-        if (!current_user_can($post_type->cap->edit_post, $post_id)) {
-            return $post_id;
-        }
-
-        // Check if user has permissions to edit this specific post
-        if (!current_user_can('edit_post', $post_id)) {
-            return $post_id;
-        }
-
-        // Cast module ID as an integer if selected, otherwise leave as empty string
-        if ( isset( $_POST['lesson_module'] ) ) {
-
-            if( empty ( $_POST['lesson_module'] ) ){
-                wp_delete_object_term_relationships($post_id, $this->taxonomy  );
-                return true;
-            }
-
-            $module_id = intval( $_POST['lesson_module'] );
-
-            // Assign lesson to selected module
-            wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
-
-            // Set default order for lesson inside module
-            if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
-                update_post_meta($post_id, '_order_module_' . $module_id, 0);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Display course field on new module screen
-     *
-     * @since 1.8.0
-     * @param object $taxonomy Taxonomy object
-     * @return void
-     */
-    public function add_module_fields($taxonomy)
-    {
-        ?>
+	private $dir;
+	private $file;
+	private $assets_dir;
+	private $assets_url;
+	private $order_page_slug;
+	public $taxonomy;
+
+	public function __construct( $file )
+	{
+		$this->file = $file;
+		$this->dir = dirname($this->file);
+		$this->assets_dir = trailingslashit($this->dir) . 'assets';
+		$this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
+		$this->taxonomy = 'module';
+		$this->order_page_slug = 'module-order';
+
+		// setup taxonomy
+		add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
+
+		// Manage lesson meta boxes for taxonomy
+		add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
+
+		// Save lesson meta box
+		add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
+
+		//Reset the none modules lessons transient
+		add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
+
+		// Frontend styling
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
+
+		// Admin styling
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
+
+		// Handle module completion record
+		add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
+		add_action('sensei_user_lesson_reset', array($this, 'save_lesson_module_progress'), 10, 2);
+		add_action('wp', array($this, 'save_module_progress'), 10);
+
+		// Handle module ordering
+		add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
+		add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
+		add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
+
+		// Ensure modules always show under courses
+		add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
+		add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
+		add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
+
+		// Add course field to taxonomy
+		add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
+		add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
+		add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+		add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+		add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
+
+		// Manage module taxonomy archive page
+		add_filter('template_include', array($this, 'module_archive_template'), 10);
+		add_action('pre_get_posts', array($this, 'module_archive_filter'), 10, 1);
+		add_filter('sensei_lessons_archive_text', array($this, 'module_archive_title'));
+		add_action('sensei_content_lesson_inside_before', array($this, 'module_archive_description'), 11);
+		add_action('sensei_pagination', array($this, 'module_navigation_links'), 11);
+		add_filter('body_class', array($this, 'module_archive_body_class'));
+
+		// add modules to the single course template
+		add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
+
+		//Single Course modules actions. Add to single-course/course-modules.php
+		add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
+
+		// Set up display on single lesson page
+		add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
+
+		// Add 'Modules' columns to Analysis tables
+		add_filter('sensei_analysis_overview_columns', array($this, 'analysis_overview_column_title'), 10, 2);
+		add_filter('sensei_analysis_overview_column_data', array($this, 'analysis_overview_column_data'), 10, 3);
+		add_filter('sensei_analysis_course_columns', array($this, 'analysis_course_column_title'), 10, 2);
+		add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
+
+		// Manage module taxonomy columns
+		add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
+		add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
+		add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
+
+		//store new modules created on the course edit screen
+		add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
+
+		// for non admin users, only show taxonomies that belong to them
+		add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
+
+		// add the teacher name next to the module term in for admin users
+		add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
+
+		// remove the default modules  metabox
+		add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
+
+	} // end constructor
+
+	/**
+	 * Alter a module term slug when a new taxonomy term is created
+	 * This will add the creators user name to the slug for uniqueness.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $term_id
+	 * @param $tt_id
+	 * @param $taxonomy
+	 *
+	 * @return void
+	 * @deprecated since 1.9.0
+	 */
+	public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
+
+		_deprecated_function('change_module_term_slug', '1.9.0' );
+
+	}// end add_module_term_group
+
+	/**
+	 * Hook in all meta boxes related tot he modules taxonomy
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $post_type
+	 * @param WP_Post $post
+	 *
+	 * @return void
+	 */
+	public function modules_metaboxes( $post_type, $post )
+	{
+		if ('lesson' == $post_type ) {
+
+			// Remove default taxonomy meta box from Lesson edit screen
+			remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
+
+			// Add custom meta box to limit module selection to one per lesson
+			add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
+		}
+
+		if( 'course' == $post_type ){
+			// Course modules selection metabox
+			add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
+		}
+	}
+
+	/**
+	 * Build content for custom module meta box
+	 *
+	 * @since 1.8.0
+	 * @param  object $post Current post object
+	 * @return void
+	 */
+	public function lesson_module_metabox($post)
+	{
+
+		// Get lesson course
+		$lesson_course = get_post_meta($post->ID, '_lesson_course', true);
+
+		$html = '';
+
+		// Only show module selection if this lesson is part of a course
+		if ($lesson_course && $lesson_course > 0) {
+
+			// Get existing lesson module
+			$lesson_module = 0;
+			$lesson_module_list = wp_get_post_terms($post->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = $single_module->term_id;
+					break;
+				}
+			}
+
+			// Get the available modules for this lesson's course
+			$modules = $this->get_course_modules($lesson_course);
+
+			// Build the HTML to output
+			$html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
+			if (is_array($modules) && count($modules) > 0) {
+				$html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
+				$html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+				foreach ($modules as $module) {
+					$html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
+				}
+				$html .= '</select>' . "\n";
+			} else {
+				$course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
+				$html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
+			} // End If Statement
+
+		} else {
+			$html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
+		} // End If Statement
+
+		// Output the HTML
+		echo $html;
+	}
+
+	/**
+	 * Save module to lesson
+	 *
+	 * @since 1.8.0
+	 * @param  integer $post_id ID of post
+	 * @return mixed            Post ID on permissions failure, boolean true on success
+	 */
+	public function save_lesson_module($post_id)
+	{
+		global $post;
+
+		// Verify post type and nonce
+		if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
+			||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
+			return $post_id;
+		}
+
+		// Check if user has permissions to edit lessons
+		$post_type = get_post_type_object($post->post_type);
+		if (!current_user_can($post_type->cap->edit_post, $post_id)) {
+			return $post_id;
+		}
+
+		// Check if user has permissions to edit this specific post
+		if (!current_user_can('edit_post', $post_id)) {
+			return $post_id;
+		}
+
+		// Cast module ID as an integer if selected, otherwise leave as empty string
+		if ( isset( $_POST['lesson_module'] ) ) {
+
+			if( empty ( $_POST['lesson_module'] ) ){
+				wp_delete_object_term_relationships($post_id, $this->taxonomy  );
+				return true;
+			}
+
+			$module_id = intval( $_POST['lesson_module'] );
+
+			// Assign lesson to selected module
+			wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
+
+			// Set default order for lesson inside module
+			if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
+				update_post_meta($post_id, '_order_module_' . $module_id, 0);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Display course field on new module screen
+	 *
+	 * @since 1.8.0
+	 * @param object $taxonomy Taxonomy object
+	 * @return void
+	 */
+	public function add_module_fields($taxonomy)
+	{
+		?>
         <div class="form-field">
             <label for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label>
             <input type="hidden" id="module_courses" name="module_courses" class="ajax_chosen_select_courses"
@@ -281,44 +281,44 @@ 
                 class="description"><?php _e('Search for and select the courses that this module will belong to.', 'woothemes-sensei'); ?></span>
         </div>
     <?php
-    }
-
-    /**
-     * Display course field on module edit screen
-     *
-     * @since 1.8.0
-     * @param  object $module Module term object
-     * @return void
-     */
-    public function edit_module_fields($module)
-    {
-
-        $module_id = $module->term_id;
-
-        // Get module's existing courses
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            )
-        );
-        $courses = get_posts($args);
-
-        //build the defaults array
-        $module_courses = array();
-        if (isset($courses) && is_array($courses)) {
-            foreach ($courses as $course) {
-                $module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
-            }
-        }
-
-        ?>
+	}
+
+	/**
+	 * Display course field on module edit screen
+	 *
+	 * @since 1.8.0
+	 * @param  object $module Module term object
+	 * @return void
+	 */
+	public function edit_module_fields($module)
+	{
+
+		$module_id = $module->term_id;
+
+		// Get module's existing courses
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			)
+		);
+		$courses = get_posts($args);
+
+		//build the defaults array
+		$module_courses = array();
+		if (isset($courses) && is_array($courses)) {
+			foreach ($courses as $course) {
+				$module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
+			}
+		}
+
+		?>
         <tr class="form-field">
             <th scope="row" valign="top"><label
                     for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label></th>
@@ -335,1401 +335,1401 @@ 
             </td>
         </tr>
     <?php
-    }
-
-    /**
-     * Save module course on add/edit
-     *
-     * @since 1.8.0
-     * @param  integer $module_id ID of module
-     * @return void
-     */
-    public function save_module_course($module_id)
-    {
-
-        // Get module's existing courses
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            )
-        );
-        $courses = get_posts($args);
-
-        // Remove module from existing courses
-        if (isset($courses) && is_array($courses)) {
-            foreach ($courses as $course) {
-                wp_remove_object_terms($course->ID, $module_id, $this->taxonomy);
-            }
-        }
-
-        // Add module to selected courses
-        if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
-
-            $course_ids = explode( ",", $_POST['module_courses'] );
-
-            foreach ( $course_ids as $course_id ) {
-
-                wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
-
-            }
-        }
-    }
-
-    /**
-     * Ajax function to search for courses matching term
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function search_courses_json()
-    {
-
-        // Security check
-        check_ajax_referer('search-courses', 'security');
-
-        // Set content type
-        header('Content-Type: application/json; charset=utf-8');
-
-        // Get user input
-        $term = urldecode(stripslashes($_GET['term']));
-
-        // Return nothing if term is empty
-        if (empty($term))
-            die();
-
-        // Set a default if none is given
-        $default = isset($_GET['default']) ? $_GET['default'] : __('No course', 'woothemes-sensei');
-
-        // Set up array of results
-        $found_courses = array('' => $default);
-
-        // Fetch results
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'orderby' => 'title',
-            's' => $term
-        );
-        $courses = get_posts($args);
-
-        // Add results to array
-        if ($courses) {
-            foreach ($courses as $course) {
-                $found_courses[$course->ID] = $course->post_title;
-            }
-        }
-
-        // Encode and return results for processing & selection
-        echo json_encode($found_courses);
-        die();
-    }
-
-    /**
-     * display modules on single course pages
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function single_course_modules(){
-
-        _deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
-        // only show modules on the course that has modules
-        if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
-
-            $this->load_course_module_content_template();
-
-        }
-
-    } // end single_course_modules
-
-    public function sensei_course_preview_titles($title, $lesson_id)
-    {
-        global $post, $current_user;
-
-        $course_id = $post->ID;
-        $title_text = '';
-
-        if (method_exists('Sensei_Utils', 'is_preview_lesson') && Sensei_Utils::is_preview_lesson($lesson_id)) {
-            $is_user_taking_course = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
-            if (!$is_user_taking_course) {
-                if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
-                    $title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
-                    // Remove brackets for display here
-                    $title_text = str_replace('(', '', $title_text);
-                    $title_text = str_replace(')', '', $title_text);
-                    $title_text = '<span class="preview-label">' . $title_text . '</span>';
-                }
-                $title .= ' ' . $title_text;
-            }
-        }
-
-        return $title;
-    }
-
-    public function module_breadcrumb_link($html, $separator)
-    {
-        global $post;
-        // Lesson
-        if (is_singular('lesson')) {
-            if (has_term('', $this->taxonomy, $post->ID)) {
-                $module = $this->get_lesson_module($post->ID);
-                if( $module ) {
-                    $html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
-                }
-            }
-        }
-        // Module
-        if (is_tax($this->taxonomy)) {
-            if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-                $course_id = intval($_GET['course_id']);
-                $html .= '<a href="' . esc_url(get_permalink($course_id)) . '" title="' .  __('Back to the course', 'woothemes-sensei') . '">' . get_the_title($course_id) . '</a>';
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Set lesson archive template to display on module taxonomy archive page
-     *
-     * @since 1.8.0
-     * @param  string $template Default template
-     * @return string           Modified template
-     */
-    public function module_archive_template($template) {
-
-        if ( ! is_tax($this->taxonomy) ) {
-            return $template;
-        }
-
-        $file = 'archive-lesson.php';
-        $find = array( $file, Sensei()->template_url . $file );
-
-        // locate the template file
-        $template = locate_template($find);
-        if (!$template) {
-
-            $template = Sensei()->plugin_path() . 'templates/' . $file;
-
-        }
-
-
-        return $template;
-    }
-
-    /**
-     * Modify module taxonomy archive query
-     *
-     * @since 1.8.0
-     * @param  object $query The query object passed by reference
-     * @return void
-     */
-    public function module_archive_filter($query)
-    {
-        if (is_tax($this->taxonomy) && $query->is_main_query()) {
-
-
-            // Limit to lessons only
-            $query->set('post_type', 'lesson');
-
-            // Set order of lessons
-            if (version_compare(Sensei()->version, '1.6.0', '>=')) {
-                $module_id = $query->queried_object_id;
-                $query->set('meta_key', '_order_module_' . $module_id);
-                $query->set('orderby', 'meta_value_num date');
-            } else {
-                $query->set('orderby', 'menu_order');
-            }
-            $query->set('order', 'ASC');
-
-            // Limit to specific course if specified
-            if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-                $course_id = intval($_GET['course_id']);
-                $meta_query[] = array(
-                    'key' => '_lesson_course',
-                    'value' => intval($course_id)
-                );
-                $query->set('meta_query', $meta_query);
-            }
-
-        }
-    }
-
-    /**
-     * Modify archive page title
-     *
-     * @since 1.8.0
-     * @param  string $title Default title
-     * @return string        Modified title
-     */
-    public function module_archive_title($title)
-    {
-        if (is_tax($this->taxonomy)) {
-            $title = apply_filters('sensei_module_archive_title', get_queried_object()->name);
-        }
-        return $title;
-    }
-
-    /**
-     * Display module description on taxonomy archive page
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function module_archive_description()
-    {
-        if (is_tax($this->taxonomy)) {
-
-            $module = get_queried_object();
-
-            $module_progress = false;
-            if (is_user_logged_in() && isset($_GET['course_id']) && intval($_GET['course_id']) > 0) {
-                global $current_user;
-                wp_get_current_user();
-                $module_progress = $this->get_user_module_progress($module->term_id, $_GET['course_id'], $current_user->ID);
-            }
-
-            if ($module_progress && $module_progress > 0) {
-                $status = __('Completed', 'woothemes-sensei');
-                $class = 'completed';
-                if ($module_progress < 100) {
-                    $status = __('In progress', 'woothemes-sensei');
-                    $class = 'in-progress';
-                }
-                echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
-            }
-
-            echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
-        }
-    }
-
-    public function module_archive_body_class($classes)
-    {
-        if (is_tax($this->taxonomy)) {
-            $classes[] = 'module-archive';
-        }
-        return $classes;
-    }
-
-    /**
-     * Display module navigation links on module taxonomy archive page
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function module_navigation_links()
-    {
-        if (is_tax($this->taxonomy) && isset($_GET['course_id'])) {
-
-            $queried_module = get_queried_object();
-            $course_modules = $this->get_course_modules($_GET['course_id']);
-
-            $prev_module = false;
-            $next_module = false;
-            $on_current = false;
-            foreach ($course_modules as $module) {
-                $this_module = $module;
-                if ($on_current) {
-                    $next_module = $this_module;
-                    break;
-                }
-                if ($this_module == $queried_module) {
-                    $on_current = true;
-                } else {
-                    $prev_module = $module;
-                }
-            }
-
-            ?>
+	}
+
+	/**
+	 * Save module course on add/edit
+	 *
+	 * @since 1.8.0
+	 * @param  integer $module_id ID of module
+	 * @return void
+	 */
+	public function save_module_course($module_id)
+	{
+
+		// Get module's existing courses
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			)
+		);
+		$courses = get_posts($args);
+
+		// Remove module from existing courses
+		if (isset($courses) && is_array($courses)) {
+			foreach ($courses as $course) {
+				wp_remove_object_terms($course->ID, $module_id, $this->taxonomy);
+			}
+		}
+
+		// Add module to selected courses
+		if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
+
+			$course_ids = explode( ",", $_POST['module_courses'] );
+
+			foreach ( $course_ids as $course_id ) {
+
+				wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
+
+			}
+		}
+	}
+
+	/**
+	 * Ajax function to search for courses matching term
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function search_courses_json()
+	{
+
+		// Security check
+		check_ajax_referer('search-courses', 'security');
+
+		// Set content type
+		header('Content-Type: application/json; charset=utf-8');
+
+		// Get user input
+		$term = urldecode(stripslashes($_GET['term']));
+
+		// Return nothing if term is empty
+		if (empty($term))
+			die();
+
+		// Set a default if none is given
+		$default = isset($_GET['default']) ? $_GET['default'] : __('No course', 'woothemes-sensei');
+
+		// Set up array of results
+		$found_courses = array('' => $default);
+
+		// Fetch results
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'orderby' => 'title',
+			's' => $term
+		);
+		$courses = get_posts($args);
+
+		// Add results to array
+		if ($courses) {
+			foreach ($courses as $course) {
+				$found_courses[$course->ID] = $course->post_title;
+			}
+		}
+
+		// Encode and return results for processing & selection
+		echo json_encode($found_courses);
+		die();
+	}
+
+	/**
+	 * display modules on single course pages
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function single_course_modules(){
+
+		_deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
+		// only show modules on the course that has modules
+		if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
+
+			$this->load_course_module_content_template();
+
+		}
+
+	} // end single_course_modules
+
+	public function sensei_course_preview_titles($title, $lesson_id)
+	{
+		global $post, $current_user;
+
+		$course_id = $post->ID;
+		$title_text = '';
+
+		if (method_exists('Sensei_Utils', 'is_preview_lesson') && Sensei_Utils::is_preview_lesson($lesson_id)) {
+			$is_user_taking_course = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
+			if (!$is_user_taking_course) {
+				if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
+					$title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
+					// Remove brackets for display here
+					$title_text = str_replace('(', '', $title_text);
+					$title_text = str_replace(')', '', $title_text);
+					$title_text = '<span class="preview-label">' . $title_text . '</span>';
+				}
+				$title .= ' ' . $title_text;
+			}
+		}
+
+		return $title;
+	}
+
+	public function module_breadcrumb_link($html, $separator)
+	{
+		global $post;
+		// Lesson
+		if (is_singular('lesson')) {
+			if (has_term('', $this->taxonomy, $post->ID)) {
+				$module = $this->get_lesson_module($post->ID);
+				if( $module ) {
+					$html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
+				}
+			}
+		}
+		// Module
+		if (is_tax($this->taxonomy)) {
+			if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
+				$html .= '<a href="' . esc_url(get_permalink($course_id)) . '" title="' .  __('Back to the course', 'woothemes-sensei') . '">' . get_the_title($course_id) . '</a>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Set lesson archive template to display on module taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @param  string $template Default template
+	 * @return string           Modified template
+	 */
+	public function module_archive_template($template) {
+
+		if ( ! is_tax($this->taxonomy) ) {
+			return $template;
+		}
+
+		$file = 'archive-lesson.php';
+		$find = array( $file, Sensei()->template_url . $file );
+
+		// locate the template file
+		$template = locate_template($find);
+		if (!$template) {
+
+			$template = Sensei()->plugin_path() . 'templates/' . $file;
+
+		}
+
+
+		return $template;
+	}
+
+	/**
+	 * Modify module taxonomy archive query
+	 *
+	 * @since 1.8.0
+	 * @param  object $query The query object passed by reference
+	 * @return void
+	 */
+	public function module_archive_filter($query)
+	{
+		if (is_tax($this->taxonomy) && $query->is_main_query()) {
+
+
+			// Limit to lessons only
+			$query->set('post_type', 'lesson');
+
+			// Set order of lessons
+			if (version_compare(Sensei()->version, '1.6.0', '>=')) {
+				$module_id = $query->queried_object_id;
+				$query->set('meta_key', '_order_module_' . $module_id);
+				$query->set('orderby', 'meta_value_num date');
+			} else {
+				$query->set('orderby', 'menu_order');
+			}
+			$query->set('order', 'ASC');
+
+			// Limit to specific course if specified
+			if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
+				$meta_query[] = array(
+					'key' => '_lesson_course',
+					'value' => intval($course_id)
+				);
+				$query->set('meta_query', $meta_query);
+			}
+
+		}
+	}
+
+	/**
+	 * Modify archive page title
+	 *
+	 * @since 1.8.0
+	 * @param  string $title Default title
+	 * @return string        Modified title
+	 */
+	public function module_archive_title($title)
+	{
+		if (is_tax($this->taxonomy)) {
+			$title = apply_filters('sensei_module_archive_title', get_queried_object()->name);
+		}
+		return $title;
+	}
+
+	/**
+	 * Display module description on taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function module_archive_description()
+	{
+		if (is_tax($this->taxonomy)) {
+
+			$module = get_queried_object();
+
+			$module_progress = false;
+			if (is_user_logged_in() && isset($_GET['course_id']) && intval($_GET['course_id']) > 0) {
+				global $current_user;
+				wp_get_current_user();
+				$module_progress = $this->get_user_module_progress($module->term_id, $_GET['course_id'], $current_user->ID);
+			}
+
+			if ($module_progress && $module_progress > 0) {
+				$status = __('Completed', 'woothemes-sensei');
+				$class = 'completed';
+				if ($module_progress < 100) {
+					$status = __('In progress', 'woothemes-sensei');
+					$class = 'in-progress';
+				}
+				echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
+			}
+
+			echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
+		}
+	}
+
+	public function module_archive_body_class($classes)
+	{
+		if (is_tax($this->taxonomy)) {
+			$classes[] = 'module-archive';
+		}
+		return $classes;
+	}
+
+	/**
+	 * Display module navigation links on module taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function module_navigation_links()
+	{
+		if (is_tax($this->taxonomy) && isset($_GET['course_id'])) {
+
+			$queried_module = get_queried_object();
+			$course_modules = $this->get_course_modules($_GET['course_id']);
+
+			$prev_module = false;
+			$next_module = false;
+			$on_current = false;
+			foreach ($course_modules as $module) {
+				$this_module = $module;
+				if ($on_current) {
+					$next_module = $this_module;
+					break;
+				}
+				if ($this_module == $queried_module) {
+					$on_current = true;
+				} else {
+					$prev_module = $module;
+				}
+			}
+
+			?>
             <div id="post-entries" class="post-entries module-navigation fix">
                 <?php if ($next_module) {
-                    $module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($next_module, $this->taxonomy));
-                    ?>
+					$module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($next_module, $this->taxonomy));
+					?>
                     <div class="nav-next fr"><a href="<?php echo esc_url($module_link); ?>"
                                                 title="<?php esc_attr_e('Next module', 'woothemes-sensei'); ?>"><?php echo $next_module->name; ?>
                             <span class="meta-nav"></span></a></div>
                 <?php } ?>
                 <?php if ($prev_module) {
-                    $module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($prev_module, $this->taxonomy));
-                    ?>
+					$module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($prev_module, $this->taxonomy));
+					?>
                     <div class="nav-prev fl"><a href="<?php echo esc_url($module_link); ?>"
                                                 title="<?php _e('Previous module', 'woothemes-sensei'); ?>"><span
                                 class="meta-nav"></span> <?php echo $prev_module->name; ?></a></div>
                 <?php } ?>
             </div>
         <?php
-        }
-    }
-
-    /**
-     * Trigger save_lesson_module_progress() when a lesson status is updated for a specific user
-     *
-     * @since 1.8.0
-     * @param  string $status Status of the lesson for the user
-     * @param  integer $user_id ID of user
-     * @param  integer $lesson_id ID of lesson
-     * @return void
-     */
-    public function update_lesson_status_module_progress($status = '', $user_id = 0, $lesson_id = 0)
-    {
-        $this->save_lesson_module_progress($user_id, $lesson_id);
-    }
-
-    /**
-     * Save lesson's module progress for a specific user
-     *
-     * @since 1.8.0
-     * @param  integer $user_id ID of user
-     * @param  integer $lesson_id ID of lesson
-     * @return void
-     */
-    public function save_lesson_module_progress($user_id = 0, $lesson_id = 0)
-    {
-        $module = $this->get_lesson_module($lesson_id);
-        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
-        if ($module && $course_id) {
-            $this->save_user_module_progress(intval($module->term_id), intval($course_id), intval($user_id));
-        }
-    }
-
-    /**
-     * Save progress of module for user
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function save_module_progress()
-    {
-        if (is_tax($this->taxonomy) && is_user_logged_in() && isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-            global $current_user;
-            wp_get_current_user();
-            $user_id = $current_user->ID;
-
-            $module = get_queried_object();
-
-            $this->save_user_module_progress(intval($module->term_id), intval($_GET['course_id']), intval($user_id));
-        }
-    }
-
-    /**
-     * Save module progess for user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @param  integer $user_id ID of user
-     * @return void
-     */
-    public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
-    {
-        $module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
-        update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
-
-        do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
-    }
-
-    /**
-     * Get module progress for a user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @param  integer $user_id ID of user
-     * @return mixed              Module progress percentage on success, false on failure
-     */
-    public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
-    {
-        $module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
-        if ($module_progress) {
-            return (float)$module_progress;
-        }
-        return false;
-    }
-
-    /**
-     * Calculate module progess for user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $user_id ID of user
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @return integer            Module progress percentage
-     */
-    public function calculate_user_module_progress($user_id = 0, $module_id = 0, $course_id = 0)
-    {
-
-        $args = array(
-            'post_type' => 'lesson',
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            ),
-            'meta_query' => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => $course_id
-                )
-            ),
-            'fields' => 'ids'
-        );
-        $lessons = get_posts($args);
-
-        if (is_wp_error($lessons) || 0 >= count($lessons)) return 0;
-
-        $completed = false;
-        $lesson_count = 0;
-        $completed_count = 0;
-        foreach ($lessons as $lesson_id) {
-            $completed = Sensei_Utils::user_completed_lesson($lesson_id, $user_id);
-            ++$lesson_count;
-            if ($completed) {
-                ++$completed_count;
-            }
-        }
-        $module_progress = ($completed_count / $lesson_count) * 100;
-
-        return (float)$module_progress;
-    }
-
-    /**
-     * Register admin screen for ordering modules
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function register_modules_admin_menu_items()
-    {
-        //add the modules link under the Course main menu
-        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
-
-        // Regsiter new admin page for module ordering
-        $hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
-
-    }
-
-    /**
-     * Display Module Order screen
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function module_order_screen()
-    {
-        ?>
+		}
+	}
+
+	/**
+	 * Trigger save_lesson_module_progress() when a lesson status is updated for a specific user
+	 *
+	 * @since 1.8.0
+	 * @param  string $status Status of the lesson for the user
+	 * @param  integer $user_id ID of user
+	 * @param  integer $lesson_id ID of lesson
+	 * @return void
+	 */
+	public function update_lesson_status_module_progress($status = '', $user_id = 0, $lesson_id = 0)
+	{
+		$this->save_lesson_module_progress($user_id, $lesson_id);
+	}
+
+	/**
+	 * Save lesson's module progress for a specific user
+	 *
+	 * @since 1.8.0
+	 * @param  integer $user_id ID of user
+	 * @param  integer $lesson_id ID of lesson
+	 * @return void
+	 */
+	public function save_lesson_module_progress($user_id = 0, $lesson_id = 0)
+	{
+		$module = $this->get_lesson_module($lesson_id);
+		$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+		if ($module && $course_id) {
+			$this->save_user_module_progress(intval($module->term_id), intval($course_id), intval($user_id));
+		}
+	}
+
+	/**
+	 * Save progress of module for user
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function save_module_progress()
+	{
+		if (is_tax($this->taxonomy) && is_user_logged_in() && isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+			global $current_user;
+			wp_get_current_user();
+			$user_id = $current_user->ID;
+
+			$module = get_queried_object();
+
+			$this->save_user_module_progress(intval($module->term_id), intval($_GET['course_id']), intval($user_id));
+		}
+	}
+
+	/**
+	 * Save module progess for user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @param  integer $user_id ID of user
+	 * @return void
+	 */
+	public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
+	{
+		$module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
+		update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
+
+		do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
+	}
+
+	/**
+	 * Get module progress for a user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @param  integer $user_id ID of user
+	 * @return mixed              Module progress percentage on success, false on failure
+	 */
+	public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
+	{
+		$module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
+		if ($module_progress) {
+			return (float)$module_progress;
+		}
+		return false;
+	}
+
+	/**
+	 * Calculate module progess for user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $user_id ID of user
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @return integer            Module progress percentage
+	 */
+	public function calculate_user_module_progress($user_id = 0, $module_id = 0, $course_id = 0)
+	{
+
+		$args = array(
+			'post_type' => 'lesson',
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			),
+			'meta_query' => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => $course_id
+				)
+			),
+			'fields' => 'ids'
+		);
+		$lessons = get_posts($args);
+
+		if (is_wp_error($lessons) || 0 >= count($lessons)) return 0;
+
+		$completed = false;
+		$lesson_count = 0;
+		$completed_count = 0;
+		foreach ($lessons as $lesson_id) {
+			$completed = Sensei_Utils::user_completed_lesson($lesson_id, $user_id);
+			++$lesson_count;
+			if ($completed) {
+				++$completed_count;
+			}
+		}
+		$module_progress = ($completed_count / $lesson_count) * 100;
+
+		return (float)$module_progress;
+	}
+
+	/**
+	 * Register admin screen for ordering modules
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function register_modules_admin_menu_items()
+	{
+		//add the modules link under the Course main menu
+		add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
+
+		// Regsiter new admin page for module ordering
+		$hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
+
+	}
+
+	/**
+	 * Display Module Order screen
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function module_order_screen()
+	{
+		?>
         <div id="<?php echo esc_attr($this->order_page_slug); ?>"
              class="wrap <?php echo esc_attr($this->order_page_slug); ?>">
         <h2><?php _e('Order Modules', 'woothemes-sensei'); ?></h2><?php
 
-        $html = '';
-
-        if (isset($_POST['module-order']) && 0 < strlen($_POST['module-order'])) {
-            $ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
-
-            if ($ordered) {
-                $html .= '<div class="updated fade">' . "\n";
-                $html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
-                $html .= '</div>' . "\n";
-            }
-        }
-
-        $courses = Sensei()->course->get_all_courses();
-
-        $html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
-        $html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
-        $html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
-        $html .= '<select id="module-order-course" name="course_id">' . "\n";
-        $html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
-
-        foreach ($courses as $course) {
-            if (has_term('', $this->taxonomy, $course->ID)) {
-                $course_id = '';
-                if (isset($_GET['course_id'])) {
-                    $course_id = intval($_GET['course_id']);
-                }
-                $html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
-            }
-        }
-
-        $html .= '</select>' . "\n";
-        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
-        $html .= '</form>' . "\n";
-
-        if (isset($_GET['course_id'])) {
-            $course_id = intval($_GET['course_id']);
-            if ($course_id > 0) {
-                $modules = $this->get_course_modules($course_id);
-                $modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
-                if ($modules) {
-
-                    $order = $this->get_course_module_order($course_id);
-
-                    $order_string='';
-                    if ($order) {
-                        $order_string = implode(',', $order);
-                    }
-
-                    $html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-                    $html .= '<ul class="sortable-module-list">' . "\n";
-                    $count = 0;
-                    foreach ($modules as $module) {
-                        $count++;
-                        $class = $this->taxonomy;
-                        if ($count == 1) {
-                            $class .= ' first';
-                        }
-                        if ($count == count($module)) {
-                            $class .= ' last';
-                        }
-                        if ($count % 2 != 0) {
-                            $class .= ' alternate';
-                        }
-                        $html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
-                    }
-                    $html .= '</ul>' . "\n";
-
-                    $html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
-                    $html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-                    $html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
-                    $html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
-                }
-            }
-        }
-
-        echo $html;
-
-        ?></div><?php
-    }
-
-    /**
-     * Add 'Module order' column to courses list table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Existing columns
-     * @return array           Modifed columns
-     */
-    public function course_columns($columns = array())
-    {
-        $columns['module_order'] = __('Module order', 'woothemes-sensei');
-        return $columns;
-    }
-
-    /**
-     * Load content in 'Module order' column
-     *
-     * @since 1.8.0
-     *
-     * @param  string $column Current column name
-     * @param  integer $course_id ID of course
-     * @return void
-     */
-    public function course_column_content($column = '', $course_id = 0)
-    {
-        if ($column == 'module_order') {
-            if (has_term('', $this->taxonomy, $course_id)) {
-                echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
-            }
-        }
-    }
-
-    /**
-     * Save module order for course
-     *
-     * @since 1.8.0
-     *
-     * @param  string $order_string Comma-separated string of module IDs
-     * @param  integer $course_id ID of course
-     * @return boolean                 True on success, false on failure
-     */
-    private function save_course_module_order($order_string = '', $course_id = 0)
-    {
-        if ($order_string && $course_id) {
-            $order = explode(',', $order_string);
-            update_post_meta(intval($course_id), '_module_order', $order);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get module order for course
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $course_id ID of course
-     * @return mixed              Module order on success, false if no module order has been saved
-     */
-    public function get_course_module_order($course_id = 0)
-    {
-        if ($course_id) {
-            $order = get_post_meta(intval($course_id), '_module_order', true);
-            return $order;
-        }
-        return false;
-    }
-
-    /**
-     * Modify module taxonomy columns
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function taxonomy_column_headings($columns)
-    {
-
-        unset($columns['posts']);
-
-        $columns['lessons'] = __('Lessons', 'woothemes-sensei');
-
-        return $columns;
-    }
-
-    /**
-     * Manage content in custom module taxonomy columns
-     *
-     * @since 1.8.0
-     *
-     * @param  string $column_data Default data for column
-     * @param  string $column_name Name of current column
-     * @param  integer $term_id ID of current term
-     * @return string               Modified column data
-     */
-    public function taxonomy_column_content($column_data, $column_name, $term_id)
-    {
-
-        $args = array(
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => intval($term_id)
-                )
-            )
-        );
-
-        $module = get_term($term_id, $this->taxonomy);
-
-        switch ($column_name) {
-
-            case 'lessons':
-                $args['post_type'] = 'lesson';
-                $lessons = get_posts($args);
-                $total_lessons = count($lessons);
-                $column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
-                break;
-        }
-
-        return $column_data;
-    }
-
-    /**
-     * Add 'Module' columns to Analysis Lesson Overview table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function analysis_overview_column_title($columns)
-    {
-
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $new_columns = array();
-            if (is_array($columns) && 0 < count($columns)) {
-                foreach ($columns as $column => $title) {
-                    $new_columns[$column] = $title;
-                    if ($column == 'title') {
-                        $new_columns['lesson_module'] = __('Module', 'woothemes-sensei');
-                    }
-                }
-            }
-
-            if (0 < count($new_columns)) {
-                return $new_columns;
-            }
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Data for 'Module' column Analysis Lesson Overview table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Table column data
-     * @param  WP_Post $lesson
-     * @return array              Updated column data
-     */
-    public function analysis_overview_column_data($columns, $lesson )
-    {
-
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $lesson_module = '';
-            $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
-                    break;
-                }
-            }
-
-            $columns['lesson_module'] = $lesson_module;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Add 'Module' columns to Analysis Course table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function analysis_course_column_title($columns)
-    {
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $columns['lesson_module'] = __('Module', 'woothemes-sensei');
-        }
-        return $columns;
-    }
-
-    /**
-     * Data for 'Module' column in Analysis Course table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Table column data
-     * @param  WP_Post $lesson
-     * @return array              Updated columns data
-     */
-    public function analysis_course_column_data($columns, $lesson )
-    {
-
-        if ( isset( $_GET['course_id'] ) ) {
-            $lesson_module = '';
-            $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
-                    break;
-                }
-            }
-
-            $columns['lesson_module'] = $lesson_module;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Get module for lesson
-     *
-     * This function also checks if the module still
-     * exists on the course before returning it. Although
-     * the lesson has a module the same module must exist on the
-     * course for it to be valid.
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $lesson_id ID of lesson
-     * @return object             Module taxonomy term object
-     */
-    public function get_lesson_module($lesson_id = 0)
-    {
-        $lesson_id = intval($lesson_id);
-        if ( ! ( intval( $lesson_id > 0) ) ) {
-            return false;
-        }
-
-        // get taxonomy terms on this lesson
-        $modules = wp_get_post_terms($lesson_id, $this->taxonomy);
-
-        //check if error returned
-        if(    empty( $modules )
-            || is_wp_error( $modules )
-            || isset( $modules['errors'] ) ){
-
-            return false;
-
-        }
-
-       // get the last item in the array there should be only be 1 really.
-       // this method works for all php versions.
-       foreach( $modules as $module ){
-           break;
-       }
-
-        if ( ! isset($module) || ! is_object($module) || is_wp_error($module)) {
-            return false;
-        }
-
-        $module->url = get_term_link($module, $this->taxonomy);
-        $course_id = intval(get_post_meta(intval($lesson_id), '_lesson_course', true));
-        if (isset($course_id) && 0 < $course_id) {
-
-            // the course should contain the same module taxonomy term for this to be valid
-            if( ! has_term( $module, $this->taxonomy, $course_id)){
-                return false;
-            }
-
-            $module->url = esc_url(add_query_arg('course_id', intval($course_id), $module->url));
-        }
-        return $module;
-
-    }
-
-    /**
-     * Get ordered array of all modules in course
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $course_id ID of course
-     * @return array              Ordered array of module taxonomy term objects
-     */
-    public function get_course_modules($course_id = 0)
-    {
-        $course_id = intval($course_id);
-        if (0 < $course_id) {
-
-            // Get modules for course
-            $modules = wp_get_post_terms($course_id, $this->taxonomy);
-
-            // Get custom module order for course
-            $order = $this->get_course_module_order($course_id);
-
-            // Sort by custom order if custom order exists
-            if ($order) {
-                $ordered_modules = array();
-                $unordered_modules = array();
-                foreach ($modules as $module) {
-                    $order_key = array_search($module->term_id, $order);
-                    if ($order_key !== false) {
-                        $ordered_modules[$order_key] = $module;
-                    } else {
-                        $unordered_modules[] = $module;
-                    }
-                }
-
-                // Order modules correctly
-                ksort($ordered_modules);
-
-                // Append modules that have not yet been ordered
-                if (count($unordered_modules) > 0) {
-                    $ordered_modules = array_merge($ordered_modules, $unordered_modules);
-                }
-
-            } else {
-
-                $ordered_modules = $modules;
-
-            }
-
-            return $ordered_modules;
-
-        }
-
-        return false;
-    }
-
-    /**
-     * Load frontend CSS
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function enqueue_styles() {
-
-        wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-frontend');
-
-    }
-
-    /**
-     * Load admin Javascript
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function admin_enqueue_scripts( $hook ) {
-
-        /**
-         * Filter the page hooks where modules admin script can be loaded on.
-         *
-         * @param array $white_listed_pages
-         */
-        $script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
-            'edit-tags.php',
-            'course_page_module-order',
-            'post-new.php',
-            'post.php'
-        ) );
-
-        if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
-            return;
-        }
-
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-        wp_enqueue_script( 'sensei-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
-        wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version , true );
-        wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'sensei-core-select2' ), Sensei()->version, true );
-
-        // localized module data
-        $localize_modulesAdmin = array(
-            'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
-            'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
-        );
-
-        wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
-    }
-
-    /**
-     * Load admin CSS
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function admin_enqueue_styles() {
-
-        wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-sortable');
-
-    }
-
-    /**
-     * Show the title modules on the single course template.
-     *
-     * Function is hooked into sensei_single_course_modules_before.
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function course_modules_title( ) {
-
-       if( sensei_module_has_lessons() ){
-
-            echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
-
-        }
-
-    }
-
-    /**
-     * Display the single course modules content this will only show
-     * if the course has modules.
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function load_course_module_content_template(){
-
-        // load backwards compatible template name if it exists in the users theme
-        $located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
-        if( $located_template ){
-
-            Sensei_Templates::get_template( 'single-course/course-modules.php' );
-            return;
-
-        }
-
-        Sensei_Templates::get_template( 'single-course/modules.php' );
-
-    } // end course_module_content
-
-    /**
-     * Returns all lessons for the given module ID
-     *
-     * @since 1.8.0
-     *
-     * @param $course_id
-     * @param $term_id
-     * @return array $lessons
-     */
-    public function get_lessons( $course_id , $term_id ){
-
-        $lesson_query = $this->get_lessons_query( $course_id, $term_id );
-
-        if( isset( $lesson_query->posts ) ){
+		$html = '';
+
+		if (isset($_POST['module-order']) && 0 < strlen($_POST['module-order'])) {
+			$ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
+
+			if ($ordered) {
+				$html .= '<div class="updated fade">' . "\n";
+				$html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
+				$html .= '</div>' . "\n";
+			}
+		}
+
+		$courses = Sensei()->course->get_all_courses();
+
+		$html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
+		$html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
+		$html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
+		$html .= '<select id="module-order-course" name="course_id">' . "\n";
+		$html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
+
+		foreach ($courses as $course) {
+			if (has_term('', $this->taxonomy, $course->ID)) {
+				$course_id = '';
+				if (isset($_GET['course_id'])) {
+					$course_id = intval($_GET['course_id']);
+				}
+				$html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
+			}
+		}
+
+		$html .= '</select>' . "\n";
+		$html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
+		$html .= '</form>' . "\n";
+
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
+			if ($course_id > 0) {
+				$modules = $this->get_course_modules($course_id);
+				$modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
+				if ($modules) {
+
+					$order = $this->get_course_module_order($course_id);
+
+					$order_string='';
+					if ($order) {
+						$order_string = implode(',', $order);
+					}
+
+					$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
+					$html .= '<ul class="sortable-module-list">' . "\n";
+					$count = 0;
+					foreach ($modules as $module) {
+						$count++;
+						$class = $this->taxonomy;
+						if ($count == 1) {
+							$class .= ' first';
+						}
+						if ($count == count($module)) {
+							$class .= ' last';
+						}
+						if ($count % 2 != 0) {
+							$class .= ' alternate';
+						}
+						$html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
+					}
+					$html .= '</ul>' . "\n";
+
+					$html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
+					$html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
+					$html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
+					$html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
+				}
+			}
+		}
+
+		echo $html;
+
+		?></div><?php
+	}
+
+	/**
+	 * Add 'Module order' column to courses list table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Existing columns
+	 * @return array           Modifed columns
+	 */
+	public function course_columns($columns = array())
+	{
+		$columns['module_order'] = __('Module order', 'woothemes-sensei');
+		return $columns;
+	}
+
+	/**
+	 * Load content in 'Module order' column
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $column Current column name
+	 * @param  integer $course_id ID of course
+	 * @return void
+	 */
+	public function course_column_content($column = '', $course_id = 0)
+	{
+		if ($column == 'module_order') {
+			if (has_term('', $this->taxonomy, $course_id)) {
+				echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
+			}
+		}
+	}
+
+	/**
+	 * Save module order for course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $order_string Comma-separated string of module IDs
+	 * @param  integer $course_id ID of course
+	 * @return boolean                 True on success, false on failure
+	 */
+	private function save_course_module_order($order_string = '', $course_id = 0)
+	{
+		if ($order_string && $course_id) {
+			$order = explode(',', $order_string);
+			update_post_meta(intval($course_id), '_module_order', $order);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get module order for course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $course_id ID of course
+	 * @return mixed              Module order on success, false if no module order has been saved
+	 */
+	public function get_course_module_order($course_id = 0)
+	{
+		if ($course_id) {
+			$order = get_post_meta(intval($course_id), '_module_order', true);
+			return $order;
+		}
+		return false;
+	}
+
+	/**
+	 * Modify module taxonomy columns
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function taxonomy_column_headings($columns)
+	{
+
+		unset($columns['posts']);
+
+		$columns['lessons'] = __('Lessons', 'woothemes-sensei');
+
+		return $columns;
+	}
+
+	/**
+	 * Manage content in custom module taxonomy columns
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $column_data Default data for column
+	 * @param  string $column_name Name of current column
+	 * @param  integer $term_id ID of current term
+	 * @return string               Modified column data
+	 */
+	public function taxonomy_column_content($column_data, $column_name, $term_id)
+	{
+
+		$args = array(
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => intval($term_id)
+				)
+			)
+		);
+
+		$module = get_term($term_id, $this->taxonomy);
+
+		switch ($column_name) {
+
+			case 'lessons':
+				$args['post_type'] = 'lesson';
+				$lessons = get_posts($args);
+				$total_lessons = count($lessons);
+				$column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
+				break;
+		}
+
+		return $column_data;
+	}
+
+	/**
+	 * Add 'Module' columns to Analysis Lesson Overview table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function analysis_overview_column_title($columns)
+	{
+
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$new_columns = array();
+			if (is_array($columns) && 0 < count($columns)) {
+				foreach ($columns as $column => $title) {
+					$new_columns[$column] = $title;
+					if ($column == 'title') {
+						$new_columns['lesson_module'] = __('Module', 'woothemes-sensei');
+					}
+				}
+			}
+
+			if (0 < count($new_columns)) {
+				return $new_columns;
+			}
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Data for 'Module' column Analysis Lesson Overview table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Table column data
+	 * @param  WP_Post $lesson
+	 * @return array              Updated column data
+	 */
+	public function analysis_overview_column_data($columns, $lesson )
+	{
+
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$lesson_module = '';
+			$lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+					break;
+				}
+			}
+
+			$columns['lesson_module'] = $lesson_module;
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Add 'Module' columns to Analysis Course table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function analysis_course_column_title($columns)
+	{
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$columns['lesson_module'] = __('Module', 'woothemes-sensei');
+		}
+		return $columns;
+	}
+
+	/**
+	 * Data for 'Module' column in Analysis Course table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Table column data
+	 * @param  WP_Post $lesson
+	 * @return array              Updated columns data
+	 */
+	public function analysis_course_column_data($columns, $lesson )
+	{
+
+		if ( isset( $_GET['course_id'] ) ) {
+			$lesson_module = '';
+			$lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+					break;
+				}
+			}
+
+			$columns['lesson_module'] = $lesson_module;
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Get module for lesson
+	 *
+	 * This function also checks if the module still
+	 * exists on the course before returning it. Although
+	 * the lesson has a module the same module must exist on the
+	 * course for it to be valid.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $lesson_id ID of lesson
+	 * @return object             Module taxonomy term object
+	 */
+	public function get_lesson_module($lesson_id = 0)
+	{
+		$lesson_id = intval($lesson_id);
+		if ( ! ( intval( $lesson_id > 0) ) ) {
+			return false;
+		}
+
+		// get taxonomy terms on this lesson
+		$modules = wp_get_post_terms($lesson_id, $this->taxonomy);
+
+		//check if error returned
+		if(    empty( $modules )
+			|| is_wp_error( $modules )
+			|| isset( $modules['errors'] ) ){
+
+			return false;
+
+		}
+
+	   // get the last item in the array there should be only be 1 really.
+	   // this method works for all php versions.
+	   foreach( $modules as $module ){
+		   break;
+	   }
+
+		if ( ! isset($module) || ! is_object($module) || is_wp_error($module)) {
+			return false;
+		}
+
+		$module->url = get_term_link($module, $this->taxonomy);
+		$course_id = intval(get_post_meta(intval($lesson_id), '_lesson_course', true));
+		if (isset($course_id) && 0 < $course_id) {
+
+			// the course should contain the same module taxonomy term for this to be valid
+			if( ! has_term( $module, $this->taxonomy, $course_id)){
+				return false;
+			}
+
+			$module->url = esc_url(add_query_arg('course_id', intval($course_id), $module->url));
+		}
+		return $module;
+
+	}
+
+	/**
+	 * Get ordered array of all modules in course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $course_id ID of course
+	 * @return array              Ordered array of module taxonomy term objects
+	 */
+	public function get_course_modules($course_id = 0)
+	{
+		$course_id = intval($course_id);
+		if (0 < $course_id) {
+
+			// Get modules for course
+			$modules = wp_get_post_terms($course_id, $this->taxonomy);
+
+			// Get custom module order for course
+			$order = $this->get_course_module_order($course_id);
+
+			// Sort by custom order if custom order exists
+			if ($order) {
+				$ordered_modules = array();
+				$unordered_modules = array();
+				foreach ($modules as $module) {
+					$order_key = array_search($module->term_id, $order);
+					if ($order_key !== false) {
+						$ordered_modules[$order_key] = $module;
+					} else {
+						$unordered_modules[] = $module;
+					}
+				}
+
+				// Order modules correctly
+				ksort($ordered_modules);
+
+				// Append modules that have not yet been ordered
+				if (count($unordered_modules) > 0) {
+					$ordered_modules = array_merge($ordered_modules, $unordered_modules);
+				}
+
+			} else {
+
+				$ordered_modules = $modules;
+
+			}
+
+			return $ordered_modules;
+
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load frontend CSS
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function enqueue_styles() {
+
+		wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
+		wp_enqueue_style($this->taxonomy . '-frontend');
+
+	}
+
+	/**
+	 * Load admin Javascript
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function admin_enqueue_scripts( $hook ) {
+
+		/**
+		 * Filter the page hooks where modules admin script can be loaded on.
+		 *
+		 * @param array $white_listed_pages
+		 */
+		$script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
+			'edit-tags.php',
+			'course_page_module-order',
+			'post-new.php',
+			'post.php'
+		) );
+
+		if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
+			return;
+		}
+
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+
+		wp_enqueue_script( 'sensei-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
+		wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version , true );
+		wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'sensei-core-select2' ), Sensei()->version, true );
+
+		// localized module data
+		$localize_modulesAdmin = array(
+			'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
+			'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
+		);
+
+		wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
+	}
+
+	/**
+	 * Load admin CSS
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function admin_enqueue_styles() {
+
+		wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
+		wp_enqueue_style($this->taxonomy . '-sortable');
+
+	}
+
+	/**
+	 * Show the title modules on the single course template.
+	 *
+	 * Function is hooked into sensei_single_course_modules_before.
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function course_modules_title( ) {
+
+	   if( sensei_module_has_lessons() ){
+
+			echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
+
+		}
+
+	}
+
+	/**
+	 * Display the single course modules content this will only show
+	 * if the course has modules.
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function load_course_module_content_template(){
+
+		// load backwards compatible template name if it exists in the users theme
+		$located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
+		if( $located_template ){
+
+			Sensei_Templates::get_template( 'single-course/course-modules.php' );
+			return;
+
+		}
+
+		Sensei_Templates::get_template( 'single-course/modules.php' );
+
+	} // end course_module_content
+
+	/**
+	 * Returns all lessons for the given module ID
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 * @param $term_id
+	 * @return array $lessons
+	 */
+	public function get_lessons( $course_id , $term_id ){
+
+		$lesson_query = $this->get_lessons_query( $course_id, $term_id );
+
+		if( isset( $lesson_query->posts ) ){
 
-            return $lesson_query->posts;
+			return $lesson_query->posts;
 
-        }else{
+		}else{
 
-            return array();
+			return array();
 
-        }
+		}
 
-    } // end get lessons
+	} // end get lessons
 
-    /**
-     * Returns all lessons for the given module ID
-     *
-     * @since 1.8.0
-     *
-     * @param $course_id
-     * @param $term_id
-     * @return WP_Query $lessons_query
-     */
-    public function get_lessons_query( $course_id , $term_id ){
-
-        if( empty( $term_id ) || empty( $course_id ) ){
-
-            return array();
-
-        }
-
-        $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' => 'module',
-                    'field' => 'id',
-                    'terms' => intval( $term_id )
-                )
-            ),
-            'orderby' => 'menu_order',
-            'order' => 'ASC',
-            'suppress_filters' => 0
-        );
-
-        if (version_compare( Sensei()->version, '1.6.0', '>=')) {
-            $args['meta_key'] = '_order_module_' . intval( $term_id );
-            $args['orderby'] = 'meta_value_num date';
-        }
-
-        $lessons_query = new WP_Query( $args );
-
-        return $lessons_query;
-
-    } // end get lessons
-
-    /**
-     * Find the lesson in the given course that doesn't belong
-     * to any of the courses modules
-     *
-     *
-     * @param $course_id
-     *
-     * @return array $non_module_lessons
-     */
-    public function get_none_module_lessons( $course_id ){
-
-        $non_module_lessons = array();
-
-        //exit if there is no course id passed in
-        if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
-
-            return $non_module_lessons;
-        }
-
-        //save some time and check if we already have the saved
-        if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
-
-            return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
-
-        }
-
-        // create terms array which must be excluded from other arrays
-        $course_modules = $this->get_course_modules( $course_id );
-
-        //exit if there are no module on this course
-        if( empty( $course_modules ) || ! is_array( $course_modules ) ){
-
-            return  Sensei()->course->course_lessons( $course_id );
-
-        }
-
-        $terms = array();
-        foreach( $course_modules as $module ){
-
-            array_push( $terms ,  $module->term_id );
-
-        }
-
-        $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' => 'module',
-                    'field' => 'id',
-                    'terms' =>  $terms,
-                    'operator' => 'NOT IN'
-                )
-            ),
-            'orderby' => 'menu_order',
-            'order' => 'ASC',
-            'suppress_filters' => 0
-        );
-
-        $wp_lessons_query = new WP_Query( $args );
-
-        if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
-            $non_module_lessons = $wp_lessons_query->get_posts();
-            set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
-        }
-
-        return $non_module_lessons;
-    } // end get_none_module_lessons
-
-    /**
-     * Register the modules taxonomy
-     *
-     * @since 1.8.0
-     */
-    public function setup_modules_taxonomy(){
-
-        $labels = array(
-            'name' => __('Modules', 'woothemes-sensei'),
-            'singular_name' => __('Module', 'woothemes-sensei'),
-            'search_items' => __('Search Modules', 'woothemes-sensei'),
-            'all_items' => __('All Modules', 'woothemes-sensei'),
-            'parent_item' => __('Parent Module', 'woothemes-sensei'),
-            'parent_item_colon' => __('Parent Module:', 'woothemes-sensei'),
-            'edit_item' => __('Edit Module', 'woothemes-sensei'),
-            'update_item' => __('Update Module', 'woothemes-sensei'),
-            'add_new_item' => __('Add New Module', 'woothemes-sensei'),
-            'new_item_name' => __('New Module Name', 'woothemes-sensei'),
-            'menu_name' => __('Modules', 'woothemes-sensei'),
-        );
-
-        /**
-         * Filter to alter the Sensei Modules rewrite slug
-         *
-         * @since 1.8.0
-         * @param string default 'modules'
-         */
-        $modules_rewrite_slug = apply_filters('sensei_module_slug', 'modules');
-
-        $args = array(
-            'public' => true,
-            'hierarchical' => true,
-            'show_admin_column' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_courses',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_courses'
-            ),
-            'show_in_nav_menus' => false,
-            'show_in_quick_edit' => false,
-            'show_ui' => true,
-            'rewrite' => array('slug' => $modules_rewrite_slug ),
-            'labels' => $labels
-        );
-
-        register_taxonomy( 'module' , array('course', 'lesson'), $args);
-
-    }// end setup_modules_taxonomy
-
-    /**
-     * When the wants to edit the lesson modules redirect them to the course modules.
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    function redirect_to_lesson_module_taxonomy_to_course( ){
-
-        global $typenow , $taxnow;
-
-        if( 'lesson'== $typenow && 'module'==$taxnow ){
-            wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
-        }
-
-    }// end redirect to course taxonomy
-
-    /**
-     * Completely remove the module menu item under lessons.
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function remove_lessons_menu_model_taxonomy(){
-        global $submenu;
-
-        if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
-            return; // exit
-        }
-
-        $lesson_main_menu = $submenu['edit.php?post_type=lesson'];
-        foreach( $lesson_main_menu as $index => $sub_item ){
-
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=lesson'][ $index ]);
-            }
-        }
-
-    }// end remove lesson module tax
-
-    /**
-     * Completely remove the second modules under courses
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function remove_courses_menu_model_taxonomy(){
-        global $submenu;
-
-        if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
-            return; // exit
-        }
-
-        $course_main_menu = $submenu['edit.php?post_type=course'];
-        foreach( $course_main_menu as $index => $sub_item ){
-
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=course'][ $index ]);
-            }
-        }
-
-    }// end remove courses module tax
-
-    /**
-     * Determine the author of a module term term by looking at
-     * the prefixed author id. This function will query the full term object.
-     * Will return the admin user author could not be determined.
-     *
-     * @since 1.8.0
-     *
-     * @param string $term_name
-     * @return array $owners { type WP_User }. Empty array if none if found.
-     */
-    public static function get_term_authors( $term_name ){
-
-        $terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
-
-        $owners = array();
-        if( empty( $terms ) ){
-
-            return $owners;
+	/**
+	 * Returns all lessons for the given module ID
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 * @param $term_id
+	 * @return WP_Query $lessons_query
+	 */
+	public function get_lessons_query( $course_id , $term_id ){
+
+		if( empty( $term_id ) || empty( $course_id ) ){
+
+			return array();
+
+		}
+
+		$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' => 'module',
+					'field' => 'id',
+					'terms' => intval( $term_id )
+				)
+			),
+			'orderby' => 'menu_order',
+			'order' => 'ASC',
+			'suppress_filters' => 0
+		);
+
+		if (version_compare( Sensei()->version, '1.6.0', '>=')) {
+			$args['meta_key'] = '_order_module_' . intval( $term_id );
+			$args['orderby'] = 'meta_value_num date';
+		}
+
+		$lessons_query = new WP_Query( $args );
+
+		return $lessons_query;
+
+	} // end get lessons
+
+	/**
+	 * Find the lesson in the given course that doesn't belong
+	 * to any of the courses modules
+	 *
+	 *
+	 * @param $course_id
+	 *
+	 * @return array $non_module_lessons
+	 */
+	public function get_none_module_lessons( $course_id ){
+
+		$non_module_lessons = array();
+
+		//exit if there is no course id passed in
+		if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
+
+			return $non_module_lessons;
+		}
+
+		//save some time and check if we already have the saved
+		if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
+
+			return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
+
+		}
+
+		// create terms array which must be excluded from other arrays
+		$course_modules = $this->get_course_modules( $course_id );
+
+		//exit if there are no module on this course
+		if( empty( $course_modules ) || ! is_array( $course_modules ) ){
+
+			return  Sensei()->course->course_lessons( $course_id );
+
+		}
+
+		$terms = array();
+		foreach( $course_modules as $module ){
+
+			array_push( $terms ,  $module->term_id );
+
+		}
+
+		$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' => 'module',
+					'field' => 'id',
+					'terms' =>  $terms,
+					'operator' => 'NOT IN'
+				)
+			),
+			'orderby' => 'menu_order',
+			'order' => 'ASC',
+			'suppress_filters' => 0
+		);
+
+		$wp_lessons_query = new WP_Query( $args );
+
+		if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
+			$non_module_lessons = $wp_lessons_query->get_posts();
+			set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
+		}
+
+		return $non_module_lessons;
+	} // end get_none_module_lessons
+
+	/**
+	 * Register the modules taxonomy
+	 *
+	 * @since 1.8.0
+	 */
+	public function setup_modules_taxonomy(){
+
+		$labels = array(
+			'name' => __('Modules', 'woothemes-sensei'),
+			'singular_name' => __('Module', 'woothemes-sensei'),
+			'search_items' => __('Search Modules', 'woothemes-sensei'),
+			'all_items' => __('All Modules', 'woothemes-sensei'),
+			'parent_item' => __('Parent Module', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Module:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Module', 'woothemes-sensei'),
+			'update_item' => __('Update Module', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Module', 'woothemes-sensei'),
+			'new_item_name' => __('New Module Name', 'woothemes-sensei'),
+			'menu_name' => __('Modules', 'woothemes-sensei'),
+		);
+
+		/**
+		 * Filter to alter the Sensei Modules rewrite slug
+		 *
+		 * @since 1.8.0
+		 * @param string default 'modules'
+		 */
+		$modules_rewrite_slug = apply_filters('sensei_module_slug', 'modules');
+
+		$args = array(
+			'public' => true,
+			'hierarchical' => true,
+			'show_admin_column' => true,
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_courses',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_courses'
+			),
+			'show_in_nav_menus' => false,
+			'show_in_quick_edit' => false,
+			'show_ui' => true,
+			'rewrite' => array('slug' => $modules_rewrite_slug ),
+			'labels' => $labels
+		);
+
+		register_taxonomy( 'module' , array('course', 'lesson'), $args);
+
+	}// end setup_modules_taxonomy
+
+	/**
+	 * When the wants to edit the lesson modules redirect them to the course modules.
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	function redirect_to_lesson_module_taxonomy_to_course( ){
+
+		global $typenow , $taxnow;
+
+		if( 'lesson'== $typenow && 'module'==$taxnow ){
+			wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
+		}
+
+	}// end redirect to course taxonomy
+
+	/**
+	 * Completely remove the module menu item under lessons.
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function remove_lessons_menu_model_taxonomy(){
+		global $submenu;
+
+		if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
+			return; // exit
+		}
+
+		$lesson_main_menu = $submenu['edit.php?post_type=lesson'];
+		foreach( $lesson_main_menu as $index => $sub_item ){
+
+			if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
+				unset( $submenu['edit.php?post_type=lesson'][ $index ]);
+			}
+		}
+
+	}// end remove lesson module tax
+
+	/**
+	 * Completely remove the second modules under courses
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function remove_courses_menu_model_taxonomy(){
+		global $submenu;
+
+		if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
+			return; // exit
+		}
+
+		$course_main_menu = $submenu['edit.php?post_type=course'];
+		foreach( $course_main_menu as $index => $sub_item ){
+
+			if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
+				unset( $submenu['edit.php?post_type=course'][ $index ]);
+			}
+		}
+
+	}// end remove courses module tax
+
+	/**
+	 * Determine the author of a module term term by looking at
+	 * the prefixed author id. This function will query the full term object.
+	 * Will return the admin user author could not be determined.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $term_name
+	 * @return array $owners { type WP_User }. Empty array if none if found.
+	 */
+	public static function get_term_authors( $term_name ){
+
+		$terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
+
+		$owners = array();
+		if( empty( $terms ) ){
+
+			return $owners;
 
-        }
+		}
 
-        // setup the admin user
+		// setup the admin user
 
 
-        //if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
-        foreach( $terms as $term){
-            if( $term->name == $term_name ){
+		//if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
+		foreach( $terms as $term){
+			if( $term->name == $term_name ){
 
-                // look for the author in the slug
-                $owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
+				// look for the author in the slug
+				$owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
 
-            }// end if term name
+			}// end if term name
 
-        } // end for each
+		} // end for each
 
-        return $owners;
+		return $owners;
 
-    }// end get_term_author
+	}// end get_term_author
 
-    /**
-     * Looks at a term slug and figures out
-     * which author created the slug. The author was
-     * appended when the user saved the module term in the course edit
-     * screen.
-     *
-     * @since 1.8.0
-     *
-     * @param $slug
-     * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
-     */
-    public static function get_term_author( $slug='' ){
+	/**
+	 * Looks at a term slug and figures out
+	 * which author created the slug. The author was
+	 * appended when the user saved the module term in the course edit
+	 * screen.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $slug
+	 * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
+	 */
+	public static function get_term_author( $slug='' ){
 
-        $term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
+		$term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
 
-        if( empty( $slug ) ){
+		if( empty( $slug ) ){
 
-            return $term_owner;
+			return $term_owner;
 
-        }
+		}
 
-        // look for the author in the slug
-        $slug_parts = explode( '-', $slug );
+		// look for the author in the slug
+		$slug_parts = explode( '-', $slug );
 
-        if( count( $slug_parts ) > 1 ){
+		if( count( $slug_parts ) > 1 ){
 
-            // get the user data
-            $possible_user_id = $slug_parts[0];
-            $author = get_userdata( $possible_user_id );
+			// get the user data
+			$possible_user_id = $slug_parts[0];
+			$author = get_userdata( $possible_user_id );
 
-            // if the user doesnt exist for the first part of the slug
-            // then this slug was also created by admin
-            if( is_a( $author, 'WP_User' ) ){
+			// if the user doesnt exist for the first part of the slug
+			// then this slug was also created by admin
+			if( is_a( $author, 'WP_User' ) ){
 
-                $term_owner =  $author;
+				$term_owner =  $author;
 
-            }
-        }
+			}
+		}
 
-        return $term_owner;
-    }
+		return $term_owner;
+	}
 
-    /**
-     * Display the Sensei modules taxonomy terms metabox
-     *
-     * @since 1.8.0
-     *
-     * @hooked into add_meta_box
-     *
-     * @param WP_Post $post Post object.
-     */
-    public function course_module_metabox( $post ) {
+	/**
+	 * Display the Sensei modules taxonomy terms metabox
+	 *
+	 * @since 1.8.0
+	 *
+	 * @hooked into add_meta_box
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public function course_module_metabox( $post ) {
 
-        $tax_name = 'module';
-        $taxonomy = get_taxonomy( 'module' );
+		$tax_name = 'module';
+		$taxonomy = get_taxonomy( 'module' );
 
-        ?>
+		?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
@@ -1744,9 +1744,9 @@ 
 
             <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
                 <?php
-                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-                echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-                ?>
+				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+				?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
                     <?php wp_terms_checklist( $post->ID, array( 'taxonomy'=>$tax_name , 'popular_cats' => $popular_ids ) ); ?>
                 </ul>
@@ -1756,9 +1756,9 @@ 
                     <h4>
                         <a id="sensei-<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
                             <?php
-                            /* translators: %s: add new taxonomy label */
-                            printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
-                            ?>
+							/* translators: %s: add new taxonomy label */
+							printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+							?>
                         </a>
                     </h4>
                     <p id="sensei-<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
@@ -1773,331 +1773,331 @@ 
         </div>
     <?php
 
-    } // end course_module_metabox
+	} // end course_module_metabox
 
 
-    /**
-     * Submits a new module term prefixed with the
-     * the current author id.
-     *
-     * @since 1.8.0
-     */
-    public static function add_new_module_term( ) {
+	/**
+	 * Submits a new module term prefixed with the
+	 * the current author id.
+	 *
+	 * @since 1.8.0
+	 */
+	public static function add_new_module_term( ) {
 
 
-        if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
-            wp_send_json_error( array('error'=> 'wrong security nonce') );
-        }
+		if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
+			wp_send_json_error( array('error'=> 'wrong security nonce') );
+		}
 
-        // get the term an create the new term storing infomration
-        $term_name = sanitize_text_field( $_POST['newTerm'] );
+		// get the term an create the new term storing infomration
+		$term_name = sanitize_text_field( $_POST['newTerm'] );
 
-        if( current_user_can('manage_options' ) ) {
+		if( current_user_can('manage_options' ) ) {
 
-            $term_slug = str_ireplace(' ', '-', trim( $term_name ) );
+			$term_slug = str_ireplace(' ', '-', trim( $term_name ) );
 
-        } else {
+		} else {
 
-            $term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
+			$term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
 
-        }
+		}
 
-        $course_id = sanitize_text_field( $_POST['course_id'] );
+		$course_id = sanitize_text_field( $_POST['course_id'] );
 
-        // save the term
-        $slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
+		// save the term
+		$slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
 
-        // send error for all errors except term exits
-        if( is_wp_error( $slug ) ){
+		// send error for all errors except term exits
+		if( is_wp_error( $slug ) ){
 
-            // prepare for possible term name and id to be passed down if term exists
-            $term_data = array();
+			// prepare for possible term name and id to be passed down if term exists
+			$term_data = array();
 
-            // if term exists also send back the term name and id
-            if( isset( $slug->errors['term_exists'] ) ){
+			// if term exists also send back the term name and id
+			if( isset( $slug->errors['term_exists'] ) ){
 
-                $term = get_term_by( 'slug', $term_slug, 'module');
-                $term_data['name'] = $term_name;
-                $term_data['id'] = $term->term_id;
+				$term = get_term_by( 'slug', $term_slug, 'module');
+				$term_data['name'] = $term_name;
+				$term_data['id'] = $term->term_id;
 
-                // set the object terms
-                wp_set_object_terms( $course_id, $term->term_id, 'module', true );
-            }
+				// set the object terms
+				wp_set_object_terms( $course_id, $term->term_id, 'module', true );
+			}
 
-            wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
+			wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
 
-        }
+		}
 
-        //make sure the new term is checked for this course
+		//make sure the new term is checked for this course
 
-        wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
+		wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
 
-        // Handle request then generate response using WP_Ajax_Response
-        wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
+		// Handle request then generate response using WP_Ajax_Response
+		wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
 
-    }
+	}
 
-    /**
-     * Limit the course module metabox
-     * term list to only those on courses belonging to current teacher.
-     *
-     * Hooked into 'get_terms'
-     *
-     * @since 1.8.0
-     */
-    public function filter_module_terms( $terms, $taxonomies, $args ){
+	/**
+	 * Limit the course module metabox
+	 * term list to only those on courses belonging to current teacher.
+	 *
+	 * Hooked into 'get_terms'
+	 *
+	 * @since 1.8.0
+	 */
+	public function filter_module_terms( $terms, $taxonomies, $args ){
 
-        //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
-            return $terms;
-        }
+		//dont limit for admins and other taxonomies. This should also only apply to admin
+		if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
+			return $terms;
+		}
 
-        // avoid infinite call loop
-        remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		// avoid infinite call loop
+		remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
 
-        // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
-            // change only scrub the terms ids form the array keys
-            $terms = array_keys( $terms );
-        }
+		// in certain cases the array is passed in as reference to the parent term_id => parent_id
+		if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
+			// change only scrub the terms ids form the array keys
+			$terms = array_keys( $terms );
+		}
 
-        $teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
+		$teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
 
-        // add filter again as removed above
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		// add filter again as removed above
+		add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
 
-        return $teachers_terms;
-    }// end filter_module_terms
+		return $teachers_terms;
+	}// end filter_module_terms
 
-    /**
-     * For the selected items on a course module only return those
-     * for the current user. This does not apply to admin and super admin users.
-     *
-     * hooked into get_object_terms
-     *
-     * @since 1.8.0
-     */
-    public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
+	/**
+	 * For the selected items on a course module only return those
+	 * for the current user. This does not apply to admin and super admin users.
+	 *
+	 * hooked into get_object_terms
+	 *
+	 * @since 1.8.0
+	 */
+	public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
 
-        //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
-            // only apply this to module only taxonomy queries so 1 taxonomy only:
-            ||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
-            return $terms;
-        }
+		//dont limit for admins and other taxonomies. This should also only apply to admin
+		if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
+			// only apply this to module only taxonomy queries so 1 taxonomy only:
+			||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
+			return $terms;
+		}
 
-        $term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
+		$term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
 
-        // if term objects were passed in send back objects
-        // if term id were passed in send that back
-        if( is_object( $terms[0] ) ){
-            return $term_objects;
-        }
+		// if term objects were passed in send back objects
+		// if term id were passed in send that back
+		if( is_object( $terms[0] ) ){
+			return $term_objects;
+		}
 
-        $terms = array();
-        foreach( $term_objects as $term_object ){
-            $terms[] = $term_object->term_id;
-        }
+		$terms = array();
+		foreach( $term_objects as $term_object ){
+			$terms[] = $term_object->term_id;
+		}
 
-        return $terms;
+		return $terms;
 
 
-    }// end filter_course_selected_terms
+	}// end filter_course_selected_terms
 
-    /**
-     * Filter the given terms and only return the
-     * terms that belong to the given user id.
-     *
-     * @since 1.8.0
-     * @param $terms
-     * @param $user_id
-     * @return array
-     */
-    public function filter_terms_by_owner( $terms, $user_id ){
+	/**
+	 * Filter the given terms and only return the
+	 * terms that belong to the given user id.
+	 *
+	 * @since 1.8.0
+	 * @param $terms
+	 * @param $user_id
+	 * @return array
+	 */
+	public function filter_terms_by_owner( $terms, $user_id ){
 
-        $users_terms = array();
+		$users_terms = array();
 
-        foreach( $terms as $index => $term ){
+		foreach( $terms as $index => $term ){
 
-            if( is_numeric( $term ) ){
-                // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
-            }
+			if( is_numeric( $term ) ){
+				// the term id was given, get the term object
+				$term = get_term( $term, 'module' );
+			}
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+			$author = Sensei_Core_Modules::get_term_author( $term->slug );
 
-            if ( $user_id == $author->ID ) {
-                // add the term to the teachers terms
-                $users_terms[] = $term;
-            }
+			if ( $user_id == $author->ID ) {
+				// add the term to the teachers terms
+				$users_terms[] = $term;
+			}
 
-        }
+		}
 
-        return $users_terms;
+		return $users_terms;
 
-    } // end filter terms by owner
+	} // end filter terms by owner
 
-    /**
-     * Add the teacher name next to modules. Only works in Admin for Admin users.
-     * This will not add name to terms belonging to admin user.
-     *
-     * Hooked into 'get_terms'
-     *
-     * @since 1.8.0
-     */
-    public function append_teacher_name_to_module( $terms, $taxonomies, $args )
-    {
+	/**
+	 * Add the teacher name next to modules. Only works in Admin for Admin users.
+	 * This will not add name to terms belonging to admin user.
+	 *
+	 * Hooked into 'get_terms'
+	 *
+	 * @since 1.8.0
+	 */
+	public function append_teacher_name_to_module( $terms, $taxonomies, $args )
+	{
 
-        // only for admin users ont he module taxonomy
-        if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
-            return $terms;
-        }
+		// only for admin users ont he module taxonomy
+		if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
+			return $terms;
+		}
 
-        // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        // simply return this as wp doesn't need an array of stdObject Term
-        if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
+		// in certain cases the array is passed in as reference to the parent term_id => parent_id
+		// simply return this as wp doesn't need an array of stdObject Term
+		if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
 
-            return $terms;
+			return $terms;
 
-        }
+		}
 
-        // loop through and update all terms adding the author name
-        foreach( $terms as $index => $term ){
+		// loop through and update all terms adding the author name
+		foreach( $terms as $index => $term ){
 
-            if( is_numeric( $term ) ){
-                // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
-            }
+			if( is_numeric( $term ) ){
+				// the term id was given, get the term object
+				$term = get_term( $term, 'module' );
+			}
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+			$author = Sensei_Core_Modules::get_term_author( $term->slug );
 
-            if( ! user_can( $author, 'manage_options' ) && isset( $term->name ) ) {
-                $term->name = $term->name . ' (' . $author->display_name . ') ';
-            }
+			if( ! user_can( $author, 'manage_options' ) && isset( $term->name ) ) {
+				$term->name = $term->name . ' (' . $author->display_name . ') ';
+			}
 
-            // add the term to the teachers terms
-            $users_terms[] = $term;
+			// add the term to the teachers terms
+			$users_terms[] = $term;
 
-        }
+		}
 
-        return $users_terms;
-    }
+		return $users_terms;
+	}
 
-    /**
-     * Remove modules metabox that come by default
-     * with the modules taxonomy. We are removing this as
-     * we have created our own custom meta box.
-     */
-    public static function remove_default_modules_box() {
+	/**
+	 * Remove modules metabox that come by default
+	 * with the modules taxonomy. We are removing this as
+	 * we have created our own custom meta box.
+	 */
+	public static function remove_default_modules_box() {
 
-        remove_meta_box('modulediv', 'course', 'side');
+		remove_meta_box('modulediv', 'course', 'side');
 
-    }
+	}
 
-    /**
-     * When a course is save make sure to reset the transient set
-     * for it when determining the none module lessons.
-     *
-     * @sine 1.9.0
-     * @param $post_id
-     */
-    public static function reset_none_modules_transient ( $post_id ){
+	/**
+	 * When a course is save make sure to reset the transient set
+	 * for it when determining the none module lessons.
+	 *
+	 * @sine 1.9.0
+	 * @param $post_id
+	 */
+	public static function reset_none_modules_transient ( $post_id ){
 
-        // this should only apply to course and lesson post types
-        if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
+		// this should only apply to course and lesson post types
+		if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
 
-            $course_id = '';
+			$course_id = '';
 
-            if( 'lesson' == get_post_type( $post_id ) ){
+			if( 'lesson' == get_post_type( $post_id ) ){
 
-                $course_id = Sensei()->lesson->get_course_id( $post_id );
+				$course_id = Sensei()->lesson->get_course_id( $post_id );
 
-            }
+			}
 
 
-            if( !empty( $course_id ) ){
+			if( !empty( $course_id ) ){
 
-                delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
+				delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
 
-            }
+			}
 
-        } // end if is a course or a lesson
+		} // end if is a course or a lesson
 
-    } // end reset_none_modules_transient
+	} // end reset_none_modules_transient
 
-    /**
-     * This function calls the deprecated hook 'sensei_single_course_modules_content' to fire
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     *
-     */
-    public static function deprecate_sensei_single_course_modules_content(){
+	/**
+	 * This function calls the deprecated hook 'sensei_single_course_modules_content' to fire
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 *
+	 */
+	public static function deprecate_sensei_single_course_modules_content(){
 
-        sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
+		sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
 
-    }
+	}
 
-    /**
-     * Setup the single course module loop.
-     *
-     * Setup the global $sensei_modules_loop
-     *
-     * @since 1.9.0
-     */
-    public static function setup_single_course_module_loop(){
+	/**
+	 * Setup the single course module loop.
+	 *
+	 * Setup the global $sensei_modules_loop
+	 *
+	 * @since 1.9.0
+	 */
+	public static function setup_single_course_module_loop(){
 
-        global $sensei_modules_loop, $post;
-        $course_id = $post->ID;
+		global $sensei_modules_loop, $post;
+		$course_id = $post->ID;
 
-        $modules = Sensei()->modules->get_course_modules( $course_id );
+		$modules = Sensei()->modules->get_course_modules( $course_id );
 
-        //initial setup
-        $sensei_modules_loop['total'] = 0;
-        $sensei_modules_loop['modules'] = array();
-        $sensei_modules_loop['current'] = -1;
+		//initial setup
+		$sensei_modules_loop['total'] = 0;
+		$sensei_modules_loop['modules'] = array();
+		$sensei_modules_loop['current'] = -1;
 
-        // exit if this course doesn't have modules
-        if( !$modules || empty( $modules )  ){
-            return;
-        }
+		// exit if this course doesn't have modules
+		if( !$modules || empty( $modules )  ){
+			return;
+		}
 
 
-        $lessons_in_all_modules = array();
-        foreach( $modules as $term ){
+		$lessons_in_all_modules = array();
+		foreach( $modules as $term ){
 
-            $lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
-            $lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
+			$lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
+			$lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
 
-        }
+		}
 
 
-        //setup all of the modules loop variables
-        $sensei_modules_loop['total'] = count( $modules );
-        $sensei_modules_loop['modules'] = $modules;
-        $sensei_modules_loop['current'] = -1;
-        $sensei_modules_loop['course_id'] = $course_id;
+		//setup all of the modules loop variables
+		$sensei_modules_loop['total'] = count( $modules );
+		$sensei_modules_loop['modules'] = $modules;
+		$sensei_modules_loop['current'] = -1;
+		$sensei_modules_loop['course_id'] = $course_id;
 
-    }// end setup_single_course_module_loop
+	}// end setup_single_course_module_loop
 
-    /**
-     * Tear down the course module loop.
-     *
-     * @since 1.9.0
-     *
-     */
-    public static function teardown_single_course_module_loop(){
+	/**
+	 * Tear down the course module loop.
+	 *
+	 * @since 1.9.0
+	 *
+	 */
+	public static function teardown_single_course_module_loop(){
 
-        global $sensei_modules_loop, $wp_query, $post;
+		global $sensei_modules_loop, $wp_query, $post;
 
-        //reset all of the modules loop variables
-        $sensei_modules_loop['total'] = 0;
-        $sensei_modules_loop['modules'] = array();
-        $sensei_modules_loop['current'] = -1;
+		//reset all of the modules loop variables
+		$sensei_modules_loop['total'] = 0;
+		$sensei_modules_loop['modules'] = array();
+		$sensei_modules_loop['current'] = -1;
 
-        // set the current course to be the global post again
-        wp_reset_query();
-        $post = $wp_query->post;
-    }// end teardown_single_course_module_loop
+		// set the current course to be the global post again
+		wp_reset_query();
+		$post = $wp_query->post;
+	}// end teardown_single_course_module_loop
 
 } // end modules class

includes/class-sensei-question.php

Indentation +567 added lines, -567 removed lines

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

includes/class-sensei-list-table.php

Indentation +11 added lines, -11 removed lines

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

includes/class-sensei-updates.php

Indentation +276 added lines, -276 removed lines

@@ -12,107 +12,107 @@ 
  */
 class Sensei_Updates
 {
-    public $token = 'woothemes-sensei';
-    public $version;
-    public $updates_run;
-    public $updates;
-    private $parent;
-
-    /**
-     * Constructor.
-     *
-     * @access  public
-     * @since   1.1.0
-     * @param   string $parent The main Sensei object by Ref.
-     * @return  void
-     */
-    public function __construct($parent)
-    {
+	public $token = 'woothemes-sensei';
+	public $version;
+	public $updates_run;
+	public $updates;
+	private $parent;
+
+	/**
+	 * Constructor.
+	 *
+	 * @access  public
+	 * @since   1.1.0
+	 * @param   string $parent The main Sensei object by Ref.
+	 * @return  void
+	 */
+	public function __construct($parent)
+	{
 
 		// Setup object data
 		$this->parent = $parent;
 		$this->updates_run = get_option( 'woothemes-sensei-upgrades', array() );
 
-        // The list of upgrades to run
-        $this->updates = array('1.1.0' => array('auto' => array('assign_role_caps' => array('title' => __('Assign role capabilities', 'woothemes-sensei'), 'desc' => __('Assigns Sensei capabilites to the relevant user roles.', 'woothemes-sensei'), 'product' => 'Sensei')),
-            'manual' => array()
-        ),
-            '1.3.0' => array('auto' => array('set_default_quiz_grade_type' => array('title' => __('Set default quiz grade type', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei')),
-                'set_default_question_type' => array('title' => __('Set default question type', 'woothemes-sensei'), 'desc' => __('Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei'))
-            ),
-                'manual' => array('update_question_answer_data' => array('title' => __('Update question answer data', 'woothemes-sensei'), 'desc' => __('Updates questions to use the new question types structure.', 'woothemes-sensei')))
-            ),
-            '1.4.0' => array('auto' => array('update_question_grade_points' => array('title' => __('Update question grade points', 'woothemes-sensei'), 'desc' => __('Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei'))),
-                'manual' => array()
-            ),
-            '1.5.0' => array('auto' => array('convert_essay_paste_questions' => array('title' => __('Convert essay paste questions into multi-line questions', 'woothemes-sensei'), 'desc' => __('Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei'))),
-                'manual' => array('set_random_question_order' => array('title' => __('Set all quizzes to have a random question order', 'woothemes-sensei'), 'desc' => __('Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei')),
-                    'set_default_show_question_count' => array('title' => __('Set all quizzes to show all questions', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei')),
-                    'remove_deleted_user_activity' => array('title' => __('Remove Sensei activity for deleted users', 'woothemes-sensei'), 'desc' => __('Removes all course, lesson & quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei')))
-            ),
-            '1.6.0' => array('auto' => array('add_teacher_role' => array('title' => __('Add \'Teacher\' role', 'woothemes-sensei'), 'desc' => __('Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei')),
-                'add_sensei_caps' => array('title' => __('Add administrator capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei')),
-                'restructure_question_meta' => array('title' => __('Restructure question meta data', 'woothemes-sensei'), 'desc' => __('Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei')),
-                'update_quiz_settings' => array('title' => __('Add new quiz settings', 'woothemes-sensei'), 'desc' => __('Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei')),
-                'reset_lesson_order_meta' => array('title' => __('Set default order of lessons', 'woothemes-sensei'), 'desc' => __('Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei')),),
-                'manual' => array()
-            ),
-            '1.7.0' => array('auto' => array('add_editor_caps' => array('title' => __('Add Editor capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei')),),
-                'forced' => array('update_question_gap_fill_separators' => array('title' => __('Update Gap Fill questions', 'woothemes-sensei'), 'desc' => __('Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei')),
-                    'update_quiz_lesson_relationship' => array('title' => __('Restructure quiz lesson relationship', 'woothemes-sensei'), 'desc' => __('Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei')),
-                    'status_changes_fix_lessons' => array('title' => __('Update lesson statuses', 'woothemes-sensei'), 'desc' => __('Update existing lesson statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_lessons' => array('title' => __('Convert lesson statuses', 'woothemes-sensei'), 'desc' => __('Convert to new lesson statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_courses' => array('title' => __('Convert course statuses', 'woothemes-sensei'), 'desc' => __('Convert to new course statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_questions' => array('title' => __('Convert question statuses', 'woothemes-sensei'), 'desc' => __('Convert to new question statuses.', 'woothemes-sensei')),
-                    'update_legacy_sensei_comments_status' => array('title' => __('Convert legacy Sensei activity types', 'woothemes-sensei'), 'desc' => __('Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei')),
-                    'update_comment_course_lesson_comment_counts' => array('title' => __('Update comment counts', 'woothemes-sensei'), 'desc' => __('Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei')),),
-            ),
-            '1.7.2' => array('auto' => array('index_comment_status_field' => array('title' => __('Add database index to comment statuses', 'woothemes-sensei'), 'desc' => __('This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei')),),
-                /*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
-            ),
-            '1.8.0' => array('auto' => array('enhance_teacher_role' => array('title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.'),),
-                'manual' => array()
-            ),
-        );
+		// The list of upgrades to run
+		$this->updates = array('1.1.0' => array('auto' => array('assign_role_caps' => array('title' => __('Assign role capabilities', 'woothemes-sensei'), 'desc' => __('Assigns Sensei capabilites to the relevant user roles.', 'woothemes-sensei'), 'product' => 'Sensei')),
+			'manual' => array()
+		),
+			'1.3.0' => array('auto' => array('set_default_quiz_grade_type' => array('title' => __('Set default quiz grade type', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei')),
+				'set_default_question_type' => array('title' => __('Set default question type', 'woothemes-sensei'), 'desc' => __('Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei'))
+			),
+				'manual' => array('update_question_answer_data' => array('title' => __('Update question answer data', 'woothemes-sensei'), 'desc' => __('Updates questions to use the new question types structure.', 'woothemes-sensei')))
+			),
+			'1.4.0' => array('auto' => array('update_question_grade_points' => array('title' => __('Update question grade points', 'woothemes-sensei'), 'desc' => __('Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei'))),
+				'manual' => array()
+			),
+			'1.5.0' => array('auto' => array('convert_essay_paste_questions' => array('title' => __('Convert essay paste questions into multi-line questions', 'woothemes-sensei'), 'desc' => __('Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei'))),
+				'manual' => array('set_random_question_order' => array('title' => __('Set all quizzes to have a random question order', 'woothemes-sensei'), 'desc' => __('Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei')),
+					'set_default_show_question_count' => array('title' => __('Set all quizzes to show all questions', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei')),
+					'remove_deleted_user_activity' => array('title' => __('Remove Sensei activity for deleted users', 'woothemes-sensei'), 'desc' => __('Removes all course, lesson & quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei')))
+			),
+			'1.6.0' => array('auto' => array('add_teacher_role' => array('title' => __('Add \'Teacher\' role', 'woothemes-sensei'), 'desc' => __('Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei')),
+				'add_sensei_caps' => array('title' => __('Add administrator capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei')),
+				'restructure_question_meta' => array('title' => __('Restructure question meta data', 'woothemes-sensei'), 'desc' => __('Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei')),
+				'update_quiz_settings' => array('title' => __('Add new quiz settings', 'woothemes-sensei'), 'desc' => __('Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei')),
+				'reset_lesson_order_meta' => array('title' => __('Set default order of lessons', 'woothemes-sensei'), 'desc' => __('Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei')),),
+				'manual' => array()
+			),
+			'1.7.0' => array('auto' => array('add_editor_caps' => array('title' => __('Add Editor capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei')),),
+				'forced' => array('update_question_gap_fill_separators' => array('title' => __('Update Gap Fill questions', 'woothemes-sensei'), 'desc' => __('Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei')),
+					'update_quiz_lesson_relationship' => array('title' => __('Restructure quiz lesson relationship', 'woothemes-sensei'), 'desc' => __('Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei')),
+					'status_changes_fix_lessons' => array('title' => __('Update lesson statuses', 'woothemes-sensei'), 'desc' => __('Update existing lesson statuses.', 'woothemes-sensei')),
+					'status_changes_convert_lessons' => array('title' => __('Convert lesson statuses', 'woothemes-sensei'), 'desc' => __('Convert to new lesson statuses.', 'woothemes-sensei')),
+					'status_changes_convert_courses' => array('title' => __('Convert course statuses', 'woothemes-sensei'), 'desc' => __('Convert to new course statuses.', 'woothemes-sensei')),
+					'status_changes_convert_questions' => array('title' => __('Convert question statuses', 'woothemes-sensei'), 'desc' => __('Convert to new question statuses.', 'woothemes-sensei')),
+					'update_legacy_sensei_comments_status' => array('title' => __('Convert legacy Sensei activity types', 'woothemes-sensei'), 'desc' => __('Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei')),
+					'update_comment_course_lesson_comment_counts' => array('title' => __('Update comment counts', 'woothemes-sensei'), 'desc' => __('Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei')),),
+			),
+			'1.7.2' => array('auto' => array('index_comment_status_field' => array('title' => __('Add database index to comment statuses', 'woothemes-sensei'), 'desc' => __('This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei')),),
+				/*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
+			),
+			'1.8.0' => array('auto' => array('enhance_teacher_role' => array('title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.'),),
+				'manual' => array()
+			),
+		);
 
 		$this->updates = apply_filters( 'sensei_upgrade_functions', $this->updates, $this->updates );
 		$this->version = get_option( 'woothemes-sensei-version' );
 
-        // Manual Update Screen
-        add_action('admin_menu', array($this, 'add_update_admin_screen'), 50);
-
-    } // End __construct()
-
-    /**
-     * add_update_admin_screen Adds admin screen to run manual udpates
-     *
-     * @access public
-     * @since  1.3.7
-     * @return void
-     */
-    public function add_update_admin_screen()
-    {
-        if (current_user_can('manage_options')) {
-            add_submenu_page('sensei', __('Sensei Updates', 'woothemes-sensei'), __('Data Updates', 'woothemes-sensei'), 'manage_options', 'sensei_updates', array($this, 'sensei_updates_page'));
-        }
-    } // End add_update_admin_screen()
-
-    /**
-     * sensei_updates_page HTML output for manual update screen
-     *
-     * @access public
-     * @since  1.3.7
-     * @return void
-     */
-    public function sensei_updates_page() {
-
-        // Only allow admins to load this page and run the update functions
-        if ( ! current_user_can('manage_options')) {
-
-            return;
-
-        }
-        ?>
+		// Manual Update Screen
+		add_action('admin_menu', array($this, 'add_update_admin_screen'), 50);
+
+	} // End __construct()
+
+	/**
+	 * add_update_admin_screen Adds admin screen to run manual udpates
+	 *
+	 * @access public
+	 * @since  1.3.7
+	 * @return void
+	 */
+	public function add_update_admin_screen()
+	{
+		if (current_user_can('manage_options')) {
+			add_submenu_page('sensei', __('Sensei Updates', 'woothemes-sensei'), __('Data Updates', 'woothemes-sensei'), 'manage_options', 'sensei_updates', array($this, 'sensei_updates_page'));
+		}
+	} // End add_update_admin_screen()
+
+	/**
+	 * sensei_updates_page HTML output for manual update screen
+	 *
+	 * @access public
+	 * @since  1.3.7
+	 * @return void
+	 */
+	public function sensei_updates_page() {
+
+		// Only allow admins to load this page and run the update functions
+		if ( ! current_user_can('manage_options')) {
+
+			return;
+
+		}
+		?>
 
         <div class="wrap">
 
@@ -120,111 +120,111 @@ 
         <h2><?php _e('Sensei Updates', 'woothemes-sensei'); ?></h2>
 
         <?php
-        $function_name= '';
-        if ( isset($_GET['action']) && $_GET['action'] == 'update'
-            && isset($_GET['n']) && intval($_GET['n']) >= 0
-            && ( (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) || (isset($_GET['functions']) && '' != $_GET['functions']))) {
+		$function_name= '';
+		if ( isset($_GET['action']) && $_GET['action'] == 'update'
+			&& isset($_GET['n']) && intval($_GET['n']) >= 0
+			&& ( (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) || (isset($_GET['functions']) && '' != $_GET['functions']))) {
 
-            // Setup the data variables
-            $n = intval($_GET['n']);
-            $functions_list = '';
-            $done_processing = false;
+			// Setup the data variables
+			$n = intval($_GET['n']);
+			$functions_list = '';
+			$done_processing = false;
 
-            // Check for updates to run
-            if (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) {
+			// Check for updates to run
+			if (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) {
 
-                foreach ($_POST['checked'] as $key => $function_name) {
+				foreach ($_POST['checked'] as $key => $function_name) {
 
-                    if( ! isset(  $_POST[ $function_name.'_nonce_field' ] ) 
-                        || ! wp_verify_nonce( $_POST[ $function_name.'_nonce_field' ] , 'run_'.$function_name ) ){
+					if( ! isset(  $_POST[ $function_name.'_nonce_field' ] ) 
+						|| ! wp_verify_nonce( $_POST[ $function_name.'_nonce_field' ] , 'run_'.$function_name ) ){
 
-                        wp_die(
-                            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                            '<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
-                            403
-                        );
+						wp_die(
+							'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+							'<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+							403
+						);
 
-                    }
+					}
 
-                    // Dynamic function call
-                    if (method_exists($this, $function_name)) {
+					// Dynamic function call
+					if (method_exists($this, $function_name)) {
 
-                        $done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
+						$done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
 
-                    } elseif ($this->function_in_whitelist($function_name)) {
+					} elseif ($this->function_in_whitelist($function_name)) {
 
-                        $done_processing = call_user_func_array($function_name, array(50, $n));
+						$done_processing = call_user_func_array($function_name, array(50, $n));
 
-                    } else {
+					} else {
 
-                        _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
-                        return;
+						_doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+						return;
 
-                    }// End If Statement
+					}// End If Statement
 
-                // Add to functions list get args
-                if ('' == $functions_list) {
-                    $functions_list .= $function_name;
-                } else {
-                    $functions_list .= '+' . $function_name;
-                } // End If Statement
+				// Add to functions list get args
+				if ('' == $functions_list) {
+					$functions_list .= $function_name;
+				} else {
+					$functions_list .= '+' . $function_name;
+				} // End If Statement
 
-                // Mark update has having been run
-                $this->set_update_run($function_name);
+				// Mark update has having been run
+				$this->set_update_run($function_name);
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-        // Check for updates to run
-        if (isset($_GET['functions']) && '' != $_GET['functions']) {
+		// Check for updates to run
+		if (isset($_GET['functions']) && '' != $_GET['functions']) {
 
-            // Existing functions from GET variables instead of POST
-            $functions_array = $_GET['functions'];
+			// Existing functions from GET variables instead of POST
+			$functions_array = $_GET['functions'];
 
-            foreach ($functions_array as $key => $function_name) {
+			foreach ($functions_array as $key => $function_name) {
 
-                if( ! isset( $_GET[ $function_name.'_nonce' ] )
-                    || ! wp_verify_nonce( $_GET[ $function_name.'_nonce' ] , 'run_'.$function_name ) ){
+				if( ! isset( $_GET[ $function_name.'_nonce' ] )
+					|| ! wp_verify_nonce( $_GET[ $function_name.'_nonce' ] , 'run_'.$function_name ) ){
 
-                    wp_die(
-                        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                        '<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
-                        403
-                    );
+					wp_die(
+						'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+						'<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+						403
+					);
 
-                }
+				}
 
-                // Dynamic function call
-                if (method_exists($this, $function_name)) {
+				// Dynamic function call
+				if (method_exists($this, $function_name)) {
 
-                    $done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
+					$done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
 
-                } elseif ($this->function_in_whitelist($function_name)) {
+				} elseif ($this->function_in_whitelist($function_name)) {
 
-                    $done_processing = call_user_func_array($function_name, array(50, $n));
+					$done_processing = call_user_func_array($function_name, array(50, $n));
 
-                } else {
+				} else {
 
-                    _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
-                    return;
+					_doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+					return;
 
-                } // End If Statement
+				} // End If Statement
 
-                // Add to functions list get args
-                if ('' == $functions_list) {
-                    $functions_list .= $function_name;
-                } else {
-                    $functions_list .= '+' . $function_name;
-                } // End If Statement
+				// Add to functions list get args
+				if ('' == $functions_list) {
+					$functions_list .= $function_name;
+				} else {
+					$functions_list .= '+' . $function_name;
+				} // End If Statement
 
-                $this->set_update_run($function_name);
+				$this->set_update_run($function_name);
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-        if (!$done_processing) { ?>
+		if (!$done_processing) { ?>
 
             <h3><?php _e('Processing Updates...', 'woothemes-sensei'); ?></h3>
 
@@ -233,14 +233,14 @@ 
                 <?php _e( "If your browser doesn't start loading the next page automatically, click this button:", 'woothemes-sensei' ); ?>
 
                 <?php
-                $next_action_url = add_query_arg( array(
-                    'page' => 'sensei_updates',
-                    'action' => 'update',
-                    'n' => $n + 50,
-                    'functions' => array( $functions_list ),
-                    $function_name.'_nonce' => wp_create_nonce( 'run_'. $function_name ),
-                ), admin_url( 'admin.php' ) );
-                ?>
+				$next_action_url = add_query_arg( array(
+					'page' => 'sensei_updates',
+					'action' => 'update',
+					'n' => $n + 50,
+					'functions' => array( $functions_list ),
+					$function_name.'_nonce' => wp_create_nonce( 'run_'. $function_name ),
+				), admin_url( 'admin.php' ) );
+				?>
 
                 <a class="button"  href="<?php echo esc_url( $next_action_url ); ?>">
 
@@ -269,7 +269,7 @@ 
 
         <?php } // End If Statement
 
-        } else { ?>
+		} else { ?>
 
             <h3><?php _e('Updates', 'woothemes-sensei'); ?></h3>
             <p><?php printf(__('These are updates that have been made available as new Sensei versions have been released. Updates of type %1$sAuto%2$s will run as you update Sensei to the relevant version - other updates need to be run manually and you can do that here.', 'woothemes-sensei'), '<code>', '</code>'); ?></p>
@@ -298,19 +298,19 @@ 
 
                 <tbody class="updates">
                 <?php
-                // Sort updates with the latest at the top
-                uksort($this->updates, array($this, 'sort_updates'));
-                $this->updates = array_reverse($this->updates, true);
-                $class = 'alternate';
-                foreach ($this->updates as $version => $version_updates) {
-                    foreach ($version_updates as $type => $updates) {
-                        foreach ($updates as $update => $data) {
-                            $update_run = $this->has_update_run($update);
-                            $product = 'Sensei';
-                            if (isset($data['product']) && '' != $data['product']) {
-                                $product = $data['product'];
-                            } // End If Statement
-                            ?>
+				// Sort updates with the latest at the top
+				uksort($this->updates, array($this, 'sort_updates'));
+				$this->updates = array_reverse($this->updates, true);
+				$class = 'alternate';
+				foreach ($this->updates as $version => $version_updates) {
+					foreach ($version_updates as $type => $updates) {
+						foreach ($updates as $update => $data) {
+							$update_run = $this->has_update_run($update);
+							$product = 'Sensei';
+							if (isset($data['product']) && '' != $data['product']) {
+								$product = $data['product'];
+							} // End If Statement
+							?>
                             <form method="post" action="admin.php?page=sensei_updates&action=update&n=0"
                                   name="update-sensei" class="upgrade">
                                 <tr class="<?php echo $class; ?>">
@@ -323,11 +323,11 @@ 
                                         </p>
                                     </td>
                                     <?php
-                                    $type_label = __('Auto', 'woothemes-sensei');
-                                    if ($type != 'auto') {
-                                        $type_label = __('Manual', 'woothemes-sensei');
-                                    }
-                                    ?>
+									$type_label = __('Auto', 'woothemes-sensei');
+									if ($type != 'auto') {
+										$type_label = __('Manual', 'woothemes-sensei');
+									}
+									?>
                                     <td><p><?php echo $type_label; ?></p></td>
                                     <td>
                                         <p>
@@ -339,24 +339,24 @@ 
                                                    name="update">
 
                                             <?php
-                                            $nonce_action = 'run_'.$update;
-                                            $nonce_field_name = $update.'_nonce_field';
-                                            wp_nonce_field( $nonce_action, $nonce_field_name, false, true );
-                                            ?>
+											$nonce_action = 'run_'.$update;
+											$nonce_field_name = $update.'_nonce_field';
+											wp_nonce_field( $nonce_action, $nonce_field_name, false, true );
+											?>
                                         </p>
                                     </td>
                                 </tr>
                             </form>
                             <?php
-                            if ('alternate' == $class) {
-                                $class = '';
-                            } else {
-                                $class = 'alternate';
-                            }
-                        }
-                    }
-                }
-                ?>
+							if ('alternate' == $class) {
+								$class = '';
+							} else {
+								$class = 'alternate';
+							}
+						}
+					}
+				}
+				?>
                 </tbody>
 
             </table>
@@ -364,31 +364,31 @@ 
             </div>
 
             <?php
-        } // End If Statement
-    } // End sensei_updates_page()
+		} // End If Statement
+	} // End sensei_updates_page()
 
-    /**
-     * Since 1.9.0
-     *
-     * A list of safe to execute functions withing the
-     * updater context.
-     *
-     * @param string $function_name
-     */
-    public function function_in_whitelist( $function_name ){
+	/**
+	 * Since 1.9.0
+	 *
+	 * A list of safe to execute functions withing the
+	 * updater context.
+	 *
+	 * @param string $function_name
+	 */
+	public function function_in_whitelist( $function_name ){
 
-        $function_whitelist = array(
-            'status_changes_convert_questions',
-            'status_changes_fix_lessons',
-            'status_changes_convert_courses',
-            'status_changes_convert_lessons',
-            'status_changes_repair_course_statuses',
+		$function_whitelist = array(
+			'status_changes_convert_questions',
+			'status_changes_fix_lessons',
+			'status_changes_convert_courses',
+			'status_changes_convert_lessons',
+			'status_changes_repair_course_statuses',
 
-        );
+		);
 
-        return in_array($function_name, $function_whitelist );
+		return in_array($function_name, $function_whitelist );
 
-    }// end function_in_whitelist
+	}// end function_in_whitelist
 
 	/**
 	 * Sort updates list by version number
@@ -413,47 +413,47 @@ 
 
 		// Only allow admins to run update functions
 		if( ! current_user_can( 'manage_options' ) ) {
-            return false;
-        }
-
-        $this->force_updates();
-
-        // Run through all functions
-        foreach ( $this->updates as $version => $value ) {
-            foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
-                if ( $upgrade_type == $type ) {
-                    $updated = false;
-                    // Run the update function
-                    foreach ( $function_to_run as $function_name => $update_data ) {
-                        if ( isset( $function_name ) && '' != $function_name ) {
-                            if ( ! in_array( $function_name, $this->updates_run ) ) {
-                                $updated = false;
-                                if ( method_exists( $this, $function_name ) ) {
-
-            $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+			return false;
+		}
+
+		$this->force_updates();
+
+		// Run through all functions
+		foreach ( $this->updates as $version => $value ) {
+			foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
+				if ( $upgrade_type == $type ) {
+					$updated = false;
+					// Run the update function
+					foreach ( $function_to_run as $function_name => $update_data ) {
+						if ( isset( $function_name ) && '' != $function_name ) {
+							if ( ! in_array( $function_name, $this->updates_run ) ) {
+								$updated = false;
+								if ( method_exists( $this, $function_name ) ) {
+
+			$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
 			update_option( Sensei()->token . '-upgrades', $this->updates_run );
 			return true;
 
-                                } elseif( $this->function_in_whitelist( $function_name ) ) {
+								} elseif( $this->function_in_whitelist( $function_name ) ) {
 
-                                    $updated = call_user_func( $function_name );
+									$updated = call_user_func( $function_name );
 
-                                }  // End If Statement
+								}  // End If Statement
 
-                                if ( $updated ) {
-                                    array_push( $this->updates_run, $function_name );
-                                } // End If Statement
-                            }
-                        } // End If Statement
-                    } // End For Loop
-                } // End If Statement
-            } // End For Loop
-        } // End For Loop
+								if ( $updated ) {
+									array_push( $this->updates_run, $function_name );
+								} // End If Statement
+							}
+						} // End If Statement
+					} // End For Loop
+				} // End If Statement
+			} // End For Loop
+		} // End For Loop
 
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-        update_option( $this->token . '-upgrades', $this->updates_run );
+		$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+		update_option( $this->token . '-upgrades', $this->updates_run );
 
-        return true;
+		return true;
 
 	} // End update()
 
@@ -566,7 +566,7 @@ 
 	 */
 	private function set_update_run( $update ) {
 		array_push( $this->updates_run, $update );
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+		$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
 		update_option( Sensei()->token . '-upgrades', $this->updates_run );
 	}
 
@@ -1030,11 +1030,11 @@ 
 				update_post_meta( $lesson->ID, '_order_' . $course_id, 0 );
 			}
 
-            $module = Sensei()->modules->get_lesson_module( $lesson->ID );
+			$module = Sensei()->modules->get_lesson_module( $lesson->ID );
 
-            if( $module ) {
-                update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
-            }
+			if( $module ) {
+				update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
+			}
 
 		}
 
@@ -1844,22 +1844,22 @@ 
 
 	}
 
-     /**
-     * WooThemes_Sensei_Updates::enhance_teacher_role
-     *
-     * This runs the update to create the teacher role
-     * @access public
-     * @since 1.8.0
-     * @return bool;
-     */
-    public  function enhance_teacher_role ( ) {
-
-        require_once('class-sensei-teacher.php');
-        $teacher = new Sensei_Teacher();
-        $teacher->create_role();
-        return true;
-
-    }// end enhance_teacher_role
+	 /**
+	  * WooThemes_Sensei_Updates::enhance_teacher_role
+	  *
+	  * This runs the update to create the teacher role
+	  * @access public
+	  * @since 1.8.0
+	  * @return bool;
+	  */
+	public  function enhance_teacher_role ( ) {
+
+		require_once('class-sensei-teacher.php');
+		$teacher = new Sensei_Teacher();
+		$teacher->create_role();
+		return true;
+
+	}// end enhance_teacher_role
 
 } // End Class