woothemes / sensei

includes/class-sensei-analysis-overview-list-table.php

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Analysis Overview Data Table.
@@ -18,17 +18,17 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $type = 'users' ) {
-		$this->type = in_array( $type, array( 'courses', 'lessons', 'users' ) ) ? $type : 'users';
+	public function __construct($type = 'users') {
+		$this->type = in_array($type, array('courses', 'lessons', 'users')) ? $type : 'users';
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_overview' );
+		parent::__construct('analysis_overview');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -38,41 +38,41 @@ 
 	 */
 	function get_columns() {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$columns = array(
-					'title' => __( 'Course', 'woothemes-sensei' ),
-					'students' => __( 'Learners', 'woothemes-sensei' ),
-					'lessons' => __( 'Lessons', 'woothemes-sensei' ),
-					'completions' => __( 'Completed', 'woothemes-sensei' ),
-					'average_percent' => __( 'Average Percentage', 'woothemes-sensei' ),
+					'title' => __('Course', 'woothemes-sensei'),
+					'students' => __('Learners', 'woothemes-sensei'),
+					'lessons' => __('Lessons', 'woothemes-sensei'),
+					'completions' => __('Completed', 'woothemes-sensei'),
+					'average_percent' => __('Average Percentage', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => __( 'Lesson', 'woothemes-sensei' ),
-					'course' => __( 'Course', 'woothemes-sensei' ),
-					'students' => __( 'Learners', 'woothemes-sensei' ),
-					'completions' => __( 'Completed', 'woothemes-sensei' ),
-					'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+					'title' => __('Lesson', 'woothemes-sensei'),
+					'course' => __('Course', 'woothemes-sensei'),
+					'students' => __('Learners', 'woothemes-sensei'),
+					'completions' => __('Completed', 'woothemes-sensei'),
+					'average_grade' => __('Average Grade', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'users':
 			default:
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'registered' => __( 'Date Registered', 'woothemes-sensei' ),
-					'active_courses' => __( 'Active Courses', 'woothemes-sensei' ),
-					'completed_courses' => __( 'Completed Courses', 'woothemes-sensei' ),
-					'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'registered' => __('Date Registered', 'woothemes-sensei'),
+					'active_courses' => __('Active Courses', 'woothemes-sensei'),
+					'completed_courses' => __('Completed Courses', 'woothemes-sensei'),
+					'average_grade' => __('Average Grade', 'woothemes-sensei'),
 				);
 				break;
 		}
 		// Backwards compatible filter name, moving forward should have single filter name
-		$columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns', $columns, $this );
-		$columns = apply_filters( 'sensei_analysis_overview_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns', $columns, $this);
+		$columns = apply_filters('sensei_analysis_overview_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -83,41 +83,41 @@ 
 	 */
 	function get_sortable_columns() {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'students' => array( 'students', false ),
-					'lessons' => array( 'lessons', false ),
-					'completions' => array( 'completions', false ),
-					'average_percent' => array( 'average_percent', false ),
+					'title' => array('title', false),
+					'students' => array('students', false),
+					'lessons' => array('lessons', false),
+					'completions' => array('completions', false),
+					'average_percent' => array('average_percent', false),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'course' => array( 'course', false ),
-					'students' => array( 'students', false ),
-					'completions' => array( 'completions', false ),
-					'average_grade' => array( 'average_grade', false ),
+					'title' => array('title', false),
+					'course' => array('course', false),
+					'students' => array('students', false),
+					'completions' => array('completions', false),
+					'average_grade' => array('average_grade', false),
 				);
 				break;
 
 			case 'users':
 			default:
 				$columns = array(
-					'title' => array( 'user_login', false ),
-					'registered' => array( 'registered', false ),
-					'active_courses' => array( 'active_courses', false ),
-					'completed_courses' => array( 'completed_courses', false ),
-					'average_grade' => array( 'average_grade', false )
+					'title' => array('user_login', false),
+					'registered' => array('registered', false),
+					'active_courses' => array('active_courses', false),
+					'completed_courses' => array('completed_courses', false),
+					'average_grade' => array('average_grade', false)
 				);
 				break;
 		}
 		// Backwards compatible filter name, moving forward should have single filter name
-		$columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns_sortable', $columns, $this );
-		$columns = apply_filters( 'sensei_analysis_overview_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns_sortable', $columns, $this);
+		$columns = apply_filters('sensei_analysis_overview_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -131,25 +131,25 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -160,32 +160,32 @@ 
 		);
 
         // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
+        if (isset($_GET['s']) && ! empty($_GET['s'])) {
+            $args['search'] = esc_html($_GET['s']);
         }
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
-				$this->items = $this->get_courses( $args );
+				$this->items = $this->get_courses($args);
 				break;
 
 			case 'lessons':
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 
 			case 'users':
 			default :
-				$this->items = $this->get_learners( $args );
+				$this->items = $this->get_learners($args);
 				break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -201,16 +201,16 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		$args = array(
@@ -220,37 +220,37 @@ 
 
 
         // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
+        if (isset($_GET['s']) && ! empty($_GET['s'])) {
+            $args['search'] = esc_html($_GET['s']);
         }
 
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
-				$this->items = $this->get_courses( $args );
+				$this->items = $this->get_courses($args);
 				break;
 
 			case 'lessons':
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 
 			case 'users':
 			default :
-				$this->items = $this->get_learners( $args );
+				$this->items = $this->get_learners($args);
 				break;
 		}
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -262,9 +262,9 @@ 
 	 * @param object $item The current item
      * @return array $column_data;
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses' :
 				// Get Learners (i.e. those who have started)
 				$course_args = array( 
@@ -272,7 +272,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'any',
 					);
-				$course_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_learners', $course_args, $item ) );
+				$course_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_learners', $course_args, $item));
 
 				// Get Course Completions
 				$course_args = array( 
@@ -280,10 +280,10 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'complete',
 					);
-				$course_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_completions', $course_args, $item ) );
+				$course_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_completions', $course_args, $item));
 
 				// Course Lessons
-				$course_lessons = Sensei()->lesson->lesson_count( array('publish', 'private'), $item->ID );
+				$course_lessons = Sensei()->lesson->lesson_count(array('publish', 'private'), $item->ID);
 
 				// Get Percent Complete
 				$grade_args = array( 
@@ -293,31 +293,31 @@ 
 						'meta_key' => 'percent',
 					);
 
-				$percent_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_percentage', $grade_args, $item ), true ) );
-				$percent_total = Sensei_Grading::get_course_users_grades_sum( $item->ID );
+				$percent_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_percentage', $grade_args, $item), true));
+				$percent_total = Sensei_Grading::get_course_users_grades_sum($item->ID);
 
                 $course_average_percent = 0;
-                if( $percent_count > 0 && $percent_total > 0 ){
-                    $course_average_percent = abs( round( doubleval( $percent_total / $percent_count ), 2 ) );
+                if ($percent_count > 0 && $percent_total > 0) {
+                    $course_average_percent = abs(round(doubleval($percent_total / $percent_count), 2));
                 }
 
 
 				// Output course data
-				if ( $this->csv_output ) {
-					$course_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+				if ($this->csv_output) {
+					$course_title = apply_filters('the_title', $item->post_title, $item->ID);
 				}
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID ), admin_url( 'admin.php' ) );
+					$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID), admin_url('admin.php'));
 
-					$course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+					$course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 					$course_average_percent .= '%';
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $course_title,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $course_title,
 												'students' => $course_students,
 												'lessons' => $course_lessons,
 												'completions' => $course_completions,
 												'average_percent' => $course_average_percent,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'lessons' :
@@ -327,65 +327,65 @@ 
 						'type' => 'sensei_lesson_status',
 						'status' => 'any',
 					);
-				$lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) );
+				$lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item));
 
 				// Get Course Completions
 				$lesson_args = array( 
 						'post_id' => $item->ID,
 						'type' => 'sensei_lesson_status',
-						'status' => array( 'complete', 'graded', 'passed', 'failed' ),
+						'status' => array('complete', 'graded', 'passed', 'failed'),
 						'count' => true,
 					);
-				$lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) );
+				$lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item));
 
 				// Course 
-				$course_id = get_post_meta( $item->ID, '_lesson_course', true );
-				$course_title = $course_id ? get_the_title( $course_id ) : '';
+				$course_id = get_post_meta($item->ID, '_lesson_course', true);
+				$course_title = $course_id ? get_the_title($course_id) : '';
 
 				$lesson_average_grade = __('n/a', 'woothemes-sensei');
-				if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) {
+				if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) {
 					// Get Percent Complete
 					$grade_args = array( 
 							'post_id' => $item->ID,
 							'type' => 'sensei_lesson_status',
-							'status' => array( 'graded', 'passed', 'failed' ),
+							'status' => array('graded', 'passed', 'failed'),
 							'meta_key' => 'grade',
 						);
 
-					$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true ));
-					$grade_total = Sensei_Grading::get_lessons_users_grades_sum( $item->ID );
+					$grade_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true));
+					$grade_total = Sensei_Grading::get_lessons_users_grades_sum($item->ID);
 
                     $lesson_average_grade = 0;
-                    if( $grade_total > 0 && $grade_count > 0 ){
-                        $lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+                    if ($grade_total > 0 && $grade_count > 0) {
+                        $lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
                     }
 
                 }
 				// Output lesson data
-				if ( $this->csv_output ) {
-					$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+				if ($this->csv_output) {
+					$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 				}
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-					$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+					$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+					$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-					if ( $course_id ) {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-						$course_title = '<a href="' . esc_url( $url ) . '">' . $course_title . '</a>';
+					if ($course_id) {
+						$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+						$course_title = '<a href="'.esc_url($url).'">'.$course_title.'</a>';
 					}
 					else {
 						$course_title = __('n/a', 'woothemes-sensei');
 					}
-					if ( is_numeric( $lesson_average_grade ) ) {
+					if (is_numeric($lesson_average_grade)) {
 						$lesson_average_grade .= '%';
 					}
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $lesson_title,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $lesson_title,
 												'course' => $course_title,
 												'students' => $lesson_students,
 												'completions' => $lesson_completions,
 												'average_grade' => $lesson_average_grade,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'users' :
@@ -396,7 +396,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'any',
 					);
-				$user_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_started', $course_args, $item ) );
+				$user_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_started', $course_args, $item));
 
 				// Get Completed Courses
 				$course_args = array( 
@@ -404,7 +404,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'complete',
 					);
-				$user_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_ended', $course_args, $item ) );
+				$user_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_ended', $course_args, $item));
 
 				// Get Quiz Grades
 				$grade_args = array( 
@@ -414,29 +414,29 @@ 
 						'meta_key' => 'grade',
 					);
 
-				$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_lesson_grades', $grade_args, $item ), true ));
-				$grade_total = Sensei_Grading::get_user_graded_lessons_sum( $item->ID );
+				$grade_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_lesson_grades', $grade_args, $item), true));
+				$grade_total = Sensei_Grading::get_user_graded_lessons_sum($item->ID);
 
                 $user_average_grade = 0;
-                if( $grade_total > 0 && $grade_count > 0 ){
-                    $user_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+                if ($grade_total > 0 && $grade_count > 0) {
+                    $user_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
                 }
 
 				// Output the users data
-				if ( $this->csv_output ) {
-                    $user_name = Sensei_Learner::get_full_name( $item->ID );
+				if ($this->csv_output) {
+                    $user_name = Sensei_Learner::get_full_name($item->ID);
                 }
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
-					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
+					$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->ID), admin_url('admin.php'));
+					$user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$item->display_name.'</a></strong>';
 					$user_average_grade .= '%';
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $user_name,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $user_name,
 												'registered' => $item->user_registered,
-												'active_courses' => ( $user_courses_started - $user_courses_ended ),
+												'active_courses' => ($user_courses_started - $user_courses_ended),
 												'completed_courses' => $user_courses_ended,
 												'average_grade' => $user_average_grade,
-											), $item, $this );
+											), $item, $this);
 				break;
 		} // end switch
 		return $column_data;
@@ -447,7 +447,7 @@ 
 	 * @since  1.7.0
 	 * @return array courses
 	 */
-	private function get_courses( $args ) {
+	private function get_courses($args) {
 		$course_args = array(
 			'post_type' => 'course',
 			'post_status' => array('publish', 'private'),
@@ -458,16 +458,16 @@ 
 			'suppress_filters' => 0,
 		);
 
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$course_args['posts_per_page'] = '-1';
 		}
 
-		if( isset( $args['search'] ) ) {
+		if (isset($args['search'])) {
 			$course_args['s'] = $args['search'];
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$courses_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_courses', $course_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_courses', $course_args));
 		$this->total_items = $courses_query->found_posts;
 		return $courses_query->posts;
 
@@ -478,7 +478,7 @@ 
 	 * @since  1.7.0
 	 * @return array lessons
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 		$lessons_args = array(
 			'post_type' => 'lesson',
 			'post_status' => array('publish', 'private'),
@@ -489,16 +489,16 @@ 
 			'suppress_filters' => 0,
 		);
 
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$lessons_args['posts_per_page'] = '-1';
 		}
 
-		if( isset( $args['search'] ) ) {
+		if (isset($args['search'])) {
 			$lessons_args['s'] = $args['search'];
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$lessons_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_lessons', $lessons_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_lessons', $lessons_args));
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
 	} // End get_lessons()
@@ -508,24 +508,24 @@ 
 	 * @since  1.7.0
 	 * @return array learners
 	 */
-	private function get_learners( $args ) {
+	private function get_learners($args) {
 
-		if ( !empty($args['search']) ) {
+		if ( ! empty($args['search'])) {
 			$args = array(
-				'search' => '*' . trim( $args['search'], '*' ) . '*',
+				'search' => '*'.trim($args['search'], '*').'*',
 			);
 		}
 
 		// This stops the full meta data of each user being loaded
-		$args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' );
+		$args['fields'] = array('ID', 'user_login', 'user_email', 'user_registered', 'display_name');
 
         /**
          * Filter the WP_User_Query arguments
          * @since 1.6.0
          * @param $args
          */
-        $args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
-		$wp_user_search = new WP_User_Query( $args );
+        $args = apply_filters('sensei_analysis_overview_filter_users', $args);
+		$wp_user_search = new WP_User_Query($args);
         $learners = $wp_user_search->get_results();
 		$this->total_items = $wp_user_search->get_total();
 
@@ -538,18 +538,18 @@ 
 	 * @since  1.2.0
 	 * @return array $stats_to_render of stats boxes and values
 	 */
-	public function stats_boxes () {
+	public function stats_boxes() {
 
 		// Get the data required
 		$user_count = count_users();
-		$user_count = apply_filters( 'sensei_analysis_total_users', $user_count['total_users'], $user_count );
-		$total_courses = Sensei()->course->course_count( array('publish', 'private') );
-		$total_lessons = Sensei()->lesson->lesson_count( array('publish', 'private') );
+		$user_count = apply_filters('sensei_analysis_total_users', $user_count['total_users'], $user_count);
+		$total_courses = Sensei()->course->course_count(array('publish', 'private'));
+		$total_lessons = Sensei()->lesson->lesson_count(array('publish', 'private'));
 
         /**
          * filter the analysis tot grades query args
          */
-		$grade_args = apply_filters( 'sensei_analysis_total_quiz_grades', array(
+		$grade_args = apply_filters('sensei_analysis_total_quiz_grades', array(
 				'type' => 'sensei_lesson_status',
 				'status' => 'any',
 
@@ -559,8 +559,8 @@ 
 		$total_grade_count = Sensei_Grading::get_graded_lessons_count();
 		$total_grade_total = Sensei_Grading::get_graded_lessons_sum();
 		$total_average_grade = 0;
-		if( $total_grade_total > 0 &&  $total_grade_count >0   ){
-			$total_average_grade = abs( round( doubleval( $total_grade_total / $total_grade_count ), 2 ) );
+		if ($total_grade_total > 0 && $total_grade_count > 0) {
+			$total_average_grade = abs(round(doubleval($total_grade_total / $total_grade_count), 2));
 		}
 
 
@@ -568,24 +568,24 @@ 
 				'type' => 'sensei_course_status',
 				'status' => 'any',
 			);
-		$total_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_started', $course_args ) );
+		$total_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_started', $course_args));
 		$course_args = array( 
 				'type' => 'sensei_course_status',
 				'status' => 'complete',
 			);
-		$total_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_ended', $course_args ) );
-		$average_courses_per_learner = abs( round( doubleval( $total_courses_started / $user_count ), 2 ) );
+		$total_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_ended', $course_args));
+		$average_courses_per_learner = abs(round(doubleval($total_courses_started / $user_count), 2));
 
 		// Setup the boxes to render
 		$stats_to_render = array( 
-								__( 'Total Courses', 'woothemes-sensei' ) => $total_courses,
-								__( 'Total Lessons', 'woothemes-sensei' ) => $total_lessons,
-								__( 'Total Learners', 'woothemes-sensei' ) => $user_count,
-								__( 'Average Courses per Learner', 'woothemes-sensei' ) => $average_courses_per_learner,
-								__( 'Average Grade', 'woothemes-sensei' ) => $total_average_grade . '%',
-								__( 'Total Completed Courses', 'woothemes-sensei' ) => $total_courses_ended,
+								__('Total Courses', 'woothemes-sensei') => $total_courses,
+								__('Total Lessons', 'woothemes-sensei') => $total_lessons,
+								__('Total Learners', 'woothemes-sensei') => $user_count,
+								__('Average Courses per Learner', 'woothemes-sensei') => $average_courses_per_learner,
+								__('Average Grade', 'woothemes-sensei') => $total_average_grade.'%',
+								__('Total Completed Courses', 'woothemes-sensei') => $total_courses_ended,
 							);
-		return apply_filters( 'sensei_analysis_stats_boxes', $stats_to_render );
+		return apply_filters('sensei_analysis_stats_boxes', $stats_to_render);
 	} // End stats_boxes()
 
 	/**
@@ -595,12 +595,12 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		if( ! $this->view || 'users' == $this->view ) {
+		if ( ! $this->view || 'users' == $this->view) {
 			$type = 'learners';
 		} else {
 			$type = $this->view;
 		}
-		echo  sprintf( __( '%1$sNo %2$s found%3$s', 'woothemes-sensei' ), '<em>', $type, '</em>' );
+		echo  sprintf(__('%1$sNo %2$s found%3$s', 'woothemes-sensei'), '<em>', $type, '</em>');
 	} // End no_items()
 
 	/**
@@ -615,7 +615,7 @@ 
 			'page' => $this->page_slug,
 		);
 		$learners_class = $courses_class = $lessons_class = '';
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$courses_class = 'current';
 				break;
@@ -633,18 +633,18 @@ 
 		$lesson_args['view'] = 'lessons';
 		$courses_args['view'] = 'courses';
 
-		$menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ). '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>';
-		$menu['courses'] = '<a class="' . $courses_class . '" href="' . esc_url ( add_query_arg( $courses_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Courses', 'woothemes-sensei' ) . '</a>';
-		$menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>';
+		$menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>';
+		$menu['courses'] = '<a class="'.$courses_class.'" href="'.esc_url(add_query_arg($courses_args, admin_url('admin.php'))).'">'.__('Courses', 'woothemes-sensei').'</a>';
+		$menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>';
 
-		$menu = apply_filters( 'sensei_analysis_overview_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu = apply_filters('sensei_analysis_overview_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 	} // End data_table_header()
 
@@ -654,7 +654,7 @@ 
 	 * @return void
 	 */
 	public function data_table_footer() {
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$report = 'courses-overview';
 				break;
@@ -668,8 +668,8 @@ 
 				$report = 'user-overview';
 			break;
 		} // End Switch Statement
-		$url = add_query_arg( array( 'page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$url = add_query_arg(array('page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report), admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	} // End data_table_footer()
 
 	/**
@@ -677,19 +677,19 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	public function search_button( $text = '' ) {
-		switch( $this->type ) {
+	public function search_button($text = '') {
+		switch ($this->type) {
 			case 'courses':
-				$text = __( 'Search Courses', 'woothemes-sensei' );
+				$text = __('Search Courses', 'woothemes-sensei');
 			break;
 
 			case 'lessons':
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 
 			case 'users':
 			default:
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 		} // End Switch Statement
 

includes/class-sensei-course.php

Indentation +1458 added lines, -1458 removed lines

@@ -12,21 +12,21 @@ 
  */
 class Sensei_Course {
 
-    /**
-     * @var $token
-     */
+	/**
+	 * @var $token
+	 */
 	public $token;
 
-    /**
-     * @var array $meta_fields
-     */
+	/**
+	 * @var array $meta_fields
+	 */
 	public $meta_fields;
 
-    /**
-     * @var string|bool $my_courses_page reference to the sites
-     * my courses page, false if none was set
-     */
-    public  $my_courses_page;
+	/**
+	 * @var string|bool $my_courses_page reference to the sites
+	 * my courses page, false if none was set
+	 */
+	public  $my_courses_page;
 
 	/**
 	 * Constructor.
@@ -34,14 +34,14 @@ 
 	 */
 	public function __construct () {
 
-        $this->token = 'course';
+		$this->token = 'course';
 
 		// Setup meta fields for this post type
 		$this->meta_fields = array( 'course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product' );
 		// Admin actions
 		if ( is_admin() ) {
 			// Metabox functions
-            add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
+			add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
 			add_action( 'save_post', array( $this, 'meta_box_save' ) );
 			// Custom Write Panel Columns
 			add_filter( 'manage_edit-course_columns', array( $this, 'add_column_headings' ), 10, 1 );
@@ -57,47 +57,47 @@ 
 		// Update course completion upon grading of a quiz
 		add_action( 'sensei_user_quiz_grade', array( $this, 'update_status_after_quiz_submission' ), 10, 2 );
 
-        // show the progress bar ont he single course page
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
+		// show the progress bar ont he single course page
+		add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
+		add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
 
-        // provide an option to block all emails related to a selected course
-        add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
-        add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
+		// provide an option to block all emails related to a selected course
+		add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
+		add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
 
-        // preview lessons on the course content
-        add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
+		// preview lessons on the course content
+		add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
 
-        // the course meta
-        add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
+		// the course meta
+		add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
 
-        // backwards compatible template hooks
-        add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
-        add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
+		// backwards compatible template hooks
+		add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
+		add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
 
-        // add the user status on the course to the markup as a class
-        add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
+		// add the user status on the course to the markup as a class
+		add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
 
-        //filter the course query in Sensei specific instances
-        add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
+		//filter the course query in Sensei specific instances
+		add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
 
-        //attache the sorting to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
+		//attache the sorting to the course archive
+		add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
 
-        //attach the filter links to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
+		//attach the filter links to the course archive
+		add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
 
-        //filter the course query when featured filter is applied
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
+		//filter the course query when featured filter is applied
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
 
-        // handle the order by title post submission
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
+		// handle the order by title post submission
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
 
-        // ensure the course category page respects the manual order set for courses
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
+		// ensure the course category page respects the manual order set for courses
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
 
-        // flush rewrite rules when saving a course
-        add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
+		// flush rewrite rules when saving a course
+		add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
 
 	} // End __construct()
 
@@ -150,13 +150,13 @@ 
 		add_meta_box( 'course-video', __( 'Course Video', 'woothemes-sensei' ), array( $this, 'course_video_meta_box_content' ), $this->token, 'normal', 'default' );
 		// Add Meta Box for Course Lessons
 		add_meta_box( 'course-lessons', __( 'Course Lessons', 'woothemes-sensei' ), array( $this, 'course_lessons_meta_box_content' ), $this->token, 'normal', 'default' );
-        // Add Meta Box to link to Manage Learners
-        add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
-        // Remove "Custom Settings" meta box.
+		// Add Meta Box to link to Manage Learners
+		add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
+		// Remove "Custom Settings" meta box.
 		remove_meta_box( 'woothemes-settings', $this->token, 'normal' );
 
-        // add Disable email notification box
-        add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
+		// add Disable email notification box
+		add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
 
 	} // End meta_box_setup()
 
@@ -174,10 +174,10 @@ 
 		$post_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'DESC',
-    						'exclude' 			=> $post->ID,
-    						'post_status'		=> array( 'publish', 'private', 'draft' ),
-    						'tax_query'			=> array(
+							'order'           	=> 'DESC',
+							'exclude' 			=> $post->ID,
+							'post_status'		=> array( 'publish', 'private', 'draft' ),
+							'tax_query'			=> array(
 								array(
 									'taxonomy'	=> 'product_type',
 									'field'		=> 'slug',
@@ -205,21 +205,21 @@ 
 						$product_object = get_product( $post_item->ID );
 						$parent_id = wp_get_post_parent_id( $post_item->ID );
 
-                        if( sensei_check_woocommerce_version( '2.1' ) ) {
+						if( sensei_check_woocommerce_version( '2.1' ) ) {
 							$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
 
 						} else {
-                            // fall back to pre wc 2.1
+							// fall back to pre wc 2.1
 							$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
 
 						}
 
-                        $product_name = ucwords( $formatted_variation );
-                        if( empty( $product_name ) ){
+						$product_name = ucwords( $formatted_variation );
+						if( empty( $product_name ) ){
 
-                            $product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
+							$product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
 
-                        }
+						}
 
 					} else {
 
@@ -269,7 +269,7 @@ 
 
 			} else {
 
-                $html .= '<p>' . "\n";
+				$html .= '<p>' . "\n";
 					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . "\n";
 				$html .= '</p>'."\n";
 
@@ -295,8 +295,8 @@ 
 		$post_args = array(	'post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'DESC',
-    						'exclude' 			=> $post->ID,
+							'order'           	=> 'DESC',
+							'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
 		$posts_array = get_posts( $post_args );
@@ -337,7 +337,7 @@ 
 
 		$checked = '';
 		if ( isset( $course_featured ) && ( '' != $course_featured ) ) {
-	 	    $checked = checked( 'featured', $course_featured, false );
+	 		$checked = checked( 'featured', $course_featured, false );
 	 	} // End If Statement
 
 	 	$html .= '<input type="checkbox" name="course_featured" value="featured" ' . $checked . '>&nbsp;' . __( 'Feature this course', 'woothemes-sensei' ) . '<br>';
@@ -432,8 +432,8 @@ 
 			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
 		} // End If Statement
 
-        // update field with the new value
-        return update_post_meta( $post_id, $meta_key, $new_meta_value );
+		// update field with the new value
+		return update_post_meta( $post_id, $meta_key, $new_meta_value );
 
 	} // End save_post_meta()
 
@@ -457,8 +457,8 @@ 
 
 		$html = '';
 		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="'
-                 . esc_attr( 'woo_' . $this->token . '_noonce' )
-                 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+				 . esc_attr( 'woo_' . $this->token . '_noonce' )
+				 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
 
 		if ( count( $posts_array ) > 0 ) {
 
@@ -479,8 +479,8 @@ 
 			$html .= '<p>' . esc_html( __( 'No lessons exist yet for this course.', 'woothemes-sensei' ) ) . "\n";
 
 				$html .= '<a href="' . admin_url( 'post-new.php?post_type=lesson' . $course_id )
-                         . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
-                         . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
+						 . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
+						 . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
 
 			$html .= '</p>'."\n";
 		} // End If Statement
@@ -489,29 +489,29 @@ 
 
 	} // End course_lessons_meta_box_content()
 
-    /**
-     * course_manage_meta_box_content function.
-     *
-     * @since 1.9.0
-     * @access public
-     * @return void
-     */
+	/**
+	 * course_manage_meta_box_content function.
+	 *
+	 * @since 1.9.0
+	 * @access public
+	 * @return void
+	 */
 
-    public function course_manage_meta_box_content () {
-        global $post;
+	public function course_manage_meta_box_content () {
+		global $post;
         
-        $manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+		$manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
 
-        $grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+		$grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
 
 
-        echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
+		echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
 
-        echo "<li><a href='$grading_url'>".__("Manage Grading", 'woothemes-sensei')."</a></li></ul>";
+		echo "<li><a href='$grading_url'>".__("Manage Grading", 'woothemes-sensei')."</a></li></ul>";
 
 
 
-    } // End course_manage_meta_box_content()
+	} // End course_manage_meta_box_content()
 
 	/**
 	 * Add column headings to the "lesson" post list screen.
@@ -652,92 +652,92 @@ 
 			} // End If Statement
 		} // End If Statement
 
-        $stored_order = get_option( 'sensei_course_order', '' );
-        $order = 'ASC';
-        $orderby = 'menu_order';
-        if( empty( $stored_order ) ){
+		$stored_order = get_option( 'sensei_course_order', '' );
+		$order = 'ASC';
+		$orderby = 'menu_order';
+		if( empty( $stored_order ) ){
 
-            $order = 'DESC';
-            $orderby = 'date';
+			$order = 'DESC';
+			$orderby = 'date';
 
-        }
+		}
 
 		switch ($type) {
 
 			case 'usercourses':
 				$post_args = array(	'post_type' 		=> 'course',
 									'orderby'         	=> $orderby,
-    								'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'include'			=> $includes,
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'include'			=> $includes,
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 			case 'freecourses':
 
-                $post_args = array(
-                    'post_type' 		=> 'course',
-                    'orderby'         	=> $orderby,
-                    'order'           	=> $order,
-                    'post_status'      	=> 'publish',
-                    'exclude'			=> $excludes,
-                    'suppress_filters' 	=> 0
-                );
-                // Sub Query to get all WooCommerce Products that have Zero price
-                $post_args['meta_query'] = Sensei_WC::get_free_courses_meta_query_args();
+				$post_args = array(
+					'post_type' 		=> 'course',
+					'orderby'         	=> $orderby,
+					'order'           	=> $order,
+					'post_status'      	=> 'publish',
+					'exclude'			=> $excludes,
+					'suppress_filters' 	=> 0
+				);
+				// Sub Query to get all WooCommerce Products that have Zero price
+				$post_args['meta_query'] = Sensei_WC::get_free_courses_meta_query_args();
 
-                break;
+				break;
 
 			case 'paidcourses':
 
-                $post_args = array(
-                    'post_type' 		=> 'course',
-                    'orderby'         	=> $orderby,
-                    'order'           	=> $order,
-                    'post_status'      	=> 'publish',
-                    'exclude'			=> $excludes,
-                    'suppress_filters' 	=> 0
-                );
+				$post_args = array(
+					'post_type' 		=> 'course',
+					'orderby'         	=> $orderby,
+					'order'           	=> $order,
+					'post_status'      	=> 'publish',
+					'exclude'			=> $excludes,
+					'suppress_filters' 	=> 0
+				);
 
-                // Sub Query to get all WooCommerce Products that have price greater than zero
-                $post_args['meta_query'] = Sensei_WC::get_paid_courses_meta_query_args();
+				// Sub Query to get all WooCommerce Products that have price greater than zero
+				$post_args['meta_query'] = Sensei_WC::get_paid_courses_meta_query_args();
 
 				break;
 
 			case 'featuredcourses':
-                $post_args = array(	'post_type' 		=> 'course',
-                                    'orderby'         	=> $orderby,
-                                    'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'meta_value' 		=> 'featured',
-    								'meta_key' 			=> '_course_featured',
-    								'meta_compare' 		=> '=',
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+				$post_args = array(	'post_type' 		=> 'course',
+									'orderby'         	=> $orderby,
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'meta_value' 		=> 'featured',
+									'meta_key' 			=> '_course_featured',
+									'meta_compare' 		=> '=',
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 			default:
 				$post_args = array(	'post_type' 		=> 'course',
-                                    'orderby'         	=> $orderby,
-                                    'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+									'orderby'         	=> $orderby,
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 
 		}
 
-        $post_args['posts_per_page'] = $amount;
-        $paged = $wp_query->get( 'paged' );
-        $post_args['paged'] = empty( $paged) ? 1 : $paged;
+		$post_args['posts_per_page'] = $amount;
+		$paged = $wp_query->get( 'paged' );
+		$post_args['paged'] = empty( $paged) ? 1 : $paged;
 
-        if( 'newcourses' == $type ){
+		if( 'newcourses' == $type ){
 
-            $post_args[ 'orderby' ] = 'date';
-            $post_args[ 'order' ] = 'DESC';
-        }
+			$post_args[ 'orderby' ] = 'date';
+			$post_args[ 'order' ] = 'DESC';
+		}
 
 		return $post_args;
 	}
@@ -747,24 +747,24 @@ 
 	 * course_image function.
 	 *
 	 * Outputs the courses image, or first image from a lesson within a course
-     *
-     * Will echo the image unless return true is specified.
+	 *
+	 * Will echo the image unless return true is specified.
 	 *
 	 * @access public
 	 * @param int | WP_Post $course_id (default: 0)
 	 * @param string $width (default: '100')
 	 * @param string $height (default: '100')
-     * @param bool $return default false
-     *
+	 * @param bool $return default false
+	 *
 	 * @return string | void
 	 */
 	public function course_image( $course_id = 0, $width = '100', $height = '100', $return = false ) {
 
-        if ( is_a( $course_id, 'WP_Post' ) ) {
+		if ( is_a( $course_id, 'WP_Post' ) ) {
 
-	        $course_id = $course_id->ID;
+			$course_id = $course_id->ID;
 
-        }
+		}
 
 		if ( 'course' !== get_post_type( $course_id )  ){
 
@@ -827,7 +827,7 @@ 
  				// Display Image Placeholder if none
 				if ( Sensei()->settings->get( 'placeholder_images_enable' ) ) {
 
-                    $img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+					$img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
 
 				} // End If Statement
 
@@ -841,15 +841,15 @@ 
 
 		} // End If Statement
 
-        if( $return ){
+		if( $return ){
 
-            return $html;
+			return $html;
 
-        }else{
+		}else{
 
-            echo $html;
+			echo $html;
 
-        }
+		}
 
 	} // End course_image()
 
@@ -893,9 +893,9 @@ 
 	 */
 	public function course_lessons( $course_id = 0, $post_status = 'publish', $fields = 'all' ) {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
-            $course_id = $course_id->ID;
-        }
+		if( is_a( $course_id, 'WP_Post' ) ){
+			$course_id = $course_id->ID;
+		}
 
 		$post_args = array(	'post_type'         => 'lesson',
 							'posts_per_page'       => -1,
@@ -911,67 +911,67 @@ 
 							'suppress_filters'  => 0,
 							);
 		$query_results = new WP_Query( $post_args );
-        $lessons = $query_results->posts;
-
-        // re order the lessons. This could not be done via the OR meta query as there may be lessons
-        // with the course order for a different course and this should not be included. It could also not
-        // be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
-        // that have been added to the course.
-        if( count( $lessons) > 1  ){
-
-            foreach( $lessons as $lesson ){
-
-                $order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
-                // for lessons with no order set it to be 10000 so that it show up at the end
-                $lesson->course_order = $order ? $order : 100000;
-            }
-
-            uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
-        }
-
-        /**
-         * Filter runs inside Sensei_Course::course_lessons function
-         *
-         * Returns all lessons for a given course
-         *
-         * @param array $lessons
-         * @param int $course_id
-         */
-        $lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
-
-        //return the requested fields
-        // runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
-        // objects
-        if( 'ids' == $fields ) {
-            $lesson_objects = $lessons;
-            $lessons = array();
-
-            foreach ($lesson_objects as $lesson) {
-                $lessons[] = $lesson->ID;
-            }
-        }
-
-        return $lessons;
+		$lessons = $query_results->posts;
+
+		// re order the lessons. This could not be done via the OR meta query as there may be lessons
+		// with the course order for a different course and this should not be included. It could also not
+		// be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
+		// that have been added to the course.
+		if( count( $lessons) > 1  ){
+
+			foreach( $lessons as $lesson ){
+
+				$order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
+				// for lessons with no order set it to be 10000 so that it show up at the end
+				$lesson->course_order = $order ? $order : 100000;
+			}
+
+			uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
+		}
+
+		/**
+		 * Filter runs inside Sensei_Course::course_lessons function
+		 *
+		 * Returns all lessons for a given course
+		 *
+		 * @param array $lessons
+		 * @param int $course_id
+		 */
+		$lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
+
+		//return the requested fields
+		// runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
+		// objects
+		if( 'ids' == $fields ) {
+			$lesson_objects = $lessons;
+			$lessons = array();
+
+			foreach ($lesson_objects as $lesson) {
+				$lessons[] = $lesson->ID;
+			}
+		}
+
+		return $lessons;
 
 	} // End course_lessons()
 
-    /**
-     * Used for the uasort in $this->course_lessons()
-     * @since 1.8.0
-     * @access protected
-     *
-     * @param array $lesson_1
-     * @param array $lesson_2
-     * @return int
-     */
-    protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
+	/**
+	 * Used for the uasort in $this->course_lessons()
+	 * @since 1.8.0
+	 * @access protected
+	 *
+	 * @param array $lesson_1
+	 * @param array $lesson_2
+	 * @return int
+	 */
+	protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
 
-        if ( $lesson_1->course_order == $lesson_2->course_order ) {
-            return 0;
-        }
+		if ( $lesson_1->course_order == $lesson_2->course_order ) {
+			return 0;
+		}
 
-        return ($lesson_1->course_order < $lesson_2->course_order) ? -1 : 1;
-    }
+		return ($lesson_1->course_order < $lesson_2->course_order) ? -1 : 1;
+	}
 
 	/**
 	 * Fetch all quiz ids in a course
@@ -1034,15 +1034,15 @@ 
 	 */
 	public function course_author_lesson_count( $author_id = 0, $course_id = 0 ) {
 
-        $lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-		    					'author'         	=> $author_id,
-		    					'meta_key'        	=> '_lesson_course',
-    							'meta_value'      	=> $course_id,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
+								'author'         	=> $author_id,
+								'meta_key'        	=> '_lesson_course',
+								'meta_value'      	=> $course_id,
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 		$count = count( $lessons_array );
 		return $count;
@@ -1060,17 +1060,17 @@ 
 
 		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-		    					'meta_key'        	=> '_lesson_course',
-    							'meta_value'      	=> $course_id,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
+								'meta_key'        	=> '_lesson_course',
+								'meta_value'      	=> $course_id,
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 
-        $count = count( $lessons_array );
+		$count = count( $lessons_array );
 
-        return $count;
+		return $count;
 
 	} // End course_lesson_count()
 
@@ -1085,9 +1085,9 @@ 
 
 		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
-    	    					'meta_query' => array(
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
+								'meta_query' => array(
 									array(
 										'key' => '_lesson_course',
 										'value' => $course_id
@@ -1098,12 +1098,12 @@ 
 									)
 								),
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 
 		$count = count( $lessons_array );
 
-        return $count;
+		return $count;
 
 	} // End course_lesson_count()
 
@@ -1122,8 +1122,8 @@ 
 			$post_args = array(	'post_type' 		=> 'course',
 								'posts_per_page' 		=> -1,
 								'meta_key'        	=> '_course_woocommerce_product',
-	    						'meta_value'      	=> $product_id,
-	    						'post_status'       => 'publish',
+								'meta_value'      	=> $product_id,
+								'post_status'       => 'publish',
 								'suppress_filters' 	=> 0,
 								'orderby' 			=> 'menu_order date',
 								'order' 			=> 'ASC',
@@ -1155,9 +1155,9 @@ 
 
 	/**
 	 * load_user_courses_content generates HTML for user's active & completed courses
-     *
-     * This function also ouputs the html so no need to echo the content.
-     *
+	 *
+	 * This function also ouputs the html so no need to echo the content.
+	 *
 	 * @since  1.4.0
 	 * @param  object  $user   Queried user object
 	 * @param  boolean $manage Whether the user has permission to manage the courses
@@ -1166,17 +1166,17 @@ 
 	public function load_user_courses_content( $user = false ) {
 		global $course, $my_courses_page, $my_courses_section;
 
-        if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
-            || ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
+		if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
+			|| ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
 
-            // do not show the content if the settings doesn't allow for it
-            return;
+			// do not show the content if the settings doesn't allow for it
+			return;
 
-        }
+		}
 
-        $manage = ( $user->ID == get_current_user_id() ) ? true : false;
+		$manage = ( $user->ID == get_current_user_id() ) ? true : false;
 
-        do_action( 'sensei_before_learner_course_content', $user );
+		do_action( 'sensei_before_learner_course_content', $user );
 
 		// Build Output HTML
 		$complete_html = $active_html = '';
@@ -1191,7 +1191,7 @@ 
 			// Logic for Active and Completed Courses
 			$per_page = 20;
 			if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] )
-                && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
+				&& ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
 
 				$per_page = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
 
@@ -1237,112 +1237,112 @@ 
 					}
 				}
 
-			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+				// Get Course Categories
+				$category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
 
-                $active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
+				$active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
 
-                // Image
-                $active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
+				// Image
+				$active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
 
-                // Title
-                $active_html .= '<header>';
+				// Title
+				$active_html .= '<header>';
 
-                $active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+				$active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
 
-                $active_html .= '</header>';
+				$active_html .= '</header>';
 
-                $active_html .= '<section class="entry">';
+				$active_html .= '<section class="entry">';
 
-                $active_html .= '<p class="sensei-course-meta">';
+				$active_html .= '<p class="sensei-course-meta">';
 
-                // Author
-                $user_info = get_userdata( absint( $course_item->post_author ) );
-                if ( isset( Sensei()->settings->settings[ 'course_author' ] )
-                    && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+				// Author
+				$user_info = get_userdata( absint( $course_item->post_author ) );
+				if ( isset( Sensei()->settings->settings[ 'course_author' ] )
+					&& ( Sensei()->settings->settings[ 'course_author' ] ) ) {
 
-                    $active_html .= '<span class="course-author">'
-                        . __( 'by ', 'woothemes-sensei' )
-                        . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
-                        . '" title="' . esc_attr( $user_info->display_name ) . '">'
-                        . esc_html( $user_info->display_name )
-                        . '</a></span>';
+					$active_html .= '<span class="course-author">'
+						. __( 'by ', 'woothemes-sensei' )
+						. '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
+						. '" title="' . esc_attr( $user_info->display_name ) . '">'
+						. esc_html( $user_info->display_name )
+						. '</a></span>';
 
-                } // End If Statement
+				} // End If Statement
 
-                // Lesson count for this author
-                $lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
-                // Handle Division by Zero
-                if ( 0 == $lesson_count ) {
+				// Lesson count for this author
+				$lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
+				// Handle Division by Zero
+				if ( 0 == $lesson_count ) {
 
-                    $lesson_count = 1;
+					$lesson_count = 1;
 
-                } // End If Statement
-                $active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
-                // Course Categories
-                if ( '' != $category_output ) {
+				} // End If Statement
+				$active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
+				// Course Categories
+				if ( '' != $category_output ) {
 
-                    $active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+					$active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
 
-                } // End If Statement
-                $active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
+				} // End If Statement
+				$active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
 
-                $active_html .= '</p>';
+				$active_html .= '</p>';
 
-                $active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+				$active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
 
 
 
-                $progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
+				$progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
 
-                $active_html .= $this->get_progress_meter( $progress_percentage );
+				$active_html .= $this->get_progress_meter( $progress_percentage );
 
-                $active_html .= '</section>';
+				$active_html .= '</section>';
 
-                if( is_user_logged_in() ) {
+				if( is_user_logged_in() ) {
 
-                    $active_html .= '<section class="entry-actions">';
+					$active_html .= '<section class="entry-actions">';
 
-                    $active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
+					$active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
 
-                    $active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
+					$active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
 
-                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
+					$active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
 
-                    if ( 0 < absint( count( $course_lessons ) )
-                        && Sensei()->settings->settings['course_completion'] == 'complete' ){
+					if ( 0 < absint( count( $course_lessons ) )
+						&& Sensei()->settings->settings['course_completion'] == 'complete' ){
 
-                        $active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
-                            .  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
+						$active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
+							.  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
 
-                    } // End If Statement
+					} // End If Statement
 
-                    $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
+					$course_purchased = false;
+					if ( Sensei_WC::is_woocommerce_active() ) {
 
-                        // Get the product ID
-                        $wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+						// Get the product ID
+						$wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
+						if ( 0 < $wc_post_id ) {
 
-                            $course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
+							$course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
 
-                        } // End If Statement
+						} // End If Statement
 
-                    } // End If Statement
+					} // End If Statement
 
-                    if ( false == $course_purchased ) {
+					if ( false == $course_purchased ) {
 
-                        $active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
-                            .  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
+						$active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
+							.  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
 
-                    } // End If Statement
+					} // End If Statement
 
-                    $active_html .= '</form>';
+					$active_html .= '</form>';
 
-                    $active_html .= '</section>';
-                }
+					$active_html .= '</section>';
+				}
 
-                $active_html .= '</article>';
+				$active_html .= '</article>';
 			}
 
 			// Active pagination
@@ -1382,49 +1382,49 @@ 
 			foreach ( $completed_courses as $course_item ) {
 				$course = $course_item;
 
-			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+				// Get Course Categories
+				$category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
 
-		    	$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
+				$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
 
-		    	    // Image
-		    		$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
+					// Image
+					$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
 
-		    		// Title
-		    		$complete_html .= '<header>';
+					// Title
+					$complete_html .= '<header>';
 
-		    		    $complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+						$complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
 
-		    		$complete_html .= '</header>';
+					$complete_html .= '</header>';
 
-		    		$complete_html .= '<section class="entry">';
+					$complete_html .= '<section class="entry">';
 
-		    			$complete_html .= '<p class="sensei-course-meta">';
+						$complete_html .= '<p class="sensei-course-meta">';
 
-		    		    	// Author
-		    		    	$user_info = get_userdata( absint( $course_item->post_author ) );
-		    		    	if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
-		    		    		$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
-		    		    	} // End If Statement
+							// Author
+							$user_info = get_userdata( absint( $course_item->post_author ) );
+							if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+								$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+							} // End If Statement
 
-		    		    	// Lesson count for this author
-		    		    	$complete_html .= '<span class="course-lesson-count">'
-                                . Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
-                                . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
-                                . '</span>';
+							// Lesson count for this author
+							$complete_html .= '<span class="course-lesson-count">'
+								. Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
+								. '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
+								. '</span>';
 
-		    		    	// Course Categories
-		    		    	if ( '' != $category_output ) {
+							// Course Categories
+							if ( '' != $category_output ) {
 
-		    		    		$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+								$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
 
-		    		    	} // End If Statement
+							} // End If Statement
 
 						$complete_html .= '</p>';
 
 						$complete_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
 
-                        $complete_html .= $this->get_progress_meter( 100 );
+						$complete_html .= $this->get_progress_meter( 100 );
 
 						if( $manage ) {
 							$has_quizzes = Sensei()->course->course_quizzes( $course_item->ID, true );
@@ -1437,22 +1437,22 @@ 
 								if( $has_quizzes ) {
 
 									$results_link = '<a class="button view-results" href="'
-                                        . Sensei()->course_results->get_permalink( $course_item->ID )
-                                        . '">' . __( 'View results', 'woothemes-sensei' )
-                                        . '</a>';
+										. Sensei()->course_results->get_permalink( $course_item->ID )
+										. '">' . __( 'View results', 'woothemes-sensei' )
+										. '</a>';
 								}
-                                /**
-                                 * Filter documented in Sensei_Course::the_course_action_buttons
-                                 */
+								/**
+								 * Filter documented in Sensei_Course::the_course_action_buttons
+								 */
 								$complete_html .= apply_filters( 'sensei_results_links', $results_link, $course_item->ID );
 								$complete_html .= '</p>';
 
 							}
 						}
 
-		    		$complete_html .= '</section>';
+					$complete_html .= '</section>';
 
-		    	$complete_html .= '</article>';
+				$complete_html .= '</article>';
 			}
 
 			// Active pagination
@@ -1527,16 +1527,16 @@ 
 		    <?php do_action( 'sensei_before_active_user_courses' ); ?>
 
 		    <?php
-            $course_page_url = Sensei_Course::get_courses_page_url();
-            ?>
+			$course_page_url = Sensei_Course::get_courses_page_url();
+			?>
 
 		    <div id="active-courses">
 
 		    	<?php if ( '' != $active_html ) {
 
-		    		echo $active_html;
+					echo $active_html;
 
-		    	} else { ?>
+				} else { ?>
 
 		    		<div class="sensei-message info">
 
@@ -1562,9 +1562,9 @@ 
 
 		    	<?php if ( '' != $complete_html ) {
 
-		    		echo $complete_html;
+					echo $complete_html;
 
-		    	} else { ?>
+				} else { ?>
 
 		    		<div class="sensei-message info">
 
@@ -1583,356 +1583,356 @@ 
 		<?php do_action( 'sensei_after_user_courses' ); ?>
 
 		<?php
-        echo ob_get_clean();
+		echo ob_get_clean();
 
-        do_action( 'sensei_after_learner_course_content', $user );
+		do_action( 'sensei_after_learner_course_content', $user );
 
 	} // end load_user_courses_content
 
-    /**
-     * Returns a list of all courses
-     *
-     * @since 1.8.0
-     * @return array $courses{
-     *  @type $course WP_Post
-     * }
-     */
-    public static function get_all_courses(){
-
-        $args = array(
-               'post_type' => 'course',
-                'posts_per_page' 		=> -1,
-                'orderby'         	=> 'title',
-                'order'           	=> 'ASC',
-                'post_status'      	=> 'any',
-                'suppress_filters' 	=> 0,
-        );
-
-        $wp_query_obj =  new WP_Query( $args );
-
-        /**
-         * sensei_get_all_courses filter
-         *
-         * This filter runs inside Sensei_Course::get_all_courses.
-         *
-         * @param array $courses{
-         *  @type WP_Post
-         * }
-         * @param array $attributes
-         */
-        return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
-
-    }// end get_all_courses
-
-    /**
-     * Generate the course meter component
-     *
-     * @since 1.8.0
-     * @param int $progress_percentage 0 - 100
-     * @return string $progress_bar_html
-     */
-    public function get_progress_meter( $progress_percentage ){
-
-        if ( 50 < $progress_percentage ) {
-            $class = ' green';
-        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
-            $class = ' orange';
-        } else {
-            $class = ' red';
-        }
-        $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
-
-        return $progress_bar_html;
-
-    }// end get_progress_meter
-
-    /**
-     * Generate a statement that tells users
-     * how far they are in the course.
-     *
-     * @param int $course_id
-     * @param int $user_id
-     *
-     * @return string $statement_html
-     */
-    public function get_progress_statement( $course_id, $user_id ){
-
-        if( empty( $course_id ) || empty( $user_id )
-        || ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
-            return '';
-        }
-
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-        $total_lessons = count( $this->course_lessons( $course_id ) );
-
-        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
-
-        /**
-         * Filter the course completion statement.
-         * Default Currently completed $var lesson($plural) of $var in total
-         *
-         * @param string $statement
-         */
-        return apply_filters( 'sensei_course_completion_statement', $statement );
-
-    }// end generate_progress_statement
-
-    /**
-     * Output the course progress statement
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_statement( $course_id = 0, $user_id = 0 ){
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
-    }
-
-    /**
-     * Output the course progress bar
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_meter( $course_id = 0, $user_id = 0 ){
-
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
-            || ! Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
-            return;
-        }
-        $percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
-
-        echo $this->get_progress_meter( $percentage_completed );
-
-    }// end the_progress_meter
-
-    /**
-     * Checks how many lessons are completed
-     *
-     * @since 1.8.0
-     *
-     * @param int $course_id
-     * @param int $user_id
-     * @return array $completed_lesson_ids
-     */
-    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
-
-        if( !( intval( $user_id ) ) > 0 ){
-            $user_id = get_current_user_id();
-        }
+	/**
+	 * Returns a list of all courses
+	 *
+	 * @since 1.8.0
+	 * @return array $courses{
+	 *  @type $course WP_Post
+	 * }
+	 */
+	public static function get_all_courses(){
+
+		$args = array(
+			   'post_type' => 'course',
+				'posts_per_page' 		=> -1,
+				'orderby'         	=> 'title',
+				'order'           	=> 'ASC',
+				'post_status'      	=> 'any',
+				'suppress_filters' 	=> 0,
+		);
+
+		$wp_query_obj =  new WP_Query( $args );
+
+		/**
+		 * sensei_get_all_courses filter
+		 *
+		 * This filter runs inside Sensei_Course::get_all_courses.
+		 *
+		 * @param array $courses{
+		 *  @type WP_Post
+		 * }
+		 * @param array $attributes
+		 */
+		return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
+
+	}// end get_all_courses
 
-        $completed_lesson_ids = array();
+	/**
+	 * Generate the course meter component
+	 *
+	 * @since 1.8.0
+	 * @param int $progress_percentage 0 - 100
+	 * @return string $progress_bar_html
+	 */
+	public function get_progress_meter( $progress_percentage ){
 
-        $course_lessons = $this->course_lessons( $course_id );
+		if ( 50 < $progress_percentage ) {
+			$class = ' green';
+		} elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
+			$class = ' orange';
+		} else {
+			$class = ' red';
+		}
+		$progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
 
-        foreach( $course_lessons as $lesson ){
+		return $progress_bar_html;
 
-            $is_lesson_completed = Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
-            if( $is_lesson_completed ){
-                $completed_lesson_ids[] = $lesson->ID;
-            }
-
-        }
-
-        return $completed_lesson_ids;
+	}// end get_progress_meter
 
-    }// end get_completed_lesson_ids
+	/**
+	 * Generate a statement that tells users
+	 * how far they are in the course.
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 *
+	 * @return string $statement_html
+	 */
+	public function get_progress_statement( $course_id, $user_id ){
 
-    /**
-     * Calculate the perceantage completed in the course
-     *
-     * @since 1.8.0
-     *
-     * @param int $course_id
-     * @param int $user_id
-     * @return int $percentage
-     */
-    public function get_completion_percentage( $course_id, $user_id = 0 ){
-
-        if( !( intval( $user_id ) ) > 0 ){
-            $user_id = get_current_user_id();
-        }
-
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-
-        if( ! (  $completed  > 0 ) ){
-            return 0;
-        }
-
-        $total_lessons = count( $this->course_lessons( $course_id ) );
-        $percentage = $completed / $total_lessons * 100;
-
-        /**
-         *
-         * Filter the percentage returned for a users course.
-         *
-         * @param $percentage
-         * @param $course_id
-         * @param $user_id
-         * @since 1.8.0
-         */
-        return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+		if( empty( $course_id ) || empty( $user_id )
+		|| ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+			return '';
+		}
 
-    }// end get_completed_lesson_ids
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+		$total_lessons = count( $this->course_lessons( $course_id ) );
 
-    /**
-     * Block email notifications for the specific courses
-     * that the user disabled the notifications.
-     *
-     * @since 1.8.0
-     * @param $should_send
-     * @return bool
-     */
-    public function block_notification_emails( $should_send ){
-        global $sensei_email_data;
-        $email = $sensei_email_data;
+		$statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
 
-        $course_id = '';
+		/**
+		 * Filter the course completion statement.
+		 * Default Currently completed $var lesson($plural) of $var in total
+		 *
+		 * @param string $statement
+		 */
+		return apply_filters( 'sensei_course_completion_statement', $statement );
 
-        if( isset( $email['course_id'] ) ){
+	}// end generate_progress_statement
 
-            $course_id = $email['course_id'];
-
-        }elseif( isset( $email['lesson_id'] ) ){
+	/**
+	 * Output the course progress statement
+	 *
+	 * @param $course_id
+	 * @return void
+	 */
+	public function the_progress_statement( $course_id = 0, $user_id = 0 ){
+		if( empty( $course_id ) ){
+			global $post;
+			$course_id = $post->ID;
+		}
 
-            $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+		if( empty( $user_id ) ){
+			$user_id = get_current_user_id();
+		}
 
-        }elseif( isset( $email['quiz_id'] ) ){
+		echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
+	}
 
-            $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+	/**
+	 * Output the course progress bar
+	 *
+	 * @param $course_id
+	 * @return void
+	 */
+	public function the_progress_meter( $course_id = 0, $user_id = 0 ){
+
+		if( empty( $course_id ) ){
+			global $post;
+			$course_id = $post->ID;
+		}
+
+		if( empty( $user_id ) ){
+			$user_id = get_current_user_id();
+		}
+
+		if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
+			|| ! Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
+			return;
+		}
+		$percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
+
+		echo $this->get_progress_meter( $percentage_completed );
+
+	}// end the_progress_meter
+
+	/**
+	 * Checks how many lessons are completed
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return array $completed_lesson_ids
+	 */
+	public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
+
+		$completed_lesson_ids = array();
 
-        }
+		$course_lessons = $this->course_lessons( $course_id );
 
-        if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
-
-            $course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
-
-            if ($course_emails_disabled) {
-
-                return false;
-
-            }
-
-        }// end if
-
-        return $should_send;
-    }// end block_notification_emails
-
-    /**
-     * Render the course notification setting meta box
-     *
-     * @since 1.8.0
-     * @param $course
-     */
-    public function course_notification_meta_box_content( $course ){
-
-        $checked = get_post_meta( $course->ID , 'disable_notification', true );
-
-        // generate checked html
-        $checked_html = '';
-        if( $checked ){
-            $checked_html = 'checked="checked"';
-        }
-        wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
-
-        echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
-        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
-
-    }// end course_notification_meta_box_content
-
-    /**
-     * Store the setting for the course notification setting.
-     *
-     * @hooked int save_post
-     * @since 1.8.0
-     *
-     * @param $course_id
-     */
-    public function save_course_notification_meta_box( $course_id ){
-
-        if( !isset( $_POST['_sensei_course_notification']  )
-            || ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
-            return;
-        }
-
-        if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
-            $new_val = true;
-        }else{
-            $new_val = false;
-        }
-
-       update_post_meta( $course_id , 'disable_notification', $new_val );
-
-    }// end save notification meta box
-
-    /**
-     * Backwards compatibility hooks added to ensure that
-     * plugins and other parts of sensei still works.
-     *
-     * This function hooks into `sensei_course_content_inside_before`
-     *
-     * @since 1.9
-     *
-     * @param WP_Post $post
-     */
-    public function content_before_backwards_compatibility_hooks( $post_id ){
-
-        sensei_do_deprecated_action( 'sensei_course_image','1.9.0','sensei_course_content_inside_before' );
-        sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before' );
-
-    }
+		foreach( $course_lessons as $lesson ){
 
-    /**
-     * Backwards compatibility hooks that should be hooked into sensei_loop_course_before
-     *
-     * hooked into 'sensei_loop_course_before'
-     *
-     * @since 1.9
-     *
-     * @global WP_Post $post
-     */
-    public  function loop_before_backwards_compatibility_hooks( ){
-
-        global $post;
-        sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
-
-    }
-
-    /**
-     * Output a link to view course. The button text is different depending on the amount of preview lesson available.
-     *
-     * hooked into 'sensei_course_content_inside_after'
-     *
-     * @since 1.9.0
-     *
-     * @param integer $course_id
-     */
-    public function the_course_free_lesson_preview( $course_id ){
-        // Meta data
-        $course = get_post( $course_id );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-            ?>
+			$is_lesson_completed = Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
+			if( $is_lesson_completed ){
+				$completed_lesson_ids[] = $lesson->ID;
+			}
+
+		}
+
+		return $completed_lesson_ids;
+
+	}// end get_completed_lesson_ids
+
+	/**
+	 * Calculate the perceantage completed in the course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return int $percentage
+	 */
+	public function get_completion_percentage( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
+
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+
+		if( ! (  $completed  > 0 ) ){
+			return 0;
+		}
+
+		$total_lessons = count( $this->course_lessons( $course_id ) );
+		$percentage = $completed / $total_lessons * 100;
+
+		/**
+		 *
+		 * Filter the percentage returned for a users course.
+		 *
+		 * @param $percentage
+		 * @param $course_id
+		 * @param $user_id
+		 * @since 1.8.0
+		 */
+		return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+
+	}// end get_completed_lesson_ids
+
+	/**
+	 * Block email notifications for the specific courses
+	 * that the user disabled the notifications.
+	 *
+	 * @since 1.8.0
+	 * @param $should_send
+	 * @return bool
+	 */
+	public function block_notification_emails( $should_send ){
+		global $sensei_email_data;
+		$email = $sensei_email_data;
+
+		$course_id = '';
+
+		if( isset( $email['course_id'] ) ){
+
+			$course_id = $email['course_id'];
+
+		}elseif( isset( $email['lesson_id'] ) ){
+
+			$course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+
+		}elseif( isset( $email['quiz_id'] ) ){
+
+			$lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
+			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+
+		}
+
+		if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
+
+			$course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
+
+			if ($course_emails_disabled) {
+
+				return false;
+
+			}
+
+		}// end if
+
+		return $should_send;
+	}// end block_notification_emails
+
+	/**
+	 * Render the course notification setting meta box
+	 *
+	 * @since 1.8.0
+	 * @param $course
+	 */
+	public function course_notification_meta_box_content( $course ){
+
+		$checked = get_post_meta( $course->ID , 'disable_notification', true );
+
+		// generate checked html
+		$checked_html = '';
+		if( $checked ){
+			$checked_html = 'checked="checked"';
+		}
+		wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
+
+		echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
+		echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
+
+	}// end course_notification_meta_box_content
+
+	/**
+	 * Store the setting for the course notification setting.
+	 *
+	 * @hooked int save_post
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 */
+	public function save_course_notification_meta_box( $course_id ){
+
+		if( !isset( $_POST['_sensei_course_notification']  )
+			|| ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
+			return;
+		}
+
+		if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
+			$new_val = true;
+		}else{
+			$new_val = false;
+		}
+
+	   update_post_meta( $course_id , 'disable_notification', $new_val );
+
+	}// end save notification meta box
+
+	/**
+	 * Backwards compatibility hooks added to ensure that
+	 * plugins and other parts of sensei still works.
+	 *
+	 * This function hooks into `sensei_course_content_inside_before`
+	 *
+	 * @since 1.9
+	 *
+	 * @param WP_Post $post
+	 */
+	public function content_before_backwards_compatibility_hooks( $post_id ){
+
+		sensei_do_deprecated_action( 'sensei_course_image','1.9.0','sensei_course_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before' );
+
+	}
+
+	/**
+	 * Backwards compatibility hooks that should be hooked into sensei_loop_course_before
+	 *
+	 * hooked into 'sensei_loop_course_before'
+	 *
+	 * @since 1.9
+	 *
+	 * @global WP_Post $post
+	 */
+	public  function loop_before_backwards_compatibility_hooks( ){
+
+		global $post;
+		sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
+
+	}
+
+	/**
+	 * Output a link to view course. The button text is different depending on the amount of preview lesson available.
+	 *
+	 * hooked into 'sensei_course_content_inside_after'
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $course_id
+	 */
+	public function the_course_free_lesson_preview( $course_id ){
+		// Meta data
+		$course = get_post( $course_id );
+		$preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+
+		if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
+			?>
             <p class="sensei-free-lessons">
                 <a href="<?php echo get_permalink(); ?>">
                     <?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
@@ -1941,23 +1941,23 @@ 
             </p>
 
         <?php
-        }
-    }
+		}
+	}
 
-    /**
-     * Add course mata to the course meta hook
-     *
-     * @since 1.9.0
-     * @param integer $course_id
-     */
-    public function the_course_meta( $course_id ){
-        echo '<p class="sensei-course-meta">';
+	/**
+	 * Add course mata to the course meta hook
+	 *
+	 * @since 1.9.0
+	 * @param integer $course_id
+	 */
+	public function the_course_meta( $course_id ){
+		echo '<p class="sensei-course-meta">';
 
-        $course = get_post( $course_id );
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+		$course = get_post( $course_id );
+		$category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
+		$author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+		if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
 
             <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
 
@@ -1975,62 +1975,62 @@ 
 
         <?php } // End If Statement
 
-        // number of completed lessons
-        if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
-            || Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
+		// number of completed lessons
+		if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
+			|| Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
 
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+			$completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
+			$lesson_count = count( $this->course_lessons( $course->ID ) );
+			echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
 
-        }
+		}
 
-        sensei_simple_course_price( $course->ID );
+		sensei_simple_course_price( $course->ID );
 
-        echo '</p>';
-    } // end the course meta
+		echo '</p>';
+	} // end the course meta
 
-    /**
-     * Filter the classes attached to a post types for courses
-     * and add a status class for when the user is logged in.
-     *
-     * @param $classes
-     * @param $class
-     * @param $post_id
-     *
-     * @return array $classes
-     */
-    public static function add_course_user_status_class( $classes, $class, $course_id ){
+	/**
+	 * Filter the classes attached to a post types for courses
+	 * and add a status class for when the user is logged in.
+	 *
+	 * @param $classes
+	 * @param $class
+	 * @param $post_id
+	 *
+	 * @return array $classes
+	 */
+	public static function add_course_user_status_class( $classes, $class, $course_id ){
 
-        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
+		if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
 
-            if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
+			if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
 
-                $classes[] = 'user-status-completed';
+				$classes[] = 'user-status-completed';
 
-            }else{
+			}else{
 
-                $classes[] = 'user-status-active';
+				$classes[] = 'user-status-active';
 
-            }
+			}
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end add_course_user_status_class
+	}// end add_course_user_status_class
 
-    /**
-     * Prints out the course action buttons links
-     *
-     * - complete course
-     * - delete course
-     *
-     * @param WP_Post $course
-     */
-    public static function the_course_action_buttons( $course ){
+	/**
+	 * Prints out the course action buttons links
+	 *
+	 * - complete course
+	 * - delete course
+	 *
+	 * @param WP_Post $course
+	 */
+	public static function the_course_action_buttons( $course ){
 
-        if( is_user_logged_in() ) { ?>
+		if( is_user_logged_in() ) { ?>
 
             <section class="entry-actions">
                 <form method="POST" action="<?php  echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>">
@@ -2044,50 +2044,50 @@ 
                     <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e( intval( $course->ID ) ); ?>" />
 
                     <?php if ( 0 < absint( count( Sensei()->course->course_lessons( $course->ID ) ) )
-                        && Sensei()->settings->settings['course_completion'] == 'complete'
-                        && ! Sensei_Utils::user_completed_course( $course, get_current_user_id() )) { ?>
+						&& Sensei()->settings->settings['course_completion'] == 'complete'
+						&& ! Sensei_Utils::user_completed_course( $course, get_current_user_id() )) { ?>
 
                         <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e( 'Mark as Complete', 'woothemes-sensei' ); ?>" /></span>
 
                    <?php  } // End If Statement
 
-                    $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
-                        // Get the product ID
-                        $wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+					$course_purchased = false;
+					if ( Sensei_WC::is_woocommerce_active() ) {
+						// Get the product ID
+						$wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
+						if ( 0 < $wc_post_id ) {
 
-                            $user = wp_get_current_user();
-                            $course_purchased = Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
+							$user = wp_get_current_user();
+							$course_purchased = Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
 
-                        } // End If Statement
-                    } // End If Statement
+						} // End If Statement
+					} // End If Statement
 
-                    if ( ! $course_purchased && ! Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
+					if ( ! $course_purchased && ! Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
 
                         <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __( 'Delete Course', 'woothemes-sensei' ); ?>"/></span>
 
                     <?php } // End If Statement
 
-                    $has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
-                    $results_link = '';
-                    if( $has_quizzes ){
-                        $results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
-                    }
+					$has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
+					$results_link = '';
+					if( $has_quizzes ){
+						$results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
+					}
 
-                    // Output only if there is content to display
-                    if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+					// Output only if there is content to display
+					if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
 
                         <p class="sensei-results-links">
                             <?php
-                            /**
-                             * Filter the results links
-                             *
-                             * @param string $results_links_html
-                             * @param integer $course_id
-                             */
-                            echo apply_filters( 'sensei_results_links', $results_link, $course->ID );
-                            ?>
+							/**
+							 * Filter the results links
+							 *
+							 * @param string $results_links_html
+							 * @param integer $course_id
+							 */
+							echo apply_filters( 'sensei_results_links', $results_link, $course->ID );
+							?>
                         </p>
 
                     <?php } // end if has filter  ?>
@@ -2096,476 +2096,476 @@ 
 
         <?php  }// end if is user logged in
 
-    }// end the_course_action_buttons
-
-    /**
-     * This function alter the main query on the course archive page.
-     * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
-     *
-     * This function targets only the course archives and the my courses page. Shortcodes can set their own
-     * query parameters via the arguments.
-     *
-     * This function is hooked into pre_get_posts filter
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_query_filter( $query ){
-
-        // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
-            return $query;
-        }
-
-        global $post; // used to get the current page id for my courses
-
-        // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
-        {
-            /**
-             * sensei_archive_courses_per_page
-             *
-             * Sensei courses per page on the course
-             * archive
-             *
-             * @since 1.9.0
-             * @param integer $posts_per_page default 10
-             */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
-
-        }
-        // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
-        {
-            /**
-             * sensei_my_courses_per_page
-             *
-             * Sensei courses per page on the my courses page
-             * as set in the settings
-             *
-             * @since 1.9.0
-             * @param integer $posts_per_page default 10
-             */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
-
-        }
-
-        return $query;
-
-    }// end course_query_filter
-
-    /**
-     * Determine the class of the course loop
-     *
-     * This will output .first or .last and .course-item-number-x
-     *
-     * @return array $extra_classes
-     * @since 1.9.0
-     */
-    public static function get_course_loop_content_class ()
-    {
-
-        global $sensei_course_loop;
-
-
-        if( !isset( $sensei_course_loop ) ){
-            $sensei_course_loop = array();
-        }
-
-        if (!isset($sensei_course_loop['counter'])) {
-            $sensei_course_loop['counter'] = 0;
-        }
-
-        if (!isset($sensei_course_loop['columns'])) {
-            $sensei_course_loop['columns'] = self::get_loop_number_of_columns();
-        }
-
-        // increment the counter
-        $sensei_course_loop['counter']++;
-
-        $extra_classes = array();
-        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'first';
-        }
-
-        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'last';
-        }
-
-        // add the item number to the classes as well.
-        $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
-
-        /**
-         * Filter the course loop class the fires in the  in get_course_loop_content_class function
-         * which is called from the course loop content-course.php
-         *
-         * @since 1.9.0
-         *
-         * @param array $extra_classes
-         * @param WP_Post $loop_current_course
-         */
-        return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
-
-    }// end get_course_loop_class
-
-    /**
-     * Get the number of columns set for Sensei courses
-     *
-     * @since 1.9.0
-     * @return mixed|void
-     */
-    public static function get_loop_number_of_columns(){
-
-        /**
-         * Filter the number of columns on the course archive page.
-         *
-         * @since 1.9.0
-         * @param int $number_of_columns default 1
-         */
-        return apply_filters('sensei_course_loop_number_of_columns', 1);
-
-    }
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_sorting( $query ){
-
-        // don't show on category pages and other pages
-        if( ! is_archive(  'course ') || is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * Filter the sensei archive course order by values
-         *
-         * @since 1.9.0
-         * @param array $options {
-         *  @type string $option_value
-         *  @type string $option_string
-         * }
-         */
-        $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
-            "newness"     => __( "Sort by newest first", "woothemes-sensei"),
-            "title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
-        ));
-
-        // setup the currently selected item
-        $selected = 'newness';
-        if( isset( $_GET['orderby'] ) ){
-
-            $selected =  $_GET[ 'orderby' ];
-
-        }
-
-        ?>
+	}// end the_course_action_buttons
+
+	/**
+	 * This function alter the main query on the course archive page.
+	 * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
+	 *
+	 * This function targets only the course archives and the my courses page. Shortcodes can set their own
+	 * query parameters via the arguments.
+	 *
+	 * This function is hooked into pre_get_posts filter
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_query_filter( $query ){
+
+		// exit early for no course queries and admin queries
+		if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+			return $query;
+		}
+
+		global $post; // used to get the current page id for my courses
+
+		// for the course archive page
+		if( $query->is_main_query() && is_post_type_archive('course') )
+		{
+			/**
+			 * sensei_archive_courses_per_page
+			 *
+			 * Sensei courses per page on the course
+			 * archive
+			 *
+			 * @since 1.9.0
+			 * @param integer $posts_per_page default 10
+			 */
+			$query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
+
+		}
+		// for the my courses page
+		elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+		{
+			/**
+			 * sensei_my_courses_per_page
+			 *
+			 * Sensei courses per page on the my courses page
+			 * as set in the settings
+			 *
+			 * @since 1.9.0
+			 * @param integer $posts_per_page default 10
+			 */
+			$query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
+
+		}
+
+		return $query;
+
+	}// end course_query_filter
+
+	/**
+	 * Determine the class of the course loop
+	 *
+	 * This will output .first or .last and .course-item-number-x
+	 *
+	 * @return array $extra_classes
+	 * @since 1.9.0
+	 */
+	public static function get_course_loop_content_class ()
+	{
+
+		global $sensei_course_loop;
+
+
+		if( !isset( $sensei_course_loop ) ){
+			$sensei_course_loop = array();
+		}
+
+		if (!isset($sensei_course_loop['counter'])) {
+			$sensei_course_loop['counter'] = 0;
+		}
+
+		if (!isset($sensei_course_loop['columns'])) {
+			$sensei_course_loop['columns'] = self::get_loop_number_of_columns();
+		}
+
+		// increment the counter
+		$sensei_course_loop['counter']++;
+
+		$extra_classes = array();
+		if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'first';
+		}
+
+		if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'last';
+		}
+
+		// add the item number to the classes as well.
+		$extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
+
+		/**
+		 * Filter the course loop class the fires in the  in get_course_loop_content_class function
+		 * which is called from the course loop content-course.php
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param array $extra_classes
+		 * @param WP_Post $loop_current_course
+		 */
+		return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
+
+	}// end get_course_loop_class
+
+	/**
+	 * Get the number of columns set for Sensei courses
+	 *
+	 * @since 1.9.0
+	 * @return mixed|void
+	 */
+	public static function get_loop_number_of_columns(){
+
+		/**
+		 * Filter the number of columns on the course archive page.
+		 *
+		 * @since 1.9.0
+		 * @param int $number_of_columns default 1
+		 */
+		return apply_filters('sensei_course_loop_number_of_columns', 1);
+
+	}
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_sorting( $query ){
+
+		// don't show on category pages and other pages
+		if( ! is_archive(  'course ') || is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * Filter the sensei archive course order by values
+		 *
+		 * @since 1.9.0
+		 * @param array $options {
+		 *  @type string $option_value
+		 *  @type string $option_string
+		 * }
+		 */
+		$course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
+			"newness"     => __( "Sort by newest first", "woothemes-sensei"),
+			"title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
+		));
+
+		// setup the currently selected item
+		$selected = 'newness';
+		if( isset( $_GET['orderby'] ) ){
+
+			$selected =  $_GET[ 'orderby' ];
+
+		}
+
+		?>
 
         <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr( Sensei_Utils::get_current_url() ) ; ?>" method="POST">
             <select name="course-orderby" class="orderby">
                 <?php
-                foreach( $course_order_by_options as $value => $text ){
+				foreach( $course_order_by_options as $value => $text ){
 
-                    echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
+					echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
 
-                }
-                ?>
+				}
+				?>
             </select>
         </form>
 
     <?php
-    }// end course archive filters
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_filters( $query ){
-
-        // don't show on category pages
-        if( is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * filter the course archive filter buttons
-         *
-         * @since 1.9.0
-         * @param array $filters{
-         *   @type array ( $id, $url , $title )
-         * }
-         *
-         */
-        $filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
-            array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
-            array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
-        ));
-
-
-        ?>
+	}// end course archive filters
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_filters( $query ){
+
+		// don't show on category pages
+		if( is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * filter the course archive filter buttons
+		 *
+		 * @since 1.9.0
+		 * @param array $filters{
+		 *   @type array ( $id, $url , $title )
+		 * }
+		 *
+		 */
+		$filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
+			array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
+			array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
+		));
+
+
+		?>
         <ul class="sensei-course-filters clearfix" >
             <?php
 
-            //determine the current active url
-            $current_url = Sensei_Utils::get_current_url();
+			//determine the current active url
+			$current_url = Sensei_Utils::get_current_url();
 
-            foreach( $filters as $filter ) {
+			foreach( $filters as $filter ) {
 
-                $active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
+				$active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
 
-                echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
+				echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
 
-            }
-            ?>
+			}
+			?>
 
         </ul>
 
         <?php
 
-    }
+	}
 
-    /**
-     * if the featured link is clicked on the course archive page
-     * filter the courses returned to only show those featured
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_featured_filter( $query ){
-
-        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
-            //setup meta query for featured courses
-            $query->set( 'meta_value', 'featured'  );
-            $query->set( 'meta_key', '_course_featured'  );
-            $query->set( 'meta_compare', '='  );
-        }
-
-        return $query;
-    }
-
-    /**
-     * if the course order drop down is changed
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_order_by_title( $query ){
-
-        if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
-            && 'course'== $query->get('post_type') && $query->is_main_query()  ){
-            // setup the order by title for this query
-            $query->set( 'orderby', 'title'  );
-            $query->set( 'order', 'ASC'  );
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Get the link to the courses page. This will be the course post type archive
-     * page link or the page the user set in their settings
-     *
-     * @since 1.9.0
-     * @return string $course_page_url
-     */
-    public static function get_courses_page_url(){
-
-        $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
+	/**
+	 * if the featured link is clicked on the course archive page
+	 * filter the courses returned to only show those featured
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_featured_filter( $query ){
 
-        return $course_page_url;
-
-    }// get_course_url
+		if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
+			//setup meta query for featured courses
+			$query->set( 'meta_value', 'featured'  );
+			$query->set( 'meta_key', '_course_featured'  );
+			$query->set( 'meta_compare', '='  );
+		}
 
-    /**
-     * Output the headers on the course archive page
-     *
-     * Hooked into the sensei_archive_title
-     *
-     * @since 1.9.0
-     * @param string $query_type
-     * @param string $before_html
-     * @param string $after_html
-     * @return void
-     */
-    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+		return $query;
+	}
 
-        if( ! is_post_type_archive('course') ){
-            return;
-        }
+	/**
+	 * if the course order drop down is changed
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_order_by_title( $query ){
 
-        // deprecated since 1.9.0
-        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
+		if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
+			&& 'course'== $query->get('post_type') && $query->is_main_query()  ){
+			// setup the order by title for this query
+			$query->set( 'orderby', 'title'  );
+			$query->set( 'order', 'ASC'  );
+		}
 
-        $html = '';
+		return $query;
+	}
 
-        if( empty( $before_html ) ){
 
-            $before_html = '<header class="archive-header"><h1>';
+	/**
+	 * Get the link to the courses page. This will be the course post type archive
+	 * page link or the page the user set in their settings
+	 *
+	 * @since 1.9.0
+	 * @return string $course_page_url
+	 */
+	public static function get_courses_page_url(){
 
-        }
+		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
 
-        if( empty( $after_html ) ){
+		return $course_page_url;
 
-            $after_html = '</h1></header>';
+	}// get_course_url
 
-        }
+	/**
+	 * Output the headers on the course archive page
+	 *
+	 * Hooked into the sensei_archive_title
+	 *
+	 * @since 1.9.0
+	 * @param string $query_type
+	 * @param string $before_html
+	 * @param string $after_html
+	 * @return void
+	 */
+	public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
 
-        if ( is_tax( 'course-category' ) ) {
+		if( ! is_post_type_archive('course') ){
+			return;
+		}
 
-            global $wp_query;
+		// deprecated since 1.9.0
+		sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
 
-            $taxonomy_obj = $wp_query->get_queried_object();
-            $taxonomy_short_name = $taxonomy_obj->taxonomy;
-            $taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
-            $title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
-            echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
-            return;
+		$html = '';
 
-        } // End If Statement
+		if( empty( $before_html ) ){
 
-        switch ( $query_type ) {
-            case 'newcourses':
-                $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'featuredcourses':
-                $html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'freecourses':
-                $html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'paidcourses':
-                $html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            default:
-                $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-        } // End Switch Statement
+			$before_html = '<header class="archive-header"><h1>';
 
-        echo apply_filters( 'course_archive_title', $html );
+		}
 
-    }//course_archive_header
+		if( empty( $after_html ) ){
 
+			$after_html = '</h1></header>';
 
-    /**
-     * Filter the single course content
-     * taking into account if the user has access.
-     *
-     * @1.9.0
-     *
-     * @param string $content
-     * @return string $content or $excerpt
-     */
-    public static function single_course_content( $content ){
+		}
 
-        if( ! is_singular('course') ){
+		if ( is_tax( 'course-category' ) ) {
 
-            return $content;
+			global $wp_query;
 
-        }
+			$taxonomy_obj = $wp_query->get_queried_object();
+			$taxonomy_short_name = $taxonomy_obj->taxonomy;
+			$taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
+			$title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
+			echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
+			return;
 
-        // Content Access Permissions
-        $access_permission = false;
+		} // End If Statement
 
-        if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+		switch ( $query_type ) {
+			case 'newcourses':
+				$html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'featuredcourses':
+				$html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'freecourses':
+				$html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'paidcourses':
+				$html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			default:
+				$html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+		} // End Switch Statement
+
+		echo apply_filters( 'course_archive_title', $html );
+
+	}//course_archive_header
 
-            $access_permission = true;
 
-        } // End If Statement
+	/**
+	 * Filter the single course content
+	 * taking into account if the user has access.
+	 *
+	 * @1.9.0
+	 *
+	 * @param string $content
+	 * @return string $content or $excerpt
+	 */
+	public static function single_course_content( $content ){
 
-        // Check if the user is taking the course
-        $is_user_taking_course = Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
+		if( ! is_singular('course') ){
 
-        if(Sensei_WC::is_woocommerce_active()) {
+			return $content;
 
-            $wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
-            $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		}
 
-            $has_product_attached = isset ( $product ) && is_object ( $product );
+		// Content Access Permissions
+		$access_permission = false;
 
-        } else {
+		if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-            $has_product_attached = false;
+			$access_permission = true;
 
-        }
+		} // End If Statement
 
-        if ( ( is_user_logged_in() && $is_user_taking_course )
-            || ( $access_permission && !$has_product_attached)
-            || 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
+		// Check if the user is taking the course
+		$is_user_taking_course = Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
 
-	        // compensate for core providing and empty $content
+		if(Sensei_WC::is_woocommerce_active()) {
 
-	        if( empty( $content ) ){
-		        remove_filter( 'the_content', array( 'Sensei_Course', 'single_course_content') );
-		        $course = get_post( get_the_ID() );
+			$wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
+			$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-		        $content = apply_filters( 'the_content', $course->post_content );
+			$has_product_attached = isset ( $product ) && is_object ( $product );
 
-	        }
+		} else {
 
-            return $content;
+			$has_product_attached = false;
 
-        } else {
+		}
 
-            return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
+		if ( ( is_user_logged_in() && $is_user_taking_course )
+			|| ( $access_permission && !$has_product_attached)
+			|| 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
 
-        }
+			// compensate for core providing and empty $content
 
-    }// end single_course_content
+			if( empty( $content ) ){
+				remove_filter( 'the_content', array( 'Sensei_Course', 'single_course_content') );
+				$course = get_post( get_the_ID() );
 
-    /**
-     * Output the the single course lessons title with markup.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_lessons_title(){
+				$content = apply_filters( 'the_content', $course->post_content );
 
-	    if ( ! is_singular( 'course' )  ) {
-		    return;
-	    }
+			}
 
-        global $post;
-        $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
-        $course_lessons = Sensei()->course->course_lessons( $post->ID );
+			return $content;
 
-        // title should be Other Lessons if there are lessons belonging to models.
-        $title = __('Other Lessons', 'woothemes-sensei');
+		} else {
 
-        // show lessons if the number of lesson in the course is the same as those that isn't assigned to a module
-        if( count( $course_lessons ) == count( $none_module_lessons )  ){
+			return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
 
-            $title = __('Lessons', 'woothemes-sensei');
+		}
 
-        }elseif( empty( $none_module_lessons ) ){ // if the none module lessons are simply empty the title should not be shown
+	}// end single_course_content
 
-            $title = '';
-        }
+	/**
+	 * Output the the single course lessons title with markup.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_lessons_title(){
 
-        /**
-         * hook document in class-woothemes-sensei-message.php
-         */
-        $title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+		if ( ! is_singular( 'course' )  ) {
+			return;
+		}
 
-        ob_start(); // start capturing the following output.
+		global $post;
+		$none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
+		$course_lessons = Sensei()->course->course_lessons( $post->ID );
 
-        ?>
+		// title should be Other Lessons if there are lessons belonging to models.
+		$title = __('Other Lessons', 'woothemes-sensei');
+
+		// show lessons if the number of lesson in the course is the same as those that isn't assigned to a module
+		if( count( $course_lessons ) == count( $none_module_lessons )  ){
+
+			$title = __('Lessons', 'woothemes-sensei');
+
+		}elseif( empty( $none_module_lessons ) ){ // if the none module lessons are simply empty the title should not be shown
+
+			$title = '';
+		}
+
+		/**
+		 * hook document in class-woothemes-sensei-message.php
+		 */
+		$title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+
+		ob_start(); // start capturing the following output.
+
+		?>
 
             <header>
                 <h2> <?php echo $title; ?> </h2>
@@ -2573,297 +2573,297 @@ 
 
         <?php
 
-        /**
-         * Filter the title and markup that appears above the lessons on a single course
-         * page.
-         *
-         * @since 1.9.0
-         * @param string $lessons_title_html
-         */
-        echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
-
-    }// end the_course_lessons_title
-
-    /**
-     * This function loads the global wp_query object with with lessons
-     * of the current course. It is designed to be used on the single-course template
-     * and expects the global post to be a singular course.
-     *
-     * This function excludes lessons belonging to modules as they are
-     * queried separately.
-     *
-     * @since 1.9.0
-     * @global $wp_query
-     */
-    public static function load_single_course_lessons_query(){
+		/**
+		 * Filter the title and markup that appears above the lessons on a single course
+		 * page.
+		 *
+		 * @since 1.9.0
+		 * @param string $lessons_title_html
+		 */
+		echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
 
-        global $post, $wp_query;
+	}// end the_course_lessons_title
 
-        $course_id = $post->ID;
-
-        if( 'course' != get_post_type( $course_id ) ){
-            return;
-        }
+	/**
+	 * This function loads the global wp_query object with with lessons
+	 * of the current course. It is designed to be used on the single-course template
+	 * and expects the global post to be a singular course.
+	 *
+	 * This function excludes lessons belonging to modules as they are
+	 * queried separately.
+	 *
+	 * @since 1.9.0
+	 * @global $wp_query
+	 */
+	public static function load_single_course_lessons_query(){
 
-        $course_lesson_query_args = array(
-            'post_type'         => 'lesson',
-            'posts_per_page'    => 500,
-            'orderby'           => 'date',
-            'order'             => 'ASC',
-            'meta_query'        => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
-                ),
-            ),
-            'post_status'       => 'public',
-            'suppress_filters'  => 0,
-        );
+		global $post, $wp_query;
 
-        // Exclude lessons belonging to modules as they are queried along with the modules.
-        $modules = Sensei()->modules->get_course_modules( $course_id );
-        if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+		$course_id = $post->ID;
 
-            $terms_ids = array();
-            foreach( $modules as $term ){
+		if( 'course' != get_post_type( $course_id ) ){
+			return;
+		}
 
-                $terms_ids[] = $term->term_id;
+		$course_lesson_query_args = array(
+			'post_type'         => 'lesson',
+			'posts_per_page'    => 500,
+			'orderby'           => 'date',
+			'order'             => 'ASC',
+			'meta_query'        => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => intval( $course_id ),
+				),
+			),
+			'post_status'       => 'public',
+			'suppress_filters'  => 0,
+		);
+
+		// Exclude lessons belonging to modules as they are queried along with the modules.
+		$modules = Sensei()->modules->get_course_modules( $course_id );
+		if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+
+			$terms_ids = array();
+			foreach( $modules as $term ){
+
+				$terms_ids[] = $term->term_id;
 
-            }
+			}
 
-            $course_lesson_query_args[ 'tax_query'] = array(
-                array(
-                    'taxonomy' => 'module',
-                    'field'    => 'id',
-                    'terms'    => $terms_ids,
-                    'operator' => 'NOT IN',
-                ),
-            );
-        }
+			$course_lesson_query_args[ 'tax_query'] = array(
+				array(
+					'taxonomy' => 'module',
+					'field'    => 'id',
+					'terms'    => $terms_ids,
+					'operator' => 'NOT IN',
+				),
+			);
+		}
 
-        //setting lesson order
-        $course_lesson_order = get_post_meta( $course_id, '_lesson_order', true);
-        if( !empty( $course_lesson_order ) ){
+		//setting lesson order
+		$course_lesson_order = get_post_meta( $course_id, '_lesson_order', true);
+		if( !empty( $course_lesson_order ) ){
 
-            $course_lesson_query_args['post__in'] = explode( ',', $course_lesson_order );
-            $course_lesson_query_args['orderby']= 'post__in' ;
-            unset( $course_lesson_query_args['order'] );
+			$course_lesson_query_args['post__in'] = explode( ',', $course_lesson_order );
+			$course_lesson_query_args['orderby']= 'post__in' ;
+			unset( $course_lesson_query_args['order'] );
 
-        }
+		}
 
-        $wp_query = new WP_Query( $course_lesson_query_args );
+		$wp_query = new WP_Query( $course_lesson_query_args );
 
-    }// load_single_course_lessons
+	}// load_single_course_lessons
 
-    /**
-     * Flush the rewrite rules for a course post type
-     *
-     * @since 1.9.0
-     *
-     * @param $post_id
-     */
-    public static function flush_rewrite_rules( $post_id ){
+	/**
+	 * Flush the rewrite rules for a course post type
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $post_id
+	 */
+	public static function flush_rewrite_rules( $post_id ){
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
 
-            return;
+			return;
 
-        }
+		}
 
 
-        if( 'course' == get_post_type( $post_id )  ){
+		if( 'course' == get_post_type( $post_id )  ){
 
-            Sensei()->initiate_rewrite_rules_flush();
+			Sensei()->initiate_rewrite_rules_flush();
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Optionally return the full content on the single course pages
-     * depending on the users course_single_content_display setting
-     *
-     * @since 1.9.0
-     * @param $excerpt
-     * @return string
-     */
-    public static function full_content_excerpt_override( $excerpt ){
+	/**
+	 * Optionally return the full content on the single course pages
+	 * depending on the users course_single_content_display setting
+	 *
+	 * @since 1.9.0
+	 * @param $excerpt
+	 * @return string
+	 */
+	public static function full_content_excerpt_override( $excerpt ){
 
-        if (   is_singular('course')  &&
-                'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
+		if (   is_singular('course')  &&
+				'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
 
-            return get_the_content();
+			return get_the_content();
 
-        } else {
+		} else {
 
-            return $excerpt;
+			return $excerpt;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Output the course actions like start taking course, register, add to cart etc.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_enrolment_actions(){
-        ?>
+	/**
+	 * Output the course actions like start taking course, register, add to cart etc.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_enrolment_actions(){
+		?>
         <section class="course-meta course-enrolment">
         <?php
-        global  $post, $current_user;
-        $is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
-        if ( is_user_logged_in() && ! $is_user_taking_course ) {
-
-            // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-
-            // Check for woocommerce
-            if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
-                sensei_wc_add_to_cart($post->ID);
-            } else {
-                sensei_start_course_form($post->ID);
-            } // End If Statement
-
-        } elseif ( is_user_logged_in() ) {
-
-            // Check if course is completed
-            $user_course_status = Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
-            $completed_course = Sensei_Utils::user_completed_course( $user_course_status );
-            // Success message
-            if ( $completed_course ) { ?>
+		global  $post, $current_user;
+		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		if ( is_user_logged_in() && ! $is_user_taking_course ) {
+
+			// Get the product ID
+			$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+
+			// Check for woocommerce
+			if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
+				sensei_wc_add_to_cart($post->ID);
+			} else {
+				sensei_start_course_form($post->ID);
+			} // End If Statement
+
+		} elseif ( is_user_logged_in() ) {
+
+			// Check if course is completed
+			$user_course_status = Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
+			$completed_course = Sensei_Utils::user_completed_course( $user_course_status );
+			// Success message
+			if ( $completed_course ) { ?>
                 <div class="status completed"><?php  _e( 'Completed', 'woothemes-sensei' ); ?></div>
                 <?php
-                $has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
-                if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+				$has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
+				if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
                     <p class="sensei-results-links">
                         <?php
-                        $results_link = '';
-                        if( $has_quizzes ) {
-                            $results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
-                        }
-                        /**
-                         * Filter documented in Sensei_Course::the_course_action_buttons
-                         */
-                        $results_link = apply_filters( 'sensei_results_links', $results_link, $post->ID );
-                        echo $results_link;
-                        ?></p>
+						$results_link = '';
+						if( $has_quizzes ) {
+							$results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
+						}
+						/**
+						 * Filter documented in Sensei_Course::the_course_action_buttons
+						 */
+						$results_link = apply_filters( 'sensei_results_links', $results_link, $post->ID );
+						echo $results_link;
+						?></p>
                 <?php } ?>
             <?php } else { ?>
                 <div class="status in-progress"><?php echo __( 'In Progress', 'woothemes-sensei' ); ?></div>
             <?php }
 
-        } else {
-            // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-            // Check for woocommerce
-            if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
+		} else {
+			// Get the product ID
+			$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+			// Check for woocommerce
+			if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
 
-                sensei_wc_add_to_cart($post->ID);
+				sensei_wc_add_to_cart($post->ID);
 
-            } else {
+			} else {
 
-                if( get_option( 'users_can_register') ) {
+				if( get_option( 'users_can_register') ) {
 
 
-                    $my_courses_page_id = '';
+					$my_courses_page_id = '';
 
-                    /**
-                     * Filter to force Sensei to output the default WordPress user
-                     * registration link.
-                     *
-                     * @since 1.9.0
-                     * @param bool $wp_register_link default false
-                     */
+					/**
+					 * Filter to force Sensei to output the default WordPress user
+					 * registration link.
+					 *
+					 * @since 1.9.0
+					 * @param bool $wp_register_link default false
+					 */
 
-                    $wp_register_link = apply_filters('sensei_use_wp_register_link', false);
+					$wp_register_link = apply_filters('sensei_use_wp_register_link', false);
 
-                    $settings = Sensei()->settings->get_settings();
-                    if( isset( $settings[ 'my_course_page' ] )
-                        && 0 < intval( $settings[ 'my_course_page' ] ) ){
+					$settings = Sensei()->settings->get_settings();
+					if( isset( $settings[ 'my_course_page' ] )
+						&& 0 < intval( $settings[ 'my_course_page' ] ) ){
 
-                        $my_courses_page_id = $settings[ 'my_course_page' ];
+						$my_courses_page_id = $settings[ 'my_course_page' ];
 
-                    }
+					}
 
-                    // If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
-                    // is false, link to My Courses. If not, link to default WordPress registration page.
-                    if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
+					// If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
+					// is false, link to My Courses. If not, link to default WordPress registration page.
+					if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
 
-                        $my_courses_url = get_permalink( $my_courses_page_id  );
-                        $register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
-                        echo '<div class="status register">' . $register_link . '</div>' ;
+						$my_courses_url = get_permalink( $my_courses_page_id  );
+						$register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
+						echo '<div class="status register">' . $register_link . '</div>' ;
 
-                    } else{
+					} else{
 
-                        wp_register( '<div class="status register">', '</div>' );
+						wp_register( '<div class="status register">', '</div>' );
 
-                    }
+					}
 
-                } // end if user can register
+				} // end if user can register
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement ?>
+		} // End If Statement ?>
 
         </section><?php
 
-    }// end the_course_enrolment_actions
+	}// end the_course_enrolment_actions
 
-    /**
-     * Output the course video inside the loop.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_video(){
+	/**
+	 * Output the course video inside the loop.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_video(){
 
-        global $post;
+		global $post;
 
-	    if ( ! is_singular( 'course' )  ) {
-		    return;
-	    }
-        // Get the meta info
-        $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+		if ( ! is_singular( 'course' )  ) {
+			return;
+		}
+		// Get the meta info
+		$course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
 
-        if ( 'http' == substr( $course_video_embed, 0, 4) ) {
+		if ( 'http' == substr( $course_video_embed, 0, 4) ) {
 
-            $course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
+			$course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
 
-        } // End If Statement
+		} // End If Statement
 
-        if ( '' != $course_video_embed ) { ?>
+		if ( '' != $course_video_embed ) { ?>
 
             <div class="course-video">
                 <?php echo html_entity_decode($course_video_embed); ?>
             </div>
 
         <?php } // End If Statement
-    }
+	}
 
-    /**
-     * Output the title for the single lesson page
-     *
-     * @global $post
-     * @since 1.9.0
-     */
-    public static function the_title(){
+	/**
+	 * Output the title for the single lesson page
+	 *
+	 * @global $post
+	 * @since 1.9.0
+	 */
+	public static function the_title(){
 
-	    if( ! is_singular( 'course' ) ){
+		if( ! is_singular( 'course' ) ){
 			return;
-	    }
-        global $post;
+		}
+		global $post;
 
-        ?>
+		?>
         <header>
 
             <h1>
 
                 <?php
-                /**
-                 * Filter documented in class-sensei-messages.php the_title
-                 */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
-                ?>
+				/**
+				 * Filter documented in class-sensei-messages.php the_title
+				 */
+				echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+				?>
 
             </h1>
 
@@ -2871,111 +2871,111 @@ 
 
         <?php
 
-    }//the_title
-
-    /**
-     * Show the title on the course category pages
-     *
-     * @since 1.9.0
-     */
-    public static function course_category_title(){
-
-        if( ! is_tax( 'course-category' ) ){
-            return;
-        }
-
-        $category_slug = get_query_var('course-category');
-        $term  = get_term_by('slug',$category_slug,'course-category');
-
-        if( ! empty($term) ){
-
-            $title = $term->name;
-
-        }else{
-
-            $title = 'Course Category';
-
-        }
-
-        $html = '<h2 class="sensei-category-title">';
-        $html .= __('Category') . ' ' . $title;
-        $html .= '</h2>';
-
-        echo apply_filters( 'course_category_title', $html , $term->term_id );
-
-    }// course_category_title
-
-    /**
-     * Alter the course query to respect the order set for courses and apply
-     * this on the course-category pages.
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $query
-     * @return WP_Query
-     */
-    public static function alter_course_category_order( $query ){
-
-        if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
-            return $query;
-        }
-
-        $order = get_option( 'sensei_course_order', '' );
-        if( !empty( $order )  ){
-            $query->set('orderby', 'menu_order' );
-            $query->set('order', 'ASC' );
-        }
-
-        return $query;
-
-    }
-
-    /**
-     * The very basic course query arguments
-     * so we don't have to repeat this througout
-     * the code base.
-     *
-     * Usage:
-     * $args = Sensei_Course::get_default_query_args();
-     * $args['custom_arg'] ='custom value';
-     * $courses = get_posts( $args )
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_default_query_args(){
-        return array(
-            'post_type' 		=> 'course',
-            'posts_per_page' 		=> 1000,
-            'orderby'         	=> 'date',
-            'order'           	=> 'DESC',
-            'suppress_filters' 	=> 0
-        );
-    }
-
-    /**
-     * Check if the prerequisite course is completed
-     * Courses with no pre-requisite should always return true
-     *
-     * @since 1.9.0
-     * @param $course_id
-     * @return bool
-     */
-    public static function is_prerequisite_complete( $course_id ){
-
-        $course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
-
-        // if it has a pre requisite course check it
-        if( ! empty(  $course_prerequisite_id ) ){
-
-            return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
-
-        }
-
-        return true;
-
-    }// end is_prerequisite_complete
+	}//the_title
+
+	/**
+	 * Show the title on the course category pages
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_category_title(){
+
+		if( ! is_tax( 'course-category' ) ){
+			return;
+		}
+
+		$category_slug = get_query_var('course-category');
+		$term  = get_term_by('slug',$category_slug,'course-category');
+
+		if( ! empty($term) ){
+
+			$title = $term->name;
+
+		}else{
+
+			$title = 'Course Category';
+
+		}
+
+		$html = '<h2 class="sensei-category-title">';
+		$html .= __('Category') . ' ' . $title;
+		$html .= '</h2>';
+
+		echo apply_filters( 'course_category_title', $html , $term->term_id );
+
+	}// course_category_title
+
+	/**
+	 * Alter the course query to respect the order set for courses and apply
+	 * this on the course-category pages.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query
+	 */
+	public static function alter_course_category_order( $query ){
+
+		if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
+			return $query;
+		}
+
+		$order = get_option( 'sensei_course_order', '' );
+		if( !empty( $order )  ){
+			$query->set('orderby', 'menu_order' );
+			$query->set('order', 'ASC' );
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * The very basic course query arguments
+	 * so we don't have to repeat this througout
+	 * the code base.
+	 *
+	 * Usage:
+	 * $args = Sensei_Course::get_default_query_args();
+	 * $args['custom_arg'] ='custom value';
+	 * $courses = get_posts( $args )
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_default_query_args(){
+		return array(
+			'post_type' 		=> 'course',
+			'posts_per_page' 		=> 1000,
+			'orderby'         	=> 'date',
+			'order'           	=> 'DESC',
+			'suppress_filters' 	=> 0
+		);
+	}
+
+	/**
+	 * Check if the prerequisite course is completed
+	 * Courses with no pre-requisite should always return true
+	 *
+	 * @since 1.9.0
+	 * @param $course_id
+	 * @return bool
+	 */
+	public static function is_prerequisite_complete( $course_id ){
+
+		$course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
+
+		// if it has a pre requisite course check it
+		if( ! empty(  $course_prerequisite_id ) ){
+
+			return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
+
+		}
+
+		return true;
+
+	}// end is_prerequisite_complete
 
 
 }// End Class

Spacing +657 added lines, -657 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Course Class
@@ -32,72 +32,72 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
         $this->token = 'course';
 
 		// Setup meta fields for this post type
-		$this->meta_fields = array( 'course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product' );
+		$this->meta_fields = array('course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product');
 		// Admin actions
-		if ( is_admin() ) {
+		if (is_admin()) {
 			// Metabox functions
-            add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
-			add_action( 'save_post', array( $this, 'meta_box_save' ) );
+            add_action('add_meta_boxes', array($this, 'meta_box_setup'), 20);
+			add_action('save_post', array($this, 'meta_box_save'));
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-course_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
+			add_filter('manage_edit-course_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
 		} else {
 			$this->my_courses_page = false;
 		} // End If Statement
 
 		// Update course completion upon completion of a lesson
-		add_action( 'sensei_user_lesson_end', array( $this, 'update_status_after_lesson_change' ), 10, 2 );
+		add_action('sensei_user_lesson_end', array($this, 'update_status_after_lesson_change'), 10, 2);
 		// Update course completion upon reset of a lesson
-		add_action( 'sensei_user_lesson_reset', array( $this, 'update_status_after_lesson_change' ), 10, 2 );
+		add_action('sensei_user_lesson_reset', array($this, 'update_status_after_lesson_change'), 10, 2);
 		// Update course completion upon grading of a quiz
-		add_action( 'sensei_user_quiz_grade', array( $this, 'update_status_after_quiz_submission' ), 10, 2 );
+		add_action('sensei_user_quiz_grade', array($this, 'update_status_after_quiz_submission'), 10, 2);
 
         // show the progress bar ont he single course page
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
+        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_statement'), 15);
+        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_meter'), 16);
 
         // provide an option to block all emails related to a selected course
-        add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
-        add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
+        add_filter('sensei_send_emails', array($this, 'block_notification_emails'));
+        add_action('save_post', array($this, 'save_course_notification_meta_box'));
 
         // preview lessons on the course content
-        add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
+        add_action('sensei_course_content_inside_after', array($this, 'the_course_free_lesson_preview'));
 
         // the course meta
-        add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
+        add_action('sensei_course_content_inside_before', array($this, 'the_course_meta'));
 
         // backwards compatible template hooks
-        add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
-        add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
+        add_action('sensei_course_content_inside_before', array($this, 'content_before_backwards_compatibility_hooks'));
+        add_action('sensei_loop_course_before', array($this, 'loop_before_backwards_compatibility_hooks'));
 
         // add the user status on the course to the markup as a class
-        add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
+        add_filter('post_class', array(__CLASS__, 'add_course_user_status_class'), 20, 3);
 
         //filter the course query in Sensei specific instances
-        add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
+        add_filter('pre_get_posts', array(__CLASS__, 'course_query_filter'));
 
         //attache the sorting to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
+        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_sorting'));
 
         //attach the filter links to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
+        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_filters'));
 
         //filter the course query when featured filter is applied
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
+        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_featured_filter'));
 
         // handle the order by title post submission
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
+        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_order_by_title'));
 
         // ensure the course category page respects the manual order set for courses
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
+        add_filter('pre_get_posts', array(__CLASS__, 'alter_course_category_order'));
 
         // flush rewrite rules when saving a course
-        add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
+        add_action('save_post', array('Sensei_Course', 'flush_rewrite_rules'));
 
 	} // End __construct()
 
@@ -107,10 +107,10 @@ 
 	 * @param type $user_id
 	 * @param type $quiz_id
 	 */
-	public function update_status_after_quiz_submission( $user_id, $quiz_id ) {
-		if ( intval( $user_id ) > 0 && intval( $quiz_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$this->update_status_after_lesson_change( $user_id, $lesson_id );
+	public function update_status_after_quiz_submission($user_id, $quiz_id) {
+		if (intval($user_id) > 0 && intval($quiz_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$this->update_status_after_lesson_change($user_id, $lesson_id);
 		}
 	}
 
@@ -120,12 +120,12 @@ 
 	 * @param int $user_id
 	 * @param int $lesson_id
 	 */
-	public function update_status_after_lesson_change( $user_id, $lesson_id ) {
-		if ( intval( $user_id ) > 0 && intval( $lesson_id ) > 0 ) {
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if ( intval( $course_id ) > 0 ) {
+	public function update_status_after_lesson_change($user_id, $lesson_id) {
+		if (intval($user_id) > 0 && intval($lesson_id) > 0) {
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if (intval($course_id) > 0) {
 				// Updates the Course status and it's meta data
-				Sensei_Utils::user_complete_course( $course_id, $user_id );
+				Sensei_Utils::user_complete_course($course_id, $user_id);
 			}
 		}
 	}
@@ -136,27 +136,27 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function meta_box_setup () {
+	public function meta_box_setup() {
 
-		if ( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 			// Add Meta Box for WooCommerce Course
-			add_meta_box( 'course-wc-product', __( 'WooCommerce Product', 'woothemes-sensei' ), array( $this, 'course_woocommerce_product_meta_box_content' ), $this->token, 'side', 'default' );
+			add_meta_box('course-wc-product', __('WooCommerce Product', 'woothemes-sensei'), array($this, 'course_woocommerce_product_meta_box_content'), $this->token, 'side', 'default');
 		} // End If Statement
 		// Add Meta Box for Prerequisite Course
-		add_meta_box( 'course-prerequisite', __( 'Course Prerequisite', 'woothemes-sensei' ), array( $this, 'course_prerequisite_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('course-prerequisite', __('Course Prerequisite', 'woothemes-sensei'), array($this, 'course_prerequisite_meta_box_content'), $this->token, 'side', 'default');
 		// Add Meta Box for Featured Course
-		add_meta_box( 'course-featured', __( 'Featured Course', 'woothemes-sensei' ), array( $this, 'course_featured_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('course-featured', __('Featured Course', 'woothemes-sensei'), array($this, 'course_featured_meta_box_content'), $this->token, 'side', 'default');
 		// Add Meta Box for Course Meta
-		add_meta_box( 'course-video', __( 'Course Video', 'woothemes-sensei' ), array( $this, 'course_video_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('course-video', __('Course Video', 'woothemes-sensei'), array($this, 'course_video_meta_box_content'), $this->token, 'normal', 'default');
 		// Add Meta Box for Course Lessons
-		add_meta_box( 'course-lessons', __( 'Course Lessons', 'woothemes-sensei' ), array( $this, 'course_lessons_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('course-lessons', __('Course Lessons', 'woothemes-sensei'), array($this, 'course_lessons_meta_box_content'), $this->token, 'normal', 'default');
         // Add Meta Box to link to Manage Learners
-        add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
+        add_meta_box('course-manage', __('Course Management', 'woothemes-sensei'), array($this, 'course_manage_meta_box_content'), $this->token, 'side', 'default');
         // Remove "Custom Settings" meta box.
-		remove_meta_box( 'woothemes-settings', $this->token, 'normal' );
+		remove_meta_box('woothemes-settings', $this->token, 'normal');
 
         // add Disable email notification box
-        add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
+        add_meta_box('course-notifications', __('Course Notifications', 'woothemes-sensei'), array($this, 'course_notification_meta_box_content'), 'course', 'normal', 'default');
 
 	} // End meta_box_setup()
 
@@ -166,58 +166,58 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_woocommerce_product_meta_box_content () {
+	public function course_woocommerce_product_meta_box_content() {
 		global $post;
 
-		$select_course_woocommerce_product = get_post_meta( $post->ID, '_course_woocommerce_product', true );
+		$select_course_woocommerce_product = get_post_meta($post->ID, '_course_woocommerce_product', true);
 
-		$post_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
+		$post_args = array('post_type' 		=> array('product', 'product_variation'),
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'DESC',
     						'exclude' 			=> $post->ID,
-    						'post_status'		=> array( 'publish', 'private', 'draft' ),
+    						'post_status'		=> array('publish', 'private', 'draft'),
     						'tax_query'			=> array(
 								array(
 									'taxonomy'	=> 'product_type',
 									'field'		=> 'slug',
-									'terms'		=> array( 'variable', 'grouped' ),
+									'terms'		=> array('variable', 'grouped'),
 									'operator'	=> 'NOT IN'
 								)
 							),
 							'suppress_filters' 	=> 0
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
+		if (count($posts_array) > 0) {
 
-			$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">' . "\n";
-			$html .= '<option value="-">' . __( 'None', 'woothemes-sensei' ) . '</option>';
+			$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">'."\n";
+			$html .= '<option value="-">'.__('None', 'woothemes-sensei').'</option>';
 				$prev_parent_id = 0;
-				foreach ( $posts_array as $post_item ) {
+				foreach ($posts_array as $post_item) {
 
-					if ( 'product_variation' == $post_item->post_type ) {
+					if ('product_variation' == $post_item->post_type) {
 
-						$product_object = get_product( $post_item->ID );
-						$parent_id = wp_get_post_parent_id( $post_item->ID );
+						$product_object = get_product($post_item->ID);
+						$parent_id = wp_get_post_parent_id($post_item->ID);
 
-                        if( sensei_check_woocommerce_version( '2.1' ) ) {
-							$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
+                        if (sensei_check_woocommerce_version('2.1')) {
+							$formatted_variation = wc_get_formatted_variation($product_object->variation_data, true);
 
 						} else {
                             // fall back to pre wc 2.1
-							$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
+							$formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true);
 
 						}
 
-                        $product_name = ucwords( $formatted_variation );
-                        if( empty( $product_name ) ){
+                        $product_name = ucwords($formatted_variation);
+                        if (empty($product_name)) {
 
-                            $product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
+                            $product_name = __('Variation #', 'woothemes-sensei').$product_object->variation_id;
 
                         }
 
@@ -230,47 +230,47 @@ 
 					}
 
 					// Show variations in groups
-					if( $parent_id && $parent_id != $prev_parent_id ) {
+					if ($parent_id && $parent_id != $prev_parent_id) {
 
-						if( 0 != $prev_parent_id ) {
+						if (0 != $prev_parent_id) {
 
 							$html .= '</optgroup>';
 
 						}
-						$html .= '<optgroup label="' . get_the_title( $parent_id ) . '">';
+						$html .= '<optgroup label="'.get_the_title($parent_id).'">';
 						$prev_parent_id = $parent_id;
 
-					} elseif( ! $parent_id && 0 == $prev_parent_id ) {
+					} elseif ( ! $parent_id && 0 == $prev_parent_id) {
 
 						$html .= '</optgroup>';
 
 					}
 
-					$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_woocommerce_product, false ) . '>' . esc_html( $product_name ) . '</option>' . "\n";
+					$html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_woocommerce_product, false).'>'.esc_html($product_name).'</option>'."\n";
 
 				} // End For Loop
 
-			$html .= '</select>' . "\n";
-			if ( current_user_can( 'publish_product' )) {
+			$html .= '</select>'."\n";
+			if (current_user_can('publish_product')) {
 
-				$html .= '<p>' . "\n";
-					$html .= '<a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Add a Product', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<p>'."\n";
+					$html .= '<a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Add a Product', 'woothemes-sensei').'</a>'."\n";
 				$html .= '</p>'."\n";
 
 			} // End If Statement
 
 		} else {
 
-			if ( current_user_can( 'publish_product' )) {
+			if (current_user_can('publish_product')) {
 
-				$html .= '<p>' . "\n";
-					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . '&nbsp;<a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Please add some first', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<p>'."\n";
+					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei')).'&nbsp;<a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Please add some first', 'woothemes-sensei').'</a>'."\n";
 				$html .= '</p>'."\n";
 
 			} else {
 
-                $html .= '<p>' . "\n";
-					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . "\n";
+                $html .= '<p>'."\n";
+					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei'))."\n";
 				$html .= '</p>'."\n";
 
 			} // End If Statement
@@ -287,33 +287,33 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_prerequisite_meta_box_content () {
+	public function course_prerequisite_meta_box_content() {
 		global $post;
 
-		$select_course_prerequisite = get_post_meta( $post->ID, '_course_prerequisite', true );
+		$select_course_prerequisite = get_post_meta($post->ID, '_course_prerequisite', true);
 
-		$post_args = array(	'post_type' 		=> 'course',
+		$post_args = array('post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'DESC',
     						'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
-			$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">' . "\n";
-			$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>';
-				foreach ($posts_array as $post_item){
-					$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_prerequisite, false ) . '>' . esc_html( $post_item->post_title ) . '</option>' . "\n";
+		if (count($posts_array) > 0) {
+			$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">'."\n";
+			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
+				foreach ($posts_array as $post_item) {
+					$html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_prerequisite, false).'>'.esc_html($post_item->post_title).'</option>'."\n";
 				} // End For Loop
-			$html .= '</select>' . "\n";
+			$html .= '</select>'."\n";
 		} else {
-			$html .= '<p>' . esc_html( __( 'No courses exist yet. Please add some first.', 'woothemes-sensei' ) ) . '</p>';
+			$html .= '<p>'.esc_html(__('No courses exist yet. Please add some first.', 'woothemes-sensei')).'</p>';
 		} // End If Statement
 
 		echo $html;
@@ -326,21 +326,21 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_featured_meta_box_content () {
+	public function course_featured_meta_box_content() {
 		global $post;
 
-		$course_featured = get_post_meta( $post->ID, '_course_featured', true );
+		$course_featured = get_post_meta($post->ID, '_course_featured', true);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
 		$checked = '';
-		if ( isset( $course_featured ) && ( '' != $course_featured ) ) {
-	 	    $checked = checked( 'featured', $course_featured, false );
+		if (isset($course_featured) && ('' != $course_featured)) {
+	 	    $checked = checked('featured', $course_featured, false);
 	 	} // End If Statement
 
-	 	$html .= '<input type="checkbox" name="course_featured" value="featured" ' . $checked . '>&nbsp;' . __( 'Feature this course', 'woothemes-sensei' ) . '<br>';
+	 	$html .= '<input type="checkbox" name="course_featured" value="featured" '.$checked.'>&nbsp;'.__('Feature this course', 'woothemes-sensei').'<br>';
 
 		echo $html;
 
@@ -352,16 +352,16 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_video_meta_box_content () {
+	public function course_video_meta_box_content() {
 		global $post;
 
-		$course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+		$course_video_embed = get_post_meta($post->ID, '_course_video_embed', true);
 
 		$html = '';
 
-		$html .= '<label class="screen-reader-text" for="course_video_embed">' . __( 'Video Embed Code', 'woothemes-sensei' ) . '</label>';
-		$html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">' . $course_video_embed . '</textarea>';
-		$html .= '<p>' .  __( 'Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei' ) . '</p>';
+		$html .= '<label class="screen-reader-text" for="course_video_embed">'.__('Video Embed Code', 'woothemes-sensei').'</label>';
+		$html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">'.$course_video_embed.'</textarea>';
+		$html .= '<p>'.__('Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei').'</p>';
 
 		echo $html;
 
@@ -376,36 +376,36 @@ 
 	 * @param int $post_id
 	 * @return int
 	 */
-	public function meta_box_save ( $post_id ) {
+	public function meta_box_save($post_id) {
 		global $post;
 
 		/* Verify the nonce before proceeding. */
-		if ( ( get_post_type() != $this->token ) || ! wp_verify_nonce( $_POST['woo_' . $this->token . '_noonce'], plugin_basename(__FILE__) ) ) {
+		if ((get_post_type() != $this->token) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_noonce'], plugin_basename(__FILE__))) {
 			return $post_id;
 		}
 
 		/* Get the post type object. */
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type = get_post_type_object($post->post_type);
 
 		/* Check if the current user has permission to edit the post. */
-		if ( !current_user_can( $post_type->cap->edit_post, $post_id ) ) {
+		if ( ! current_user_can($post_type->cap->edit_post, $post_id)) {
 			return $post_id;
 		} // End If Statement
 
-		if ( 'page' == $_POST['post_type'] ) {
-			if ( ! current_user_can( 'edit_page', $post_id ) ) {
+		if ('page' == $_POST['post_type']) {
+			if ( ! current_user_can('edit_page', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} else {
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} // End If Statement
 
 		// Save the post meta data fields
-		if ( isset($this->meta_fields) && is_array($this->meta_fields) ) {
-			foreach ( $this->meta_fields as $meta_key ) {
-				$this->save_post_meta( $meta_key, $post_id );
+		if (isset($this->meta_fields) && is_array($this->meta_fields)) {
+			foreach ($this->meta_fields as $meta_key) {
+				$this->save_post_meta($meta_key, $post_id);
 			} // End For Loop
 		} // End If Statement
 
@@ -422,18 +422,18 @@ 
 	 * @param int $post_id (default: 0)
 	 * @return int new meta id | bool meta value saved status
 	 */
-	private function save_post_meta( $post_key = '', $post_id = 0 ) {
+	private function save_post_meta($post_key = '', $post_id = 0) {
 		// Get the meta key.
-		$meta_key = '_' . $post_key;
+		$meta_key = '_'.$post_key;
 		// Get the posted data and sanitize it for use as an HTML class.
-		if ( 'course_video_embed' == $post_key) {
-			$new_meta_value = esc_html( $_POST[$post_key] );
+		if ('course_video_embed' == $post_key) {
+			$new_meta_value = esc_html($_POST[$post_key]);
 		} else {
-			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
+			$new_meta_value = (isset($_POST[$post_key]) ? sanitize_html_class($_POST[$post_key]) : '');
 		} // End If Statement
 
         // update field with the new value
-        return update_post_meta( $post_id, $meta_key, $new_meta_value );
+        return update_post_meta($post_id, $meta_key, $new_meta_value);
 
 	} // End save_post_meta()
 
@@ -443,31 +443,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_lessons_meta_box_content () {
+	public function course_lessons_meta_box_content() {
 
 		global $post;
 
 		// Setup Lesson Query
 		$posts_array = array();
-		if ( 0 < $post->ID ) {
+		if (0 < $post->ID) {
 
-			$posts_array = $this->course_lessons( $post->ID, 'any' );
+			$posts_array = $this->course_lessons($post->ID, 'any');
 
 		} // End If Statement
 
 		$html = '';
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="'
-                 . esc_attr( 'woo_' . $this->token . '_noonce' )
-                 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'
+                 . esc_attr('woo_'.$this->token.'_noonce')
+                 . '" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
+		if (count($posts_array) > 0) {
 
-			foreach ($posts_array as $post_item){
+			foreach ($posts_array as $post_item) {
 
 				$html .= '<p>'."\n";
 
 					$html .= $post_item->post_title."\n";
-					$html .= '<a href="' . esc_url( get_edit_post_link( $post_item->ID ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $post_item->post_title ) ) . '" class="edit-lesson-action">' . __( 'Edit this lesson', 'woothemes-sensei' ) . '</a>';
+					$html .= '<a href="'.esc_url(get_edit_post_link($post_item->ID)).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $post_item->post_title)).'" class="edit-lesson-action">'.__('Edit this lesson', 'woothemes-sensei').'</a>';
 
 				$html .= '</p>'."\n";
 
@@ -475,12 +475,12 @@ 
 
 		} else {
 			$course_id = '';
-			if ( 0 < $post->ID ) { $course_id = '&course_id=' . $post->ID; }
-			$html .= '<p>' . esc_html( __( 'No lessons exist yet for this course.', 'woothemes-sensei' ) ) . "\n";
+			if (0 < $post->ID) { $course_id = '&course_id='.$post->ID; }
+			$html .= '<p>'.esc_html(__('No lessons exist yet for this course.', 'woothemes-sensei'))."\n";
 
-				$html .= '<a href="' . admin_url( 'post-new.php?post_type=lesson' . $course_id )
-                         . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
-                         . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<a href="'.admin_url('post-new.php?post_type=lesson'.$course_id)
+                         . '" title="'.esc_attr(__('Add a Lesson', 'woothemes-sensei')).'">'
+                         . __('Please add some.', 'woothemes-sensei').'</a>'."\n";
 
 			$html .= '</p>'."\n";
 		} // End If Statement
@@ -497,12 +497,12 @@ 
      * @return void
      */
 
-    public function course_manage_meta_box_content () {
+    public function course_manage_meta_box_content() {
         global $post;
         
-        $manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+        $manage_url = esc_url(add_query_arg(array('page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php')));
 
-        $grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+        $grading_url = esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php')));
 
 
         echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
@@ -520,16 +520,16 @@ 
 	 * @param  array $defaults
 	 * @return array $new_columns
 	 */
-	public function add_column_headings ( $defaults ) {
+	public function add_column_headings($defaults) {
 		$new_columns['cb'] = '<input type="checkbox" />';
 		// $new_columns['id'] = __( 'ID' );
-		$new_columns['title'] = _x( 'Course Title', 'column name', 'woothemes-sensei' );
-		$new_columns['course-prerequisite'] = _x( 'Pre-requisite Course', 'column name', 'woothemes-sensei' );
-		if ( Sensei_WC::is_woocommerce_active() ) {
-			$new_columns['course-woocommerce-product'] = _x( 'WooCommerce Product', 'column name', 'woothemes-sensei' );
+		$new_columns['title'] = _x('Course Title', 'column name', 'woothemes-sensei');
+		$new_columns['course-prerequisite'] = _x('Pre-requisite Course', 'column name', 'woothemes-sensei');
+		if (Sensei_WC::is_woocommerce_active()) {
+			$new_columns['course-woocommerce-product'] = _x('WooCommerce Product', 'column name', 'woothemes-sensei');
 		} // End If Statement
-		$new_columns['course-category'] = _x( 'Category', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['course-category'] = _x('Category', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 
@@ -544,45 +544,45 @@ 
 	 * @param  int $id
 	 * @return void
 	 */
-	public function add_column_data ( $column_name, $id ) {
+	public function add_column_data($column_name, $id) {
 		global $wpdb, $post;
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'id':
 				echo $id;
 			break;
 
 			case 'course-prerequisite':
-				$course_prerequisite_id = get_post_meta( $id, '_course_prerequisite', true);
-				if ( 0 < absint( $course_prerequisite_id ) ) { echo '<a href="' . esc_url( get_edit_post_link( absint( $course_prerequisite_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $course_prerequisite_id ) ) ) ) . '">' . get_the_title( absint( $course_prerequisite_id ) ) . '</a>'; }
+				$course_prerequisite_id = get_post_meta($id, '_course_prerequisite', true);
+				if (0 < absint($course_prerequisite_id)) { echo '<a href="'.esc_url(get_edit_post_link(absint($course_prerequisite_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($course_prerequisite_id)))).'">'.get_the_title(absint($course_prerequisite_id)).'</a>'; }
 
 			break;
 
 			case 'course-woocommerce-product':
-				if ( Sensei_WC::is_woocommerce_active() ) {
-					$course_woocommerce_product_id = get_post_meta( $id, '_course_woocommerce_product', true);
-					if ( 0 < absint( $course_woocommerce_product_id ) ) {
-						if ( 'product_variation' == get_post_type( $course_woocommerce_product_id ) ) {
-							$product_object = get_product( $course_woocommerce_product_id );
-							if( sensei_check_woocommerce_version( '2.1' ) ) {
-								$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
+				if (Sensei_WC::is_woocommerce_active()) {
+					$course_woocommerce_product_id = get_post_meta($id, '_course_woocommerce_product', true);
+					if (0 < absint($course_woocommerce_product_id)) {
+						if ('product_variation' == get_post_type($course_woocommerce_product_id)) {
+							$product_object = get_product($course_woocommerce_product_id);
+							if (sensei_check_woocommerce_version('2.1')) {
+								$formatted_variation = wc_get_formatted_variation($product_object->variation_data, true);
 							} else {
-								$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
+								$formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true);
 							}
 							$course_woocommerce_product_id = $product_object->parent->post->ID;
-							$product_name = $product_object->parent->post->post_title . '<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . ucwords( $formatted_variation );
+							$product_name = $product_object->parent->post->post_title.'<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.ucwords($formatted_variation);
 						} else {
-							$product_name = get_the_title( absint( $course_woocommerce_product_id ) );
+							$product_name = get_the_title(absint($course_woocommerce_product_id));
 						} // End If Statement
-						echo '<a href="' . esc_url( get_edit_post_link( absint( $course_woocommerce_product_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $product_name ) ) . '">' . $product_name . '</a>';
+						echo '<a href="'.esc_url(get_edit_post_link(absint($course_woocommerce_product_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $product_name)).'">'.$product_name.'</a>';
 					} // End If Statement
 				} // End If Statement
 			break;
 
 			case 'course-category':
-				$output = get_the_term_list( $id, 'course-category', '', ', ', '' );
-				if ( '' == $output ) {
-					$output = __( 'None', 'woothemes-sensei' );
+				$output = get_the_term_list($id, 'course-category', '', ', ', '');
+				if ('' == $output) {
+					$output = __('None', 'woothemes-sensei');
 				} // End If Statement
 				echo $output;
 			break;
@@ -602,29 +602,29 @@ 
 	 * @param array $includes (default: array())
 	 * @return array
 	 */
-	public function course_query( $amount = 0, $type = 'default', $includes = array(), $excludes = array() ) {
-		global $my_courses_page ;
+	public function course_query($amount = 0, $type = 'default', $includes = array(), $excludes = array()) {
+		global $my_courses_page;
 
 		$results_array = array();
 
-		if( $my_courses_page ) { add_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); }
+		if ($my_courses_page) { add_action('pre_get_posts', array($this, 'filter_my_courses')); }
 
-		$post_args = $this->get_archive_query_args( $type, $amount, $includes, $excludes );
+		$post_args = $this->get_archive_query_args($type, $amount, $includes, $excludes);
 
 		// get the posts
-		if( empty( $post_args ) ) {
+		if (empty($post_args)) {
 
 			return $results_array;
 
-		}else{
+		} else {
 
 			//reset the pagination as this widgets do not need it
 			$post_args['paged'] = 1;
-			$results_array = get_posts( $post_args );
+			$results_array = get_posts($post_args);
 
 		}
 
-		if( $my_courses_page ) { remove_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); }
+		if ($my_courses_page) { remove_action('pre_get_posts', array($this, 'filter_my_courses')); }
 
 		return $results_array;
 
@@ -640,22 +640,22 @@ 
 	 * @param array $includes (default: array())
 	 * @return array
 	 */
-	public function get_archive_query_args( $type = '', $amount = 0 , $includes = array(), $excludes = array() ) {
+	public function get_archive_query_args($type = '', $amount = 0, $includes = array(), $excludes = array()) {
 
 		global $wp_query;
 
-		if ( 0 == $amount && ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && 'usercourses' != $type && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) ) {
-			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+		if (0 == $amount && (isset(Sensei()->settings->settings['course_archive_amount']) && 'usercourses' != $type && (0 < absint(Sensei()->settings->settings['course_archive_amount'])))) {
+			$amount = absint(Sensei()->settings->settings['course_archive_amount']);
 		} else {
-			if ( 0 == $amount) {
-				$amount = $wp_query->get( 'posts_per_page' );
+			if (0 == $amount) {
+				$amount = $wp_query->get('posts_per_page');
 			} // End If Statement
 		} // End If Statement
 
-        $stored_order = get_option( 'sensei_course_order', '' );
+        $stored_order = get_option('sensei_course_order', '');
         $order = 'ASC';
         $orderby = 'menu_order';
-        if( empty( $stored_order ) ){
+        if (empty($stored_order)) {
 
             $order = 'DESC';
             $orderby = 'date';
@@ -665,7 +665,7 @@ 
 		switch ($type) {
 
 			case 'usercourses':
-				$post_args = array(	'post_type' 		=> 'course',
+				$post_args = array('post_type' 		=> 'course',
 									'orderby'         	=> $orderby,
     								'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -706,7 +706,7 @@ 
 				break;
 
 			case 'featuredcourses':
-                $post_args = array(	'post_type' 		=> 'course',
+                $post_args = array('post_type' 		=> 'course',
                                     'orderby'         	=> $orderby,
                                     'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -718,7 +718,7 @@ 
 									);
 				break;
 			default:
-				$post_args = array(	'post_type' 		=> 'course',
+				$post_args = array('post_type' 		=> 'course',
                                     'orderby'         	=> $orderby,
                                     'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -730,13 +730,13 @@ 
 		}
 
         $post_args['posts_per_page'] = $amount;
-        $paged = $wp_query->get( 'paged' );
-        $post_args['paged'] = empty( $paged) ? 1 : $paged;
+        $paged = $wp_query->get('paged');
+        $post_args['paged'] = empty($paged) ? 1 : $paged;
 
-        if( 'newcourses' == $type ){
+        if ('newcourses' == $type) {
 
-            $post_args[ 'orderby' ] = 'date';
-            $post_args[ 'order' ] = 'DESC';
+            $post_args['orderby'] = 'date';
+            $post_args['order'] = 'DESC';
         }
 
 		return $post_args;
@@ -758,15 +758,15 @@ 
      *
 	 * @return string | void
 	 */
-	public function course_image( $course_id = 0, $width = '100', $height = '100', $return = false ) {
+	public function course_image($course_id = 0, $width = '100', $height = '100', $return = false) {
 
-        if ( is_a( $course_id, 'WP_Post' ) ) {
+        if (is_a($course_id, 'WP_Post')) {
 
 	        $course_id = $course_id->ID;
 
         }
 
-		if ( 'course' !== get_post_type( $course_id )  ){
+		if ('course' !== get_post_type($course_id)) {
 
 			return;
 
@@ -775,26 +775,26 @@ 
 		$html = '';
 
 		// Get Width and Height settings
-		if ( ( $width == '100' ) && ( $height == '100' ) ) {
+		if (($width == '100') && ($height == '100')) {
 
-			if ( is_singular( 'course' ) ) {
+			if (is_singular('course')) {
 
-				if ( !Sensei()->settings->settings[ 'course_single_image_enable' ] ) {
+				if ( ! Sensei()->settings->settings['course_single_image_enable']) {
 					return '';
 				} // End If Statement
 				$image_thumb_size = 'course_single_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 
 			} else {
 
-				if ( !Sensei()->settings->settings[ 'course_archive_image_enable' ] ) {
+				if ( ! Sensei()->settings->settings['course_archive_image_enable']) {
 					return '';
 				} // End If Statement
 
 				$image_thumb_size = 'course_archive_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 
@@ -803,31 +803,31 @@ 
 		} // End If Statement
 
 		$img_url = '';
-		if ( has_post_thumbnail( $course_id ) ) {
+		if (has_post_thumbnail($course_id)) {
    			// Get Featured Image
-   			$img_url = get_the_post_thumbnail( $course_id, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') );
+   			$img_url = get_the_post_thumbnail($course_id, array($width, $height), array('class' => 'woo-image thumbnail alignleft'));
  		} else {
 
 			// Check for a Lesson Image
-			$course_lessons = $this->course_lessons( $course_id );
+			$course_lessons = $this->course_lessons($course_id);
 
-			foreach ($course_lessons as $lesson_item){
-				if ( has_post_thumbnail( $lesson_item->ID ) ) {
+			foreach ($course_lessons as $lesson_item) {
+				if (has_post_thumbnail($lesson_item->ID)) {
 					// Get Featured Image
-					$img_url = get_the_post_thumbnail( $lesson_item->ID, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') );
-					if ( '' != $img_url ) {
+					$img_url = get_the_post_thumbnail($lesson_item->ID, array($width, $height), array('class' => 'woo-image thumbnail alignleft'));
+					if ('' != $img_url) {
 						break;
 					} // End If Statement
 
 				} // End If Statement
 			} // End For Loop
 
- 			if ( '' == $img_url ) {
+ 			if ('' == $img_url) {
 
  				// Display Image Placeholder if none
-				if ( Sensei()->settings->get( 'placeholder_images_enable' ) ) {
+				if (Sensei()->settings->get('placeholder_images_enable')) {
 
-                    $img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+                    $img_url = apply_filters('sensei_course_placeholder_image_url', '<img src="http://placehold.it/'.$width.'x'.$height.'" class="woo-image thumbnail alignleft" />');
 
 				} // End If Statement
 
@@ -835,17 +835,17 @@ 
 
 		} // End If Statement
 
-		if ( '' != $img_url ) {
+		if ('' != $img_url) {
 
-			$html .= '<a href="' . get_permalink( $course_id ) . '" title="' . esc_attr( get_post_field( 'post_title', $course_id ) ) . '">' . $img_url  .'</a>';
+			$html .= '<a href="'.get_permalink($course_id).'" title="'.esc_attr(get_post_field('post_title', $course_id)).'">'.$img_url.'</a>';
 
 		} // End If Statement
 
-        if( $return ){
+        if ($return) {
 
             return $html;
 
-        }else{
+        } else {
 
             echo $html;
 
@@ -862,9 +862,9 @@ 
 	 * @param string $post_status (default: 'publish')
 	 * @return int
 	 */
-	public function course_count( $post_status = 'publish' ) {
+	public function course_count($post_status = 'publish') {
 
-		$post_args = array(	'post_type'         => 'course',
+		$post_args = array('post_type'         => 'course',
 							'posts_per_page'    => -1,
 //							'orderby'           => 'menu_order date',
 //							'order'             => 'ASC',
@@ -875,10 +875,10 @@ 
 
 		// Allow WP to generate the complex final query, just shortcut to only do an overall count
 //		add_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
-		$courses_query = new WP_Query( apply_filters( 'sensei_course_count', $post_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_course_count', $post_args));
 //		remove_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
 
-		return count( $courses_query->posts );
+		return count($courses_query->posts);
 	} // End course_count()
 
 
@@ -891,42 +891,42 @@ 
 	 * @param string $fields (default: 'all'). WP only allows 3 types, but we will limit it to only 'ids' or 'all'
 	 * @return array{ type WP_Post }  $posts_array
 	 */
-	public function course_lessons( $course_id = 0, $post_status = 'publish', $fields = 'all' ) {
+	public function course_lessons($course_id = 0, $post_status = 'publish', $fields = 'all') {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
+        if (is_a($course_id, 'WP_Post')) {
             $course_id = $course_id->ID;
         }
 
-		$post_args = array(	'post_type'         => 'lesson',
+		$post_args = array('post_type'         => 'lesson',
 							'posts_per_page'       => -1,
 							'orderby'           => 'date',
 							'order'             => 'ASC',
 							'meta_query'        => array(
 								array(
 									'key' => '_lesson_course',
-									'value' => intval( $course_id ),
+									'value' => intval($course_id),
 								),
 							),
 							'post_status'       => $post_status,
 							'suppress_filters'  => 0,
 							);
-		$query_results = new WP_Query( $post_args );
+		$query_results = new WP_Query($post_args);
         $lessons = $query_results->posts;
 
         // re order the lessons. This could not be done via the OR meta query as there may be lessons
         // with the course order for a different course and this should not be included. It could also not
         // be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
         // that have been added to the course.
-        if( count( $lessons) > 1  ){
+        if (count($lessons) > 1) {
 
-            foreach( $lessons as $lesson ){
+            foreach ($lessons as $lesson) {
 
-                $order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
+                $order = intval(get_post_meta($lesson->ID, '_order_'.$course_id, true));
                 // for lessons with no order set it to be 10000 so that it show up at the end
                 $lesson->course_order = $order ? $order : 100000;
             }
 
-            uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
+            uasort($lessons, array($this, '_short_course_lessons_callback'));
         }
 
         /**
@@ -937,12 +937,12 @@ 
          * @param array $lessons
          * @param int $course_id
          */
-        $lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
+        $lessons = apply_filters('sensei_course_get_lessons', $lessons, $course_id);
 
         //return the requested fields
         // runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
         // objects
-        if( 'ids' == $fields ) {
+        if ('ids' == $fields) {
             $lesson_objects = $lessons;
             $lessons = array();
 
@@ -964,9 +964,9 @@ 
      * @param array $lesson_2
      * @return int
      */
-    protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
+    protected function _short_course_lessons_callback($lesson_1, $lesson_2) {
 
-        if ( $lesson_1->course_order == $lesson_2->course_order ) {
+        if ($lesson_1->course_order == $lesson_2->course_order) {
             return 0;
         }
 
@@ -980,21 +980,21 @@ 
 	 * @param  boolean $boolean_check True if a simple yes/no is required
 	 * @return array              Array of quiz post objects
 	 */
-	public function course_quizzes( $course_id = 0, $boolean_check = false ) {
+	public function course_quizzes($course_id = 0, $boolean_check = false) {
 
 
 		$course_quizzes = array();
 
-		if( $course_id ) {
-			$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
+		if ($course_id) {
+			$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
 
-			foreach( $lesson_ids as $lesson_id ) {
-				$has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
-				if ( $has_questions && $boolean_check ) {
+			foreach ($lesson_ids as $lesson_id) {
+				$has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
+				if ($has_questions && $boolean_check) {
 					return true;
 				}
-				elseif ( $has_questions ) {
-					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+				elseif ($has_questions) {
+					$quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 //					$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
 //					if( count( $questions ) > 0 ) {
 						$course_quizzes[] = $quiz_id;
@@ -1002,7 +1002,7 @@ 
 				}
 			}
 		}
-		if ( $boolean_check && empty($course_quizzes) ) {
+		if ($boolean_check && empty($course_quizzes)) {
 			$course_quizzes = false;
 		}
 		return $course_quizzes;
@@ -1017,9 +1017,9 @@ 
 	 * @param  string $post_status (default: 'publish')
 	 * @return array
 	 */
-	public function course_lessons_completed( $course_id = 0, $post_status = 'publish' ) {
+	public function course_lessons_completed($course_id = 0, $post_status = 'publish') {
 
-		return $this->course_lessons( $course_id, $post_status );
+		return $this->course_lessons($course_id, $post_status);
 
 	} // End course_lessons_completed()
 
@@ -1032,9 +1032,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_author_lesson_count( $author_id = 0, $course_id = 0 ) {
+	public function course_author_lesson_count($author_id = 0, $course_id = 0) {
 
-        $lesson_args = array(	'post_type' 		=> 'lesson',
+        $lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
 		    					'author'         	=> $author_id,
 		    					'meta_key'        	=> '_lesson_course',
@@ -1043,8 +1043,8 @@ 
     	    					'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
-		$count = count( $lessons_array );
+		$lessons_array = get_posts($lesson_args);
+		$count = count($lessons_array);
 		return $count;
 
 	} // End course_author_lesson_count()
@@ -1056,9 +1056,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_lesson_count( $course_id = 0 ) {
+	public function course_lesson_count($course_id = 0) {
 
-		$lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
 		    					'meta_key'        	=> '_lesson_course',
     							'meta_value'      	=> $course_id,
@@ -1066,9 +1066,9 @@ 
     	    					'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
+		$lessons_array = get_posts($lesson_args);
 
-        $count = count( $lessons_array );
+        $count = count($lessons_array);
 
         return $count;
 
@@ -1081,9 +1081,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_lesson_preview_count( $course_id = 0 ) {
+	public function course_lesson_preview_count($course_id = 0) {
 
-		$lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
     	    					'post_status'      	=> 'publish',
     	    					'suppress_filters' 	=> 0,
@@ -1099,9 +1099,9 @@ 
 								),
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
+		$lessons_array = get_posts($lesson_args);
 
-		$count = count( $lessons_array );
+		$count = count($lessons_array);
 
         return $count;
 
@@ -1114,12 +1114,12 @@ 
 	 * @param  int $product_id (default: 0)
 	 * @return array
 	 */
-	public function get_product_courses( $product_id = 0 ) {
+	public function get_product_courses($product_id = 0) {
 
 		$posts_array = array();
 		// Check for WooCommerce
-		if ( Sensei_WC::is_woocommerce_active() && 0 < $product_id ) {
-			$post_args = array(	'post_type' 		=> 'course',
+		if (Sensei_WC::is_woocommerce_active() && 0 < $product_id) {
+			$post_args = array('post_type' 		=> 'course',
 								'posts_per_page' 		=> -1,
 								'meta_key'        	=> '_course_woocommerce_product',
 	    						'meta_value'      	=> $product_id,
@@ -1128,7 +1128,7 @@ 
 								'orderby' 			=> 'menu_order date',
 								'order' 			=> 'ASC',
 								);
-			$posts_array = get_posts( $post_args );
+			$posts_array = get_posts($post_args);
 		} // End If Statement
 		return $posts_array;
 
@@ -1139,17 +1139,17 @@ 
 	 * @param  WP_Query $query
 	 * @return void
 	 */
-	public function filter_my_courses( $query ) {
+	public function filter_my_courses($query) {
 		global  $my_courses_section;
 
-		if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
-			$amount = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
-			$query->set( 'posts_per_page', $amount );
+		if (isset(Sensei()->settings->settings['my_course_amount']) && (0 < absint(Sensei()->settings->settings['my_course_amount']))) {
+			$amount = absint(Sensei()->settings->settings['my_course_amount']);
+			$query->set('posts_per_page', $amount);
 		}
 
-		if( isset( $_GET[ $my_courses_section . '_page' ] ) && 0 < intval( $_GET[ $my_courses_section . '_page' ] ) ) {
-			$page = intval( $_GET[ $my_courses_section . '_page' ] );
-			$query->set( 'paged', $page );
+		if (isset($_GET[$my_courses_section.'_page']) && 0 < intval($_GET[$my_courses_section.'_page'])) {
+			$page = intval($_GET[$my_courses_section.'_page']);
+			$query->set('paged', $page);
 		}
 	}
 
@@ -1163,48 +1163,48 @@ 
 	 * @param  boolean $manage Whether the user has permission to manage the courses
 	 * @return string          HTML displayng course data
 	 */
-	public function load_user_courses_content( $user = false ) {
+	public function load_user_courses_content($user = false) {
 		global $course, $my_courses_page, $my_courses_section;
 
-        if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
-            || ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
+        if ( ! isset(Sensei()->settings->settings['learner_profile_show_courses'])
+            || ! Sensei()->settings->settings['learner_profile_show_courses']) {
 
             // do not show the content if the settings doesn't allow for it
             return;
 
         }
 
-        $manage = ( $user->ID == get_current_user_id() ) ? true : false;
+        $manage = ($user->ID == get_current_user_id()) ? true : false;
 
-        do_action( 'sensei_before_learner_course_content', $user );
+        do_action('sensei_before_learner_course_content', $user);
 
 		// Build Output HTML
 		$complete_html = $active_html = '';
 
-		if( is_a( $user, 'WP_User' ) ) {
+		if (is_a($user, 'WP_User')) {
 
 			$my_courses_page = true;
 
 			// Allow action to be run before My Courses content has loaded
-			do_action( 'sensei_before_my_courses', $user->ID );
+			do_action('sensei_before_my_courses', $user->ID);
 
 			// Logic for Active and Completed Courses
 			$per_page = 20;
-			if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] )
-                && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
+			if (isset(Sensei()->settings->settings['my_course_amount'])
+                && (0 < absint(Sensei()->settings->settings['my_course_amount']))) {
 
-				$per_page = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
+				$per_page = absint(Sensei()->settings->settings['my_course_amount']);
 
 			}
 
-			$course_statuses = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user->ID, 'type' => 'sensei_course_status' ), true );
+			$course_statuses = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user->ID, 'type' => 'sensei_course_status'), true);
 			// User may only be on 1 Course
-			if ( !is_array($course_statuses) ) {
-				$course_statuses = array( $course_statuses );
+			if ( ! is_array($course_statuses)) {
+				$course_statuses = array($course_statuses);
 			}
 			$completed_ids = $active_ids = array();
-			foreach( $course_statuses as $course_status ) {
-				if ( Sensei_Utils::user_completed_course( $course_status, $user->ID ) ) {
+			foreach ($course_statuses as $course_status) {
+				if (Sensei_Utils::user_completed_course($course_status, $user->ID)) {
 					$completed_ids[] = $course_status->comment_post_ID;
 				} else {
 					$active_ids[] = $course_status->comment_post_ID;
@@ -1214,41 +1214,41 @@ 
 			$active_count = $completed_count = 0;
 
 			$active_courses = array();
-			if ( 0 < intval( count( $active_ids ) ) ) {
+			if (0 < intval(count($active_ids))) {
 				$my_courses_section = 'active';
-				$active_courses = Sensei()->course->course_query( $per_page, 'usercourses', $active_ids );
-				$active_count = count( $active_ids );
+				$active_courses = Sensei()->course->course_query($per_page, 'usercourses', $active_ids);
+				$active_count = count($active_ids);
 			} // End If Statement
 
 			$completed_courses = array();
-			if ( 0 < intval( count( $completed_ids ) ) ) {
+			if (0 < intval(count($completed_ids))) {
 				$my_courses_section = 'completed';
-				$completed_courses = Sensei()->course->course_query( $per_page, 'usercourses', $completed_ids );
-				$completed_count = count( $completed_ids );
+				$completed_courses = Sensei()->course->course_query($per_page, 'usercourses', $completed_ids);
+				$completed_count = count($completed_ids);
 			} // End If Statement
 
-			foreach ( $active_courses as $course_item ) {
+			foreach ($active_courses as $course_item) {
 
-				$course_lessons =  Sensei()->course->course_lessons( $course_item->ID );
+				$course_lessons = Sensei()->course->course_lessons($course_item->ID);
 				$lessons_completed = 0;
-				foreach ( $course_lessons as $lesson ) {
-					if ( Sensei_Utils::user_completed_lesson( $lesson->ID, $user->ID ) ) {
+				foreach ($course_lessons as $lesson) {
+					if (Sensei_Utils::user_completed_lesson($lesson->ID, $user->ID)) {
 						++$lessons_completed;
 					}
 				}
 
 			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+			    $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', '');
 
-                $active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
+                $active_html .= '<article class="'.esc_attr(join(' ', get_post_class(array('course', 'post'), $course_item->ID))).'">';
 
                 // Image
-                $active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
+                $active_html .= Sensei()->course->course_image(absint($course_item->ID), '100', '100', true);
 
                 // Title
                 $active_html .= '<header>';
 
-                $active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+                $active_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>';
 
                 $active_html .= '</header>';
 
@@ -1257,83 +1257,83 @@ 
                 $active_html .= '<p class="sensei-course-meta">';
 
                 // Author
-                $user_info = get_userdata( absint( $course_item->post_author ) );
-                if ( isset( Sensei()->settings->settings[ 'course_author' ] )
-                    && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+                $user_info = get_userdata(absint($course_item->post_author));
+                if (isset(Sensei()->settings->settings['course_author'])
+                    && (Sensei()->settings->settings['course_author'])) {
 
                     $active_html .= '<span class="course-author">'
-                        . __( 'by ', 'woothemes-sensei' )
-                        . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
-                        . '" title="' . esc_attr( $user_info->display_name ) . '">'
-                        . esc_html( $user_info->display_name )
+                        . __('by ', 'woothemes-sensei')
+                        . '<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author)))
+                        . '" title="'.esc_attr($user_info->display_name).'">'
+                        . esc_html($user_info->display_name)
                         . '</a></span>';
 
                 } // End If Statement
 
                 // Lesson count for this author
-                $lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
+                $lesson_count = Sensei()->course->course_lesson_count(absint($course_item->ID));
                 // Handle Division by Zero
-                if ( 0 == $lesson_count ) {
+                if (0 == $lesson_count) {
 
                     $lesson_count = 1;
 
                 } // End If Statement
-                $active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
+                $active_html .= '<span class="course-lesson-count">'.$lesson_count.'&nbsp;'.__('Lessons', 'woothemes-sensei').'</span>';
                 // Course Categories
-                if ( '' != $category_output ) {
+                if ('' != $category_output) {
 
-                    $active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+                    $active_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>';
 
                 } // End If Statement
-                $active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
+                $active_html .= '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $lessons_completed, $lesson_count).'</span>';
 
                 $active_html .= '</p>';
 
-                $active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+                $active_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>';
 
 
 
-                $progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
+                $progress_percentage = abs(round((doubleval($lessons_completed) * 100) / ($lesson_count), 0));
 
-                $active_html .= $this->get_progress_meter( $progress_percentage );
+                $active_html .= $this->get_progress_meter($progress_percentage);
 
                 $active_html .= '</section>';
 
-                if( is_user_logged_in() ) {
+                if (is_user_logged_in()) {
 
                     $active_html .= '<section class="entry-actions">';
 
-                    $active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
+                    $active_html .= '<form method="POST" action="'.esc_url(remove_query_arg(array('active_page', 'completed_page'))).'">';
 
-                    $active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
+                    $active_html .= '<input type="hidden" name="'.esc_attr('woothemes_sensei_complete_course_noonce').'" id="'.esc_attr('woothemes_sensei_complete_course_noonce').'" value="'.esc_attr(wp_create_nonce('woothemes_sensei_complete_course_noonce')).'" />';
 
-                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
+                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="'.esc_attr(absint($course_item->ID)).'" />';
 
-                    if ( 0 < absint( count( $course_lessons ) )
-                        && Sensei()->settings->settings['course_completion'] == 'complete' ){
+                    if (0 < absint(count($course_lessons))
+                        && Sensei()->settings->settings['course_completion'] == 'complete') {
 
                         $active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
-                            .  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
+                            .  __('Mark as Complete', 'woothemes-sensei').'"/> </span>';
 
                     } // End If Statement
 
                     $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
+                    if (Sensei_WC::is_woocommerce_active()) {
 
                         // Get the product ID
-                        $wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+                        $wc_post_id = get_post_meta(absint($course_item->ID), '_course_woocommerce_product', true);
+                        if (0 < $wc_post_id) {
 
-                            $course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
+                            $course_purchased = Sensei_WC::has_customer_bought_product($user->ID, $wc_post_id);
 
                         } // End If Statement
 
                     } // End If Statement
 
-                    if ( false == $course_purchased ) {
+                    if (false == $course_purchased) {
 
                         $active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
-                            .  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
+                            .  __('Delete Course', 'woothemes-sensei').'"/></span>';
 
                     } // End If Statement
 
@@ -1346,54 +1346,54 @@ 
 			}
 
 			// Active pagination
-			if( $active_count > $per_page ) {
+			if ($active_count > $per_page) {
 
 				$current_page = 1;
-				if( isset( $_GET['active_page'] ) && 0 < intval( $_GET['active_page'] ) ) {
+				if (isset($_GET['active_page']) && 0 < intval($_GET['active_page'])) {
 					$current_page = $_GET['active_page'];
 				}
 
 				$active_html .= '<nav class="pagination woo-pagination">';
-				$total_pages = ceil( $active_count / $per_page );
+				$total_pages = ceil($active_count / $per_page);
 
-				if( $current_page > 1 ) {
-					$prev_link = add_query_arg( 'active_page', $current_page - 1 );
-					$active_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page > 1) {
+					$prev_link = add_query_arg('active_page', $current_page - 1);
+					$active_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> ';
 				}
 
-				for ( $i = 1; $i <= $total_pages; $i++ ) {
-					$link = add_query_arg( 'active_page', $i );
+				for ($i = 1; $i <= $total_pages; $i++) {
+					$link = add_query_arg('active_page', $i);
 
-					if( $i == $current_page ) {
-						$active_html .= '<span class="page-numbers current">' . $i . '</span> ';
+					if ($i == $current_page) {
+						$active_html .= '<span class="page-numbers current">'.$i.'</span> ';
 					} else {
-						$active_html .= '<a class="page-numbers" href="' . esc_url( $link ). '">' . $i . '</a> ';
+						$active_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> ';
 					}
 				}
 
-				if( $current_page < $total_pages ) {
-					$next_link = add_query_arg( 'active_page', $current_page + 1 );
-					$active_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page < $total_pages) {
+					$next_link = add_query_arg('active_page', $current_page + 1);
+					$active_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> ';
 				}
 
 				$active_html .= '</nav>';
 			}
 
-			foreach ( $completed_courses as $course_item ) {
+			foreach ($completed_courses as $course_item) {
 				$course = $course_item;
 
 			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+			    $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', '');
 
-		    	$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
+		    	$complete_html .= '<article class="'.join(' ', get_post_class(array('course', 'post'), $course_item->ID)).'">';
 
 		    	    // Image
-		    		$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
+		    		$complete_html .= Sensei()->course->course_image(absint($course_item->ID), 100, 100, true);
 
 		    		// Title
 		    		$complete_html .= '<header>';
 
-		    		    $complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+		    		    $complete_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>';
 
 		    		$complete_html .= '</header>';
 
@@ -1402,49 +1402,49 @@ 
 		    			$complete_html .= '<p class="sensei-course-meta">';
 
 		    		    	// Author
-		    		    	$user_info = get_userdata( absint( $course_item->post_author ) );
-		    		    	if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
-		    		    		$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+		    		    	$user_info = get_userdata(absint($course_item->post_author));
+		    		    	if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {
+		    		    		$complete_html .= '<span class="course-author">'.__('by ', 'woothemes-sensei').'<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author))).'" title="'.esc_attr($user_info->display_name).'">'.esc_html($user_info->display_name).'</a></span>';
 		    		    	} // End If Statement
 
 		    		    	// Lesson count for this author
 		    		    	$complete_html .= '<span class="course-lesson-count">'
-                                . Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
-                                . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
+                                . Sensei()->course->course_lesson_count(absint($course_item->ID))
+                                . '&nbsp;'.__('Lessons', 'woothemes-sensei')
                                 . '</span>';
 
 		    		    	// Course Categories
-		    		    	if ( '' != $category_output ) {
+		    		    	if ('' != $category_output) {
 
-		    		    		$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+		    		    		$complete_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>';
 
 		    		    	} // End If Statement
 
 						$complete_html .= '</p>';
 
-						$complete_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+						$complete_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>';
 
-                        $complete_html .= $this->get_progress_meter( 100 );
+                        $complete_html .= $this->get_progress_meter(100);
 
-						if( $manage ) {
-							$has_quizzes = Sensei()->course->course_quizzes( $course_item->ID, true );
+						if ($manage) {
+							$has_quizzes = Sensei()->course->course_quizzes($course_item->ID, true);
 							// Output only if there is content to display
-							if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) {
+							if (has_filter('sensei_results_links') || $has_quizzes) {
 
 
 								$complete_html .= '<p class="sensei-results-links">';
 								$results_link = '';
-								if( $has_quizzes ) {
+								if ($has_quizzes) {
 
 									$results_link = '<a class="button view-results" href="'
-                                        . Sensei()->course_results->get_permalink( $course_item->ID )
-                                        . '">' . __( 'View results', 'woothemes-sensei' )
+                                        . Sensei()->course_results->get_permalink($course_item->ID)
+                                        . '">'.__('View results', 'woothemes-sensei')
                                         . '</a>';
 								}
                                 /**
                                  * Filter documented in Sensei_Course::the_course_action_buttons
                                  */
-								$complete_html .= apply_filters( 'sensei_results_links', $results_link, $course_item->ID );
+								$complete_html .= apply_filters('sensei_results_links', $results_link, $course_item->ID);
 								$complete_html .= '</p>';
 
 							}
@@ -1456,35 +1456,35 @@ 
 			}
 
 			// Active pagination
-			if( $completed_count > $per_page ) {
+			if ($completed_count > $per_page) {
 
 				$current_page = 1;
-				if( isset( $_GET['completed_page'] ) && 0 < intval( $_GET['completed_page'] ) ) {
+				if (isset($_GET['completed_page']) && 0 < intval($_GET['completed_page'])) {
 					$current_page = $_GET['completed_page'];
 				}
 
 				$complete_html .= '<nav class="pagination woo-pagination">';
-				$total_pages = ceil( $completed_count / $per_page );
+				$total_pages = ceil($completed_count / $per_page);
 
 
-				if( $current_page > 1 ) {
-					$prev_link = add_query_arg( 'completed_page', $current_page - 1 );
-					$complete_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page > 1) {
+					$prev_link = add_query_arg('completed_page', $current_page - 1);
+					$complete_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> ';
 				}
 
-				for ( $i = 1; $i <= $total_pages; $i++ ) {
-					$link = add_query_arg( 'completed_page', $i );
+				for ($i = 1; $i <= $total_pages; $i++) {
+					$link = add_query_arg('completed_page', $i);
 
-					if( $i == $current_page ) {
-						$complete_html .= '<span class="page-numbers current">' . $i . '</span> ';
+					if ($i == $current_page) {
+						$complete_html .= '<span class="page-numbers current">'.$i.'</span> ';
 					} else {
-						$complete_html .= '<a class="page-numbers" href="' . esc_url( $link ) . '">' . $i . '</a> ';
+						$complete_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> ';
 					}
 				}
 
-				if( $current_page < $total_pages ) {
-					$next_link = add_query_arg( 'completed_page', $current_page + 1 );
-					$complete_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page < $total_pages) {
+					$next_link = add_query_arg('completed_page', $current_page + 1);
+					$complete_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> ';
 				}
 
 				$complete_html .= '</nav>';
@@ -1492,26 +1492,26 @@ 
 
 		} // End If Statement
 
-		if( $manage ) {
-			$no_active_message = __( 'You have no active courses.', 'woothemes-sensei' );
-			$no_complete_message = __( 'You have not completed any courses yet.', 'woothemes-sensei' );
+		if ($manage) {
+			$no_active_message = __('You have no active courses.', 'woothemes-sensei');
+			$no_complete_message = __('You have not completed any courses yet.', 'woothemes-sensei');
 		} else {
-			$no_active_message =  __( 'This learner has no active courses.', 'woothemes-sensei' );
-			$no_complete_message =  __( 'This learner has not completed any courses yet.', 'woothemes-sensei' );
+			$no_active_message = __('This learner has no active courses.', 'woothemes-sensei');
+			$no_complete_message = __('This learner has not completed any courses yet.', 'woothemes-sensei');
 		}
 
 		ob_start();
 		?>
 
-		<?php do_action( 'sensei_before_user_courses' ); ?>
+		<?php do_action('sensei_before_user_courses'); ?>
 
 		<?php
-		if( $manage && ( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) ) {
+		if ($manage && ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable'])) {
 			?>
 			<p class="my-messages-link-container">
-                <a class="my-messages-link" href="<?php echo get_post_type_archive_link( 'sensei_message' ); ?>"
-                   title="<?php _e( 'View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei' ); ?>">
-                    <?php _e( 'My Messages', 'woothemes-sensei' ); ?>
+                <a class="my-messages-link" href="<?php echo get_post_type_archive_link('sensei_message'); ?>"
+                   title="<?php _e('View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei'); ?>">
+                    <?php _e('My Messages', 'woothemes-sensei'); ?>
                 </a>
             </p>
 			<?php
@@ -1520,11 +1520,11 @@ 
 		<div id="my-courses">
 
 		    <ul>
-		    	<li><a href="#active-courses"><?php  _e( 'Active Courses', 'woothemes-sensei' ); ?></a></li>
-		    	<li><a href="#completed-courses"><?php  _e( 'Completed Courses', 'woothemes-sensei' ); ?></a></li>
+		    	<li><a href="#active-courses"><?php  _e('Active Courses', 'woothemes-sensei'); ?></a></li>
+		    	<li><a href="#completed-courses"><?php  _e('Completed Courses', 'woothemes-sensei'); ?></a></li>
 		    </ul>
 
-		    <?php do_action( 'sensei_before_active_user_courses' ); ?>
+		    <?php do_action('sensei_before_active_user_courses'); ?>
 
 		    <?php
             $course_page_url = Sensei_Course::get_courses_page_url();
@@ -1532,7 +1532,7 @@ 
 
 		    <div id="active-courses">
 
-		    	<?php if ( '' != $active_html ) {
+		    	<?php if ('' != $active_html) {
 
 		    		echo $active_html;
 
@@ -1544,7 +1544,7 @@ 
 
                         <a href="<?php echo $course_page_url; ?>">
 
-                            <?php  _e( 'Start a Course!', 'woothemes-sensei' ); ?>
+                            <?php  _e('Start a Course!', 'woothemes-sensei'); ?>
 
                         </a>
 
@@ -1554,13 +1554,13 @@ 
 
 		    </div>
 
-		    <?php do_action( 'sensei_after_active_user_courses' ); ?>
+		    <?php do_action('sensei_after_active_user_courses'); ?>
 
-		    <?php do_action( 'sensei_before_completed_user_courses' ); ?>
+		    <?php do_action('sensei_before_completed_user_courses'); ?>
 
 		    <div id="completed-courses">
 
-		    	<?php if ( '' != $complete_html ) {
+		    	<?php if ('' != $complete_html) {
 
 		    		echo $complete_html;
 
@@ -1576,16 +1576,16 @@ 
 
 		    </div>
 
-		    <?php do_action( 'sensei_after_completed_user_courses' ); ?>
+		    <?php do_action('sensei_after_completed_user_courses'); ?>
 
 		</div>
 
-		<?php do_action( 'sensei_after_user_courses' ); ?>
+		<?php do_action('sensei_after_user_courses'); ?>
 
 		<?php
         echo ob_get_clean();
 
-        do_action( 'sensei_after_learner_course_content', $user );
+        do_action('sensei_after_learner_course_content', $user);
 
 	} // end load_user_courses_content
 
@@ -1597,7 +1597,7 @@ 
      *  @type $course WP_Post
      * }
      */
-    public static function get_all_courses(){
+    public static function get_all_courses() {
 
         $args = array(
                'post_type' => 'course',
@@ -1608,7 +1608,7 @@ 
                 'suppress_filters' 	=> 0,
         );
 
-        $wp_query_obj =  new WP_Query( $args );
+        $wp_query_obj = new WP_Query($args);
 
         /**
          * sensei_get_all_courses filter
@@ -1620,7 +1620,7 @@ 
          * }
          * @param array $attributes
          */
-        return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
+        return apply_filters('sensei_get_all_courses', $wp_query_obj->posts);
 
     }// end get_all_courses
 
@@ -1631,16 +1631,16 @@ 
      * @param int $progress_percentage 0 - 100
      * @return string $progress_bar_html
      */
-    public function get_progress_meter( $progress_percentage ){
+    public function get_progress_meter($progress_percentage) {
 
-        if ( 50 < $progress_percentage ) {
+        if (50 < $progress_percentage) {
             $class = ' green';
-        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
+        } elseif (25 <= $progress_percentage && 50 >= $progress_percentage) {
             $class = ' orange';
         } else {
             $class = ' red';
         }
-        $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
+        $progress_bar_html = '<div class="meter'.esc_attr($class).'"><span style="width: '.$progress_percentage.'%">'.round($progress_percentage).'%</span></div>';
 
         return $progress_bar_html;
 
@@ -1655,17 +1655,17 @@ 
      *
      * @return string $statement_html
      */
-    public function get_progress_statement( $course_id, $user_id ){
+    public function get_progress_statement($course_id, $user_id) {
 
-        if( empty( $course_id ) || empty( $user_id )
-        || ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+        if (empty($course_id) || empty($user_id)
+        || ! Sensei_Utils::user_started_course($course_id, $user_id)) {
             return '';
         }
 
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-        $total_lessons = count( $this->course_lessons( $course_id ) );
+        $completed = count($this->get_completed_lesson_ids($course_id, $user_id));
+        $total_lessons = count($this->course_lessons($course_id));
 
-        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
+        $statement = sprintf(_n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons);
 
         /**
          * Filter the course completion statement.
@@ -1673,7 +1673,7 @@ 
          *
          * @param string $statement
          */
-        return apply_filters( 'sensei_course_completion_statement', $statement );
+        return apply_filters('sensei_course_completion_statement', $statement);
 
     }// end generate_progress_statement
 
@@ -1683,17 +1683,17 @@ 
      * @param $course_id
      * @return void
      */
-    public function the_progress_statement( $course_id = 0, $user_id = 0 ){
-        if( empty( $course_id ) ){
+    public function the_progress_statement($course_id = 0, $user_id = 0) {
+        if (empty($course_id)) {
             global $post;
             $course_id = $post->ID;
         }
 
-        if( empty( $user_id ) ){
+        if (empty($user_id)) {
             $user_id = get_current_user_id();
         }
 
-        echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
+        echo '<span class="progress statement  course-completion-rate">'.$this->get_progress_statement($course_id, $user_id).'</span>';
     }
 
     /**
@@ -1702,24 +1702,24 @@ 
      * @param $course_id
      * @return void
      */
-    public function the_progress_meter( $course_id = 0, $user_id = 0 ){
+    public function the_progress_meter($course_id = 0, $user_id = 0) {
 
-        if( empty( $course_id ) ){
+        if (empty($course_id)) {
             global $post;
             $course_id = $post->ID;
         }
 
-        if( empty( $user_id ) ){
+        if (empty($user_id)) {
             $user_id = get_current_user_id();
         }
 
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
-            || ! Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
+        if ('course' != get_post_type($course_id) || ! get_userdata($user_id)
+            || ! Sensei_Utils::user_started_course($course_id, $user_id)) {
             return;
         }
-        $percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
+        $percentage_completed = $this->get_completion_percentage($course_id, $user_id);
 
-        echo $this->get_progress_meter( $percentage_completed );
+        echo $this->get_progress_meter($percentage_completed);
 
     }// end the_progress_meter
 
@@ -1732,20 +1732,20 @@ 
      * @param int $user_id
      * @return array $completed_lesson_ids
      */
-    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
+    public function get_completed_lesson_ids($course_id, $user_id = 0) {
 
-        if( !( intval( $user_id ) ) > 0 ){
+        if ( ! (intval($user_id)) > 0) {
             $user_id = get_current_user_id();
         }
 
         $completed_lesson_ids = array();
 
-        $course_lessons = $this->course_lessons( $course_id );
+        $course_lessons = $this->course_lessons($course_id);
 
-        foreach( $course_lessons as $lesson ){
+        foreach ($course_lessons as $lesson) {
 
-            $is_lesson_completed = Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
-            if( $is_lesson_completed ){
+            $is_lesson_completed = Sensei_Utils::user_completed_lesson($lesson->ID, $user_id);
+            if ($is_lesson_completed) {
                 $completed_lesson_ids[] = $lesson->ID;
             }
 
@@ -1764,19 +1764,19 @@ 
      * @param int $user_id
      * @return int $percentage
      */
-    public function get_completion_percentage( $course_id, $user_id = 0 ){
+    public function get_completion_percentage($course_id, $user_id = 0) {
 
-        if( !( intval( $user_id ) ) > 0 ){
+        if ( ! (intval($user_id)) > 0) {
             $user_id = get_current_user_id();
         }
 
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+        $completed = count($this->get_completed_lesson_ids($course_id, $user_id));
 
-        if( ! (  $completed  > 0 ) ){
+        if ( ! ($completed > 0)) {
             return 0;
         }
 
-        $total_lessons = count( $this->course_lessons( $course_id ) );
+        $total_lessons = count($this->course_lessons($course_id));
         $percentage = $completed / $total_lessons * 100;
 
         /**
@@ -1788,7 +1788,7 @@ 
          * @param $user_id
          * @since 1.8.0
          */
-        return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+        return apply_filters('sensei_course_completion_percentage', $percentage, $course_id, $user_id);
 
     }// end get_completed_lesson_ids
 
@@ -1800,28 +1800,28 @@ 
      * @param $should_send
      * @return bool
      */
-    public function block_notification_emails( $should_send ){
+    public function block_notification_emails($should_send) {
         global $sensei_email_data;
         $email = $sensei_email_data;
 
         $course_id = '';
 
-        if( isset( $email['course_id'] ) ){
+        if (isset($email['course_id'])) {
 
             $course_id = $email['course_id'];
 
-        }elseif( isset( $email['lesson_id'] ) ){
+        }elseif (isset($email['lesson_id'])) {
 
-            $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+            $course_id = Sensei()->lesson->get_course_id($email['lesson_id']);
 
-        }elseif( isset( $email['quiz_id'] ) ){
+        }elseif (isset($email['quiz_id'])) {
 
-            $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+            $lesson_id = Sensei()->quiz->get_lesson_id($email['quiz_id']);
+            $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         }
 
-        if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
+        if ( ! empty($course_id) && 'course' == get_post_type($course_id)) {
 
             $course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
 
@@ -1842,19 +1842,19 @@ 
      * @since 1.8.0
      * @param $course
      */
-    public function course_notification_meta_box_content( $course ){
+    public function course_notification_meta_box_content($course) {
 
-        $checked = get_post_meta( $course->ID , 'disable_notification', true );
+        $checked = get_post_meta($course->ID, 'disable_notification', true);
 
         // generate checked html
         $checked_html = '';
-        if( $checked ){
+        if ($checked) {
             $checked_html = 'checked="checked"';
         }
-        wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
+        wp_nonce_field('update-course-notification-setting', '_sensei_course_notification');
 
-        echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
-        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
+        echo '<input id="disable_sensei_course_notification" '.$checked_html.' type="checkbox" name="disable_sensei_course_notification" >';
+        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei').'</label>';
 
     }// end course_notification_meta_box_content
 
@@ -1866,20 +1866,20 @@ 
      *
      * @param $course_id
      */
-    public function save_course_notification_meta_box( $course_id ){
+    public function save_course_notification_meta_box($course_id) {
 
-        if( !isset( $_POST['_sensei_course_notification']  )
-            || ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
+        if ( ! isset($_POST['_sensei_course_notification'])
+            || ! wp_verify_nonce($_POST['_sensei_course_notification'], 'update-course-notification-setting')) {
             return;
         }
 
-        if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
+        if (isset($_POST['disable_sensei_course_notification']) && 'on' == $_POST['disable_sensei_course_notification']) {
             $new_val = true;
-        }else{
+        } else {
             $new_val = false;
         }
 
-       update_post_meta( $course_id , 'disable_notification', $new_val );
+       update_post_meta($course_id, 'disable_notification', $new_val);
 
     }// end save notification meta box
 
@@ -1893,10 +1893,10 @@ 
      *
      * @param WP_Post $post
      */
-    public function content_before_backwards_compatibility_hooks( $post_id ){
+    public function content_before_backwards_compatibility_hooks($post_id) {
 
-        sensei_do_deprecated_action( 'sensei_course_image','1.9.0','sensei_course_content_inside_before' );
-        sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before' );
+        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_course_content_inside_before');
+        sensei_do_deprecated_action('sensei_course_archive_course_title', '1.9.0', 'sensei_course_content_inside_before');
 
     }
 
@@ -1909,10 +1909,10 @@ 
      *
      * @global WP_Post $post
      */
-    public  function loop_before_backwards_compatibility_hooks( ){
+    public  function loop_before_backwards_compatibility_hooks( ) {
 
         global $post;
-        sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
+        sensei_do_deprecated_action('sensei_course_archive_header', '1.9.0', 'sensei_course_content_inside_before', $post->post_type);
 
     }
 
@@ -1925,19 +1925,19 @@ 
      *
      * @param integer $course_id
      */
-    public function the_course_free_lesson_preview( $course_id ){
+    public function the_course_free_lesson_preview($course_id) {
         // Meta data
-        $course = get_post( $course_id );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+        $course = get_post($course_id);
+        $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course->ID));
+        $is_user_taking_course = Sensei_Utils::user_started_course($course->ID, get_current_user_id());
 
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
+        if (0 < $preview_lesson_count && ! $is_user_taking_course) {
             ?>
             <p class="sensei-free-lessons">
                 <a href="<?php echo get_permalink(); ?>">
-                    <?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
+                    <?php _e('Preview this course', 'woothemes-sensei') ?>
                 </a>
-                - <?php echo sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ) ; ?>
+                - <?php echo sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?>
             </p>
 
         <?php
@@ -1950,42 +1950,42 @@ 
      * @since 1.9.0
      * @param integer $course_id
      */
-    public function the_course_meta( $course_id ){
+    public function the_course_meta($course_id) {
         echo '<p class="sensei-course-meta">';
 
-        $course = get_post( $course_id );
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+        $course = get_post($course_id);
+        $category_output = get_the_term_list($course->ID, 'course-category', '', ', ', '');
+        $author_display_name = get_the_author_meta('display_name', $course->post_author);
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+        if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {?>
 
-            <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
+            <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?>
 
-                <a href="<?php esc_attr_e( get_author_posts_url( $course->post_author ) ); ?>" title="<?php esc_attr_e( $author_display_name ); ?>"><?php esc_attr_e( $author_display_name   ); ?></a>
+                <a href="<?php esc_attr_e(get_author_posts_url($course->post_author)); ?>" title="<?php esc_attr_e($author_display_name); ?>"><?php esc_attr_e($author_display_name); ?></a>
 
             </span>
 
         <?php } // End If Statement ?>
 
-        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $course->ID ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?></span>
+        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($course->ID).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
 
-       <?php if ( '' != $category_output ) { ?>
+       <?php if ('' != $category_output) { ?>
 
-            <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 
         <?php } // End If Statement
 
         // number of completed lessons
-        if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
-            || Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
+        if (Sensei_Utils::user_started_course($course->ID, get_current_user_id())
+            || Sensei_Utils::user_completed_course($course->ID, get_current_user_id())) {
 
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+            $completed = count($this->get_completed_lesson_ids($course->ID, get_current_user_id()));
+            $lesson_count = count($this->course_lessons($course->ID));
+            echo '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $completed, $lesson_count).'</span>';
 
         }
 
-        sensei_simple_course_price( $course->ID );
+        sensei_simple_course_price($course->ID);
 
         echo '</p>';
     } // end the course meta
@@ -2000,15 +2000,15 @@ 
      *
      * @return array $classes
      */
-    public static function add_course_user_status_class( $classes, $class, $course_id ){
+    public static function add_course_user_status_class($classes, $class, $course_id) {
 
-        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
+        if ('course' == get_post_type($course_id) && is_user_logged_in()) {
 
-            if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
+            if (Sensei_Utils::user_completed_course($course_id, get_current_user_id())) {
 
                 $classes[] = 'user-status-completed';
 
-            }else{
+            } else {
 
                 $classes[] = 'user-status-active';
 
@@ -2028,55 +2028,55 @@ 
      *
      * @param WP_Post $course
      */
-    public static function the_course_action_buttons( $course ){
+    public static function the_course_action_buttons($course) {
 
-        if( is_user_logged_in() ) { ?>
+        if (is_user_logged_in()) { ?>
 
             <section class="entry-actions">
-                <form method="POST" action="<?php  echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>">
+                <form method="POST" action="<?php  echo esc_url(remove_query_arg(array('active_page', 'completed_page'))); ?>">
 
                     <input type="hidden"
-                           name="<?php esc_attr_e( 'woothemes_sensei_complete_course_noonce' ) ?>"
-                           id="<?php  esc_attr_e( 'woothemes_sensei_complete_course_noonce' ); ?>"
-                           value="<?php esc_attr_e( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ); ?>"
+                           name="<?php esc_attr_e('woothemes_sensei_complete_course_noonce') ?>"
+                           id="<?php  esc_attr_e('woothemes_sensei_complete_course_noonce'); ?>"
+                           value="<?php esc_attr_e(wp_create_nonce('woothemes_sensei_complete_course_noonce')); ?>"
                         />
 
-                    <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e( intval( $course->ID ) ); ?>" />
+                    <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e(intval($course->ID)); ?>" />
 
-                    <?php if ( 0 < absint( count( Sensei()->course->course_lessons( $course->ID ) ) )
+                    <?php if (0 < absint(count(Sensei()->course->course_lessons($course->ID)))
                         && Sensei()->settings->settings['course_completion'] == 'complete'
-                        && ! Sensei_Utils::user_completed_course( $course, get_current_user_id() )) { ?>
+                        && ! Sensei_Utils::user_completed_course($course, get_current_user_id())) { ?>
 
-                        <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e( 'Mark as Complete', 'woothemes-sensei' ); ?>" /></span>
+                        <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e('Mark as Complete', 'woothemes-sensei'); ?>" /></span>
 
                    <?php  } // End If Statement
 
                     $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
+                    if (Sensei_WC::is_woocommerce_active()) {
                         // Get the product ID
-                        $wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+                        $wc_post_id = get_post_meta(intval($course->ID), '_course_woocommerce_product', true);
+                        if (0 < $wc_post_id) {
 
                             $user = wp_get_current_user();
-                            $course_purchased = Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
+                            $course_purchased = Sensei_Utils::sensei_customer_bought_product($user->user_email, $user->ID, $wc_post_id);
 
                         } // End If Statement
                     } // End If Statement
 
-                    if ( ! $course_purchased && ! Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
+                    if ( ! $course_purchased && ! Sensei_Utils::user_completed_course($course->ID, get_current_user_id())) {?>
 
-                        <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __( 'Delete Course', 'woothemes-sensei' ); ?>"/></span>
+                        <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __('Delete Course', 'woothemes-sensei'); ?>"/></span>
 
                     <?php } // End If Statement
 
-                    $has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
+                    $has_quizzes = Sensei()->course->course_quizzes($course->ID, true);
                     $results_link = '';
-                    if( $has_quizzes ){
-                        $results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
+                    if ($has_quizzes) {
+                        $results_link = '<a class="button view-results" href="'.Sensei()->course_results->get_permalink($course->ID).'">'.__('View results', 'woothemes-sensei').'</a>';
                     }
 
                     // Output only if there is content to display
-                    if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+                    if (has_filter('sensei_results_links') || $has_quizzes) { ?>
 
                         <p class="sensei-results-links">
                             <?php
@@ -2086,7 +2086,7 @@ 
                              * @param string $results_links_html
                              * @param integer $course_id
                              */
-                            echo apply_filters( 'sensei_results_links', $results_link, $course->ID );
+                            echo apply_filters('sensei_results_links', $results_link, $course->ID);
                             ?>
                         </p>
 
@@ -2112,17 +2112,17 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_query_filter( $query ){
+    public static function course_query_filter($query) {
 
         // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+        if (is_admin( ) || 'course' != $query->get('post_type')) {
             return $query;
         }
 
         global $post; // used to get the current page id for my courses
 
         // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
+        if ($query->is_main_query() && is_post_type_archive('course'))
         {
             /**
              * sensei_archive_courses_per_page
@@ -2133,11 +2133,11 @@ 
              * @since 1.9.0
              * @param integer $posts_per_page default 10
              */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
+            $query->set('posts_per_page', apply_filters('sensei_archive_courses_per_page', 10));
 
         }
         // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+        elseif (is_page() && Sensei()->settings->get('my_course_page') == $post->ID)
         {
             /**
              * sensei_my_courses_per_page
@@ -2148,7 +2148,7 @@ 
              * @since 1.9.0
              * @param integer $posts_per_page default 10
              */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
+            $query->set('posts_per_page', apply_filters('sensei_my_courses_per_page', 10));
 
         }
 
@@ -2164,21 +2164,21 @@ 
      * @return array $extra_classes
      * @since 1.9.0
      */
-    public static function get_course_loop_content_class ()
+    public static function get_course_loop_content_class()
     {
 
         global $sensei_course_loop;
 
 
-        if( !isset( $sensei_course_loop ) ){
+        if ( ! isset($sensei_course_loop)) {
             $sensei_course_loop = array();
         }
 
-        if (!isset($sensei_course_loop['counter'])) {
+        if ( ! isset($sensei_course_loop['counter'])) {
             $sensei_course_loop['counter'] = 0;
         }
 
-        if (!isset($sensei_course_loop['columns'])) {
+        if ( ! isset($sensei_course_loop['columns'])) {
             $sensei_course_loop['columns'] = self::get_loop_number_of_columns();
         }
 
@@ -2186,16 +2186,16 @@ 
         $sensei_course_loop['counter']++;
 
         $extra_classes = array();
-        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
+        if (0 == ($sensei_course_loop['counter'] - 1) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']) {
             $extra_classes[] = 'first';
         }
 
-        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
+        if (0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']) {
             $extra_classes[] = 'last';
         }
 
         // add the item number to the classes as well.
-        $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
+        $extra_classes[] = 'loop-item-number-'.$sensei_course_loop['counter'];
 
         /**
          * Filter the course loop class the fires in the  in get_course_loop_content_class function
@@ -2206,7 +2206,7 @@ 
          * @param array $extra_classes
          * @param WP_Post $loop_current_course
          */
-        return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
+        return apply_filters('sensei_course_loop_content_class', $extra_classes, get_post());
 
     }// end get_course_loop_class
 
@@ -2216,7 +2216,7 @@ 
      * @since 1.9.0
      * @return mixed|void
      */
-    public static function get_loop_number_of_columns(){
+    public static function get_loop_number_of_columns() {
 
         /**
          * Filter the number of columns on the course archive page.
@@ -2236,10 +2236,10 @@ 
      * @since 1.9.0
      * @param
      */
-    public static function course_archive_sorting( $query ){
+    public static function course_archive_sorting($query) {
 
         // don't show on category pages and other pages
-        if( ! is_archive(  'course ') || is_tax('course-category') ){
+        if ( ! is_archive('course ') || is_tax('course-category')) {
             return;
         }
 
@@ -2252,27 +2252,27 @@ 
          *  @type string $option_string
          * }
          */
-        $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
-            "newness"     => __( "Sort by newest first", "woothemes-sensei"),
-            "title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
+        $course_order_by_options = apply_filters('sensei_archive_course_order_by_options', array(
+            "newness"     => __("Sort by newest first", "woothemes-sensei"),
+            "title"       => __("Sort by title A-Z", "woothemes-sensei"),
         ));
 
         // setup the currently selected item
         $selected = 'newness';
-        if( isset( $_GET['orderby'] ) ){
+        if (isset($_GET['orderby'])) {
 
-            $selected =  $_GET[ 'orderby' ];
+            $selected = $_GET['orderby'];
 
         }
 
         ?>
 
-        <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr( Sensei_Utils::get_current_url() ) ; ?>" method="POST">
+        <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr(Sensei_Utils::get_current_url()); ?>" method="POST">
             <select name="course-orderby" class="orderby">
                 <?php
-                foreach( $course_order_by_options as $value => $text ){
+                foreach ($course_order_by_options as $value => $text) {
 
-                    echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
+                    echo '<option value="'.$value.' "'.selected($selected, $value, false).'>'.$text.'</option>';
 
                 }
                 ?>
@@ -2290,10 +2290,10 @@ 
      * @since 1.9.0
      * @param
      */
-    public static function course_archive_filters( $query ){
+    public static function course_archive_filters($query) {
 
         // don't show on category pages
-        if( is_tax('course-category') ){
+        if (is_tax('course-category')) {
             return;
         }
 
@@ -2306,9 +2306,9 @@ 
          * }
          *
          */
-        $filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
-            array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
-            array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
+        $filters = apply_filters('sensei_archive_course_filter_by_options', array(
+            array('id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __('All', 'woothemes-sensei')),
+            array('id' => 'featured', 'url' => add_query_arg(array('course_filter'=>'featured'), self::get_courses_page_url()), 'title'=> __('Featured', 'woothemes-sensei')),
         ));
 
 
@@ -2319,11 +2319,11 @@ 
             //determine the current active url
             $current_url = Sensei_Utils::get_current_url();
 
-            foreach( $filters as $filter ) {
+            foreach ($filters as $filter) {
 
-                $active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
+                $active_class = $current_url == $filter['url'] ? ' class="active" ' : '';
 
-                echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
+                echo '<li><a '.$active_class.' id="'.$filter['id'].'" href="'.esc_url($filter['url']).'" >'.$filter['title'].'</a></li>';
 
             }
             ?>
@@ -2344,13 +2344,13 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_featured_filter( $query ){
+    public static function course_archive_featured_filter($query) {
 
-        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
+        if (isset ($_GET['course_filter']) && 'featured' == $_GET['course_filter'] && $query->is_main_query()) {
             //setup meta query for featured courses
-            $query->set( 'meta_value', 'featured'  );
-            $query->set( 'meta_key', '_course_featured'  );
-            $query->set( 'meta_compare', '='  );
+            $query->set('meta_value', 'featured');
+            $query->set('meta_key', '_course_featured');
+            $query->set('meta_compare', '=');
         }
 
         return $query;
@@ -2365,13 +2365,13 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_order_by_title( $query ){
+    public static function course_archive_order_by_title($query) {
 
-        if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
-            && 'course'== $query->get('post_type') && $query->is_main_query()  ){
+        if (isset ($_POST['course-orderby']) && 'title ' == $_POST['course-orderby']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
             // setup the order by title for this query
-            $query->set( 'orderby', 'title'  );
-            $query->set( 'order', 'ASC'  );
+            $query->set('orderby', 'title');
+            $query->set('order', 'ASC');
         }
 
         return $query;
@@ -2385,10 +2385,10 @@ 
      * @since 1.9.0
      * @return string $course_page_url
      */
-    public static function get_courses_page_url(){
+    public static function get_courses_page_url() {
 
-        $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
+        $course_page_id = intval(Sensei()->settings->settings['course_page']);
+        $course_page_url = empty($course_page_id) ? get_post_type_archive_link('course') : get_permalink($course_page_id);
 
         return $course_page_url;
 
@@ -2405,61 +2405,61 @@ 
      * @param string $after_html
      * @return void
      */
-    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+    public static function archive_header($query_type = '', $before_html = '', $after_html = '') {
 
-        if( ! is_post_type_archive('course') ){
+        if ( ! is_post_type_archive('course')) {
             return;
         }
 
         // deprecated since 1.9.0
-        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
+        sensei_do_deprecated_action('sensei_archive_title', '1.9.0', 'sensei_archive_before_course_loop');
 
         $html = '';
 
-        if( empty( $before_html ) ){
+        if (empty($before_html)) {
 
             $before_html = '<header class="archive-header"><h1>';
 
         }
 
-        if( empty( $after_html ) ){
+        if (empty($after_html)) {
 
             $after_html = '</h1></header>';
 
         }
 
-        if ( is_tax( 'course-category' ) ) {
+        if (is_tax('course-category')) {
 
             global $wp_query;
 
             $taxonomy_obj = $wp_query->get_queried_object();
             $taxonomy_short_name = $taxonomy_obj->taxonomy;
-            $taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
-            $title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
-            echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
+            $taxonomy_raw_obj = get_taxonomy($taxonomy_short_name);
+            $title = sprintf(__('%1$s Archives: %2$s', 'woothemes-sensei'), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name);
+            echo apply_filters('course_category_archive_title', $before_html.$title.$after_html);
             return;
 
         } // End If Statement
 
-        switch ( $query_type ) {
+        switch ($query_type) {
             case 'newcourses':
-                $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('New Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'featuredcourses':
-                $html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Featured Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'freecourses':
-                $html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Free Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'paidcourses':
-                $html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Paid Courses', 'woothemes-sensei').$after_html;
                 break;
             default:
-                $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Courses', 'woothemes-sensei').$after_html;
                 break;
         } // End Switch Statement
 
-        echo apply_filters( 'course_archive_title', $html );
+        echo apply_filters('course_archive_title', $html);
 
     }//course_archive_header
 
@@ -2473,9 +2473,9 @@ 
      * @param string $content
      * @return string $content or $excerpt
      */
-    public static function single_course_content( $content ){
+    public static function single_course_content($content) {
 
-        if( ! is_singular('course') ){
+        if ( ! is_singular('course')) {
 
             return $content;
 
@@ -2484,21 +2484,21 @@ 
         // Content Access Permissions
         $access_permission = false;
 
-        if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+        if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) {
 
             $access_permission = true;
 
         } // End If Statement
 
         // Check if the user is taking the course
-        $is_user_taking_course = Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
+        $is_user_taking_course = Sensei_Utils::user_started_course(get_the_ID(), get_current_user_id());
 
-        if(Sensei_WC::is_woocommerce_active()) {
+        if (Sensei_WC::is_woocommerce_active()) {
 
-            $wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
-            $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+            $wc_post_id = get_post_meta(get_the_ID(), '_course_woocommerce_product', true);
+            $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
-            $has_product_attached = isset ( $product ) && is_object ( $product );
+            $has_product_attached = isset ($product) && is_object($product);
 
         } else {
 
@@ -2506,17 +2506,17 @@ 
 
         }
 
-        if ( ( is_user_logged_in() && $is_user_taking_course )
-            || ( $access_permission && !$has_product_attached)
-            || 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
+        if ((is_user_logged_in() && $is_user_taking_course)
+            || ($access_permission && ! $has_product_attached)
+            || 'full' == Sensei()->settings->get('course_single_content_display')) {
 
 	        // compensate for core providing and empty $content
 
-	        if( empty( $content ) ){
-		        remove_filter( 'the_content', array( 'Sensei_Course', 'single_course_content') );
-		        $course = get_post( get_the_ID() );
+	        if (empty($content)) {
+		        remove_filter('the_content', array('Sensei_Course', 'single_course_content'));
+		        $course = get_post(get_the_ID());
 
-		        $content = apply_filters( 'the_content', $course->post_content );
+		        $content = apply_filters('the_content', $course->post_content);
 
 	        }
 
@@ -2524,7 +2524,7 @@ 
 
         } else {
 
-            return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
+            return '<p class="course-excerpt">'.get_post(get_the_ID())->post_excerpt.'</p>';
 
         }
 
@@ -2535,25 +2535,25 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_lessons_title(){
+    public static function the_course_lessons_title() {
 
-	    if ( ! is_singular( 'course' )  ) {
+	    if ( ! is_singular('course')) {
 		    return;
 	    }
 
         global $post;
-        $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
-        $course_lessons = Sensei()->course->course_lessons( $post->ID );
+        $none_module_lessons = Sensei()->modules->get_none_module_lessons($post->ID);
+        $course_lessons = Sensei()->course->course_lessons($post->ID);
 
         // title should be Other Lessons if there are lessons belonging to models.
         $title = __('Other Lessons', 'woothemes-sensei');
 
         // show lessons if the number of lesson in the course is the same as those that isn't assigned to a module
-        if( count( $course_lessons ) == count( $none_module_lessons )  ){
+        if (count($course_lessons) == count($none_module_lessons)) {
 
             $title = __('Lessons', 'woothemes-sensei');
 
-        }elseif( empty( $none_module_lessons ) ){ // if the none module lessons are simply empty the title should not be shown
+        }elseif (empty($none_module_lessons)) { // if the none module lessons are simply empty the title should not be shown
 
             $title = '';
         }
@@ -2561,7 +2561,7 @@ 
         /**
          * hook document in class-woothemes-sensei-message.php
          */
-        $title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+        $title = apply_filters('sensei_single_title', $title, $post->post_type);
 
         ob_start(); // start capturing the following output.
 
@@ -2580,7 +2580,7 @@ 
          * @since 1.9.0
          * @param string $lessons_title_html
          */
-        echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
+        echo apply_filters('the_course_lessons_title', ob_get_clean()); // output and filter the captured output and stop capturing.
 
     }// end the_course_lessons_title
 
@@ -2595,13 +2595,13 @@ 
      * @since 1.9.0
      * @global $wp_query
      */
-    public static function load_single_course_lessons_query(){
+    public static function load_single_course_lessons_query() {
 
         global $post, $wp_query;
 
         $course_id = $post->ID;
 
-        if( 'course' != get_post_type( $course_id ) ){
+        if ('course' != get_post_type($course_id)) {
             return;
         }
 
@@ -2613,7 +2613,7 @@ 
             'meta_query'        => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                 ),
             ),
             'post_status'       => 'public',
@@ -2621,17 +2621,17 @@ 
         );
 
         // Exclude lessons belonging to modules as they are queried along with the modules.
-        $modules = Sensei()->modules->get_course_modules( $course_id );
-        if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+        $modules = Sensei()->modules->get_course_modules($course_id);
+        if ( ! is_wp_error($modules) && ! empty($modules) && is_array($modules)) {
 
             $terms_ids = array();
-            foreach( $modules as $term ){
+            foreach ($modules as $term) {
 
                 $terms_ids[] = $term->term_id;
 
             }
 
-            $course_lesson_query_args[ 'tax_query'] = array(
+            $course_lesson_query_args['tax_query'] = array(
                 array(
                     'taxonomy' => 'module',
                     'field'    => 'id',
@@ -2642,16 +2642,16 @@ 
         }
 
         //setting lesson order
-        $course_lesson_order = get_post_meta( $course_id, '_lesson_order', true);
-        if( !empty( $course_lesson_order ) ){
+        $course_lesson_order = get_post_meta($course_id, '_lesson_order', true);
+        if ( ! empty($course_lesson_order)) {
 
-            $course_lesson_query_args['post__in'] = explode( ',', $course_lesson_order );
-            $course_lesson_query_args['orderby']= 'post__in' ;
-            unset( $course_lesson_query_args['order'] );
+            $course_lesson_query_args['post__in'] = explode(',', $course_lesson_order);
+            $course_lesson_query_args['orderby'] = 'post__in';
+            unset($course_lesson_query_args['order']);
 
         }
 
-        $wp_query = new WP_Query( $course_lesson_query_args );
+        $wp_query = new WP_Query($course_lesson_query_args);
 
     }// load_single_course_lessons
 
@@ -2662,16 +2662,16 @@ 
      *
      * @param $post_id
      */
-    public static function flush_rewrite_rules( $post_id ){
+    public static function flush_rewrite_rules($post_id) {
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 
             return;
 
         }
 
 
-        if( 'course' == get_post_type( $post_id )  ){
+        if ('course' == get_post_type($post_id)) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -2687,10 +2687,10 @@ 
      * @param $excerpt
      * @return string
      */
-    public static function full_content_excerpt_override( $excerpt ){
+    public static function full_content_excerpt_override($excerpt) {
 
-        if (   is_singular('course')  &&
-                'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
+        if (is_singular('course') &&
+                'full' == Sensei()->settings->get('course_single_content_display')) {
 
             return get_the_content();
 
@@ -2707,63 +2707,63 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_enrolment_actions(){
+    public static function the_course_enrolment_actions() {
         ?>
         <section class="course-meta course-enrolment">
         <?php
         global  $post, $current_user;
-        $is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
-        if ( is_user_logged_in() && ! $is_user_taking_course ) {
+        $is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID);
+        if (is_user_logged_in() && ! $is_user_taking_course) {
 
             // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+            $wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
 
             // Check for woocommerce
-            if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
+            if (Sensei_WC::is_woocommerce_active() && (0 < intval($wc_post_id))) {
                 sensei_wc_add_to_cart($post->ID);
             } else {
                 sensei_start_course_form($post->ID);
             } // End If Statement
 
-        } elseif ( is_user_logged_in() ) {
+        } elseif (is_user_logged_in()) {
 
             // Check if course is completed
-            $user_course_status = Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
-            $completed_course = Sensei_Utils::user_completed_course( $user_course_status );
+            $user_course_status = Sensei_Utils::user_course_status($post->ID, $current_user->ID);
+            $completed_course = Sensei_Utils::user_completed_course($user_course_status);
             // Success message
-            if ( $completed_course ) { ?>
-                <div class="status completed"><?php  _e( 'Completed', 'woothemes-sensei' ); ?></div>
+            if ($completed_course) { ?>
+                <div class="status completed"><?php  _e('Completed', 'woothemes-sensei'); ?></div>
                 <?php
-                $has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
-                if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+                $has_quizzes = Sensei()->course->course_quizzes($post->ID, true);
+                if (has_filter('sensei_results_links') || $has_quizzes) { ?>
                     <p class="sensei-results-links">
                         <?php
                         $results_link = '';
-                        if( $has_quizzes ) {
-                            $results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
+                        if ($has_quizzes) {
+                            $results_link = '<a class="view-results" href="'.Sensei()->course_results->get_permalink($post->ID).'">'.__('View results', 'woothemes-sensei').'</a>';
                         }
                         /**
                          * Filter documented in Sensei_Course::the_course_action_buttons
                          */
-                        $results_link = apply_filters( 'sensei_results_links', $results_link, $post->ID );
+                        $results_link = apply_filters('sensei_results_links', $results_link, $post->ID);
                         echo $results_link;
                         ?></p>
                 <?php } ?>
             <?php } else { ?>
-                <div class="status in-progress"><?php echo __( 'In Progress', 'woothemes-sensei' ); ?></div>
+                <div class="status in-progress"><?php echo __('In Progress', 'woothemes-sensei'); ?></div>
             <?php }
 
         } else {
             // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+            $wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
             // Check for woocommerce
-            if ( Sensei_WC::is_woocommerce_active() && ( 0 < intval( $wc_post_id ) ) ) {
+            if (Sensei_WC::is_woocommerce_active() && (0 < intval($wc_post_id))) {
 
                 sensei_wc_add_to_cart($post->ID);
 
             } else {
 
-                if( get_option( 'users_can_register') ) {
+                if (get_option('users_can_register')) {
 
 
                     $my_courses_page_id = '';
@@ -2779,24 +2779,24 @@ 
                     $wp_register_link = apply_filters('sensei_use_wp_register_link', false);
 
                     $settings = Sensei()->settings->get_settings();
-                    if( isset( $settings[ 'my_course_page' ] )
-                        && 0 < intval( $settings[ 'my_course_page' ] ) ){
+                    if (isset($settings['my_course_page'])
+                        && 0 < intval($settings['my_course_page'])) {
 
-                        $my_courses_page_id = $settings[ 'my_course_page' ];
+                        $my_courses_page_id = $settings['my_course_page'];
 
                     }
 
                     // If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
                     // is false, link to My Courses. If not, link to default WordPress registration page.
-                    if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
+                    if ( ! empty($my_courses_page_id) && $my_courses_page_id && ! $wp_register_link) {
 
-                        $my_courses_url = get_permalink( $my_courses_page_id  );
-                        $register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
-                        echo '<div class="status register">' . $register_link . '</div>' ;
+                        $my_courses_url = get_permalink($my_courses_page_id);
+                        $register_link = '<a href="'.$my_courses_url.'">'.__('Register', 'woothemes-sensei').'</a>';
+                        echo '<div class="status register">'.$register_link.'</div>';
 
-                    } else{
+                    } else {
 
-                        wp_register( '<div class="status register">', '</div>' );
+                        wp_register('<div class="status register">', '</div>');
 
                     }
 
@@ -2815,23 +2815,23 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_video(){
+    public static function the_course_video() {
 
         global $post;
 
-	    if ( ! is_singular( 'course' )  ) {
+	    if ( ! is_singular('course')) {
 		    return;
 	    }
         // Get the meta info
-        $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+        $course_video_embed = get_post_meta($post->ID, '_course_video_embed', true);
 
-        if ( 'http' == substr( $course_video_embed, 0, 4) ) {
+        if ('http' == substr($course_video_embed, 0, 4)) {
 
-            $course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
+            $course_video_embed = wp_oembed_get(esc_url($course_video_embed));
 
         } // End If Statement
 
-        if ( '' != $course_video_embed ) { ?>
+        if ('' != $course_video_embed) { ?>
 
             <div class="course-video">
                 <?php echo html_entity_decode($course_video_embed); ?>
@@ -2846,9 +2846,9 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
-	    if( ! is_singular( 'course' ) ){
+	    if ( ! is_singular('course')) {
 			return;
 	    }
         global $post;
@@ -2862,7 +2862,7 @@ 
                 /**
                  * Filter documented in class-sensei-messages.php the_title
                  */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+                echo apply_filters('sensei_single_title', get_the_title($post), $post->post_type);
                 ?>
 
             </h1>
@@ -2878,30 +2878,30 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_category_title(){
+    public static function course_category_title() {
 
-        if( ! is_tax( 'course-category' ) ){
+        if ( ! is_tax('course-category')) {
             return;
         }
 
         $category_slug = get_query_var('course-category');
-        $term  = get_term_by('slug',$category_slug,'course-category');
+        $term = get_term_by('slug', $category_slug, 'course-category');
 
-        if( ! empty($term) ){
+        if ( ! empty($term)) {
 
             $title = $term->name;
 
-        }else{
+        } else {
 
             $title = 'Course Category';
 
         }
 
         $html = '<h2 class="sensei-category-title">';
-        $html .= __('Category') . ' ' . $title;
+        $html .= __('Category').' '.$title;
         $html .= '</h2>';
 
-        echo apply_filters( 'course_category_title', $html , $term->term_id );
+        echo apply_filters('course_category_title', $html, $term->term_id);
 
     }// course_category_title
 
@@ -2914,16 +2914,16 @@ 
      * @param WP_Query $query
      * @return WP_Query
      */
-    public static function alter_course_category_order( $query ){
+    public static function alter_course_category_order($query) {
 
-        if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
+        if ( ! is_tax('course-category') || ! $query->is_main_query()) {
             return $query;
         }
 
-        $order = get_option( 'sensei_course_order', '' );
-        if( !empty( $order )  ){
-            $query->set('orderby', 'menu_order' );
-            $query->set('order', 'ASC' );
+        $order = get_option('sensei_course_order', '');
+        if ( ! empty($order)) {
+            $query->set('orderby', 'menu_order');
+            $query->set('order', 'ASC');
         }
 
         return $query;
@@ -2944,7 +2944,7 @@ 
      *
      * @return array
      */
-    public static function get_default_query_args(){
+    public static function get_default_query_args() {
         return array(
             'post_type' 		=> 'course',
             'posts_per_page' 		=> 1000,
@@ -2962,14 +2962,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_prerequisite_complete( $course_id ){
+    public static function is_prerequisite_complete($course_id) {
 
-        $course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
+        $course_prerequisite_id = get_post_meta($course_id, '_course_prerequisite', true);
 
         // if it has a pre requisite course check it
-        if( ! empty(  $course_prerequisite_id ) ){
+        if ( ! empty($course_prerequisite_id)) {
 
-            return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
+            return Sensei_Utils::user_completed_course($course_prerequisite_id, get_current_user_id());
 
         }
 
@@ -2985,4 +2985,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Course extends Sensei_Course{}
+class WooThemes_Sensei_Course extends Sensei_Course {}

includes/class-sensei-grading.php

Indentation +419 added lines, -419 removed lines

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

Spacing +280 added lines, -280 removed lines

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

includes/class-sensei-lesson.php

Indentation +1063 added lines, -1063 removed lines

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

Spacing +1098 added lines, -1098 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Lessons Class
@@ -19,83 +19,83 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
         $this->token = 'lesson';
 
 		// Setup meta fields for this post type
-		$this->meta_fields = array( 'lesson_prerequisite', 'lesson_course', 'lesson_preview', 'lesson_length', 'lesson_complexity', 'lesson_video_embed' );
+		$this->meta_fields = array('lesson_prerequisite', 'lesson_course', 'lesson_preview', 'lesson_length', 'lesson_complexity', 'lesson_video_embed');
 
         $this->question_order = '';
 
 		// Admin actions
-		if ( is_admin() ) {
+		if (is_admin()) {
 
 			// Metabox functions
-			add_action( 'admin_menu', array( $this, 'meta_box_setup' ), 20 );
-			add_action( 'save_post', array( $this, 'meta_box_save' ) );
-			add_action( 'save_post', array( $this, 'quiz_update' ) );
+			add_action('admin_menu', array($this, 'meta_box_setup'), 20);
+			add_action('save_post', array($this, 'meta_box_save'));
+			add_action('save_post', array($this, 'quiz_update'));
 
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-lesson_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
+			add_filter('manage_edit-lesson_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
 
 			// Add/Update question
-			add_action( 'wp_ajax_lesson_update_question', array( $this, 'lesson_update_question' ) );
-			add_action( 'wp_ajax_nopriv_lesson_update_question', array( $this, 'lesson_update_question' ) );
+			add_action('wp_ajax_lesson_update_question', array($this, 'lesson_update_question'));
+			add_action('wp_ajax_nopriv_lesson_update_question', array($this, 'lesson_update_question'));
 
 			// Add course
-			add_action( 'wp_ajax_lesson_add_course', array( $this, 'lesson_add_course' ) );
-			add_action( 'wp_ajax_nopriv_lesson_add_course', array( $this, 'lesson_add_course' ) );
+			add_action('wp_ajax_lesson_add_course', array($this, 'lesson_add_course'));
+			add_action('wp_ajax_nopriv_lesson_add_course', array($this, 'lesson_add_course'));
 
 			// Update grade type
-			add_action( 'wp_ajax_lesson_update_grade_type', array( $this, 'lesson_update_grade_type' ) );
-			add_action( 'wp_ajax_nopriv_lesson_update_grade_type', array( $this, 'lesson_update_grade_type' ) );
+			add_action('wp_ajax_lesson_update_grade_type', array($this, 'lesson_update_grade_type'));
+			add_action('wp_ajax_nopriv_lesson_update_grade_type', array($this, 'lesson_update_grade_type'));
 
 			// Update question order
-			add_action( 'wp_ajax_lesson_update_question_order', array( $this, 'lesson_update_question_order' ) );
-			add_action( 'wp_ajax_nopriv_lesson_update_question_order', array( $this, 'lesson_update_question_order' ) );
+			add_action('wp_ajax_lesson_update_question_order', array($this, 'lesson_update_question_order'));
+			add_action('wp_ajax_nopriv_lesson_update_question_order', array($this, 'lesson_update_question_order'));
 
 			//Update question order
-			add_action( 'wp_ajax_lesson_update_question_order_random', array( $this, 'lesson_update_question_order_random' ) );
-			add_action( 'wp_ajax_nopriv_lesson_update_question_order_random', array( $this, 'lesson_update_question_order_random' ) );
+			add_action('wp_ajax_lesson_update_question_order_random', array($this, 'lesson_update_question_order_random'));
+			add_action('wp_ajax_nopriv_lesson_update_question_order_random', array($this, 'lesson_update_question_order_random'));
 
 			// Get answer ID
-			add_action( 'wp_ajax_question_get_answer_id', array( $this, 'question_get_answer_id' ) );
-			add_action( 'wp_ajax_nopriv_question_get_answer_id', array( $this, 'question_get_answer_id' ) );
+			add_action('wp_ajax_question_get_answer_id', array($this, 'question_get_answer_id'));
+			add_action('wp_ajax_nopriv_question_get_answer_id', array($this, 'question_get_answer_id'));
 
 			// Add multiple questions
-			add_action( 'wp_ajax_lesson_add_multiple_questions', array( $this, 'lesson_add_multiple_questions' ) );
-			add_action( 'wp_ajax_nopriv_lesson_add_multiple_questions', array( $this, 'lesson_add_multiple_questions' ) );
+			add_action('wp_ajax_lesson_add_multiple_questions', array($this, 'lesson_add_multiple_questions'));
+			add_action('wp_ajax_nopriv_lesson_add_multiple_questions', array($this, 'lesson_add_multiple_questions'));
 
 			// Remove multiple questions
-			add_action( 'wp_ajax_lesson_remove_multiple_questions', array( $this, 'lesson_remove_multiple_questions' ) );
-			add_action( 'wp_ajax_nopriv_lesson_remove_multiple_questions', array( $this, 'lesson_remove_multiple_questions' ) );
+			add_action('wp_ajax_lesson_remove_multiple_questions', array($this, 'lesson_remove_multiple_questions'));
+			add_action('wp_ajax_nopriv_lesson_remove_multiple_questions', array($this, 'lesson_remove_multiple_questions'));
 
 			// Get question category limit
-			add_action( 'wp_ajax_get_question_category_limit', array( $this, 'get_question_category_limit' ) );
-			add_action( 'wp_ajax_nopriv_get_question_category_limit', array( $this, 'get_question_category_limit' ) );
+			add_action('wp_ajax_get_question_category_limit', array($this, 'get_question_category_limit'));
+			add_action('wp_ajax_nopriv_get_question_category_limit', array($this, 'get_question_category_limit'));
 
 			// Add existing questions
-			add_action( 'wp_ajax_lesson_add_existing_questions', array( $this, 'lesson_add_existing_questions' ) );
-			add_action( 'wp_ajax_nopriv_lesson_add_existing_questions', array( $this, 'lesson_add_existing_questions' ) );
+			add_action('wp_ajax_lesson_add_existing_questions', array($this, 'lesson_add_existing_questions'));
+			add_action('wp_ajax_nopriv_lesson_add_existing_questions', array($this, 'lesson_add_existing_questions'));
 
 			// Filter existing questions
-			add_action( 'wp_ajax_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) );
-			add_action( 'wp_ajax_nopriv_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) );
+			add_action('wp_ajax_filter_existing_questions', array($this, 'quiz_panel_filter_existing_questions'));
+			add_action('wp_ajax_nopriv_filter_existing_questions', array($this, 'quiz_panel_filter_existing_questions'));
 
             // output bulk edit fields
-            add_action( 'bulk_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
-            add_action( 'quick_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 );
+            add_action('bulk_edit_custom_box', array($this, 'all_lessons_edit_fields'), 10, 2);
+            add_action('quick_edit_custom_box', array($this, 'all_lessons_edit_fields'), 10, 2);
 
             // load quick edit default values
-            add_action('manage_lesson_posts_custom_column', array( $this, 'set_quick_edit_admin_defaults'), 11, 2);
+            add_action('manage_lesson_posts_custom_column', array($this, 'set_quick_edit_admin_defaults'), 11, 2);
 
             // save bulk edit fields
-            add_action( 'wp_ajax_save_bulk_edit_book', array( $this, 'save_all_lessons_edit_fields' ) );
+            add_action('wp_ajax_save_bulk_edit_book', array($this, 'save_all_lessons_edit_fields'));
 
             // flush rewrite rules when saving a lesson
-            add_action('save_post', array( __CLASS__, 'flush_rewrite_rules' ) );
+            add_action('save_post', array(__CLASS__, 'flush_rewrite_rules'));
 
 		} else {
 			// Frontend actions
@@ -108,34 +108,34 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function meta_box_setup () {
+	public function meta_box_setup() {
 
 		// Add Meta Box for Prerequisite Lesson
-		add_meta_box( 'lesson-prerequisite', __( 'Lesson Prerequisite', 'woothemes-sensei' ), array( $this, 'lesson_prerequisite_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('lesson-prerequisite', __('Lesson Prerequisite', 'woothemes-sensei'), array($this, 'lesson_prerequisite_meta_box_content'), $this->token, 'side', 'default');
 
 		// Add Meta Box for Lesson Course
-		add_meta_box( 'lesson-course', __( 'Lesson Course', 'woothemes-sensei' ), array( $this, 'lesson_course_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('lesson-course', __('Lesson Course', 'woothemes-sensei'), array($this, 'lesson_course_meta_box_content'), $this->token, 'side', 'default');
 
 		// Add Meta Box for Lesson Preview
-		add_meta_box( 'lesson-preview', __( 'Lesson Preview', 'woothemes-sensei' ), array( $this, 'lesson_preview_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('lesson-preview', __('Lesson Preview', 'woothemes-sensei'), array($this, 'lesson_preview_meta_box_content'), $this->token, 'side', 'default');
 
 		// Add Meta Box for Lesson Information
-		add_meta_box( 'lesson-info', __( 'Lesson Information', 'woothemes-sensei' ), array( $this, 'lesson_info_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('lesson-info', __('Lesson Information', 'woothemes-sensei'), array($this, 'lesson_info_meta_box_content'), $this->token, 'normal', 'default');
 
 		// Add Meta Box for Quiz Settings
-		add_meta_box( 'lesson-quiz-settings', __( 'Quiz Settings', 'woothemes-sensei' ), array( $this, 'lesson_quiz_settings_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('lesson-quiz-settings', __('Quiz Settings', 'woothemes-sensei'), array($this, 'lesson_quiz_settings_meta_box_content'), $this->token, 'normal', 'default');
 
 		// Add Meta Box for Lesson Quiz Questions
-		add_meta_box( 'lesson-quiz', __( 'Quiz Questions', 'woothemes-sensei' ), array( $this, 'lesson_quiz_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('lesson-quiz', __('Quiz Questions', 'woothemes-sensei'), array($this, 'lesson_quiz_meta_box_content'), $this->token, 'normal', 'default');
 
 		// Remove "Custom Settings" meta box.
-		remove_meta_box( 'woothemes-settings', $this->token, 'normal' );
+		remove_meta_box('woothemes-settings', $this->token, 'normal');
 
 		// Add JS scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Add CSS
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_styles'));
 
 	} // End meta_box_setup()
 
@@ -146,30 +146,30 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_info_meta_box_content () {
+	public function lesson_info_meta_box_content() {
 		global $post;
 
-		$lesson_length = get_post_meta( $post->ID, '_lesson_length', true );
-		$lesson_complexity = get_post_meta( $post->ID, '_lesson_complexity', true );
+		$lesson_length = get_post_meta($post->ID, '_lesson_length', true);
+		$lesson_complexity = get_post_meta($post->ID, '_lesson_complexity', true);
 		$complexity_array = $this->lesson_complexities();
-		$lesson_video_embed = get_post_meta( $post->ID, '_lesson_video_embed', true );
+		$lesson_video_embed = get_post_meta($post->ID, '_lesson_video_embed', true);
 
 		$html = '';
 		// Lesson Length
-		$html .= '<p><label for="lesson_length">' . __( 'Lesson Length in minutes', 'woothemes-sensei' ) . ': </label>';
-		$html .= '<input type="number" id="lesson-length" name="lesson_length" class="small-text" value="' . esc_attr( $lesson_length ) . '" /></p>' . "\n";
+		$html .= '<p><label for="lesson_length">'.__('Lesson Length in minutes', 'woothemes-sensei').': </label>';
+		$html .= '<input type="number" id="lesson-length" name="lesson_length" class="small-text" value="'.esc_attr($lesson_length).'" /></p>'."\n";
 		// Lesson Complexity
-		$html .= '<p><label for="lesson_complexity">' . __( 'Lesson Complexity', 'woothemes-sensei' ) . ': </label>';
+		$html .= '<p><label for="lesson_complexity">'.__('Lesson Complexity', 'woothemes-sensei').': </label>';
 		$html .= '<select id="lesson-complexity-options" name="lesson_complexity" class="chosen_select lesson-complexity-select">';
-			$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>';
-			foreach ($complexity_array as $key => $value){
-				$html .= '<option value="' . esc_attr( $key ) . '"' . selected( $key, $lesson_complexity, false ) . '>' . esc_html( $value ) . '</option>' . "\n";
+			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
+			foreach ($complexity_array as $key => $value) {
+				$html .= '<option value="'.esc_attr($key).'"'.selected($key, $lesson_complexity, false).'>'.esc_html($value).'</option>'."\n";
 			} // End For Loop
-		$html .= '</select></p>' . "\n";
+		$html .= '</select></p>'."\n";
 
-		$html .= '<p><label for="lesson_video_embed">' . __( 'Video Embed Code', 'woothemes-sensei' ) . ':</label><br/>' . "\n";
-		$html .= '<textarea rows="5" cols="50" name="lesson_video_embed" tabindex="6" id="course-video-embed">' . $lesson_video_embed . '</textarea></p>' . "\n";
-		$html .= '<p>' .  __( 'Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei' ) . '</p>';
+		$html .= '<p><label for="lesson_video_embed">'.__('Video Embed Code', 'woothemes-sensei').':</label><br/>'."\n";
+		$html .= '<textarea rows="5" cols="50" name="lesson_video_embed" tabindex="6" id="course-video-embed">'.$lesson_video_embed.'</textarea></p>'."\n";
+		$html .= '<p>'.__('Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei').'</p>';
 
 		echo $html;
 
@@ -181,31 +181,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_prerequisite_meta_box_content () {
+	public function lesson_prerequisite_meta_box_content() {
 		global $post;
 		// Get existing post meta
-		$select_lesson_prerequisite = get_post_meta( $post->ID, '_lesson_prerequisite', true );
+		$select_lesson_prerequisite = get_post_meta($post->ID, '_lesson_prerequisite', true);
 		// Get the Lesson Posts
-		$post_args = array(	'post_type' 		=> 'lesson',
+		$post_args = array('post_type' 		=> 'lesson',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'ASC',
     						'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 		// Build the HTML to Output
 		$html = '';
-		$html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false  );
-		if ( count( $posts_array ) > 0 ) {
-			$html .= '<select id="lesson-prerequisite-options" name="lesson_prerequisite" class="chosen_select widefat">' . "\n";
-			$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>';
-				foreach ($posts_array as $post_item){
-					$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_lesson_prerequisite, false ) . '>' . esc_html( $post_item->post_title ) . '</option>' . "\n";
+		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false);
+		if (count($posts_array) > 0) {
+			$html .= '<select id="lesson-prerequisite-options" name="lesson_prerequisite" class="chosen_select widefat">'."\n";
+			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
+				foreach ($posts_array as $post_item) {
+					$html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_lesson_prerequisite, false).'>'.esc_html($post_item->post_title).'</option>'."\n";
 				} // End For Loop
-			$html .= '</select>' . "\n";
+			$html .= '</select>'."\n";
 		} else {
-			$html .= '<p>' . esc_html( __( 'No lessons exist yet. Please add some first.', 'woothemes-sensei' ) ) . '</p>';
+			$html .= '<p>'.esc_html(__('No lessons exist yet. Please add some first.', 'woothemes-sensei')).'</p>';
 		} // End If Statement
 		// Output the HTML
 		echo $html;
@@ -217,20 +217,20 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_preview_meta_box_content () {
+	public function lesson_preview_meta_box_content() {
 		global $post;
 		// Get existing post meta
-		$lesson_preview = get_post_meta( $post->ID, '_lesson_preview', true );
+		$lesson_preview = get_post_meta($post->ID, '_lesson_preview', true);
 		$html = '';
-		$html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false  );
+		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false);
 
 		$checked = '';
-		if ( isset( $lesson_preview ) && ( '' != $lesson_preview ) ) {
-	 	    $checked = checked( 'preview', $lesson_preview, false );
+		if (isset($lesson_preview) && ('' != $lesson_preview)) {
+	 	    $checked = checked('preview', $lesson_preview, false);
 	 	} // End If Statement
 
 	 	$html .= '<label for="lesson_preview">';
-	 	$html .= '<input type="checkbox" id="lesson_preview" name="lesson_preview" value="preview" ' . $checked . '>&nbsp;' . __( 'Allow this lesson to be viewed without purchase/login', 'woothemes-sensei' ) . '<br>';
+	 	$html .= '<input type="checkbox" id="lesson_preview" name="lesson_preview" value="preview" '.$checked.'>&nbsp;'.__('Allow this lesson to be viewed without purchase/login', 'woothemes-sensei').'<br>';
 
 		// Output the HTML
 		echo $html;
@@ -243,32 +243,32 @@ 
 	 * @param int $post_id
 	 * @return integer $post_id
 	 */
-	public function meta_box_save ( $post_id ) {
+	public function meta_box_save($post_id) {
 
 		// Verify the nonce before proceeding.
-		if ( ( get_post_type( $post_id ) != $this->token ) || !isset(   $_POST[ 'woo_' . $this->token . '_nonce'] )  || ! wp_verify_nonce( $_POST[ 'woo_' . $this->token . '_nonce' ], 'sensei-save-post-meta' ) ) {
+		if ((get_post_type($post_id) != $this->token) || ! isset($_POST['woo_'.$this->token.'_nonce']) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_nonce'], 'sensei-save-post-meta')) {
 			return $post_id;
 		} // End If Statement
 		// Get the post type object.
-		$post_type = get_post_type_object( get_post_type( $post_id ) );
+		$post_type = get_post_type_object(get_post_type($post_id));
 		// Check if the current user has permission to edit the post.
-		if ( !current_user_can( $post_type->cap->edit_post, $post_id ) ) {
+		if ( ! current_user_can($post_type->cap->edit_post, $post_id)) {
 			return $post_id;
 		} // End If Statement
 		// Check if the current post type is a page
-		if ( 'page' == $_POST[ 'post_type' ] ) {
-			if ( ! current_user_can( 'edit_page', $post_id ) ) {
+		if ('page' == $_POST['post_type']) {
+			if ( ! current_user_can('edit_page', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} else {
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} // End If Statement
 		// Save the post meta data fields
-		if ( isset($this->meta_fields) && is_array($this->meta_fields) ) {
-			foreach ( $this->meta_fields as $meta_key ) {
-				$this->save_post_meta( $meta_key, $post_id );
+		if (isset($this->meta_fields) && is_array($this->meta_fields)) {
+			foreach ($this->meta_fields as $meta_key) {
+				$this->save_post_meta($meta_key, $post_id);
 			} // End For Loop
 		} // End If Statement
 	} // End meta_box_save()
@@ -280,37 +280,37 @@ 
 	 * @access public
 	 * @return integer|boolean $post_id or false
 	 */
-	public function quiz_update( $post_id ) {
+	public function quiz_update($post_id) {
 		global $post;
 		// Verify the nonce before proceeding.
-		if ( ( 'lesson' != get_post_type( $post_id ) )|| !isset(   $_POST[ 'woo_' . $this->token . '_nonce'] )  || ! wp_verify_nonce( $_POST[ 'woo_' . $this->token . '_nonce' ], 'sensei-save-post-meta') ) {
-			if ( isset($post->ID) ) {
+		if (('lesson' != get_post_type($post_id)) || ! isset($_POST['woo_'.$this->token.'_nonce']) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_nonce'], 'sensei-save-post-meta')) {
+			if (isset($post->ID)) {
 				return $post->ID;
 			} else {
 				return false;
 			} // End If Statement
 		} // End If Statement
 
-		if( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) {
+		if (wp_is_post_revision($post_id) || wp_is_post_autosave($post_id)) {
 			return false;
 		}
 
 		// Temporarily disable the filter
-        remove_action( 'save_post', array( $this, 'quiz_update' ) );
+        remove_action('save_post', array($this, 'quiz_update'));
 		// Save the Quiz
-		$quiz_id = $this->lesson_quizzes( $post_id, 'any');
+		$quiz_id = $this->lesson_quizzes($post_id, 'any');
 
 		 // Sanitize and setup the post data
-		$_POST = stripslashes_deep( $_POST );
-		if ( isset( $_POST[ 'quiz_id' ] ) && ( 0 < absint( $_POST[ 'quiz_id' ] ) ) ) {
-			$quiz_id = absint( $_POST[ 'quiz_id' ] );
+		$_POST = stripslashes_deep($_POST);
+		if (isset($_POST['quiz_id']) && (0 < absint($_POST['quiz_id']))) {
+			$quiz_id = absint($_POST['quiz_id']);
 		} // End If Statement
-		$post_title = esc_html( $_POST[ 'post_title' ] );
-		$post_status = esc_html( $_POST[ 'post_status' ] );
+		$post_title = esc_html($_POST['post_title']);
+		$post_status = esc_html($_POST['post_status']);
 		$post_content = '';
 
 		// Setup Query Arguments
-		$post_type_args = array(	'post_content' => $post_content,
+		$post_type_args = array('post_content' => $post_content,
   		    						'post_status' => $post_status,
   		    						'post_title' => $post_title,
   		    						'post_type' => 'quiz',
@@ -320,84 +320,84 @@ 
 		$settings = $this->get_quiz_settings();
 
   		// Update or Insert the Lesson Quiz
-		if ( 0 < $quiz_id ) {
+		if (0 < $quiz_id) {
 			// Update the Quiz
-			$post_type_args[ 'ID' ] = $quiz_id;
+			$post_type_args['ID'] = $quiz_id;
 		    wp_update_post($post_type_args);
 
 		    // Update the post meta data
-		    update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
+		    update_post_meta($quiz_id, '_quiz_lesson', $post_id);
 
-		    foreach( $settings as $field ) {
-		    	if( 'random_question_order' != $field['id'] ) {
-			    	$value = $this->get_submitted_setting_value( $field );
-			    	if( isset( $value ) ) {
-			    		update_post_meta( $quiz_id, '_' . $field['id'], $value );
+		    foreach ($settings as $field) {
+		    	if ('random_question_order' != $field['id']) {
+			    	$value = $this->get_submitted_setting_value($field);
+			    	if (isset($value)) {
+			    		update_post_meta($quiz_id, '_'.$field['id'], $value);
 			    	}
 			    }
 		    }
 
 		    // Set the post terms for quiz-type
-		    wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
+		    wp_set_post_terms($quiz_id, array('multiple-choice'), 'quiz-type');
 		} else {
 			// Create the Quiz
 		    $quiz_id = wp_insert_post($post_type_args);
 
 		    // Add the post meta data WP will add it if it doesn't exist
-            update_post_meta( $quiz_id, '_quiz_lesson', $post_id );
+            update_post_meta($quiz_id, '_quiz_lesson', $post_id);
 
-		    foreach( $settings as $field ) {
-		    	if( 'random_question_order' != $field['id'] ) {
+		    foreach ($settings as $field) {
+		    	if ('random_question_order' != $field['id']) {
 
                     //ignore values not posted to avoid
                     // overwriting with empty or default values
                     // when the values are posted from bulk edit or quick edit
-                    if( !isset( $_POST[ $field['id'] ] ) ){
+                    if ( ! isset($_POST[$field['id']])) {
                         continue;
                     }
 
-			    	$value = $this->get_submitted_setting_value( $field );
-			    	if( isset( $value ) ) {
-			    		add_post_meta( $quiz_id, '_' . $field['id'], $value );
+			    	$value = $this->get_submitted_setting_value($field);
+			    	if (isset($value)) {
+			    		add_post_meta($quiz_id, '_'.$field['id'], $value);
 			    	}
 			    }
 		    }
 
 		    // Set the post terms for quiz-type
-		    wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' );
+		    wp_set_post_terms($quiz_id, array('multiple-choice'), 'quiz-type');
 		} // End If Statement
 
 		// Add default lesson order meta value
-		$course_id = get_post_meta( $post_id, '_lesson_course', true );
-		if( $course_id ) {
-			if( ! get_post_meta( $post_id, '_order_' . $course_id, true ) ) {
-				update_post_meta( $post_id, '_order_' . $course_id, 0 );
+		$course_id = get_post_meta($post_id, '_lesson_course', true);
+		if ($course_id) {
+			if ( ! get_post_meta($post_id, '_order_'.$course_id, true)) {
+				update_post_meta($post_id, '_order_'.$course_id, 0);
 			}
 		}
 		// Add reference back to the Quiz
-		update_post_meta( $post_id, '_lesson_quiz', $quiz_id );
+		update_post_meta($post_id, '_lesson_quiz', $quiz_id);
 		// Mark if the Lesson Quiz has questions
-		$quiz_questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
-		if( 0 < count( $quiz_questions ) ) {
-			update_post_meta( $post_id, '_quiz_has_questions', '1' );
+		$quiz_questions = Sensei()->lesson->lesson_quiz_questions($quiz_id);
+		if (0 < count($quiz_questions)) {
+			update_post_meta($post_id, '_quiz_has_questions', '1');
 		}
 		else {
-			delete_post_meta( $post_id, '_quiz_has_questions' );
+			delete_post_meta($post_id, '_quiz_has_questions');
 		}
 
 		// Restore the previously disabled filter
-        add_action( 'save_post', array( $this, 'quiz_update' ) );
+        add_action('save_post', array($this, 'quiz_update'));
 
 	} // End post_updated()
 
-	public function get_submitted_setting_value( $field = false ) {
+	public function get_submitted_setting_value($field = false) {
 
-		if( ! $field ) return;
+		if ( ! $field) return;
 
 		$value = false;
 
-		if( 'quiz_grade_type' == $field['id'] ) {
-			if( isset( $_POST[ $field['id'] ] ) && 'on' == $_POST[ $field['id'] ] ) {
+		if ('quiz_grade_type' == $field['id']) {
+			if (isset($_POST[$field['id']]) && 'on' == $_POST[$field['id']]) {
 				$value = 'auto';
 			} else {
 				$value = 'manual';
@@ -405,8 +405,8 @@ 
 			return $value;
 		}
 
-		if ( isset( $_POST[ $field['id'] ] ) ) {
-			$value = $_POST[ $field['id'] ];
+		if (isset($_POST[$field['id']])) {
+			$value = $_POST[$field['id']];
 		} else {
 			$value = $field['default'];
 		}
@@ -422,18 +422,18 @@ 
 	 * @param int $post_id (default: 0)
 	 * @return int|bool meta id or saved status
 	 */
-	private function save_post_meta( $post_key = '', $post_id = 0 ) {
+	private function save_post_meta($post_key = '', $post_id = 0) {
 		// Get the meta key.
-		$meta_key = '_' . $post_key;
+		$meta_key = '_'.$post_key;
 
         //ignore fields are not posted
 
-        if( !isset( $_POST[ $post_key ] ) ){
+        if ( ! isset($_POST[$post_key])) {
 
             // except for lesson preview checkbox field
-            if( 'lesson_preview' == $post_key ){
+            if ('lesson_preview' == $post_key) {
 
-                $_POST[ $post_key ] = '';
+                $_POST[$post_key] = '';
 
             } else {
 
@@ -444,15 +444,15 @@ 
         }
 
 		// Get the posted data and sanitize it for use as an HTML class.
-		if ( 'lesson_video_embed' == $post_key) {
-			$new_meta_value = esc_html( $_POST[$post_key] );
+		if ('lesson_video_embed' == $post_key) {
+			$new_meta_value = esc_html($_POST[$post_key]);
 		} else {
-			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
+			$new_meta_value = (isset($_POST[$post_key]) ? sanitize_html_class($_POST[$post_key]) : '');
 		} // End If Statement
 
         // update field with the new value
-        if( -1 != $new_meta_value  ){
-            return update_post_meta( $post_id, $meta_key, $new_meta_value );
+        if ( -1 != $new_meta_value  ) {
+            return update_post_meta($post_id, $meta_key, $new_meta_value);
         }
 
 	} // End save_post_meta()
@@ -463,30 +463,30 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_course_meta_box_content () {
+	public function lesson_course_meta_box_content() {
 		global $post;
 		// Setup Lesson Meta Data
 		$selected_lesson_course = 0;
-		if ( 0 < $post->ID ) {
-			$selected_lesson_course = get_post_meta( $post->ID, '_lesson_course', true );
+		if (0 < $post->ID) {
+			$selected_lesson_course = get_post_meta($post->ID, '_lesson_course', true);
 		} // End If Statement
 		// Handle preselected course
-		if ( isset( $_GET[ 'course_id' ] ) && ( 0 < absint( $_GET[ 'course_id' ] ) ) ) {
-			$selected_lesson_course = absint( $_GET[ 'course_id' ] );
+		if (isset($_GET['course_id']) && (0 < absint($_GET['course_id']))) {
+			$selected_lesson_course = absint($_GET['course_id']);
 		} // End If Statement
 		// Get the Lesson Posts
-		$post_args = array(	'post_type' 		=> 'course',
+		$post_args = array('post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'ASC',
     						'post_status'      	=> 'any',
     						'suppress_filters' 	=> 0,
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 		// Buid the HTML to Output
 		$html = '';
 		// Nonce
-		$html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false  );
+		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false);
 
         // Select the course for the lesson
         $drop_down_args = array(
@@ -496,67 +496,67 @@ 
 
         $courses = WooThemes_Sensei_Course::get_all_courses();
         $courses_options = array();
-        foreach( $courses as $course ){
-            $courses_options[ $course->ID ] = get_the_title( $course ) ;
+        foreach ($courses as $course) {
+            $courses_options[$course->ID] = get_the_title($course);
         }
-        $html .= Sensei_Utils::generate_drop_down( $selected_lesson_course, $courses_options, $drop_down_args );
+        $html .= Sensei_Utils::generate_drop_down($selected_lesson_course, $courses_options, $drop_down_args);
 
         // Course Actions Panel
-		if ( current_user_can( 'publish_courses' )) {
+		if (current_user_can('publish_courses')) {
 				$html .= '<div id="lesson-course-actions">';
 					$html .= '<p>';
 						// Add a course action link
-						$html .= '<a id="lesson-course-add" href="#course-add" class="lesson-add-course">+ ' . __('Add New Course', 'woothemes-sensei' ) . '</a>';
+						$html .= '<a id="lesson-course-add" href="#course-add" class="lesson-add-course">+ '.__('Add New Course', 'woothemes-sensei').'</a>';
 					$html .= '</p>';
 				$html .= '</div>';
 				// Add a course input fields
 				$html .= '<div id="lesson-course-details" class="hidden">';
 					$html .= '<p>';
 						// Course Title input
-						$html .= '<label>' . __( 'Course Title' , 'woothemes-sensei' ) . '</label> ';
+						$html .= '<label>'.__('Course Title', 'woothemes-sensei').'</label> ';
 	  					$html .= '<input type="text" id="course-title" name="course_title" value="" size="25" class="widefat" />';
 	  					// Course Description input
-	  					$html .= '<label>' . __( 'Description' , 'woothemes-sensei' ) . '</label> ';
+	  					$html .= '<label>'.__('Description', 'woothemes-sensei').'</label> ';
 	  					$html .= '<textarea rows="10" cols="40" id="course-content" name="course_content" value="" size="300" class="widefat"></textarea>';
 	  					// Course Prerequisite
-	  					$html .= '<label>' . __( 'Course Prerequisite' , 'woothemes-sensei' ) . '</label> ';
-	  					$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">' . "\n";
-							$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>';
-							foreach ($posts_array as $post_item){
-								$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '">' . esc_html( $post_item->post_title ) . '</option>' . "\n";
+	  					$html .= '<label>'.__('Course Prerequisite', 'woothemes-sensei').'</label> ';
+	  					$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">'."\n";
+							$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
+							foreach ($posts_array as $post_item) {
+								$html .= '<option value="'.esc_attr(absint($post_item->ID)).'">'.esc_html($post_item->post_title).'</option>'."\n";
 							} // End For Loop
-						$html .= '</select>' . "\n";
+						$html .= '</select>'."\n";
 						// Course Product
-                        if ( Sensei_WC::is_woocommerce_active() ) {
+                        if (Sensei_WC::is_woocommerce_active()) {
 	  						// Get the Products
-							$select_course_woocommerce_product = get_post_meta( $post_item->ID, '_course_woocommerce_product', true );
+							$select_course_woocommerce_product = get_post_meta($post_item->ID, '_course_woocommerce_product', true);
 
-							$product_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
+							$product_args = array('post_type' 		=> array('product', 'product_variation'),
 													'posts_per_page' 		=> -1,
 													'orderby'         	=> 'title',
 	    											'order'           	=> 'DESC',
-	    											'post_status'		=> array( 'publish', 'private', 'draft' ),
+	    											'post_status'		=> array('publish', 'private', 'draft'),
 	    											'tax_query'			=> array(
 														array(
 															'taxonomy'	=> 'product_type',
 															'field'		=> 'slug',
-															'terms'		=> array( 'variable', 'grouped' ),
+															'terms'		=> array('variable', 'grouped'),
 															'operator'	=> 'NOT IN'
 														)
 													),
 	    											'suppress_filters' 	=> 0
 													);
-							$products_array = get_posts( $product_args );
-							$html .= '<label>' . __( 'WooCommerce Product' , 'woothemes-sensei' ) . '</label> ';
-	  						$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">' . "\n";
-								$html .= '<option value="-">' . __( 'None', 'woothemes-sensei' ) . '</option>';
+							$products_array = get_posts($product_args);
+							$html .= '<label>'.__('WooCommerce Product', 'woothemes-sensei').'</label> ';
+	  						$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">'."\n";
+								$html .= '<option value="-">'.__('None', 'woothemes-sensei').'</option>';
 								$prev_parent_id = 0;
-								foreach ($products_array as $products_item){
+								foreach ($products_array as $products_item) {
 
-									if ( 'product_variation' == $products_item->post_type ) {
-										$product_object = get_product( $products_item->ID );
-										$parent_id = wp_get_post_parent_id( $products_item->ID );
-										$product_name = ucwords( woocommerce_get_formatted_variation( $product_object->variation_data, true ) );
+									if ('product_variation' == $products_item->post_type) {
+										$product_object = get_product($products_item->ID);
+										$parent_id = wp_get_post_parent_id($products_item->ID);
+										$product_name = ucwords(woocommerce_get_formatted_variation($product_object->variation_data, true));
 									} else {
 										$parent_id = false;
 										$prev_parent_id = 0;
@@ -564,32 +564,32 @@ 
 									}
 
 									// Show variations in groups
-									if( $parent_id && $parent_id != $prev_parent_id ) {
-										if( 0 != $prev_parent_id ) {
+									if ($parent_id && $parent_id != $prev_parent_id) {
+										if (0 != $prev_parent_id) {
 											$html .= '</optgroup>';
 										}
-										$html .= '<optgroup label="' . get_the_title( $parent_id ) . '">';
+										$html .= '<optgroup label="'.get_the_title($parent_id).'">';
 										$prev_parent_id = $parent_id;
-									} elseif( ! $parent_id && 0 == $prev_parent_id ) {
+									} elseif ( ! $parent_id && 0 == $prev_parent_id) {
 										$html .= '</optgroup>';
 									}
 
-									$html .= '<option value="' . esc_attr( absint( $products_item->ID ) ) . '">' . esc_html( $products_item->post_title ) . '</option>' . "\n";
+									$html .= '<option value="'.esc_attr(absint($products_item->ID)).'">'.esc_html($products_item->post_title).'</option>'."\n";
 								} // End For Loop
-							$html .= '</select>' . "\n";
+							$html .= '</select>'."\n";
 						} else {
 							// Default
 							$html .= '<input type="hidden" name="course_woocommerce_product" id="course-woocommerce-product-options" value="-" />';
 						}
 						// Course Category
-	  					$html .= '<label>' . __( 'Course Category' , 'woothemes-sensei' ) . '</label> ';
-	  					$cat_args = array( 'echo' => false, 'hierarchical' => true, 'show_option_none' => __( 'None', 'woothemes-sensei' ), 'taxonomy' => 'course-category', 'orderby' => 'name', 'id' => 'course-category-options', 'name' => 'course_category', 'class' => 'widefat' );
-						$html .= wp_dropdown_categories(apply_filters('widget_course_categories_dropdown_args', $cat_args)) . "\n";
+	  					$html .= '<label>'.__('Course Category', 'woothemes-sensei').'</label> ';
+	  					$cat_args = array('echo' => false, 'hierarchical' => true, 'show_option_none' => __('None', 'woothemes-sensei'), 'taxonomy' => 'course-category', 'orderby' => 'name', 'id' => 'course-category-options', 'name' => 'course_category', 'class' => 'widefat');
+						$html .= wp_dropdown_categories(apply_filters('widget_course_categories_dropdown_args', $cat_args))."\n";
 	  					// Save the course action button
-	  					$html .= '<a title="' . esc_attr( __( 'Save Course', 'woothemes-sensei' ) ) . '" href="#add-course-metadata" class="lesson_course_save button button-highlighted">' . esc_html( __( 'Add Course', 'woothemes-sensei' ) ) . '</a>';
+	  					$html .= '<a title="'.esc_attr(__('Save Course', 'woothemes-sensei')).'" href="#add-course-metadata" class="lesson_course_save button button-highlighted">'.esc_html(__('Add Course', 'woothemes-sensei')).'</a>';
 						$html .= '&nbsp;&nbsp;&nbsp;';
 						// Cancel action link
-						$html .= '<a href="#course-add-cancel" class="lesson_course_cancel">' . __( 'Cancel', 'woothemes-sensei' ) . '</a>';
+						$html .= '<a href="#course-add-cancel" class="lesson_course_cancel">'.__('Cancel', 'woothemes-sensei').'</a>';
 					$html .= '</p>';
 				$html .= '</div>';
 			} // End If Statement
@@ -598,20 +598,20 @@ 
 		echo $html;
 	} // End lesson_course_meta_box_content()
 
-	public function quiz_panel( $quiz_id = 0 ) {
+	public function quiz_panel($quiz_id = 0) {
 
-		$html = wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false  );
+		$html = wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false);
 		$html .= '<div id="add-quiz-main">';
-			if ( 0 == $quiz_id ) {
+			if (0 == $quiz_id) {
 				$html .= '<p>';
 					// Default message and Add a Quiz button
-					$html .= esc_html( __( 'Once you have saved your lesson you will be able to add questions.', 'woothemes-sensei' ) );
+					$html .= esc_html(__('Once you have saved your lesson you will be able to add questions.', 'woothemes-sensei'));
 				$html .= '</p>';
 			}
 
 			// Quiz Panel CSS Class
 			$quiz_class = '';
-			if ( 0 == $quiz_id ) {
+			if (0 == $quiz_id) {
 				$quiz_class = ' class="hidden"';
 			} // End If Statement
 			// Build the HTML to Output
@@ -619,15 +619,15 @@ 
 
 			// Setup Questions Query
 			$questions = array();
-			if ( 0 < $quiz_id ) {
-				$questions = $this->lesson_quiz_questions( $quiz_id );
+			if (0 < $quiz_id) {
+				$questions = $this->lesson_quiz_questions($quiz_id);
 			} // End If Statement
 
 			$question_count = 0;
-			foreach( $questions as $question ) {
+			foreach ($questions as $question) {
 
-				if( $question->post_type == 'multiple_question' ) {
-					$question_number = get_post_meta( $question->ID, 'number', true );
+				if ($question->post_type == 'multiple_question') {
+					$question_number = get_post_meta($question->ID, 'number', true);
 					$question_count += $question_number;
 				} else {
 					++$question_count;
@@ -636,68 +636,68 @@ 
 			}
 
 			// Inner DIV
-			$html .= '<div id="add-quiz-metadata"' . $quiz_class . '>';
+			$html .= '<div id="add-quiz-metadata"'.$quiz_class.'>';
 
 				// Quiz ID
-				$html .= '<input type="hidden" name="quiz_id" id="quiz_id" value="' . esc_attr( $quiz_id ) . '" />';
+				$html .= '<input type="hidden" name="quiz_id" id="quiz_id" value="'.esc_attr($quiz_id).'" />';
 
 				// Default Message
-				if ( 0 == $quiz_id ) {
+				if (0 == $quiz_id) {
 					$html .= '<p class="save-note">';
-						$html .= esc_html( __( 'Please save your lesson in order to add questions to your quiz.', 'woothemes-sensei' ) );
+						$html .= esc_html(__('Please save your lesson in order to add questions to your quiz.', 'woothemes-sensei'));
 					$html .= '</p>';
 				} // End If Statement
 
 			$html .= '</div>';
 
 			// Question Container DIV
-			$html .= '<div id="add-question-main"' . $quiz_class . '>';
+			$html .= '<div id="add-question-main"'.$quiz_class.'>';
 				// Inner DIV
 				$html .= '<div id="add-question-metadata">';
 
 					// Count of questions
-					$html .= '<input type="hidden" name="question_counter" id="question_counter" value="' . esc_attr( $question_count ) . '" />';
+					$html .= '<input type="hidden" name="question_counter" id="question_counter" value="'.esc_attr($question_count).'" />';
 					// Table headers
 					$html .= '<table class="widefat" id="sortable-questions">
 								<thead>
 								    <tr>
 								        <th class="question-count-column">#</th>
-								        <th>' . __( 'Question', 'woothemes-sensei' ) . '</th>
-								        <th style="width:45px;">' . __( 'Grade', 'woothemes-sensei' ) . '</th>
-								        <th style="width:125px;">' . __( 'Type', 'woothemes-sensei' ) . '</th>
-								        <th style="width:125px;">' . __( 'Action', 'woothemes-sensei' ) . '</th>
+								        <th>' . __('Question', 'woothemes-sensei').'</th>
+								        <th style="width:45px;">' . __('Grade', 'woothemes-sensei').'</th>
+								        <th style="width:125px;">' . __('Type', 'woothemes-sensei').'</th>
+								        <th style="width:125px;">' . __('Action', 'woothemes-sensei').'</th>
 								    </tr>
 								</thead>
 								<tfoot>
 								    <tr>
 									    <th class="question-count-column">#</th>
-									    <th>' . __( 'Question', 'woothemes-sensei' ) . '</th>
-									    <th>' . __( 'Grade', 'woothemes-sensei' ) . '</th>
-									    <th>' . __( 'Type', 'woothemes-sensei' ) . '</th>
-									    <th>' . __( 'Action', 'woothemes-sensei' ) . '</th>
+									    <th>' . __('Question', 'woothemes-sensei').'</th>
+									    <th>' . __('Grade', 'woothemes-sensei').'</th>
+									    <th>' . __('Type', 'woothemes-sensei').'</th>
+									    <th>' . __('Action', 'woothemes-sensei').'</th>
 								    </tr>
 								</tfoot>';
 
 					$message_class = '';
-					if ( 0 < $question_count ) { $message_class = 'hidden'; }
+					if (0 < $question_count) { $message_class = 'hidden'; }
 
-					$html .= '<tbody id="no-questions-message" class="' . esc_attr( $message_class ) . '">';
+					$html .= '<tbody id="no-questions-message" class="'.esc_attr($message_class).'">';
 						$html .= '<tr>';
-							$html .= '<td colspan="5">' . __( 'There are no Questions for this Quiz yet. Please add some below.', 'woothemes-sensei' ) . '</td>';
+							$html .= '<td colspan="5">'.__('There are no Questions for this Quiz yet. Please add some below.', 'woothemes-sensei').'</td>';
 						$html .= '</tr>';
 					$html .= '</tbody>';
 
-					if( 0 < $question_count ) {
-						$html .= $this->quiz_panel_questions( $questions );
+					if (0 < $question_count) {
+						$html .= $this->quiz_panel_questions($questions);
 					}
 
 					$html .= '</table>';
 
-					if( ! isset( $this->question_order ) ) {
+					if ( ! isset($this->question_order)) {
 						$this->question_order = '';
 					}
 
-					$html .= '<input type="hidden" id="question-order" name="question-order" value="' . $this->question_order . '" />';
+					$html .= '<input type="hidden" id="question-order" name="question-order" value="'.$this->question_order.'" />';
 
 				$html .= '</div>';
 
@@ -716,47 +716,47 @@ 
 
 	}
 
-	public function quiz_panel_questions( $questions = array() ) {
+	public function quiz_panel_questions($questions = array()) {
 		global $quiz_questions;
 
 		$quiz_questions = $questions;
 
 		$html = '';
 
-		if( count( $questions ) > 0 ) {
+		if (count($questions) > 0) {
 
 			$question_class = '';
 			$question_counter = 1;
 
-			foreach ( $questions as $question ) {
+			foreach ($questions as $question) {
 
 				$question_id = $question->ID;
 
-				$question_type = Sensei()->question->get_question_type( $question_id );
+				$question_type = Sensei()->question->get_question_type($question_id);
 
 				$multiple_data = array();
 				$question_increment = 1;
-				if( 'multiple_question' == $question->post_type ) {
+				if ('multiple_question' == $question->post_type) {
 					$question_type = 'category';
 
-					$question_category = get_post_meta( $question->ID, 'category', true );
-					$question_cat = get_term( $question_category, 'question-category' );
+					$question_category = get_post_meta($question->ID, 'category', true);
+					$question_cat = get_term($question_category, 'question-category');
 
-					$question_number = get_post_meta( $question->ID, 'number', true );
+					$question_number = get_post_meta($question->ID, 'number', true);
 					$question_increment = $question_number;
 
-					$multiple_data = array( $question_cat->name, $question_number );
+					$multiple_data = array($question_cat->name, $question_number);
 				}
 
-				if( ! $question_type ) {
+				if ( ! $question_type) {
 					$question_type = 'multiple-choice';
 				}
 
 				// Row with question and actions
-				$html .= $this->quiz_panel_question( $question_type, $question_counter, $question_id, 'quiz', $multiple_data );
+				$html .= $this->quiz_panel_question($question_type, $question_counter, $question_id, 'quiz', $multiple_data);
 				$question_counter += $question_increment;
 
-				if( isset( $this->question_order ) && strlen( $this->question_order ) > 0 ) { $this->question_order .= ','; }
+				if (isset($this->question_order) && strlen($this->question_order) > 0) { $this->question_order .= ','; }
 				$this->question_order .= $question_id;
 			} // End For Loop
 		}
@@ -765,161 +765,161 @@ 
 
 	}
 
-	public function quiz_panel_question( $question_type = '', $question_counter = 0, $question_id = 0, $context = 'quiz', $multiple_data = array() ) {
-		global $row_counter,  $quiz_questions;
+	public function quiz_panel_question($question_type = '', $question_counter = 0, $question_id = 0, $context = 'quiz', $multiple_data = array()) {
+		global $row_counter, $quiz_questions;
 
 		$html = '';
 
 		$question_class = '';
-		if( 'quiz' == $context ) {
-			if( ! $row_counter || ! isset( $row_counter ) ) {
+		if ('quiz' == $context) {
+			if ( ! $row_counter || ! isset($row_counter)) {
 				$row_counter = 1;
 			}
-			if( $row_counter % 2 ) { $question_class = 'alternate'; }
+			if ($row_counter % 2) { $question_class = 'alternate'; }
 			++$row_counter;
 		}
 
-		if( $question_id ) {
+		if ($question_id) {
 
-			if( $question_type != 'category' ) {
+			if ($question_type != 'category') {
 
-				$question_grade = Sensei()->question->get_question_grade( $question_id );
+				$question_grade = Sensei()->question->get_question_grade($question_id);
 
-				$question_media = get_post_meta( $question_id, '_question_media', true );
+				$question_media = get_post_meta($question_id, '_question_media', true);
 				$question_media_type = $question_media_thumb = $question_media_link = $question_media_title = '';
 				$question_media_thumb_class = $question_media_link_class = $question_media_delete_class = 'hidden';
-				$question_media_add_button = __( 'Add file', 'woothemes-sensei' );
-				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_add_button = __('Add file', 'woothemes-sensei');
+				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_delete_class = '';
 							$question_media_type = $mimetype_array[0];
-							if( 'image' == $question_media_type ) {
-								$question_media_thumb = wp_get_attachment_thumb_url( $question_media );
-								if( $question_media_thumb ) {
+							if ('image' == $question_media_type) {
+								$question_media_thumb = wp_get_attachment_thumb_url($question_media);
+								if ($question_media_thumb) {
 									$question_media_thumb_class = '';
 								}
 							}
-							$question_media_url = wp_get_attachment_url( $question_media );
-							if( $question_media_url ) {
-								$attachment = get_post( $question_media );
+							$question_media_url = wp_get_attachment_url($question_media);
+							if ($question_media_url) {
+								$attachment = get_post($question_media);
 								$question_media_title = $attachment->post_title;
 
-								if( ! $question_media_title ) {
-									$question_media_filename = basename( $question_media_url );
+								if ( ! $question_media_title) {
+									$question_media_filename = basename($question_media_url);
 									$question_media_title = $question_media_filename;
 								}
-								$question_media_link = '<a class="' . $question_media_type . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_title . '</a>';
+								$question_media_link = '<a class="'.$question_media_type.'" href="'.esc_url($question_media_url).'" target="_blank">'.$question_media_title.'</a>';
 								$question_media_link_class = '';
 							}
 
-							$question_media_add_button = __( 'Change file', 'woothemes-sensei' );
+							$question_media_add_button = __('Change file', 'woothemes-sensei');
 						}
 					}
 				}
 
-				$random_order = get_post_meta( $question_id, '_random_order', true );
-				if( ! $random_order ) {
+				$random_order = get_post_meta($question_id, '_random_order', true);
+				if ( ! $random_order) {
 					$random_order = 'yes';
 				}
 
-				if( ! $question_type ) { $question_type = 'multiple-choice'; }
+				if ( ! $question_type) { $question_type = 'multiple-choice'; }
 			}
 
-			$html .= '<tbody class="' . $question_class . '">';
+			$html .= '<tbody class="'.$question_class.'">';
 
-				if( 'quiz' == $context ) {
+				if ('quiz' == $context) {
 					$html .= '<tr>';
-						if( $question_type != 'category' ) {
-							$question = get_post( $question_id );
-							$html .= '<td class="table-count question-number question-count-column"><span class="number">' . $question_counter . '</span></td>';
-							$html .= '<td>' . esc_html( $question->post_title ) . '</td>';
-							$html .= '<td class="question-grade-column">' . esc_html( $question_grade ) . '</td>';
-							$question_types_filtered = ucwords( str_replace( array( '-', 'boolean' ), array( ' ', __( 'True/False', 'woothemes-sensei' ) ), $question_type ) );
-							$html .= '<td>' . esc_html( $question_types_filtered ) . '</td>';
-							$html .= '<td><a title="' . esc_attr( __( 'Edit Question', 'woothemes-sensei' ) ) . '" href="#question_' . $question_counter .'" class="question_table_edit">' . esc_html( __( 'Edit', 'woothemes-sensei' ) ) . '</a> <a title="' . esc_attr( __( 'Remove Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_delete">' . esc_html( __( 'Remove', 'woothemes-sensei' ) ) . '</a></td>';
+						if ($question_type != 'category') {
+							$question = get_post($question_id);
+							$html .= '<td class="table-count question-number question-count-column"><span class="number">'.$question_counter.'</span></td>';
+							$html .= '<td>'.esc_html($question->post_title).'</td>';
+							$html .= '<td class="question-grade-column">'.esc_html($question_grade).'</td>';
+							$question_types_filtered = ucwords(str_replace(array('-', 'boolean'), array(' ', __('True/False', 'woothemes-sensei')), $question_type));
+							$html .= '<td>'.esc_html($question_types_filtered).'</td>';
+							$html .= '<td><a title="'.esc_attr(__('Edit Question', 'woothemes-sensei')).'" href="#question_'.$question_counter.'" class="question_table_edit">'.esc_html(__('Edit', 'woothemes-sensei')).'</a> <a title="'.esc_attr(__('Remove Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_table_delete">'.esc_html(__('Remove', 'woothemes-sensei')).'</a></td>';
 
 						} else {
 
-							$end_number = intval( $question_counter ) + intval( $multiple_data[1] ) - 1;
-							if( $question_counter == $end_number ) {
+							$end_number = intval($question_counter) + intval($multiple_data[1]) - 1;
+							if ($question_counter == $end_number) {
 								$row_numbers = $question_counter;
 							} else {
-								$row_numbers = $question_counter . ' - ' . $end_number;
+								$row_numbers = $question_counter.' - '.$end_number;
 							}
-							$row_title = sprintf( __( 'Selected from \'%1$s\' ', 'woothemes-sensei' ), $multiple_data[0] );
+							$row_title = sprintf(__('Selected from \'%1$s\' ', 'woothemes-sensei'), $multiple_data[0]);
 
-							$html .= '<td class="table-count question-number question-count-column"><span class="number hidden">' . $question_counter . '</span><span class="hidden total-number">' . $multiple_data[1] . '</span><span class="row-numbers">' . esc_html( $row_numbers ) . '</span></td>';
-							$html .= '<td>' . esc_html( $row_title ) . '</td>';
+							$html .= '<td class="table-count question-number question-count-column"><span class="number hidden">'.$question_counter.'</span><span class="hidden total-number">'.$multiple_data[1].'</span><span class="row-numbers">'.esc_html($row_numbers).'</span></td>';
+							$html .= '<td>'.esc_html($row_title).'</td>';
 							$html .= '<td class="question-grade-column"></td>';
-							$html .= '<td><input type="hidden" name="question_id" class="row_question_id" id="question_' . $question_counter . '_id" value="' . $question_id . '" /></td>';
-							$html .= '<td><a title="' . esc_attr( __( 'Edit Question', 'woothemes-sensei' ) ) . '" href="#question_' . $question_counter .'" class="question_table_edit" style="visibility:hidden;">' . esc_html( __( 'Edit', 'woothemes-sensei' ) ) . '</a> <a title="' . esc_attr( __( 'Remove Question(s)', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_multiple_delete" rel="' . $question_id . '">' . esc_html( __( 'Remove', 'woothemes-sensei' ) ) . '</a></td>';
+							$html .= '<td><input type="hidden" name="question_id" class="row_question_id" id="question_'.$question_counter.'_id" value="'.$question_id.'" /></td>';
+							$html .= '<td><a title="'.esc_attr(__('Edit Question', 'woothemes-sensei')).'" href="#question_'.$question_counter.'" class="question_table_edit" style="visibility:hidden;">'.esc_html(__('Edit', 'woothemes-sensei')).'</a> <a title="'.esc_attr(__('Remove Question(s)', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_multiple_delete" rel="'.$question_id.'">'.esc_html(__('Remove', 'woothemes-sensei')).'</a></td>';
 
 						}
 					$html .= '</tr>';
 				}
 
-				if( $question_type != 'category' ) {
+				if ($question_type != 'category') {
 
 					$edit_class = '';
-					if( 'quiz' == $context ) {
+					if ('quiz' == $context) {
 						$edit_class = 'hidden';
 					}
 
-					$question = get_post( $question_id );
-					$html .= '<tr class="question-quick-edit ' . esc_attr( $edit_class ) . '">';
+					$question = get_post($question_id);
+					$html .= '<tr class="question-quick-edit '.esc_attr($edit_class).'">';
 						$html .= '<td colspan="5">';
-							$html .= '<span class="hidden question_original_counter">' . $question_counter . '</span>';
+							$html .= '<span class="hidden question_original_counter">'.$question_counter.'</span>';
 					    	$html .= '<div class="question_required_fields">';
 
 						    	// Question title
 						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '">' . __( 'Question:', 'woothemes-sensei' ) . '</label> ';
-							    	$html .= '<input type="text" id="question_' . $question_counter . '" name="question" value="' . esc_attr( htmlspecialchars( $question->post_title ) ) . '" size="25" class="widefat" />';
+							    	$html .= '<label for="question_'.$question_counter.'">'.__('Question:', 'woothemes-sensei').'</label> ';
+							    	$html .= '<input type="text" id="question_'.$question_counter.'" name="question" value="'.esc_attr(htmlspecialchars($question->post_title)).'" size="25" class="widefat" />';
 						    	$html .= '</div>';
 
 						    	// Question description
 						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> ';
+							    	$html .= '<label for="question_'.$question_counter.'_desc">'.__('Question Description (optional):', 'woothemes-sensei').'</label> ';
 						    	$html .= '</div>';
-							    	$html .= '<textarea id="question_' . $question_counter . '_desc" name="question_description" class="widefat" rows="4">' . esc_textarea( $question->post_content ) . '</textarea>';
+							    	$html .= '<textarea id="question_'.$question_counter.'_desc" name="question_description" class="widefat" rows="4">'.esc_textarea($question->post_content).'</textarea>';
 
 						    	// Question grade
 						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_grade">' . __( 'Question grade:', 'woothemes-sensei' ) . '</label> ';
-							    	$html .= '<input type="number" id="question_' . $question_counter . '_grade" class="question_grade small-text" name="question_grade" min="0" value="' . $question_grade . '" />';
+							    	$html .= '<label for="question_'.$question_counter.'_grade">'.__('Question grade:', 'woothemes-sensei').'</label> ';
+							    	$html .= '<input type="number" id="question_'.$question_counter.'_grade" class="question_grade small-text" name="question_grade" min="0" value="'.$question_grade.'" />';
 						    	$html .= '</div>';
 
 						    	// Random order
-						    	if( $question_type == 'multiple-choice' ) {
+						    	if ($question_type == 'multiple-choice') {
 						    		$html .= '<div>';
-						    			$html .= '<label for="' . $question_counter . '_random_order"><input type="checkbox" name="random_order" class="random_order" id="' . $question_counter . '_random_order" value="yes" ' . checked( $random_order, 'yes', false ) . ' /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
+						    			$html .= '<label for="'.$question_counter.'_random_order"><input type="checkbox" name="random_order" class="random_order" id="'.$question_counter.'_random_order" value="yes" '.checked($random_order, 'yes', false).' /> '.__('Randomise answer order', 'woothemes-sensei').'</label>';
 						    		$html .= '</div>';
 						    	}
 
 						    	// Question media
 						    	$html .= '<div>';
-							    	$html .= '<label for="question_' . $question_counter . '_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
-							    	$html .= '<button id="question_' . $question_counter . '_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . $question_media_add_button . '</button>';
-							    	$html .= '<button id="question_' . $question_counter . '_media_button_delete" class="delete_media_file_button button-secondary ' . $question_media_delete_class . '">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
-							    	$html .= '<span id="question_' . $question_counter . '_media_link" class="question_media_link ' . $question_media_link_class . '">' . $question_media_link . '</span>';
-							    	$html .= '<br/><img id="question_' . $question_counter . '_media_preview" class="question_media_preview ' . $question_media_thumb_class . '" src="' . $question_media_thumb . '" /><br/>';
-							    	$html .= '<input type="hidden" id="question_' . $question_counter . '_media" class="question_media" name="question_media" value="' . $question_media . '" />';
+							    	$html .= '<label for="question_'.$question_counter.'_media_button">'.__('Question media:', 'woothemes-sensei').'</label><br/>';
+							    	$html .= '<button id="question_'.$question_counter.'_media_button" class="upload_media_file_button button-secondary" data-uploader_title="'.__('Add file to question', 'woothemes-sensei').'" data-uploader_button_text="'.__('Add to question', 'woothemes-sensei').'">'.$question_media_add_button.'</button>';
+							    	$html .= '<button id="question_'.$question_counter.'_media_button_delete" class="delete_media_file_button button-secondary '.$question_media_delete_class.'">'.__('Delete file', 'woothemes-sensei').'</button><br/>';
+							    	$html .= '<span id="question_'.$question_counter.'_media_link" class="question_media_link '.$question_media_link_class.'">'.$question_media_link.'</span>';
+							    	$html .= '<br/><img id="question_'.$question_counter.'_media_preview" class="question_media_preview '.$question_media_thumb_class.'" src="'.$question_media_thumb.'" /><br/>';
+							    	$html .= '<input type="hidden" id="question_'.$question_counter.'_media" class="question_media" name="question_media" value="'.$question_media.'" />';
 						    	$html .= '</div>';
 
 						    $html .= '</div>';
 
-						    $html .= $this->quiz_panel_question_field( $question_type, $question_id, $question_counter );
+						    $html .= $this->quiz_panel_question_field($question_type, $question_id, $question_counter);
 
-						    $html .= '<input type="hidden" id="question_' . $question_counter . '_question_type" class="question_type" name="question_type" value="' . $question_type . '" />';
-							$html .= '<input type="hidden" name="question_id" class="row_question_id" id="question_' . $question_counter . '_id" value="' . $question_id . '" />';
+						    $html .= '<input type="hidden" id="question_'.$question_counter.'_question_type" class="question_type" name="question_type" value="'.$question_type.'" />';
+							$html .= '<input type="hidden" name="question_id" class="row_question_id" id="question_'.$question_counter.'_id" value="'.$question_id.'" />';
 
-							if( 'quiz' == $context ) {
+							if ('quiz' == $context) {
 					    		$html .= '<div class="update-question">';
-						    		$html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="' . esc_attr( __( 'Cancel', 'woothemes-sensei' ) ) . '">' . __( 'Cancel', 'woothemes-sensei' ) . '</a> ';
-						    		$html .= '<a title="' . esc_attr( __( 'Update Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_save button button-highlighted">' . esc_html( __( 'Update', 'woothemes-sensei' ) ) . '</a>';
+						    		$html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="'.esc_attr(__('Cancel', 'woothemes-sensei')).'">'.__('Cancel', 'woothemes-sensei').'</a> ';
+						    		$html .= '<a title="'.esc_attr(__('Update Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_table_save button button-highlighted">'.esc_html(__('Update', 'woothemes-sensei')).'</a>';
 					    		$html .= '</div>';
 					    	}
 
@@ -934,79 +934,79 @@ 
 		return $html;
 	}
 
-	public function quiz_panel_add( $context = 'quiz' ) {
+	public function quiz_panel_add($context = 'quiz') {
 
 
 		$html = '<div id="add-new-question">';
 
 			$question_types = Sensei()->question->question_types();
 
-			$question_cats = get_terms( 'question-category', array( 'hide_empty' => false ) );
+			$question_cats = get_terms('question-category', array('hide_empty' => false));
 
-			if( 'quiz' == $context ) {
+			if ('quiz' == $context) {
 	    		$html .= '<h2 class="nav-tab-wrapper add-question-tabs">';
-	    			$html .= '<a id="tab-new" class="nav-tab nav-tab-active">' . __( 'New Question'  , 'woothemes-sensei' ) . '</a>';
-	    			$html .= '<a id="tab-existing" class="nav-tab">' . __( 'Existing Questions'  , 'woothemes-sensei' ) . '</a>';
-                    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats )  && ! Sensei()->teacher->is_admin_teacher() ) {
-	    				$html .= '<a id="tab-multiple" class="nav-tab">' . __( 'Category Questions'  , 'woothemes-sensei' ) . '</a>';
+	    			$html .= '<a id="tab-new" class="nav-tab nav-tab-active">'.__('New Question', 'woothemes-sensei').'</a>';
+	    			$html .= '<a id="tab-existing" class="nav-tab">'.__('Existing Questions', 'woothemes-sensei').'</a>';
+                    if ( ! empty($question_cats) && ! is_wp_error($question_cats) && ! Sensei()->teacher->is_admin_teacher()) {
+	    				$html .= '<a id="tab-multiple" class="nav-tab">'.__('Category Questions', 'woothemes-sensei').'</a>';
 	    			}
 	    		$html .= '</h2>';
 	    	}
 
 	    	$html .= '<div class="tab-content" id="tab-new-content">';
 
-	    		if( 'quiz' == $context ) {
-	    			$html .= '<p><em>' . sprintf( __( 'Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
+	    		if ('quiz' == $context) {
+	    			$html .= '<p><em>'.sprintf(__('Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit.php?post_type=question').'">', '</a>').'</em></p>';
 	    		}
 
 				$html .= '<div class="question">';
 					$html .= '<div class="question_required_fields">';
 
 						// Question title
-						$html .= '<p><label>' . __( 'Question:'  , 'woothemes-sensei' ) . '</label> ';
+						$html .= '<p><label>'.__('Question:', 'woothemes-sensei').'</label> ';
 	  					$html .= '<input type="text" id="add_question" name="question" value="" size="25" class="widefat" /></p>';
 
 						// Question description
 						$html .= '<p>';
-							$html .= '<label for="question_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> ';
+							$html .= '<label for="question_desc">'.__('Question Description (optional):', 'woothemes-sensei').'</label> ';
 						$html .= '</p>';
 						$html .= '<textarea id="question_desc" name="question_description" class="widefat" rows="4"></textarea>';
 
 	  					// Question type
-						$html .= '<p><label>' . __( 'Question Type:' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<select id="add-question-type-options" name="question_type" class="chosen_select widefat question-type-select">' . "\n";
-							foreach ( $question_types as $type => $label ) {
-								$html .= '<option value="' . esc_attr( $type ) . '">' . esc_html( $label ) . '</option>' . "\n";
+						$html .= '<p><label>'.__('Question Type:', 'woothemes-sensei').'</label> ';
+						$html .= '<select id="add-question-type-options" name="question_type" class="chosen_select widefat question-type-select">'."\n";
+							foreach ($question_types as $type => $label) {
+								$html .= '<option value="'.esc_attr($type).'">'.esc_html($label).'</option>'."\n";
 							} // End For Loop
-						$html .= '</select></p>' . "\n";
+						$html .= '</select></p>'."\n";
 
 						// Question category
-						if( 'quiz' == $context ) {
-							if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) {
-								$html .= '<p><label>' . __( 'Question Category:' , 'woothemes-sensei' ) . '</label> ';
-								$html .= '<select id="add-question-category-options" name="question_category" class="chosen_select widefat question-category-select">' . "\n";
-								$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>' . "\n";
-								foreach( $question_cats as $cat ) {
-									$html .= '<option value="' . esc_attr( $cat->term_id ) . '">' . esc_html( $cat->name ) . '</option>';
+						if ('quiz' == $context) {
+							if ( ! empty($question_cats) && ! is_wp_error($question_cats)) {
+								$html .= '<p><label>'.__('Question Category:', 'woothemes-sensei').'</label> ';
+								$html .= '<select id="add-question-category-options" name="question_category" class="chosen_select widefat question-category-select">'."\n";
+								$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'."\n";
+								foreach ($question_cats as $cat) {
+									$html .= '<option value="'.esc_attr($cat->term_id).'">'.esc_html($cat->name).'</option>';
 								} // End For Loop
-								$html .= '</select></p>' . "\n";
+								$html .= '</select></p>'."\n";
 							}
 						}
 
 	  					// Question grade
-						$html .= '<p><label>' . __( 'Question Grade:'  , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<input type="number" id="add-question-grade" name="question_grade" class="small-text" min="0" value="1" /></p>' . "\n";
+						$html .= '<p><label>'.__('Question Grade:', 'woothemes-sensei').'</label> ';
+						$html .= '<input type="number" id="add-question-grade" name="question_grade" class="small-text" min="0" value="1" /></p>'."\n";
 
 						// Random order
 						$html .= '<p class="add_question_random_order">';
-			    			$html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>';
+			    			$html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> '.__('Randomise answer order', 'woothemes-sensei').'</label>';
 			    		$html .= '</p>';
 
 			    		// Question media
 						$html .= '<p>';
-					    	$html .= '<label for="question_add_new_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>';
-					    	$html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . __( 'Add file', 'woothemes-sensei' ) . '</button>';
-					    	$html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>';
+					    	$html .= '<label for="question_add_new_media_button">'.__('Question media:', 'woothemes-sensei').'</label><br/>';
+					    	$html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="'.__('Add file to question', 'woothemes-sensei').'" data-uploader_button_text="'.__('Add to question', 'woothemes-sensei').'">'.__('Add file', 'woothemes-sensei').'</button>';
+					    	$html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">'.__('Delete file', 'woothemes-sensei').'</button><br/>';
 					    	$html .= '<span id="question_add_new_media_link" class="question_media_link hidden"></span>';
 					    	$html .= '<br/><img id="question_add_new_media_preview" class="question_media_preview hidden" src="" /><br/>';
 					    	$html .= '<input type="hidden" id="question_add_new_media" class="question_media" name="question_media" value="" />';
@@ -1015,44 +1015,44 @@ 
 					$html .= '</div>';
 				$html .= '</div>';
 
-				foreach ( $question_types as $type => $label ) {
-					$html .= $this->quiz_panel_question_field( $type );
+				foreach ($question_types as $type => $label) {
+					$html .= $this->quiz_panel_question_field($type);
 				}
 
-				if( 'quiz' == $context ) {
+				if ('quiz' == $context) {
 					$html .= '<div class="add-question">';
-			    		$html .= '<a title="' . esc_attr( __( 'Add Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">' . esc_html( __( 'Add Question', 'woothemes-sensei' ) ) . '</a>';
+			    		$html .= '<a title="'.esc_attr(__('Add Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">'.esc_html(__('Add Question', 'woothemes-sensei')).'</a>';
 		    		$html .= '</div>';
 		    	}
 
 		    $html .= '</div>';
 
-		    if( 'quiz' == $context ) {
+		    if ('quiz' == $context) {
 
 			    $html .= '<div class="tab-content hidden" id="tab-existing-content">';
 
-			    	$html .= '<p><em>' . sprintf( __( 'Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>';
+			    	$html .= '<p><em>'.sprintf(__('Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit.php?post_type=question').'">', '</a>').'</em></p>';
 
 			    	$html .= '<div id="existing-filters" class="alignleft actions">
 			    				<select id="existing-status">
-			    					<option value="all">' . __( 'All', 'woothemes-sensei' ) . '</option>
-			    					<option value="unused">' . __( 'Unused', 'woothemes-sensei' ) . '</option>
-			    					<option value="used">' . __( 'Used', 'woothemes-sensei' ) . '</option>
+			    					<option value="all">' . __('All', 'woothemes-sensei').'</option>
+			    					<option value="unused">' . __('Unused', 'woothemes-sensei').'</option>
+			    					<option value="used">' . __('Used', 'woothemes-sensei').'</option>
 			    				</select>
 			    				<select id="existing-type">
-			    					<option value="">' . __( 'All Types', 'woothemes-sensei' ) . '</option>';
-							    	foreach ( $question_types as $type => $label ) {
-										$html .= '<option value="' . esc_attr( $type ) . '">' . esc_html( $label ) . '</option>';
+			    					<option value="">' . __('All Types', 'woothemes-sensei').'</option>';
+							    	foreach ($question_types as $type => $label) {
+										$html .= '<option value="'.esc_attr($type).'">'.esc_html($label).'</option>';
 									}
     				$html .= '</select>
     							<select id="existing-category">
-			    					<option value="">' . __( 'All Categories', 'woothemes-sensei' ) . '</option>';
-				    				foreach( $question_cats as $cat ) {
-										$html .= '<option value="' . esc_attr( $cat->slug ) . '">' . esc_html( $cat->name ) . '</option>';
+			    					<option value="">' . __('All Categories', 'woothemes-sensei').'</option>';
+				    				foreach ($question_cats as $cat) {
+										$html .= '<option value="'.esc_attr($cat->slug).'">'.esc_html($cat->name).'</option>';
 									}
     				$html .= '</select>
-    							<input type="text" id="existing-search" placeholder="' . __( 'Search', 'woothemes-sensei' ) . '" />
-    							<a class="button" id="existing-filter-button">' . __( 'Filter', 'woothemes-sensei' ) . '</a>
+    							<input type="text" id="existing-search" placeholder="' . __('Search', 'woothemes-sensei').'" />
+    							<a class="button" id="existing-filter-button">' . __('Filter', 'woothemes-sensei').'</a>
 			    			</div>';
 
 			    	$html .= '<table id="existing-table" class="widefat">';
@@ -1060,17 +1060,17 @@ 
 			    		$html .= '<thead>
 									    <tr>
 									        <th scope="col" class="column-cb check-column"><input type="checkbox" /></th>
-									        <th scope="col">' . __( 'Question', 'woothemes-sensei' ) . '</th>
-									        <th scope="col">' . __( 'Type', 'woothemes-sensei' ) . '</th>
-									        <th scope="col">' . __( 'Category', 'woothemes-sensei' ) . '</th>
+									        <th scope="col">' . __('Question', 'woothemes-sensei').'</th>
+									        <th scope="col">' . __('Type', 'woothemes-sensei').'</th>
+									        <th scope="col">' . __('Category', 'woothemes-sensei').'</th>
 									    </tr>
 									</thead>
 									<tfoot>
 									    <tr>
 										    <th scope="col" class="check-column"><input type="checkbox" /></th>
-									        <th scope="col">' . __( 'Question', 'woothemes-sensei' ) . '</th>
-									        <th scope="col">' . __( 'Type', 'woothemes-sensei' ) . '</th>
-									        <th scope="col">' . __( 'Category', 'woothemes-sensei' ) . '</th>
+									        <th scope="col">' . __('Question', 'woothemes-sensei').'</th>
+									        <th scope="col">' . __('Type', 'woothemes-sensei').'</th>
+									        <th scope="col">' . __('Category', 'woothemes-sensei').'</th>
 									    </tr>
 									</tfoot>';
 						$html .= '<tbody id="existing-questions">';
@@ -1078,8 +1078,8 @@ 
 						$questions = $this->quiz_panel_get_existing_questions();
 
 						$row = 1;
-						foreach( $questions['questions'] as $question ) {
-							$html .= $this->quiz_panel_add_existing_question( $question->ID, $row );
+						foreach ($questions['questions'] as $question) {
+							$html .= $this->quiz_panel_add_existing_question($question->ID, $row);
 							++$row;
 						}
 
@@ -1088,36 +1088,36 @@ 
 			    	$html .= '</table>';
 
 			    	$next_class = '';
-			    	if( $questions['count'] <= 10 ) {
+			    	if ($questions['count'] <= 10) {
 			    		$next_class = 'hidden';
 			    	}
 
 			    	$html .= '<div id="existing-pagination">';
 			    		$html .= '<input type="hidden" id="existing-page" value="1" />';
-			    		$html .= '<a class="prev no-paging">&larr; ' . __( 'Previous', 'woothemes-sensei') . '</a> <a class="next ' . esc_attr( $next_class ) . '">' . __( 'Next', 'woothemes-sensei') . ' &rarr;</a>';
+			    		$html .= '<a class="prev no-paging">&larr; '.__('Previous', 'woothemes-sensei').'</a> <a class="next '.esc_attr($next_class).'">'.__('Next', 'woothemes-sensei').' &rarr;</a>';
 			    	$html .= '</div>';
 
 			    	$html .= '<div class="existing-actions">';
-			    		$html .= '<a title="' . esc_attr( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '" class="add_existing_save button button-primary button-highlighted">' . esc_html( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '</a></p>';
+			    		$html .= '<a title="'.esc_attr(__('Add Selected Question(s)', 'woothemes-sensei')).'" class="add_existing_save button button-primary button-highlighted">'.esc_html(__('Add Selected Question(s)', 'woothemes-sensei')).'</a></p>';
 			    	$html .= '</div>';
 
 			    $html .= '</div>';
 
-			    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) {
+			    if ( ! empty($question_cats) && ! is_wp_error($question_cats)) {
 				    $html .= '<div class="tab-content hidden" id="tab-multiple-content">';
 
-				    	$html .= '<p><em>' . sprintf( __( 'Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=question-category&post_type=question' ) . '">', '</a>' ) . '</em></p>';
+				    	$html .= '<p><em>'.sprintf(__('Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit-tags.php?taxonomy=question-category&post_type=question').'">', '</a>').'</em></p>';
 
-						$html .= '<p><select id="add-multiple-question-category-options" name="multiple_category" class="chosen_select widefat question-category-select">' . "\n";
-						$html .= '<option value="">' . __( 'Select a Question Category', 'woothemes-sensei' ) . '</option>' . "\n";
-						foreach( $question_cats as $cat ) {
-							$html .= '<option value="' . esc_attr( $cat->term_id ) . '">' . esc_html( $cat->name ) . '</option>';
+						$html .= '<p><select id="add-multiple-question-category-options" name="multiple_category" class="chosen_select widefat question-category-select">'."\n";
+						$html .= '<option value="">'.__('Select a Question Category', 'woothemes-sensei').'</option>'."\n";
+						foreach ($question_cats as $cat) {
+							$html .= '<option value="'.esc_attr($cat->term_id).'">'.esc_html($cat->name).'</option>';
 						} // End For Loop
-						$html .= '</select></p>' . "\n";
+						$html .= '</select></p>'."\n";
 
-						$html .= '<p>' . __( 'Number of questions:', 'woothemes-sensei' ) . ' <input type="number" min="1" value="1" max="1" id="add-multiple-question-count" class="small-text"/>';
+						$html .= '<p>'.__('Number of questions:', 'woothemes-sensei').' <input type="number" min="1" value="1" max="1" id="add-multiple-question-count" class="small-text"/>';
 
-						$html .= '<a title="' . esc_attr( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '" class="add_multiple_save button button-primary button-highlighted">' . esc_html( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '</a></p>';
+						$html .= '<a title="'.esc_attr(__('Add Question(s)', 'woothemes-sensei')).'" class="add_multiple_save button button-primary button-highlighted">'.esc_html(__('Add Question(s)', 'woothemes-sensei')).'</a></p>';
 
 				    $html .= '</div>';
 				}
@@ -1128,7 +1128,7 @@ 
 		return $html;
 	}
 
-	public function quiz_panel_get_existing_questions( $question_status = 'all', $question_type = '', $question_category = '', $question_search = '', $page = 1 ) {
+	public function quiz_panel_get_existing_questions($question_status = 'all', $question_type = '', $question_category = '', $question_search = '', $page = 1) {
 
 		$args = array(
 			'post_type' => 'question',
@@ -1137,14 +1137,14 @@ 
 			'suppress_filters' => 0,
 		);
 
-		switch( $question_status ) {
+		switch ($question_status) {
 			case 'unused': $quiz_status = 'NOT EXISTS'; break;
 			case 'used': $quiz_status = 'EXISTS'; break;
 			default: $quiz_status = ''; break;
 		}
 
-		if( $quiz_status ) {
-			switch( $quiz_status ) {
+		if ($quiz_status) {
+			switch ($quiz_status) {
 				case 'EXISTS':
 					$args['meta_query'][] = array(
 						'key' => '_quiz_id',
@@ -1162,7 +1162,7 @@ 
 			}
 		}
 
-		if( $question_type ) {
+		if ($question_type) {
 			$args['tax_query'][] = array(
 				'taxonomy' => 'question-type',
 				'field' => 'slug',
@@ -1170,7 +1170,7 @@ 
 			);
 		}
 
-		if( $question_category ) {
+		if ($question_category) {
 			$args['tax_query'][] = array(
 				'taxonomy' => 'question-category',
 				'field' => 'slug',
@@ -1178,19 +1178,19 @@ 
 			);
 		}
 
-		if( $question_type && $question_category ) {
+		if ($question_type && $question_category) {
 			$args['tax_query']['relation'] = 'AND';
 		}
 
-		if( $question_search ) {
+		if ($question_search) {
 			$args['s'] = $question_search;
 		}
 
-		if( $page ) {
+		if ($page) {
 			$args['paged'] = $page;
 		}
 
-		$qry = new WP_Query( $args );
+		$qry = new WP_Query($args);
 
         /**
          * Filter existing questions query
@@ -1199,39 +1199,39 @@ 
          *
          * @param WP_Query $wp_query
          */
-        $qry = apply_filters( 'sensei_existing_questions_query_results', $qry );
+        $qry = apply_filters('sensei_existing_questions_query_results', $qry);
 
 		$questions['questions'] = $qry->posts;
-		$questions['count'] = intval( $qry->found_posts );
+		$questions['count'] = intval($qry->found_posts);
 		$questions['page'] = $page;
 
 		return $questions;
 	}
 
-	public function quiz_panel_add_existing_question( $question_id = 0, $row = 1 ) {
+	public function quiz_panel_add_existing_question($question_id = 0, $row = 1) {
 
 		$html = '';
 
-		if( ! $question_id ) {
+		if ( ! $question_id) {
 
             return;
 
         }
 
 		$existing_class = '';
-		if( $row % 2 ) {
+		if ($row % 2) {
             $existing_class = 'alternate';
         }
 
-		$question_type = Sensei()->question->get_question_type( $question_id );
+		$question_type = Sensei()->question->get_question_type($question_id);
 
-		$question_cat_list = strip_tags( get_the_term_list( $question_id, 'question-category', '', ', ', '' ) );
+		$question_cat_list = strip_tags(get_the_term_list($question_id, 'question-category', '', ', ', ''));
 
-		$html .= '<tr class="' . esc_attr( $existing_class ) . '">
-					<td class="cb"><input type="checkbox" value="' . $question_id . '" class="existing-item" /></td>
-					<td>' . get_the_title( $question_id ) . '</td>
-					<td>' . esc_html( $question_type ) . '</td>
-					<td>' . esc_html( $question_cat_list ) . '</td>
+		$html .= '<tr class="'.esc_attr($existing_class).'">
+					<td class="cb"><input type="checkbox" value="' . $question_id.'" class="existing-item" /></td>
+					<td>' . get_the_title($question_id).'</td>
+					<td>' . esc_html($question_type).'</td>
+					<td>' . esc_html($question_cat_list).'</td>
 				  </tr>';
 
 		return $html;
@@ -1244,58 +1244,58 @@ 
 
 		//Add nonce security to the request
 		$nonce = '';
-		if( isset( $_POST['filter_existing_questions_nonce'] ) ) {
-			$nonce = esc_html( $_POST['filter_existing_questions_nonce'] );
+		if (isset($_POST['filter_existing_questions_nonce'])) {
+			$nonce = esc_html($_POST['filter_existing_questions_nonce']);
 		} // End If Statement
 
-		if( ! wp_verify_nonce( $nonce, 'filter_existing_questions_nonce' ) ) {
-			die( $return );
+		if ( ! wp_verify_nonce($nonce, 'filter_existing_questions_nonce')) {
+			die($return);
 		} // End If Statement
 
 		// Parse POST data
 		$data = $_POST['data'];
 		$question_data = array();
-		parse_str( $data, $question_data );
+		parse_str($data, $question_data);
 
-		if( 0 < count( $question_data ) ) {
+		if (0 < count($question_data)) {
 
 			$question_status = '';
-			if( isset( $question_data['question_status'] ) ) {
+			if (isset($question_data['question_status'])) {
 				$question_status = $question_data['question_status'];
 			}
 
 			$question_type = '';
-			if( isset( $question_data['question_type'] ) ) {
+			if (isset($question_data['question_type'])) {
 				$question_type = $question_data['question_type'];
 			}
 
 			$question_category = '';
-			if( isset( $question_data['question_category'] ) ) {
+			if (isset($question_data['question_category'])) {
 				$question_category = $question_data['question_category'];
 			}
 
 			$question_search = '';
-			if( isset( $question_data['question_search'] ) ) {
+			if (isset($question_data['question_search'])) {
 				$question_search = $question_data['question_search'];
 			}
 
 			$question_page = 1;
-			if( isset( $question_data['question_page'] ) ) {
-				$question_page = intval( $question_data['question_page'] );
+			if (isset($question_data['question_page'])) {
+				$question_page = intval($question_data['question_page']);
 			}
 
-			$questions = $this->quiz_panel_get_existing_questions( $question_status, $question_type, $question_category, $question_search, $question_page );
+			$questions = $this->quiz_panel_get_existing_questions($question_status, $question_type, $question_category, $question_search, $question_page);
 
 			$row = 1;
 			$html = '';
-			foreach( $questions['questions'] as $question ) {
-				$html .= $this->quiz_panel_add_existing_question( $question->ID, $row );
+			foreach ($questions['questions'] as $question) {
+				$html .= $this->quiz_panel_add_existing_question($question->ID, $row);
 				++$row;
 			}
 
-			if( ! $html ) {
+			if ( ! $html) {
 				$html = '<tr class="alternate">
-								<td class="no-results" colspan="4"><em>' . __( 'There are no questions matching your search.', 'woothemes-sensei' ) . '</em></td>
+								<td class="no-results" colspan="4"><em>' . __('There are no questions matching your search.', 'woothemes-sensei').'</em></td>
 							  </tr>';
 			}
 
@@ -1303,53 +1303,53 @@ 
 			$return['count'] = $questions['count'];
 			$return['page'] = $questions['page'];
 
-			wp_send_json( $return );
+			wp_send_json($return);
 		}
 
-		die( $return );
+		die($return);
 	}
 
-	public function quiz_panel_question_field( $question_type = '', $question_id = 0, $question_counter = 0 ) {
+	public function quiz_panel_question_field($question_type = '', $question_id = 0, $question_counter = 0) {
 
 		$html = '';
 
-		if( $question_type ) {
+		if ($question_type) {
 
 			$right_answer = '';
 			$wrong_answers = array();
 			$answer_order_string = '';
 			$answer_order = array();
-			if( $question_id ) {
-				$right_answer = get_post_meta( $question_id, '_question_right_answer', true);
-				$wrong_answers = get_post_meta( $question_id, '_question_wrong_answers', true);
-				$answer_order_string = get_post_meta( $question_id, '_answer_order', true );
-				$answer_order = array_filter( explode( ',', $answer_order_string ) );
+			if ($question_id) {
+				$right_answer = get_post_meta($question_id, '_question_right_answer', true);
+				$wrong_answers = get_post_meta($question_id, '_question_wrong_answers', true);
+				$answer_order_string = get_post_meta($question_id, '_answer_order', true);
+				$answer_order = array_filter(explode(',', $answer_order_string));
 				$question_class = '';
 			} else {
 				$question_id = '';
 				$question_class = 'answer-fields question_required_fields hidden';
 			}
 
-			switch ( $question_type ) {
+			switch ($question_type) {
 				case 'multiple-choice':
-					$html .= '<div class="question_default_fields multiple-choice-answers ' . str_replace( ' hidden', '', $question_class ) . '">';
+					$html .= '<div class="question_default_fields multiple-choice-answers '.str_replace(' hidden', '', $question_class).'">';
 
 						$right_answers = (array) $right_answer;
 						// Calculate total right answers available (defaults to 1)
 						$total_right = 0;
-						if( $question_id ) {
-							$total_right = get_post_meta( $question_id, '_right_answer_count', true );
+						if ($question_id) {
+							$total_right = get_post_meta($question_id, '_right_answer_count', true);
 						}
-						if( 0 == intval( $total_right ) ) {
+						if (0 == intval($total_right)) {
 							$total_right = 1;
 						}
-						for ( $i = 0; $i < $total_right; $i++ ) {
-							if ( !isset( $right_answers[ $i ] ) ) { $right_answers[ $i ] = ''; }
-							$right_answer_id = $this->get_answer_id( $right_answers[ $i ] );
+						for ($i = 0; $i < $total_right; $i++) {
+							if ( ! isset($right_answers[$i])) { $right_answers[$i] = ''; }
+							$right_answer_id = $this->get_answer_id($right_answers[$i]);
 							// Right Answer
-							$right_answer = '<label class="answer" for="question_' . $question_counter . '_right_answer_' . $i . '"><span>' . __( 'Right:' , 'woothemes-sensei' ) . '</span> <input rel="' . esc_attr( $right_answer_id ) . '" type="text" id="question_' . $question_counter . '_right_answer_' . $i . '" name="question_right_answers[]" value="' . esc_attr( $right_answers[ $i ] ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
-							if( $question_id ) {
-								$answers[ $right_answer_id ] = $right_answer;
+							$right_answer = '<label class="answer" for="question_'.$question_counter.'_right_answer_'.$i.'"><span>'.__('Right:', 'woothemes-sensei').'</span> <input rel="'.esc_attr($right_answer_id).'" type="text" id="question_'.$question_counter.'_right_answer_'.$i.'" name="question_right_answers[]" value="'.esc_attr($right_answers[$i]).'" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
+							if ($question_id) {
+								$answers[$right_answer_id] = $right_answer;
 							} else {
 								$answers[] = $right_answer;
 							}
@@ -1357,23 +1357,23 @@ 
 
 				    	// Calculate total wrong answers available (defaults to 4)
 				    	$total_wrong = 0;
-				    	if( $question_id ) {
-				    		$total_wrong = get_post_meta( $question_id, '_wrong_answer_count', true );
+				    	if ($question_id) {
+				    		$total_wrong = get_post_meta($question_id, '_wrong_answer_count', true);
 				    	}
-				    	if( 0 == intval( $total_wrong ) ) {
+				    	if (0 == intval($total_wrong)) {
 				    		$total_wrong = 1;
 				    	}
 
                         // Setup Wrong Answer HTML
-                        foreach ( $wrong_answers as $i => $answer ){
+                        foreach ($wrong_answers as $i => $answer) {
 
-                            $answer_id = $this->get_answer_id( $answer );
-                            $wrong_answer = '<label class="answer" for="question_' . $question_counter . '_wrong_answer_' . $i . '"><span>' . __( 'Wrong:' , 'woothemes-sensei' ) ;
-                            $wrong_answer .= '</span> <input rel="' . esc_attr( $answer_id ) . '" type="text" id="question_' . $question_counter . '_wrong_answer_' . $i ;
-                            $wrong_answer .= '" name="question_wrong_answers[]" value="' . esc_attr( $answer ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
-                            if( $question_id ) {
+                            $answer_id = $this->get_answer_id($answer);
+                            $wrong_answer = '<label class="answer" for="question_'.$question_counter.'_wrong_answer_'.$i.'"><span>'.__('Wrong:', 'woothemes-sensei');
+                            $wrong_answer .= '</span> <input rel="'.esc_attr($answer_id).'" type="text" id="question_'.$question_counter.'_wrong_answer_'.$i;
+                            $wrong_answer .= '" name="question_wrong_answers[]" value="'.esc_attr($answer).'" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>';
+                            if ($question_id) {
 
-                                $answers[ $answer_id ] = $wrong_answer;
+                                $answers[$answer_id] = $wrong_answer;
 
                             } else {
 
@@ -1384,115 +1384,115 @@ 
                         } // end for each
 
 				    	$answers_sorted = $answers;
-				    	if( $question_id && count( $answer_order ) > 0 ) {
+				    	if ($question_id && count($answer_order) > 0) {
 				    		$answers_sorted = array();
-				    		foreach( $answer_order as $answer_id ) {
-				    			if( isset( $answers[ $answer_id ] ) ) {
-				    				$answers_sorted[ $answer_id ] = $answers[ $answer_id ];
-				    				unset( $answers[ $answer_id ] );
+				    		foreach ($answer_order as $answer_id) {
+				    			if (isset($answers[$answer_id])) {
+				    				$answers_sorted[$answer_id] = $answers[$answer_id];
+				    				unset($answers[$answer_id]);
 				    			}
 				    		}
 
-				    		if( count( $answers ) > 0 ) {
-						    	foreach( $answers as $id => $answer ) {
-						    		$answers_sorted[ $id ] = $answer;
+				    		if (count($answers) > 0) {
+						    	foreach ($answers as $id => $answer) {
+						    		$answers_sorted[$id] = $answer;
 						    	}
 						    }
 				    	}
 
-						foreach( $answers_sorted as $id => $answer ) {
+						foreach ($answers_sorted as $id => $answer) {
 				    		$html .= $answer;
 				    	}
 
-				    	$html .= '<input type="hidden" class="answer_order" name="answer_order" value="' . $answer_order_string . '" />';
-				    	$html .= '<span class="hidden right_answer_count">' . $total_right . '</span>';
-				    	$html .= '<span class="hidden wrong_answer_count">' . $total_wrong . '</span>';
+				    	$html .= '<input type="hidden" class="answer_order" name="answer_order" value="'.$answer_order_string.'" />';
+				    	$html .= '<span class="hidden right_answer_count">'.$total_right.'</span>';
+				    	$html .= '<span class="hidden wrong_answer_count">'.$total_wrong.'</span>';
 
 				    	$html .= '<div class="add_answer_options">';
-					    	$html .= '<a class="add_right_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add right answer', 'woothemes-sensei' ) . '</a>';
-					    	$html .= '<a class="add_wrong_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add wrong answer', 'woothemes-sensei' ) . '</a>';
+					    	$html .= '<a class="add_right_answer_option add_answer_option button" rel="'.$question_counter.'">'.__('Add right answer', 'woothemes-sensei').'</a>';
+					    	$html .= '<a class="add_wrong_answer_option add_answer_option button" rel="'.$question_counter.'">'.__('Add wrong answer', 'woothemes-sensei').'</a>';
 				    	$html .= '</div>';
 
-                        $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id , 'multiple-choice' );
+                        $html .= $this->quiz_panel_question_feedback($question_counter, $question_id, 'multiple-choice');
 
 			    	$html .= '</div>';
 				break;
 				case 'boolean':
-					$html .= '<div class="question_boolean_fields ' . $question_class . '">';
-						if( $question_id ) {
-							$field_name = 'question_' . $question_id . '_right_answer_boolean';
+					$html .= '<div class="question_boolean_fields '.$question_class.'">';
+						if ($question_id) {
+							$field_name = 'question_'.$question_id.'_right_answer_boolean';
 						} else {
 							$field_name = 'question_right_answer_boolean';
 							$right_answer = 'true';
 						}
-						$html .= '<label for="question_' . $question_id . '_boolean_true"><input id="question_' . $question_id . '_boolean_true" type="radio" name="' . $field_name . '" value="true" '. checked( $right_answer, 'true', false ) . ' /> ' . __( 'True', 'woothemes-sensei' ) . '</label>';
-						$html .= '<label for="question_' . $question_id . '_boolean_false"><input id="question_' . $question_id . '_boolean_false" type="radio" name="' . $field_name . '" value="false" '. checked( $right_answer, 'false', false ) . ' /> ' . __( 'False', 'woothemes-sensei' ) . '</label>';
+						$html .= '<label for="question_'.$question_id.'_boolean_true"><input id="question_'.$question_id.'_boolean_true" type="radio" name="'.$field_name.'" value="true" '.checked($right_answer, 'true', false).' /> '.__('True', 'woothemes-sensei').'</label>';
+						$html .= '<label for="question_'.$question_id.'_boolean_false"><input id="question_'.$question_id.'_boolean_false" type="radio" name="'.$field_name.'" value="false" '.checked($right_answer, 'false', false).' /> '.__('False', 'woothemes-sensei').'</label>';
 
-                    $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id, 'boolean' );
+                    $html .= $this->quiz_panel_question_feedback($question_counter, $question_id, 'boolean');
 
 					$html .= '</div>';
 				break;
 				case 'gap-fill':
-					$gapfill_array = explode( '||', $right_answer );
-					if ( isset( $gapfill_array[0] ) ) { $gapfill_pre = $gapfill_array[0]; } else { $gapfill_pre = ''; }
-					if ( isset( $gapfill_array[1] ) ) { $gapfill_gap = $gapfill_array[1]; } else { $gapfill_gap = ''; }
-					if ( isset( $gapfill_array[2] ) ) { $gapfill_post = $gapfill_array[2]; } else { $gapfill_post = ''; }
-					$html .= '<div class="question_gapfill_fields ' . $question_class . '">';
+					$gapfill_array = explode('||', $right_answer);
+					if (isset($gapfill_array[0])) { $gapfill_pre = $gapfill_array[0]; } else { $gapfill_pre = ''; }
+					if (isset($gapfill_array[1])) { $gapfill_gap = $gapfill_array[1]; } else { $gapfill_gap = ''; }
+					if (isset($gapfill_array[2])) { $gapfill_post = $gapfill_array[2]; } else { $gapfill_post = ''; }
+					$html .= '<div class="question_gapfill_fields '.$question_class.'">';
 						// Fill in the Gaps
-						$html .= '<label>' . __( 'Text before the Gap:' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_pre" name="add_question_right_answer_gapfill_pre" value="' . $gapfill_pre . '" size="25" class="widefat gapfill-field" />';
-	  					$html .= '<label>' . __( 'The Gap:' , 'woothemes-sensei' ) . '</label> ';
-	  					$html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_gap" name="add_question_right_answer_gapfill_gap" value="' . $gapfill_gap . '" size="25" class="widefat gapfill-field" />';
-	  					$html .= '<label>' . __( 'Text after the Gap:' , 'woothemes-sensei' ) . '</label> ';
-	  					$html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_post" name="add_question_right_answer_gapfill_post" value="' . $gapfill_post . '" size="25" class="widefat gapfill-field" />';
-	  					$html .= '<label>' . __( 'Preview:' , 'woothemes-sensei' ) . '</label> ';
-	  					$html .= '<p class="gapfill-preview">' . $gapfill_pre . '&nbsp;<u>' . $gapfill_gap . '</u>&nbsp;' . $gapfill_post . '</p>';
+						$html .= '<label>'.__('Text before the Gap:', 'woothemes-sensei').'</label> ';
+						$html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_pre" name="add_question_right_answer_gapfill_pre" value="'.$gapfill_pre.'" size="25" class="widefat gapfill-field" />';
+	  					$html .= '<label>'.__('The Gap:', 'woothemes-sensei').'</label> ';
+	  					$html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_gap" name="add_question_right_answer_gapfill_gap" value="'.$gapfill_gap.'" size="25" class="widefat gapfill-field" />';
+	  					$html .= '<label>'.__('Text after the Gap:', 'woothemes-sensei').'</label> ';
+	  					$html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_post" name="add_question_right_answer_gapfill_post" value="'.$gapfill_post.'" size="25" class="widefat gapfill-field" />';
+	  					$html .= '<label>'.__('Preview:', 'woothemes-sensei').'</label> ';
+	  					$html .= '<p class="gapfill-preview">'.$gapfill_pre.'&nbsp;<u>'.$gapfill_gap.'</u>&nbsp;'.$gapfill_post.'</p>';
 	  				$html .= '</div>';
 				break;
 				case 'multi-line':
-					$html .= '<div class="question_multiline_fields ' . $question_class . '">';
+					$html .= '<div class="question_multiline_fields '.$question_class.'">';
 						// Guides for grading
-						if( $question_counter ) {
-							$field_id = 'question_' . $question_counter . '_add_question_right_answer_multiline';
+						if ($question_counter) {
+							$field_id = 'question_'.$question_counter.'_add_question_right_answer_multiline';
 						} else {
 							$field_id = 'add_question_right_answer_multiline';
 						}
-						$html .= '<label>' . __( 'Guide/Teacher Notes for grading the answer' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<textarea id="' . $field_id . '" name="add_question_right_answer_multiline" rows="4" cols="40" class="widefat">' . $right_answer . '</textarea>';
+						$html .= '<label>'.__('Guide/Teacher Notes for grading the answer', 'woothemes-sensei').'</label> ';
+						$html .= '<textarea id="'.$field_id.'" name="add_question_right_answer_multiline" rows="4" cols="40" class="widefat">'.$right_answer.'</textarea>';
 					$html .= '</div>';
 				break;
 				case 'single-line':
-					$html .= '<div class="question_singleline_fields ' . $question_class . '">';
+					$html .= '<div class="question_singleline_fields '.$question_class.'">';
 						// Recommended Answer
-						if( $question_counter ) {
-							$field_id = 'question_' . $question_counter . '_add_question_right_answer_singleline';
+						if ($question_counter) {
+							$field_id = 'question_'.$question_counter.'_add_question_right_answer_singleline';
 						} else {
 							$field_id = 'add_question_right_answer_singleline';
 						}
-						$html .= '<label>' . __( 'Recommended Answer' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<input type="text" id="' . $field_id . '" name="add_question_right_answer_singleline" value="' . $right_answer . '" size="25" class="widefat" />';
+						$html .= '<label>'.__('Recommended Answer', 'woothemes-sensei').'</label> ';
+						$html .= '<input type="text" id="'.$field_id.'" name="add_question_right_answer_singleline" value="'.$right_answer.'" size="25" class="widefat" />';
 					$html .= '</div>';
 				break;
 				case 'file-upload':
-					$html .= '<div class="question_fileupload_fields ' . $question_class . '">';
-						if( $question_counter ) {
-							$right_field_id = 'question_' . $question_counter . '_add_question_right_answer_fileupload';
-							$wrong_field_id = 'question_' . $question_counter . '_add_question_wrong_answer_fileupload';
+					$html .= '<div class="question_fileupload_fields '.$question_class.'">';
+						if ($question_counter) {
+							$right_field_id = 'question_'.$question_counter.'_add_question_right_answer_fileupload';
+							$wrong_field_id = 'question_'.$question_counter.'_add_question_wrong_answer_fileupload';
 						} else {
 							$right_field_id = 'add_question_right_answer_fileupload';
 							$wrong_field_id = 'add_question_wrong_answer_fileupload';
 						}
 
 						$wrong_answer = '';
-						if( isset( $wrong_answers[0] ) ) {
+						if (isset($wrong_answers[0])) {
 							$wrong_answer = $wrong_answers[0];
 						}
-						$html .= '<label>' . __( 'Description for student explaining what needs to be uploaded' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<textarea id="' . $wrong_field_id . '" name="add_question_wrong_answer_fileupload" rows="4" cols="40" class="widefat">' . $wrong_answer . '</textarea>';
+						$html .= '<label>'.__('Description for student explaining what needs to be uploaded', 'woothemes-sensei').'</label> ';
+						$html .= '<textarea id="'.$wrong_field_id.'" name="add_question_wrong_answer_fileupload" rows="4" cols="40" class="widefat">'.$wrong_answer.'</textarea>';
 
 						// Guides for grading
-						$html .= '<label>' . __( 'Guide/Teacher Notes for grading the upload' , 'woothemes-sensei' ) . '</label> ';
-						$html .= '<textarea id="' . $right_field_id . '" name="add_question_right_answer_fileupload" rows="4" cols="40" class="widefat">' . $right_answer . '</textarea>';
+						$html .= '<label>'.__('Guide/Teacher Notes for grading the upload', 'woothemes-sensei').'</label> ';
+						$html .= '<textarea id="'.$right_field_id.'" name="add_question_right_answer_fileupload" rows="4" cols="40" class="widefat">'.$right_answer.'</textarea>';
 					$html .= '</div>';
 				break;
 			}
@@ -1501,32 +1501,32 @@ 
 		return $html;
 	}
 
-	public function quiz_panel_question_feedback( $question_counter = 0, $question_id = 0, $question_type = '' ) {
+	public function quiz_panel_question_feedback($question_counter = 0, $question_id = 0, $question_type = '') {
 
         // default field name
         $field_name = 'answer_feedback';
-        if( 'boolean' == $question_type ){
+        if ('boolean' == $question_type) {
 
             $field_name = 'answer_feedback_boolean';
 
-        }elseif( 'multiple-choice' == $question_type ){
+        }elseif ('multiple-choice' == $question_type) {
 
             $field_name = 'answer_feedback_multiple_choice';
 
         }// end if
 
-		if( $question_counter ) {
-			$field_name = 'answer_' . $question_counter . '_feedback';
+		if ($question_counter) {
+			$field_name = 'answer_'.$question_counter.'_feedback';
 		}
 
 		$feedback = '';
-		if( $question_id ) {
-			$feedback = get_post_meta( $question_id, '_answer_feedback', true );
+		if ($question_id) {
+			$feedback = get_post_meta($question_id, '_answer_feedback', true);
 		}
 
-		$html = '<p title="' . __( 'This feedback will be automatically displayed to the student once they have completed the quiz.', 'woothemes-sensei' ) . '">';
-		$html .= '<label for="' . $field_name . '">' . __( 'Answer Feedback' , 'woothemes-sensei' ) . ':</label>';
-		$html .= '<textarea id="' . $field_name . '" name="' . $field_name . '" rows="4" cols="40" class="answer_feedback widefat">' . $feedback . '</textarea>';
+		$html = '<p title="'.__('This feedback will be automatically displayed to the student once they have completed the quiz.', 'woothemes-sensei').'">';
+		$html .= '<label for="'.$field_name.'">'.__('Answer Feedback', 'woothemes-sensei').':</label>';
+		$html .= '<textarea id="'.$field_name.'" name="'.$field_name.'" rows="4" cols="40" class="answer_feedback widefat">'.$feedback.'</textarea>';
 		$html .= '</p>';
 
 		return $html;
@@ -1535,19 +1535,19 @@ 
 	public function question_get_answer_id() {
 		$data = $_POST['data'];
 		$answer_data = array();
-		parse_str( $data, $answer_data );
+		parse_str($data, $answer_data);
 		$answer = $answer_data['answer_value'];
-		$answer_id = $this->get_answer_id( $answer );
+		$answer_id = $this->get_answer_id($answer);
 		echo $answer_id;
 		die();
 	}
 
-	public function get_answer_id( $answer = '' ) {
+	public function get_answer_id($answer = '') {
 
 		$answer_id = '';
 
-		if( $answer ) {
-			$answer_id = md5( $answer );
+		if ($answer) {
+			$answer_id = md5($answer);
 		}
 
 		return $answer_id;
@@ -1560,17 +1560,17 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_quiz_meta_box_content () {
+	public function lesson_quiz_meta_box_content() {
 		global $post;
 
 		// Get quiz panel
 		$quiz_id = 0;
 		$quizzes = array();
-		if ( 0 < $post->ID ) {
-			$quiz_id = $this->lesson_quizzes( $post->ID, 'any' );
+		if (0 < $post->ID) {
+			$quiz_id = $this->lesson_quizzes($post->ID, 'any');
 		}
 
-		echo $this->quiz_panel( $quiz_id );
+		echo $this->quiz_panel($quiz_id);
 
 	} // End lesson_quiz_meta_box_content()
 
@@ -1587,53 +1587,53 @@ 
 		$quiz_id = 0;
 		$lesson_id = $post->ID;
 		$quizzes = array();
-		if ( 0 < $lesson_id ) {
-			$quiz_id = $this->lesson_quizzes( $lesson_id, 'any' );
+		if (0 < $lesson_id) {
+			$quiz_id = $this->lesson_quizzes($lesson_id, 'any');
 		}
 
-		if( $quiz_id ) {
-			$html .= $this->quiz_settings_panel( $lesson_id, $quiz_id );
+		if ($quiz_id) {
+			$html .= $this->quiz_settings_panel($lesson_id, $quiz_id);
 		} else {
-			$html .= '<p><em>' . __( 'There is no quiz for this lesson yet - please add one in the \'Quiz Questions\' box.', 'woothemes-sensei' ) . '</em></p>';
+			$html .= '<p><em>'.__('There is no quiz for this lesson yet - please add one in the \'Quiz Questions\' box.', 'woothemes-sensei').'</em></p>';
 		}
 
 		echo $html;
 	}
 
-	public function quiz_settings_panel( $lesson_id = 0, $quiz_id = 0 ) {
+	public function quiz_settings_panel($lesson_id = 0, $quiz_id = 0) {
 
 
 		$html = '';
 
-		if( ! $lesson_id && ! $quiz_id ) return $html;
+		if ( ! $lesson_id && ! $quiz_id) return $html;
 
-		$settings = $this->get_quiz_settings( $quiz_id );
+		$settings = $this->get_quiz_settings($quiz_id);
 
-		$html = Sensei()->admin->render_settings( $settings, $quiz_id, 'quiz-settings' );
+		$html = Sensei()->admin->render_settings($settings, $quiz_id, 'quiz-settings');
 
 		return $html;
 
 	}
 
-	public function get_quiz_settings( $quiz_id = 0 ) {
+	public function get_quiz_settings($quiz_id = 0) {
 
 		$disable_passmark = '';
-		$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-		if( ! $pass_required ) {
+		$pass_required = get_post_meta($quiz_id, '_pass_required', true);
+		if ( ! $pass_required) {
 			$disable_passmark = 'hidden';
 		}
 
 		// Setup Questions Query
 		$questions = array();
-		if ( 0 < $quiz_id ) {
-			$questions = $this->lesson_quiz_questions( $quiz_id );
+		if (0 < $quiz_id) {
+			$questions = $this->lesson_quiz_questions($quiz_id);
 		}
 
 		// Count questions
 		$question_count = 0;
-		foreach( $questions as $question ) {
-			if( $question->post_type == 'multiple_question' ) {
-				$question_number = get_post_meta( $question->ID, 'number', true );
+		foreach ($questions as $question) {
+			if ($question->post_type == 'multiple_question') {
+				$question_number = get_post_meta($question->ID, 'number', true);
 				$question_count += $question_number;
 			} else {
 				++$question_count;
@@ -1643,15 +1643,15 @@ 
 		$settings = array(
 			array(
 				'id' 			=> 'pass_required',
-				'label'			=> __( 'Pass required to complete lesson', 'woothemes-sensei' ),
-				'description'	=> __( 'The passmark must be achieved before the lesson is complete.', 'woothemes-sensei' ),
+				'label'			=> __('Pass required to complete lesson', 'woothemes-sensei'),
+				'description'	=> __('The passmark must be achieved before the lesson is complete.', 'woothemes-sensei'),
 				'type'			=> 'checkbox',
 				'default'		=> '',
 				'checked'		=> 'on',
 			),
 			array(
 				'id' 			=> 'quiz_passmark',
-				'label'			=> __( 'Quiz passmark percentage', 'woothemes-sensei' ),
+				'label'			=> __('Quiz passmark percentage', 'woothemes-sensei'),
 				'description'	=> '',
 				'type'			=> 'number',
 				'default'		=> 0,
@@ -1662,17 +1662,17 @@ 
 			),
 			array(
 				'id' 			=> 'show_questions',
-				'label'			=> __( 'Number of questions to show', 'woothemes-sensei' ),
-				'description'	=> __( 'Show a random selection of questions from this quiz each time a student views it.', 'woothemes-sensei' ),
+				'label'			=> __('Number of questions to show', 'woothemes-sensei'),
+				'description'	=> __('Show a random selection of questions from this quiz each time a student views it.', 'woothemes-sensei'),
 				'type'			=> 'number',
 				'default'		=> '',
-				'placeholder'	=> __( 'All', 'woothemes-sensei' ),
+				'placeholder'	=> __('All', 'woothemes-sensei'),
 				'min'			=> 1,
 				'max'			=> $question_count,
 			),
 			array(
 				'id' 			=> 'random_question_order',
-				'label'			=> __( 'Randomise question order', 'woothemes-sensei' ),
+				'label'			=> __('Randomise question order', 'woothemes-sensei'),
 				'description'	=> '',
 				'type'			=> 'checkbox',
 				'default'		=> 'no',
@@ -1680,23 +1680,23 @@ 
 			),
 			array(
 				'id' 			=> 'quiz_grade_type',
-				'label'			=> __( 'Grade quiz automatically', 'woothemes-sensei' ),
-				'description'	=> __( 'Grades quiz and displays answer explanation immediately after completion. Only applicable if quiz is limited to Multiple Choice, True/False and Gap Fill questions. Questions that have a grade of zero are skipped during autograding.', 'woothemes-sensei' ),
+				'label'			=> __('Grade quiz automatically', 'woothemes-sensei'),
+				'description'	=> __('Grades quiz and displays answer explanation immediately after completion. Only applicable if quiz is limited to Multiple Choice, True/False and Gap Fill questions. Questions that have a grade of zero are skipped during autograding.', 'woothemes-sensei'),
 				'type'			=> 'checkbox',
 				'default'		=> 'auto',
 				'checked'		=> 'auto',
 			),
 			array(
 				'id' 			=> 'enable_quiz_reset',
-				'label'			=> __( 'Allow user to retake the quiz', 'woothemes-sensei' ),
-				'description'	=> __( 'Enables the quiz reset button.', 'woothemes-sensei' ),
+				'label'			=> __('Allow user to retake the quiz', 'woothemes-sensei'),
+				'description'	=> __('Enables the quiz reset button.', 'woothemes-sensei'),
 				'type'			=> 'checkbox',
 				'default'		=> '',
 				'checked'		=> 'on',
 			),
 		);
 
-		return apply_filters( 'sensei_quiz_settings', $settings );
+		return apply_filters('sensei_quiz_settings', $settings);
 	}
 
 	/**
@@ -1705,38 +1705,38 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function enqueue_scripts( $hook ) {
+	public function enqueue_scripts($hook) {
 		global  $post_type;
 
-		$allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question' ) );
-		$allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) );
-		$allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order' ) );
+		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question'));
+		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php'));
+		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order'));
 
 		// Test for Write Panel Pages
-		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
+		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) {
 
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+			$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 			// Load the lessons script
             wp_enqueue_media();
-			wp_enqueue_script( 'sensei-lesson-metadata', Sensei()->plugin_url . 'assets/js/lesson-metadata' . $suffix . '.js', array( 'jquery', 'sensei-core-select2' ,'jquery-ui-sortable' ), Sensei()->version, true );
-			wp_enqueue_script( 'sensei-lesson-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
-			wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-lesson-chosen' ), Sensei()->version, true );
+			wp_enqueue_script('sensei-lesson-metadata', Sensei()->plugin_url.'assets/js/lesson-metadata'.$suffix.'.js', array('jquery', 'sensei-core-select2', 'jquery-ui-sortable'), Sensei()->version, true);
+			wp_enqueue_script('sensei-lesson-chosen', Sensei()->plugin_url.'assets/chosen/chosen.jquery'.$suffix.'.js', array('jquery'), Sensei()->version, true);
+			wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery'.$suffix.'.js', array('jquery', 'sensei-lesson-chosen'), Sensei()->version, true);
 
             // Load the bulk edit screen script
-            if( 'edit.php' == $hook && 'lesson'==$_GET['post_type'] ) {
-                wp_enqueue_script( 'sensei-lessons-bulk-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-bulk-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
+            if ('edit.php' == $hook && 'lesson' == $_GET['post_type']) {
+                wp_enqueue_script('sensei-lessons-bulk-edit', Sensei()->plugin_url.'assets/js/admin/lesson-bulk-edit'.$suffix.'.js', array('jquery'), Sensei()->version, true);
             }
 
 			// Localise script
-			$translation_strings = array( 'right_colon' => __( 'Right:', 'woothemes-sensei' ), 'wrong_colon' => __( 'Wrong:', 'woothemes-sensei' ), 'add_file' => __( 'Add file', 'woothemes-sensei' ), 'change_file' => __( 'Change file', 'woothemes-sensei' ), 'confirm_remove' => __( 'Are you sure you want to remove this question?', 'woothemes-sensei' ), 'confirm_remove_multiple' => __( 'Are you sure you want to remove these questions?', 'woothemes-sensei' ), 'too_many_for_cat' => __( 'You have selected more questions than this category contains - please reduce the number of questions that you are adding.', 'woothemes-sensei' ) );
-			$ajax_vars = array( 'lesson_update_question_nonce' => wp_create_nonce( 'lesson_update_question_nonce' ), 'lesson_add_course_nonce' => wp_create_nonce( 'lesson_add_course_nonce' ), 'lesson_update_grade_type_nonce' => wp_create_nonce( 'lesson_update_grade_type_nonce' ), 'lesson_update_question_order_nonce' => wp_create_nonce( 'lesson_update_question_order_nonce' ), 'lesson_update_question_order_random_nonce' => wp_create_nonce( 'lesson_update_question_order_random_nonce' ), 'lesson_add_multiple_questions_nonce' => wp_create_nonce( 'lesson_add_multiple_questions_nonce' ), 'lesson_remove_multiple_questions_nonce' => wp_create_nonce( 'lesson_remove_multiple_questions_nonce' ), 'lesson_add_existing_questions_nonce' => wp_create_nonce( 'lesson_add_existing_questions_nonce' ), 'filter_existing_questions_nonce' => wp_create_nonce( 'filter_existing_questions_nonce' ) );
-			$data = array_merge( $translation_strings, $ajax_vars );
-			wp_localize_script( 'sensei-lesson-metadata', 'woo_localized_data', $data );
+			$translation_strings = array('right_colon' => __('Right:', 'woothemes-sensei'), 'wrong_colon' => __('Wrong:', 'woothemes-sensei'), 'add_file' => __('Add file', 'woothemes-sensei'), 'change_file' => __('Change file', 'woothemes-sensei'), 'confirm_remove' => __('Are you sure you want to remove this question?', 'woothemes-sensei'), 'confirm_remove_multiple' => __('Are you sure you want to remove these questions?', 'woothemes-sensei'), 'too_many_for_cat' => __('You have selected more questions than this category contains - please reduce the number of questions that you are adding.', 'woothemes-sensei'));
+			$ajax_vars = array('lesson_update_question_nonce' => wp_create_nonce('lesson_update_question_nonce'), 'lesson_add_course_nonce' => wp_create_nonce('lesson_add_course_nonce'), 'lesson_update_grade_type_nonce' => wp_create_nonce('lesson_update_grade_type_nonce'), 'lesson_update_question_order_nonce' => wp_create_nonce('lesson_update_question_order_nonce'), 'lesson_update_question_order_random_nonce' => wp_create_nonce('lesson_update_question_order_random_nonce'), 'lesson_add_multiple_questions_nonce' => wp_create_nonce('lesson_add_multiple_questions_nonce'), 'lesson_remove_multiple_questions_nonce' => wp_create_nonce('lesson_remove_multiple_questions_nonce'), 'lesson_add_existing_questions_nonce' => wp_create_nonce('lesson_add_existing_questions_nonce'), 'filter_existing_questions_nonce' => wp_create_nonce('filter_existing_questions_nonce'));
+			$data = array_merge($translation_strings, $ajax_vars);
+			wp_localize_script('sensei-lesson-metadata', 'woo_localized_data', $data);
 
 			// Chosen RTL
-			if ( is_rtl() ) {
-				wp_enqueue_script( 'sensei-chosen-rtl', Sensei()->plugin_url . 'assets/chosen/chosen-rtl' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
+			if (is_rtl()) {
+				wp_enqueue_script('sensei-chosen-rtl', Sensei()->plugin_url.'assets/chosen/chosen-rtl'.$suffix.'.js', array('jquery'), Sensei()->version, true);
 			}
 
 		}
@@ -1750,16 +1750,16 @@ 
 	 * @since  1.4.0
 	 * @return void
 	 */
-	public function enqueue_styles ( $hook ) {
+	public function enqueue_styles($hook) {
 		global  $post_type;
 
-		$allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question', 'sensei_message' ) );
-		$allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) );
-		$allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings' ) );
+		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question', 'sensei_message'));
+		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php'));
+		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings'));
 
 		// Test for Write Panel Pages
-		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
-			wp_enqueue_style( 'woothemes-sensei-settings-api', esc_url( Sensei()->plugin_url . 'assets/css/settings.css' ), '', Sensei()->version );
+		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) {
+			wp_enqueue_style('woothemes-sensei-settings-api', esc_url(Sensei()->plugin_url.'assets/css/settings.css'), '', Sensei()->version);
 		}
 
 	} // End enqueue_styles()
@@ -1771,12 +1771,12 @@ 
 	 * @param  array $defaults
 	 * @return array $new_columns
 	 */
-	public function add_column_headings ( $defaults ) {
+	public function add_column_headings($defaults) {
 		$new_columns['cb'] = '<input type="checkbox" />';
-		$new_columns['title'] = _x( 'Lesson Title', 'column name', 'woothemes-sensei' );
-		$new_columns['lesson-course'] = _x( 'Course', 'column name', 'woothemes-sensei' );
-		$new_columns['lesson-prerequisite'] = _x( 'Pre-requisite Lesson', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['title'] = _x('Lesson Title', 'column name', 'woothemes-sensei');
+		$new_columns['lesson-course'] = _x('Course', 'column name', 'woothemes-sensei');
+		$new_columns['lesson-prerequisite'] = _x('Pre-requisite Lesson', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 		return $new_columns;
@@ -1790,23 +1790,23 @@ 
 	 * @param  int $id
 	 * @return void
 	 */
-	public function add_column_data ( $column_name, $id ) {
+	public function add_column_data($column_name, $id) {
 		global $wpdb, $post;
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'id':
 				echo $id;
 			break;
 			case 'lesson-course':
-				$lesson_course_id = get_post_meta( $id, '_lesson_course', true);
-				if ( 0 < absint( $lesson_course_id ) ) {
-					echo '<a href="' . esc_url( get_edit_post_link( absint( $lesson_course_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $lesson_course_id ) ) ) ) . '">' . get_the_title( absint( $lesson_course_id ) ) . '</a>';
+				$lesson_course_id = get_post_meta($id, '_lesson_course', true);
+				if (0 < absint($lesson_course_id)) {
+					echo '<a href="'.esc_url(get_edit_post_link(absint($lesson_course_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($lesson_course_id)))).'">'.get_the_title(absint($lesson_course_id)).'</a>';
 				} // End If Statement
 			break;
 			case 'lesson-prerequisite':
-				$lesson_prerequisite_id = get_post_meta( $id, '_lesson_prerequisite', true);
-				if ( 0 < absint( $lesson_prerequisite_id ) ) {
-					echo '<a href="' . esc_url( get_edit_post_link( absint( $lesson_prerequisite_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $lesson_prerequisite_id ) ) ) ) . '">' . get_the_title( absint( $lesson_prerequisite_id ) ) . '</a>';
+				$lesson_prerequisite_id = get_post_meta($id, '_lesson_prerequisite', true);
+				if (0 < absint($lesson_prerequisite_id)) {
+					echo '<a href="'.esc_url(get_edit_post_link(absint($lesson_prerequisite_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($lesson_prerequisite_id)))).'">'.get_the_title(absint($lesson_prerequisite_id)).'</a>';
 				} // End If Statement
 			break;
 			default:
@@ -1820,14 +1820,14 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_add_course () {
+	public function lesson_add_course() {
 		global $current_user;
 		//Add nonce security to the request
-		if ( isset($_POST['lesson_add_course_nonce']) ) {
-			$nonce = esc_html( $_POST['lesson_add_course_nonce'] );
+		if (isset($_POST['lesson_add_course_nonce'])) {
+			$nonce = esc_html($_POST['lesson_add_course_nonce']);
 		} // End If Statement
-		if ( ! wp_verify_nonce( $nonce, 'lesson_add_course_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_course_nonce')
+            || ! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 		// Parse POST data
@@ -1849,14 +1849,14 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lesson_update_question () {
+	public function lesson_update_question() {
 		global $current_user;
 		//Add nonce security to the request
-		if ( isset($_POST['lesson_update_question_nonce']) ) {
-			$nonce = esc_html( $_POST['lesson_update_question_nonce'] );
+		if (isset($_POST['lesson_update_question_nonce'])) {
+			$nonce = esc_html($_POST['lesson_update_question_nonce']);
 		} // End If Statement
-		if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_nonce' )
-            ||  ! current_user_can( 'edit_questions' )) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_question_nonce')
+            ||  ! current_user_can('edit_questions')) {
 
 			die('');
 
@@ -1866,30 +1866,30 @@ 
 		// WP slashes all incoming data regardless of Magic Quotes setting (see wp_magic_quotes()), which means that
 		// even the $_POST['data'] encoded with encodeURIComponent has it's apostrophes slashed.
 		// So first restore the original unslashed apostrophes by removing those slashes
-		$data = wp_unslash( $_POST['data'] );
+		$data = wp_unslash($_POST['data']);
 		// Then parse the string to an array (note that parse_str automatically urldecodes all the variables)
 		$question_data = array();
 		parse_str($data, $question_data);
 		// Finally re-slash all elements to ensure consistancy for lesson_save_question()
-		$question_data = wp_slash( $question_data );
+		$question_data = wp_slash($question_data);
 		// Save the question
 		$return = false;
 		// Question Save and Delete logic
-		if ( isset( $question_data['action'] ) && ( $question_data['action'] == 'delete' ) ) {
+		if (isset($question_data['action']) && ($question_data['action'] == 'delete')) {
 			// Delete the Question
 			$return = $this->lesson_delete_question($question_data);
 		} else {
 			// Save the Question
-			if ( isset( $question_data['quiz_id'] ) && ( 0 < absint( $question_data['quiz_id'] ) ) ) {
+			if (isset($question_data['quiz_id']) && (0 < absint($question_data['quiz_id']))) {
 				$current_user = wp_get_current_user();
 				$question_data['post_author'] = $current_user->ID;
-				$question_id = $this->lesson_save_question( $question_data );
-				$question_type = Sensei()->question->get_question_type( $question_id );
+				$question_id = $this->lesson_save_question($question_data);
+				$question_type = Sensei()->question->get_question_type($question_id);
 
-				$question_count = intval( $question_data['question_count'] );
+				$question_count = intval($question_data['question_count']);
 				++$question_count;
 
-				$return = $this->quiz_panel_question( $question_type, $question_count, $question_id );
+				$return = $this->quiz_panel_question($question_type, $question_count, $question_id);
 			} // End If Statement
 		} // End If Statement
 
@@ -1904,49 +1904,49 @@ 
 
 		//Add nonce security to the request
 		$nonce = '';
-		if( isset( $_POST['lesson_add_multiple_questions_nonce'] ) ) {
-			$nonce = esc_html( $_POST['lesson_add_multiple_questions_nonce'] );
+		if (isset($_POST['lesson_add_multiple_questions_nonce'])) {
+			$nonce = esc_html($_POST['lesson_add_multiple_questions_nonce']);
 		} // End If Statement
 
-		if( ! wp_verify_nonce( $nonce, 'lesson_add_multiple_questions_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
-			die( $return );
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_multiple_questions_nonce')
+            || ! current_user_can('edit_lessons')) {
+			die($return);
 		} // End If Statement
 
 		// Parse POST data
 		$data = $_POST['data'];
 		$question_data = array();
-		parse_str( $data, $question_data );
+		parse_str($data, $question_data);
 
-		if( is_array( $question_data ) ) {
-			if( isset( $question_data['quiz_id'] ) && ( 0 < absint( $question_data['quiz_id'] ) ) ) {
+		if (is_array($question_data)) {
+			if (isset($question_data['quiz_id']) && (0 < absint($question_data['quiz_id']))) {
 
-				$quiz_id = intval( $question_data['quiz_id'] );
-				$question_number = intval( $question_data['question_number'] );
-				$question_category = intval( $question_data['question_category'] );
+				$quiz_id = intval($question_data['quiz_id']);
+				$question_number = intval($question_data['question_number']);
+				$question_category = intval($question_data['question_category']);
 
-				$question_counter = intval( $question_data['question_count'] );
+				$question_counter = intval($question_data['question_count']);
 				++$question_counter;
 
-				$cat = get_term( $question_category, 'question-category' );
+				$cat = get_term($question_category, 'question-category');
 
 				$post_data = array(
 					'post_content' => '',
 					'post_status' => 'publish',
-					'post_title' => sprintf( __( '%1$s Question(s) from %2$s', 'woothemes-sensei' ), $question_number, $cat->name ),
+					'post_title' => sprintf(__('%1$s Question(s) from %2$s', 'woothemes-sensei'), $question_number, $cat->name),
 					'post_type' => 'multiple_question'
 				);
 
-				$multiple_id = wp_insert_post( $post_data );
+				$multiple_id = wp_insert_post($post_data);
 
-				if( $multiple_id && ! is_wp_error( $multiple_id ) ) {
-					add_post_meta( $multiple_id, 'category', $question_category );
-					add_post_meta( $multiple_id, 'number', $question_number );
-					add_post_meta( $multiple_id, '_quiz_id', $quiz_id, false );
-					add_post_meta( $multiple_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_counter );
-					$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-					update_post_meta( $lesson_id, '_quiz_has_questions', '1' );
-					$return = $this->quiz_panel_question( 'category', $question_counter, $multiple_id, 'quiz', array( $cat->name, $question_number ) );
+				if ($multiple_id && ! is_wp_error($multiple_id)) {
+					add_post_meta($multiple_id, 'category', $question_category);
+					add_post_meta($multiple_id, 'number', $question_number);
+					add_post_meta($multiple_id, '_quiz_id', $quiz_id, false);
+					add_post_meta($multiple_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_counter);
+					$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+					update_post_meta($lesson_id, '_quiz_has_questions', '1');
+					$return = $this->quiz_panel_question('category', $question_counter, $multiple_id, 'quiz', array($cat->name, $question_number));
 				}
 			}
 		}
@@ -1960,25 +1960,25 @@ 
 
 		//Add nonce security to the request
 		$nonce = '';
-		if( isset( $_POST['lesson_remove_multiple_questions_nonce'] ) ) {
-			$nonce = esc_html( $_POST['lesson_remove_multiple_questions_nonce'] );
+		if (isset($_POST['lesson_remove_multiple_questions_nonce'])) {
+			$nonce = esc_html($_POST['lesson_remove_multiple_questions_nonce']);
 		} // End If Statement
 
-		if( ! wp_verify_nonce( $nonce, 'lesson_remove_multiple_questions_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_remove_multiple_questions_nonce')
+        || ! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 
 		// Parse POST data
 		$data = $_POST['data'];
 		$question_data = array();
-		parse_str( $data, $question_data );
+		parse_str($data, $question_data);
 
-		if( is_array( $question_data ) ) {
-			wp_delete_post( $question_data['question_id'], true );
+		if (is_array($question_data)) {
+			wp_delete_post($question_data['question_id'], true);
 		}
 
-		die( 'Deleted' );
+		die('Deleted');
 	}
 
 	public function get_question_category_limit() {
@@ -1989,11 +1989,11 @@ 
 		// Parse POST data
 		$data = $_POST['data'];
 		$cat_data = array();
-		parse_str( $data, $cat_data );
+		parse_str($data, $cat_data);
 
-		if( isset( $cat_data['cat'] ) && '' != $cat_data['cat'] ) {
-			$cat = get_term( $cat_data['cat'], 'question-category' );
-			if( isset( $cat->count ) ) {
+		if (isset($cat_data['cat']) && '' != $cat_data['cat']) {
+			$cat = get_term($cat_data['cat'], 'question-category');
+			if (isset($cat->count)) {
 				$return = $cat->count;
 			}
 		}
@@ -2007,45 +2007,45 @@ 
 
 		//Add nonce security to the request
 		$nonce = '';
-		if( isset( $_POST['lesson_add_existing_questions_nonce'] ) ) {
-			$nonce = esc_html( $_POST['lesson_add_existing_questions_nonce'] );
+		if (isset($_POST['lesson_add_existing_questions_nonce'])) {
+			$nonce = esc_html($_POST['lesson_add_existing_questions_nonce']);
 		} // End If Statement
 
-		if( ! wp_verify_nonce( $nonce, 'lesson_add_existing_questions_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_existing_questions_nonce')
+        || ! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 
 		// Parse POST data
 		$data = $_POST['data'];
 		$question_data = array();
-		parse_str( $data, $question_data );
+		parse_str($data, $question_data);
 
 		$return = '';
 
-		if( is_array( $question_data ) ) {
+		if (is_array($question_data)) {
 
-			if( isset( $question_data['questions'] ) && '' != $question_data['questions'] ) {
+			if (isset($question_data['questions']) && '' != $question_data['questions']) {
 
-				$questions = explode( ',', trim( $question_data['questions'], ',' ) );
+				$questions = explode(',', trim($question_data['questions'], ','));
 				$quiz_id = $question_data['quiz_id'];
-				$question_count = intval( $question_data['question_count'] );
+				$question_count = intval($question_data['question_count']);
 
-				foreach( $questions as $question_id ) {
+				foreach ($questions as $question_id) {
 
 					++$question_count;
 
-					$quizzes = get_post_meta( $question_id, '_quiz_id', false );
-					if( ! in_array( $quiz_id, $quizzes ) ) {
-			    		add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
-						$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-						update_post_meta( $lesson_id, '_quiz_has_questions', '1' );
+					$quizzes = get_post_meta($question_id, '_quiz_id', false);
+					if ( ! in_array($quiz_id, $quizzes)) {
+			    		add_post_meta($question_id, '_quiz_id', $quiz_id, false);
+						$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+						update_post_meta($lesson_id, '_quiz_has_questions', '1');
 			    	}
 
-			    	add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
-					$question_type = Sensei()->question->get_question_type( $question_id );
+			    	add_post_meta($question_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_count);
+					$question_type = Sensei()->question->get_question_type($question_id);
 
-					$return .= $this->quiz_panel_question( $question_type, $question_count, $question_id );
+					$return .= $this->quiz_panel_question($question_type, $question_count, $question_id);
 				}
 			}
 		}
@@ -2057,14 +2057,14 @@ 
 
 	public function lesson_update_grade_type() {
 		//Add nonce security to the request
-		if ( isset($_POST['lesson_update_grade_type_nonce']) ) {
+		if (isset($_POST['lesson_update_grade_type_nonce'])) {
 
-			$nonce = esc_html( $_POST['lesson_update_grade_type_nonce'] );
+			$nonce = esc_html($_POST['lesson_update_grade_type_nonce']);
 
 		} // End If Statement
 
-		if ( ! wp_verify_nonce( $nonce, 'lesson_update_grade_type_nonce' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_grade_type_nonce')
+        || ! current_user_can('edit_lessons')) {
 
 			die('');
 
@@ -2074,18 +2074,18 @@ 
 		$data = $_POST['data'];
 		$quiz_data = array();
 		parse_str($data, $quiz_data);
-		update_post_meta( $quiz_data['quiz_id'], '_quiz_grade_type', $quiz_data['quiz_grade_type'] );
+		update_post_meta($quiz_data['quiz_id'], '_quiz_grade_type', $quiz_data['quiz_grade_type']);
 		die();
 	}
 
 	public function lesson_update_question_order() {
 		// Add nonce security to the request
-		if ( isset($_POST['lesson_update_question_order_nonce']) ) {
-			$nonce = esc_html( $_POST['lesson_update_question_order_nonce'] );
+		if (isset($_POST['lesson_update_question_order_nonce'])) {
+			$nonce = esc_html($_POST['lesson_update_question_order_nonce']);
 		} // End If Statement
 
-        if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_nonce' )
-            ||! current_user_can( 'edit_lessons' ) ) {
+        if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_nonce')
+            ||! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 
@@ -2093,25 +2093,25 @@ 
 		$data = $_POST['data'];
 		$quiz_data = array();
 		parse_str($data, $quiz_data);
-		if( strlen( $quiz_data['question_order'] ) > 0 ) {
-			$questions = explode( ',', $quiz_data['question_order'] );
+		if (strlen($quiz_data['question_order']) > 0) {
+			$questions = explode(',', $quiz_data['question_order']);
 			$o = 1;
-			foreach( $questions as $question_id ) {
-				update_post_meta( $question_id, '_quiz_question_order' . $quiz_data['quiz_id'], $quiz_data['quiz_id'] . '000' . $o );
+			foreach ($questions as $question_id) {
+				update_post_meta($question_id, '_quiz_question_order'.$quiz_data['quiz_id'], $quiz_data['quiz_id'].'000'.$o);
 				++$o;
 			}
-			update_post_meta( $quiz_data['quiz_id'], '_question_order', $questions );
+			update_post_meta($quiz_data['quiz_id'], '_question_order', $questions);
 		}
 		die();
 	}
 
 	public function lesson_update_question_order_random() {
 		//Add nonce security to the request
-		if ( isset($_POST['lesson_update_question_order_random_nonce']) ) {
-			$nonce = esc_html( $_POST['lesson_update_question_order_random_nonce'] );
+		if (isset($_POST['lesson_update_question_order_random_nonce'])) {
+			$nonce = esc_html($_POST['lesson_update_question_order_random_nonce']);
 		} // End If Statement
-		if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_random_nonce' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_random_nonce')
+            || ! current_user_can('edit_lessons')) {
 
 			die('');
 
@@ -2120,7 +2120,7 @@ 
 		$data = $_POST['data'];
 		$quiz_data = array();
 		parse_str($data, $quiz_data);
-		update_post_meta( $quiz_data['quiz_id'], '_random_question_order', $quiz_data['random_question_order'] );
+		update_post_meta($quiz_data['quiz_id'], '_random_question_order', $quiz_data['random_question_order']);
 		die();
 	}
 
@@ -2131,7 +2131,7 @@ 
 	 * @param array $data (default: array())
 	 * @return integer|boolean $course_id or false
 	 */
-	private function lesson_save_course( $data = array() ) {
+	private function lesson_save_course($data = array()) {
 		global $current_user;
 		$return = false;
 		// Setup the course data
@@ -2140,58 +2140,58 @@ 
 		$course_title = '';
 		$course_prerequisite = 0;
 		$course_category = 0;
-		if ( isset( $data[ 'course_id' ] ) && ( 0 < absint( $data[ 'course_id' ] ) ) ) {
-			$course_id = absint( $data[ 'course_id' ] );
+		if (isset($data['course_id']) && (0 < absint($data['course_id']))) {
+			$course_id = absint($data['course_id']);
 		} // End If Statement
-		if ( isset( $data[ 'course_title' ] ) && ( '' != $data[ 'course_title' ] ) ) {
-			$course_title = $data[ 'course_title' ];
+		if (isset($data['course_title']) && ('' != $data['course_title'])) {
+			$course_title = $data['course_title'];
 		} // End If Statement
 		$post_title = $course_title;
-		if ( isset($data[ 'post_author' ]) ) {
-			$post_author = $data[ 'post_author' ];
+		if (isset($data['post_author'])) {
+			$post_author = $data['post_author'];
 		} else {
 			$current_user = wp_get_current_user();
 			$post_author = $current_user->ID;
 		} // End If Statement
 		$post_status = 'publish';
 		$post_type = 'course';
-		if ( isset( $data[ 'course_content' ] ) && ( '' != $data[ 'course_content' ] ) ) {
-			$course_content = $data[ 'course_content' ];
+		if (isset($data['course_content']) && ('' != $data['course_content'])) {
+			$course_content = $data['course_content'];
 		} // End If Statement
 		$post_content = $course_content;
 		// Course Query Arguments
-		$post_type_args = array(	'post_content' => $post_content,
+		$post_type_args = array('post_content' => $post_content,
   		    						'post_status' => $post_status,
   		    						'post_title' => $post_title,
   		    						'post_type' => $post_type
   		    						);
   		// Only save if there is a valid title
-  		if ( $post_title != '' ) {
+  		if ($post_title != '') {
   		    // Check for prerequisite courses & product id
-  		    $course_prerequisite_id = absint( $data[ 'course_prerequisite' ] );
-  		    $course_woocommerce_product_id = absint( $data[ 'course_woocommerce_product' ] );
-  		    $course_category_id = absint( $data[ 'course_category' ] );
-  		    if ( 0 == $course_woocommerce_product_id ) { $course_woocommerce_product_id = '-'; }
+  		    $course_prerequisite_id = absint($data['course_prerequisite']);
+  		    $course_woocommerce_product_id = absint($data['course_woocommerce_product']);
+  		    $course_category_id = absint($data['course_category']);
+  		    if (0 == $course_woocommerce_product_id) { $course_woocommerce_product_id = '-'; }
   		    // Insert or Update the Lesson Quiz
-		    if ( 0 < $course_id ) {
-		    	$post_type_args[ 'ID' ] = $course_id;
+		    if (0 < $course_id) {
+		    	$post_type_args['ID'] = $course_id;
 		    	$course_id = wp_update_post($post_type_args);
-		    	update_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
-		    	update_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
-		    	if ( 0 < $course_category_id ) {
-		    		wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
+		    	update_post_meta($course_id, '_course_prerequisite', $course_prerequisite_id);
+		    	update_post_meta($course_id, '_course_woocommerce_product', $course_woocommerce_product_id);
+		    	if (0 < $course_category_id) {
+		    		wp_set_object_terms($course_id, $course_category_id, 'course-category');
 		    	} // End If Statement
 		    } else {
 		    	$course_id = wp_insert_post($post_type_args);
-		    	add_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id );
-		    	add_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id );
-		    	if ( 0 < $course_category_id ) {
-		    		wp_set_object_terms( $course_id, $course_category_id, 'course-category' );
+		    	add_post_meta($course_id, '_course_prerequisite', $course_prerequisite_id);
+		    	add_post_meta($course_id, '_course_woocommerce_product', $course_woocommerce_product_id);
+		    	if (0 < $course_category_id) {
+		    		wp_set_object_terms($course_id, $course_category_id, 'course-category');
 		    	} // End If Statement
 		    } // End If Statement
 		} // End If Statement
   		// Check that the insert or update saved by testing the post id
-  		if ( 0 < $course_id ) {
+  		if (0 < $course_id) {
   			$return = $course_id;
   		} // End If Statement
   		return $return;
@@ -2205,7 +2205,7 @@ 
 	 * @param array $data (default: array())
 	 * @return integer|boolean $question_id or false
 	 */
-	public function lesson_save_question( $data = array(), $context = 'quiz' ) {
+	public function lesson_save_question($data = array(), $context = 'quiz') {
 		$return = false;
 		// Save the Questions
 		// Setup the Question data
@@ -2217,130 +2217,130 @@ 
 		$question_category = '';
 
 		// Handle Question Type
-		if ( isset( $data[ 'question_type' ] ) && ( '' != $data[ 'question_type' ] ) ) {
-			$question_type = $data[ 'question_type' ];
+		if (isset($data['question_type']) && ('' != $data['question_type'])) {
+			$question_type = $data['question_type'];
 		} // End If Statement
 
-		if ( isset( $data[ 'question_category' ] ) && ( '' != $data[ 'question_category' ] ) ) {
-			$question_category = $data[ 'question_category' ];
+		if (isset($data['question_category']) && ('' != $data['question_category'])) {
+			$question_category = $data['question_category'];
 		} // End If Statement
 
-		if ( isset( $data[ 'question_id' ] ) && ( 0 < absint( $data[ 'question_id' ] ) ) ) {
-			$question_id = absint( $data[ 'question_id' ] );
+		if (isset($data['question_id']) && (0 < absint($data['question_id']))) {
+			$question_id = absint($data['question_id']);
 		} // End If Statement
-		if ( isset( $data[ 'question' ] ) && ( '' != $data[ 'question' ] ) ) {
-			$question_text = $data[ 'question' ];
+		if (isset($data['question']) && ('' != $data['question'])) {
+			$question_text = $data['question'];
 		} // End If Statement
 		$post_title = $question_text;
 		// Handle Default Fields (multiple choice)
-		if ( 'multiple-choice' == $question_type && isset( $data[ 'question_right_answers' ] ) && ( '' != $data[ 'question_right_answers' ] ) ) {
-			$question_right_answers = $data[ 'question_right_answers' ];
+		if ('multiple-choice' == $question_type && isset($data['question_right_answers']) && ('' != $data['question_right_answers'])) {
+			$question_right_answers = $data['question_right_answers'];
 		} // End If Statement
-		elseif ( 'multiple-choice' == $question_type && isset( $data[ 'question_right_answer' ] ) && ( '' != $data[ 'question_right_answer' ] ) ) {
-			$question_right_answer = $data[ 'question_right_answer' ];
+		elseif ('multiple-choice' == $question_type && isset($data['question_right_answer']) && ('' != $data['question_right_answer'])) {
+			$question_right_answer = $data['question_right_answer'];
 		} // End If Statement
-		if ( 'multiple-choice' == $question_type && isset( $data[ 'question_wrong_answers' ] ) && ( '' != $data[ 'question_wrong_answers' ] ) ) {
-			$question_wrong_answers = $data[ 'question_wrong_answers' ];
+		if ('multiple-choice' == $question_type && isset($data['question_wrong_answers']) && ('' != $data['question_wrong_answers'])) {
+			$question_wrong_answers = $data['question_wrong_answers'];
 		} // End If Statement
 		// Handle Boolean Fields - Edit
-		if ( 'boolean' == $question_type && isset( $data[ 'question_' . $question_id . '_right_answer_boolean' ] ) && ( '' != $data[ 'question_' . $question_id . '_right_answer_boolean' ] ) ) {
-			$question_right_answer = $data[ 'question_' . $question_id . '_right_answer_boolean' ];
+		if ('boolean' == $question_type && isset($data['question_'.$question_id.'_right_answer_boolean']) && ('' != $data['question_'.$question_id.'_right_answer_boolean'])) {
+			$question_right_answer = $data['question_'.$question_id.'_right_answer_boolean'];
 		} // End If Statement
 		// Handle Boolean Fields - Add
-		if ( 'boolean' == $question_type && isset( $data[ 'question_right_answer_boolean' ] ) && ( '' != $data[ 'question_right_answer_boolean' ] ) ) {
-			$question_right_answer = $data[ 'question_right_answer_boolean' ];
+		if ('boolean' == $question_type && isset($data['question_right_answer_boolean']) && ('' != $data['question_right_answer_boolean'])) {
+			$question_right_answer = $data['question_right_answer_boolean'];
 		} // End If Statement
 		// Handle Gap Fill Fields
-		if ( 'gap-fill' == $question_type && isset( $data[ 'add_question_right_answer_gapfill_gap' ] ) && '' != $data[ 'add_question_right_answer_gapfill_gap' ] ) {
-			$question_right_answer = $data[ 'add_question_right_answer_gapfill_pre' ] . '||' . $data[ 'add_question_right_answer_gapfill_gap' ] . '||' . $data[ 'add_question_right_answer_gapfill_post' ];
+		if ('gap-fill' == $question_type && isset($data['add_question_right_answer_gapfill_gap']) && '' != $data['add_question_right_answer_gapfill_gap']) {
+			$question_right_answer = $data['add_question_right_answer_gapfill_pre'].'||'.$data['add_question_right_answer_gapfill_gap'].'||'.$data['add_question_right_answer_gapfill_post'];
 		} // End If Statement
 		// Handle Multi Line Fields
-		if ( 'multi-line' == $question_type && isset( $data[ 'add_question_right_answer_multiline' ] ) && ( '' != $data[ 'add_question_right_answer_multiline' ] ) ) {
-			$question_right_answer = $data[ 'add_question_right_answer_multiline' ];
+		if ('multi-line' == $question_type && isset($data['add_question_right_answer_multiline']) && ('' != $data['add_question_right_answer_multiline'])) {
+			$question_right_answer = $data['add_question_right_answer_multiline'];
 		} // End If Statement
 		// Handle Single Line Fields
-		if ( 'single-line' == $question_type && isset( $data[ 'add_question_right_answer_singleline' ] ) && ( '' != $data[ 'add_question_right_answer_singleline' ] ) ) {
-			$question_right_answer = $data[ 'add_question_right_answer_singleline' ];
+		if ('single-line' == $question_type && isset($data['add_question_right_answer_singleline']) && ('' != $data['add_question_right_answer_singleline'])) {
+			$question_right_answer = $data['add_question_right_answer_singleline'];
 		} // End If Statement
 		// Handle File Upload Fields
-		if ( 'file-upload' == $question_type && isset( $data[ 'add_question_right_answer_fileupload' ] ) && ( '' != $data[ 'add_question_right_answer_fileupload' ] ) ) {
-			$question_right_answer = $data[ 'add_question_right_answer_fileupload' ];
+		if ('file-upload' == $question_type && isset($data['add_question_right_answer_fileupload']) && ('' != $data['add_question_right_answer_fileupload'])) {
+			$question_right_answer = $data['add_question_right_answer_fileupload'];
 		} // End If Statement
-		if ( 'file-upload' == $question_type && isset( $data[ 'add_question_wrong_answer_fileupload' ] ) && ( '' != $data[ 'add_question_wrong_answer_fileupload' ] ) ) {
-			$question_wrong_answers = array( $data[ 'add_question_wrong_answer_fileupload' ] );
+		if ('file-upload' == $question_type && isset($data['add_question_wrong_answer_fileupload']) && ('' != $data['add_question_wrong_answer_fileupload'])) {
+			$question_wrong_answers = array($data['add_question_wrong_answer_fileupload']);
 		} // End If Statement
 
 		// Handle Question Grade
-		if ( isset( $data[ 'question_grade' ] ) && ( '' != $data[ 'question_grade' ] ) ) {
-			$question_grade = $data[ 'question_grade' ];
+		if (isset($data['question_grade']) && ('' != $data['question_grade'])) {
+			$question_grade = $data['question_grade'];
 		} // End If Statement
 
 		// Handle Answer Feedback
 		$answer_feedback = '';
-		if ( isset( $data[ 'answer_feedback_boolean' ] ) && !empty( $data[ 'answer_feedback_boolean' ] ) ) {
+		if (isset($data['answer_feedback_boolean']) && ! empty($data['answer_feedback_boolean'])) {
 
-            $answer_feedback = $data[ 'answer_feedback_boolean' ];
+            $answer_feedback = $data['answer_feedback_boolean'];
 
-		}elseif( isset( $data[ 'answer_feedback_multiple_choice' ] ) && !empty( $data[ 'answer_feedback_multiple_choice' ] ) ){
+		}elseif (isset($data['answer_feedback_multiple_choice']) && ! empty($data['answer_feedback_multiple_choice'])) {
 
-            $answer_feedback = $data[ 'answer_feedback_multiple_choice' ];
+            $answer_feedback = $data['answer_feedback_multiple_choice'];
 
-        }elseif( isset( $data[ 'answer_feedback' ] )  ){
+        }elseif (isset($data['answer_feedback'])) {
 
-            $answer_feedback = $data[ 'answer_feedback' ];
+            $answer_feedback = $data['answer_feedback'];
 
         } // End If Statement
 
 		$post_title = $question_text;
-		$post_author = $data[ 'post_author' ];
+		$post_author = $data['post_author'];
 		$post_status = 'publish';
 		$post_type = 'question';
 		// Handle the extended question text
-		if ( isset( $data[ 'question_description' ] ) && ( '' != $data[ 'question_description' ] ) ) {
-			$post_content = $data[ 'question_description' ];
+		if (isset($data['question_description']) && ('' != $data['question_description'])) {
+			$post_content = $data['question_description'];
 		}
 		else {
 			$post_content = '';
 		}
 		// Question Query Arguments
-		$post_type_args = array(	'post_content' => $post_content,
+		$post_type_args = array('post_content' => $post_content,
   		    						'post_status' => $post_status,
   		    						'post_title' => $post_title,
   		    						'post_type' => $post_type
   		    						);
 
   		// Remove empty values and reindex the array
-  		if ( is_array( $question_right_answers ) && 0 < count($question_right_answers) ) {
-  			$question_right_answers_array = array_values( array_filter( $question_right_answers, 'strlen' ) );
+  		if (is_array($question_right_answers) && 0 < count($question_right_answers)) {
+  			$question_right_answers_array = array_values(array_filter($question_right_answers, 'strlen'));
   			$question_right_answers = array();
 
-  			foreach( $question_right_answers_array as $answer ) {
-  				if( ! in_array( $answer, $question_right_answers ) ) {
+  			foreach ($question_right_answers_array as $answer) {
+  				if ( ! in_array($answer, $question_right_answers)) {
   					$question_right_answers[] = $answer;
   				}
   			}
-  			if ( 0 < count($question_right_answers) ) {
+  			if (0 < count($question_right_answers)) {
   				$question_right_answer = $question_right_answers;
   			}
   		} // End If Statement
-  		$right_answer_count = count( $question_right_answer );
+  		$right_answer_count = count($question_right_answer);
 
 		// Remove empty values and reindex the array
-  		if ( is_array( $question_wrong_answers ) ) {
-  			$question_wrong_answers_array = array_values( array_filter( $question_wrong_answers, 'strlen' ) );
+  		if (is_array($question_wrong_answers)) {
+  			$question_wrong_answers_array = array_values(array_filter($question_wrong_answers, 'strlen'));
   			$question_wrong_answers = array();
   		} // End If Statement
 
-  		foreach( $question_wrong_answers_array as $answer ) {
-  			if( ! in_array( $answer, $question_wrong_answers ) ) {
+  		foreach ($question_wrong_answers_array as $answer) {
+  			if ( ! in_array($answer, $question_wrong_answers)) {
   				$question_wrong_answers[] = $answer;
   			}
   		}
 
-  		$wrong_answer_count = count( $question_wrong_answers );
+  		$wrong_answer_count = count($question_wrong_answers);
 
   		// Only save if there is a valid title
-  		if ( $post_title != '' ) {
+  		if ($post_title != '') {
 
   			// Get Quiz ID for the question
   		    $quiz_id = $data['quiz_id'];
@@ -2350,86 +2350,86 @@ 
 
   		    // Get answer order
   		    $answer_order = '';
-  		    if( isset( $data['answer_order'] ) ) {
+  		    if (isset($data['answer_order'])) {
 				$answer_order = $data['answer_order'];
 			}
 
 			// Get random order selection
 			$random_order = 'no';
-			if( isset( $data['random_order'] ) ) {
+			if (isset($data['random_order'])) {
 				$random_order = $data['random_order'];
 			}
 
   		    // Insert or Update the question
-  		    if ( 0 < $question_id ) {
+  		    if (0 < $question_id) {
 
-  		    	$post_type_args[ 'ID' ] = $question_id;
-		    	$question_id = wp_update_post( $post_type_args );
+  		    	$post_type_args['ID'] = $question_id;
+		    	$question_id = wp_update_post($post_type_args);
 
 		    	// Update poast meta
-		    	if( 'quiz' == $context ) {
-		    		$quizzes = get_post_meta( $question_id, '_quiz_id', false );
-		    		if( ! in_array( $quiz_id, $quizzes ) ) {
-			    		add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
+		    	if ('quiz' == $context) {
+		    		$quizzes = get_post_meta($question_id, '_quiz_id', false);
+		    		if ( ! in_array($quiz_id, $quizzes)) {
+			    		add_post_meta($question_id, '_quiz_id', $quiz_id, false);
 			    	}
 		    	}
 
-		    	update_post_meta( $question_id, '_question_grade', $question_grade );
-		    	update_post_meta( $question_id, '_question_right_answer', $question_right_answer );
-		    	update_post_meta( $question_id, '_right_answer_count', $right_answer_count );
-		    	update_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
-		    	update_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
-		    	update_post_meta( $question_id, '_question_media', $question_media );
-		    	update_post_meta( $question_id, '_answer_order', $answer_order );
-		    	update_post_meta( $question_id, '_random_order', $random_order );
-
-		    	if( 'quiz' != $context ) {
-		    		wp_set_post_terms( $question_id, array( $question_type ), 'question-type', false );
+		    	update_post_meta($question_id, '_question_grade', $question_grade);
+		    	update_post_meta($question_id, '_question_right_answer', $question_right_answer);
+		    	update_post_meta($question_id, '_right_answer_count', $right_answer_count);
+		    	update_post_meta($question_id, '_question_wrong_answers', $question_wrong_answers);
+		    	update_post_meta($question_id, '_wrong_answer_count', $wrong_answer_count);
+		    	update_post_meta($question_id, '_question_media', $question_media);
+		    	update_post_meta($question_id, '_answer_order', $answer_order);
+		    	update_post_meta($question_id, '_random_order', $random_order);
+
+		    	if ('quiz' != $context) {
+		    		wp_set_post_terms($question_id, array($question_type), 'question-type', false);
 		    	}
 				// Don't store empty value, no point
-				if ( !empty($answer_feedback) ) {
-					update_post_meta( $question_id, '_answer_feedback', $answer_feedback );
+				if ( ! empty($answer_feedback)) {
+					update_post_meta($question_id, '_answer_feedback', $answer_feedback);
 				}
 
 		    } else {
-				$question_id = wp_insert_post( $post_type_args );
-				$question_count = intval( $data['question_count'] );
+				$question_id = wp_insert_post($post_type_args);
+				$question_count = intval($data['question_count']);
 				++$question_count;
 
 				// Set post meta
-				if( 'quiz' == $context ) {
-					add_post_meta( $question_id, '_quiz_id', $quiz_id, false );
-					$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-					update_post_meta( $lesson_id, '_quiz_has_questions', '1' );
+				if ('quiz' == $context) {
+					add_post_meta($question_id, '_quiz_id', $quiz_id, false);
+					$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+					update_post_meta($lesson_id, '_quiz_has_questions', '1');
 				}
 
-				if( isset( $question_grade ) ) {
-		    		add_post_meta( $question_id, '_question_grade', $question_grade );
+				if (isset($question_grade)) {
+		    		add_post_meta($question_id, '_question_grade', $question_grade);
 		    	}
-		    	add_post_meta( $question_id, '_question_right_answer', $question_right_answer );
-		    	add_post_meta( $question_id, '_right_answer_count', $right_answer_count );
-		    	add_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers );
-		    	add_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count );
-		    	add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count );
-		    	add_post_meta( $question_id, '_question_media', $question_media );
-		    	add_post_meta( $question_id, '_answer_order', $answer_order );
-		    	add_post_meta( $question_id, '_random_order', $random_order );
+		    	add_post_meta($question_id, '_question_right_answer', $question_right_answer);
+		    	add_post_meta($question_id, '_right_answer_count', $right_answer_count);
+		    	add_post_meta($question_id, '_question_wrong_answers', $question_wrong_answers);
+		    	add_post_meta($question_id, '_wrong_answer_count', $wrong_answer_count);
+		    	add_post_meta($question_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_count);
+		    	add_post_meta($question_id, '_question_media', $question_media);
+		    	add_post_meta($question_id, '_answer_order', $answer_order);
+		    	add_post_meta($question_id, '_random_order', $random_order);
 				// Don't store empty value, no point
-				if ( !empty($answer_feedback) ) {
-					add_post_meta( $question_id, '_answer_feedback', $answer_feedback );
+				if ( ! empty($answer_feedback)) {
+					add_post_meta($question_id, '_answer_feedback', $answer_feedback);
 				}
 
 		    	// Set the post terms for question-type
-			    wp_set_post_terms( $question_id, array( $question_type ), 'question-type' );
+			    wp_set_post_terms($question_id, array($question_type), 'question-type');
 
-			    if( $question_category ) {
-	    			wp_set_post_terms( $question_id, array( $question_category ), 'question-category' );
+			    if ($question_category) {
+	    			wp_set_post_terms($question_id, array($question_category), 'question-category');
 	    		}
 
 		    } // End If Statement
 		} // End If Statement
   		// Check that the insert or update saved by testing the post id
-  		if ( 0 < $question_id ) {
+  		if (0 < $question_id) {
   			$return = $question_id;
   		} // End If Statement
   		return $return;
@@ -2443,20 +2443,20 @@ 
 	 * @param array $data (default: array())
 	 * @return boolean
 	 */
-	private function lesson_delete_question( $data = array() ) {
+	private function lesson_delete_question($data = array()) {
 
 		// Get which question to delete
 		$question_id = 0;
-		if ( isset( $data[ 'question_id' ] ) && ( 0 < absint( $data[ 'question_id' ] ) ) ) {
-			$question_id = absint( $data[ 'question_id' ] );
+		if (isset($data['question_id']) && (0 < absint($data['question_id']))) {
+			$question_id = absint($data['question_id']);
 		} // End If Statement
 		// Delete the question
-		if ( 0 < $question_id ) {
-			$quizzes = get_post_meta( $question_id, '_quiz_id', false );
+		if (0 < $question_id) {
+			$quizzes = get_post_meta($question_id, '_quiz_id', false);
 
-			foreach( $quizzes as $quiz_id ) {
-				if( $quiz_id == $data['quiz_id'] ) {
-					delete_post_meta( $question_id, '_quiz_id', $quiz_id );
+			foreach ($quizzes as $quiz_id) {
+				if ($quiz_id == $data['quiz_id']) {
+					delete_post_meta($question_id, '_quiz_id', $quiz_id);
 				}
 			}
 
@@ -2475,9 +2475,9 @@ 
 	public function lesson_complexities() {
 
 		// V2 - make filter for this array
-        $lesson_complexities = array( 	'easy' => __( 'Easy', 'woothemes-sensei' ),
-									'std' => __( 'Standard', 'woothemes-sensei' ),
-									'hard' => __( 'Hard', 'woothemes-sensei' )
+        $lesson_complexities = array('easy' => __('Easy', 'woothemes-sensei'),
+									'std' => __('Standard', 'woothemes-sensei'),
+									'hard' => __('Hard', 'woothemes-sensei')
 									);
 
 		return $lesson_complexities;
@@ -2492,9 +2492,9 @@ 
 	 * @param string $post_status (default: 'publish')
 	 * @return int
 	 */
-	public function lesson_count( $post_status = 'publish', $course_id = false ) {
+	public function lesson_count($post_status = 'publish', $course_id = false) {
 
-		$post_args = array(	'post_type'         => 'lesson',
+		$post_args = array('post_type'         => 'lesson',
 							'posts_per_page'    => -1,
 //							'orderby'           => 'menu_order date',
 //							'order'             => 'ASC',
@@ -2502,7 +2502,7 @@ 
 							'suppress_filters'  => 0,
 							'fields'            => 'ids',
 							);
-		if( $course_id ) {
+		if ($course_id) {
 			$post_args['meta_query'][] = array(
 				'key' => '_lesson_course',
 				'value' => $course_id,
@@ -2519,10 +2519,10 @@ 
 
 		// Allow WP to generate the complex final query, just shortcut to only do an overall count
 //		add_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
-		$lessons_query = new WP_Query( apply_filters( 'sensei_lesson_count', $post_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_lesson_count', $post_args));
 //		remove_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
 
-		return count( $lessons_query->posts );
+		return count($lessons_query->posts);
 	} // End lesson_count()
 
 
@@ -2535,11 +2535,11 @@ 
 	 * @param string $fields (default: 'ids')
 	 * @return int $quiz_id
 	 */
-	public function lesson_quizzes( $lesson_id = 0, $post_status = 'any', $fields = 'ids' ) {
+	public function lesson_quizzes($lesson_id = 0, $post_status = 'any', $fields = 'ids') {
 
 		$posts_array = array();
 
-		$post_args = array(	'post_type' 		=> 'quiz',
+		$post_args = array('post_type' 		=> 'quiz',
 							'posts_per_page' 		=> 1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'DESC',
@@ -2548,7 +2548,7 @@ 
 							'suppress_filters' 	=> 0,
 							'fields'            => $fields
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
         $quiz_id = array_shift($posts_array);
 
 		return $quiz_id;
@@ -2571,37 +2571,37 @@ 
      *
 	 * @return array $questions { $question type WP_Post }
 	 */
-	public function lesson_quiz_questions( $quiz_id = 0, $post_status = 'any', $orderby = 'meta_value_num title', $order = 'ASC' ) {
+	public function lesson_quiz_questions($quiz_id = 0, $post_status = 'any', $orderby = 'meta_value_num title', $order = 'ASC') {
 
 		$quiz_id = (string) $quiz_id;
-        $quiz_lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $quiz_lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
         // setup the user id
-        if( is_admin() ) {
-            $user_id = isset( $_GET['user'] ) ? $_GET['user'] : '' ;
+        if (is_admin()) {
+            $user_id = isset($_GET['user']) ? $_GET['user'] : '';
         } else {
             $user_id = get_current_user_id();
         }
 
         // get the users current status on the lesson
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $user_id );
+        $user_lesson_status = Sensei_Utils::user_lesson_status($quiz_lesson_id, $user_id);
 
 		// Set the default question order if it has not already been set for this quiz
-		$this->set_default_question_order( $quiz_id );
+		$this->set_default_question_order($quiz_id);
 
 		// If viewing quiz on the frontend then show questions in random order if set
-		if ( ! is_admin() ) {
-			$random_order = get_post_meta( $quiz_id, '_random_question_order', true );
-			if( $random_order && $random_order == 'yes' ) {
+		if ( ! is_admin()) {
+			$random_order = get_post_meta($quiz_id, '_random_question_order', true);
+			if ($random_order && $random_order == 'yes') {
 				$orderby = 'rand';
 			}
 		}
 
 		// Get all questions and multiple questions
 		$question_query_args = array(
-			'post_type' 		=> array( 'question', 'multiple_question' ),
+			'post_type' 		=> array('question', 'multiple_question'),
 			'posts_per_page' 	=> -1,
-			'meta_key'        	=> '_quiz_question_order' . $quiz_id,
+			'meta_key'        	=> '_quiz_question_order'.$quiz_id,
 			'orderby'         	=> $orderby,
 			'order'           	=> $order,
 			'meta_query'		=> array(
@@ -2615,7 +2615,7 @@ 
 		);
 
         //query the questions
-		$questions_query = new WP_Query( $question_query_args );
+		$questions_query = new WP_Query($question_query_args);
 
         // Set return array to initially include all items
         $questions = $questions_query->posts;
@@ -2625,20 +2625,20 @@ 
 
 		// If viewing quiz on frontend or in grading then only single questions must be shown
 		$selected_questions = false;
-		if( ! is_admin() || ( is_admin() && isset( $_GET['page'] ) && 'sensei_grading' == $_GET['page'] && isset( $_GET['user'] ) && isset( $_GET['quiz_id'] ) ) ) {
+		if ( ! is_admin() || (is_admin() && isset($_GET['page']) && 'sensei_grading' == $_GET['page'] && isset($_GET['user']) && isset($_GET['quiz_id']))) {
 
 			// Fetch the questions that the user was asked in their quiz if they have already completed it
-			$questions_asked_string = !empty( $user_lesson_status->comment_ID) ? get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true ) : false;
-			if( !empty($questions_asked_string) ) {
+			$questions_asked_string = ! empty($user_lesson_status->comment_ID) ? get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true) : false;
+			if ( ! empty($questions_asked_string)) {
 
-				$selected_questions = explode( ',', $questions_asked_string );
+				$selected_questions = explode(',', $questions_asked_string);
 
 				// Fetch each question in the order in which they were asked
 				$questions = array();
-				foreach( $selected_questions as $question_id ) {
-					if( ! $question_id ) continue;
-					$question = get_post( $question_id );
-					if( ! isset( $question ) || ! isset( $question->ID ) ) continue;
+				foreach ($selected_questions as $question_id) {
+					if ( ! $question_id) continue;
+					$question = get_post($question_id);
+					if ( ! isset($question) || ! isset($question->ID)) continue;
 					$questions[] = $question;
 				}
 
@@ -2650,24 +2650,24 @@ 
 				$existing_questions = array();
 
 				// Set array of questions that already exist so we can prevent duplicates from appearing
-				foreach( $questions_array as $question ) {
-					if( 'question' != $question->post_type ) continue;
+				foreach ($questions_array as $question) {
+					if ('question' != $question->post_type) continue;
 					$existing_questions[] = $question->ID;
 				}
 
 				// Include only single questions in the return array
 				$questions_loop = $questions_array;
 				$questions_array = array();
-				foreach( $questions_loop as $k => $question ) {
+				foreach ($questions_loop as $k => $question) {
 
 					// If this is a single question then include it
-					if( 'question' == $question->post_type ) {
+					if ('question' == $question->post_type) {
 						$questions_array[] = $question;
 					} else {
 
 						// If this is a multiple question then get the specified amount of questions from the specified category
-						$question_cat = intval( get_post_meta( $question->ID, 'category', true ) );
-						$question_number = intval( get_post_meta( $question->ID, 'number', true ) );
+						$question_cat = intval(get_post_meta($question->ID, 'category', true));
+						$question_number = intval(get_post_meta($question->ID, 'number', true));
 
 						$qargs = array(
 							'post_type' 		=> 'question',
@@ -2684,14 +2684,14 @@ 
 							'suppress_filters' 	=> 0,
 							'post__not_in'		=> $existing_questions,
 						);
-						$cat_questions = get_posts( $qargs );
+						$cat_questions = get_posts($qargs);
 
 						// Merge results into return array
-						$questions_array = array_merge( $questions_array, $cat_questions );
+						$questions_array = array_merge($questions_array, $cat_questions);
 
 						// Add selected questions to existing questions array to prevent duplicates from being added
-						foreach( $questions_array as $cat_question ) {
-							if( in_array( $cat_question->ID, $existing_questions ) ) continue;
+						foreach ($questions_array as $cat_question) {
+							if (in_array($cat_question->ID, $existing_questions)) continue;
 							$existing_questions[] = $cat_question->ID;
 						}
 					}
@@ -2703,29 +2703,29 @@ 
 		}
 
 		// If user has not already taken the quiz and a limited number of questions are to be shown, then show a random selection of the specified amount of questions
-		if( ! $selected_questions ) {
+		if ( ! $selected_questions) {
 
 			// Only limit questions like this on the frontend
-			if( ! is_admin() ) {
+			if ( ! is_admin()) {
 
 				// Get number of questions to show
-				$show_questions = intval( get_post_meta( $quiz_id, '_show_questions', true ) );
-				if( $show_questions ) {
+				$show_questions = intval(get_post_meta($quiz_id, '_show_questions', true));
+				if ($show_questions) {
 
 					// Get random set of array keys from selected questions array
-					$selected_questions = array_rand( $questions_array, $show_questions );
+					$selected_questions = array_rand($questions_array, $show_questions);
 
 					// Loop through all questions and pick the the ones to be shown based on the random key selection
 					$questions = array();
-					foreach( $questions_array as $k => $question ) {
+					foreach ($questions_array as $k => $question) {
 
 						// Random keys will always be an array, unless only one question is to be shown
-						if( is_array( $selected_questions ) ) {
-							if( in_array( $k, $selected_questions ) ) {
+						if (is_array($selected_questions)) {
+							if (in_array($k, $selected_questions)) {
 								$questions[] = $question;
 							}
-						} elseif( 1 == $show_questions ) {
-							if ( $selected_questions == $k ) {
+						} elseif (1 == $show_questions) {
+							if ($selected_questions == $k) {
 								$questions[] = $question;
 							}
 						}
@@ -2736,12 +2736,12 @@ 
 
         // Save the questions that will be asked for the current user
         // this happens only once per user/quiz, unless the user resets the quiz
-        if( ! is_admin() ){
+        if ( ! is_admin()) {
 
-            if( $user_lesson_status ) {
+            if ($user_lesson_status) {
 
                 $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true);
-                if ( empty($questions_asked) && $user_lesson_status) {
+                if (empty($questions_asked) && $user_lesson_status) {
 
                     $questions_asked = array();
                     foreach ($questions as $question) {
@@ -2764,7 +2764,7 @@ 
          * @hooked Sensei_Teacher::allow_teacher_access_to_questions
          * @since 1.8.0
          */
-		return apply_filters( 'sensei_lesson_quiz_questions', $questions,  $quiz_id  );
+		return apply_filters('sensei_lesson_quiz_questions', $questions, $quiz_id);
 
 	} // End lesson_quiz_questions()
 
@@ -2772,13 +2772,13 @@ 
 	 * Set the default quiz order
 	 * @param integer $quiz_id ID of quiz
 	 */
-	public function set_default_question_order( $quiz_id = 0 ) {
+	public function set_default_question_order($quiz_id = 0) {
 
-		if( $quiz_id ) {
+		if ($quiz_id) {
 
-			$question_order = get_post_meta( $quiz_id, '_question_order', true );
+			$question_order = get_post_meta($quiz_id, '_question_order', true);
 
-			if( ! $question_order ) {
+			if ( ! $question_order) {
 
 				$args = array(
 					'post_type' 		=> 'question',
@@ -2794,11 +2794,11 @@ 
 					'post_status'		=> 'any',
 					'suppress_filters' 	=> 0
 				);
-				$questions = get_posts( $args );
+				$questions = get_posts($args);
 
 				$o = 1;
-				foreach( $questions as $question ) {
-					add_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $o, true );
+				foreach ($questions as $question) {
+					add_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$o, true);
 					$o++;
 				}
 			}
@@ -2817,36 +2817,36 @@ 
 	 * @param string $height (default: '100')
 	 * @return string
 	 */
-	public function lesson_image( $lesson_id = 0, $width = '100', $height = '100', $widget = false ) {
+	public function lesson_image($lesson_id = 0, $width = '100', $height = '100', $widget = false) {
 
 		$html = '';
 
 		// Get Width and Height settings
-		if ( ( $width == '100' ) && ( $height == '100' ) ) {
+		if (($width == '100') && ($height == '100')) {
 
-			if ( is_singular( 'lesson' ) ) {
+			if (is_singular('lesson')) {
 
-				if ( ! $widget && ! Sensei()->settings->settings[ 'lesson_single_image_enable' ] ) {
+				if ( ! $widget && ! Sensei()->settings->settings['lesson_single_image_enable']) {
 
 					return '';
 
 				} // End If Statement
 
 				$image_thumb_size = 'lesson_single_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 				$crop = $dimensions['crop'];
 
 			} else {
 
-				if ( ! $widget && ! Sensei()->settings->settings[ 'course_lesson_image_enable' ] ) {
+				if ( ! $widget && ! Sensei()->settings->settings['course_lesson_image_enable']) {
 
 					return '';
 				} // End If Statement
 
 				$image_thumb_size = 'lesson_archive_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 				$crop = $dimensions['crop'];
@@ -2857,23 +2857,23 @@ 
 
 		$img_url = '';
 
-		if ( has_post_thumbnail( $lesson_id ) ) {
+		if (has_post_thumbnail($lesson_id)) {
 
    			// Get Featured Image
-   			$img_url = get_the_post_thumbnail( $lesson_id, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') );
+   			$img_url = get_the_post_thumbnail($lesson_id, array($width, $height), array('class' => 'woo-image thumbnail alignleft'));
 
  		} else {
 
  			// Display Image Placeholder if none
-			if ( Sensei()->settings->settings[ 'placeholder_images_enable' ] ) {
+			if (Sensei()->settings->settings['placeholder_images_enable']) {
 
-                $img_url = apply_filters( 'sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+                $img_url = apply_filters('sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/'.$width.'x'.$height.'" class="woo-image thumbnail alignleft" />');
 
 			} // End If Statement
 
 		} // End If Statement
 
-		$html .= '<a href="' . get_permalink( $lesson_id ) . '" title="' . esc_attr( get_post_field( 'post_title', $lesson_id ) ) . '">' . $img_url . '</a>';
+		$html .= '<a href="'.get_permalink($lesson_id).'" title="'.esc_attr(get_post_field('post_title', $lesson_id)).'">'.$img_url.'</a>';
 
 		return $html;
 
@@ -2885,9 +2885,9 @@ 
      * @since 1.9.0
      * @param integer $lesson_id
      */
-    public static function the_lesson_image( $lesson_id = 0 ){
+    public static function the_lesson_image($lesson_id = 0) {
 
-        echo Sensei()->lesson->lesson_image( $lesson_id );
+        echo Sensei()->lesson->lesson_image($lesson_id);
 
     }
 
@@ -2898,17 +2898,17 @@ 
      * @param bool $add_p_tags should the excerpt be wrapped by calling wpautop()
 	 * @return string
 	 */
-	public static function lesson_excerpt( $lesson = null, $add_p_tags = true ) {
+	public static function lesson_excerpt($lesson = null, $add_p_tags = true) {
 		$html = '';
-		if ( is_a( $lesson, 'WP_Post' ) && 'lesson' == $lesson->post_type ) {
+		if (is_a($lesson, 'WP_Post') && 'lesson' == $lesson->post_type) {
 
-            $excerpt =  $lesson->post_excerpt;
+            $excerpt = $lesson->post_excerpt;
 
             // if $add_p_tags true wrap with <p> else return the excerpt as is
-            $html =  $add_p_tags ? wpautop( $excerpt ) : $excerpt;
+            $html = $add_p_tags ? wpautop($excerpt) : $excerpt;
 
 		}
-		return apply_filters( 'sensei_lesson_excerpt', $html );
+		return apply_filters('sensei_lesson_excerpt', $html);
 
 	} // End lesson_excerpt()
 
@@ -2921,20 +2921,20 @@ 
      * @param int $lesson_id
      * @return int|bool $course_id or bool when nothing is found.
      */
-     public function get_course_id( $lesson_id ){
+     public function get_course_id($lesson_id) {
 
-         if( ! isset( $lesson_id ) || empty( $lesson_id )
-         ||  'lesson' != get_post_type( $lesson_id ) ){
+         if ( ! isset($lesson_id) || empty($lesson_id)
+         ||  'lesson' != get_post_type($lesson_id)) {
              return false;
          }
 
-         $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true);
+         $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 
          // make sure the course id is valid
-         if( empty( $lesson_course_id )
-             || is_array( $lesson_course_id )
-             || intval( $lesson_course_id ) < 1
-             || 'course' != get_post_type( $lesson_course_id ) ){
+         if (empty($lesson_course_id)
+             || is_array($lesson_course_id)
+             || intval($lesson_course_id) < 1
+             || 'course' != get_post_type($lesson_course_id)) {
 
              return false;
 
@@ -2961,11 +2961,11 @@ 
      * @param string $post_type
      * @return void
      */
-    public function all_lessons_edit_fields( $column_name, $post_type ) {
+    public function all_lessons_edit_fields($column_name, $post_type) {
 
         // only show these options ont he lesson post type edit screen
-        if( 'lesson' != $post_type || 'lesson-course' != $column_name
-            || ! current_user_can( 'edit_lessons' ) ) {
+        if ('lesson' != $post_type || 'lesson-course' != $column_name
+            || ! current_user_can('edit_lessons')) {
             return;
         }
 
@@ -2973,41 +2973,41 @@ 
         <fieldset class="sensei-edit-field-set inline-edit-lesson">
             <div class="sensei-inline-edit-col column-<?php echo $column_name ?>">
                     <?php
-                    echo '<h4>' . __('Lesson Information', 'woothemes-sensei') . '</h4>';
+                    echo '<h4>'.__('Lesson Information', 'woothemes-sensei').'</h4>';
                     // create a nonce field to be  used as a security measure when saving the data
-                    wp_nonce_field( 'bulk-edit-lessons', '_edit_lessons_nonce' );
-                    wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce'  );
+                    wp_nonce_field('bulk-edit-lessons', '_edit_lessons_nonce');
+                    wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce');
 
                     // unchanged option - we need this in because
                     // the default option in bulk edit should not be empty. If it is
                     // the user will erase data they didn't want to touch.
-                    $no_change_text = '-- ' . __('No Change', 'woothemes-sensei') . ' --';
+                    $no_change_text = '-- '.__('No Change', 'woothemes-sensei').' --';
 
                     //
                     //course selection
                     //
-                    $courses =  WooThemes_Sensei_Course::get_all_courses();
+                    $courses = WooThemes_Sensei_Course::get_all_courses();
                     $course_options = array();
-                    if ( count( $courses ) > 0 ) {
-                        foreach ($courses as $course ){
-                            $course_options[ $course->ID ] = get_the_title( $course->ID );
+                    if (count($courses) > 0) {
+                        foreach ($courses as $course) {
+                            $course_options[$course->ID] = get_the_title($course->ID);
                         }
                     }
                     //pre-append the no change option
-                    $course_options['-1']=  $no_change_text;
-                    $course_attributes = array( 'name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course' , 'class'=>' ' );
-                    $course_field =  Sensei_Utils::generate_drop_down( '-1', $course_options, $course_attributes );
-                    echo $this->generate_all_lessons_edit_field( __('Lesson Course', 'woothemes-sensei'),   $course_field  );
+                    $course_options['-1'] = $no_change_text;
+                    $course_attributes = array('name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course', 'class'=>' ');
+                    $course_field = Sensei_Utils::generate_drop_down('-1', $course_options, $course_attributes);
+                    echo $this->generate_all_lessons_edit_field(__('Lesson Course', 'woothemes-sensei'), $course_field);
 
                     //
                     // lesson complexity selection
                     //
-                    $lesson_complexities =  $this->lesson_complexities();
+                    $lesson_complexities = $this->lesson_complexities();
                     //pre-append the no change option
-                    $lesson_complexities['-1']=  $no_change_text;
-                    $complexity_dropdown_attributes = array( 'name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity' , 'class'=>' ');
-                    $complexity_filed =  Sensei_Utils::generate_drop_down( '-1', $lesson_complexities, $complexity_dropdown_attributes );
-                    echo $this->generate_all_lessons_edit_field( __('Lesson Complexity', 'woothemes-sensei'),   $complexity_filed  );
+                    $lesson_complexities['-1'] = $no_change_text;
+                    $complexity_dropdown_attributes = array('name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity', 'class'=>' ');
+                    $complexity_filed = Sensei_Utils::generate_drop_down('-1', $lesson_complexities, $complexity_dropdown_attributes);
+                    echo $this->generate_all_lessons_edit_field(__('Lesson Complexity', 'woothemes-sensei'), $complexity_filed);
 
                     ?>
 
@@ -3020,34 +3020,34 @@ 
                     //
                     $pass_required_options = array(
                         '-1' => $no_change_text,
-                         '0' => __('No','woothemes'),
-                         '1' => __('Yes','woothemes'),
+                         '0' => __('No', 'woothemes'),
+                         '1' => __('Yes', 'woothemes'),
                     );
 
-                    $pass_required_select_attributes = array( 'name'=> 'pass_required',
+                    $pass_required_select_attributes = array('name'=> 'pass_required',
                                                                 'id'=> 'sensei-edit-lesson-pass-required',
-                                                                'class'=>' '   );
-                    $require_pass_field =  Sensei_Utils::generate_drop_down( '-1', $pass_required_options, $pass_required_select_attributes, false );
-                    echo $this->generate_all_lessons_edit_field( __('Pass required', 'woothemes-sensei'),   $require_pass_field  );
+                                                                'class'=>' ');
+                    $require_pass_field = Sensei_Utils::generate_drop_down('-1', $pass_required_options, $pass_required_select_attributes, false);
+                    echo $this->generate_all_lessons_edit_field(__('Pass required', 'woothemes-sensei'), $require_pass_field);
 
                     //
                     // Quiz pass percentage
                     //
                     $quiz_pass_percentage_field = '<input name="quiz_passmark" id="sensei-edit-quiz-pass-percentage" type="number" />';
-                    echo $this->generate_all_lessons_edit_field( __('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field  );
+                    echo $this->generate_all_lessons_edit_field(__('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field);
 
                     //
                     // Enable quiz reset button
                     //
                     $quiz_reset_select__options = array(
                         '-1' => $no_change_text,
-                        '0' => __('No','woothemes'),
-                        '1' => __('Yes','woothemes'),
+                        '0' => __('No', 'woothemes'),
+                        '1' => __('Yes', 'woothemes'),
                     );
                     $quiz_reset_name_id = 'sensei-edit-enable-quiz-reset';
-                    $quiz_reset_select_attributes = array( 'name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' ' );
-                    $quiz_reset_field =  Sensei_Utils::generate_drop_down( '-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false );
-                    echo $this->generate_all_lessons_edit_field( __('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field  );
+                    $quiz_reset_select_attributes = array('name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' ');
+                    $quiz_reset_field = Sensei_Utils::generate_drop_down('-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false);
+                    echo $this->generate_all_lessons_edit_field(__('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field);
 
                     ?>
             </div>
@@ -3066,17 +3066,17 @@ 
      * @param string $field type markup for the field that must be wrapped.
      * @return string $field_html
      */
-    public function generate_all_lessons_edit_field( $title  ,$field ){
+    public function generate_all_lessons_edit_field($title, $field) {
 
         $html = '';
         $html = '<div class="inline-edit-group" >';
-        $html .=  '<span class="title">'. $title .'</span> ';
+        $html .= '<span class="title">'.$title.'</span> ';
         $html .= '<span class="input-text-wrap">';
         $html .= $field;
         $html .= '</span>';
         $html .= '</label></div>';
 
-        return $html ;
+        return $html;
 
     }//end generate_all_lessons_edit_field
 
@@ -3090,48 +3090,48 @@ 
     function save_all_lessons_edit_fields() {
 
         // verify all the data before attempting to save
-        if( ! isset( $_POST['security'] ) || ! check_ajax_referer( 'bulk-edit-lessons', 'security' )
-            ||  empty( $_POST[ 'post_ids' ] )  || ! is_array( $_POST[ 'post_ids' ] ) ) {
+        if ( ! isset($_POST['security']) || ! check_ajax_referer('bulk-edit-lessons', 'security')
+            ||  empty($_POST['post_ids']) || ! is_array($_POST['post_ids'])) {
             die();
         }
 
         // get our variables
-        $new_course = sanitize_text_field(  $_POST['sensei_edit_lesson_course'] );
-        $new_complexity = sanitize_text_field(  $_POST['sensei_edit_complexity'] );
-        $new_pass_required = sanitize_text_field(  $_POST['sensei_edit_pass_required'] );
-        $new_pass_percentage = sanitize_text_field(  $_POST['sensei_edit_pass_percentage'] );
-        $new_enable_quiz_reset = sanitize_text_field(  $_POST['sensei_edit_enable_quiz_reset'] );
+        $new_course = sanitize_text_field($_POST['sensei_edit_lesson_course']);
+        $new_complexity = sanitize_text_field($_POST['sensei_edit_complexity']);
+        $new_pass_required = sanitize_text_field($_POST['sensei_edit_pass_required']);
+        $new_pass_percentage = sanitize_text_field($_POST['sensei_edit_pass_percentage']);
+        $new_enable_quiz_reset = sanitize_text_field($_POST['sensei_edit_enable_quiz_reset']);
         // store the values for all selected posts
-        foreach( $_POST[ 'post_ids' ] as $lesson_id ) {
+        foreach ($_POST['post_ids'] as $lesson_id) {
 
             // get the quiz id needed for the quiz meta
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+            $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
             // do not save the items if the value is -1 as this
             // means it was not changed
 
             // update lesson course
-            if( -1 != $new_course ){
-                update_post_meta( $lesson_id, '_lesson_course', $new_course );
+            if ( -1 != $new_course ) {
+                update_post_meta($lesson_id, '_lesson_course', $new_course);
             }
             // update lesson complexity
-            if( -1 != $new_complexity ){
-                update_post_meta( $lesson_id, '_lesson_complexity', $new_complexity );
+            if ( -1 != $new_complexity ) {
+                update_post_meta($lesson_id, '_lesson_complexity', $new_complexity);
             }
 
             // Quiz Related settings
-            if( isset( $quiz_id) && 0 < intval( $quiz_id ) ) {
+            if (isset($quiz_id) && 0 < intval($quiz_id)) {
 
                 // update pass required
                 if (-1 != $new_pass_required) {
 
-                    $checked = $new_pass_required  ? 'on' : '';
+                    $checked = $new_pass_required ? 'on' : '';
                     update_post_meta($quiz_id, '_pass_required', $checked);
-                    unset( $checked );
+                    unset($checked);
                 }
 
                 // update pass percentage
-                if( !empty( $new_pass_percentage) && is_numeric( $new_pass_percentage ) ){
+                if ( ! empty($new_pass_percentage) && is_numeric($new_pass_percentage)) {
 
                         update_post_meta($quiz_id, '_quiz_passmark', $new_pass_percentage);
 
@@ -3142,9 +3142,9 @@ 
                 //
                 if (-1 != $new_enable_quiz_reset ) {
 
-                    $checked = $new_enable_quiz_reset ? 'on' : ''  ;
+                    $checked = $new_enable_quiz_reset ? 'on' : '';
                     update_post_meta($quiz_id, '_enable_quiz_reset', $checked);
-                    unset( $checked );
+                    unset($checked);
 
                 }
 
@@ -3168,31 +3168,31 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function set_quick_edit_admin_defaults( $column_name, $post_id ){
+    public function set_quick_edit_admin_defaults($column_name, $post_id) {
 
-        if( 'lesson-course' != $column_name ){
+        if ('lesson-course' != $column_name) {
             return;
         }
         // load the script
-        $suffix = defined( 'SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
-        wp_enqueue_script( 'sensei-lesson-quick-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-quick-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        wp_enqueue_script('sensei-lesson-quick-edit', Sensei()->plugin_url.'assets/js/admin/lesson-quick-edit'.$suffix.'.js', array('jquery'), Sensei()->version, true);
 
         // setup the values for all meta fields
         $data = array();
-        foreach( $this->meta_fields as $field ){
+        foreach ($this->meta_fields as $field) {
 
-            $data[$field] =  get_post_meta( $post_id, '_'.$field, true );
+            $data[$field] = get_post_meta($post_id, '_'.$field, true);
 
         }
         // add quiz meta fields
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $post_id );
-        foreach( Sensei()->quiz->meta_fields as $field ){
+        $quiz_id = Sensei()->lesson->lesson_quizzes($post_id);
+        foreach (Sensei()->quiz->meta_fields as $field) {
 
-            $data[$field] =  get_post_meta( $quiz_id, '_'.$field, true );
+            $data[$field] = get_post_meta($quiz_id, '_'.$field, true);
 
         }
 
-        wp_localize_script( 'sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data );
+        wp_localize_script('sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data);
 
     }// end quick edit admin defaults
 
@@ -3205,19 +3205,19 @@ 
      * @param array $classes
      * @return array $classes
      */
-    public static function single_course_lessons_classes( $classes ){
+    public static function single_course_lessons_classes($classes) {
 
-        if(  is_singular('course') ){
+        if (is_singular('course')) {
 
             global $post;
             $course_id = $post->ID;
 
-            $lesson_classes = array( 'course', 'post' );
-            if ( is_user_logged_in() ) {
+            $lesson_classes = array('course', 'post');
+            if (is_user_logged_in()) {
 
                 // Check if Lesson is complete
-                $single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
-                if ( $single_lesson_complete ) {
+                $single_lesson_complete = Sensei_Utils::user_completed_lesson(get_the_ID(), get_current_user_id());
+                if ($single_lesson_complete) {
 
                     $lesson_classes[] = 'lesson-completed';
 
@@ -3225,14 +3225,14 @@ 
 
             } // End If Statement
 
-            $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
-            if (  Sensei_Utils::is_preview_lesson( get_the_ID() ) && !$is_user_taking_course ) {
+            $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id());
+            if (Sensei_Utils::is_preview_lesson(get_the_ID()) && ! $is_user_taking_course) {
 
                 $lesson_classes[] = 'lesson-preview';
 
             }
 
-            $classes = array_merge( $classes, $lesson_classes  );
+            $classes = array_merge($classes, $lesson_classes);
 
         }
 
@@ -3246,56 +3246,56 @@ 
      * @since 1.9.0
      * @param $lesson_id
      */
-    public static function the_lesson_meta( $lesson_id ){
+    public static function the_lesson_meta($lesson_id) {
 
         global $wp_query;
         $loop_lesson_number = $wp_query->current_post + 1;
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+        $course_id = Sensei()->lesson->get_course_id($lesson_id);
         $single_lesson_complete = false;
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+        $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id());
 
         // Get Lesson data
         $complexity_array = Sensei()->lesson->lesson_complexities();
 
-        $lesson_complexity = get_post_meta( $lesson_id, '_lesson_complexity', true );
-        if ( '' != $lesson_complexity ) {
+        $lesson_complexity = get_post_meta($lesson_id, '_lesson_complexity', true);
+        if ('' != $lesson_complexity) {
 
             $lesson_complexity = $complexity_array[$lesson_complexity];
 
         }
-        $user_info = get_userdata( absint( get_post()->post_author ) );
-        $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id);
+        $user_info = get_userdata(absint(get_post()->post_author));
+        $is_preview = Sensei_Utils::is_preview_lesson($lesson_id);
         $preview_label = '';
-        if ( $is_preview && !$is_user_taking_course ) {
+        if ($is_preview && ! $is_user_taking_course) {
 
-            $preview_label = Sensei()->frontend->sensei_lesson_preview_title_text( $lesson_id);
-            $preview_label = '<span class="preview-heading">' . $preview_label . '</span>';
+            $preview_label = Sensei()->frontend->sensei_lesson_preview_title_text($lesson_id);
+            $preview_label = '<span class="preview-heading">'.$preview_label.'</span>';
 
         }
 
 
-        $count_markup= '';
+        $count_markup = '';
         /**
          * Filter for if you want the $lesson_count to show next to the lesson.
          *
          * @since 1.0
          * @param bool default false.
          */
-        if( apply_filters( 'sensei_show_lesson_numbers', false ) ) {
+        if (apply_filters('sensei_show_lesson_numbers', false)) {
 
-            $count_markup =  '<span class="lesson-number">' . $loop_lesson_number. '</span>';
+            $count_markup = '<span class="lesson-number">'.$loop_lesson_number.'</span>';
 
         }
 
-        $heading_link_title = sprintf( __( 'Start %s', 'woothemes-sensei' ), get_the_title( $lesson_id ) );
+        $heading_link_title = sprintf(__('Start %s', 'woothemes-sensei'), get_the_title($lesson_id));
 
         ?>
         <header>
             <h2>
-                <a href="<?php echo esc_url_raw( get_permalink( $lesson_id ) ) ?>"
-                   title="<?php esc_attr_e( $heading_link_title ) ?>" >
-                    <?php echo $count_markup. get_the_title( $lesson_id ) . $preview_label; ?>
+                <a href="<?php echo esc_url_raw(get_permalink($lesson_id)) ?>"
+                   title="<?php esc_attr_e($heading_link_title) ?>" >
+                    <?php echo $count_markup.get_the_title($lesson_id).$preview_label; ?>
                 </a>
             </h2>
 
@@ -3304,33 +3304,33 @@ 
                 <?php
 
                 $meta_html = '';
-                $user_lesson_status = Sensei_Utils::user_lesson_status( get_the_ID(), get_current_user_id() );
+                $user_lesson_status = Sensei_Utils::user_lesson_status(get_the_ID(), get_current_user_id());
 
-                $lesson_length = get_post_meta( $lesson_id, '_lesson_length', true );
-                if ( '' != $lesson_length ) {
+                $lesson_length = get_post_meta($lesson_id, '_lesson_length', true);
+                if ('' != $lesson_length) {
 
-                    $meta_html .= '<span class="lesson-length">' .  __( 'Length: ', 'woothemes-sensei' ) . $lesson_length . __( ' minutes', 'woothemes-sensei' ) . '</span>';
+                    $meta_html .= '<span class="lesson-length">'.__('Length: ', 'woothemes-sensei').$lesson_length.__(' minutes', 'woothemes-sensei').'</span>';
 
                 }
 
-                if ( Sensei()->settings->get( 'lesson_author' ) ) {
+                if (Sensei()->settings->get('lesson_author')) {
 
-                    $meta_html .= '<span class="lesson-author">' .  __( 'Author: ', 'woothemes-sensei' ) . '<a href="' . get_author_posts_url( absint( get_post()->post_author ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+                    $meta_html .= '<span class="lesson-author">'.__('Author: ', 'woothemes-sensei').'<a href="'.get_author_posts_url(absint(get_post()->post_author)).'" title="'.esc_attr($user_info->display_name).'">'.esc_html($user_info->display_name).'</a></span>';
 
                 } // End If Statement
-                if ( '' != $lesson_complexity ) {
+                if ('' != $lesson_complexity) {
 
-                    $meta_html .= '<span class="lesson-complexity">' .  __( 'Complexity: ', 'woothemes-sensei' ) . $lesson_complexity .'</span>';
+                    $meta_html .= '<span class="lesson-complexity">'.__('Complexity: ', 'woothemes-sensei').$lesson_complexity.'</span>';
 
                 }
 
-                if ( $single_lesson_complete ) {
+                if ($single_lesson_complete) {
 
-                    $meta_html .= '<span class="lesson-status complete">' .__( 'Complete', 'woothemes-sensei' ) .'</span>';
+                    $meta_html .= '<span class="lesson-status complete">'.__('Complete', 'woothemes-sensei').'</span>';
 
-                } elseif ( $user_lesson_status ) {
+                } elseif ($user_lesson_status) {
 
-                    $meta_html .= '<span class="lesson-status in-progress">' . __( 'In Progress', 'woothemes-sensei' ) .'</span>';
+                    $meta_html .= '<span class="lesson-status in-progress">'.__('In Progress', 'woothemes-sensei').'</span>';
 
                 } // End If Statement
 
@@ -3353,19 +3353,19 @@ 
      *
      * @param $lesson_id
      */
-    public static function the_lesson_thumbnail( $lesson_id ){
+    public static function the_lesson_thumbnail($lesson_id) {
 
-        if( empty( $lesson_id ) ){
+        if (empty($lesson_id)) {
 
             $lesson_id = get_the_ID();
 
         }
 
-        if( 'lesson' != get_post_type( $lesson_id ) ){
+        if ('lesson' != get_post_type($lesson_id)) {
             return;
         }
 
-        echo Sensei()->lesson->lesson_image( $lesson_id );
+        echo Sensei()->lesson->lesson_image($lesson_id);
     }
 
 
@@ -3376,14 +3376,14 @@ 
      * @param string $excerpt
      * @return string $excerpt
      */
-    public static function alter_the_lesson_excerpt( $excerpt ) {
+    public static function alter_the_lesson_excerpt($excerpt) {
 
-        if ('lesson' == get_post_type(get_the_ID())){
+        if ('lesson' == get_post_type(get_the_ID())) {
 
             // remove this hooks to avoid an infinite loop.
-            remove_filter( 'get_the_excerpt', array( 'WooThemes_Sensei_Lesson','alter_the_lesson_excerpt') );
+            remove_filter('get_the_excerpt', array('WooThemes_Sensei_Lesson', 'alter_the_lesson_excerpt'));
 
-            return WooThemes_Sensei_Lesson::lesson_excerpt( get_post( get_the_ID() ) );
+            return WooThemes_Sensei_Lesson::lesson_excerpt(get_post(get_the_ID()));
         }
 
         return $excerpt;
@@ -3398,20 +3398,20 @@ 
      * @param $current_lesson_id
      * @return mixed | bool | int $prerequisite_lesson_id or false
      */
-    public static function get_lesson_prerequisite_id( $current_lesson_id  ){
+    public static function get_lesson_prerequisite_id($current_lesson_id) {
 
-        $prerequisite_lesson_id = get_post_meta( $current_lesson_id , '_lesson_prerequisite', true );
+        $prerequisite_lesson_id = get_post_meta($current_lesson_id, '_lesson_prerequisite', true);
 
         // set ti to false if not a valid prerequisite lesson id
-        if(  empty( $prerequisite_lesson_id )
-            || 'lesson' != get_post_type( $prerequisite_lesson_id )
-            || $prerequisite_lesson_id == $current_lesson_id  ) {
+        if (empty($prerequisite_lesson_id)
+            || 'lesson' != get_post_type($prerequisite_lesson_id)
+            || $prerequisite_lesson_id == $current_lesson_id) {
 
             $prerequisite_lesson_id = false;
 
         }
 
-        return apply_filters( 'sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id );
+        return apply_filters('sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id);
 
     }
 
@@ -3426,27 +3426,27 @@ 
      * @param $user_id
      * @return bool
      */
-    public  static function is_prerequisite_complete( $lesson_id, $user_id  ){
+    public  static function is_prerequisite_complete($lesson_id, $user_id) {
 
-        if( empty( $lesson_id ) || empty( $user_id )
-        || 'lesson' != get_post_type( $lesson_id )
-        ||  ! is_a( get_user_by( 'id', $user_id ), 'WP_User' )){
+        if (empty($lesson_id) || empty($user_id)
+        || 'lesson' != get_post_type($lesson_id)
+        ||  ! is_a(get_user_by('id', $user_id), 'WP_User')) {
 
             return false;
 
         }
 
-        $pre_requisite_id = (string) self::get_lesson_prerequisite_id( $lesson_id );
+        $pre_requisite_id = (string) self::get_lesson_prerequisite_id($lesson_id);
 
         // not a valid pre-requisite so pre-requisite is completed
-        if( 'lesson' != get_post_type( $pre_requisite_id )
-            || ! is_numeric( $pre_requisite_id ) ){
+        if ('lesson' != get_post_type($pre_requisite_id)
+            || ! is_numeric($pre_requisite_id)) {
 
             return true;
 
         }
 
-        return  Sensei_Utils::user_completed_lesson( $pre_requisite_id, $user_id );
+        return  Sensei_Utils::user_completed_lesson($pre_requisite_id, $user_id);
 
     }// end is_prerequisite_complete
 
@@ -3455,20 +3455,20 @@ 
      *
      * @since 1.9.0
      */
-    public  static function user_not_taking_course_message(){
+    public  static function user_not_taking_course_message() {
 
         $lesson_id = get_the_ID();
 
-        if( 'lesson' != get_post_type( $lesson_id ) ){
+        if ('lesson' != get_post_type($lesson_id)) {
             return;
         }
 
-        $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id );
-        $pre_requisite_complete = self::is_prerequisite_complete( $lesson_id , get_current_user_id() );
-        $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+        $is_preview = Sensei_Utils::is_preview_lesson($lesson_id);
+        $pre_requisite_complete = self::is_prerequisite_complete($lesson_id, get_current_user_id());
+        $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
+        $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id());
 
-        if ( $pre_requisite_complete && $is_preview && !$user_taking_course ) {
+        if ($pre_requisite_complete && $is_preview && ! $user_taking_course) {
             ?>
 
             <div class="sensei-message alert">
@@ -3488,11 +3488,11 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_signup_link( ){
+    public static function course_signup_link( ) {
 
-        $course_id =  Sensei()->lesson->get_course_id( get_the_ID() );
+        $course_id = Sensei()->lesson->get_course_id(get_the_ID());
 
-        if ( empty( $course_id ) || 'course' != get_post_type( $course_id ) || sensei_all_access() ) {
+        if (empty($course_id) || 'course' != get_post_type($course_id) || sensei_all_access()) {
 
             return;
 
@@ -3502,24 +3502,24 @@ 
         <section class="course-signup lesson-meta">
 
             <?php
-            $wc_post_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
+            $wc_post_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true);
 
-            if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
+            if (Sensei_WC::is_woocommerce_active() && (0 < $wc_post_id)) {
 
                 global $current_user;
-                if( is_user_logged_in() ) {
+                if (is_user_logged_in()) {
                     wp_get_current_user();
 
-                    $course_purchased = Sensei_Utils::sensei_customer_bought_product( $current_user->user_email, $current_user->ID, $wc_post_id );
+                    $course_purchased = Sensei_Utils::sensei_customer_bought_product($current_user->user_email, $current_user->ID, $wc_post_id);
 
-                    if( $course_purchased ) {
+                    if ($course_purchased) {
 
-                        $prereq_course_id = get_post_meta( $course_id, '_course_prerequisite',true );
-                        $course_link = '<a href="' . esc_url( get_permalink( $prereq_course_id ) ) . '" title="' . esc_attr( get_the_title( $prereq_course_id ) ) . '">' . __( 'the previous course', 'woothemes-sensei' )  . '</a>';
+                        $prereq_course_id = get_post_meta($course_id, '_course_prerequisite', true);
+                        $course_link = '<a href="'.esc_url(get_permalink($prereq_course_id)).'" title="'.esc_attr(get_the_title($prereq_course_id)).'">'.__('the previous course', 'woothemes-sensei').'</a>';
                         ?>
                             <div class="sensei-message info">
 
-                                <?php  echo sprintf( __( 'Please complete %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link ); ?>
+                                <?php  echo sprintf(__('Please complete %1$s before starting the lesson.', 'woothemes-sensei'), $course_link); ?>
 
                             </div>
 
@@ -3528,12 +3528,12 @@ 
                         <div class="sensei-message info">
 
                             <?php
-                            $course_link = '<a href="' . esc_url( get_permalink( $course_id ) )
-                                            . '"title="' . __( 'Sign Up', 'woothemes-sensei' )
-                                            . '">' . __( 'course', 'woothemes-sensei' )
+                            $course_link = '<a href="'.esc_url(get_permalink($course_id))
+                                            . '"title="'.__('Sign Up', 'woothemes-sensei')
+                                            . '">'.__('course', 'woothemes-sensei')
                                             . '</a>';
 
-                            echo  sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
+                            echo  sprintf(__('Please purchase the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link);
 
                             ?>
 
@@ -3542,29 +3542,29 @@ 
 
                 <?php } else { ?>
 
-                    <div class="sensei-message info"><?php echo sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">' . __( 'course', 'woothemes-sensei' ) . '</a>' ); ?></div>
+                    <div class="sensei-message info"><?php echo sprintf(__('Please purchase the %1$s before starting the lesson.', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Sign Up', 'woothemes-sensei').'">'.__('course', 'woothemes-sensei').'</a>'); ?></div>
 
                 <?php } ?>
 
             <?php } else { ?>
 
-            <?php if( ! Sensei_Utils::user_started_course( $course_id, get_current_user_id() ) &&  sensei_is_login_required() )  : ?>
+            <?php if ( ! Sensei_Utils::user_started_course($course_id, get_current_user_id()) && sensei_is_login_required())  : ?>
 
                 <div class="sensei-message alert">
                     <?php
-                    $course_link =  '<a href="'
-                                        . esc_url( get_permalink( $course_id ) )
-                                        . '" title="' . __( 'Sign Up', 'woothemes-sensei' )
-                                        . '">' . __( 'course', 'woothemes-sensei' )
+                    $course_link = '<a href="'
+                                        . esc_url(get_permalink($course_id))
+                                        . '" title="'.__('Sign Up', 'woothemes-sensei')
+                                        . '">'.__('course', 'woothemes-sensei')
                                     . '</a>';
 
-					if ( Sensei_Utils::is_preview_lesson( get_the_ID( ) ) ) {
+					if (Sensei_Utils::is_preview_lesson(get_the_ID( ))) {
 
-						echo sprintf( __( 'This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ),  $course_link );
+						echo sprintf(__('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei'), $course_link);
 
 					} else {
 
-						echo sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ),  $course_link );
+						echo sprintf(__('Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link);
 
 					}
 
@@ -3585,14 +3585,14 @@ 
      *
      * @since 1.9.0
      */
-    public  static function prerequisite_complete_message(){
+    public  static function prerequisite_complete_message() {
 
-        $lesson_prerequisite =  WooThemes_Sensei_Lesson::get_lesson_prerequisite_id( get_the_ID() );
+        $lesson_prerequisite = WooThemes_Sensei_Lesson::get_lesson_prerequisite_id(get_the_ID());
         $lesson_has_pre_requisite = $lesson_prerequisite > 0;
-        if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(  get_the_ID(), get_current_user_id() ) && $lesson_has_pre_requisite ) {
+        if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(get_the_ID(), get_current_user_id()) && $lesson_has_pre_requisite) {
 
-            $prerequisite_lesson_link  = '<a href="' . esc_url( get_permalink( $lesson_prerequisite ) ) . '" title="' . esc_attr(  sprintf( __( 'You must first complete: %1$s', 'woothemes-sensei' ), get_the_title( $lesson_prerequisite ) ) ) . '">' . get_the_title( $lesson_prerequisite ). '</a>';
-            echo sprintf( __( 'You must first complete %1$s before viewing this Lesson', 'woothemes-sensei' ), $prerequisite_lesson_link );
+            $prerequisite_lesson_link = '<a href="'.esc_url(get_permalink($lesson_prerequisite)).'" title="'.esc_attr(sprintf(__('You must first complete: %1$s', 'woothemes-sensei'), get_the_title($lesson_prerequisite))).'">'.get_the_title($lesson_prerequisite).'</a>';
+            echo sprintf(__('You must first complete %1$s before viewing this Lesson', 'woothemes-sensei'), $prerequisite_lesson_link);
 
         }
 
@@ -3604,7 +3604,7 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_lesson_archive_header_hook(){
+    public static function deprecate_sensei_lesson_archive_header_hook() {
 
         sensei_do_deprecated_action('sensei_lesson_archive_header', '1.9.0', 'sensei_loop_lesson_inside_before');
 
@@ -3620,9 +3620,9 @@ 
 
         $before_html = '<header class="archive-header"><h1>';
         $after_html = '</h1></header>';
-        $html = $before_html .  __( 'Lessons Archive', 'woothemes-sensei' ) . $after_html;
+        $html = $before_html.__('Lessons Archive', 'woothemes-sensei').$after_html;
 
-        echo apply_filters( 'sensei_lesson_archive_title', $html );
+        echo apply_filters('sensei_lesson_archive_title', $html);
 
     } // sensei_course_archive_header()
 
@@ -3632,7 +3632,7 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
         global $post;
 
@@ -3645,7 +3645,7 @@ 
                 /**
                  * Filter documented in class-sensei-messages.php the_title
                  */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+                echo apply_filters('sensei_single_title', get_the_title($post), $post->post_type);
                 ?>
 
             </h1>
@@ -3663,16 +3663,16 @@ 
      *
      * @param $post_id
      */
-    public static function flush_rewrite_rules( $post_id ){
+    public static function flush_rewrite_rules($post_id) {
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 
             return;
 
         }
 
 
-        if( 'lesson' == get_post_type( $post_id )  ){
+        if ('lesson' == get_post_type($post_id)) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -3689,21 +3689,21 @@ 
      * @param int $lesson_id
      * @param int $user_id
      */
-    public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0 ) {
+    public static function footer_quiz_call_to_action($lesson_id = 0, $user_id = 0) {
 
 
-        $lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
-        $user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
-        $lesson_prerequisite       = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
-        $lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-        $quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
+        $lesson_id                 = empty($lesson_id) ? get_the_ID() : $lesson_id;
+        $user_id                   = empty($lesson_id) ? get_current_user_id() : $user_id;
+        $lesson_prerequisite       = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true);
+        $lesson_course_id          = (int) get_post_meta($lesson_id, '_lesson_course', true);
+        $quiz_id                   = Sensei()->lesson->lesson_quizzes($lesson_id);
+        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson(intval($lesson_id), $user_id);
         $show_actions              = is_user_logged_in() ? true : false;
 
-        if( intval( $lesson_prerequisite ) > 0 ) {
+        if (intval($lesson_prerequisite) > 0) {
 
             // If the user hasn't completed the prereq then hide the current actions
-            $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id );
+            $show_actions = Sensei_Utils::user_completed_lesson($lesson_prerequisite, $user_id);
 
         }
         ?>
@@ -3711,19 +3711,19 @@ 
         <footer>
 
             <?php
-            if( $show_actions && $quiz_id && Sensei()->access_settings() ) {
+            if ($show_actions && $quiz_id && Sensei()->access_settings()) {
 
-                $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
-                if( $has_quiz_questions ) {
+                $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
+                if ($has_quiz_questions) {
                     ?>
 
                     <p>
 
                         <a class="button"
-                           href="<?php echo esc_url_raw( get_permalink( $quiz_id ) ); ?>"
-                           title="<?php _e( 'View the Lesson Quiz', 'woothemes-sensei'  ); ?>">
+                           href="<?php echo esc_url_raw(get_permalink($quiz_id)); ?>"
+                           title="<?php _e('View the Lesson Quiz', 'woothemes-sensei'); ?>">
 
-                            <?php  _e( 'View the Lesson Quiz', 'woothemes-sensei' ); ?>
+                            <?php  _e('View the Lesson Quiz', 'woothemes-sensei'); ?>
 
                         </a>
 
@@ -3734,11 +3734,11 @@ 
 
             } // End If Statement
 
-            if ( $show_actions && ! $has_user_completed_lesson ) {
+            if ($show_actions && ! $has_user_completed_lesson) {
 
                 sensei_complete_lesson_button();
 
-            } elseif( $show_actions ) {
+            } elseif ($show_actions) {
 
                 sensei_reset_lesson_button();
 
@@ -3755,20 +3755,20 @@ 
      *
      * @since 1.9.0
      */
-    public static function output_comments(){
+    public static function output_comments() {
 
-        if( ! is_user_logged_in() ){
+        if ( ! is_user_logged_in()) {
             return;
         }
 
-        $pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete( get_the_ID(), get_current_user_id() );
-        $course_id = Sensei()->lesson->get_course_id( get_the_ID() );
-        $allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
-        $user_taking_course = Sensei_Utils::user_started_course($course_id );
+        $pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete(get_the_ID(), get_current_user_id());
+        $course_id = Sensei()->lesson->get_course_id(get_the_ID());
+        $allow_comments = Sensei()->settings->settings['lesson_comments'];
+        $user_taking_course = Sensei_Utils::user_started_course($course_id);
 
-        $lesson_allow_comments = $allow_comments && $pre_requisite_complete  && $user_taking_course;
+        $lesson_allow_comments = $allow_comments && $pre_requisite_complete && $user_taking_course;
 
-        if (  $lesson_allow_comments || is_singular( 'sensei_message' ) ) {
+        if ($lesson_allow_comments || is_singular('sensei_message')) {
 
             comments_template();
 
@@ -3784,26 +3784,26 @@ 
      *
      * @since 1.9.0
      */
-    public static function user_lesson_quiz_status_message( $lesson_id = 0, $user_id = 0){
+    public static function user_lesson_quiz_status_message($lesson_id = 0, $user_id = 0) {
 
-        $lesson_id                 =  empty( $lesson_id ) ?  get_the_ID() : $lesson_id;
-        $user_id                   = empty( $lesson_id ) ?  get_current_user_id() : $user_id;
-        $lesson_course_id          = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-        $quiz_id                   = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id );
+        $lesson_id                 = empty($lesson_id) ? get_the_ID() : $lesson_id;
+        $user_id                   = empty($lesson_id) ? get_current_user_id() : $user_id;
+        $lesson_course_id          = (int) get_post_meta($lesson_id, '_lesson_course', true);
+        $quiz_id                   = Sensei()->lesson->lesson_quizzes($lesson_id);
+        $has_user_completed_lesson = Sensei_Utils::user_completed_lesson(intval($lesson_id), $user_id);
 
 
-        if ( $quiz_id && is_user_logged_in()
-            && Sensei_Utils::user_started_course( $lesson_course_id, $user_id ) ) {
+        if ($quiz_id && is_user_logged_in()
+            && Sensei_Utils::user_started_course($lesson_course_id, $user_id)) {
 
             $no_quiz_count = 0;
-            $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+            $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
 
             // Display lesson quiz status message
-            if ( $has_user_completed_lesson || $has_quiz_questions ) {
-                $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id, $user_id, true );
-                echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
-                if( $has_quiz_questions ) {
+            if ($has_user_completed_lesson || $has_quiz_questions) {
+                $status = Sensei_Utils::sensei_user_quiz_status_message($lesson_id, $user_id, true);
+                echo '<div class="sensei-message '.$status['box_class'].'">'.$status['message'].'</div>';
+                if ($has_quiz_questions) {
                    // echo $status['extra'];
                 } // End If Statement
             } // End If Statement
@@ -3819,11 +3819,11 @@ 
      * @param $content
      * @return string
      */
-    public static function limit_archive_content ( $content ){
+    public static function limit_archive_content($content) {
 
-        if( is_archive('lesson') && Sensei()->settings->get('access_permission') ){
+        if (is_archive('lesson') && Sensei()->settings->get('access_permission')) {
 
-            return wp_trim_words( $content, $num_words = 30, $more = '…' );
+            return wp_trim_words($content, $num_words = 30, $more = '…');
         }
 
         return $content;
@@ -3836,9 +3836,9 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_all_lesson_ids(){
+    public static function get_all_lesson_ids() {
 
-        return get_posts( array(
+        return get_posts(array(
             'post_type'=>'lesson',
             'fields'=>'ids',
             'post_status' => 'publish',
@@ -3855,4 +3855,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Lesson extends Sensei_Lesson{}
+class WooThemes_Sensei_Lesson extends Sensei_Lesson {}

includes/class-sensei-modules.php

Indentation +1888 added lines, -1888 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,1405 +335,1405 @@ 
             </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(){
-
-	    if ( ! is_singular( 'course' )  ) {
-		    return;
-	    }
-
-        // 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(){
+
+		if ( ! is_singular( 'course' )  ) {
+			return;
+		}
+
+		// 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>
@@ -1748,9 +1748,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>
@@ -1760,9 +1760,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">
@@ -1777,331 +1777,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

Spacing +262 added lines, -262 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Sensei Modules Class
@@ -21,33 +21,33 @@ 
     private $order_page_slug;
     public $taxonomy;
 
-    public function __construct( $file )
+    public function __construct($file)
     {
         $this->file = $file;
         $this->dir = dirname($this->file);
-        $this->assets_dir = trailingslashit($this->dir) . 'assets';
+        $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 );
+        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 );
+        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' ) );
+        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 );
+        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);
@@ -55,20 +55,20 @@ 
         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_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_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($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
@@ -80,10 +80,10 @@ 
         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 );
+        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);
+        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);
@@ -95,22 +95,22 @@ 
         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('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' ) );
+        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_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 );
+        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' ));
+        add_action('admin_init', array('Sensei_Core_Modules', 'remove_default_modules_box'));
 
     } // end constructor
 
@@ -127,9 +127,9 @@ 
      * @return void
      * @deprecated since 1.9.0
      */
-    public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
+    public function change_module_term_slug($term_id, $tt_id, $taxonomy) {
 
-        _deprecated_function('change_module_term_slug', '1.9.0' );
+        _deprecated_function('change_module_term_slug', '1.9.0');
 
     }// end add_module_term_group
 
@@ -143,20 +143,20 @@ 
      *
      * @return void
      */
-    public function modules_metaboxes( $post_type, $post )
+    public function modules_metaboxes($post_type, $post)
     {
-        if ('lesson' == $post_type ) {
+        if ('lesson' == $post_type) {
 
             // Remove default taxonomy meta box from Lesson edit screen
-            remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
+            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');
+            add_meta_box($this->taxonomy.'_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
         }
 
-        if( 'course' == $post_type ){
+        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');
+            add_meta_box($this->taxonomy.'_course_mb', __('Course Modules', 'woothemes-sensei'), array($this, 'course_module_metabox'), 'course', 'side', 'core');
         }
     }
 
@@ -192,21 +192,21 @@ 
             $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))) . '" />';
+            $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>';
+                $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 .= '<option value="'.esc_attr(absint($module->term_id)).'"'.selected($module->term_id, $lesson_module, false).'>'.esc_html($module->name).'</option>'."\n";
                 }
-                $html .= '</select>' . "\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>';
+                $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>';
+            $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
@@ -225,38 +225,38 @@ 
         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))) {
+        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)) {
+        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)) {
+        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 (isset($_POST['lesson_module'])) {
 
-            if( empty ( $_POST['lesson_module'] ) ){
-                wp_delete_object_term_relationships($post_id, $this->taxonomy  );
+            if (empty ($_POST['lesson_module'])) {
+                wp_delete_object_term_relationships($post_id, $this->taxonomy);
                 return true;
             }
 
-            $module_id = intval( $_POST['lesson_module'] );
+            $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);
+            if ( ! get_post_meta($post_id, '_order_module_'.$module_id, true)) {
+                update_post_meta($post_id, '_order_module_'.$module_id, 0);
             }
         }
 
@@ -314,7 +314,7 @@ 
         $module_courses = array();
         if (isset($courses) && is_array($courses)) {
             foreach ($courses as $course) {
-                $module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
+                $module_courses[] = array('id' =>$course->ID, 'details'=>$course->post_title);
             }
         }
 
@@ -324,8 +324,8 @@ 
                     for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label></th>
             <td>
                 <input type="hidden"
-                       data-defaults="<?php echo esc_attr( json_encode($module_courses)); ?>"
-                       value="<?php echo esc_attr( json_encode($module_courses) ); ?>"
+                       data-defaults="<?php echo esc_attr(json_encode($module_courses)); ?>"
+                       value="<?php echo esc_attr(json_encode($module_courses)); ?>"
                        id="module_courses" name="module_courses"
                        class="ajax_chosen_select_courses"
                        placeholder="<?php esc_attr_e('Search for courses...', 'woothemes-sensei'); ?>"
@@ -370,11 +370,11 @@ 
         }
 
         // Add module to selected courses
-        if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
+        if (isset($_POST['module_courses']) && ! empty($_POST['module_courses'])) {
 
-            $course_ids = explode( ",", $_POST['module_courses'] );
+            $course_ids = explode(",", $_POST['module_courses']);
 
-            foreach ( $course_ids as $course_id ) {
+            foreach ($course_ids as $course_id) {
 
                 wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
 
@@ -438,11 +438,11 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function single_course_modules(){
+    public function single_course_modules() {
 
-        _deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
+        _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' )  )  {
+        if (is_singular('course') && has_term('', 'module')) {
 
             $this->load_course_module_content_template();
 
@@ -459,15 +459,15 @@ 
 
         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 ( ! $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_text = '<span class="preview-label">'.$title_text.'</span>';
                 }
-                $title .= ' ' . $title_text;
+                $title .= ' '.$title_text;
             }
         }
 
@@ -481,8 +481,8 @@ 
         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>';
+                if ($module) {
+                    $html .= ' '.$separator.' <a href="'.esc_url($module->url).'" title="'.__('Back to the module', 'woothemes-sensei').'">'.$module->name.'</a>';
                 }
             }
         }
@@ -490,7 +490,7 @@ 
         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>';
+                $html .= '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Back to the course', 'woothemes-sensei').'">'.get_the_title($course_id).'</a>';
             }
         }
         return $html;
@@ -505,18 +505,18 @@ 
      */
     public function module_archive_template($template) {
 
-        if ( ! is_tax($this->taxonomy) ) {
+        if ( ! is_tax($this->taxonomy)) {
             return $template;
         }
 
         $file = 'archive-lesson.php';
-        $find = array( $file, Sensei()->template_url . $file );
+        $find = array($file, Sensei()->template_url.$file);
 
         // locate the template file
         $template = locate_template($find);
-        if (!$template) {
+        if ( ! $template) {
 
-            $template = Sensei()->plugin_path() . 'templates/' . $file;
+            $template = Sensei()->plugin_path().'templates/'.$file;
 
         }
 
@@ -542,7 +542,7 @@ 
             // 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('meta_key', '_order_module_'.$module_id);
                 $query->set('orderby', 'meta_value_num date');
             } else {
                 $query->set('orderby', 'menu_order');
@@ -603,10 +603,10 @@ 
                     $status = __('In progress', 'woothemes-sensei');
                     $class = 'in-progress';
                 }
-                echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
+                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>';
+            echo '<p class="archive-description module-description">'.apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id).'</p>';
         }
     }
 
@@ -731,7 +731,7 @@ 
     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));
+        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);
     }
@@ -748,9 +748,9 @@ 
      */
     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);
+        $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 (float) $module_progress;
         }
         return false;
     }
@@ -803,7 +803,7 @@ 
         }
         $module_progress = ($completed_count / $lesson_count) * 100;
 
-        return (float)$module_progress;
+        return (float) $module_progress;
     }
 
     /**
@@ -816,7 +816,7 @@ 
     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','' );
+        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'));
@@ -843,19 +843,19 @@ 
             $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";
+                $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";
+        $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)) {
@@ -863,30 +863,30 @@ 
                 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 .= '<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";
+        $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() );
+                $modules = $this->append_teacher_name_to_module($modules, array('module'), array());
                 if ($modules) {
 
                     $order = $this->get_course_module_order($course_id);
 
-                    $order_string='';
+                    $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";
+                    $html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+                    $html .= '<ul class="sortable-module-list">'."\n";
                     $count = 0;
                     foreach ($modules as $module) {
                         $count++;
@@ -900,14 +900,14 @@ 
                         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 .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($module->term_id).'" style="width: 100%;"> '.$module->name.'</span></li>'."\n";
                     }
-                    $html .= '</ul>' . "\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";
+                    $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";
                 }
             }
         }
@@ -944,7 +944,7 @@ 
     {
         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>';
+                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>';
             }
         }
     }
@@ -1036,7 +1036,7 @@ 
                 $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>';
+                $column_data = '<a href="'.admin_url('edit.php?module='.urlencode($module->slug).'&post_type=lesson').'">'.intval($total_lessons).'</a>';
                 break;
         }
 
@@ -1054,7 +1054,7 @@ 
     public function analysis_overview_column_title($columns)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $new_columns = array();
             if (is_array($columns) && 0 < count($columns)) {
                 foreach ($columns as $column => $title) {
@@ -1082,15 +1082,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated column data
      */
-    public function analysis_overview_column_data($columns, $lesson )
+    public function analysis_overview_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        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>';
+                    $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;
                 }
             }
@@ -1111,7 +1111,7 @@ 
      */
     public function analysis_course_column_title($columns)
     {
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $columns['lesson_module'] = __('Module', 'woothemes-sensei');
         }
         return $columns;
@@ -1126,15 +1126,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated columns data
      */
-    public function analysis_course_column_data($columns, $lesson )
+    public function analysis_course_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['course_id'] ) ) {
+        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>';
+                    $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;
                 }
             }
@@ -1161,7 +1161,7 @@ 
     public function get_lesson_module($lesson_id = 0)
     {
         $lesson_id = intval($lesson_id);
-        if ( ! ( intval( $lesson_id > 0) ) ) {
+        if ( ! (intval($lesson_id > 0))) {
             return false;
         }
 
@@ -1169,9 +1169,9 @@ 
         $modules = wp_get_post_terms($lesson_id, $this->taxonomy);
 
         //check if error returned
-        if(    empty( $modules )
-            || is_wp_error( $modules )
-            || isset( $modules['errors'] ) ){
+        if (empty($modules)
+            || is_wp_error($modules)
+            || isset($modules['errors'])) {
 
             return false;
 
@@ -1179,7 +1179,7 @@ 
 
        // 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 ){
+       foreach ($modules as $module) {
            break;
        }
 
@@ -1192,7 +1192,7 @@ 
         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)){
+            if ( ! has_term($module, $this->taxonomy, $course_id)) {
                 return false;
             }
 
@@ -1264,8 +1264,8 @@ 
      */
     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');
+        wp_register_style($this->taxonomy.'-frontend', esc_url($this->assets_url).'css/modules-frontend.css', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-frontend');
 
     }
 
@@ -1276,37 +1276,37 @@ 
      *
      * @return void
      */
-    public function admin_enqueue_scripts( $hook ) {
+    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(
+        $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 ) ) {
+        if ( ! in_array($hook, $script_on_pages_white_list)) {
             return;
         }
 
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $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 );
+        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' )
+            'search_courses_nonce' => wp_create_nonce('search-courses'),
+            'selectPlaceholder'    => __('Search for courses', 'woothemes-sensei')
         );
 
-        wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
+        wp_localize_script($this->taxonomy.'-admin', 'modulesAdmin', $localize_modulesAdmin);
     }
 
     /**
@@ -1318,8 +1318,8 @@ 
      */
     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');
+        wp_register_style($this->taxonomy.'-sortable', esc_url($this->assets_url).'css/modules-admin.css', '', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-sortable');
 
     }
 
@@ -1333,9 +1333,9 @@ 
      */
     public function course_modules_title( ) {
 
-       if( sensei_module_has_lessons() ){
+       if (sensei_module_has_lessons()) {
 
-            echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
+            echo '<header><h2>'.__('Modules', 'woothemes-sensei').'</h2></header>';
 
         }
 
@@ -1348,22 +1348,22 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function load_course_module_content_template(){
+    public function load_course_module_content_template() {
 
-	    if ( ! is_singular( 'course' )  ) {
+	    if ( ! is_singular('course')) {
 		    return;
 	    }
 
         // 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 ){
+        $located_template = locate_template(Sensei()->template_url.'single-course/course-modules.php');
+        if ($located_template) {
 
-            Sensei_Templates::get_template( 'single-course/course-modules.php' );
+            Sensei_Templates::get_template('single-course/course-modules.php');
             return;
 
         }
 
-        Sensei_Templates::get_template( 'single-course/modules.php' );
+        Sensei_Templates::get_template('single-course/modules.php');
 
     } // end course_module_content
 
@@ -1376,15 +1376,15 @@ 
      * @param $term_id
      * @return array $lessons
      */
-    public function get_lessons( $course_id , $term_id ){
+    public function get_lessons($course_id, $term_id) {
 
-        $lesson_query = $this->get_lessons_query( $course_id, $term_id );
+        $lesson_query = $this->get_lessons_query($course_id, $term_id);
 
-        if( isset( $lesson_query->posts ) ){
+        if (isset($lesson_query->posts)) {
 
             return $lesson_query->posts;
 
-        }else{
+        } else {
 
             return array();
 
@@ -1401,9 +1401,9 @@ 
      * @param $term_id
      * @return WP_Query $lessons_query
      */
-    public function get_lessons_query( $course_id , $term_id ){
+    public function get_lessons_query($course_id, $term_id) {
 
-        if( empty( $term_id ) || empty( $course_id ) ){
+        if (empty($term_id) || empty($course_id)) {
 
             return array();
 
@@ -1424,7 +1424,7 @@ 
                 array(
                     'taxonomy' => 'module',
                     'field' => 'id',
-                    'terms' => intval( $term_id )
+                    'terms' => intval($term_id)
                 )
             ),
             'orderby' => 'menu_order',
@@ -1432,12 +1432,12 @@ 
             'suppress_filters' => 0
         );
 
-        if (version_compare( Sensei()->version, '1.6.0', '>=')) {
-            $args['meta_key'] = '_order_module_' . intval( $term_id );
+        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 );
+        $lessons_query = new WP_Query($args);
 
         return $lessons_query;
 
@@ -1452,37 +1452,37 @@ 
      *
      * @return array $non_module_lessons
      */
-    public function get_none_module_lessons( $course_id ){
+    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 ) ) {
+        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') ){
+        if (get_transient('sensei_'.$course_id.'_none_module_lessons')) {
 
-            return 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 );
+        $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 ) ){
+        if (empty($course_modules) || ! is_array($course_modules)) {
 
-            return  Sensei()->course->course_lessons( $course_id );
+            return  Sensei()->course->course_lessons($course_id);
 
         }
 
         $terms = array();
-        foreach( $course_modules as $module ){
+        foreach ($course_modules as $module) {
 
-            array_push( $terms ,  $module->term_id );
+            array_push($terms, $module->term_id);
 
         }
 
@@ -1493,7 +1493,7 @@ 
             'meta_query' => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                     'compare' => '='
                 )
             ),
@@ -1510,11 +1510,11 @@ 
             'suppress_filters' => 0
         );
 
-        $wp_lessons_query = new WP_Query( $args );
+        $wp_lessons_query = new WP_Query($args);
 
-        if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
+        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 );
+            set_transient('sensei_'.$course_id.'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS);
         }
 
         return $non_module_lessons;
@@ -1525,7 +1525,7 @@ 
      *
      * @since 1.8.0
      */
-    public function setup_modules_taxonomy(){
+    public function setup_modules_taxonomy() {
 
         $labels = array(
             'name' => __('Modules', 'woothemes-sensei'),
@@ -1562,11 +1562,11 @@ 
             'show_in_nav_menus' => false,
             'show_in_quick_edit' => false,
             'show_ui' => true,
-            'rewrite' => array('slug' => $modules_rewrite_slug ),
+            'rewrite' => array('slug' => $modules_rewrite_slug),
             'labels' => $labels
         );
 
-        register_taxonomy( 'module' , array('course', 'lesson'), $args);
+        register_taxonomy('module', array('course', 'lesson'), $args);
 
     }// end setup_modules_taxonomy
 
@@ -1578,12 +1578,12 @@ 
      * @since 1.8.0
      * @return void
      */
-    function redirect_to_lesson_module_taxonomy_to_course( ){
+    function redirect_to_lesson_module_taxonomy_to_course( ) {
 
-        global $typenow , $taxnow;
+        global $typenow, $taxnow;
 
-        if( 'lesson'== $typenow && 'module'==$taxnow ){
-            wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
+        if ('lesson' == $typenow && 'module' == $taxnow) {
+            wp_safe_redirect(esc_url_raw('edit-tags.php?taxonomy=module&post_type=course'));
         }
 
     }// end redirect to course taxonomy
@@ -1596,18 +1596,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_lessons_menu_model_taxonomy(){
+    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'] ) ){
+        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 ){
+        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 ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=lesson'][$index]);
             }
         }
 
@@ -1621,18 +1621,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_courses_menu_model_taxonomy(){
+    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'] ) ){
+        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 ){
+        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 ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=course'][$index]);
             }
         }
 
@@ -1648,12 +1648,12 @@ 
      * @param string $term_name
      * @return array $owners { type WP_User }. Empty array if none if found.
      */
-    public static function get_term_authors( $term_name ){
+    public static function get_term_authors($term_name) {
 
-        $terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
+        $terms = get_terms(array('module'), array('name__like'=>$term_name, 'hide_empty' => false));
 
         $owners = array();
-        if( empty( $terms ) ){
+        if (empty($terms)) {
 
             return $owners;
 
@@ -1663,11 +1663,11 @@ 
 
 
         //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 ){
+        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  );
+                $owners[] = Sensei_Core_Modules::get_term_author($term->slug);
 
             }// end if term name
 
@@ -1688,30 +1688,30 @@ 
      * @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='' ){
+    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;
 
         }
 
         // look for the author in the slug
-        $slug_parts = explode( '-', $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 );
+            $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 (is_a($author, 'WP_User')) {
 
-                $term_owner =  $author;
+                $term_owner = $author;
 
             }
         }
@@ -1728,48 +1728,48 @@ 
      *
      * @param WP_Post $post Post object.
      */
-    public function course_module_metabox( $post ) {
+    public function course_module_metabox($post) {
 
         $tax_name = 'module';
-        $taxonomy = get_taxonomy( '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>
-                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
             </ul>
 
             <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
                 <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-                    <?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+                    <?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
                 </ul>
             </div>
 
             <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
                 <?php
-                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                $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 ) ); ?>
+                    <?php wp_terms_checklist($post->ID, array('taxonomy'=>$tax_name, 'popular_cats' => $popular_ids)); ?>
                 </ul>
             </div>
-            <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+            <?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
                 <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
                     <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 );
+                            printf(__('+ %s'), $taxonomy->labels->add_new_item);
                             ?>
                         </a>
                     </h4>
                     <p id="sensei-<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
-                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr( $taxonomy->labels->add_new_item ); ?></a>
-                        <?php wp_nonce_field( '_ajax_nonce-add-' . $tax_name, 'add_module_nonce' ); ?>
+                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
+                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr($taxonomy->labels->add_new_item); ?></a>
+                        <?php wp_nonce_field('_ajax_nonce-add-'.$tax_name, 'add_module_nonce'); ?>
                         <span id="<?php echo $tax_name; ?>-ajax-response"></span>
                     </p>
                 </div>
@@ -1789,55 +1789,55 @@ 
     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'] );
+        $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 {
 
-            $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)  );
+        $slug = wp_insert_term($term_name, 'module', array('slug'=> $term_slug));
 
         // send error for all errors except term exits
-        if( is_wp_error( $slug ) ){
+        if (is_wp_error($slug)) {
 
             // 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 (isset($slug->errors['term_exists'])) {
 
-                $term = get_term_by( 'slug', $term_slug, 'module');
+                $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 );
+                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
 
-        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 ) );
+        wp_send_json_success(array('termId' => $slug['term_id'], 'termName' => $term_name));
 
     }
 
@@ -1849,26 +1849,26 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_module_terms( $terms, $taxonomies, $args ){
+    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()  ){
+        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 );
+        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'] ){
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
             // change only scrub the terms ids form the array keys
-            $terms = array_keys( $terms );
+            $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('get_terms', array($this, 'filter_module_terms'), 20, 3);
 
         return $teachers_terms;
     }// end filter_module_terms
@@ -1881,25 +1881,25 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
+    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 )
+        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 )  ){
+            ||  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] ) ){
+        if (is_object($terms[0])) {
             return $term_objects;
         }
 
         $terms = array();
-        foreach( $term_objects as $term_object ){
+        foreach ($term_objects as $term_object) {
             $terms[] = $term_object->term_id;
         }
 
@@ -1917,20 +1917,20 @@ 
      * @param $user_id
      * @return array
      */
-    public function filter_terms_by_owner( $terms, $user_id ){
+    public function filter_terms_by_owner($terms, $user_id) {
 
         $users_terms = array();
 
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $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 ) {
+            if ($user_id == $author->ID) {
                 // add the term to the teachers terms
                 $users_terms[] = $term;
             }
@@ -1949,34 +1949,34 @@ 
      *
      * @since 1.8.0
      */
-    public function append_teacher_name_to_module( $terms, $taxonomies, $args )
+    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()) {
+        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']) {
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
 
             return $terms;
 
         }
 
         // loop through and update all terms adding the author name
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $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
@@ -2005,23 +2005,23 @@ 
      * @sine 1.9.0
      * @param $post_id
      */
-    public static function reset_none_modules_transient ( $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' ) ) ){
+        if (in_array(get_post_type($post_id), array('course', 'lesson'))) {
 
             $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');
 
             }
 
@@ -2036,9 +2036,9 @@ 
      * @deprecated since 1.9.0
      *
      */
-    public static function deprecate_sensei_single_course_modules_content(){
+    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');
 
     }
 
@@ -2049,12 +2049,12 @@ 
      *
      * @since 1.9.0
      */
-    public static function setup_single_course_module_loop(){
+    public static function setup_single_course_module_loop() {
 
         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;
@@ -2062,22 +2062,22 @@ 
         $sensei_modules_loop['current'] = -1;
 
         // exit if this course doesn't have modules
-        if( !$modules || empty( $modules )  ){
+        if ( ! $modules || empty($modules)) {
             return;
         }
 
 
         $lessons_in_all_modules = array();
-        foreach( $modules as $term ){
+        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['total'] = count($modules);
         $sensei_modules_loop['modules'] = $modules;
         $sensei_modules_loop['current'] = -1;
         $sensei_modules_loop['course_id'] = $course_id;
@@ -2090,7 +2090,7 @@ 
      * @since 1.9.0
      *
      */
-    public static function teardown_single_course_module_loop(){
+    public static function teardown_single_course_module_loop() {
 
         global $sensei_modules_loop, $wp_query, $post;
 

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' ) ) ) )
 		);
 
@@ -623,19 +623,19 @@ 
 		$lower_case_plural =  function_exists( 'mb_strtolower' ) ? mb_strtolower( $plural, 'UTF-8') :  strtolower( $plural );
 
 		$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' ), $lower_case_plural ) ,
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ),  $lower_case_plural ),
-		    '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' ), $lower_case_plural ) ,
+			'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ),  $lower_case_plural ),
+			'parent_item_colon' => '',
+			'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
 		  );
 
 		return $labels;
@@ -708,7 +708,7 @@ 
 	 * Assigns the defaults for each user role capabilities.
 	 *
 	 * @since  1.1.0
-     *
+	 *
 	 * @param array $post_types
 	 * @return void
 	 */
@@ -776,7 +776,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 ) {

Spacing +238 added lines, -238 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Post Types Class
@@ -40,43 +40,43 @@ 
 	 * Constructor
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Setup Post Types
 		$this->labels = array();
         $this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
-		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_multiple_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_sensei_message_post_type' ), 100 );
+		add_action('init', array($this, 'setup_course_post_type'), 100);
+		add_action('init', array($this, 'setup_lesson_post_type'), 100);
+		add_action('init', array($this, 'setup_quiz_post_type'), 100);
+		add_action('init', array($this, 'setup_question_post_type'), 100);
+		add_action('init', array($this, 'setup_multiple_question_post_type'), 100);
+		add_action('init', array($this, 'setup_sensei_message_post_type'), 100);
 
 		// Setup Taxonomies
-		add_action( 'init', array( $this, 'setup_course_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_tag_taxonomy' ), 100 );
+		add_action('init', array($this, 'setup_course_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_quiz_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_lesson_tag_taxonomy'), 100);
 
 		// Load Post Type Objects
-		$default_post_types = array( 'course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages' ) ;
-		$this->load_posttype_objects( $default_post_types );
+		$default_post_types = array('course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages');
+		$this->load_posttype_objects($default_post_types);
 
 		// Admin functions
-		if ( is_admin() ) {
-			$this->set_role_cap_defaults( $default_post_types );
+		if (is_admin()) {
+			$this->set_role_cap_defaults($default_post_types);
 			global $pagenow;
-			if ( ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) ) {
-				add_filter( 'enter_title_here', array( $this, 'enter_title_here' ), 10 );
-				add_filter( 'post_updated_messages', array( $this, 'setup_post_type_messages' ) );
+			if (($pagenow == 'post.php' || $pagenow == 'post-new.php')) {
+				add_filter('enter_title_here', array($this, 'enter_title_here'), 10);
+				add_filter('post_updated_messages', array($this, 'setup_post_type_messages'));
 			} // End If Statement
 		} // End If Statement
 
 		// Add 'Edit Quiz' link to admin bar
-		add_action( 'admin_bar_menu', array( $this, 'quiz_admin_bar_menu' ), 81 );
+		add_action('admin_bar_menu', array($this, 'quiz_admin_bar_menu'), 81);
 
 	} // End __construct()
 
@@ -87,12 +87,12 @@ 
 	 * @param array $posttypes (default: array())
 	 * @return void
 	 */
-	public function load_posttype_objects( $posttypes = array() ) {
+	public function load_posttype_objects($posttypes = array()) {
 
-		foreach ( $posttypes as $posttype_token => $posttype_name ) {
+		foreach ($posttypes as $posttype_token => $posttype_name) {
 
 			// Load the files
-			$class_name = 'WooThemes_Sensei_' . $posttype_name;
+			$class_name = 'WooThemes_Sensei_'.$posttype_name;
 			$this->$posttype_token = new $class_name();
 			$this->$posttype_token->token = $posttype_token;
 
@@ -106,10 +106,10 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_course_post_type () {
+	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'] ),
+		    '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,
@@ -117,7 +117,7 @@ 
 		    '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' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_course_slug', _x('course', 'post type single url base', 'woothemes-sensei'))),
                 'with_front' => true,
                 'feeds' => true,
                 'pages' => true
@@ -127,7 +127,7 @@ 
             'has_archive'         => $this->get_course_post_type_archive_slug(),
 		    'hierarchical'        => false,
 		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+		    'supports'            => array('title', 'editor', 'excerpt', 'thumbnail')
 		);
 
         /**
@@ -136,7 +136,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
+		register_post_type('course', apply_filters('sensei_register_post_type_course', $args));
 
 	} // End setup_course_post_type()
 
@@ -155,17 +155,17 @@ 
      *
      * @return false|string
      */
-    public function get_course_post_type_archive_slug(){
+    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 ) ){
+        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';
 
@@ -183,12 +183,12 @@ 
      *
      * @return bool
      */
-    public function has_old_shortcodes( $content ){
+    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
 
@@ -199,26 +199,26 @@ 
 	 * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_lesson_post_type () {
+	public function setup_lesson_post_type() {
 
-		$supports_array = array( 'title', 'editor', 'excerpt', 'thumbnail', 'page-attributes' );
+		$supports_array = array('title', 'editor', 'excerpt', 'thumbnail', 'page-attributes');
 		$allow_comments = false;
-		if ( isset( Sensei()->settings->settings[ 'lesson_comments' ] ) ) {
-			$allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
+		if (isset(Sensei()->settings->settings['lesson_comments'])) {
+			$allow_comments = Sensei()->settings->settings['lesson_comments'];
 		} // End If Statement
-		if ( $allow_comments ) {
-			array_push( $supports_array, 'comments' );
+		if ($allow_comments) {
+			array_push($supports_array, 'comments');
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+		    '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' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_lesson_slug', _x('lesson', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -237,7 +237,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
+		register_post_type('lesson', apply_filters('sensei_register_post_type_lesson', $args));
 
 	} // End setup_lesson_post_type()
 
@@ -247,7 +247,7 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_quiz_post_type () {
+	public function setup_quiz_post_type() {
 
 		$args = array(
 		    'labels' => $this->create_post_type_labels(
@@ -263,7 +263,7 @@ 
 		    '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' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_quiz_slug', _x('quiz', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -273,7 +273,7 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+		    'supports' => array('')
 		);
 
         /**
@@ -282,7 +282,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
+		register_post_type('quiz', apply_filters('sensei_register_post_type_quiz', $args));
 
 	} // End setup_quiz_post_type()
 
@@ -292,10 +292,10 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_question_post_type () {
+	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'] ),
+		    '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,
@@ -304,7 +304,7 @@ 
 		    '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' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_question_slug', _x('question', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -314,7 +314,7 @@ 
 		    'has_archive' => true,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+		    'supports' => array('title')
 		);
 
         /**
@@ -323,7 +323,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
+		register_post_type('question', apply_filters('sensei_register_post_type_question', $args));
 
 	} // End setup_question_post_type()
 
@@ -332,10 +332,10 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_multiple_question_post_type () {
+	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'] ),
+		    '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,
@@ -344,7 +344,7 @@ 
 		    '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' ) ) ) ,
+                '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
@@ -354,10 +354,10 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+		    'supports' => array('title', 'custom-fields')
 		);
 
-		register_post_type( 'multiple_question', $args );
+		register_post_type('multiple_question', $args);
 	} // End setup_multiple_question_post_type()
 
 	/**
@@ -365,12 +365,12 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_sensei_message_post_type () {
+	public function setup_sensei_message_post_type() {
 
-		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
+		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'] ),
+			    '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,
@@ -379,7 +379,7 @@ 
 			    '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' ) ) ) ,
+                    'slug' => esc_attr(apply_filters('sensei_messages_slug', _x('messages', 'post type single slug', 'woothemes-sensei'))),
                     'with_front' =>  false,
                     'feeds' => false,
                     'pages' => true
@@ -389,7 +389,7 @@ 
 			    'has_archive' => true,
 			    'hierarchical' => false,
 			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+			    'supports' => array('title', 'editor', 'comments'),
 			);
 
             /**
@@ -398,7 +398,7 @@ 
              * @since 1.9.0
              * @param array $args
              */
-			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
+			register_post_type('sensei_message', apply_filters('sensei_register_post_type_sensei_message', $args));
 		}
 	} // End setup_sensei_message_post_type()
 
@@ -407,20 +407,20 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	public function setup_course_category_taxonomy () {
+	public function setup_course_category_taxonomy() {
 		// "Course Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Course Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Course Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Course Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Course Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Course Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Course Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Course Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Course Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Course Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Course Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Course Categories', 'woothemes-sensei' ),
+			'name' => _x('Course Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Course Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Course Categories', 'woothemes-sensei'),
+			'all_items' => __('All Course Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Course Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Course Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Course Category', 'woothemes-sensei'),
+			'update_item' => __('Update Course Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Course Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Course Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Course Categories', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -435,10 +435,10 @@ 
                 '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' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_course_category_slug', _x('course-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'course-category', array( 'course' ), $args );
+		register_taxonomy('course-category', array('course'), $args);
 
 	} // End setup_course_category_taxonomy()
 
@@ -447,21 +447,21 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_quiz_type_taxonomy () {
+	public function setup_quiz_type_taxonomy() {
 
 		// "Quiz Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Quiz Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Quiz Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Quiz Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Quiz Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Quiz Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Quiz Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Quiz Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Quiz Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Quiz Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Quiz Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Quiz Types', 'woothemes-sensei' ),
+			'name' => _x('Quiz Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Quiz Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Quiz Types', 'woothemes-sensei'),
+			'all_items' => __('All Quiz Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Quiz Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Quiz Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Quiz Type', 'woothemes-sensei'),
+			'update_item' => __('Update Quiz Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Quiz Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Quiz Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Quiz Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -472,10 +472,10 @@ 
 			'query_var' => true,
 			'show_in_nav_menus' => false,
             'public' => false,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_quiz_type_slug', _x('quiz-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'quiz-type', array( 'quiz' ), $args );
+		register_taxonomy('quiz-type', array('quiz'), $args);
 	} // End setup_quiz_type_taxonomy()
 
 	/**
@@ -483,21 +483,21 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_type_taxonomy () {
+	public function setup_question_type_taxonomy() {
 
 		// "Question Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Question Types', 'woothemes-sensei' ),
+			'name' => _x('Question Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Types', 'woothemes-sensei'),
+			'all_items' => __('All Question Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Type', 'woothemes-sensei'),
+			'update_item' => __('Update Question Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Question Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -509,10 +509,10 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_type_slug', _x( 'question-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_type_slug', _x('question-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-type', array( 'question' ), $args );
+		register_taxonomy('question-type', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -520,20 +520,20 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_category_taxonomy () {
+	public function setup_question_category_taxonomy() {
 		// "Question Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Categories', 'woothemes-sensei' ),
+			'name' => _x('Question Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Categories', 'woothemes-sensei'),
+			'all_items' => __('All Question Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Category', 'woothemes-sensei'),
+			'update_item' => __('Update Question Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Categories', 'woothemes-sensei'),
 		);
 
 		$args = array(
@@ -549,10 +549,10 @@ 
                 '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' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_category_slug', _x('question-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-category', array( 'question' ), $args );
+		register_taxonomy('question-category', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -560,20 +560,20 @@ 
 	 * @since  1.5.0
 	 * @return void
 	 */
-	public function setup_lesson_tag_taxonomy () {
+	public function setup_lesson_tag_taxonomy() {
 		// "Lesson Tags" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Lesson Tags', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Lesson Tag', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Lesson Tags', 'woothemes-sensei' ),
-			'all_items' => __( 'All Lesson Tags', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Tag', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Tag:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Lesson Tag', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Lesson Tag', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Lesson Tag', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Tag Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Lesson Tags', 'woothemes-sensei' )
+			'name' => _x('Lesson Tags', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Lesson Tag', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Lesson Tags', 'woothemes-sensei'),
+			'all_items' => __('All Lesson Tags', 'woothemes-sensei'),
+			'parent_item' => __('Parent Tag', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Tag:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Lesson Tag', 'woothemes-sensei'),
+			'update_item' => __('Update Lesson Tag', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Lesson Tag', 'woothemes-sensei'),
+			'new_item_name' => __('New Tag Name', 'woothemes-sensei'),
+			'menu_name' => __('Lesson Tags', 'woothemes-sensei')
 		);
 
 		$args = array(
@@ -587,10 +587,10 @@ 
                 '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' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_lesson_tag_slug', _x('lesson-tag', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'lesson-tag', array( 'lesson' ), $args );
+		register_taxonomy('lesson-tag', array('lesson'), $args);
 	} // End setup_lesson_tag_taxonomy()
 
 	/**
@@ -598,15 +598,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_post_type_labels_base () {
-		$this->labels = array( 'course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array() );
+	private function setup_post_type_labels_base() {
+		$this->labels = array('course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array());
 
-		$this->labels['course'] = array( 'singular' => __( 'Course', 'woothemes-sensei' ), 'plural' => __( 'Courses', 'woothemes-sensei' ), 'menu' => __( 'Courses', 'woothemes-sensei' ) );
-		$this->labels['lesson'] = array( 'singular' => __( 'Lesson', 'woothemes-sensei' ), 'plural' => __( 'Lessons', 'woothemes-sensei' ), 'menu' => __( 'Lessons', 'woothemes-sensei' ) );
-		$this->labels['quiz'] = array( 'singular' => __( 'Quiz', 'woothemes-sensei' ), 'plural' => __( 'Quizzes', 'woothemes-sensei' ), 'menu' => __( 'Quizzes', 'woothemes-sensei' ) );
-		$this->labels['question'] = array( 'singular' => __( 'Question', 'woothemes-sensei' ), 'plural' => __( 'Questions', 'woothemes-sensei' ), 'menu' => __( 'Questions', 'woothemes-sensei' ) );
-		$this->labels['multiple_question'] = array( 'singular' => __( 'Multiple Question', 'woothemes-sensei' ), 'plural' => __( 'Multiple Questions', 'woothemes-sensei' ), 'menu' => __( 'Multiple Questions', 'woothemes-sensei' ) );
-		$this->labels['sensei_message'] = array( 'singular' => __( 'Message', 'woothemes-sensei' ), 'plural' => __( 'Messages', 'woothemes-sensei' ), 'menu' => __( 'Messages', 'woothemes-sensei' ) );
+		$this->labels['course'] = array('singular' => __('Course', 'woothemes-sensei'), 'plural' => __('Courses', 'woothemes-sensei'), 'menu' => __('Courses', 'woothemes-sensei'));
+		$this->labels['lesson'] = array('singular' => __('Lesson', 'woothemes-sensei'), 'plural' => __('Lessons', 'woothemes-sensei'), 'menu' => __('Lessons', 'woothemes-sensei'));
+		$this->labels['quiz'] = array('singular' => __('Quiz', 'woothemes-sensei'), 'plural' => __('Quizzes', 'woothemes-sensei'), 'menu' => __('Quizzes', 'woothemes-sensei'));
+		$this->labels['question'] = array('singular' => __('Question', 'woothemes-sensei'), 'plural' => __('Questions', 'woothemes-sensei'), 'menu' => __('Questions', 'woothemes-sensei'));
+		$this->labels['multiple_question'] = array('singular' => __('Multiple Question', 'woothemes-sensei'), 'plural' => __('Multiple Questions', 'woothemes-sensei'), 'menu' => __('Multiple Questions', 'woothemes-sensei'));
+		$this->labels['sensei_message'] = array('singular' => __('Message', 'woothemes-sensei'), 'plural' => __('Messages', 'woothemes-sensei'), 'menu' => __('Messages', 'woothemes-sensei'));
 
 	} // End setup_post_type_labels_base()
 
@@ -618,24 +618,24 @@ 
 	 * @param  string $menu     The menu item label
 	 * @return array            An array of the labels to be used
 	 */
-	private function create_post_type_labels ( $singular, $plural, $menu ) {
+	private function create_post_type_labels($singular, $plural, $menu) {
 
-		$lower_case_plural =  function_exists( 'mb_strtolower' ) ? mb_strtolower( $plural, 'UTF-8') :  strtolower( $plural );
+		$lower_case_plural = function_exists('mb_strtolower') ? mb_strtolower($plural, 'UTF-8') : strtolower($plural);
 
 		$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' ), $lower_case_plural ) ,
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ),  $lower_case_plural ),
+		    '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'), $lower_case_plural),
+		    'not_found_in_trash' => sprintf(__('No %s found in Trash', 'woothemes-sensei'), $lower_case_plural),
 		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+		    'menu_name' => sprintf(__('%s', 'woothemes-sensei'), $menu)
 		  );
 
 		return $labels;
@@ -647,14 +647,14 @@ 
 	 * @param  array $messages The existing array of messages for post types.
 	 * @return array           The modified array of messages for post types.
 	 */
-	public function setup_post_type_messages ( $messages ) {
+	public function setup_post_type_messages($messages) {
 		global $post, $post_ID;
 
-		$messages['course'] = $this->create_post_type_messages( 'course' );
-		$messages['lesson'] = $this->create_post_type_messages( 'lesson' );
-		$messages['quiz'] = $this->create_post_type_messages( 'quiz' );
-		$messages['question'] = $this->create_post_type_messages( 'question' );
-		$messages['multiple_question'] = $this->create_post_type_messages( 'multiple_question' );
+		$messages['course'] = $this->create_post_type_messages('course');
+		$messages['lesson'] = $this->create_post_type_messages('lesson');
+		$messages['quiz'] = $this->create_post_type_messages('quiz');
+		$messages['question'] = $this->create_post_type_messages('question');
+		$messages['multiple_question'] = $this->create_post_type_messages('multiple_question');
 
 		return $messages;
 	} // End setup_post_type_messages()
@@ -665,23 +665,23 @@ 
 	 * @param  string $post_type The post type for which to create messages.
 	 * @return array            An array of messages (empty array if the post type isn't one we're looking to work with).
 	 */
-	private function create_post_type_messages ( $post_type ) {
+	private function create_post_type_messages($post_type) {
 		global $post, $post_ID;
 
-		if ( ! isset( $this->labels[$post_type] ) ) { return array(); }
+		if ( ! isset($this->labels[$post_type])) { return array(); }
 
 		$messages = array(
 			0 => '',
-			1 => sprintf( __( '%1$s updated. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			2 => __( 'Custom field updated.' , 'woothemes-sensei' ),
-			3 => __( 'Custom field deleted.' , 'woothemes-sensei' ),
-			4 => sprintf( __( '%1$s updated.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			5 => isset( $_GET['revision'] ) ? sprintf( __( '%1$s restored to revision from %2$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6 => sprintf( __( '%1$s published. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			7 => sprintf( __( '%1$s saved.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			8 => sprintf( __( '%1$s submitted. %2$sPreview %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', '</a>' ),
-			9 => sprintf( __( '%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<strong>' . date_i18n( __( 'M j, Y @ G:i' , 'woothemes-sensei' ), strtotime( $post->post_date ) ) . '</strong>', '<a target="_blank" href="' . esc_url( get_permalink( $post_ID ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
-			10 => sprintf( __( '%1$s draft updated. %2$sPreview %3$s%4$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
+			1 => sprintf(__('%1$s updated. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			2 => __('Custom field updated.', 'woothemes-sensei'),
+			3 => __('Custom field deleted.', 'woothemes-sensei'),
+			4 => sprintf(__('%1$s updated.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			5 => isset($_GET['revision']) ? sprintf(__('%1$s restored to revision from %2$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6 => sprintf(__('%1$s published. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			7 => sprintf(__('%1$s saved.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			8 => sprintf(__('%1$s submitted. %2$sPreview %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', '</a>'),
+			9 => sprintf(__('%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<strong>'.date_i18n(__('M j, Y @ G:i', 'woothemes-sensei'), strtotime($post->post_date)).'</strong>', '<a target="_blank" href="'.esc_url(get_permalink($post_ID)).'">', $this->labels[$post_type]['singular'], '</a>'),
+			10 => sprintf(__('%1$s draft updated. %2$sPreview %3$s%4$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', $this->labels[$post_type]['singular'], '</a>'),
 		);
 
 		return $messages;
@@ -694,11 +694,11 @@ 
 	 * @param  string $title
 	 * @return string $title
 	 */
-	public function enter_title_here ( $title ) {
-		if ( get_post_type() == 'course' ) {
-			$title = __( 'Enter a title for this course here', 'woothemes-sensei' );
-		} elseif ( get_post_type() == 'lesson' ) {
-			$title = __( 'Enter a title for this lesson here', 'woothemes-sensei' );
+	public function enter_title_here($title) {
+		if (get_post_type() == 'course') {
+			$title = __('Enter a title for this course here', 'woothemes-sensei');
+		} elseif (get_post_type() == 'lesson') {
+			$title = __('Enter a title for this lesson here', 'woothemes-sensei');
 		}
 
 		return $title;
@@ -712,60 +712,60 @@ 
 	 * @param array $post_types
 	 * @return void
 	 */
-	public function set_role_cap_defaults( $post_types = array() ) {
+	public function set_role_cap_defaults($post_types = array()) {
 
-		foreach ( $post_types as $post_type_item => $post_type_name ) {
+		foreach ($post_types as $post_type_item => $post_type_name) {
 			// Super Admin
-			$this->role_caps[] =  array(	'administrator' 	=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+			$this->role_caps[] = array('administrator' 	=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s',
 																			'manage_sensei',
-																			'manage_sensei_grades' ),
-											'editor' 			=> array(	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																		 	'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+																			'manage_sensei_grades'),
+											'editor' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																		 	'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'author' 			=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'author' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'contributor' 		=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'contributor' 		=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's' ),
-											'subscriber' 		=> array( 	'read' )
+																			'delete_'.$post_type_item.'s'),
+											'subscriber' 		=> array('read')
 
 										);
 		} // End For Loop
@@ -779,16 +779,16 @@ 
      * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
-	public function quiz_admin_bar_menu( $bar ) {
-		if ( is_single() && 'quiz' == get_queried_object()->post_type ) {
-			$lesson_id = get_post_meta( get_queried_object()->ID, '_quiz_lesson', true );
-			if ( $lesson_id ) {
+	public function quiz_admin_bar_menu($bar) {
+		if (is_single() && 'quiz' == get_queried_object()->post_type) {
+			$lesson_id = get_post_meta(get_queried_object()->ID, '_quiz_lesson', true);
+			if ($lesson_id) {
 				$object_type = get_post_type_object('quiz');
-				$bar->add_menu( array(
+				$bar->add_menu(array(
 					'id' => 'edit',
 					'title' => $object_type->labels->edit_item,
-					'href' => get_edit_post_link( $lesson_id ),
-				) );
+					'href' => get_edit_post_link($lesson_id),
+				));
 			}
 		}
 	}
@@ -800,4 +800,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_PostTypes extends Sensei_PostTypes{}
+class WooThemes_Sensei_PostTypes extends Sensei_PostTypes {}

includes/class-sensei-templates.php

Indentation +515 added lines, -515 removed lines

@@ -12,684 +12,684 @@
  */
 class Sensei_Templates {
 
-    /**
-     *  Load the template files from within sensei/templates/ or the the theme if overrided within the theme.
-     *
-     * @since 1.9.0
-     * @param string $slug
-     * @param string $name default: ''
-     *
-     * @return void
-     */
-    public static function get_part(  $slug, $name = ''  ){
+	/**
+	 *  Load the template files from within sensei/templates/ or the the theme if overrided within the theme.
+	 *
+	 * @since 1.9.0
+	 * @param string $slug
+	 * @param string $name default: ''
+	 *
+	 * @return void
+	 */
+	public static function get_part(  $slug, $name = ''  ){
 
-        $template = '';
-        $plugin_template_url = Sensei()->template_url;
-        $plugin_template_path = Sensei()->plugin_path() . "/templates/";
+		$template = '';
+		$plugin_template_url = Sensei()->template_url;
+		$plugin_template_path = Sensei()->plugin_path() . "/templates/";
 
-        // Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php
-        if ( $name ){
+		// Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php
+		if ( $name ){
 
-            $template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) );
+			$template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) );
 
-        }
+		}
 
-        // Get default slug-name.php
-        if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){
+		// Get default slug-name.php
+		if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){
 
-            $template = $plugin_template_path . "{$slug}-{$name}.php";
+			$template = $plugin_template_path . "{$slug}-{$name}.php";
 
-        }
+		}
 
 
-        // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php
-        if ( !$template ){
+		// If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php
+		if ( !$template ){
 
-            $template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) );
+			$template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) );
 
-        }
+		}
 
 
-        if ( $template ){
+		if ( $template ){
 
-            load_template( $template, false );
+			load_template( $template, false );
 
-        }
+		}
 
-    } // end get part
+	} // end get part
 
-    /**
-     * Get the template.
-     *
-     * @since 1.9.0
-     *
-     * @param $template_name
-     * @param array $args
-     * @param string $template_path
-     * @param string $default_path
-     */
-    public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	/**
+	 * Get the template.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $template_name
+	 * @param array $args
+	 * @param string $template_path
+	 * @param string $default_path
+	 */
+	public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 
-        if ( $args && is_array($args) )
-            extract( $args );
+		if ( $args && is_array($args) )
+			extract( $args );
 
-        $located = self::locate_template( $template_name, $template_path, $default_path );
+		$located = self::locate_template( $template_name, $template_path, $default_path );
 
-        if( ! empty( $located ) ){
+		if( ! empty( $located ) ){
 
-            do_action( 'sensei_before_template_part', $template_name, $template_path, $located );
+			do_action( 'sensei_before_template_part', $template_name, $template_path, $located );
 
-            include( $located );
+			include( $located );
 
-            do_action( 'sensei_after_template_part', $template_name, $template_path, $located );
+			do_action( 'sensei_after_template_part', $template_name, $template_path, $located );
 
-        }
+		}
 
-    } // end get template
+	} // end get template
 
-    /**
-     * Check if the template file exists. A wrapper for WP locate_template.
-     *
-     * @since 1.9.0
-     *
-     * @param $template_name
-     * @param string $template_path
-     * @param string $default_path
-     *
-     * @return mixed|void
-     */
-    public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	/**
+	 * Check if the template file exists. A wrapper for WP locate_template.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $template_name
+	 * @param string $template_path
+	 * @param string $default_path
+	 *
+	 * @return mixed|void
+	 */
+	public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
 
-        if ( ! $template_path ) $template_path = Sensei()->template_url;
-        if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
+		if ( ! $template_path ) $template_path = Sensei()->template_url;
+		if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
 
-        // Look within passed path within the theme - this is priority
-        $template = locate_template(
-            array(
-                $template_path . $template_name,
-                $template_name
-            )
-        );
+		// Look within passed path within the theme - this is priority
+		$template = locate_template(
+			array(
+				$template_path . $template_name,
+				$template_name
+			)
+		);
 
-        // Get default template
-        if ( ! $template ){
+		// Get default template
+		if ( ! $template ){
 
-            $template = $default_path . $template_name;
+			$template = $default_path . $template_name;
 
-        }
-        // return nothing for file that do not exist
-        if( !file_exists( $template ) ){
-            $template = '';
-        }
+		}
+		// return nothing for file that do not exist
+		if( !file_exists( $template ) ){
+			$template = '';
+		}
 
-        // Return what we found
-        return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path );
+		// Return what we found
+		return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path );
 
-    } // end locate
+	} // end locate
 
-    /**
-     * Determine which Sensei template to load based on the
-     * current page context.
-     *
-     * @since 1.0
-     *
-     * @param string $template
-     * @return string $template
-     */
-    public static function template_loader ( $template = '' ) {
+	/**
+	 * Determine which Sensei template to load based on the
+	 * current page context.
+	 *
+	 * @since 1.0
+	 *
+	 * @param string $template
+	 * @return string $template
+	 */
+	public static function template_loader ( $template = '' ) {
 
-        global $wp_query, $email_template;
+		global $wp_query, $email_template;
 
-        $find = array( 'woothemes-sensei.php' );
-        $file = '';
+		$find = array( 'woothemes-sensei.php' );
+		$file = '';
 
-        if ( isset( $email_template ) && $email_template ) {
+		if ( isset( $email_template ) && $email_template ) {
 
-            $file 	= 'emails/' . $email_template;
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'emails/' . $email_template;
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( is_single() && get_post_type() == 'course' ) {
+		} elseif ( is_single() && get_post_type() == 'course' ) {
 
-            if ( Sensei()->check_user_permissions( 'course-single' ) ) {
+			if ( Sensei()->check_user_permissions( 'course-single' ) ) {
 
-                // possible backward compatible template include if theme overrides content-single-course.php
-                // this template was removed in 1.9.0 and code all moved into the main single-course.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true );
+				// possible backward compatible template include if theme overrides content-single-course.php
+				// this template was removed in 1.9.0 and code all moved into the main single-course.php file
+				self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true );
 
-                $file 	= 'single-course.php';
-                $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+				$file 	= 'single-course.php';
+				$find[] = $file;
+				$find[] = Sensei()->template_url . $file;
 
-            } else {
+			} else {
 
-                // No Permissions Page
-                return self::get_no_permission_template();
+				// No Permissions Page
+				return self::get_no_permission_template();
 
-            } // End If Statement
+			} // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'lesson' ) {
+		} elseif ( is_single() && get_post_type() == 'lesson' ) {
 
-            if ( Sensei()->check_user_permissions( 'lesson-single' ) ) {
+			if ( Sensei()->check_user_permissions( 'lesson-single' ) ) {
 
-                // possible backward compatible template include if theme overrides content-single-lesson.php
-                // this template was removed in 1.9.0 and code all moved into the main single-lesson.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true );
+				// possible backward compatible template include if theme overrides content-single-lesson.php
+				// this template was removed in 1.9.0 and code all moved into the main single-lesson.php file
+				self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true );
 
-                $file 	= 'single-lesson.php';
-                $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+				$file 	= 'single-lesson.php';
+				$find[] = $file;
+				$find[] = Sensei()->template_url . $file;
 
-            } else {
+			} else {
 
-                // No Permissions Page
-                return self::get_no_permission_template();
+				// No Permissions Page
+				return self::get_no_permission_template();
 
-            } // End If Statement
+			} // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'quiz' ) {
+		} elseif ( is_single() && get_post_type() == 'quiz' ) {
 
-            if ( Sensei()->check_user_permissions( 'quiz-single' ) ) {
+			if ( Sensei()->check_user_permissions( 'quiz-single' ) ) {
 
-                // possible backward compatible template include if theme overrides content-single-quiz.php
-                // this template was removed in 1.9.0 and code all moved into the main single-quiz.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true);
+				// possible backward compatible template include if theme overrides content-single-quiz.php
+				// this template was removed in 1.9.0 and code all moved into the main single-quiz.php file
+				self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true);
 
-                $file 	= 'single-quiz.php';
-                $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+				$file 	= 'single-quiz.php';
+				$find[] = $file;
+				$find[] = Sensei()->template_url . $file;
 
-            } else {
+			} else {
 
-                // No Permissions Page
-                return self::get_no_permission_template();
+				// No Permissions Page
+				return self::get_no_permission_template();
 
-            } // End If Statement
+			} // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'sensei_message' ) {
+		} elseif ( is_single() && get_post_type() == 'sensei_message' ) {
 
-            // possible backward compatible template include if theme overrides content-single-message.php
-            // this template was removed in 1.9.0 and code all moved into the main single-message.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true );
+			// possible backward compatible template include if theme overrides content-single-message.php
+			// this template was removed in 1.9.0 and code all moved into the main single-message.php file
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true );
 
-            $file 	= 'single-message.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'single-message.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( is_post_type_archive( 'course' )
-                    || is_page( Sensei()->get_page_id( 'courses' ) )
-                    || is_tax( 'course-category' )) {
+		} elseif ( is_post_type_archive( 'course' )
+					|| is_page( Sensei()->get_page_id( 'courses' ) )
+					|| is_tax( 'course-category' )) {
 
-            // possible backward compatible template include if theme overrides 'taxonomy-course-category'
-            // this template was removed in 1.9.0 and replaced by archive-course.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php');
+			// possible backward compatible template include if theme overrides 'taxonomy-course-category'
+			// this template was removed in 1.9.0 and replaced by archive-course.php
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php');
 
-            $file 	= 'archive-course.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'archive-course.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( is_post_type_archive( 'sensei_message' ) ) {
+		} elseif ( is_post_type_archive( 'sensei_message' ) ) {
 
-            $file 	= 'archive-message.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'archive-message.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif( is_tax( 'lesson-tag' ) ) {
+		} elseif( is_tax( 'lesson-tag' ) ) {
 
-            // possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php'
-            // this template was removed in 1.9.0 and replaced by archive-lesson.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' );
+			// possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php'
+			// this template was removed in 1.9.0 and replaced by archive-lesson.php
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' );
 
-            $file 	= 'archive-lesson.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'archive-lesson.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) {
+		} elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) {
 
-            // Override for sites with static home page
-            $wp_query->is_home = false;
+			// Override for sites with static home page
+			$wp_query->is_home = false;
 
-            $file 	= 'learner-profile.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'learner-profile.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( isset( $wp_query->query_vars['course_results'] ) ) {
+		} elseif ( isset( $wp_query->query_vars['course_results'] ) ) {
 
-            // Override for sites with static home page
-            $wp_query->is_home = false;
+			// Override for sites with static home page
+			$wp_query->is_home = false;
 
-            $file = 'course-results.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file = 'course-results.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        }elseif( is_author()
-                 && Sensei_Teacher::is_a_teacher( get_query_var('author') )
-                 && ! user_can( get_query_var('author'), 'manage_options' ) ){
+		}elseif( is_author()
+				 && Sensei_Teacher::is_a_teacher( get_query_var('author') )
+				 && ! user_can( get_query_var('author'), 'manage_options' ) ){
 
-            $file = 'teacher-archive.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file = 'teacher-archive.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } // Load the template file
+		} // Load the template file
 
-        if ( $file ) {
+		if ( $file ) {
 
-            $template = locate_template( $find );
-            if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+			$template = locate_template( $find );
+			if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
 
-        } // End If Statement
+		} // End If Statement
 
-        return $template;
+		return $template;
 
-    } // End template_loader()
+	} // End template_loader()
 
-    /**
-     * This function loads the no-permissions template for users with no access
-     * if a Sensei template was loaded.
-     *
-     * This function doesn't determine the permissions. Permissions must be determined
-     * before loading this function as it only gets the template.
-     *
-     * This function also checks the user theme for overrides to ensure the right template
-     * file is returned.
-     *
-     * @since 1.9.0
-     */
-    public static function get_no_permission_template( ){
+	/**
+	 * This function loads the no-permissions template for users with no access
+	 * if a Sensei template was loaded.
+	 *
+	 * This function doesn't determine the permissions. Permissions must be determined
+	 * before loading this function as it only gets the template.
+	 *
+	 * This function also checks the user theme for overrides to ensure the right template
+	 * file is returned.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function get_no_permission_template( ){
 
-        // possible backward compatible template loading
-        // this template was removed in 1.9.0 and code all moved into the no-permissions.php file
-        self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true );
+		// possible backward compatible template loading
+		// this template was removed in 1.9.0 and code all moved into the no-permissions.php file
+		self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true );
 
-        $file 	= 'no-permissions.php';
-        $find[] = $file;
-        $find[] = Sensei()->template_url . $file;
+		$file 	= 'no-permissions.php';
+		$find[] = $file;
+		$find[] = Sensei()->template_url . $file;
 
-        $template = locate_template( $find );
-        if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+		$template = locate_template( $find );
+		if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
 
-	    // set a global constant so that we know that we're in this template
-	    define('SENSEI_NO_PERMISSION', true );
+		// set a global constant so that we know that we're in this template
+		define('SENSEI_NO_PERMISSION', true );
 
-        return $template;
+		return $template;
 
-    }
+	}
 
-    /**
-     * This function is specifically created for loading template files from the theme.
-     *
-     * This function checks if the user has overwritten the templates like in their theme. If they have it in their theme it will load the header and the footer
-     * around the singular content file from their theme and exit.
-     *
-     * If none is found this function will do nothing. If a template is found this funciton
-     * will exit execution of the script an not continue.
-     *
-     * @since 1.9.0
-     * @param string $template
-     * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true
-     */
-    public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){
+	/**
+	 * This function is specifically created for loading template files from the theme.
+	 *
+	 * This function checks if the user has overwritten the templates like in their theme. If they have it in their theme it will load the header and the footer
+	 * around the singular content file from their theme and exit.
+	 *
+	 * If none is found this function will do nothing. If a template is found this funciton
+	 * will exit execution of the script an not continue.
+	 *
+	 * @since 1.9.0
+	 * @param string $template
+	 * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true
+	 */
+	public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){
 
-        $found_template = locate_template( array( $template ) );
-        if( $found_template ){
+		$found_template = locate_template( array( $template ) );
+		if( $found_template ){
 
-            if( $load_header_footer ){
+			if( $load_header_footer ){
 
-                get_sensei_header();
-                include( $found_template );
-                get_sensei_footer();
-
-            }else{
-
-                include( $found_template );
-
-            }
-
-            exit;
-
-        }
+				get_sensei_header();
+				include( $found_template );
+				get_sensei_footer();
+
+			}else{
+
+				include( $found_template );
+
+			}
+
+			exit;
+
+		}
 
-    }
+	}
 
 
-    /**
-     * Hooks the deprecated archive content hook into the hook again just in
-     * case other developers have used it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecated_archive_course_content_hook(){
-
-        sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
+	/**
+	 * Hooks the deprecated archive content hook into the hook again just in
+	 * case other developers have used it.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecated_archive_course_content_hook(){
+
+		sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
 
-    }// end deprecated_archive_hook
+	}// end deprecated_archive_hook
 
-    /**
-     * A generic function for echoing the post title
-     *
-     * @since 1.9.0
-     * @param  WP_Post $post
-     */
-    public static function the_title( $post ){
-
-        // ID passed in
-        if( is_numeric( $post ) ){
-            $post = get_post( $post );
-        }
-
-        /**
-         * Filter the template html tag for the title
-         *
-         * @since 1.9.0
-         *
-         * @param $title_html_tag default is 'h3'
-         */
-        $title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
-
-        /**
-         * Filter the title classes
-         *
-         * @since 1.9.0
-         * @param string $title_classes defaults to $post_type-title
-         */
-        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
+	/**
+	 * A generic function for echoing the post title
+	 *
+	 * @since 1.9.0
+	 * @param  WP_Post $post
+	 */
+	public static function the_title( $post ){
+
+		// ID passed in
+		if( is_numeric( $post ) ){
+			$post = get_post( $post );
+		}
+
+		/**
+		 * Filter the template html tag for the title
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param $title_html_tag default is 'h3'
+		 */
+		$title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
+
+		/**
+		 * Filter the title classes
+		 *
+		 * @since 1.9.0
+		 * @param string $title_classes defaults to $post_type-title
+		 */
+		$title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
 
-        $html= '';
-        $html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
-        $html .= '<a href="' . get_permalink( $post->ID ) . '" >';
-        $html .= $post->post_title ;
-        $html .= '</a>';
-        $html .= '</'. $title_html_tag. '>';
-        echo $html;
-
-    }// end the title
-
-    /**
-     * This function adds the hooks inside and above the single course content for
-     * backwards compatibility sake.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_course_inside_before_hooks(){
-
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
-        sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-
-    }// end deprecated_single_course_inside_before_hooks
-
-    /**
-     * This function adds the hooks to sensei_course_single_lessons for
-     * backwards compatibility sake.  and provides developers with an alternative.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecate_sensei_course_single_lessons_hook(){
+		$html= '';
+		$html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
+		$html .= '<a href="' . get_permalink( $post->ID ) . '" >';
+		$html .= $post->post_title ;
+		$html .= '</a>';
+		$html .= '</'. $title_html_tag. '>';
+		echo $html;
+
+	}// end the title
+
+	/**
+	 * This function adds the hooks inside and above the single course content for
+	 * backwards compatibility sake.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_course_inside_before_hooks(){
+
+		sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
+		sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+
+	}// end deprecated_single_course_inside_before_hooks
+
+	/**
+	 * This function adds the hooks to sensei_course_single_lessons for
+	 * backwards compatibility sake.  and provides developers with an alternative.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecate_sensei_course_single_lessons_hook(){
 
-        sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
+		sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
 
-    }// deprecate_sensei_course_single_lessons_hook
+	}// deprecate_sensei_course_single_lessons_hook
 
-    /**
-     * Deprecated all deprecated_single_main_content_hook hooked actions.
-     *
-     * The content must be dealt with inside the respective templates.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_main_content_hook(){
+	/**
+	 * Deprecated all deprecated_single_main_content_hook hooked actions.
+	 *
+	 * The content must be dealt with inside the respective templates.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_main_content_hook(){
 
-            if( is_singular( 'course' ) ) {
+			if( is_singular( 'course' ) ) {
 
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
-
-            } elseif( is_singular( 'message' ) ){
-
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
-            }
-
-    }// end deprecated_single_course_single_main_content_hook
-
-    /**
-     * Deprecate the  old sensei modules
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_before_hook(){
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
+
+			} elseif( is_singular( 'message' ) ){
+
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
+			}
+
+	}// end deprecated_single_course_single_main_content_hook
+
+	/**
+	 * Deprecate the  old sensei modules
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_before_hook(){
 
-        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
+		sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
 
-    }
-
-    /**
-     * Deprecate the  old sensei modules after hooks
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_after_hook(){
+	}
+
+	/**
+	 * Deprecate the  old sensei modules after hooks
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_after_hook(){
 
-        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
+		sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
 
-    }
+	}
 
-    /**
-     * Deprecate the single message hooks for post types.
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_all_post_type_single_title_hooks(){
+	/**
+	 * Deprecate the single message hooks for post types.
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_all_post_type_single_title_hooks(){
 
-        if( is_singular( 'sensei_message' ) ){
+		if( is_singular( 'sensei_message' ) ){
 
-            sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
+			sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * course_single_meta function.
-     *
-     * @access public
-     * @return void
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_course_single_meta_hooks() {
+	/**
+	 * course_single_meta function.
+	 *
+	 * @access public
+	 * @return void
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_course_single_meta_hooks() {
 
-        // deprecate all these hooks
-        sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
+		// deprecate all these hooks
+		sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
 
-    } // End deprecate_course_single_meta_hooks
+	} // End deprecate_course_single_meta_hooks
 
-    /**
-     * Run the deprecated hooks on the single lesson page
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
+	/**
+	 * Run the deprecated hooks on the single lesson page
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
 
-        if( is_singular( 'lesson' ) ){
+		if( is_singular( 'lesson' ) ){
 
-            sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
-            sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
+			sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
+			sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
 
-        }
+		}
 
-    }// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
+	}// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
 
-    /**
-     * Deprecate the hook sensei_lesson_course_signup.
-     *
-     * The hook content will be linked directly on the recommended
-     * sensei_single_lesson_content_inside_after
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_course_signup_hook(){
+	/**
+	 * Deprecate the hook sensei_lesson_course_signup.
+	 *
+	 * The hook content will be linked directly on the recommended
+	 * sensei_single_lesson_content_inside_after
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_course_signup_hook(){
 
-        $lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+		$lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
+		$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
 
-        if(  !$user_taking_course ) {
+		if(  !$user_taking_course ) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
+			sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
 
-        }
-    }// end deprecate_sensei_lesson_course_signup_hook
+		}
+	}// end deprecate_sensei_lesson_course_signup_hook
 
-    /**
-     * Running the deprecated hook: sensei_lesson_single_meta
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_meta_hook(){
+	/**
+	 * Running the deprecated hook: sensei_lesson_single_meta
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_meta_hook(){
 
-        if ( sensei_can_user_view_lesson()  ) {
+		if ( sensei_can_user_view_lesson()  ) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
+			sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
 
 
-        }
+		}
 
-    }// end deprecate_sensei_lesson_single_meta_hook
+	}// end deprecate_sensei_lesson_single_meta_hook
 
-    /**
-     * Deprecate the sensei lesson single title hook
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_title(){
+	/**
+	 * Deprecate the sensei lesson single title hook
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_title(){
 
-        sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+		sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-    }// end deprecate_sensei_lesson_single_title
+	}// end deprecate_sensei_lesson_single_title
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_single_main_content_hook(){
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_single_main_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_image_hook(){
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_image_hook(){
 
-        sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+		sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    /**
-     * hook in the deprecated sensei_login_form hook for backwards
-     * compatibility
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_login_form_hook(){
+	/**
+	 * hook in the deprecated sensei_login_form hook for backwards
+	 * compatibility
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_login_form_hook(){
 
-        sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
+		sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
 
-    } // end deprecate_sensei_login_form_hook
+	} // end deprecate_sensei_login_form_hook
 
-    /**
-     * Fire the sensei_complete_course action.
-     *
-     * This is just a backwards compatible function to add the action
-     * to a template. This should not be used as the function from this
-     * hook will be added directly to my-courses page via one of the hooks there.
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_sensei_complete_course_hook(){
+	/**
+	 * Fire the sensei_complete_course action.
+	 *
+	 * This is just a backwards compatible function to add the action
+	 * to a template. This should not be used as the function from this
+	 * hook will be added directly to my-courses page via one of the hooks there.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_sensei_complete_course_hook(){
 
-        do_action( 'sensei_complete_course' );
+		do_action( 'sensei_complete_course' );
 
-    } //fire_sensei_complete_course_hook
+	} //fire_sensei_complete_course_hook
 
-    /**
-     * Fire the frontend message hook
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_frontend_messages_hook(){
+	/**
+	 * Fire the frontend message hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_frontend_messages_hook(){
 
-        do_action( 'sensei_frontend_messages' );
+		do_action( 'sensei_frontend_messages' );
 
-    }// end sensei_complete_course_action
+	}// end sensei_complete_course_action
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_before.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_before_user_course_content_hook(){
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_before.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_before_user_course_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
+		sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
 
-    }// deprecate_sensei_before_user_course_content_hook
+	}// deprecate_sensei_before_user_course_content_hook
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_after hook.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_after_user_course_content_hook(){
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_after hook.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_after_user_course_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
+		sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
 
-    }// deprecate_sensei_after_user_course_content_hook
+	}// deprecate_sensei_after_user_course_content_hook
 
-    /**
-     * Deprecate the 2 main hooks on the archive message template
-     *
-     * @deprecated since 1.9.0
-     * @since 1.9.0
-     */
-    public static function deprecated_archive_message_hooks (){
-
-        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
-        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
+	/**
+	 * Deprecate the 2 main hooks on the archive message template
+	 *
+	 * @deprecated since 1.9.0
+	 * @since 1.9.0
+	 */
+	public static function deprecated_archive_message_hooks (){
+
+		sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
+		sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
 
-    }
+	}
 
-    /**
-     * Run the sensei_complete_quiz for those still hooking
-     * into but deprecated it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_complete_quiz_action(){
+	/**
+	 * Run the sensei_complete_quiz for those still hooking
+	 * into but deprecated it.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_complete_quiz_action(){
 
-        sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
 
-    }
+	}
 
-    /**
-     * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
-     * it to provide user with a better alternative.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_quiz_question_type_action(){
+	/**
+	 * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
+	 * it to provide user with a better alternative.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_quiz_question_type_action(){
 
-        // Question Type
-        global $sensei_question_loop;
-        $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
-        sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
-
-    }
+		// Question Type
+		global $sensei_question_loop;
+		$question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
+		sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
+
+	}
 }//end class

Spacing +155 added lines, -155 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 /**
  * Sensei Template Class
  *
@@ -21,38 +21,38 @@ 
      *
      * @return void
      */
-    public static function get_part(  $slug, $name = ''  ){
+    public static function get_part($slug, $name = '') {
 
         $template = '';
         $plugin_template_url = Sensei()->template_url;
-        $plugin_template_path = Sensei()->plugin_path() . "/templates/";
+        $plugin_template_path = Sensei()->plugin_path()."/templates/";
 
         // Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php
-        if ( $name ){
+        if ($name) {
 
-            $template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) );
+            $template = locate_template(array("{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php"));
 
         }
 
         // Get default slug-name.php
-        if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){
+        if ( ! $template && $name && file_exists($plugin_template_path."{$slug}-{$name}.php")) {
 
-            $template = $plugin_template_path . "{$slug}-{$name}.php";
+            $template = $plugin_template_path."{$slug}-{$name}.php";
 
         }
 
 
         // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php
-        if ( !$template ){
+        if ( ! $template) {
 
-            $template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) );
+            $template = locate_template(array("{$slug}.php", "{$plugin_template_url}{$slug}.php"));
 
         }
 
 
-        if ( $template ){
+        if ($template) {
 
-            load_template( $template, false );
+            load_template($template, false);
 
         }
 
@@ -68,20 +68,20 @@ 
      * @param string $template_path
      * @param string $default_path
      */
-    public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+    public static function get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
-        if ( $args && is_array($args) )
-            extract( $args );
+        if ($args && is_array($args))
+            extract($args);
 
-        $located = self::locate_template( $template_name, $template_path, $default_path );
+        $located = self::locate_template($template_name, $template_path, $default_path);
 
-        if( ! empty( $located ) ){
+        if ( ! empty($located)) {
 
-            do_action( 'sensei_before_template_part', $template_name, $template_path, $located );
+            do_action('sensei_before_template_part', $template_name, $template_path, $located);
 
-            include( $located );
+            include($located);
 
-            do_action( 'sensei_after_template_part', $template_name, $template_path, $located );
+            do_action('sensei_after_template_part', $template_name, $template_path, $located);
 
         }
 
@@ -98,32 +98,32 @@ 
      *
      * @return mixed|void
      */
-    public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+    public static function locate_template($template_name, $template_path = '', $default_path = '') {
 
-        if ( ! $template_path ) $template_path = Sensei()->template_url;
-        if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
+        if ( ! $template_path) $template_path = Sensei()->template_url;
+        if ( ! $default_path) $default_path = Sensei()->plugin_path().'/templates/';
 
         // Look within passed path within the theme - this is priority
         $template = locate_template(
             array(
-                $template_path . $template_name,
+                $template_path.$template_name,
                 $template_name
             )
         );
 
         // Get default template
-        if ( ! $template ){
+        if ( ! $template) {
 
-            $template = $default_path . $template_name;
+            $template = $default_path.$template_name;
 
         }
         // return nothing for file that do not exist
-        if( !file_exists( $template ) ){
+        if ( ! file_exists($template)) {
             $template = '';
         }
 
         // Return what we found
-        return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path );
+        return apply_filters('sensei_locate_template', $template, $template_name, $template_path);
 
     } // end locate
 
@@ -136,30 +136,30 @@ 
      * @param string $template
      * @return string $template
      */
-    public static function template_loader ( $template = '' ) {
+    public static function template_loader($template = '') {
 
         global $wp_query, $email_template;
 
-        $find = array( 'woothemes-sensei.php' );
+        $find = array('woothemes-sensei.php');
         $file = '';
 
-        if ( isset( $email_template ) && $email_template ) {
+        if (isset($email_template) && $email_template) {
 
-            $file 	= 'emails/' . $email_template;
+            $file = 'emails/'.$email_template;
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif ( is_single() && get_post_type() == 'course' ) {
+        } elseif (is_single() && get_post_type() == 'course') {
 
-            if ( Sensei()->check_user_permissions( 'course-single' ) ) {
+            if (Sensei()->check_user_permissions('course-single')) {
 
                 // possible backward compatible template include if theme overrides content-single-course.php
                 // this template was removed in 1.9.0 and code all moved into the main single-course.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true );
+                self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-course.php', true);
 
-                $file 	= 'single-course.php';
+                $file = 'single-course.php';
                 $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+                $find[] = Sensei()->template_url.$file;
 
             } else {
 
@@ -168,17 +168,17 @@ 
 
             } // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'lesson' ) {
+        } elseif (is_single() && get_post_type() == 'lesson') {
 
-            if ( Sensei()->check_user_permissions( 'lesson-single' ) ) {
+            if (Sensei()->check_user_permissions('lesson-single')) {
 
                 // possible backward compatible template include if theme overrides content-single-lesson.php
                 // this template was removed in 1.9.0 and code all moved into the main single-lesson.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true );
+                self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-lesson.php', true);
 
-                $file 	= 'single-lesson.php';
+                $file = 'single-lesson.php';
                 $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+                $find[] = Sensei()->template_url.$file;
 
             } else {
 
@@ -187,17 +187,17 @@ 
 
             } // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'quiz' ) {
+        } elseif (is_single() && get_post_type() == 'quiz') {
 
-            if ( Sensei()->check_user_permissions( 'quiz-single' ) ) {
+            if (Sensei()->check_user_permissions('quiz-single')) {
 
                 // possible backward compatible template include if theme overrides content-single-quiz.php
                 // this template was removed in 1.9.0 and code all moved into the main single-quiz.php file
-                self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true);
+                self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-quiz.php', true);
 
-                $file 	= 'single-quiz.php';
+                $file = 'single-quiz.php';
                 $find[] = $file;
-                $find[] = Sensei()->template_url . $file;
+                $find[] = Sensei()->template_url.$file;
 
             } else {
 
@@ -206,76 +206,76 @@ 
 
             } // End If Statement
 
-        } elseif ( is_single() && get_post_type() == 'sensei_message' ) {
+        } elseif (is_single() && get_post_type() == 'sensei_message') {
 
             // possible backward compatible template include if theme overrides content-single-message.php
             // this template was removed in 1.9.0 and code all moved into the main single-message.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true );
+            self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-message.php', true);
 
-            $file 	= 'single-message.php';
+            $file = 'single-message.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif ( is_post_type_archive( 'course' )
-                    || is_page( Sensei()->get_page_id( 'courses' ) )
-                    || is_tax( 'course-category' )) {
+        } elseif (is_post_type_archive('course')
+                    || is_page(Sensei()->get_page_id('courses'))
+                    || is_tax('course-category')) {
 
             // possible backward compatible template include if theme overrides 'taxonomy-course-category'
             // this template was removed in 1.9.0 and replaced by archive-course.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php');
+            self::locate_and_load_template_overrides(Sensei()->template_url.'taxonomy-course-category.php');
 
-            $file 	= 'archive-course.php';
+            $file = 'archive-course.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif ( is_post_type_archive( 'sensei_message' ) ) {
+        } elseif (is_post_type_archive('sensei_message')) {
 
-            $file 	= 'archive-message.php';
+            $file = 'archive-message.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif( is_tax( 'lesson-tag' ) ) {
+        } elseif (is_tax('lesson-tag')) {
 
             // possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php'
             // this template was removed in 1.9.0 and replaced by archive-lesson.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' );
+            self::locate_and_load_template_overrides(Sensei()->template_url.'taxonomy-lesson-tag.php');
 
-            $file 	= 'archive-lesson.php';
+            $file = 'archive-lesson.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) {
+        } elseif (isset($wp_query->query_vars['learner_profile'])) {
 
             // Override for sites with static home page
             $wp_query->is_home = false;
 
-            $file 	= 'learner-profile.php';
+            $file = 'learner-profile.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        } elseif ( isset( $wp_query->query_vars['course_results'] ) ) {
+        } elseif (isset($wp_query->query_vars['course_results'])) {
 
             // Override for sites with static home page
             $wp_query->is_home = false;
 
             $file = 'course-results.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
-        }elseif( is_author()
-                 && Sensei_Teacher::is_a_teacher( get_query_var('author') )
-                 && ! user_can( get_query_var('author'), 'manage_options' ) ){
+        }elseif (is_author()
+                 && Sensei_Teacher::is_a_teacher(get_query_var('author'))
+                 && ! user_can(get_query_var('author'), 'manage_options')) {
 
             $file = 'teacher-archive.php';
             $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+            $find[] = Sensei()->template_url.$file;
 
         } // Load the template file
 
-        if ( $file ) {
+        if ($file) {
 
-            $template = locate_template( $find );
-            if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+            $template = locate_template($find);
+            if ( ! $template) $template = Sensei()->plugin_path().'/templates/'.$file;
 
         } // End If Statement
 
@@ -295,21 +295,21 @@ 
      *
      * @since 1.9.0
      */
-    public static function get_no_permission_template( ){
+    public static function get_no_permission_template( ) {
 
         // possible backward compatible template loading
         // this template was removed in 1.9.0 and code all moved into the no-permissions.php file
-        self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true );
+        self::locate_and_load_template_overrides(Sensei()->template_url.'content-no-permissions.php', true);
 
-        $file 	= 'no-permissions.php';
+        $file = 'no-permissions.php';
         $find[] = $file;
-        $find[] = Sensei()->template_url . $file;
+        $find[] = Sensei()->template_url.$file;
 
-        $template = locate_template( $find );
-        if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+        $template = locate_template($find);
+        if ( ! $template) $template = Sensei()->plugin_path().'/templates/'.$file;
 
 	    // set a global constant so that we know that we're in this template
-	    define('SENSEI_NO_PERMISSION', true );
+	    define('SENSEI_NO_PERMISSION', true);
 
         return $template;
 
@@ -328,20 +328,20 @@ 
      * @param string $template
      * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true
      */
-    public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){
+    public static function locate_and_load_template_overrides($template = '', $load_header_footer = false) {
 
-        $found_template = locate_template( array( $template ) );
-        if( $found_template ){
+        $found_template = locate_template(array($template));
+        if ($found_template) {
 
-            if( $load_header_footer ){
+            if ($load_header_footer) {
 
                 get_sensei_header();
-                include( $found_template );
+                include($found_template);
                 get_sensei_footer();
 
-            }else{
+            } else {
 
-                include( $found_template );
+                include($found_template);
 
             }
 
@@ -358,9 +358,9 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecated_archive_course_content_hook(){
+    public static function deprecated_archive_course_content_hook() {
 
-        sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
+        sensei_do_deprecated_action('sensei_course_archive_main_content', '1.9.0', 'sensei_loop_course_before');
 
     }// end deprecated_archive_hook
 
@@ -370,11 +370,11 @@ 
      * @since 1.9.0
      * @param  WP_Post $post
      */
-    public static function the_title( $post ){
+    public static function the_title($post) {
 
         // ID passed in
-        if( is_numeric( $post ) ){
-            $post = get_post( $post );
+        if (is_numeric($post)) {
+            $post = get_post($post);
         }
 
         /**
@@ -384,7 +384,7 @@ 
          *
          * @param $title_html_tag default is 'h3'
          */
-        $title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
+        $title_html_tag = apply_filters('sensei_the_title_html_tag', 'h3');
 
         /**
          * Filter the title classes
@@ -392,14 +392,14 @@ 
          * @since 1.9.0
          * @param string $title_classes defaults to $post_type-title
          */
-        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
+        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type.'-title');
 
-        $html= '';
-        $html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
-        $html .= '<a href="' . get_permalink( $post->ID ) . '" >';
-        $html .= $post->post_title ;
+        $html = '';
+        $html .= '<'.$title_html_tag.' class="'.$title_classes.'" >';
+        $html .= '<a href="'.get_permalink($post->ID).'" >';
+        $html .= $post->post_title;
         $html .= '</a>';
-        $html .= '</'. $title_html_tag. '>';
+        $html .= '</'.$title_html_tag.'>';
         echo $html;
 
     }// end the title
@@ -411,11 +411,11 @@ 
      * @since 1.9.0
      * @deprecated 1.9.0
      */
-    public static function deprecated_single_course_inside_before_hooks(){
+    public static function deprecated_single_course_inside_before_hooks() {
 
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
-        sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', array(get_the_ID()));
+        sensei_do_deprecated_action('sensei_course_single_title', '1.9.0', 'sensei_single_course_content_inside_before');
+        sensei_do_deprecated_action('sensei_course_single_meta', '1.9.0', 'sensei_single_course_content_inside_before');
 
     }// end deprecated_single_course_inside_before_hooks
 
@@ -426,9 +426,9 @@ 
      * @since 1.9.0
      * @deprecated 1.9.0
      */
-    public static function deprecate_sensei_course_single_lessons_hook(){
+    public static function deprecate_sensei_course_single_lessons_hook() {
 
-        sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
+        sensei_do_deprecated_action('sensei_course_single_lessons', '1.9.0', 'sensei_single_course_content_inside_after');
 
     }// deprecate_sensei_course_single_lessons_hook
 
@@ -440,13 +440,13 @@ 
      * @since 1.9.0
      * @deprecated 1.9.0
      */
-    public static function deprecated_single_main_content_hook(){
+    public static function deprecated_single_main_content_hook() {
 
-            if( is_singular( 'course' ) ) {
+            if (is_singular('course')) {
 
                 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
 
-            } elseif( is_singular( 'message' ) ){
+            } elseif (is_singular('message')) {
 
                 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
             }
@@ -458,9 +458,9 @@ 
      * @since 1.9.0
      * @deprecated since 1.9.0
      */
-    public static function deprecate_module_before_hook(){
+    public static function deprecate_module_before_hook() {
 
-        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
+        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0', 'sensei_single_course_modules_after');
 
     }
 
@@ -469,9 +469,9 @@ 
      * @since 1.9.0
      * @deprecated since 1.9.0
      */
-    public static function deprecate_module_after_hook(){
+    public static function deprecate_module_after_hook() {
 
-        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
+        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0', 'sensei_single_course_modules_after');
 
     }
 
@@ -481,11 +481,11 @@ 
      * @since 1.9.0
      * @deprecated since 1.9.0
      */
-    public static function deprecate_all_post_type_single_title_hooks(){
+    public static function deprecate_all_post_type_single_title_hooks() {
 
-        if( is_singular( 'sensei_message' ) ){
+        if (is_singular('sensei_message')) {
 
-            sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
+            sensei_do_deprecated_action('sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before');
 
         }
 
@@ -501,10 +501,10 @@ 
     public static function deprecate_course_single_meta_hooks() {
 
         // deprecate all these hooks
-        sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
+        sensei_do_deprecated_action('sensei_course_start', '1.9.0', 'sensei_single_course_content_inside_before');
+        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message', '1.9.0', 'sensei_single_course_content_inside_before');
+        sensei_do_deprecated_action('sensei_course_meta', '1.9.0', 'sensei_single_course_content_inside_before');
+        sensei_do_deprecated_action('sensei_course_meta_video', '1.9.0', 'sensei_single_course_content_inside_before');
 
     } // End deprecate_course_single_meta_hooks
 
@@ -514,10 +514,10 @@ 
      */
     public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
 
-        if( is_singular( 'lesson' ) ){
+        if (is_singular('lesson')) {
 
-            sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
-            sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
+            sensei_do_deprecated_action('sensei_breadcrumb', '1.9.0', 'sensei_after_main_content', get_the_ID());
+            sensei_do_deprecated_action('sensei_comments', '1.9.0', 'sensei_after_main_content', get_the_ID());
 
         }
 
@@ -531,14 +531,14 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_lesson_course_signup_hook(){
+    public static function deprecate_sensei_lesson_course_signup_hook() {
 
-        $lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+        $lesson_course_id = get_post_meta(get_the_ID(), '_lesson_course', true);
+        $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id());
 
-        if(  !$user_taking_course ) {
+        if ( ! $user_taking_course) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
+            sensei_do_deprecated_action('sensei_lesson_course_signup', '1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id);
 
         }
     }// end deprecate_sensei_lesson_course_signup_hook
@@ -549,11 +549,11 @@ 
      * @since 1.9.0
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_lesson_single_meta_hook(){
+    public static function deprecate_sensei_lesson_single_meta_hook() {
 
-        if ( sensei_can_user_view_lesson()  ) {
+        if (sensei_can_user_view_lesson()) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
+            sensei_do_deprecated_action('sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after');
 
 
         }
@@ -564,9 +564,9 @@ 
      * Deprecate the sensei lesson single title hook
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_lesson_single_title(){
+    public static function deprecate_sensei_lesson_single_title() {
 
-        sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+        sensei_do_deprecated_action('sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID());
 
     }// end deprecate_sensei_lesson_single_title
 
@@ -574,9 +574,9 @@ 
      * hook in the deperecated single main content to the lesson
      * @deprecated since 1.9.0
      */
-    public  static function deprecate_lesson_single_main_content_hook(){
+    public  static function deprecate_lesson_single_main_content_hook() {
 
-        sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
+        sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before');
 
     }// end sensei_deprecate_lesson_single_main_content_hook
 
@@ -584,9 +584,9 @@ 
      * hook in the deperecated single main content to the lesson
      * @deprecated since 1.9.0
      */
-    public  static function deprecate_lesson_image_hook(){
+    public  static function deprecate_lesson_image_hook() {
 
-        sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+        sensei_do_deprecated_action('sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID());
 
     }// end sensei_deprecate_lesson_single_main_content_hook
 
@@ -597,9 +597,9 @@ 
      * @since 1.9.0
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_login_form_hook(){
+    public static function deprecate_sensei_login_form_hook() {
 
-        sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
+        sensei_do_deprecated_action('sensei_login_form', '1.9.0', 'sensei_login_form_before');
 
     } // end deprecate_sensei_login_form_hook
 
@@ -612,9 +612,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function  fire_sensei_complete_course_hook(){
+    public static function  fire_sensei_complete_course_hook() {
 
-        do_action( 'sensei_complete_course' );
+        do_action('sensei_complete_course');
 
     } //fire_sensei_complete_course_hook
 
@@ -623,9 +623,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function  fire_frontend_messages_hook(){
+    public static function  fire_frontend_messages_hook() {
 
-        do_action( 'sensei_frontend_messages' );
+        do_action('sensei_frontend_messages');
 
     }// end sensei_complete_course_action
 
@@ -635,9 +635,9 @@ 
      *
      * @deprected since 1.9.0
      */
-    public static function  deprecate_sensei_before_user_course_content_hook(){
+    public static function  deprecate_sensei_before_user_course_content_hook() {
 
-        sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
+        sensei_do_deprecated_action('sensei_before_user_course_content', '1.9.0', 'sensei_my_courses_content_inside_before', wp_get_current_user());
 
     }// deprecate_sensei_before_user_course_content_hook
 
@@ -647,9 +647,9 @@ 
      *
      * @deprected since 1.9.0
      */
-    public static function  deprecate_sensei_after_user_course_content_hook(){
+    public static function  deprecate_sensei_after_user_course_content_hook() {
 
-        sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
+        sensei_do_deprecated_action('sensei_after_user_course_content', '1.9.0', 'sensei_my_courses_content_inside_after', wp_get_current_user());
 
     }// deprecate_sensei_after_user_course_content_hook
 
@@ -659,10 +659,10 @@ 
      * @deprecated since 1.9.0
      * @since 1.9.0
      */
-    public static function deprecated_archive_message_hooks (){
+    public static function deprecated_archive_message_hooks() {
 
-        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
-        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
+        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop');
+        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop');
 
     }
 
@@ -672,9 +672,9 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_complete_quiz_action(){
+    public static function deprecate_sensei_complete_quiz_action() {
 
-        sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
+        sensei_do_deprecated_action('sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before');
 
     }
 
@@ -684,7 +684,7 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_quiz_question_type_action(){
+    public static function deprecate_sensei_quiz_question_type_action() {
 
         // Question Type
         global $sensei_question_loop;

includes/class-sensei-wc.php

Indentation +1209 added lines, -1209 removed lines

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

Spacing +285 added lines, -285 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 
 /**
  * Sensei WooCommerce class
@@ -11,16 +11,16 @@ 
  * @since 1.9.0
  */
 
-Class Sensei_WC{
+Class Sensei_WC {
     /**
      * Load the files needed for the woocommerce integration.
      *
      * @since 1.9.0
      */
-    public static function load_woocommerce_integration_hooks(){
+    public static function load_woocommerce_integration_hooks() {
 
-	    $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
-        require_once( $woocommerce_hooks_file_path );
+	    $woocommerce_hooks_file_path = Sensei()->plugin_path().'includes/hooks/woocommerce.php';
+        require_once($woocommerce_hooks_file_path);
 
     }
     /**
@@ -29,9 +29,9 @@ 
      * @since 1.9.0
      * @return bool
      */
-    public static function is_woocommerce_active(){
+    public static function is_woocommerce_active() {
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+        $is_woocommerce_enabled_in_settings = isset(Sensei()->settings->settings['woocommerce_enabled']) && Sensei()->settings->settings['woocommerce_enabled'];
         return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
     } // end is_woocommerce_active
@@ -46,19 +46,19 @@ 
      *
      * @return bool
      */
-    public static function is_woocommerce_present(){
+    public static function is_woocommerce_present() {
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+        $active_plugins = (array) get_option('active_plugins', array());
 
-        if ( is_multisite() ){
+        if (is_multisite()) {
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
 
         }
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+        $is_woocommerce_plugin_present_and_activated = in_array('woocommerce/woocommerce.php', $active_plugins) || array_key_exists('woocommerce/woocommerce.php', $active_plugins);
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+        return class_exists('Woocommerce') || $is_woocommerce_plugin_present_and_activated;
 
     }// end is_woocommerce_present
 
@@ -71,48 +71,48 @@ 
      * @param $course_id
      * @return array $user_course_orders
      */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+    public static function get_learner_course_active_order_id($user_id, $course_id) {
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        $orders_query = new WP_Query( array(
+        $orders_query = new WP_Query(array(
             'post_type'   => 'shop_order',
             'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
+            'post_status' => array('wc-processing', 'wc-completed'),
             'meta_key'=> '_customer_user',
             'meta_value'=> $user_id,
-        ) );
+        ));
 
-        if( $orders_query->post_count == 0 ){
+        if ($orders_query->post_count == 0) {
 
             return false;
 
         }
 
-        foreach( $orders_query->get_posts() as $order ){
+        foreach ($orders_query->get_posts() as $order) {
 
-            $order = new WC_Order( $order->ID );
+            $order = new WC_Order($order->ID);
             $items = $order->get_items();
 
-            $user_orders =  array();
+            $user_orders = array();
 
-            foreach( $items as $item ){
+            foreach ($items as $item) {
 
                 // if the product id on the order and the one given to this function
                 // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+                $product = wc_get_product($item['product_id']);
 
-                if ( is_object( $product ) && $product->is_type( 'variable' )) {
+                if (is_object($product) && $product->is_type('variable')) {
 
                     $item_product_id = $item['variation_id'];
 
                 } else {
 
-                    $item_product_id =  $item['product_id'];
+                    $item_product_id = $item['product_id'];
 
                 }
 
-                if( $course_product_id == $item_product_id ){
+                if ($course_product_id == $item_product_id) {
 
                     return $order->id;
 
@@ -136,12 +136,12 @@ 
      * @param $filter_links
      * @return mixed
      */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+    public static function add_course_archive_wc_filter_links($filter_links) {
 
         $free_courses = self::get_free_courses();
         $paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
+        if (empty($free_courses) || empty($paid_courses)) {
             // do not show any WooCommerce filters if all courses are
             // free or if all courses are paid
             return $filter_links;
@@ -149,15 +149,15 @@ 
         }
 
         $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
+            'id'=>'paid',
+            'url'=> add_query_arg(array('course_filter'=>'paid'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Paid', 'woothemes-sensei')
         );
 
         $filter_links[] = array(
             'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
+            'url'=> add_query_arg(array('course_filter'=>'free'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Free', 'woothemes-sensei')
         );
 
         return $filter_links;
@@ -174,24 +174,24 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_free( $query ){
+    public static function course_archive_wc_filter_free($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+        if (isset($_GET['course_filter']) && 'free' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_free_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
             // don't show any paid courses
             $courses = self::get_paid_courses();
             $ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
                 $ids[] = $course->ID;
             }
-            $query->set( 'post__not_in', $ids );
+            $query->set('post__not_in', $ids);
 
         }// end if course_filter
 
@@ -210,16 +210,16 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_paid( $query ){
+    public static function course_archive_wc_filter_paid($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+        if (isset($_GET['course_filter']) && 'paid' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_paid_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
         }
 
@@ -232,14 +232,14 @@ 
      * single courses if woocommerce is active allowing purchase
      * information and actions to be hooked from WooCommerce.
      */
-    public static function do_single_course_wc_single_product_action(){
+    public static function do_single_course_wc_single_product_action() {
 
         /**
          * this hooks is documented within the WooCommerce plugin.
          */
-        if ( Sensei_WC::is_woocommerce_active() ) {
+        if (Sensei_WC::is_woocommerce_active()) {
 
-            do_action( 'woocommerce_before_single_product' );
+            do_action('woocommerce_before_single_product');
 
         } // End If Statement
 
@@ -260,28 +260,28 @@ 
      * @param $user_id
      * @return bool
      */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+    public static function alter_can_user_view_lesson($can_user_view_lesson, $lesson_id, $user_id) {
 
 	    // do not override access to admins
-	    if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id ) ){
+	    if (sensei_all_access() || Sensei_Utils::is_preview_lesson($lesson_id)) {
 		    return true;
 	    }
 
         // check if the course has a valid product attached to it
         // which the user should have purchased if they want to access
         // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
+        $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
         $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
+        if (isset ($product) && is_object($product)) {
 
             // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+            $order_id = self::get_learner_course_active_order_id($user_id, $course_id);
 
             // product has a successful order so this user may access the content
             // this function may only return false or the default
             // returning true may override other negatives which we don't want
-            if( ! $order_id ){
+            if ( ! $order_id) {
 
                 return false;
 
@@ -304,23 +304,23 @@ 
      */
     public static function course_link_from_order( ) {
 
-        if( ! is_order_received_page() ){
+        if ( ! is_order_received_page()) {
             return;
         }
 
-        $order_id = get_query_var( 'order-received' );
-		$order = new WC_Order( $order_id );
+        $order_id = get_query_var('order-received');
+		$order = new WC_Order($order_id);
 
 		// exit early if not wc-completed or wc-processing
-		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+		if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
         $course_links = array(); // store the for links for courses purchased
-		foreach ( $order->get_items() as $item ) {
+		foreach ($order->get_items() as $item) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+            if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                 // If item has variation_id then its a variation of the product
                 $item_id = $item['variation_id'];
@@ -332,28 +332,28 @@ 
 
             } // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+            $user_id = get_post_meta($order->id, '_customer_user', true);
 
-            if( $user_id ) {
+            if ($user_id) {
 
                 // Get all courses for product
                 $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
+                $args['meta_query'] = array(array(
                             'key' => '_course_woocommerce_product',
                             'value' => $item_id
-                        ) );
+                        ));
                 $args['orderby'] = 'menu_order date';
                 $args['order'] = 'ASC';
 
                 // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+                $courses = get_posts($args);
+                if ($courses && count($courses) > 0) {
 
-                    foreach( $courses as $course ) {
+                    foreach ($courses as $course) {
 
                         $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+                        $permalink = get_permalink($course->ID);
+                        $course_links[] .= '<a href="'.esc_url($permalink).'" >'.$title.'</a> ';
 
                     } // end for each
 
@@ -364,24 +364,24 @@ 
         }// end loop through orders
 
         // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+        if ( ! empty($course_links)) {
 
             $courses_html = _nx(
                 'You have purchased the following course:',
                 'You have purchased the following courses:',
-                count( $course_links ),
+                count($course_links),
                 'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
             );
 
-            foreach( $course_links as $link ){
+            foreach ($course_links as $link) {
 
-                $courses_html .= '<li>' . $link . '</li>';
+                $courses_html .= '<li>'.$link.'</li>';
 
             }
 
             $courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
+            wc_add_notice($courses_html, 'success');
         }
 
 	} // end course_link_order_form
@@ -394,20 +394,20 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_in_cart_message(){
+    public static function course_in_cart_message() {
 
         global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+        if (self::is_course_in_cart($post->ID)) { ?>
 
             <div class="sensei-message info">
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+                $cart_link = '<a class="cart-complete" href="'.WC()->cart->get_checkout_url()
+                              . '" title="'.__('complete purchase', 'woothemes-sensei').'">'
+                              . __('complete the purchase', 'woothemes-sensei').'</a>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+                echo sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link);
 
                 ?>
             </div>
@@ -421,14 +421,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_course_in_cart( $course_id ){
+    public static function is_course_in_cart($course_id) {
 
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+        $wc_post_id = absint(get_post_meta($course_id, '_course_woocommerce_product', true));
+        $user_course_status_id = Sensei_Utils::user_started_course($course_id, get_current_user_id());
 
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+        if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
+            if (self::is_product_in_cart($wc_post_id)) {
 
                 return true;
 
@@ -446,20 +446,20 @@ 
      * @param $product_id
      * @return bool
      */
-    public static function is_product_in_cart( $product_id ){
+    public static function is_product_in_cart($product_id) {
 
-        if ( 0 < $product_id ) {
+        if (0 < $product_id) {
 
-            $product = wc_get_product( $product_id );
+            $product = wc_get_product($product_id);
 
             $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+            if (isset($product->variation_id) && 0 < intval($product->variation_id)) {
                 $wc_product_id = $product->parent->id;
             }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+            foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
 
                 $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
+                if ($product_id == $cart_product->id) {
 
                     return true;
 
@@ -481,9 +481,9 @@ 
      *  @type int $wp_post_id
      * }
      */
-    public static function get_free_product_ids(){
+    public static function get_free_product_ids() {
 
-        return  get_posts( array(
+        return  get_posts(array(
             'post_type' => 'product',
             'posts_per_page' => '1000',
             'fields' => 'ids',
@@ -508,7 +508,7 @@ 
      * @since 1.9.0
      * @return array $wp_meta_query_param
      */
-    public static function get_free_courses_meta_query_args(){
+    public static function get_free_courses_meta_query_args() {
 
         return array(
             'relation' => 'OR',
@@ -532,7 +532,7 @@ 
      * @since 1.9.0
      * @return array $wp_query_meta_query_args_param
      */
-    public static function get_paid_courses_meta_query_args(){
+    public static function get_paid_courses_meta_query_args() {
 
         $paid_product_ids = self::get_paid_product_ids();
 
@@ -541,7 +541,7 @@ 
                 'key'     => '_course_woocommerce_product',
                 // when empty we give a false post_id to ensure the caller doesn't get any courses for their
                 // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+                'value' => empty($paid_product_ids) ? '-1000' : $paid_product_ids,
                 'compare' => 'IN',
             ),
         );
@@ -555,7 +555,7 @@ 
      * @since 1.9.0
      * @return array $product_query_args
      */
-    public static function get_paid_products_on_sale_query_args(){
+    public static function get_paid_products_on_sale_query_args() {
 
         $args = array(
                    'post_type' 		=> 'product',
@@ -565,9 +565,9 @@ 
                    'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
+        $args['fields']     = 'ids';
 
-        $args[ 'meta_query' ] = array(
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -594,7 +594,7 @@ 
      *
      * @return array
      */
-    public static function get_paid_products_not_on_sale_query_args(){
+    public static function get_paid_products_not_on_sale_query_args() {
 
         $args = array(
             'post_type' 		=> 'product',
@@ -604,8 +604,8 @@ 
             'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
+        $args['fields']     = 'ids';
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -631,24 +631,24 @@ 
      *
      * @return array $woocommerce_paid_product_ids
      */
-    public static function get_paid_product_ids(){
+    public static function get_paid_product_ids() {
 
         // get all the paid WooCommerce products that has regular
         // and sale price greater than 0
         // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+        $paid_product_ids_with_sale = get_posts(self::get_paid_products_on_sale_query_args());
 
         // get all the paid WooCommerce products that has regular price
         // greater than 0 without a sale price
         // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+        $paid_product_ids_without_sale = get_posts(self::get_paid_products_not_on_sale_query_args());
 
         // combine products ID's with regular and sale price grater than zero and those without
         // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+        $woocommerce_paid_product_ids = array_merge($paid_product_ids_with_sale, $paid_product_ids_without_sale);
 
         // if
-        if( empty($woocommerce_paid_product_ids) ){
+        if (empty($woocommerce_paid_product_ids)) {
             return array( );
         }
         return $woocommerce_paid_product_ids;
@@ -667,20 +667,20 @@ 
      *
      * @return array
      */
-    public static function get_free_courses(){
+    public static function get_free_courses() {
 
         $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+        $free_course_query_args['meta_query'] = self::get_free_courses_meta_query_args();
 
         // don't show any paid courses
         $courses = self::get_paid_courses();
         $ids = array();
-        foreach( $courses as $course ){
+        foreach ($courses as $course) {
             $ids[] = $course->ID;
         }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
+        $free_course_query_args['post__not_in'] = $ids;
 
-        return get_posts( $free_course_query_args );
+        return get_posts($free_course_query_args);
 
     }
 
@@ -690,13 +690,13 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_paid_courses(){
+    public static function get_paid_courses() {
 
         $paid_course_query_args = Sensei_Course::get_default_query_args();
 
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+        $paid_course_query_args['meta_query'] = self::get_paid_courses_meta_query_args();
 
-        return get_posts(  $paid_course_query_args );
+        return get_posts($paid_course_query_args);
     }
 
     /**
@@ -711,17 +711,17 @@ 
      * @param int $course_id
      * @return string $html markup for the button or nothing if user not allowed to buy
      */
-    public static function the_add_to_cart_button_html( $course_id ){
+    public static function the_add_to_cart_button_html($course_id) {
 
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+        if ( ! Sensei_Course::is_prerequisite_complete($course_id)) {
             return '';
         }
 
-        $wc_post_id = self::get_course_product_id( $course_id );
+        $wc_post_id = self::get_course_product_id($course_id);
 
         // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
+        if (self::has_customer_bought_product(get_current_user_id(), $wc_post_id)
+            || empty($wc_post_id)) {
 
             return '';
 
@@ -729,15 +729,15 @@ 
 
         // based on simple.php in WC templates/single-product/add-to-cart/
         // Get the product
-        $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
         // do not show the button for invalid products, non purchasable products, out
         // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
+        if ( ! isset ($product)
+            || ! is_object($product)
             || ! $product->is_purchasable()
             || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
+            || self::is_course_in_cart($wc_post_id)) {
 
             return '';
 
@@ -748,23 +748,23 @@ 
         //
         ?>
 
-        <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
+        <form action="<?php echo esc_url($product->add_to_cart_url()); ?>"
               class="cart"
               method="post"
               enctype="multipart/form-data">
 
-            <input type="hidden" name="product_id" value="<?php echo esc_attr( $product->id ); ?>" />
+            <input type="hidden" name="product_id" value="<?php echo esc_attr($product->id); ?>" />
 
             <input type="hidden" name="quantity" value="1" />
 
-            <?php if ( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { ?>
+            <?php if (isset($product->variation_id) && 0 < intval($product->variation_id)) { ?>
 
                 <input type="hidden" name="variation_id" value="<?php echo $product->variation_id; ?>" />
-                <?php if( isset( $product->variation_data ) && is_array( $product->variation_data ) && count( $product->variation_data ) > 0 ) { ?>
+                <?php if (isset($product->variation_data) && is_array($product->variation_data) && count($product->variation_data) > 0) { ?>
 
-                    <?php foreach( $product->variation_data as $att => $val ) { ?>
+                    <?php foreach ($product->variation_data as $att => $val) { ?>
 
-                        <input type="hidden" name="<?php echo esc_attr( $att ); ?>" id="<?php echo esc_attr( str_replace( 'attribute_', '', $att ) ); ?>" value="<?php echo esc_attr( $val ); ?>" />
+                        <input type="hidden" name="<?php echo esc_attr($att); ?>" id="<?php echo esc_attr(str_replace('attribute_', '', $att)); ?>" value="<?php echo esc_attr($val); ?>" />
 
                     <?php } ?>
 
@@ -792,26 +792,26 @@ 
      *
      * @return string $message
      */
-    public static function alter_no_permissions_message( $message, $post_id ){
+    public static function alter_no_permissions_message($message, $post_id) {
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+        if (empty($post_id) || 'course' != get_post_type($post_id)) {
             return  $message;
         }
 
-        $product_id = self::get_course_product_id( $post_id );
+        $product_id = self::get_course_product_id($post_id);
 
-        if( ! $product_id
-            || self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+        if ( ! $product_id
+            || self::has_customer_bought_product(get_current_user_id(), $product_id)) {
 
             return $message;
 
         }
 
         ob_start();
-        self::the_course_no_permissions_message( $post_id );
+        self::the_course_no_permissions_message($post_id);
         $woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+        return $woocommerce_course_no_permissions_message;
 
     }
     /**
@@ -820,16 +820,16 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_no_permissions_message( $course_id ){
+    public static function the_course_no_permissions_message($course_id) {
 
         // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-        $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+        $my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
+        $login_link = '<a href="'.esc_url(get_permalink($my_courses_page_id)).'">'.__('log in', 'woothemes-sensei').'</a>';
 
         ?>
 
         <span class="add-to-cart-login">
-            <?php echo sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); ?>
+            <?php echo sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link); ?>
         </span>
 
     <?php }
@@ -844,45 +844,45 @@ 
      *
      * @return bool
      */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+    public static function has_customer_bought_product($user_id, $product_id) {
 
-        $orders = get_posts( array(
+        $orders = get_posts(array(
             'numberposts' => -1,
             'post_type' => 'shope_order',
             'meta_key'    => '_customer_user',
-            'meta_value'  => intval( $user_id ),
-            'post_status' => array( 'wc-complete','wc-processing' ),
-        ) );
+            'meta_value'  => intval($user_id),
+            'post_status' => array('wc-complete', 'wc-processing'),
+        ));
 
-        foreach ( $orders as $order_id ) {
+        foreach ($orders as $order_id) {
 
-            $order = new WC_Order( $order_id->ID );
+            $order = new WC_Order($order_id->ID);
 
             // wc-active is the subscriptions complete status
-            if ( ! in_array( $order->post_status, array( 'wc-complete','wc-processing' ) ) ){
+            if ( ! in_array($order->post_status, array('wc-complete', 'wc-processing'))) {
 
                 continue;
 
             }
 
-            if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
+            if ( ! (0 < sizeof($order->get_items()))) {
 
                 continue;
 
             }
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+                if ($item['product_id'] == $product_id || $item['variation_id'] == $product_id) {
 
                     // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = wcs_get_subscription( $order );
-                        if( $sub_key ) {
-                            $sub = wcs_get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
+                    if (class_exists('WC_Subscriptions_Manager')) {
+                        $sub_key = wcs_get_subscription($order);
+                        if ($sub_key) {
+                            $sub = wcs_get_subscription($sub_key);
+                            if ($sub && isset($sub['status'])) {
+                                if ('active' == $sub['status']) {
                                     return true;
                                 } else {
                                     return false;
@@ -911,11 +911,11 @@ 
      * @return string $woocommerce_product_id or false if none exist
      *
      */
-    public static function get_course_product_id( $course_id ){
+    public static function get_course_product_id($course_id) {
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+        if (empty($product_id) || 'product' != get_post_type($product_id)) {
             return false;
         }
 
@@ -931,11 +931,11 @@ 
      * @param array $classes
      * @return array
      */
-    public static function add_woocommerce_body_class( $classes ){
+    public static function add_woocommerce_body_class($classes) {
 
-        if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
+        if ( ! in_array('woocommerce', $classes) && defined('SENSEI_NO_PERMISSION') && SENSEI_NO_PERMISSION) {
 
-            $classes[] ='woocommerce';
+            $classes[] = 'woocommerce';
 
         }
 
@@ -953,7 +953,7 @@ 
      *
      * @return  void
      */
-    public static function activate_subscription(  $order ) {
+    public static function activate_subscription($order) {
 
         $order_user = get_user_by('id', $order->user_id);
         $user['ID'] = $order_user->ID;
@@ -962,13 +962,13 @@ 
         $user['user_url'] = $order_user->user_url;
 
         // Run through each product ordered
-        if ( ! sizeof($order->get_items() )>0 ) {
+        if ( ! sizeof($order->get_items()) > 0) {
 
             return;
 
         }
 
-        foreach($order->get_items() as $item) {
+        foreach ($order->get_items() as $item) {
 
             $product_type = '';
 
@@ -983,21 +983,21 @@ 
 
             } // End If Statement
 
-            $_product = self::get_product_object( $item_id, $product_type );
+            $_product = self::get_product_object($item_id, $product_type);
 
             // Get courses that use the WC product
             $courses = array();
 
-            if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
+            if ( ! in_array($product_type, self::get_subscription_types())) {
 
-                $courses = Sensei()->course->get_product_courses( $item_id );
+                $courses = Sensei()->course->get_product_courses($item_id);
 
             } // End If Statement
 
             // Loop and add the user to the course.
-            foreach ( $courses as $course_item ){
+            foreach ($courses as $course_item) {
 
-                Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
+                Sensei_Utils::user_start_course(intval($user['ID']), $course_item->ID);
 
             } // End For Loop
 
@@ -1015,13 +1015,13 @@ 
      *
      * @return  void
      */
-    public static function email_course_details(  $order ){
+    public static function email_course_details($order) {
 
         global $woocommerce;
 
         // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+        if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
@@ -1029,16 +1029,16 @@ 
         $order_id = $order->id;
 
         //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+        if (0 < sizeof($order_items)) {
 
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+            $course_details_html = '<h2>'.__('Course details', 'woothemes-sensei').'</h2>';
             $order_contains_courses = false;
 
 
-            foreach ( $order_items as $item ) {
+            foreach ($order_items as $item) {
 
                 $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
                     // If item has variation_id then its from variation
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1047,9 +1047,9 @@ 
                     $item_id = $item['product_id'];
                 } // End If Statement
 
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
+                $user_id = get_post_meta($order_id, '_customer_user', true);
 
-                if( $user_id ) {
+                if ($user_id) {
 
                     // Get all courses for product
                     $args = array(
@@ -1064,16 +1064,16 @@ 
                         'orderby' => 'menu_order date',
                         'order' => 'ASC',
                     );
-                    $courses = get_posts( $args );
+                    $courses = get_posts($args);
 
-                    if( $courses && count( $courses ) > 0 ) {
+                    if ($courses && count($courses) > 0) {
 
-                        foreach( $courses as $course ) {
+                        foreach ($courses as $course) {
 
                             $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
+                            $permalink = get_permalink($course->ID);
                             $order_contains_courses = true;
-                            $course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+                            $course_details_html .= '<p><strong>'.sprintf(__('View course: %1$s', 'woothemes-sensei'), '</strong><a href="'.esc_url($permalink).'">'.$title.'</a>').'</p>';
                         }
 
 
@@ -1084,7 +1084,7 @@ 
             } // end for each order item
 
             // Output Course details
-            if( $order_contains_courses ){
+            if ($order_contains_courses) {
 
                 echo $course_details_html;
 
@@ -1102,26 +1102,26 @@ 
      * @param   int $order_id WC order ID
      * @return  void
      */
-    public static function complete_order ( $order_id = 0 ) {
+    public static function complete_order($order_id = 0) {
 
         $order_user = array();
 
         // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+        if (Sensei_WC::is_woocommerce_active() && (0 < $order_id)) {
             // Get order object
-            $order = new WC_Order( $order_id );
-            $user = get_user_by( 'id', $order->get_user_id() );
+            $order = new WC_Order($order_id);
+            $user = get_user_by('id', $order->get_user_id());
             $order_user['ID'] = $user->ID;
             $order_user['user_login'] = $user->user_login;
             $order_user['user_email'] = $user->user_email;
             $order_user['user_url'] = $user->user_url;
             // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
+            if (0 < sizeof($order->get_items())) {
 
-                foreach( $order->get_items() as $item ) {
+                foreach ($order->get_items() as $item) {
 
                     $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                    if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                         $item_id = $item['variation_id'];
                         $product_type = 'variation';
@@ -1132,15 +1132,15 @@ 
 
                     } // End If Statement
 
-                    $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+                    $_product = Sensei_WC::get_product_object($item_id, $product_type);
 
                     // Get courses that use the WC product
-                    $courses = Sensei()->course->get_product_courses( $_product->id );
+                    $courses = Sensei()->course->get_product_courses($_product->id);
 
                     // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
+                    foreach ($courses as $course_item) {
 
-                        $update_course = Sensei()->woocommerce_course_update( $course_item->ID, $order_user );
+                        $update_course = Sensei()->woocommerce_course_update($course_item->ID, $order_user);
 
                     } // End For Loop
 
@@ -1148,7 +1148,7 @@ 
 
             } // End If Statement
             // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+            update_post_meta($order_id, 'sensei_payment_complete', '1');
 
         } // End If Statement
 
@@ -1162,28 +1162,28 @@ 
      * @param   integer| WC_Order $order_id order ID
      * @return  void
      */
-    public static function cancel_order ( $order_id ) {
+    public static function cancel_order($order_id) {
 
         // Get order object
-        if( is_object( $order_id ) ){
+        if (is_object($order_id)) {
 
             $order = $order_id;
 
-        }else{
+        } else {
 
-            $order = new WC_Order( $order_id );
+            $order = new WC_Order($order_id);
         }
 
         // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+        if (0 < sizeof($order->get_items())) {
 
             // Get order user
-            $user_id = $order->__get( 'user_id' );
+            $user_id = $order->__get('user_id');
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1194,17 +1194,17 @@ 
 
                 } // End If Statement
 
-                $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+                $_product = Sensei_WC::get_product_object($item_id, $product_type);
 
                 // Get courses that use the WC product
                 $courses = array();
-                $courses = Sensei()->course->get_product_courses( $item_id );
+                $courses = Sensei()->course->get_product_courses($item_id);
 
                 // Loop and update those courses
-                foreach ($courses as $course_item){
+                foreach ($courses as $course_item) {
 
                     // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course($course_item->ID, $user_id);
 
                 } // End For Loop
 
@@ -1225,30 +1225,30 @@ 
      * @param   string  $product_type  '' or 'variation'
      * @return   WC_Product $wc_product_object
      */
-    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
+    public static function get_product_object($wc_product_id = 0, $product_type = '') {
 
         $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+        if (0 < intval($wc_product_id)) {
 
             // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
+            if (function_exists('wc_get_product')) {
 
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+                $wc_product_object = wc_get_product($wc_product_id); // Post WC 2.3
 
-            } elseif ( function_exists( 'get_product' ) ) {
+            } elseif (function_exists('get_product')) {
 
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+                $wc_product_object = get_product($wc_product_id); // Post WC 2.0
 
             } else {
 
                 // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+                if ('variation' == $product_type || 'subscription_variation' == $product_type) {
 
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
+                    $wc_product_object = new WC_Product_Variation($wc_product_id);
 
                 } else {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+                    $wc_product_object = new WC_Product($wc_product_id);
 
                 } // End If Statement
 
@@ -1271,19 +1271,19 @@ 
      *
      * @return bool|int
      */
-    public static function course_update ( $course_id = 0, $order_user = array()  ) {
+    public static function course_update($course_id = 0, $order_user = array()) {
 
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+        if ( ! isset($current_user) || ! $current_user->ID > 0) return false;
 
         $data_update = false;
 
         // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+        $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true);
 
         // Check if in the admin
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $user_login = $order_user['user_login'];
             $user_email = $order_user['user_email'];
@@ -1300,28 +1300,28 @@ 
         } // End If Statement
 
         // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
+        $course_prerequisite_id = (int) get_post_meta($course_id, '_course_prerequisite', true);
+        if (0 < absint($course_prerequisite_id)) {
 
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
+            $prereq_course_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, intval($user_id));
+            if ( ! $prereq_course_complete) {
 
                 // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+                return Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
 
             }
         }
 
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+        $is_user_taking_course = Sensei_Utils::user_started_course(intval($course_id), intval($user_id));
 
-        if( ! $is_user_taking_course ) {
+        if ( ! $is_user_taking_course) {
 
-            if ( Sensei_WC::is_woocommerce_active() && Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
+            if (Sensei_WC::is_woocommerce_active() && Sensei_WC::has_customer_bought_product($user_id, $wc_post_id) && (0 < $wc_post_id)) {
 
-                $activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
+                $activity_logged = Sensei_Utils::user_start_course(intval($user_id), intval($course_id));
 
                 $is_user_taking_course = false;
-                if ( true == $activity_logged ) {
+                if (true == $activity_logged) {
 
                     $is_user_taking_course = true;
 
@@ -1344,14 +1344,14 @@ 
      *
      * @return boolean                 Modified guest checkout setting
      */
-    public static function disable_guest_checkout( $guest_checkout ) {
+    public static function disable_guest_checkout($guest_checkout) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
 
-            if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
+            if (isset(WC()->cart->cart_contents) && count(WC()->cart->cart_contents) > 0) {
 
-                foreach( WC()->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
+                foreach (WC()->cart->cart_contents as $cart_key => $product) {
+                    if (isset($product['product_id'])) {
 
                         $args = array(
                             'posts_per_page' => -1,
@@ -1364,11 +1364,11 @@ 
                             )
                         );
 
-                        $posts = get_posts( $args );
+                        $posts = get_posts($args);
 
-                        if( $posts && count( $posts ) > 0 ) {
+                        if ($posts && count($posts) > 0) {
 
-                            foreach( $posts as $course ) {
+                            foreach ($posts as $course) {
                                 $guest_checkout = '';
                                 break;
 
@@ -1397,23 +1397,23 @@ 
      *
      * @return string
      **/
-    public static function virtual_order_payment_complete( $order_status, $order_id ) {
+    public static function virtual_order_payment_complete($order_status, $order_id) {
 
-        $order = new WC_Order( $order_id );
+        $order = new WC_Order($order_id);
 
-        if ( ! isset ( $order ) ) return '';
+        if ( ! isset ($order)) return '';
 
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+        if ($order_status == 'wc-processing' && ($order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed')) {
 
             $virtual_order = true;
 
-            if ( count( $order->get_items() ) > 0 ) {
+            if (count($order->get_items()) > 0) {
 
-                foreach( $order->get_items() as $item ) {
+                foreach ($order->get_items() as $item) {
 
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
+                    if ($item['product_id'] > 0) {
+                        $_product = $order->get_product_from_item($item);
+                        if ( ! $_product->is_virtual()) {
 
                             $virtual_order = false;
                             break;
@@ -1427,7 +1427,7 @@ 
             } // End If Statement
 
             // virtual order, mark as completed
-            if ( $virtual_order ) {
+            if ($virtual_order) {
 
                 return 'completed';
 
@@ -1450,14 +1450,14 @@ 
      * @param  integer $user_id
      * @return boolean $user_access_permission
      */
-    public static function get_subscription_permission( $user_access_permission, $user_id ){
+    public static function get_subscription_permission($user_access_permission, $user_id) {
 
         global $post;
 
         // ignore the current case if the following conditions are met
-        if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
-            || ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
-            || ! wcs_user_has_subscription( $user_id) ){
+        if ( ! class_exists('WC_Subscriptions') || empty($user_id)
+            || ! in_array($post->post_type, array('course', 'lesson', 'quiz'))
+            || ! wcs_user_has_subscription($user_id)) {
 
             return $user_access_permission;
 
@@ -1467,25 +1467,25 @@ 
         // is the subscription on the the current course?
 
         $course_id = 0;
-        if ( 'course' == $post->post_type ){
+        if ('course' == $post->post_type) {
 
             $course_id = $post->ID;
 
-        } elseif ( 'lesson' == $post->post_type ) {
+        } elseif ('lesson' == $post->post_type) {
 
-            $course_id = Sensei()->lesson->get_course_id( $post->ID );
+            $course_id = Sensei()->lesson->get_course_id($post->ID);
 
         } else {
 
-            $lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+            $lesson_id = Sensei()->quiz->get_lesson_id($post->ID);
+            $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         }
 
         // if the course has no subscription WooCommerce product attached to return the permissions as is
-        $product_id = Sensei_WC::get_course_product_id( $course_id );
-        $product = wc_get_product( $product_id );
-        if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
+        $product_id = Sensei_WC::get_course_product_id($course_id);
+        $product = wc_get_product($product_id);
+        if ( ! in_array($product->get_type(), self::get_subscription_types())) {
 
             return $user_access_permission;
 
@@ -1493,19 +1493,19 @@ 
 
         // give access if user has active subscription on the product otherwise restrict it.
         // also check if the user was added to the course directly after the subscription started.
-        if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-            || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-            || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
+        if (wcs_user_has_subscription($user_id, $product_id, 'active')
+            || wcs_user_has_subscription($user_id, $product_id, 'pending-cancel')
+            || self::was_user_added_without_subscription($user_id, $product_id, $course_id)) {
 
             $user_access_permission = true;
 
-        }else{
+        } else {
 
             $user_access_permission = false;
             // do not show the WC permissions message
-            remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
-            Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
-            Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
+            remove_filter('sensei_the_no_permissions_message', array('Sensei_WC', 'alter_no_permissions_message'), 20, 2);
+            Sensei()->permissions_message['title'] = __('No active subscription', 'woothemes-sensei');
+            Sensei()->permissions_message['message'] = __('Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei');
         }
 
         return $user_access_permission;
@@ -1518,9 +1518,9 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_subscription_types(){
+    public static function get_subscription_types() {
 
-        return array( 'subscription','subscription_variation','variable-subscription' );
+        return array('subscription', 'subscription_variation', 'variable-subscription');
 
     }
 
@@ -1540,15 +1540,15 @@ 
      *
      * @return bool
      */
-    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
+    public static function was_user_added_without_subscription($user_id, $product_id, $course_id) {
 
         $course_start_date = '';
         $subscription_start_date = '';
-        $is_a_subscription ='';
+        $is_a_subscription = '';
         $was_user_added_without_subscription = true;
 
         // if user is not on the course they were not added
-        if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+        if ( ! Sensei_Utils::user_started_course($course_id, $user_id)) {
 
             return false;
 
@@ -1557,34 +1557,34 @@ 
         // if user doesn't have a subscription and is taking the course
         // they were added manually
         if ( ! wcs_user_has_subscription($user_id, $product_id)
-            && Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
+            && Sensei_Utils::user_started_course($course_id, get_current_user_id())) {
 
             return true;
 
         }
 
-        $course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
+        $course_status = Sensei_Utils::user_course_status($course_id, $user_id);
 
         // comparing dates setup data
-        $course_start_date = date_create( $course_status->comment_date );
-        $subscriptions = wcs_get_users_subscriptions( $user_id );
+        $course_start_date = date_create($course_status->comment_date);
+        $subscriptions = wcs_get_users_subscriptions($user_id);
 
         // comparing every subscription
-        foreach( $subscriptions as $subscription ){
+        foreach ($subscriptions as $subscription) {
 
             // for the following statuses we know the user was not added
             // manually
             $status = $subscription->get_status();
-            if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
+            if (in_array($status, array('pending-canceled', 'active', 'on-hold', 'pending'))) {
 
                 continue;
 
             }
 
-            $current_subscription_start_date = date_create( $subscription->modified_date );
+            $current_subscription_start_date = date_create($subscription->modified_date);
 
             // is the last updated subscription date newer than course start date
-            if (  $current_subscription_start_date > $course_start_date   ) {
+            if ($current_subscription_start_date > $course_start_date) {
 
                 return false;
 

includes/class-sensei.php

Indentation +1031 added lines, -1031 removed lines

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

Spacing +213 added lines, -213 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Responsible for loading Sensei and setting up the Main WordPress hooks.
@@ -142,23 +142,23 @@ 
      * @param  string $file The base file of the plugin.
      * @since  1.0.0
      */
-    public function __construct ( $file ) {
+    public function __construct($file) {
 
         // Setup object data
         $this->file = $file;
-        $this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
-        $this->plugin_path = trailingslashit( dirname( $file ) );
-        $this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
-        $this->permissions_message = array( 'title' => __( 'Permission Denied', 'woothemes-sensei' ), 'message' => __( 'Unfortunately you do not have permissions to access this page.', 'woothemes-sensei' ) );
+        $this->plugin_url = trailingslashit(plugins_url('', $plugin = $file));
+        $this->plugin_path = trailingslashit(dirname($file));
+        $this->template_url = apply_filters('sensei_template_url', 'sensei/');
+        $this->permissions_message = array('title' => __('Permission Denied', 'woothemes-sensei'), 'message' => __('Unfortunately you do not have permissions to access this page.', 'woothemes-sensei'));
 
         // Initialize the core Sensei functionality
         $this->init();
 
         // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+        if (is_admin() && ! defined('DOING_AJAX')) $this->install();
 
         // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
+        register_activation_hook($this->file, array($this, 'activation'));
 
         // Image Sizes
         $this->init_image_sizes();
@@ -172,11 +172,11 @@ 
      * Load the foundations of Sensei.
      * @since 1.9.0
      */
-    protected function init(){
+    protected function init() {
 
         // Localisation
         $this->load_plugin_textdomain();
-        add_action( 'init', array( $this, 'load_localisation' ), 0 );
+        add_action('init', array($this, 'load_localisation'), 0);
 
         // Setup settings
         $this->settings = new Sensei_Settings();
@@ -199,12 +199,12 @@ 
      */
     public static function instance() {
 
-        if ( is_null( self::$_instance ) ) {
+        if (is_null(self::$_instance)) {
 
             //Sensei requires a reference to the main Sensei plugin file
-            $sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
+            $sensei_main_plugin_file = dirname(dirname(__FILE__)).'/woothemes-sensei.php';
 
-            self::$_instance = new self( $sensei_main_plugin_file  );
+            self::$_instance = new self($sensei_main_plugin_file);
 
             // load the global class objects needed throughout Sensei
             self::$_instance->initialize_global_objects();
@@ -223,9 +223,9 @@ 
      *
      * @param $plugin
      */
-    public static function activation_flush_rules( $plugin ){
+    public static function activation_flush_rules($plugin) {
 
-        if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
+        if (strpos($plugin, '/woothemes-sensei.php') > 0) {
 
             flush_rewrite_rules(true);
 
@@ -238,7 +238,7 @@ 
      * @since 1.8.0
      */
     public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '1.8' );
+        _doing_it_wrong(__FUNCTION__, __('Cheatin&#8217; huh?', 'woothemes-sensei'), '1.8');
     }
 
     /**
@@ -246,7 +246,7 @@ 
      * @since 1.8.0
      */
     public function __wakeup() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '1.8' );
+        _doing_it_wrong(__FUNCTION__, __('Cheatin&#8217; huh?', 'woothemes-sensei'), '1.8');
     }
 
     /**
@@ -254,13 +254,13 @@ 
      *
      * @since 1.9.0
      */
-    public function initialize_global_objects(){
+    public function initialize_global_objects() {
 
         // Setup post types.
         $this->post_types = new Sensei_PostTypes();
 
         // Lad the updates class
-        $this->updates = new Sensei_Updates( $this );
+        $this->updates = new Sensei_Updates($this);
 
         // Load Course Results Class
         $this->course_results = new Sensei_Course_Results();
@@ -284,19 +284,19 @@ 
 	    $this->load_modules_class();
 
         // Load Learner Management Functionality
-        $this->learners = new Sensei_Learner_Management( $this->file );
+        $this->learners = new Sensei_Learner_Management($this->file);
 
         // Differentiate between administration and frontend logic.
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             // Load Admin Welcome class
             new Sensei_Welcome();
 
             // Load Admin Class
-            $this->admin = new Sensei_Admin( $this->file );
+            $this->admin = new Sensei_Admin($this->file);
 
             // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $this->file );
+            $this->analysis = new Sensei_Analysis($this->file);
 
         } else {
 
@@ -313,10 +313,10 @@ 
         }
 
         // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $this->file );
+        $this->grading = new Sensei_Grading($this->file);
 
         // Load Email Class
-        $this->emails = new Sensei_Emails( $this->file );
+        $this->emails = new Sensei_Emails($this->file);
 
         // Load Learner Profiles Class
         $this->learner_profiles = new Sensei_Learner_Profiles();
@@ -328,21 +328,21 @@ 
      *
      * @since 1.9.0
      */
-    public function load_hooks(){
+    public function load_hooks() {
 
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+        add_action('widgets_init', array($this, 'register_widgets'));
+        add_action('after_setup_theme', array($this, 'ensure_post_thumbnails_support'));
 
         // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
+        add_filter('wp_count_comments', array($this, 'sensei_count_comments'), 10, 2);
 
-        add_action( 'body_class', array( $this, 'body_class' ) );
+        add_action('body_class', array($this, 'body_class'));
 
         // Check for and activate JetPack LaTeX support
-        add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules
+        add_action('plugins_loaded', array($this, 'jetpack_latex_support'), 200); // Runs after Jetpack has loaded it's modules
 
         // check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
-        add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
+        add_action('init', array($this, 'flush_rewrite_rules'), 101);
 
     }
 
@@ -354,7 +354,7 @@ 
      */
     public function run_updates() {
         // Run updates if administrator
-        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
+        if (current_user_can('manage_options') || current_user_can('manage_sensei')) {
 
             $this->updates->update();
 
@@ -367,21 +367,21 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function register_widgets () {
+    public function register_widgets() {
         // Widget List (key => value is filename => widget class).
-        $widget_list = apply_filters( 'sensei_registered_widgets_list', array( 	'course-component' 	=> 'Course_Component',
+        $widget_list = apply_filters('sensei_registered_widgets_list', array('course-component' 	=> 'Course_Component',
                 'lesson-component' 	=> 'Lesson_Component',
                 'course-categories' => 'Course_Categories',
-                'category-courses' 	=> 'Category_Courses' )
+                'category-courses' 	=> 'Category_Courses')
         );
-        foreach ( $widget_list as $key => $value ) {
-            if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+        foreach ($widget_list as $key => $value) {
+            if (file_exists($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php')) {
+                require_once($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php');
+                register_widget('WooThemes_Sensei_'.$value.'_Widget');
             }
         } // End For Loop
 
-        do_action( 'sensei_register_widgets' );
+        do_action('sensei_register_widgets');
 
     } // End register_widgets()
 
@@ -391,9 +391,9 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function load_localisation () {
+    public function load_localisation() {
 
-        load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+        load_plugin_textdomain('woothemes-sensei', false, dirname(plugin_basename($this->file)).'/lang/');
 
     } // End load_localisation()
 
@@ -403,13 +403,13 @@ 
      * @since   1.0.0
      * @return  void
      */
-    public function load_plugin_textdomain () {
+    public function load_plugin_textdomain() {
 
         $domain = 'woothemes-sensei';
         // The "plugin_locale" filter is also used in load_plugin_textdomain()
-        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
-        load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' );
-        load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+        $locale = apply_filters('plugin_locale', get_locale(), $domain);
+        load_textdomain($domain, WP_LANG_DIR.'/'.$domain.'/'.$domain.'-'.$locale.'.mo');
+        load_plugin_textdomain($domain, FALSE, dirname(plugin_basename($this->file)).'/lang/');
 
     } // End load_plugin_textdomain()
 
@@ -419,7 +419,7 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function activation () {
+    public function activation() {
 
         $this->register_plugin_version();
 
@@ -432,10 +432,10 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function install () {
+    public function install() {
 
-        register_activation_hook( $this->file, array( $this, 'activate_sensei' ) );
-        register_activation_hook( $this->file, 'flush_rewrite_rules' );
+        register_activation_hook($this->file, array($this, 'activate_sensei'));
+        register_activation_hook($this->file, 'flush_rewrite_rules');
 
     } // End install()
 
@@ -446,10 +446,10 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function activate_sensei () {
+    public function activate_sensei() {
 
-        update_option( 'skip_install_sensei_pages', 0 );
-        update_option( 'sensei_installed', 1 );
+        update_option('skip_install_sensei_pages', 0);
+        update_option('sensei_installed', 1);
 
     } // End activate_sensei()
 
@@ -459,10 +459,10 @@ 
      * @since  1.0.0
      * @return void
      */
-    private function register_plugin_version () {
-        if ( $this->version != '' ) {
+    private function register_plugin_version() {
+        if ($this->version != '') {
 
-            update_option( 'woothemes-sensei-version', $this->version );
+            update_option('woothemes-sensei-version', $this->version);
 
         }
     } // End register_plugin_version()
@@ -473,9 +473,9 @@ 
      * @since   1.0.1
      * @return  void
      */
-    public function ensure_post_thumbnails_support () {
+    public function ensure_post_thumbnails_support() {
 
-        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
+        if ( ! current_theme_supports('post-thumbnails')) { add_theme_support('post-thumbnails'); }
 
     } // End ensure_post_thumbnails_support()
 
@@ -487,10 +487,10 @@ 
      * @return void
      * @deprecated
      */
-    public function template_loader ( $template = '' ) {
+    public function template_loader($template = '') {
 
-        _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
-        Sensei_Templates::template_loader( $template );
+        _deprecated_function('Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead');
+        Sensei_Templates::template_loader($template);
 
     } // End template_loader()
 
@@ -500,15 +500,15 @@ 
      * @since  1.0.0
      * @return string $sensei_plugin_path
      */
-    public function plugin_path () {
+    public function plugin_path() {
 
-        if ( $this->plugin_path ) {
+        if ($this->plugin_path) {
 
-            $sensei_plugin_path =  $this->plugin_path;
+            $sensei_plugin_path = $this->plugin_path;
 
-        }else{
+        } else {
 
-            $sensei_plugin_path = plugin_dir_path( __FILE__ );
+            $sensei_plugin_path = plugin_dir_path(__FILE__);
 
         }
 
@@ -523,9 +523,9 @@ 
      * @param  string $page
      * @return int
      */
-    public function get_page_id ( $page ) {
-        $page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
-        return ( $page ) ? $page : -1;
+    public function get_page_id($page) {
+        $page = apply_filters('sensei_get_'.esc_attr($page).'_page_id', get_option('sensei_'.esc_attr($page).'_page_id'));
+        return ($page) ? $page : -1;
     } // End get_page_id()
 
     /**
@@ -536,101 +536,101 @@ 
      *
      * @return bool
      */
-    public function check_user_permissions ( $page = '' ) {
+    public function check_user_permissions($page = '') {
 
         global $current_user, $post;
 
         // if user is not logged in skipped for single lesson
-        if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission')
-            && 'lesson-single' !=  $page ){
+        if (empty($current_user->caps) && Sensei()->settings->get('access_permission')
+            && 'lesson-single' != $page) {
 
-            $this->permissions_message['title'] = __('Restricted Access:', 'woothemes-sensei' );
-            $this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
+            $this->permissions_message['title'] = __('Restricted Access:', 'woothemes-sensei');
+            $this->permissions_message['message'] = sprintf(__('You must be logged in to view this %s'), get_post_type());
 
             return false;
         }
 
         $user_allowed = false;
 
-        switch ( $page ) {
+        switch ($page) {
             case 'course-single':
                 // check for prerequisite course or lesson,
-                $course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true);
-                $update_course = Sensei_WC::course_update( $post->ID );
+                $course_prerequisite_id = (int) get_post_meta($post->ID, '_course_prerequisite', true);
+                $update_course = Sensei_WC::course_update($post->ID);
                 // Count completed lessons
-                if ( 0 < absint( $course_prerequisite_id ) ) {
+                if (0 < absint($course_prerequisite_id)) {
 
-                    $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
+                    $prerequisite_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, $current_user->ID);
 
                 }
                 else {
                     $prerequisite_complete = true;
                 } // End If Statement
                 // Handles restrictions
-                if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
+                if ( ! $prerequisite_complete && 0 < absint($course_prerequisite_id)) {
+                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                    $course_link = '<a href="'.esc_url(get_permalink($course_prerequisite_id)).'">'.__('course', 'woothemes-sensei').'</a>';
+                    $this->permissions_message['message'] = sprintf(__('Please complete the previous %1$s before taking this course.', 'woothemes-sensei'), $course_link);
                 } else {
                     $user_allowed = true;
                 } // End If Statement
                 break;
             case 'lesson-single':
                 // Check for WC purchase
-                $lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
+                $lesson_course_id = get_post_meta($post->ID, '_lesson_course', true);
 
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                $is_preview = Sensei_Utils::is_preview_lesson( $post->ID );
+                $update_course = Sensei_WC::course_update($lesson_course_id);
+                $is_preview = Sensei_Utils::is_preview_lesson($post->ID);
 
-                if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+                if ($this->access_settings() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) {
                     $user_allowed = true;
-                } elseif( $this->access_settings() && false == $is_preview ) {
+                } elseif ($this->access_settings() && false == $is_preview) {
 
                     $user_allowed = true;
 
                 } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                    if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                    $course_link = '<a href="'.esc_url(get_permalink($lesson_course_id)).'">'.__('course', 'woothemes-sensei').'</a>';
+                    $wc_post_id = get_post_meta($lesson_course_id, '_course_woocommerce_product', true);
+                    if (Sensei_WC::is_woocommerce_active() && (0 < $wc_post_id)) {
+                        if ($is_preview) {
+                            $this->permissions_message['message'] = sprintf(__('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei'), $course_link);
                         } else {
-                            $this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link );
+                            $this->permissions_message['message'] = sprintf(__('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei'), $course_link);
                         }
                     } else {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+                        if ($is_preview) {
+                            $this->permissions_message['message'] = sprintf(__('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei'), $course_link);
                         } else {
                             /** This filter is documented in class-woothemes-sensei-frontend.php */
-                            $this->permissions_message['message'] =  sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
+                            $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link);
                         }
                     } // End If Statement
                 } // End If Statement
                 break;
             case 'quiz-single':
-                $lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true );
-                $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true );
+                $lesson_id = get_post_meta($post->ID, '_quiz_lesson', true);
+                $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
+                $update_course = Sensei_WC::course_update($lesson_course_id);
+                if (($this->access_settings() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) || sensei_all_access()) {
 
                     // Check for prerequisite lesson for this quiz
-                    $lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true);
-                    $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID);
+                    $lesson_prerequisite_id = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true);
+                    $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson($lesson_prerequisite_id, $current_user->ID);
 
                     // Handle restrictions
-                    if( sensei_all_access() ) {
+                    if (sensei_all_access()) {
 
                         $user_allowed = true;
 
                     } else {
 
-                        if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) {
+                        if (0 < absint($lesson_prerequisite_id) && ( ! $user_lesson_prerequisite_complete)) {
 
-                            $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                            $lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>';
-                            $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link );
+                            $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                            $lesson_link = '<a href="'.esc_url(get_permalink($lesson_prerequisite_id)).'">'.__('lesson', 'woothemes-sensei').'</a>';
+                            $this->permissions_message['message'] = sprintf(__('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei'), $lesson_link);
 
                         } else {
 
@@ -638,27 +638,27 @@ 
 
                         } // End If Statement
                     } // End If Statement
-                } elseif( $this->access_settings() ) {
+                } elseif ($this->access_settings()) {
                     // Check if the user has started the course
 
-                    if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) {
+                    if (is_user_logged_in() && ! Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID) && (isset($this->settings->settings['access_permission']) && (true == $this->settings->settings['access_permission']))) {
 
                         $user_allowed = false;
-                        $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                        $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                        $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                            $this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+                        $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                        $course_link = '<a href="'.esc_url(get_permalink($lesson_course_id)).'">'.__('course', 'woothemes-sensei').'</a>';
+                        $wc_post_id = get_post_meta($lesson_course_id, '_course_woocommerce_product', true);
+                        if (Sensei_WC::is_woocommerce_active() && (0 < $wc_post_id)) {
+                            $this->permissions_message['message'] = sprintf(__('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei'), $course_link);
                         } else {
-                            $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+                            $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei'), $course_link);
                         } // End If Statement
                     } else {
                         $user_allowed = true;
                     } // End If Statement
                 } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link );
+                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                    $course_link = '<a href="'.esc_url(get_permalink(get_post_meta(get_post_meta($post->ID, '_quiz_lesson', true), '_lesson_course', true))).'">'.__('course', 'woothemes-sensei').'</a>';
+                    $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei'), $course_link);
                 } // End If Statement
                 break;
             default:
@@ -680,10 +680,10 @@ 
          * }
          * @param string $post_id
          */
-        $this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
+        $this->permissions_message = apply_filters('sensei_permissions_message', $this->permissions_message, $post->ID);
 
 
-        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
+        if (sensei_all_access() || Sensei_Utils::is_preview_lesson($post->ID)) {
             $user_allowed = true;
         }
 
@@ -697,7 +697,7 @@ 
          * @param integer $user_id
          *
          */
-        return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID );
+        return apply_filters('sensei_access_permissions', $user_allowed, $current_user->ID);
 
     } // End get_placeholder_image()
 
@@ -708,12 +708,12 @@ 
      * @access public
      * @return bool
      */
-    public function access_settings () {
+    public function access_settings() {
 
-        if( sensei_all_access() ) return true;
+        if (sensei_all_access()) return true;
 
-        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
-            if ( is_user_logged_in() ) {
+        if (isset($this->settings->settings['access_permission']) && (true == $this->settings->settings['access_permission'])) {
+            if (is_user_logged_in()) {
                 return true;
             } else {
                 return false;
@@ -729,9 +729,9 @@ 
      * @access  public
      * @return  void
      */
-    public function load_class ( $class_name = '' ) {
-        if ( '' != $class_name && '' != $this->token ) {
-            require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' );
+    public function load_class($class_name = '') {
+        if ('' != $class_name && '' != $this->token) {
+            require_once('class-'.esc_attr($this->token).'-'.esc_attr($class_name).'.php');
         } // End If Statement
     } // End load_class()
 
@@ -743,44 +743,44 @@ 
      * @param  integer $post_id
      * @return array
      */
-    public function sensei_count_comments( $comments, $post_id ) {
+    public function sensei_count_comments($comments, $post_id) {
         global $wpdb;
 
         $post_id = (int) $post_id;
 
         $count = wp_cache_get("comments-{$post_id}", 'counts');
 
-        if ( false !== $count ) {
+        if (false !== $count) {
             return $count;
         }
 
-        $statuses = array( '' ); // Default to the WP normal comments
-        $stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A );
-        foreach ( (array) $stati AS $status ) {
-            if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) {
+        $statuses = array(''); // Default to the WP normal comments
+        $stati = $wpdb->get_results("SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A);
+        foreach ((array) $stati AS $status) {
+            if ('sensei_' != substr($status['comment_type'], 0, 7)) {
                 $statuses[] = $status['comment_type'];
             }
         }
-        $where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
+        $where = "WHERE comment_type IN ('".join("', '", array_unique($statuses))."')";
 
-        if ( $post_id > 0 )
-            $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+        if ($post_id > 0)
+            $where .= $wpdb->prepare(" AND comment_post_ID = %d", $post_id);
 
-        $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
+        $count = $wpdb->get_results("SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A);
 
         $total = 0;
         $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
-        foreach ( (array) $count as $row ) {
+        foreach ((array) $count as $row) {
             // Don't count post-trashed toward totals
-            if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+            if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'])
                 $total += $row['num_comments'];
-            if ( isset( $approved[$row['comment_approved']] ) )
+            if (isset($approved[$row['comment_approved']]))
                 $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
         }
 
         $stats['total_comments'] = $total;
-        foreach ( $approved as $key ) {
-            if ( empty($stats[$key]) )
+        foreach ($approved as $key) {
+            if (empty($stats[$key]))
                 $stats[$key] = 0;
         }
 
@@ -798,15 +798,15 @@ 
      * @return void
      */
     public function init_image_sizes() {
-        $course_archive_thumbnail 	= $this->get_image_size( 'course_archive_image' );
-        $course_single_thumbnail	= $this->get_image_size( 'course_single_image' );
-        $lesson_archive_thumbnail 	= $this->get_image_size( 'lesson_archive_image' );
-        $lesson_single_thumbnail	= $this->get_image_size( 'lesson_single_image' );
-
-        add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] );
-        add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] );
-        add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] );
-        add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] );
+        $course_archive_thumbnail 	= $this->get_image_size('course_archive_image');
+        $course_single_thumbnail	= $this->get_image_size('course_single_image');
+        $lesson_archive_thumbnail 	= $this->get_image_size('lesson_archive_image');
+        $lesson_single_thumbnail	= $this->get_image_size('lesson_single_image');
+
+        add_image_size('course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop']);
+        add_image_size('course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop']);
+        add_image_size('lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop']);
+        add_image_size('lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop']);
     }
 
     /**
@@ -819,37 +819,37 @@ 
      * @param mixed $image_size
      * @return string
      */
-    public function get_image_size( $image_size ) {
+    public function get_image_size($image_size) {
 
         // Only return sizes we define in settings
-        if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) )
-            return apply_filters( 'sensei_get_image_size_' . $image_size, '' );
+        if ( ! in_array($image_size, array('course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image')))
+            return apply_filters('sensei_get_image_size_'.$image_size, '');
 
-        if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) {
-            $this->settings->settings[ $image_size . '_width' ] = false;
+        if ( ! isset($this->settings->settings[$image_size.'_width'])) {
+            $this->settings->settings[$image_size.'_width'] = false;
         }
-        if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) {
-            $this->settings->settings[ $image_size . '_height' ] = false;
+        if ( ! isset($this->settings->settings[$image_size.'_height'])) {
+            $this->settings->settings[$image_size.'_height'] = false;
         }
-        if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) {
-            $this->settings->settings[ $image_size . '_hard_crop' ] = false;
+        if ( ! isset($this->settings->settings[$image_size.'_hard_crop'])) {
+            $this->settings->settings[$image_size.'_hard_crop'] = false;
         }
 
-        $size = array_filter( array(
-            'width' => $this->settings->settings[ $image_size . '_width' ],
-            'height' => $this->settings->settings[ $image_size . '_height' ],
-            'crop' => $this->settings->settings[ $image_size . '_hard_crop' ]
-        ) );
+        $size = array_filter(array(
+            'width' => $this->settings->settings[$image_size.'_width'],
+            'height' => $this->settings->settings[$image_size.'_height'],
+            'crop' => $this->settings->settings[$image_size.'_hard_crop']
+        ));
 
-        $size['width'] 	= isset( $size['width'] ) ? $size['width'] : '100';
-        $size['height'] = isset( $size['height'] ) ? $size['height'] : '100';
-        $size['crop'] 	= isset( $size['crop'] ) ? $size['crop'] : 0;
+        $size['width'] 	= isset($size['width']) ? $size['width'] : '100';
+        $size['height'] = isset($size['height']) ? $size['height'] : '100';
+        $size['crop'] = isset($size['crop']) ? $size['crop'] : 0;
 
-        return apply_filters( 'sensei_get_image_size_' . $image_size, $size );
+        return apply_filters('sensei_get_image_size_'.$image_size, $size);
     }
 
-    public function body_class( $classes ) {
-        if( is_sensei() ) {
+    public function body_class($classes) {
+        if (is_sensei()) {
             $classes[] = 'sensei';
         }
         return $classes;
@@ -862,9 +862,9 @@ 
      * @since 1.7.0
      */
     public function jetpack_latex_support() {
-        if ( function_exists( 'latex_markup') ) {
-            add_filter( 'sensei_question_title', 'latex_markup' );
-            add_filter( 'sensei_answer_text', 'latex_markup' );
+        if (function_exists('latex_markup')) {
+            add_filter('sensei_question_title', 'latex_markup');
+            add_filter('sensei_answer_text', 'latex_markup');
         }
     }
 
@@ -876,21 +876,21 @@ 
      *
      * @since 1.8.0
      */
-    public function load_modules_class(){
+    public function load_modules_class() {
         global $sensei_modules;
 
-        if( !class_exists( 'Sensei_Modules' )
-            &&  'Sensei_Modules' != get_class( $sensei_modules ) ) {
+        if ( ! class_exists('Sensei_Modules')
+            &&  'Sensei_Modules' != get_class($sensei_modules)) {
 
             //Load the modules class
-            require_once( 'class-sensei-modules.php');
-            Sensei()->modules = new Sensei_Core_Modules( $this->file );
+            require_once('class-sensei-modules.php');
+            Sensei()->modules = new Sensei_Core_Modules($this->file);
 
-        }else{
+        } else {
             // fallback for people still using the modules extension.
             global $sensei_modules;
             Sensei()->modules = $sensei_modules;
-            add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 );
+            add_action('admin_notices', array($this, 'disable_sensei_modules_extension'), 30);
         }
     }
 
@@ -899,12 +899,12 @@ 
      *
      * @since 1.8.0
      */
-    public function disable_sensei_modules_extension(){ ?>
+    public function disable_sensei_modules_extension() { ?>
         <div class="notice updated fade">
             <p>
                 <?php
                 $plugin_manage_url = admin_url().'plugins.php#sensei-modules';
-                $plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> ';
+                $plugin_link_element = '<a href="'.$plugin_manage_url.'" >plugins page</a> ';
                 ?>
                 <strong> Modules are now included in Sensei,</strong> so you no longer need the Sensei Modules extension.
                 Please deactivate and delete it from your <?php echo $plugin_link_element; ?>. (This will not affect your existing modules).
@@ -922,18 +922,18 @@ 
      *
      * @since 1.9.0
      */
-    public function flush_rewrite_rules(){
+    public function flush_rewrite_rules() {
 
         // ensures that the rewrite rules are flushed on the second
         // attempt. This ensure that the settings for any other process
         // have been completed and saved to the database before we refresh the
         // rewrite rules.
-        $option =  get_option('sensei_flush_rewrite_rules');
-        if( '1' == $option ) {
+        $option = get_option('sensei_flush_rewrite_rules');
+        if ('1' == $option) {
 
             update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+        }elseif ('2' == $option) {
 
             flush_rewrite_rules();
             update_option('sensei_flush_rewrite_rules', '0');
@@ -948,7 +948,7 @@ 
      *
      * @since 1.9.0
      */
-    public function initiate_rewrite_rules_flush(){
+    public function initiate_rewrite_rules_flush() {
 
         update_option('sensei_flush_rewrite_rules', '1');
 
@@ -965,9 +965,9 @@ 
      *
      * @return  void
      */
-    public function sensei_woocommerce_email_course_details( $order ) {
+    public function sensei_woocommerce_email_course_details($order) {
 
-        Sensei_WC::email_course_details( $order );
+        Sensei_WC::email_course_details($order);
 
     } // end func email course details
 
@@ -976,9 +976,9 @@ 
      * @param $user_id
      * @param $subscription_key
      */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){
+    public function sensei_woocommerce_reactivate_subscription($user_id, $subscription_key) {
 
-        Sensei_WC::reactivate_subscription( $user_id, $subscription_key );
+        Sensei_WC::reactivate_subscription($user_id, $subscription_key);
     }
 
     /**
@@ -986,9 +986,9 @@ 
      * @param $user_id
      * @param $subscription_key
      */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){
+    public function sensei_woocommerce_subscription_ended($user_id, $subscription_key) {
 
-        Sensei_WC::end_subscription( $user_id, $subscription_key );
+        Sensei_WC::end_subscription($user_id, $subscription_key);
     }
 
     /**
@@ -1001,9 +1001,9 @@ 
      *
      * @return  void
      */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+    public function sensei_woocommerce_complete_order($order_id = 0) {
 
-        Sensei_WC::complete_order( $order_id );
+        Sensei_WC::complete_order($order_id);
 
     } // End sensei_woocommerce_complete_order()
 
@@ -1016,9 +1016,9 @@ 
      * @param   integer $order_id order ID
      * @return  void
      */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
+    public function sensei_woocommerce_cancel_order($order_id) {
 
-        Sensei_WC::cancel_order( $order_id );
+        Sensei_WC::cancel_order($order_id);
 
     } // End sensei_woocommerce_cancel_order()
 
@@ -1030,9 +1030,9 @@ 
      * @param   integer $order_id order ID
      * @return  void
      */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
+    public function sensei_activate_subscription($order_id = 0) {
 
-        Sensei_WC::activate_subscription( $order_id );
+        Sensei_WC::activate_subscription($order_id);
 
     } // End sensei_activate_subscription()
 
@@ -1044,9 +1044,9 @@ 
      * @param  array/Object $order_user (default: array()) Specific user's data.
      * @return bool|int
      */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+    public function woocommerce_course_update($course_id = 0, $order_user = array()) {
 
-        return Sensei_WC::course_update( $course_id, $order_user );
+        return Sensei_WC::course_update($course_id, $order_user);
 
     } // End woocommerce_course_update()
 
@@ -1063,9 +1063,9 @@ 
      *
      * @return   WC_Product $wc_product_object
      */
-    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
+    public function sensei_get_woocommerce_product_object($wc_product_id = 0, $product_type = '') {
 
-        return Sensei_WC::get_product_object( $wc_product_id, $product_type );
+        return Sensei_WC::get_product_object($wc_product_id, $product_type);
 
     } // End sensei_get_woocommerce_product_object()
 
@@ -1087,9 +1087,9 @@ 
      * @param  boolean $guest_checkout Current guest checkout setting
      * @return boolean                 Modified guest checkout setting
      */
-    public function disable_guest_checkout( $guest_checkout ) {
+    public function disable_guest_checkout($guest_checkout) {
 
-        return Sensei_WC::disable_guest_checkout( $guest_checkout );
+        return Sensei_WC::disable_guest_checkout($guest_checkout);
 
     }// end disable_guest_checkout
 
@@ -1103,9 +1103,9 @@ 
      * @param int $order_id
      * @return string
      **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
+    public function virtual_order_payment_complete($order_status, $order_id) {
 
-        return  Sensei_WC::virtual_order_payment_complete( $order_status, $order_id );
+        return  Sensei_WC::virtual_order_payment_complete($order_status, $order_id);
     }
 
 } // End Class
@@ -1115,4 +1115,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class Woothemes_Sensei extends Sensei_Main{ }
+class Woothemes_Sensei extends Sensei_Main { }