woothemes / sensei

includes/class-sensei-frontend.php

Spacing +450 added lines, -450 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Frontend Class
@@ -20,78 +20,78 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Template output actions
-		add_action( 'sensei_before_main_content', array( $this, 'sensei_output_content_wrapper' ), 10 );
-		add_action( 'sensei_after_main_content', array( $this, 'sensei_output_content_wrapper_end' ), 10 );
-		add_action( 'sensei_lesson_archive_lesson_title', array( $this, 'sensei_lesson_archive_lesson_title' ), 10 );
+		add_action('sensei_before_main_content', array($this, 'sensei_output_content_wrapper'), 10);
+		add_action('sensei_after_main_content', array($this, 'sensei_output_content_wrapper_end'), 10);
+		add_action('sensei_lesson_archive_lesson_title', array($this, 'sensei_lesson_archive_lesson_title'), 10);
 
 		// 1.2.1
-		add_action( 'wp_head', array( $this, 'sensei_complete_lesson' ), 10 );
-		add_action( 'wp_head', array( $this, 'sensei_complete_course' ), 10 );
-		add_action( 'sensei_frontend_messages', array( $this, 'sensei_frontend_messages' ) );
-		add_action( 'sensei_lesson_video', array( $this, 'sensei_lesson_video' ), 10, 1 );
-		add_action( 'sensei_complete_lesson_button', array( $this, 'sensei_complete_lesson_button' ) );
-		add_action( 'sensei_reset_lesson_button', array( $this, 'sensei_reset_lesson_button' ) );
+		add_action('wp_head', array($this, 'sensei_complete_lesson'), 10);
+		add_action('wp_head', array($this, 'sensei_complete_course'), 10);
+		add_action('sensei_frontend_messages', array($this, 'sensei_frontend_messages'));
+		add_action('sensei_lesson_video', array($this, 'sensei_lesson_video'), 10, 1);
+		add_action('sensei_complete_lesson_button', array($this, 'sensei_complete_lesson_button'));
+		add_action('sensei_reset_lesson_button', array($this, 'sensei_reset_lesson_button'));
 
-		add_action( 'sensei_course_archive_meta', array( $this, 'sensei_course_archive_meta' ) );
+		add_action('sensei_course_archive_meta', array($this, 'sensei_course_archive_meta'));
 
-		add_action( 'sensei_lesson_tag_main_content', array( $this, 'sensei_lesson_archive_main_content' ), 10 );
-		add_action( 'sensei_no_permissions_main_content', array( $this, 'sensei_no_permissions_main_content' ), 10 );
+		add_action('sensei_lesson_tag_main_content', array($this, 'sensei_lesson_archive_main_content'), 10);
+		add_action('sensei_no_permissions_main_content', array($this, 'sensei_no_permissions_main_content'), 10);
 
-		add_action( 'sensei_lesson_meta', array( $this, 'sensei_lesson_meta' ), 10 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'sensei_course_start' ), 10 );
+		add_action('sensei_lesson_meta', array($this, 'sensei_lesson_meta'), 10);
+		add_action('sensei_single_course_content_inside_before', array($this, 'sensei_course_start'), 10);
 
 		// add_filter( 'get_comments_number', array( $this, 'sensei_lesson_comment_count' ), 1 );
-		add_filter( 'the_title', array( $this, 'sensei_lesson_preview_title' ), 10, 2 );
+		add_filter('the_title', array($this, 'sensei_lesson_preview_title'), 10, 2);
 
 		//1.6.2
-		add_filter( 'wp_login_failed', array( $this, 'sensei_login_fail_redirect' ), 10 );
-		add_filter( 'init', array( $this, 'sensei_handle_login_request' ), 10 );
+		add_filter('wp_login_failed', array($this, 'sensei_login_fail_redirect'), 10);
+		add_filter('init', array($this, 'sensei_handle_login_request'), 10);
 		//1.6.3
-		add_action( 'init', array( $this, 'sensei_process_registration' ), 2 );
+		add_action('init', array($this, 'sensei_process_registration'), 2);
 		//1.7.0
-		add_action( 'sensei_pagination', array( $this, 'sensei_breadcrumb' ), 80, 1 );
+		add_action('sensei_pagination', array($this, 'sensei_breadcrumb'), 80, 1);
 
 		// Fix pagination for course archive pages when filtering by course type
-		add_filter( 'pre_get_posts', array( $this, 'sensei_course_archive_pagination' ) );
+		add_filter('pre_get_posts', array($this, 'sensei_course_archive_pagination'));
 
 		// Scripts and Styles
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Custom Menu Item filters
-		add_filter( 'wp_setup_nav_menu_item', array( $this, 'sensei_setup_nav_menu_item' ) );
-		add_filter( 'wp_nav_menu_objects', array( $this, 'sensei_wp_nav_menu_objects' ) );
+		add_filter('wp_setup_nav_menu_item', array($this, 'sensei_setup_nav_menu_item'));
+		add_filter('wp_nav_menu_objects', array($this, 'sensei_wp_nav_menu_objects'));
 		// Search Results filters
-		add_filter( 'post_class', array( $this, 'sensei_search_results_classes' ), 10 );
+		add_filter('post_class', array($this, 'sensei_search_results_classes'), 10);
 		// Only show course & lesson excerpts in search results
-		add_filter( 'the_content', array( $this, 'sensei_search_results_excerpt' ) );
+		add_filter('the_content', array($this, 'sensei_search_results_excerpt'));
 
         //Use WooCommerce filter to show admin bar to Teachers.
-        add_action( 'init', array( $this, 'sensei_show_admin_bar') );
+        add_action('init', array($this, 'sensei_show_admin_bar'));
 
         // Remove course from active courses if an order is cancelled or refunded
-		add_action( 'woocommerce_order_status_processing_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_processing_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
+		add_action('woocommerce_order_status_processing_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_processing_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'remove_active_course'), 10, 1);
 
 		// Make sure correct courses are marked as active for users
-		add_action( 'sensei_before_my_courses', array( $this, 'activate_purchased_courses' ), 10, 1 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'activate_purchased_single_course' ), 10 );
+		add_action('sensei_before_my_courses', array($this, 'activate_purchased_courses'), 10, 1);
+		add_action('sensei_single_course_content_inside_before', array($this, 'activate_purchased_single_course'), 10);
 
 		// Lesson tags
-		add_action( 'sensei_lesson_meta_extra', array( $this, 'lesson_tags_display' ), 10, 1 );
-		add_action( 'pre_get_posts', array( $this, 'lesson_tag_archive_filter' ), 10, 1 );
-		add_filter( 'sensei_lessons_archive_text', array( $this, 'lesson_tag_archive_header' ) );
-		add_action( 'sensei_loop_lesson_inside_before', array( $this, 'lesson_tag_archive_description' ), 11 );
+		add_action('sensei_lesson_meta_extra', array($this, 'lesson_tags_display'), 10, 1);
+		add_action('pre_get_posts', array($this, 'lesson_tag_archive_filter'), 10, 1);
+		add_filter('sensei_lessons_archive_text', array($this, 'lesson_tag_archive_header'));
+		add_action('sensei_loop_lesson_inside_before', array($this, 'lesson_tag_archive_description'), 11);
 
 		// Hide Sensei activity comments from lesson and course pages
-		add_filter( 'wp_list_comments_args', array( $this, 'hide_sensei_activity' ) );
+		add_filter('wp_list_comments_args', array($this, 'hide_sensei_activity'));
 	} // End __construct()
 
 	/**
@@ -101,11 +101,11 @@ 
 	 * @since  1.7.3
 	 * @return array|mixed
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( 'lesson' == $key || 'course' == $key ) {
-			if ( WP_DEBUG ) {
-				trigger_error( sprintf( 'Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3' ) );
+		if ('lesson' == $key || 'course' == $key) {
+			if (WP_DEBUG) {
+				trigger_error(sprintf('Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3'));
 			}
 			return Sensei()->$key;
 		}
@@ -118,32 +118,32 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
 		$disable_js = false;
-		if ( isset( Sensei()->settings->settings[ 'js_disable' ] ) ) {
-			$disable_js = Sensei()->settings->settings[ 'js_disable' ];
+		if (isset(Sensei()->settings->settings['js_disable'])) {
+			$disable_js = Sensei()->settings->settings['js_disable'];
 		} // End If Statement
-		if ( ! $disable_js ) {
+		if ( ! $disable_js) {
 
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+			$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 			// My Courses tabs script
-			wp_register_script( Sensei()->token . '-user-dashboard', esc_url( Sensei()->plugin_url . 'assets/js/user-dashboard' . $suffix . '.js' ), array( 'jquery-ui-tabs' ), Sensei()->version, true );
-			wp_enqueue_script( Sensei()->token . '-user-dashboard' );
+			wp_register_script(Sensei()->token.'-user-dashboard', esc_url(Sensei()->plugin_url.'assets/js/user-dashboard'.$suffix.'.js'), array('jquery-ui-tabs'), Sensei()->version, true);
+			wp_enqueue_script(Sensei()->token.'-user-dashboard');
 
 
             // Course Archive javascript
-            if( is_post_type_archive( 'course' ) ){
+            if (is_post_type_archive('course')) {
 
-                wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true );
-                wp_enqueue_script( 'sensei-course-archive-js' );
+                wp_register_script('sensei-course-archive-js', esc_url(Sensei()->plugin_url.'assets/js/frontend/course-archive'.$suffix.'.js'), array('jquery'), '1', true);
+                wp_enqueue_script('sensei-course-archive-js');
 
             }
 
 
 			// Allow additional scripts to be loaded
-			do_action( 'sensei_additional_scripts' );
+			do_action('sensei_additional_scripts');
 
 		} // End If Statement
 
@@ -154,23 +154,23 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
 		$disable_styles = false;
-		if ( isset( Sensei()->settings->settings[ 'styles_disable' ] ) ) {
-			$disable_styles = Sensei()->settings->settings[ 'styles_disable' ];
+		if (isset(Sensei()->settings->settings['styles_disable'])) {
+			$disable_styles = Sensei()->settings->settings['styles_disable'];
 		} // End If Statement
 
 		// Add filter for theme overrides
-		$disable_styles = apply_filters( 'sensei_disable_styles', $disable_styles );
+		$disable_styles = apply_filters('sensei_disable_styles', $disable_styles);
 
-		if ( ! $disable_styles ) {
+		if ( ! $disable_styles) {
 
-			wp_register_style( Sensei()->token . '-frontend', Sensei()->plugin_url . 'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( Sensei()->token . '-frontend' );
+			wp_register_style(Sensei()->token.'-frontend', Sensei()->plugin_url.'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style(Sensei()->token.'-frontend');
 
 			// Allow additional stylesheets to be loaded
-			do_action( 'sensei_additional_styles' );
+			do_action('sensei_additional_styles');
 
 		} // End If Statement
 
@@ -186,10 +186,10 @@ 
 	 * @param string $name (default: '')
 	 * @return void
 	 */
-	function sensei_get_template_part( $slug, $name = '' ) {
+	function sensei_get_template_part($slug, $name = '') {
 
-        _deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' );
-        Sensei_Templates::get_part( $slug, $name );
+        _deprecated_function('class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part');
+        Sensei_Templates::get_part($slug, $name);
 
 	} // End sensei_get_template_part()
 
@@ -204,10 +204,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	function sensei_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' );
-        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path  );
+        _deprecated_function('sensei_get_template', '1.9.0', 'Sensei_Templates::get_template');
+        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path);
 
 	} // End sensei_get_template()
 
@@ -221,10 +221,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	function sensei_locate_template($template_name, $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' );
-        Sensei_Templates::locate_template( $template_name, $template_path, $default_path );
+        _deprecated_function('sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template');
+        Sensei_Templates::locate_template($template_name, $template_path, $default_path);
 
 	} // End sensei_locate_template()
 
@@ -238,20 +238,20 @@ 
 	function sensei_output_content_wrapper() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-start.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-start.php',
             'wrappers/wrapper-start.php'
         );
 
-        $template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $template ) ){
+        $template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-start.php');
             return;
 
         }
 
-		Sensei_Templates::get_template( 'globals/wrapper-start.php' );
+		Sensei_Templates::get_template('globals/wrapper-start.php');
 
 	} // End sensei_output_content_wrapper()
 
@@ -265,21 +265,21 @@ 
 	function sensei_output_content_wrapper_end() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-end.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-end.php',
             'wrappers/wrapper-end.php'
         );
 
-        $backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $backwards_compatible_template ) ){
+        $backwards_compatible_template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($backwards_compatible_template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-end.php');
             return;
 
         }
 
 
-		Sensei_Templates::get_template( 'globals/wrapper-end.php' );
+		Sensei_Templates::get_template('globals/wrapper-end.php');
 
 	} // End sensei_output_content_wrapper_end()
 
@@ -292,57 +292,57 @@ 
 	 */
 	public static function load_content_pagination() {
 
-        if( is_singular('course') ) {
+        if (is_singular('course')) {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-posts.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
+                Sensei_Templates::get_template('wrappers/pagination-posts.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-posts.php' );
+			Sensei_Templates::get_template('globals/pagination-posts.php');
 
-		} elseif( is_singular('lesson') ) {
+		} elseif (is_singular('lesson')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-lesson.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
+                Sensei_Templates::get_template('wrappers/pagination-lesson.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-lesson.php' );
+			Sensei_Templates::get_template('globals/pagination-lesson.php');
 
-		} elseif( is_singular('quiz') ) {
+		} elseif (is_singular('quiz')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-quiz.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
+                Sensei_Templates::get_template('wrappers/pagination-quiz.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-quiz.php' );
+			Sensei_Templates::get_template('globals/pagination-quiz.php');
 
 		} else {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination.php' );
+                Sensei_Templates::get_template('wrappers/pagination.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination.php' );
+			Sensei_Templates::get_template('globals/pagination.php');
 
 		} // End If Statement
 
@@ -368,21 +368,21 @@ 
 	 * @param object $item
 	 * @return object $item
 	 */
-	public function sensei_setup_nav_menu_item( $item ) {
+	public function sensei_setup_nav_menu_item($item) {
 		global $pagenow, $wp_rewrite;
 
-		if( 'nav-menus.php' != $pagenow && !defined('DOING_AJAX') && isset( $item->url ) && 'custom' == $item->type ) {
+		if ('nav-menus.php' != $pagenow && ! defined('DOING_AJAX') && isset($item->url) && 'custom' == $item->type) {
 
 			// Set up Sensei menu links
-			$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-			$my_account_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+			$course_page_id = intval(Sensei()->settings->settings['course_page']);
+			$my_account_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
 			$course_page_url = Sensei_Course::get_courses_page_url();
-			$lesson_archive_url = get_post_type_archive_link( 'lesson' );
-			$my_courses_url = get_permalink( $my_account_page_id );
-			$my_messages_url = get_post_type_archive_link( 'sensei_message' );
+			$lesson_archive_url = get_post_type_archive_link('lesson');
+			$my_courses_url = get_permalink($my_account_page_id);
+			$my_messages_url = get_post_type_archive_link('sensei_message');
 
-			switch ( $item->url ) {
+			switch ($item->url) {
 				case '#senseicourses':
 					$item->url = $course_page_url;
 					break;
@@ -399,7 +399,7 @@ 
 					$item->url = $my_messages_url;
                     // if no archive link exist for sensei_message
                     // set it back to the place holder
-                    if( ! $item->url ){
+                    if ( ! $item->url) {
 
                         $item->url = '#senseimymessages';
 
@@ -407,21 +407,21 @@ 
 					break;
 
 				case '#senseilearnerprofile':
-					$item->url = esc_url( Sensei()->learner_profiles->get_permalink() );
+					$item->url = esc_url(Sensei()->learner_profiles->get_permalink());
 					break;
 
 				case '#senseiloginlogout':
-						$logout_url = wp_logout_url( home_url() );
+						$logout_url = wp_logout_url(home_url());
 						// Login link links to the My Courses page, to avoid the WP dashboard.
 						$login_url = $my_courses_url;
 
-						$item->url = ( is_user_logged_in() ? $logout_url : $login_url );
+						$item->url = (is_user_logged_in() ? $logout_url : $login_url);
 
 						// determine the menu title login or logout
-						if ( is_user_logged_in() ) {
-							$menu_title =  __( 'Logout'  ,'woothemes-sensei');
+						if (is_user_logged_in()) {
+							$menu_title = __('Logout', 'woothemes-sensei');
 						} else {
-							$menu_title =  __( 'Login'  ,'woothemes-sensei');
+							$menu_title = __('Login', 'woothemes-sensei');
 						}
 
 						/**
@@ -431,7 +431,7 @@ 
 						 *
 						 * @param $menu_title
 						 */
-						$item->title = apply_filters( 'sensei_login_logout_menu_title', $menu_title );
+						$item->title = apply_filters('sensei_login_logout_menu_title', $menu_title);
 
 					break;
 
@@ -439,12 +439,12 @@ 
 					break;
 			}
 
-			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
-			$item_url = untrailingslashit( $item->url );
-			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
+			$_root_relative_current = untrailingslashit($_SERVER['REQUEST_URI']);
+			$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_root_relative_current);
+			$item_url = untrailingslashit($item->url);
+			$_indexless_current = untrailingslashit(preg_replace('/'.preg_quote($wp_rewrite->index, '/').'$/', '', $current_url));
 			// Highlight current menu item
-			if ( $item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+			if ($item_url && in_array($item_url, array($current_url, $_indexless_current, $_root_relative_current))) {
 				$item->classes[] = 'current-menu-item current_page_item';
 			}
 
@@ -463,26 +463,26 @@ 
 	 * @param object $sorted_menu_items
 	 * @return object $sorted_menu_items
 	 */
-	public function sensei_wp_nav_menu_objects( $sorted_menu_items ) {
+	public function sensei_wp_nav_menu_objects($sorted_menu_items) {
 
-		foreach( $sorted_menu_items as $k=>$item ) {
+		foreach ($sorted_menu_items as $k=>$item) {
 
 			// Remove the My Messages link for logged out users or if Private Messages are disabled
-			if( ! get_post_type_archive_link( 'sensei_message' )
-                && '#senseimymessages' == $item->url ) {
+			if ( ! get_post_type_archive_link('sensei_message')
+                && '#senseimymessages' == $item->url) {
 
-				if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) {
+				if ( ! is_user_logged_in() || (isset(Sensei()->settings->settings['messages_disable']) && Sensei()->settings->settings['messages_disable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
 			// Remove the My Profile link for logged out users.
-			if( Sensei()->learner_profiles->get_permalink() == $item->url ) {
+			if (Sensei()->learner_profiles->get_permalink() == $item->url) {
 
-				if ( !is_user_logged_in() || ! ( isset( Sensei()->settings->settings[ 'learner_profile_enable' ] ) && Sensei()->settings->settings[ 'learner_profile_enable' ] ) ) {
+				if ( ! is_user_logged_in() || ! (isset(Sensei()->settings->settings['learner_profile_enable']) && Sensei()->settings->settings['learner_profile_enable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
@@ -494,7 +494,7 @@ 
 	function sensei_search_results_classes($classes) {
 	    global $post;
 	    // Handle Search Classes for Courses, Lessons, and WC Products
-	    if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) {
+	    if (isset($post->post_type) && (('course' == $post->post_type) || ('lesson' == $post->post_type) || ('product' == $post->post_type))) {
 	    	$classes[] = 'post';
 		} // End If Statement
 	    return $classes;
@@ -522,16 +522,16 @@ 
      * @param bool|false $return
      * @return string|void
 	 */
-	function sensei_course_image( $course_id, $width = '100', $height = '100', $return = false ) {
+	function sensei_course_image($course_id, $width = '100', $height = '100', $return = false) {
 
-    	if ( ! $return ) {
+    	if ( ! $return) {
 
-			echo Sensei()->course->course_image( $course_id, $width, $height );
+			echo Sensei()->course->course_image($course_id, $width, $height);
             return '';
 
 		} // End If Statement
 
-		return Sensei()->course->course_image( $course_id, $width, $height );
+		return Sensei()->course->course_image($course_id, $width, $height);
 
 	} // End sensei_course_image()
 
@@ -546,15 +546,15 @@ 
      * @param bool|false $widget
      * @return string
 	 */
-	function sensei_lesson_image( $lesson_id, $width = '100', $height = '100', $return = false, $widget = false ) {
+	function sensei_lesson_image($lesson_id, $width = '100', $height = '100', $return = false, $widget = false) {
 
-        if( ! $return ){
+        if ( ! $return) {
 
-            echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+            echo Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
             return '';
         }
 
-        return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+        return Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
 
 	} // End sensei_lesson_image()
 
@@ -562,20 +562,20 @@ 
      * @since 1.0.0
      * @param WP_Query $query
      */
-    function sensei_course_archive_pagination( $query ) {
+    function sensei_course_archive_pagination($query) {
 
-		if( ! is_admin() && $query->is_main_query() && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'newcourses', 'featuredcourses', 'freecourses', 'paidcourses' ) ) ) {
+		if ( ! is_admin() && $query->is_main_query() && isset($_GET['action']) && in_array($_GET['action'], array('newcourses', 'featuredcourses', 'freecourses', 'paidcourses'))) {
 
 			$amount = 0;
-			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
+				$amount = absint(Sensei()->settings->settings['course_archive_amount']);
 			}
 
-			if( $amount ) {
-				$query->set( 'posts_per_page', $amount );
+			if ($amount) {
+				$query->set('posts_per_page', $amount);
 			}
 
-			$query->set( 'orderby', 'menu_order date' );
+			$query->set('orderby', 'menu_order date');
 
 		}
 	}
@@ -591,7 +591,7 @@ 
 	function sensei_course_archive_header(  ) {
 
         trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header ');
-        WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' );
+        WooThemes_Sensei_Course::archive_header('', '<header class="archive-header"><h1>', '</h1></header>');
 
 	} // sensei_course_archive_header()
 
@@ -604,15 +604,15 @@ 
 	 * @return void
 	 */
 	public function sensei_lesson_archive_header( ) {
-        _deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' );
+        _deprecated_function('WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header');
         Sensei()->lesson->the_archive_header();
 	} // sensei_course_archive_header()
 
     /**
      * @deprecated since 1.9.0
      */
-	public function sensei_message_archive_header( ){
-        _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
+	public function sensei_message_archive_header( ) {
+        _deprecated_function('Sensei_Frontend::sensei_message_archive_header', 'Please use: Sense');
         Sensei_Messages::the_archive_header();
 	} // sensei_message_archive_header()
 
@@ -622,15 +622,15 @@ 
      * @param WP_Post $post_item
 	 * @return void
 	 */
-	function sensei_course_archive_course_title( $post_item ) {
-		if ( isset( $post_item->ID ) && ( 0 < $post_item->ID ) ) {
-			$post_id = absint( $post_item->ID );
+	function sensei_course_archive_course_title($post_item) {
+		if (isset($post_item->ID) && (0 < $post_item->ID)) {
+			$post_id = absint($post_item->ID);
     		$post_title = $post_item->post_title;
 		} else {
 			$post_id = get_the_ID();
     		$post_title = get_the_title();
 		} // End If Statement
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_course_archive_course_title()
 
 	/**
@@ -641,7 +641,7 @@ 
 	public function sensei_lesson_archive_lesson_title() {
 		$post_id = get_the_ID();
     	$post_title = get_the_title();
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_lesson_archive_lesson_title()
 
 	/**
@@ -650,40 +650,40 @@ 
 	 * @param  integer $id course, lesson or quiz id
 	 * @return void
 	 */
-	public function sensei_breadcrumb( $id = 0 ) {
+	public function sensei_breadcrumb($id = 0) {
 
 		// Only output on lesson, quiz and taxonomy (module) pages
-		if( ! ( is_tax( 'module' ) || is_singular( 'lesson' ) || is_singular( 'quiz' ) ) ) return;
+		if ( ! (is_tax('module') || is_singular('lesson') || is_singular('quiz'))) return;
 
-		if( empty( $id )  ){
+		if (empty($id)) {
 
             $id = get_the_ID();
 
         }
 
-		$sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' );
-		$separator = apply_filters( 'sensei_breadcrumb_separator', '&gt;' );
+		$sensei_breadcrumb_prefix = __('Back to: ', 'woothemes-sensei');
+		$separator = apply_filters('sensei_breadcrumb_separator', '&gt;');
 
-		$html = '<section class="sensei-breadcrumb">' . $sensei_breadcrumb_prefix;
+		$html = '<section class="sensei-breadcrumb">'.$sensei_breadcrumb_prefix;
 		// Lesson
-		if ( is_singular( 'lesson' ) && 0 < intval( $id ) ) {
-			$course_id = intval( get_post_meta( $id, '_lesson_course', true ) );
-			if( ! $course_id ) {
+		if (is_singular('lesson') && 0 < intval($id)) {
+			$course_id = intval(get_post_meta($id, '_lesson_course', true));
+			if ( ! $course_id) {
 				return;
 			}
-			$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>';
     	} // End If Statement
     	// Quiz
-		if ( is_singular( 'quiz' ) && 0 < intval( $id ) ) {
-			$lesson_id = intval( get_post_meta( $id, '_quiz_lesson', true ) );
-			if( ! $lesson_id ) {
+		if (is_singular('quiz') && 0 < intval($id)) {
+			$lesson_id = intval(get_post_meta($id, '_quiz_lesson', true));
+			if ( ! $lesson_id) {
 				return;
 			}
-			 $html .= '<a href="' . esc_url( get_permalink( $lesson_id ) ) . '" title="' .  __( 'Back to the lesson', 'woothemes-sensei' ) . '">' . get_the_title( $lesson_id ) . '</a>';
+			 $html .= '<a href="'.esc_url(get_permalink($lesson_id)).'" title="'.__('Back to the lesson', 'woothemes-sensei').'">'.get_the_title($lesson_id).'</a>';
     	} // End If Statement
 
     	// Allow other plugins to filter html
-    	$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
+    	$html = apply_filters('sensei_breadcrumb_output', $html, $separator);
     	$html .= '</section>';
 
     	echo $html;
@@ -695,25 +695,25 @@ 
      */
 	public function sensei_lesson_course_signup_link( ) {
 
-        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' );
+        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link');
         WooThemes_Sensei_Lesson::course_signup_link();
 	}
 
-	public function lesson_tags_display( $lesson_id = 0 ) {
-		if( $lesson_id ) {
-			$tags = wp_get_post_terms( $lesson_id, 'lesson-tag' );
-			if( $tags && count( $tags ) > 0 ) {
+	public function lesson_tags_display($lesson_id = 0) {
+		if ($lesson_id) {
+			$tags = wp_get_post_terms($lesson_id, 'lesson-tag');
+			if ($tags && count($tags) > 0) {
 				$tag_list = '';
-				foreach( $tags as $tag ) {
-					$tag_link = get_term_link( $tag, 'lesson-tag' );
-					if( ! is_wp_error( $tag_link ) ) {
-						if( $tag_list ) { $tag_list .= ', '; }
-						$tag_list .= '<a href="' . $tag_link . '">' . $tag->name . '</a>';
+				foreach ($tags as $tag) {
+					$tag_link = get_term_link($tag, 'lesson-tag');
+					if ( ! is_wp_error($tag_link)) {
+						if ($tag_list) { $tag_list .= ', '; }
+						$tag_list .= '<a href="'.$tag_link.'">'.$tag->name.'</a>';
 					}
 				}
-				if( $tag_list ) {
+				if ($tag_list) {
 					?><section class="lesson-tags">
-		    			<?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?>
+		    			<?php printf(__('Lesson tags: %1$s', 'woothemes-sensei'), $tag_list); ?>
 		    		</section><?php
 		    	}
 	    	}
@@ -723,51 +723,51 @@ 
     /**
      * @param WP_Query $query
      */
-	public function lesson_tag_archive_filter( $query ) {
-    	if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
+	public function lesson_tag_archive_filter($query) {
+    	if (is_tax('lesson-tag') && $query->is_main_query()) {
     		// Limit to lessons only
-    		$query->set( 'post_type', 'lesson' );
+    		$query->set('post_type', 'lesson');
 
     		// Set order of lessons
-    		$query->set( 'orderby', 'menu_order' );
-    		$query->set( 'order', 'ASC' );
+    		$query->set('orderby', 'menu_order');
+    		$query->set('order', 'ASC');
 
     	}
     }
 
-    public function lesson_tag_archive_header( $title ) {
-		if( is_tax( 'lesson-tag' ) ) {
-			$title = sprintf( __( 'Lesson tag: %1$s', 'woothemes-sensei' ), apply_filters( 'sensei_lesson_tag_archive_title', get_queried_object()->name ) );
+    public function lesson_tag_archive_header($title) {
+		if (is_tax('lesson-tag')) {
+			$title = sprintf(__('Lesson tag: %1$s', 'woothemes-sensei'), apply_filters('sensei_lesson_tag_archive_title', get_queried_object()->name));
 		}
 		return $title;
 	}
 
 	public function lesson_tag_archive_description() {
-		if( is_tax( 'lesson-tag' ) ) {
+		if (is_tax('lesson-tag')) {
 			$tag = get_queried_object();
-			echo '<p class="archive-description lesson-description">' . apply_filters( 'sensei_lesson_tag_archive_description', nl2br( $tag->description ), $tag->term_id ) . '</p>';
+			echo '<p class="archive-description lesson-description">'.apply_filters('sensei_lesson_tag_archive_description', nl2br($tag->description), $tag->term_id).'</p>';
 		}
 	}
 
 	public function sensei_complete_lesson() {
-		global $post,  $current_user;
+		global $post, $current_user;
 		// Handle Quiz Completion
-		if ( isset( $_POST['quiz_action'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_lesson_noonce' ], 'woothemes_sensei_complete_lesson_noonce' ) ) {
+		if (isset($_POST['quiz_action']) && wp_verify_nonce($_POST['woothemes_sensei_complete_lesson_noonce'], 'woothemes_sensei_complete_lesson_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['quiz_action'] );
+			$sanitized_submit = esc_html($_POST['quiz_action']);
 
 			switch ($sanitized_submit) {
                 case 'lesson-complete':
 
-					Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true );
+					Sensei_Utils::sensei_start_lesson($post->ID, $current_user->ID, $complete = true);
 
 					break;
 
                 case 'lesson-reset':
 
-					Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_lesson($post->ID, $current_user->ID);
 
-					$this->messages = '<div class="sensei-message note">' .  __( 'Lesson Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+					$this->messages = '<div class="sensei-message note">'.__('Lesson Reset Successfully.', 'woothemes-sensei').'</div>';
 					break;
 
 				default:
@@ -781,14 +781,14 @@ 
 	} // End sensei_complete_lesson()
 
 	public function sensei_complete_course() {
-		global $post,  $current_user, $wp_query;
-		if ( isset( $_POST['course_complete'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_course_noonce' ], 'woothemes_sensei_complete_course_noonce' ) ) {
+		global $post, $current_user, $wp_query;
+		if (isset($_POST['course_complete']) && wp_verify_nonce($_POST['woothemes_sensei_complete_course_noonce'], 'woothemes_sensei_complete_course_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['course_complete'] );
-			$sanitized_course_id = absint( esc_html( $_POST['course_complete_id'] ) );
+			$sanitized_submit = esc_html($_POST['course_complete']);
+			$sanitized_course_id = absint(esc_html($_POST['course_complete_id']));
 			// Handle submit data
 			switch ($sanitized_submit) {
-				case __( 'Mark as Complete', 'woothemes-sensei' ):
+				case __('Mark as Complete', 'woothemes-sensei'):
 
 					// Add user to course
 					$course_metadata = array(
@@ -796,15 +796,15 @@ 
 						'percent' => 0, // No completed lessons yet
 						'complete' => 0,
 					);
-					$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata );
+					$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata);
 
-					if ( $activity_logged ) {
+					if ($activity_logged) {
 						// Get all course lessons
-						$course_lesson_ids = Sensei()->course->course_lessons( $sanitized_course_id, 'any', 'ids' );
+						$course_lesson_ids = Sensei()->course->course_lessons($sanitized_course_id, 'any', 'ids');
 						// Mark all quiz user meta lessons as complete
-						foreach ( $course_lesson_ids as $lesson_item_id ){
+						foreach ($course_lesson_ids as $lesson_item_id) {
 							// Mark lesson as complete
-							$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_item_id, $current_user->ID, $complete = true );
+							$activity_logged = Sensei_Utils::sensei_start_lesson($lesson_item_id, $current_user->ID, $complete = true);
 						} // End For Loop
 
 						// Update with final stats
@@ -812,22 +812,22 @@ 
 							'percent' => 100,
 							'complete' => count($course_lesson_ids),
 						);
-						$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'complete', $course_metadata );
+						$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'complete', $course_metadata);
 
-						do_action( 'sensei_user_course_end', $current_user->ID, $sanitized_course_id );
+						do_action('sensei_user_course_end', $current_user->ID, $sanitized_course_id);
 
 						// Success message
-						$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s marked as complete.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+						$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s marked as complete.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					} // End If Statement
 
 					break;
 
-				case __( 'Delete Course', 'woothemes-sensei' ):
+				case __('Delete Course', 'woothemes-sensei'):
 
-					Sensei_Utils::sensei_remove_user_from_course( $sanitized_course_id, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_course($sanitized_course_id, $current_user->ID);
 
 					// Success message
-					$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s deleted.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+					$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s deleted.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					break;
 
 				default:
@@ -843,25 +843,25 @@ 
 	 * @param int $lesson_id
 	 * @return array
 	 */
-	public function sensei_get_user_quiz_answers( $lesson_id = 0 ) {
+	public function sensei_get_user_quiz_answers($lesson_id = 0) {
 		global $current_user;
 
 		$user_answers = array();
 
-		if ( 0 < intval( $lesson_id ) ) {
-			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $lesson_id );
-			foreach( $lesson_quiz_questions as $question ) {
-				$answer = maybe_unserialize( base64_decode( Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content' ) ) ) );
-				$user_answers[ $question->ID ] = $answer;
+		if (0 < intval($lesson_id)) {
+			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($lesson_id);
+			foreach ($lesson_quiz_questions as $question) {
+				$answer = maybe_unserialize(base64_decode(Sensei_Utils::sensei_get_activity_value(array('post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content'))));
+				$user_answers[$question->ID] = $answer;
 			}
 		}
 
 		return $user_answers;
 	} // End sensei_get_user_quiz_answers()
 
-	public function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	public function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -871,14 +871,14 @@ 
 		Sensei()->notices->print_notices();
 	} // End sensei_frontend_messages()
 
-	public function sensei_lesson_video( $post_id = 0 ) {
-		if ( 0 < intval( $post_id ) ) {
-			$lesson_video_embed = get_post_meta( $post_id, '_lesson_video_embed', true );
-			if ( 'http' == substr( $lesson_video_embed, 0, 4) ) {
+	public function sensei_lesson_video($post_id = 0) {
+		if (0 < intval($post_id)) {
+			$lesson_video_embed = get_post_meta($post_id, '_lesson_video_embed', true);
+			if ('http' == substr($lesson_video_embed, 0, 4)) {
         		// V2 - make width and height a setting for video embed
-        		$lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ );
+        		$lesson_video_embed = wp_oembed_get(esc_url($lesson_video_embed)/*, array( 'width' => 100 , 'height' => 100)*/);
         	} // End If Statement
-        	if ( '' != $lesson_video_embed ) {
+        	if ('' != $lesson_video_embed) {
         	?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
         	} // End If Statement
         } // End If Statement
@@ -890,19 +890,19 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$pass_required = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-	    	$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+	    	$pass_required = get_post_meta($quiz_id, '_pass_required', true);
 	    }
-		if( ! $quiz_id || ( $quiz_id && ! $pass_required ) ) {
+		if ( ! $quiz_id || ($quiz_id && ! $pass_required)) {
 			?>
-			<form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+			<form class="lesson_button_form" method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 	            <input type="hidden"
                        name="woothemes_sensei_complete_lesson_noonce"
                        id="woothemes_sensei_complete_lesson_noonce"
-                       value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>"
+                       value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>"
                 />
 
 	            <input type="hidden" name="quiz_action" value="lesson-complete" />
@@ -910,7 +910,7 @@ 
                 <input type="submit"
                        name="quiz_complete"
                        class="quiz-submit complete"
-                       value="<?php _e( 'Complete Lesson', 'woothemes-sensei' ); ?>"/>
+                       value="<?php _e('Complete Lesson', 'woothemes-sensei'); ?>"/>
 
 	        </form>
 			<?php
@@ -923,25 +923,25 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$reset_allowed = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-			$reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+			$reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
 		}
-		if ( ! $quiz_id || !empty($reset_allowed) ) {
+		if ( ! $quiz_id || ! empty($reset_allowed)) {
 		?>
-		<form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		<form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
             <input
             type="hidden"
-            name="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            id="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>" />
+            name="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            id="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>" />
 
             <input type="hidden" name="quiz_action" value="lesson-reset" />
 
-            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e( 'Reset Lesson', 'woothemes-sensei' ); ?>"/>
+            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e('Reset Lesson', 'woothemes-sensei'); ?>"/>
 
         </form>
 		<?php
@@ -964,23 +964,23 @@ 
 		$post_title = get_the_title();
 		$author_display_name = get_the_author();
 		$author_id = get_the_author_meta('ID');
-		$category_output = get_the_term_list( $post_id, 'course-category', '', ', ', '' );
-		$free_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $post_id ) );
+		$category_output = get_the_term_list($post_id, 'course-category', '', ', ', '');
+		$free_lesson_count = intval(Sensei()->course->course_lesson_preview_count($post_id));
 		?><section class="entry">
         	<p class="sensei-course-meta">
-           	<?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>
-		   	<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+           	<?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?>
+		   	<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . '&nbsp;' . __( 'Lessons', 'woothemes-sensei' ); ?></span>
-		   	<?php if ( '' != $category_output ) { ?>
-		   	<span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
+		   	<?php if ('' != $category_output) { ?>
+		   	<span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<?php sensei_simple_course_price( $post_id ); ?>
+		   	<?php sensei_simple_course_price($post_id); ?>
         	</p>
         	<p class="course-excerpt"><?php the_excerpt(); ?></p>
-        	<?php if ( 0 < $free_lesson_count ) {
-                $free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?>
-                <p class="sensei-free-lessons"><a href="<?php echo get_permalink( $post_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?></a> - <?php echo $free_lessons; ?></p>
+        	<?php if (0 < $free_lesson_count) {
+                $free_lessons = sprintf(__('You can access %d of this course\'s lessons for free', 'woothemes-sensei'), $free_lesson_count); ?>
+                <p class="sensei-free-lessons"><a href="<?php echo get_permalink($post_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?></a> - <?php echo $free_lessons; ?></p>
             <?php } ?>
 		</section><?php
 	} // End sensei_course_archive_meta()
@@ -1003,33 +1003,33 @@ 
     * @deprecated since 1.9.0
     */
 	public function sensei_message_archive_main_content() {
-		_deprecated_function( 'Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed' );
+		_deprecated_function('Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed');
 	} // End sensei_lesson_archive_main_content()
 
     /**
     * @deprecated since 1.9.0
     */
 	public function sensei_no_permissions_main_content() {
-        _deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' );
+        _deprecated_function('Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed');
 	} // End sensei_no_permissions_main_content()
 
 	public function sensei_course_category_main_content() {
 		global $post;
-		if ( have_posts() ) { ?>
+		if (have_posts()) { ?>
 
 			<section id="main-course" class="course-container">
 
-                <?php do_action( 'sensei_course_archive_header' ); ?>
+                <?php do_action('sensei_course_archive_header'); ?>
 
-                <?php while ( have_posts() ) { the_post(); ?>
+                <?php while (have_posts()) { the_post(); ?>
 
-                    <article class="<?php echo join( ' ', get_post_class( array( 'course', 'post' ), get_the_ID() ) ); ?>">
+                    <article class="<?php echo join(' ', get_post_class(array('course', 'post'), get_the_ID())); ?>">
 
-	    			    <?php sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', get_the_ID() ); ?>
+	    			    <?php sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', get_the_ID()); ?>
 
-	    			    <?php sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before', $post ); ?>
+	    			    <?php sensei_do_deprecated_action('sensei_course_archive_course_title', '1.9.0', 'sensei_course_content_inside_before', $post); ?>
 
-	    			    <?php do_action( 'sensei_course_archive_meta' ); ?>
+	    			    <?php do_action('sensei_course_archive_meta'); ?>
 
 	    		    </article>
 
@@ -1041,7 +1041,7 @@ 
 
 			<p>
 
-                <?php _e( 'No courses found that match your selection.', 'woothemes-sensei' ); ?>
+                <?php _e('No courses found that match your selection.', 'woothemes-sensei'); ?>
 
             </p>
 
@@ -1058,12 +1058,12 @@ 
 				<div class="col-1">
 					<?php
 					// output the actual form markup
-                    Sensei_Templates::get_template( 'user/login-form.php');
+                    Sensei_Templates::get_template('user/login-form.php');
 					?>
 				</div>
 
 			<?php
-			if ( get_option('users_can_register') ) {
+			if (get_option('users_can_register')) {
 
 				// get current url
 				$action_url = get_permalink();
@@ -1071,38 +1071,38 @@ 
 				?>
 
 				<div class="col-2">
-					<h2><?php _e( 'Register', 'woothemes-sensei' ); ?></h2>
+					<h2><?php _e('Register', 'woothemes-sensei'); ?></h2>
 
-					<form method="post" class="register"  action="<?php echo esc_url( $action_url ); ?>" >
+					<form method="post" class="register"  action="<?php echo esc_url($action_url); ?>" >
 
-						<?php do_action( 'sensei_register_form_start' ); ?>
+						<?php do_action('sensei_register_form_start'); ?>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_username"><?php _e( 'Username', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty( $_POST['sensei_reg_username'] ) ) esc_attr_e( $_POST['sensei_reg_username'] ); ?>" />
+							<label for="sensei_reg_username"><?php _e('Username', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty($_POST['sensei_reg_username'])) esc_attr_e($_POST['sensei_reg_username']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_email"><?php _e( 'Email address', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty( $_POST['sensei_reg_email'] ) ) esc_attr_e( $_POST['sensei_reg_email'] ); ?>" />
+							<label for="sensei_reg_email"><?php _e('Email address', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty($_POST['sensei_reg_email'])) esc_attr_e($_POST['sensei_reg_email']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_password"><?php _e( 'Password', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty( $_POST['sensei_reg_password'] ) ) esc_attr_e( $_POST['sensei_reg_password'] ); ?>" />
+							<label for="sensei_reg_password"><?php _e('Password', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty($_POST['sensei_reg_password'])) esc_attr_e($_POST['sensei_reg_password']); ?>" />
 						</p>
 
 						<!-- Spam Trap -->
-						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woothemes-sensei' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
+						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e('Anti-spam', 'woothemes-sensei'); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
 
-						<?php do_action( 'sensei_register_form_fields' ); ?>
-						<?php do_action( 'register_form' ); ?>
+						<?php do_action('sensei_register_form_fields'); ?>
+						<?php do_action('register_form'); ?>
 
 						<p class="form-row">
-							<input type="submit" class="button" name="register" value="<?php _e( 'Register', 'woothemes-sensei' ); ?>" />
+							<input type="submit" class="button" name="register" value="<?php _e('Register', 'woothemes-sensei'); ?>" />
 						</p>
 
-						<?php do_action( 'sensei_register_form_end' ); ?>
+						<?php do_action('sensei_register_form_end'); ?>
 
 					</form>
 				</div>
@@ -1115,17 +1115,17 @@ 
 		<?php
 	} // End sensei_login_form()
 
-	public function sensei_lesson_meta( $post_id = 0 ) {
+	public function sensei_lesson_meta($post_id = 0) {
 		global $post;
-		if ( 0 < intval( $post_id ) ) {
-		$lesson_course_id = absint( get_post_meta( $post_id, '_lesson_course', true ) );
+		if (0 < intval($post_id)) {
+		$lesson_course_id = absint(get_post_meta($post_id, '_lesson_course', true));
 		?><section class="entry">
             <p class="sensei-course-meta">
-			    <?php if ( isset( Sensei()->settings->settings[ 'lesson_author' ] ) && ( Sensei()->settings->settings[ 'lesson_author' ] ) ) { ?>
-			    <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+			    <?php if (isset(Sensei()->settings->settings['lesson_author']) && (Sensei()->settings->settings['lesson_author'])) { ?>
+			    <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 			    <?php } ?>
-                <?php if ( 0 < intval( $lesson_course_id ) ) { ?>
-                <span class="lesson-course"><?php echo '&nbsp;' . sprintf( __( 'Part of: %s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '" title="' . __( 'View course', 'woothemes-sensei' ) . '"><em>' . get_the_title( $lesson_course_id ) . '</em></a>' ); ?></span>
+                <?php if (0 < intval($lesson_course_id)) { ?>
+                <span class="lesson-course"><?php echo '&nbsp;'.sprintf(__('Part of: %s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($lesson_course_id)).'" title="'.__('View course', 'woothemes-sensei').'"><em>'.get_the_title($lesson_course_id).'</em></a>'); ?></span>
                 <?php } ?>
             </p>
             <p class="lesson-excerpt"><?php the_excerpt( ); ?></p>
@@ -1133,36 +1133,36 @@ 
 		} // End If Statement
 	} // sensei_lesson_meta()
 
-	public function sensei_lesson_preview_title_text( $course_id ) {
+	public function sensei_lesson_preview_title_text($course_id) {
 
-		$preview_text = __( ' (Preview)', 'woothemes-sensei' );
+		$preview_text = __(' (Preview)', 'woothemes-sensei');
 
 		//if this is a paid course
-		if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	$preview_text = __( ' (Free Preview)', 'woothemes-sensei' );
+		if (Sensei_WC::is_woocommerce_active()) {
+    	    $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
+    	    if (0 < $wc_post_id) {
+    	    	$preview_text = __(' (Free Preview)', 'woothemes-sensei');
     	    } // End If Statement
     	}
     	return $preview_text;
 	}
 
-	public function sensei_lesson_preview_title( $title = '', $id = 0 ) {
+	public function sensei_lesson_preview_title($title = '', $id = 0) {
 		global $post, $current_user;
 
 		// Limit to lessons and check if lesson ID matches filtered post ID
 		// @see https://github.com/woothemes/sensei/issues/574
-		if( isset( $post->ID ) && $id == $post->ID && 'lesson' == get_post_type( $post ) ) {
+		if (isset($post->ID) && $id == $post->ID && 'lesson' == get_post_type($post)) {
 
 			// Limit to main query only
-			if( is_main_query() ) {
+			if (is_main_query()) {
 
 				// Get the course ID
-				$course_id = get_post_meta( $post->ID, '_lesson_course', true );
+				$course_id = get_post_meta($post->ID, '_lesson_course', true);
 
 				// Check if the user is taking the course
-				if( is_singular( 'lesson' ) && Sensei_Utils::is_preview_lesson( $post->ID ) && ! Sensei_Utils::user_started_course( $course_id, $current_user->ID ) && $post->ID == $id ) {
-					$title .= ' ' . $this->sensei_lesson_preview_title_text( $course_id );
+				if (is_singular('lesson') && Sensei_Utils::is_preview_lesson($post->ID) && ! Sensei_Utils::user_started_course($course_id, $current_user->ID) && $post->ID == $id) {
+					$title .= ' '.$this->sensei_lesson_preview_title_text($course_id);
 				}
 			}
 		}
@@ -1173,23 +1173,23 @@ 
 		global $post, $current_user;
 
 		// Check if the user is taking the course
-		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		$is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID);
 		// Handle user starting the course
-		if ( isset( $_POST['course_start'] )
-		    && wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' )
-		    && !$is_user_taking_course ) {
+		if (isset($_POST['course_start'])
+		    && wp_verify_nonce($_POST['woothemes_sensei_start_course_noonce'], 'woothemes_sensei_start_course_noonce')
+		    && ! $is_user_taking_course) {
 
 			// Start the course
-			$activity_logged = Sensei_Utils::user_start_course( $current_user->ID, $post->ID );
+			$activity_logged = Sensei_Utils::user_start_course($current_user->ID, $post->ID);
 			$this->data = new stdClass();
 			$this->data->is_user_taking_course = false;
-			if ( $activity_logged ) {
+			if ($activity_logged) {
 				$this->data->is_user_taking_course = true;
 
 				// Refresh page to avoid re-posting
 				?>
 
-			    <script type="text/javascript"> window.location = '<?php echo get_permalink( $post->ID ); ?>'; </script>
+			    <script type="text/javascript"> window.location = '<?php echo get_permalink($post->ID); ?>'; </script>
 
 			    <?php
 			} // End If Statement
@@ -1200,15 +1200,15 @@ 
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' );
-        Sensei()->course->the_course_meta( get_post() );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta', '1.9.0', 'Sensei_Course::the_course_meta()');
+        Sensei()->course->the_course_meta(get_post());
 	} // End sensei_course_meta()
 
     /**
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta_video() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta_video', '1.9.0', 'Sensei_Course::the_course_video()');
         Sensei_Course::the_course_video();
 	} // End sensei_course_meta_video()
 
@@ -1223,12 +1223,12 @@ 
     public function sensei_woocommerce_in_cart_message() {
 		global $post, $woocommerce;
 
-		$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() );
-		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+		$wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
+        $user_course_status_id = Sensei_Utils::user_started_course($post->ID, get_current_user_id());
+		if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-			if ( Sensei_WC::is_product_in_cart( $wc_post_id ) ) {
-				echo '<div class="sensei-message info">' . sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei') . '</div>', '<a class="cart-complete" href="' . $woocommerce->cart->get_checkout_url() . '" title="' . __('complete the purchase', 'woothemes-sensei') . '">' . __('complete the purchase', 'woothemes-sensei') . '</a>' );
+			if (Sensei_WC::is_product_in_cart($wc_post_id)) {
+				echo '<div class="sensei-message info">'.sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei').'</div>', '<a class="cart-complete" href="'.$woocommerce->cart->get_checkout_url().'" title="'.__('complete the purchase', 'woothemes-sensei').'">'.__('complete the purchase', 'woothemes-sensei').'</a>');
 			} // End If Statement
 
 		} // End If Statement
@@ -1236,7 +1236,7 @@ 
 	} // End sensei_woocommerce_in_cart_message()
 
 	// Deprecated
-	public function sensei_lesson_comment_count( $count ) {
+	public function sensei_lesson_comment_count($count) {
 		return $count;
 	} // End sensei_lesson_comment_count()
 
@@ -1245,11 +1245,11 @@ 
 	 * @param  string $content Original content
 	 * @return string          Modified content
 	 */
-	public function sensei_search_results_excerpt( $content ) {
+	public function sensei_search_results_excerpt($content) {
 		global $post;
 
-		if( is_search() && in_array( $post->post_type, array( 'course', 'lesson' ) ) ) {
-			$content = '<p class="course-excerpt">' . the_excerpt( ) . '</p>';
+		if (is_search() && in_array($post->post_type, array('course', 'lesson'))) {
+			$content = '<p class="course-excerpt">'.the_excerpt( ).'</p>';
 		}
 
 		return $content;
@@ -1260,11 +1260,11 @@ 
 	 * @param  integer $order_id ID of order
 	 * @return void
 	 */
-	public function remove_active_course( $order_id ) {
-		$order = new WC_Order( $order_id );
+	public function remove_active_course($order_id) {
+		$order = new WC_Order($order_id);
 
-		foreach ( $order->get_items() as $item ) {
-			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+		foreach ($order->get_items() as $item) {
+			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'];
 			} else {
@@ -1272,11 +1272,11 @@ 
 				$item_id = $item['product_id'];
 			} 
 
-            if ( $item_id > 0 ) {
+            if ($item_id > 0) {
 
-				$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(
@@ -1292,13 +1292,13 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $args );
+					$course_ids = get_posts($args);
 
-					if( $course_ids && count( $course_ids ) > 0 ) {
-						foreach( $course_ids as $course_id ) {
+					if ($course_ids && count($course_ids) > 0) {
+						foreach ($course_ids as $course_id) {
 
 							// Remove all course user meta
-							Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+							Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
 
 						} // End For Loop
 					} // End If Statement
@@ -1314,16 +1314,16 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function activate_purchased_courses( $user_id = 0 ) {
+	public function activate_purchased_courses($user_id = 0) {
 
-		if( $user_id ) {
+		if ($user_id) {
 
-			if( Sensei_WC::is_woocommerce_active() ) {
+			if (Sensei_WC::is_woocommerce_active()) {
 
 				// Get all user's orders
 				$order_args = array(
 					'post_type' => 'shop_order',
-					'post_status' =>  array( 'wc-processing', 'wc-completed' ),
+					'post_status' =>  array('wc-processing', 'wc-completed'),
 					'posts_per_page' => -1,
 					'meta_query' => array(
 						array(
@@ -1333,25 +1333,25 @@ 
 					),
 				);
 
-				$orders = get_posts( $order_args );
+				$orders = get_posts($order_args);
 
 				$product_ids = array();
 				$order_ids = array();
 
-				foreach( $orders as $post_id ) {
+				foreach ($orders as $post_id) {
 
 					// Only process each order once
-					$processed = get_post_meta( $post_id, 'sensei_products_processed', true );
+					$processed = get_post_meta($post_id, 'sensei_products_processed', true);
 
-					if( $processed && $processed == 'processed' ) {
+					if ($processed && $processed == 'processed') {
 						continue;
 					}
 
 					// Get course product IDs from order
-					$order = new WC_Order( $post_id );
+					$order = new WC_Order($post_id);
 
 					$items = $order->get_items();
-					foreach( $items as $item ) {
+					foreach ($items as $item) {
                                             if (isset($item['variation_id']) && $item['variation_id'] > 0) {
                                                 $item_id = $item['variation_id'];
                                                 $product_type = 'variation';
@@ -1365,7 +1365,7 @@ 
 					$order_ids[] = $post_id;
 				}
 
-				if( count( $product_ids ) > 0 ) {
+				if (count($product_ids) > 0) {
 
 					// Get all courses from user's orders
 					$course_args = array(
@@ -1382,31 +1382,31 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $course_args );
+					$course_ids = get_posts($course_args);
 
-					foreach( $course_ids as $course_id ) {
+					foreach ($course_ids as $course_id) {
 
-						$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+						$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 						// Ignore course if already completed
-						if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+						if (Sensei_Utils::user_completed_course($user_course_status)) {
 							continue;
 						}
 
 						// Ignore course if already started
-						if( $user_course_status ) {
+						if ($user_course_status) {
 							continue;
 						}
 
 						// Mark course as started by user
-						Sensei_Utils::user_start_course( $user_id, $course_id );
+						Sensei_Utils::user_start_course($user_id, $course_id);
 					}
 				}
 
-				if( count( $order_ids ) > 0 ) {
-					foreach( $order_ids as $order_id ) {
+				if (count($order_ids) > 0) {
+					foreach ($order_ids as $order_id) {
 						// Mark order as processed
-						update_post_meta( $order_id, 'sensei_products_processed', 'processed' );
+						update_post_meta($order_id, 'sensei_products_processed', 'processed');
 					}
 				}
 			}
@@ -1420,28 +1420,28 @@ 
 	public function activate_purchased_single_course() {
 		global $post, $current_user;
 
-		if( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 
-			if( ! is_user_logged_in() ) return;
-			if( ! isset( $post->ID ) ) return;
+			if ( ! is_user_logged_in()) return;
+			if ( ! isset($post->ID)) return;
 
 			$user_id = $current_user->ID;
 			$course_id = $post->ID;
-			$course_product_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
-			if( ! $course_product_id ) {
+			$course_product_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true);
+			if ( ! $course_product_id) {
 				return;
 			}
 
-			$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+			$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 			// Ignore course if already completed
-			if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+			if (Sensei_Utils::user_completed_course($user_course_status)) {
 
 				return;
 			}
 
 			// Ignore course if already started
-			if( $user_course_status ) {
+			if ($user_course_status) {
 				return;
 			}
 
@@ -1449,7 +1449,7 @@ 
 			$order_args = array(
 				'post_type' => 'shop_order',
 				'posts_per_page' => -1,
-				'post_status' => array( 'wc-processing', 'wc-completed' ),
+				'post_status' => array('wc-processing', 'wc-completed'),
 				'meta_query' => array(
 					array(
 						'key' => '_customer_user',
@@ -1458,28 +1458,28 @@ 
 				),
 				'fields' => 'ids',
 			);
-			$orders = get_posts( $order_args );
+			$orders = get_posts($order_args);
 
-			foreach( $orders as $order_post_id ) {
+			foreach ($orders as $order_post_id) {
 
 				// Get course product IDs from order
-				$order = new WC_Order( $order_post_id );
+				$order = new WC_Order($order_post_id);
 
 				$items = $order->get_items();
-				foreach( $items as $item ) {
+				foreach ($items as $item) {
 
-                    $product = wc_get_product( $item['product_id'] );
+                    $product = wc_get_product($item['product_id']);
 
                     // handle product bundles
-                    if( is_object( $product ) &&  $product->is_type('bundle') ){
+                    if (is_object($product) && $product->is_type('bundle')) {
 
-                        $bundled_product = new WC_Product_Bundle( $product->id );
+                        $bundled_product = new WC_Product_Bundle($product->id);
                         $bundled_items = $bundled_product->get_bundled_items();
 
-                        foreach( $bundled_items as $bundled_item ){
+                        foreach ($bundled_items as $bundled_item) {
 
-                            if( $bundled_item->product_id == $course_product_id ) {
-                                Sensei_Utils::user_start_course( $user_id, $course_id );
+                            if ($bundled_item->product_id == $course_product_id) {
+                                Sensei_Utils::user_start_course($user_id, $course_id);
                                 return;
                             }
 
@@ -1488,8 +1488,8 @@ 
                     } else {
 
                     // handle regular products
-                        if( $item['product_id'] == $course_product_id ) {
-                            Sensei_Utils::user_start_course( $user_id, $course_id );
+                        if ($item['product_id'] == $course_product_id) {
+                            Sensei_Utils::user_start_course($user_id, $course_id);
                             return;
                         }
 
@@ -1505,9 +1505,9 @@ 
 	 * @param  array  $args Default arguments
 	 * @return array        Modified arguments
 	 */
-	public function hide_sensei_activity( $args = array() ) {
+	public function hide_sensei_activity($args = array()) {
 
-		if( is_singular( 'lesson' ) || is_singular( 'course' ) ) {
+		if (is_singular('lesson') || is_singular('course')) {
 			$args['type'] = 'comment';
 		}
 
@@ -1524,9 +1524,9 @@ 
 
 		//if not posted from the sensei login form let
 		// WordPress or any other party handle the failed request
-	    if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form']  ){
+	    if ( ! isset($_REQUEST['form']) || 'sensei-login' != $_REQUEST['form']) {
 
-	    	return ;
+	    	return;
 
 	    }
 
@@ -1534,9 +1534,9 @@ 
     	$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
 
    		 // if there's a valid referrer, and it's not the default log-in screen
-	    if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){
+	    if ( ! empty($referrer) && ! strstr($referrer, 'wp-login') && ! strstr($referrer, 'wp-admin')) {
 	        // let's append some information (login=failed) to the URL for the theme to use
-	        wp_redirect( esc_url_raw( add_query_arg('login', 'failed',  $referrer) ) );
+	        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 	    	exit;
     	}
 	}// End sensei_login_fail_redirect_to_front_end_login
@@ -1549,10 +1549,10 @@ 
 	function sensei_handle_login_request( ) {
 
 		// Check that it is a sensei login request and if it has a valid nonce
-	    if(  isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) {
+	    if (isset($_REQUEST['form']) && 'sensei-login' == $_REQUEST['form']) {
 
 	    	// Validate the login request nonce
-		    if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
+		    if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'sensei-login')) {
 		    	return;
 		    }
 
@@ -1560,47 +1560,47 @@ 
 		    $referrer = $_REQUEST['_wp_http_referer'];
 		    //$redirect = $_REQUEST['_sensei_redirect'];
 
-		    if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) )
-		    	 && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){
+		    if ((isset($_REQUEST['log']) && ! empty($_REQUEST['log']))
+		    	 && (isset($_REQUEST['pwd']) && ! empty($_REQUEST['pwd']))) {
 
 		    	// when the user has entered a password or username do the sensei login
 		    	$creds = array();
 
 		    	// check if the requests login is an email address
-		    	if( is_email(  trim( $_REQUEST['log'] ) )  ){
+		    	if (is_email(trim($_REQUEST['log']))) {
 		    		// query wordpress for the users details
-		    		$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
+		    		$user = get_user_by('email', sanitize_email($_REQUEST['log']));
 
 		    		// validate the user object
-		    		if( !$user ){
+		    		if ( ! $user) {
 
 		    			// the email doesnt exist
-                        wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+                        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 		        		exit;
 
 		    		}
 
 		    		//assigne the username to the creds array for further processing
-		    		$creds['user_login'] =  $user->user_login ;
+		    		$creds['user_login'] = $user->user_login;
 
-		    	}else{
+		    	} else {
 
 		    		// process this as a default username login
-		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
+		    		$creds['user_login'] = sanitize_text_field($_REQUEST['log']);
 
 		    	}
 
 				// get setup the rest of the creds array
-				$creds['user_password'] = sanitize_text_field( $_REQUEST['pwd'] );
-				$creds['remember'] = isset( $_REQUEST['rememberme'] ) ? true : false ;
+				$creds['user_password'] = sanitize_text_field($_REQUEST['pwd']);
+				$creds['remember'] = isset($_REQUEST['rememberme']) ? true : false;
 
 				//attempt logging in with the given details
-				$user = wp_signon( $creds, false );
+				$user = wp_signon($creds, false);
 
-				if ( is_wp_error($user) ){ // on login failure
-                    wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+				if (is_wp_error($user)) { // on login failure
+                    wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
                     exit;
-				}else{ // on login success
+				} else { // on login success
 
 					/**
 					* change the redirect url programatically
@@ -1610,21 +1610,21 @@ 
 					* @param string $referrer the page where the current url wheresensei login form was posted from
 					*/
 
-					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg( 'login', $referrer ) );
+					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg('login', $referrer));
 
-					wp_redirect( esc_url_raw( $success_redirect_url ) );
+					wp_redirect(esc_url_raw($success_redirect_url));
 		        	exit;
 
 				}	// end is_wp_error($user)
 
-		    }else{ // if username or password is empty
+		    } else { // if username or password is empty
 
-                wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
+                wp_redirect(esc_url_raw(add_query_arg('login', 'emptyfields', $referrer)));
 		        exit;
 
 		    } // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
 
-	    }elseif( ( isset( $_GET['login'] ) ) ) {
+	    }elseif ((isset($_GET['login']))) {
 	    	// else if this request is a redircect from a previously faile login request
 	    	$this->login_message_process();
 
@@ -1643,87 +1643,87 @@ 
 	 * @return void redirect
 	 *
 	 */
-	public function sensei_process_registration(){
+	public function sensei_process_registration() {
 		global 	 $current_user;
 		// check the for the sensei specific registration requests
-		if( !isset( $_POST['sensei_reg_username'] ) && ! isset( $_POST['sensei_reg_email'] ) && !isset( $_POST['sensei_reg_password'] )){
+		if ( ! isset($_POST['sensei_reg_username']) && ! isset($_POST['sensei_reg_email']) && ! isset($_POST['sensei_reg_password'])) {
 			// exit if this is not a sensei registration request
-			return ;
+			return;
 		}
 		// check for spam throw cheating huh
-		if( isset( $_POST['email_2'] ) &&  '' !== $_POST['email_2']   ){
+		if (isset($_POST['email_2']) && '' !== $_POST['email_2']) {
 			$message = 'Error:  The spam field should be empty';
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 			return;
 		}
 
 		// retreive form variables
-		$new_user_name		= sanitize_user( $_POST['sensei_reg_username'] );
-		$new_user_email		= $_POST['sensei_reg_email'];
-		$new_user_password	= $_POST['sensei_reg_password'];
+		$new_user_name = sanitize_user($_POST['sensei_reg_username']);
+		$new_user_email = $_POST['sensei_reg_email'];
+		$new_user_password = $_POST['sensei_reg_password'];
 
 		// Check the username
 		$username_error_notice = '';
-		if ( $new_user_name == '' ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: Please enter a username.' );
-		} elseif ( ! validate_username( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' );
-		} elseif ( username_exists( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' );
+		if ($new_user_name == '') {
+			$username_error_notice = __('<strong>ERROR</strong>: Please enter a username.');
+		} elseif ( ! validate_username($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.');
+		} elseif (username_exists($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is already registered. Please choose another one.');
 		}
 
 		// exit on username error
-		if( '' !== $username_error_notice ){
-			Sensei()->notices->add_notice( $username_error_notice , 'alert');
+		if ('' !== $username_error_notice) {
+			Sensei()->notices->add_notice($username_error_notice, 'alert');
 			return;
 		}
 
 		// Check the e-mail address
 		$email_error_notice = '';
-		if ( $new_user_email == '' ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: Please type your e-mail address.' );
-		} elseif ( ! is_email( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' );
-		} elseif ( email_exists( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' );
+		if ($new_user_email == '') {
+			$email_error_notice = __('<strong>ERROR</strong>: Please type your e-mail address.');
+		} elseif ( ! is_email($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: The email address isn&#8217;t correct.');
+		} elseif (email_exists($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: This email is already registered, please choose another one.');
 		}
 
 		// exit on email address error
-		if( '' !== $email_error_notice ){
-			Sensei()->notices->add_notice( $email_error_notice , 'alert');
+		if ('' !== $email_error_notice) {
+			Sensei()->notices->add_notice($email_error_notice, 'alert');
 			return;
 		}
 
 		//check user password
 
 		// exit on email address error
-		if( empty( $new_user_password ) ){
-			Sensei()->notices->add_notice(  __( '<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.' )  , 'alert');
+		if (empty($new_user_password)) {
+			Sensei()->notices->add_notice(__('<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.'), 'alert');
 			return;
 		}
 
 		// register user
-		$user_id = wp_create_user( $new_user_name, $new_user_password, $new_user_email );
-		if ( ! $user_id || is_wp_error( $user_id ) ) {
-			Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ), 'alert');
+		$user_id = wp_create_user($new_user_name, $new_user_password, $new_user_email);
+		if ( ! $user_id || is_wp_error($user_id)) {
+			Sensei()->notices->add_notice(sprintf(__('<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')), 'alert');
 		}
 
 		// notify the user
-		wp_new_user_notification( $user_id, $new_user_password );
+		wp_new_user_notification($user_id, $new_user_password);
 
 		// set global current user aka log the user in
-		$current_user = get_user_by( 'id', $user_id );
-		wp_set_auth_cookie( $user_id, true );
+		$current_user = get_user_by('id', $user_id);
+		wp_set_auth_cookie($user_id, true);
 
 		// Redirect
 		global $wp;
-		if ( wp_get_referer() ) {
-			$redirect = esc_url( wp_get_referer() );
+		if (wp_get_referer()) {
+			$redirect = esc_url(wp_get_referer());
 		} else {
-			$redirect = esc_url( home_url( $wp->request ) );
+			$redirect = esc_url(home_url($wp->request));
 		}
 
-		wp_redirect( apply_filters( 'sensei_registration_redirect', $redirect ) );
+		wp_redirect(apply_filters('sensei_registration_redirect', $redirect));
 		exit;
 
 	} // end  sensei_process_registration)()
@@ -1734,23 +1734,23 @@ 
 	 * @return void redirect
 	 * @since 1.7.0
 	 */
-	public function login_message_process(){
+	public function login_message_process() {
 
             // setup the message variables
 			$message = '';
 
 			//only output message if the url contains login=failed and login=emptyfields
 
-			if( $_GET['login'] == 'failed' ){
+			if ($_GET['login'] == 'failed') {
 
-				$message = __('Incorrect login details', 'woothemes-sensei' );
+				$message = __('Incorrect login details', 'woothemes-sensei');
 
-			}elseif( $_GET['login'] == 'emptyfields'  ){
+			}elseif ($_GET['login'] == 'emptyfields') {
 
-				$message= __('Please enter your username and password', 'woothemes-sensei' );
+				$message = __('Please enter your username and password', 'woothemes-sensei');
 			}
 
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 
 	}// end login_message_process
 
@@ -1762,11 +1762,11 @@ 
      * @return void redirect
      *
      */
-    public function sensei_show_admin_bar () {
+    public function sensei_show_admin_bar() {
 
         if (current_user_can('edit_courses')) {
 
-            add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1);
+            add_filter('woocommerce_disable_admin_bar', '__return_false', 10, 1);
 
         }
 
@@ -1779,4 +1779,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Frontend extends Sensei_Frontend{}
+class WooThemes_Sensei_Frontend extends Sensei_Frontend {}

includes/class-sensei-question.php

Indentation +567 added lines, -567 removed lines

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

Spacing +287 added lines, -287 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Question Class
@@ -19,35 +19,35 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
         $this->token = 'question';
 		$this->question_types = $this->question_types();
-		$this->meta_fields = array( 'question_right_answer', 'question_wrong_answers' );
-		if ( is_admin() ) {
+		$this->meta_fields = array('question_right_answer', 'question_wrong_answers');
+		if (is_admin()) {
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-question_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
-			add_action( 'add_meta_boxes', array( $this, 'question_edit_panel_metabox' ), 10, 2 );
+			add_filter('manage_edit-question_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
+			add_action('add_meta_boxes', array($this, 'question_edit_panel_metabox'), 10, 2);
 
 			// Quesitno list table filters
-			add_action( 'restrict_manage_posts', array( $this, 'filter_options' ) );
-			add_filter( 'request', array( $this, 'filter_actions' ) );
+			add_action('restrict_manage_posts', array($this, 'filter_options'));
+			add_filter('request', array($this, 'filter_actions'));
 
-			add_action( 'save_post', array( $this, 'save_question' ), 10, 1 );
+			add_action('save_post', array($this, 'save_question'), 10, 1);
 		} // End If Statement
 	} // End __construct()
 
 	public function question_types() {
 		$types = array(
-			'multiple-choice' => __( 'Multiple Choice', 'woothemes-sensei' ),
-			'boolean' => __( 'True/False', 'woothemes-sensei' ),
-			'gap-fill' => __( 'Gap Fill', 'woothemes-sensei' ),
-			'single-line' => __( 'Single Line', 'woothemes-sensei' ),
-			'multi-line' => __( 'Multi Line', 'woothemes-sensei' ),
-			'file-upload' => __( 'File Upload', 'woothemes-sensei' ),
+			'multiple-choice' => __('Multiple Choice', 'woothemes-sensei'),
+			'boolean' => __('True/False', 'woothemes-sensei'),
+			'gap-fill' => __('Gap Fill', 'woothemes-sensei'),
+			'single-line' => __('Single Line', 'woothemes-sensei'),
+			'multi-line' => __('Multi Line', 'woothemes-sensei'),
+			'file-upload' => __('File Upload', 'woothemes-sensei'),
 		);
 
-		return apply_filters( 'sensei_question_types', $types );
+		return apply_filters('sensei_question_types', $types);
 	}
 
 	/**
@@ -57,12 +57,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( 'Question', 'column name', 'woothemes-sensei' );
-		$new_columns['question-type'] = _x( 'Type', 'column name', 'woothemes-sensei' );
-		$new_columns['question-category'] = _x( 'Categories', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['title'] = _x('Question', 'column name', 'woothemes-sensei');
+		$new_columns['question-type'] = _x('Type', 'column name', 'woothemes-sensei');
+		$new_columns['question-category'] = _x('Categories', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 
@@ -77,27 +77,27 @@ 
 	 * @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 'question-type':
-				$question_type = strip_tags( get_the_term_list( $id, 'question-type', '', ', ', '' ) );
+				$question_type = strip_tags(get_the_term_list($id, 'question-type', '', ', ', ''));
 				$output = '&mdash;';
-				if( isset( $this->question_types[ $question_type ] ) ) {
-					$output = $this->question_types[ $question_type ];
+				if (isset($this->question_types[$question_type])) {
+					$output = $this->question_types[$question_type];
 				}
 				echo $output;
 			break;
 
 			case 'question-category':
-				$output = strip_tags( get_the_term_list( $id, 'question-category', '', ', ', '' ) );
-				if( ! $output ) {
+				$output = strip_tags(get_the_term_list($id, 'question-category', '', ', ', ''));
+				if ( ! $output) {
 					$output = '&mdash;';
 				}
 				echo $output;
@@ -110,49 +110,49 @@ 
 
 	} // End add_column_data()
 
-	public function question_edit_panel_metabox( $post_type, $post ) {
-		if( in_array( $post_type, array( 'question', 'multiple_question' ) ) ) {
+	public function question_edit_panel_metabox($post_type, $post) {
+		if (in_array($post_type, array('question', 'multiple_question'))) {
 
-			$metabox_title = __( 'Question', 'woothemes-sensei' );
+			$metabox_title = __('Question', 'woothemes-sensei');
 
-			if( isset( $post->ID ) ) {
+			if (isset($post->ID)) {
 
-                $question_type = Sensei()->question->get_question_type( $post->ID );
+                $question_type = Sensei()->question->get_question_type($post->ID);
 
-				if( $question_type ) {
-					$type = $this->question_types[ $question_type ];
-					if( $type ) {
+				if ($question_type) {
+					$type = $this->question_types[$question_type];
+					if ($type) {
 						$metabox_title = $type;
 					}
 				}
 			}
-			add_meta_box( 'question-edit-panel', $metabox_title, array( $this, 'question_edit_panel' ), 'question', 'normal', 'high' );
-			add_meta_box( 'question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'question', 'side', 'default' );
-			add_meta_box( 'multiple-question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'multiple_question', 'side', 'default' );
+			add_meta_box('question-edit-panel', $metabox_title, array($this, 'question_edit_panel'), 'question', 'normal', 'high');
+			add_meta_box('question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'question', 'side', 'default');
+			add_meta_box('multiple-question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'multiple_question', 'side', 'default');
 		}
 	}
 
 	public function question_edit_panel() {
 		global  $post, $pagenow;
 
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_styles' ) );
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_styles'));
 
 		$html = '<div id="lesson-quiz" class="single-question"><div id="add-question-main">';
 
-		if( 'post-new.php' == $pagenow ) {
+		if ('post-new.php' == $pagenow) {
 
 			$html .= '<div id="add-question-actions">';
-				$html .= Sensei()->lesson->quiz_panel_add( 'question' );
+				$html .= Sensei()->lesson->quiz_panel_add('question');
 			$html .= '</div>';
 
 		} else {
 			$question_id = $post->ID;
 
-			$question_type =  Sensei()->question->get_question_type( $post->ID );
+			$question_type = Sensei()->question->get_question_type($post->ID);
 
 			$html .= '<div id="add-question-metadata"><table class="widefat">';
-				$html .= Sensei()->lesson->quiz_panel_question( $question_type, 0, $question_id, 'question' );
+				$html .= Sensei()->lesson->quiz_panel_question($question_type, 0, $question_id, 'question');
 			$html .= '</table></div>';
 		}
 
@@ -164,20 +164,20 @@ 
 	public function question_lessons_panel() {
 		global $post;
 
-		$no_lessons = sprintf( __( '%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei' ), '<em>', '</em>' );
+		$no_lessons = sprintf(__('%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei'), '<em>', '</em>');
 
-		if( ! isset( $post->ID ) ) {
+		if ( ! isset($post->ID)) {
 			echo $no_lessons;
 			return;
 		}
 
 		// This retrieves those quizzes the question is directly connected to.
-		$quizzes = get_post_meta( $post->ID, '_quiz_id', false );
+		$quizzes = get_post_meta($post->ID, '_quiz_id', false);
 
 		// Collate all 'multiple_question' quizzes the question is part of.
-		$categories_of_question = wp_get_post_terms( $post->ID, 'question-category', array( 'fields' => 'ids' ) );
-		if ( ! empty( $categories_of_question ) ) {
-			foreach ( $categories_of_question as $term_id ) {
+		$categories_of_question = wp_get_post_terms($post->ID, 'question-category', array('fields' => 'ids'));
+		if ( ! empty($categories_of_question)) {
+			foreach ($categories_of_question as $term_id) {
 				$qargs = array(
 					'fields'           => 'ids',
 					'post_type'        => 'multiple_question',
@@ -191,41 +191,41 @@ 
 					'post_status'      => 'any',
 					'suppress_filters' => 0,
 				);
-				$cat_question_ids = get_posts( $qargs );
-				foreach( $cat_question_ids as $cat_question_id ) {
-					$cat_quizzes = get_post_meta( $cat_question_id, '_quiz_id', false );
-					$quizzes = array_merge( $quizzes, $cat_quizzes );
+				$cat_question_ids = get_posts($qargs);
+				foreach ($cat_question_ids as $cat_question_id) {
+					$cat_quizzes = get_post_meta($cat_question_id, '_quiz_id', false);
+					$quizzes = array_merge($quizzes, $cat_quizzes);
 				}
 			}
-			$quizzes = array_unique( array_filter( $quizzes ) );
+			$quizzes = array_unique(array_filter($quizzes));
 		}
 
-		if( 0 == count( $quizzes ) ) {
+		if (0 == count($quizzes)) {
 			echo $no_lessons;
 			return;
 		}
 
 		$lessons = false;
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			$lesson_id = get_post_meta( $quiz, '_quiz_lesson', true );
+			$lesson_id = get_post_meta($quiz, '_quiz_lesson', true);
 
-			if( ! $lesson_id ) continue;
+			if ( ! $lesson_id) continue;
 
-			$lessons[ $lesson_id ]['title'] = get_the_title( $lesson_id );
-			$lessons[ $lesson_id ]['link'] = admin_url( 'post.php?post=' . $lesson_id . '&action=edit' );
+			$lessons[$lesson_id]['title'] = get_the_title($lesson_id);
+			$lessons[$lesson_id]['link'] = admin_url('post.php?post='.$lesson_id.'&action=edit');
 		}
 
-		if( ! $lessons ) {
+		if ( ! $lessons) {
 			echo $no_lessons;
 			return;
 		}
 
 		$html = '<ul>';
 
-		foreach( $lessons as $id => $lesson ) {
-			$html .= '<li><a href="' . esc_url( $lesson['link'] ) . '">' . esc_html( $lesson['title'] ) . '</a></li>';
+		foreach ($lessons as $id => $lesson) {
+			$html .= '<li><a href="'.esc_url($lesson['link']).'">'.esc_html($lesson['title']).'</a></li>';
 		}
 
 		$html .= '</ul>';
@@ -234,30 +234,30 @@ 
 
 	}
 
-	public function save_question( $post_id = 0 ) {
+	public function save_question($post_id = 0) {
 
-		if( ! isset( $_POST['post_type']
-            ) || 'question' != $_POST['post_type'] ) {
+		if ( ! isset($_POST['post_type']
+            ) || 'question' != $_POST['post_type']) {
             return;
         }
 
 
 
         //setup the data for saving
-		$data = $_POST ;
+		$data = $_POST;
         $data['quiz_id'] = 0;
 		$data['question_id'] = $post_id;
 
-		if ( ! wp_is_post_revision( $post_id ) ){
+		if ( ! wp_is_post_revision($post_id)) {
 
 			// Unhook function to prevent infinite loops
-			remove_action( 'save_post', array( $this, 'save_question' ) );
+			remove_action('save_post', array($this, 'save_question'));
 
 			// Update question data
-			$question_id = Sensei()->lesson->lesson_save_question( $data, 'question' );
+			$question_id = Sensei()->lesson->lesson_save_question($data, 'question');
 
 			// Re-hook same function
-			add_action( 'save_post', array( $this, 'save_question' ) );
+			add_action('save_post', array($this, 'save_question'));
 		}
 
 		return;
@@ -270,15 +270,15 @@ 
 	public function filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			$output = '';
 
 			// Question type
-			$selected = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			$type_options = '<option value="">' . __( 'All types', 'woothemes-sensei' ) . '</option>';
-			foreach( $this->question_types as $label => $type ) {
-				$type_options .= '<option value="' . esc_attr( $label ) . '" ' . selected( $selected, $label, false ) . '>' . esc_html( $type ) . '</option>';
+			$selected = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			$type_options = '<option value="">'.__('All types', 'woothemes-sensei').'</option>';
+			foreach ($this->question_types as $label => $type) {
+				$type_options .= '<option value="'.esc_attr($label).'" '.selected($selected, $label, false).'>'.esc_html($type).'</option>';
 			}
 
 			$output .= '<select name="question_type" id="dropdown_question_type">';
@@ -286,12 +286,12 @@ 
 			$output .= '</select>';
 
 			// Question category
-			$cats = get_terms( 'question-category', array( 'hide_empty' => false ) );
-			if ( ! empty( $cats ) && ! is_wp_error( $cats ) ) {
-				$selected = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-				$cat_options = '<option value="">' . __( 'All categories', 'woothemes-sensei' ) . '</option>';
-				foreach( $cats as $cat ) {
-					$cat_options .= '<option value="' . esc_attr( $cat->slug ) . '" ' . selected( $selected, $cat->slug, false ) . '>' . esc_html( $cat->name ) . '</option>';
+			$cats = get_terms('question-category', array('hide_empty' => false));
+			if ( ! empty($cats) && ! is_wp_error($cats)) {
+				$selected = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+				$cat_options = '<option value="">'.__('All categories', 'woothemes-sensei').'</option>';
+				foreach ($cats as $cat) {
+					$cat_options .= '<option value="'.esc_attr($cat->slug).'" '.selected($selected, $cat->slug, false).'>'.esc_html($cat->name).'</option>';
 				}
 
 				$output .= '<select name="question_cat" id="dropdown_question_cat">';
@@ -308,14 +308,14 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function filter_actions( $request ) {
+	public function filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			// Question type
-			$question_type = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			if( $question_type ) {
+			$question_type = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			if ($question_type) {
 				$type_query = array(
 					'taxonomy' => 'question-type',
 					'terms' => $question_type,
@@ -325,8 +325,8 @@ 
 			}
 
 			// Question category
-			$question_cat = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-			if( $question_cat ) {
+			$question_cat = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+			if ($question_cat) {
 				$cat_query = array(
 					'taxonomy' => 'question-category',
 					'terms' => $question_cat,
@@ -351,16 +351,16 @@ 
      *
      * @return string $question_type | bool
      */
-    public function get_question_type( $question_id ){
+    public function get_question_type($question_id) {
 
-        if( empty( $question_id ) || ! intval( $question_id ) > 0
-            || 'question' != get_post_type( $question_id )   ){
+        if (empty($question_id) || ! intval($question_id) > 0
+            || 'question' != get_post_type($question_id)) {
             return false;
         }
 
         $question_type = 'multiple-choice';
-        $question_types = wp_get_post_terms( $question_id, 'question-type' );
-        foreach( $question_types as $type ) {
+        $question_types = wp_get_post_terms($question_id, 'question-type');
+        foreach ($question_types as $type) {
             $question_type = $type->slug;
         }
 
@@ -377,21 +377,21 @@ 
 	 *
 	 * @return int $question_grade | bool
 	 */
-	public function get_question_grade( $question_id ) {
+	public function get_question_grade($question_id) {
 
-		if ( empty( $question_id ) || ! intval( $question_id ) > 0
-			|| 'question' != get_post_type( $question_id ) ) {
+		if (empty($question_id) || ! intval($question_id) > 0
+			|| 'question' != get_post_type($question_id)) {
 			return false;
 		}
 
-		$question_grade_raw = get_post_meta( $question_id, '_question_grade', true );
+		$question_grade_raw = get_post_meta($question_id, '_question_grade', true);
 		// If not set then default to 1...
-		if ( false === $question_grade_raw || $question_grade_raw == '' ) {
+		if (false === $question_grade_raw || $question_grade_raw == '') {
 			$question_grade = 1;
 		}
 		// ...but allow a grade of 0 for non-marked questions
 		else {
-			$question_grade = intval( $question_grade_raw );
+			$question_grade = intval($question_grade_raw);
 		}
 		return $question_grade;
 
@@ -404,9 +404,9 @@ 
      * @since 1.9.0
      * @param $question_type
      */
-    public static function load_question_template( $question_type ){
+    public static function load_question_template($question_type) {
 
-        Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
+        Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php');
     }
 
     /**
@@ -417,9 +417,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_title( $question_id ){
+    public static function the_question_title($question_id) {
 
-        echo self::get_the_question_title( $question_id );
+        echo self::get_the_question_title($question_id);
 
     }// end the_question_title
 
@@ -431,7 +431,7 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_title( $question_id ){
+    public static function get_the_question_title($question_id) {
 
         /**
          * Filter the sensei question title
@@ -439,17 +439,17 @@ 
          * @since 1.3.0
          * @param $question_title
          */
-        $title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
+        $title = apply_filters('sensei_question_title', get_the_title($question_id));
 
         /**
          * hook document in class-woothemes-sensei-message.php the_title()
          */
-        $title = apply_filters( 'sensei_single_title', $title, 'question');
+        $title = apply_filters('sensei_single_title', $title, 'question');
 
         $title_html  = '<span class="question question-title">';
         $title_html .= $title;
         $title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
-        $title_html .='</span>';
+        $title_html .= '</span>';
 
         return $title_html;
     }
@@ -460,14 +460,14 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_description( $question_id ){
+    public static function get_the_question_description($question_id) {
 
-        $question = get_post( $question_id );
+        $question = get_post($question_id);
 
         /**
          * Already documented within WordPress Core
          */
-        return apply_filters( 'the_content', $question->post_content );
+        return apply_filters('the_content', $question->post_content);
 
     }
 
@@ -477,9 +477,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_description( $question_id  ){
+    public static function the_question_description($question_id) {
 
-        echo self::get_the_question_description( $question_id );
+        echo self::get_the_question_description($question_id);
 
     }
 
@@ -490,38 +490,38 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_media( $question_id ){
+    public static function get_the_question_media($question_id) {
 
-        $question_media = get_post_meta( $question_id, '_question_media', true );
+        $question_media = get_post_meta($question_id, '_question_media', true);
         $question_media_link = '';
-        if( 0 < intval( $question_media ) ) {
-            $mimetype = get_post_mime_type( $question_media );
-            if( $mimetype ) {
-                $mimetype_array = explode( '/', $mimetype);
-                if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
+        if (0 < intval($question_media)) {
+            $mimetype = get_post_mime_type($question_media);
+            if ($mimetype) {
+                $mimetype_array = explode('/', $mimetype);
+                if (isset($mimetype_array[0]) && $mimetype_array[0]) {
                     $question_media_type = $mimetype_array[0];
-                    $question_media_url = wp_get_attachment_url( $question_media );
-                    $attachment = get_post( $question_media );
+                    $question_media_url = wp_get_attachment_url($question_media);
+                    $attachment = get_post($question_media);
                     $question_media_title = $attachment->post_title;
                     $question_media_description = $attachment->post_content;
-                    switch( $question_media_type ) {
+                    switch ($question_media_type) {
                         case 'image':
-                            $image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
-                            $attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
+                            $image_size = apply_filters('sensei_question_image_size', 'medium', $question_id);
+                            $attachment_src = wp_get_attachment_image_src($question_media, $image_size);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank"><img src="'.$attachment_src[0].'" width="'.$attachment_src[1].'" height="'.$attachment_src[2].'" /></a>';
                             break;
 
                         case 'audio':
-                            $question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_audio_shortcode(array('src' => $question_media_url));
                             break;
 
                         case 'video':
-                            $question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_video_shortcode(array('src' => $question_media_url));
                             break;
 
                         default:
-                            $question_media_filename = basename( $question_media_url );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
+                            $question_media_filename = basename($question_media_url);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank">'.$question_media_filename.'</a>';
                             break;
                     }
                 }
@@ -529,21 +529,21 @@ 
         }
 
         $output = '';
-        if( $question_media_link ) {
+        if ($question_media_link) {
 
                 $output .= '<div class="question_media_display">';
-                $output .=      $question_media_link;
+                $output .= $question_media_link;
                 $output .= '<dl>';
 
-                if( $question_media_title ) {
+                if ($question_media_title) {
 
-                   $output .= '<dt>'. $question_media_title. '</dt>';
+                   $output .= '<dt>'.$question_media_title.'</dt>';
 
                  }
 
-                if( $question_media_description ) {
+                if ($question_media_description) {
 
-                    $output .= '<dd>' . $question_media_description . '</dd>';
+                    $output .= '<dd>'.$question_media_description.'</dd>';
 
                 }
 
@@ -564,9 +564,9 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_question_media( $question_id ){
+    public static function the_question_media($question_id) {
 
-        echo self::get_the_question_media( $question_id );
+        echo self::get_the_question_media($question_id);
 
     }
 
@@ -577,11 +577,11 @@ 
      *
      * @param $question_id
      */
-    public static function the_question_hidden_fields( $question_id ){
+    public static function the_question_hidden_fields($question_id) {
         ?>
 
-            <input type="hidden" name="question_id_<?php $question_id;?>" value="<?php $question_id;?>" />
-            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e( $question_id ); ?>" />
+            <input type="hidden" name="question_id_<?php $question_id; ?>" value="<?php $question_id; ?>" />
+            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e($question_id); ?>" />
 
         <?php
     }
@@ -592,27 +592,27 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function answer_feedback_notes( $question_id ){
+    public static function answer_feedback_notes($question_id) {
 
         //IDS
         $quiz_id = get_the_ID();
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
         // Data to check before showing feedback
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $not_empty_user_quiz_grade = !empty( $user_quiz_grade );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+        $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, get_current_user_id());
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $not_empty_user_quiz_grade = ! empty($user_quiz_grade);
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $lesson_completed = Sensei_Utils::user_completed_lesson($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
-        if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
-            ||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
-            || ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
+        if (($lesson_completed && $not_empty_user_quiz_grade)
+            ||  ($lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type)
+            || ('auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade)) {
 
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, get_current_user_id());
 
-            if( $answer_notes ) { ?>
+            if ($answer_notes) { ?>
 
                 <div class="sensei-message info info-special answer-feedback">
 
@@ -626,7 +626,7 @@ 
                          * @param string $question_id
                          * @param string $lesson_id
                          */
-                        echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
+                        echo apply_filters('sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id);
 
                     ?>
 
@@ -645,72 +645,72 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_answer_result_indication( $question_id ){
+    public static function the_answer_result_indication($question_id) {
 
-        global $post,  $current_user, $sensei_question_loop;
+        global $post, $current_user, $sensei_question_loop;
 
         // Post Data
         $quiz_id = $sensei_question_loop['quiz_id'];
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $question_item = $sensei_question_loop['current_question'];
 
         // Setup variable needed to determine if the message should show and what it should show
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $lesson_complete = Sensei_Utils::user_completed_lesson($lesson_id, get_current_user_id());
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
         // retrieve the question total grade
-        $question_grade = Sensei()->question->get_question_grade( $question_id );
+        $question_grade = Sensei()->question->get_question_grade($question_id);
 
         // retrieve grade the user achieved
-        $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
+        $user_question_grade = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
 
         // Question ID
         $question_id = $question_item->ID;
 
         // conditions to check
-        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
-        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
-        $grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
+        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '';
+        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete && $user_quiz_grade != '' && ! $reset_quiz_allowed;
+        $grade_type_auto_a_valid_grade_and_reset_not_allowed = 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '';
 
-        if (  $completed_with_valid_grade
+        if ($completed_with_valid_grade
             || $completed_with_valid_grade_and_reset_not_allowed
-            || $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
+            || $grade_type_auto_a_valid_grade_and_reset_not_allowed) {
 
             $user_correct = false;
-            $answer_message = __( 'Incorrect', 'woothemes-sensei' );
+            $answer_message = __('Incorrect', 'woothemes-sensei');
             $answer_message_class = 'user_wrong';
             // For zero grade mark as 'correct' but add no classes
-            if ( 0 == $question_grade ) {
+            if (0 == $question_grade) {
 
                 $user_correct = true;
                 $answer_message = '';
                 $answer_message_class = '';
 
-            } else if( $user_question_grade > 0 ) {
+            } else if ($user_question_grade > 0) {
 
                 $user_correct = true;
-                $answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
+                $answer_message = sprintf(__('Grade: %d', 'woothemes-sensei'), $user_question_grade);
                 $answer_message_class = 'user_right';
 
             }
 
             // attach the correct answer if the question is auto gradable and user got it wrong
-            if( !$reset_quiz_allowed && !$user_correct ){
+            if ( ! $reset_quiz_allowed && ! $user_correct) {
 
-                $answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
+                $answer_message .= ' - '.__('Right Answer:', 'woothemes-sensei').' '.self::get_correct_answer($question_item->ID);
 
             }
 
             // answer feedback
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
-            if( $answer_notes ) {
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, $current_user->ID);
+            if ($answer_notes) {
                 $answer_message_class .= ' has_notes';
             }
             ?>
 
-            <div class="answer_message <?php esc_attr_e( $answer_message_class ); ?>">
+            <div class="answer_message <?php esc_attr_e($answer_message_class); ?>">
 
                 <span><?php echo $answer_message; ?></span>
 
@@ -731,39 +731,39 @@ 
      * @param $quiz_id
      * @return array $question_data
      */
-    public static function get_template_data( $question_id, $quiz_id ){
+    public static function get_template_data($question_id, $quiz_id) {
 
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
-        $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+        $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
         //backwards compatibility
-        if( 'on' == $reset_allowed ) {
+        if ('on' == $reset_allowed) {
             $reset_allowed = 1;
         }
 
         // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
+        $user_lesson_end = Sensei_Utils::user_completed_lesson(Sensei()->quiz->get_lesson_id($quiz_id), get_current_user_id());
         $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
+        if ($user_lesson_end) {
             $user_lesson_complete = true;
         }
 
         //setup the question data
-        $data[ 'ID' ]                     = $question_id;
-        $data[ 'title' ]                  = get_the_title( $question_id );
-        $data[ 'content' ]                = get_post( $question_id )->post_content;
-        $data[ 'quiz_id' ]                = $quiz_id;
-        $data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
-        $data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
-        $data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
-        $data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
-        $data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
-        $data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
-        $data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
-        $data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
-        $data[ 'reset_quiz_allowed' ]     = $reset_allowed;
-        $data[ 'lesson_complete' ]        = $user_lesson_complete;
+        $data['ID']                     = $question_id;
+        $data['title']                  = get_the_title($question_id);
+        $data['content']                = get_post($question_id)->post_content;
+        $data['quiz_id']                = $quiz_id;
+        $data['lesson_id']              = Sensei()->quiz->get_lesson_id($quiz_id);
+        $data['type']                   = Sensei()->question->get_question_type($question_id);
+        $data['question_grade']         = Sensei()->question->get_question_grade($question_id);
+        $data['user_question_grade']    = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
+        $data['question_right_answer']  = get_post_meta($question_id, '_question_right_answer', true);
+        $data['question_wrong_answers'] = get_post_meta($question_id, '_question_wrong_answers', true);
+        $data['user_answer_entry']      = Sensei()->quiz->get_user_question_answer($lesson_id, $question_id, get_current_user_id());
+        $data['lesson_completed']       = Sensei_Utils::user_completed_course($lesson_id, get_current_user_id( ));
+        $data['quiz_grade_type']        = get_post_meta($quiz_id, '_quiz_grade_type', true);
+        $data['reset_quiz_allowed']     = $reset_allowed;
+        $data['lesson_complete']        = $user_lesson_complete;
 
         /**
          * Filter the question template data. This filter fires  in
@@ -777,7 +777,7 @@ 
          * @param string $question_id
          * @param string $quiz_id
          */
-        return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
+        return apply_filters('sensei_get_question_template_data', $data, $question_id, $quiz_id);
 
     }
 
@@ -793,28 +793,28 @@ 
      *
      * @return array()
      */
-    public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
+    public static function file_upload_load_question_data($question_data, $question_id, $quiz_id) {
 
 
-        if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('file-upload' == Sensei()->question->get_question_type($question_id)) {
 
             // Get uploaded file
-            $attachment_id = $question_data[ 'user_answer_entry' ];
+            $attachment_id = $question_data['user_answer_entry'];
             $answer_media_url = $answer_media_filename = '';
 
 
             $question_helptext = '';
-            if( isset( $question_data['question_wrong_answers'][0] ) ) {
+            if (isset($question_data['question_wrong_answers'][0])) {
 
-                $question_helptext =  $question_data['question_wrong_answers'][0];
+                $question_helptext = $question_data['question_wrong_answers'][0];
 
             }
 
 
-            if( 0 < intval( $attachment_id ) ) {
+            if (0 < intval($attachment_id)) {
 
-                $answer_media_url = wp_get_attachment_url( $attachment_id );
-                $answer_media_filename = basename( $answer_media_url );
+                $answer_media_url = wp_get_attachment_url($attachment_id);
+                $answer_media_filename = basename($answer_media_url);
 
             }
 
@@ -822,11 +822,11 @@ 
             // Get max upload file size, formatted for display
             // Code copied from wp-admin/includes/media.php:1515
             $upload_size_unit = $max_upload_size = wp_max_upload_size();
-            $sizes = array( 'KB', 'MB', 'GB' );
-            for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+            $sizes = array('KB', 'MB', 'GB');
+            for ($u = -1; $upload_size_unit > 1024 && $u < count($sizes) - 1; $u++) {
                 $upload_size_unit /= 1024;
             }
-            if ( $u < 0 ) {
+            if ($u < 0) {
 
                 $upload_size_unit = 0;
                 $u = 0;
@@ -836,14 +836,14 @@ 
                 $upload_size_unit = (int) $upload_size_unit;
 
             }
-            $max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
+            $max_upload_size = sprintf(__('Maximum upload file size: %d%s'), esc_html($upload_size_unit), esc_html($sizes[$u]));
 
             // Assemble all the data needed by the file upload template
-            $question_data[ 'answer_media_url' ]      = $answer_media_url;
-            $question_data[ 'answer_media_filename' ] = $answer_media_filename;
-            $question_data[ 'max_upload_size' ]       = $max_upload_size;
+            $question_data['answer_media_url']      = $answer_media_url;
+            $question_data['answer_media_filename'] = $answer_media_filename;
+            $question_data['max_upload_size']       = $max_upload_size;
 
-            $question_data[ 'question_helptext' ]     = $question_helptext;
+            $question_data['question_helptext']     = $question_helptext;
 
         }// end if is file upload type
 
@@ -863,27 +863,27 @@ 
      *
      * @return array()
      */
-    public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function multiple_choice_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('multiple-choice' == Sensei()->question->get_question_type($question_id)) {
 
 
             $answer_type = 'radio';
-            if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
+            if (is_array($question_data['question_right_answer']) && (1 < count($question_data['question_right_answer']))) {
 
                 $answer_type = 'checkbox';
 
             }
 
             // Merge right and wrong answers
-            if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
+            if (is_array($question_data['question_right_answer'])) {
 
-                $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+                $merged_options = array_merge($question_data['question_wrong_answers'], $question_data['question_right_answer']);
 
-            }  else {
+            } else {
 
-                array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
-                $merged_options = $question_data[ 'question_wrong_answers' ];
+                array_push($question_data['question_wrong_answers'], $question_data['question_right_answer']);
+                $merged_options = $question_data['question_wrong_answers'];
 
             }
 
@@ -891,24 +891,24 @@ 
             $question_answers_options = array();
             $count = 0;
 
-            foreach( $merged_options as $answer ) {
+            foreach ($merged_options as $answer) {
 
                 $count++;
                 $question_option = array();
 
-                if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
+                if (($question_data['lesson_completed'] && $question_data['user_quiz_grade'] != '')
+                    || ($question_data['lesson_completed'] && ! $question_data['reset_quiz_allowed'] && $question_data['user_quiz_grade'] != '')
+                    || ('auto' == $question_data['quiz_grade_type'] && ! $question_data['reset_quiz_allowed'] && ! empty($question_data['user_quiz_grade']))) {
 
                     $user_correct = false;
 
 
                     // For zero grade mark as 'correct' but add no classes
-                    if ( 0 == $question_data[ 'question_grade' ] ) {
+                    if (0 == $question_data['question_grade']) {
 
                         $user_correct = true;
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+                    } else if ($question_data['user_question_grade'] > 0) {
 
                         $user_correct = true;
 
@@ -918,20 +918,20 @@ 
 
                 // setup the option specific classes
                 $answer_class = '';
-                if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
-                    if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
+                if (isset($user_correct) && 0 < $question_data['question_grade']) {
+                    if (is_array($question_data['question_right_answer']) && in_array($answer, $question_data['question_right_answer'])) {
 
                         $answer_class .= ' right_answer';
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+                    }  elseif ( ! is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer) {
 
                         $answer_class .= ' right_answer';
 
-                    } elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
-                        ||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
+                    } elseif ((is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry']))
+                        ||  ( ! $question_data['user_answer_entry'] && $question_data['user_answer_entry'] == $answer)) {
 
                         $answer_class = 'user_wrong';
-                        if( $user_correct ) {
+                        if ($user_correct) {
 
                             $answer_class = 'user_right';
 
@@ -943,76 +943,76 @@ 
 
                 // determine if the current option must be checked
                 $checked = '';
-                if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
-                    if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
+                if (isset($question_data['user_answer_entry']) && 0 < count($question_data['user_answer_entry'])) {
+                    if (is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry'])) {
 
                         $checked = 'checked="checked"';
 
-                    } elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
+                    } elseif ( ! is_array($question_data['user_answer_entry'])) {
 
-                        $checked = checked( $answer, $question_data['user_answer_entry'] , false );
+                        $checked = checked($answer, $question_data['user_answer_entry'], false);
 
                     }
 
                 } // End If Statement
 
                 //Load the answer option data
-                $question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
-                $question_option[ 'answer' ]      = $answer;
-                $question_option[ 'option_class'] = $answer_class;
-                $question_option[ 'checked']      = $checked;
-                $question_option[ 'count' ]       = $count;
-                $question_option[ 'type' ] = $answer_type;
+                $question_option['ID']          = Sensei()->lesson->get_answer_id($answer);
+                $question_option['answer']      = $answer;
+                $question_option['option_class'] = $answer_class;
+                $question_option['checked']      = $checked;
+                $question_option['count']       = $count;
+                $question_option['type'] = $answer_type;
 
                 // add the speci  fic option to the list of options for this question
-                $question_answers_options[$question_option[ 'ID' ]] = $question_option;
+                $question_answers_options[$question_option['ID']] = $question_option;
 
             } // end for each option
 
 
             // Shuffle the array depending on the settings
             $answer_options_sorted = array();
-            $random_order = get_post_meta( $question_data['ID'], '_random_order', true );
-            if(  $random_order && $random_order == 'yes' ) {
+            $random_order = get_post_meta($question_data['ID'], '_random_order', true);
+            if ($random_order && $random_order == 'yes') {
 
                 $answer_options_sorted = $question_answers_options;
-                shuffle( $answer_options_sorted );
+                shuffle($answer_options_sorted);
 
             } else {
 
                 $answer_order = array();
-                $answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
-                if( $answer_order_string ) {
+                $answer_order_string = get_post_meta($question_data['ID'], '_answer_order', true);
+                if ($answer_order_string) {
 
-                    $answer_order = array_filter( explode( ',', $answer_order_string ) );
-                    if( count( $answer_order ) > 0 ) {
+                    $answer_order = array_filter(explode(',', $answer_order_string));
+                    if (count($answer_order) > 0) {
 
-                        foreach( $answer_order as $answer_id ) {
+                        foreach ($answer_order as $answer_id) {
 
-                            if( isset( $question_answers_options[ $answer_id ] ) ) {
+                            if (isset($question_answers_options[$answer_id])) {
 
-                                $answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
-                                unset( $question_answers_options[ $answer_id ] );
+                                $answer_options_sorted[$answer_id] = $question_answers_options[$answer_id];
+                                unset($question_answers_options[$answer_id]);
 
                             }
 
                         }
 
-                        if( count( $question_answers_options ) > 0 ) {
-                            foreach( $question_answers_options as $id => $answer ) {
+                        if (count($question_answers_options) > 0) {
+                            foreach ($question_answers_options as $id => $answer) {
 
-                                $answer_options_sorted[ $id ] = $answer;
+                                $answer_options_sorted[$id] = $answer;
 
                             }
                         }
 
-                    }else{
+                    } else {
 
                         $answer_options_sorted = $question_answers_options;
 
                     }
 
-                }else{
+                } else {
 
                     $answer_options_sorted = $question_answers_options;
 
@@ -1022,7 +1022,7 @@ 
 
 
             // assemble and setup the data for the templates data array
-            $question_data[ 'answer_options' ]    =  $answer_options_sorted;
+            $question_data['answer_options'] = $answer_options_sorted;
 
         }
 
@@ -1042,14 +1042,14 @@ 
      *
      * @return array()
      */
-    public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function gap_fill_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('gap-fill' == Sensei()->question->get_question_type($question_id)) {
 
-            $gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
-            $question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
-            $question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
-            $question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+            $gapfill_array = explode('||', $question_data['question_right_answer']);
+            $question_data['gapfill_pre']  = isset($gapfill_array[0]) ? $gapfill_array[0] : '';
+            $question_data['gapfill_gap']  = isset($gapfill_array[1]) ? $gapfill_array[1] : '';
+            $question_data['gapfill_post'] = isset($gapfill_array[2]) ? $gapfill_array[2] : '';
 
         }
 
@@ -1064,32 +1064,32 @@ 
      * @param $question_id
      * @return string $correct_answer or empty
      */
-    public static function get_correct_answer( $question_id ){
+    public static function get_correct_answer($question_id) {
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $type = Sensei()->question->get_question_type( $question_id );
-        $type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+        $right_answer = get_post_meta($question_id, '_question_right_answer', true);
+        $type = Sensei()->question->get_question_type($question_id);
+        $type_name = __('Multiple Choice', 'woothemes-sensei');
         $grade_type = 'manual-grade';
 
-        if ('boolean'== $type ) {
+        if ('boolean' == $type) {
 
             $right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+        }elseif ('multiple-choice' == $type) {
 
             $right_answer = (array) $right_answer;
-            $right_answer = implode( ', ', $right_answer );
+            $right_answer = implode(', ', $right_answer);
 
-        }elseif( 'gap-fill' == $type ) {
+        }elseif ('gap-fill' == $type) {
 
-            $right_answer_array = explode( '||', $right_answer );
-            if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-            if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-            if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+            $right_answer_array = explode('||', $right_answer);
+            if (isset($right_answer_array[0])) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+            if (isset($right_answer_array[1])) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+            if (isset($right_answer_array[2])) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-            $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
+            $right_answer = $gapfill_pre.' <span class="highlight">'.$gapfill_gap.'</span> '.$gapfill_post;
 
-        }else{
+        } else {
 
             // for non auto gradable question types no answer should be returned.
             $right_answer = '';
@@ -1107,4 +1107,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Question extends Sensei_Question{}
+class WooThemes_Sensei_Question extends Sensei_Question {}