woothemes / sensei

includes/class-sensei-templates.php

Indentation +515 added lines, -515 removed lines

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

templates/single-quiz/question_type-boolean.php

Indentation +41 added lines, -41 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying True/False ( Boolean ) Question type.
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying True/False ( Boolean ) Question type.
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
-    $boolean_options = array( 'true', 'false' );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	$boolean_options = array( 'true', 'false' );
 
 ?>
 
@@ -25,44 +25,44 @@ 
 
     <?php
 
-    // setup the options the right answer set by the admin/teacher
-    // will be compared to.
-    $boolean_options = array( true, false );
+	// setup the options the right answer set by the admin/teacher
+	// will be compared to.
+	$boolean_options = array( true, false );
 
-    //loop through the 2 boolean options and compare them with
-    // the selected right answer
-    foreach ( $boolean_options as $option ){
+	//loop through the 2 boolean options and compare them with
+	// the selected right answer
+	foreach ( $boolean_options as $option ){
 
-        $answer_class = '';
+		$answer_class = '';
 
-        // Add classes to indicate correctness, only if there is a grade
-        if( isset( $question_data[ 'user_correct' ] ) && 0 < $question_data['question_grade'] ) {
+		// Add classes to indicate correctness, only if there is a grade
+		if( isset( $question_data[ 'user_correct' ] ) && 0 < $question_data['question_grade'] ) {
 
-            if( $question_right_answer == $question_data[ 'question_right_answer' ] ) {
+			if( $question_right_answer == $question_data[ 'question_right_answer' ] ) {
 
-                if( $question_data[ 'user_correct' ] ) {
+				if( $question_data[ 'user_correct' ] ) {
 
-                    $answer_class = 'user_right';
+					$answer_class = 'user_right';
 
-                }
+				}
 
-                $answer_class .= ' right_answer';
+				$answer_class .= ' right_answer';
 
-            } else {
+			} else {
 
-                if( ! $question_data[ 'user_correct' ] ) {
+				if( ! $question_data[ 'user_correct' ] ) {
 
-                    $answer_class = 'user_wrong';
+					$answer_class = 'user_wrong';
 
-                }
+				}
 
-            } // end if right answer == current booloean options
+			} // end if right answer == current booloean options
 
-        }// end if $user_correct .. $question_grade
+		}// end if $user_correct .. $question_grade
 
-	    $option_value = $option ? 'true' : 'false';
+		$option_value = $option ? 'true' : 'false';
 
-    ?>
+	?>
 
     <li class="<?php esc_attr_e( $answer_class ); ?>">
 
@@ -76,17 +76,17 @@ 
         <label for="<?php echo esc_attr( 'question_' . $question_data[ 'ID' ]  ) . '-option-' . $option_value; ?>">
             <?php
 
-            if( 'true' == $option ){
+			if( 'true' == $option ){
 
-                _e( 'True', 'woothemes-sensei' );
+				_e( 'True', 'woothemes-sensei' );
 
-            }else{
+			}else{
 
-                _e( 'False', 'woothemes-sensei' );
+				_e( 'False', 'woothemes-sensei' );
 
-            }
+			}
 
-            ?>
+			?>
 
 
         </label>

woothemes-sensei.php

Indentation +69 added lines, -69 removed lines

@@ -30,80 +30,80 @@
 

 	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

 

-    require_once( 'includes/class-sensei-autoloader.php' );

-    require_once( 'includes/lib/woo-functions.php' );

-    require_once( 'includes/sensei-functions.php' );

+	require_once( 'includes/class-sensei-autoloader.php' );

+	require_once( 'includes/lib/woo-functions.php' );

+	require_once( 'includes/sensei-functions.php' );

 

-    if ( ! is_admin() ) {

-        require_once( 'includes/template-functions.php' );

-    }

+	if ( ! is_admin() ) {

+		require_once( 'includes/template-functions.php' );

+	}

 

-    /**

-     * Returns the global Sensei Instance.

-     *

-     * @since 1.8.0

-     */

-    function Sensei(){

+	/**

+	 * Returns the global Sensei Instance.

+	 *

+	 * @since 1.8.0

+	 */

+	function Sensei(){

 

-        return Sensei_Main::instance();

+		return Sensei_Main::instance();

 

-    }

+	}

 

 	// set the sensei version number

 	Sensei()->version = '1.9.1';

 

-    //backwards compatibility

-    global $woothemes_sensei;

-    $woothemes_sensei = Sensei();

-

-    /**

-    * Hook in WooCommerce functionality

-    */

-    if( Sensei_WC::is_woocommerce_active() ){

-        add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

-    }

-

-    /**

-     * Load all Template hooks

-    */

-    if(! is_admin() ){

-

-        require_once( 'includes/hooks/template.php' );

-

-    }

-

-    /**

-     * Plugin updates

-     * @since  1.0.1

-     */

-    woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

-

-    /**

-     * Sensei Activation Hook registration

-     * @since 1.8.0

-     */

-    register_activation_hook( __FILE__, 'activate_sensei' );

-

-    /**

-     * Activate_sensei

-     *

-     * All the activation checks needed to ensure Sensei is ready for use

-     * @since 1.8.0

-     */

-    function activate_sensei () {

-

-        // create the teacher role on activation and ensure that it has all the needed capabilities

-        Sensei()->teacher->create_role();

-

-        //Setup all the role capabilities needed

-        Sensei()->updates->add_sensei_caps();

-        Sensei()->updates->add_editor_caps();

-        Sensei()->updates->assign_role_caps();

-

-        //Flush rules

-        add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

-

-        //Load the Welcome Screen

-        add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

-

-    }// end activate_sensei

+	//backwards compatibility

+	global $woothemes_sensei;

+	$woothemes_sensei = Sensei();

+

+	/**

+	 * Hook in WooCommerce functionality

+	 */

+	if( Sensei_WC::is_woocommerce_active() ){

+		add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

+	}

+

+	/**

+	 * Load all Template hooks

+	 */

+	if(! is_admin() ){

+

+		require_once( 'includes/hooks/template.php' );

+

+	}

+

+	/**

+	 * Plugin updates

+	 * @since  1.0.1

+	 */

+	woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

+

+	/**

+	 * Sensei Activation Hook registration

+	 * @since 1.8.0

+	 */

+	register_activation_hook( __FILE__, 'activate_sensei' );

+

+	/**

+	 * Activate_sensei

+	 *

+	 * All the activation checks needed to ensure Sensei is ready for use

+	 * @since 1.8.0

+	 */

+	function activate_sensei () {

+

+		// create the teacher role on activation and ensure that it has all the needed capabilities

+		Sensei()->teacher->create_role();

+

+		//Setup all the role capabilities needed

+		Sensei()->updates->add_sensei_caps();

+		Sensei()->updates->add_editor_caps();

+		Sensei()->updates->assign_role_caps();

+

+		//Flush rules

+		add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

+

+		//Load the Welcome Screen

+		add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

+

+	}// end activate_sensei

includes/class-sensei-frontend.php

Indentation +312 added lines, -312 removed lines

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

includes/template-functions.php

Indentation +320 added lines, -321 removed lines

@@ -5,18 +5,18 @@ 
 	 * 	Output tags.
 	 ***************************************************************************************************/
 
-    /**
-     * sensei_course_archive_next_link function.
-     *
-     * @access public
-     * @param string $type (default: 'newcourses')
-     * @return void
-     */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+	/**
+	 * sensei_course_archive_next_link function.
+	 *
+	 * @access public
+	 * @param string $type (default: 'newcourses')
+	 * @return void
+	 */
+	function sensei_course_archive_next_link( $type = 'newcourses' ) {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+		_deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
 
-    } // End sensei_course_archive_next_link()
+	} // End sensei_course_archive_next_link()
 
 	 /**
 	  * course_single_lessons function.
@@ -26,14 +26,14 @@ 
 	  */
 	 function course_single_lessons() {
 
-         // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+		 // load backwards compatible template name if it exists in the users theme
+		 $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
+		 if( $located_template ){
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
-             return;
+			 Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+			 return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'single-course/lessons.php' );
 
@@ -48,8 +48,8 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
-         sensei_the_single_lesson_meta();
+		 _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+		 sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
 
@@ -60,7 +60,7 @@ 
 	  * @access public
 	  * @param bool $return (default: false)
 	  * @return void
-      * @deprecated since 1.9.0
+	  * @deprecated since 1.9.0
 	  */
 	 function quiz_questions( $return = false ) {
 
@@ -74,11 +74,11 @@ 
 	  * @access public
 	  * @since  1.3.0
 	  * @return void
-      * @deprecated
+	  * @deprecated
 	  */
 	 function quiz_question_type( $question_type = 'multiple-choice' ) {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+		 Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
 
 	 } // End lesson_single_meta()
 
@@ -89,14 +89,14 @@ 
 	/**
 	 * sensei_check_prerequisite_course function.
 	 *
-     * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
+	 * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return bool
 	 */
 	function sensei_check_prerequisite_course( $course_id ) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+		return Sensei_Course::is_prerequisite_complete( $course_id );
 
 	} // End sensei_check_prerequisite_course()
 
@@ -120,14 +120,14 @@ 
     			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
 
     		</form><?php
-    	} // End If Statement
+		} // End If Statement
 	} // End sensei_start_course_form()
 
 
 	/**
 	 * sensei_wc_add_to_cart function.
 	 *
-     * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
+	 * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return void
@@ -147,7 +147,7 @@ 
 	 * @return bool
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+		return Sensei_WC::is_product_in_cart( $wc_product_id );
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -160,17 +160,17 @@ 
 	function sensei_simple_course_price( $post_id ) {
 
 		//WooCommerce Pricing
-        if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		if ( Sensei_WC::is_woocommerce_active() ) {
+			$wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
+			if ( 0 < $wc_post_id ) {
+				// Get the product
+				$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+				if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
-    	    } // End If Statement
-    	} // End If Statement
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_simple_course_price()
 
 	/**
@@ -197,7 +197,7 @@ 
 
 
 		if ( ! $query->is_main_query() )
-        	return;
+			return;
 
 		// Apply Filter only if on frontend and when course archive is running
 		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
@@ -205,11 +205,11 @@ 
 		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
 			// Check for pagination settings
    			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
-    		} else {
-    			$amount = $query->get( 'posts_per_page' );
-    		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			} else {
+				$amount = $query->get( 'posts_per_page' );
+			} // End If Statement
+			$query->set( 'posts_per_page', $amount );
 		} // End If Statement
 	} // End sensei_course_archive_filter()
 	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
@@ -248,70 +248,70 @@ 
 			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
-
-            if( !empty( $modules )  ){
-                foreach( (array) $modules as $module ) {
-
-                    $args = array(
-                        'post_type' => 'lesson',
-                        'post_status' => 'publish',
-                        'posts_per_page' => -1,
-                        'meta_query' => array(
-                            array(
-                                'key' => '_lesson_course',
-                                'value' => intval( $lesson_course_id ),
-                                'compare' => '='
-                            )
-                        ),
-                        'tax_query' => array(
-                            array(
-                                'taxonomy' => Sensei()->modules->taxonomy,
-                                'field' => 'id',
-                                'terms' => intval( $module->term_id )
-                            )
-                        ),
-                        'meta_key' => '_order_module_' . $module->term_id,
-                        'orderby' => 'meta_value_num date',
-                        'order' => 'ASC',
-                        'suppress_filters' => 0
-                    );
-
-                    $lessons = get_posts( $args );
-                    if ( 0 < count( $lessons ) ) {
-                        foreach ($lessons as $lesson_item){
-                            $all_lessons[] = $lesson_item->ID;
-                        } // End For Loop
-                    } // End If Statement
-
-                }//end for each
-
-            }// end if empty modules
-
-            $args = array(
-                'post_type' => 'lesson',
-                'posts_per_page' => -1,
-                'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
-                'orderby' => 'meta_value_num date',
-                'order' => 'ASC',
-                'meta_query' => array(
-                    array(
-                        'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
-                    ),
-                ),
-                'post__not_in' => $all_lessons,
-            );
-
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
+			$modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+
+			if( !empty( $modules )  ){
+				foreach( (array) $modules as $module ) {
+
+					$args = array(
+						'post_type' => 'lesson',
+						'post_status' => 'publish',
+						'posts_per_page' => -1,
+						'meta_query' => array(
+							array(
+								'key' => '_lesson_course',
+								'value' => intval( $lesson_course_id ),
+								'compare' => '='
+							)
+						),
+						'tax_query' => array(
+							array(
+								'taxonomy' => Sensei()->modules->taxonomy,
+								'field' => 'id',
+								'terms' => intval( $module->term_id )
+							)
+						),
+						'meta_key' => '_order_module_' . $module->term_id,
+						'orderby' => 'meta_value_num date',
+						'order' => 'ASC',
+						'suppress_filters' => 0
+					);
+
+					$lessons = get_posts( $args );
+					if ( 0 < count( $lessons ) ) {
+						foreach ($lessons as $lesson_item){
+							$all_lessons[] = $lesson_item->ID;
+						} // End For Loop
+					} // End If Statement
+
+				}//end for each
+
+			}// end if empty modules
+
+			$args = array(
+				'post_type' => 'lesson',
+				'posts_per_page' => -1,
+				'suppress_filters' => 0,
+				'meta_key' => '_order_' . $lesson_course_id,
+				'orderby' => 'meta_value_num date',
+				'order' => 'ASC',
+				'meta_query' => array(
+					array(
+						'key' => '_lesson_course',
+						'value' => intval( $lesson_course_id ),
+					),
+				),
+				'post__not_in' => $all_lessons,
+			);
+
+			$other_lessons = get_posts( $args );
+			if ( 0 < count( $other_lessons ) ) {
 				foreach ($other_lessons as $lesson_item){
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+			if ( 0 < count( $all_lessons ) ) {
 				$found_index = false;
 				foreach ( $all_lessons as $lesson ){
 					if ( $found_index && $return_values['next_lesson'] == 0 ) {
@@ -342,9 +342,9 @@ 
    */
   function sensei_get_excerpt( $post_id = '' ) {
 
-      global $post;
-      _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
-      return get_the_excerpt();
+	  global $post;
+	  _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
+	  return get_the_excerpt();
 
   }
 
@@ -369,7 +369,7 @@ 
 */
 function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+	return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -484,27 +484,27 @@ 
 
 	}else{
 
-        // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+		// if the loop has not been initiated check the first module has lessons
+		if( -1 == $sensei_modules_loop[ 'current' ]  ){
 
-            $index = 0;
+			$index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
-                // setup the query for the module lessons
-                $course_id = $sensei_modules_loop['course_id'];
+			if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+				// setup the query for the module lessons
+				$course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+				$module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
+				$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
 
-                // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+				// setup the global wp-query only if the lessons
+				if( $modules_query->have_posts() ){
 
-                    return true;
+					return true;
 
-                }
-            }
-        }
-        // default to false if the first module doesn't have posts
+				}
+			}
+		}
+		// default to false if the first module doesn't have posts
 		return false;
 
 	}
@@ -612,46 +612,46 @@ 
 		return '';
 	}
 
-    global $sensei_modules_loop;
-    $module_title = $sensei_modules_loop['current_module']->name;
-    $module_term_id = $sensei_modules_loop['current_module']->term_id;
-    $course_id = $sensei_modules_loop['course_id'];
-    $module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
+	global $sensei_modules_loop;
+	$module_title = $sensei_modules_loop['current_module']->name;
+	$module_term_id = $sensei_modules_loop['current_module']->term_id;
+	$course_id = $sensei_modules_loop['course_id'];
+	$module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
 
-    $module_status =  '';
-    if ( $module_progress && $module_progress > 0) {
+	$module_status =  '';
+	if ( $module_progress && $module_progress > 0) {
 
-        $module_status = __('Completed', 'woothemes-sensei');
+		$module_status = __('Completed', 'woothemes-sensei');
 
-        if ($module_progress < 100) {
+		if ($module_progress < 100) {
 
-            $module_status = __('In progress', 'woothemes-sensei');
+			$module_status = __('In progress', 'woothemes-sensei');
 
-        }
+		}
 
-    }
+	}
 
 	if ( empty( $module_status ) ){
 		return '';
 	}
 
 	$status_class = strtolower( str_replace( ' ', '-', $module_status  ) );
-    $module_status_html = '<p class="status module-status ' . $status_class . '">'
-                            . $module_status
-                            . '</p>';
-
-    /**
-     * Filter the module status.
-     *
-     * This fires within the sensei_get_the_module_status function.
-     *
-     * @since 1.9.0
-     *
-     * @param $module_status_html
-     * @param $module_term_id
-     * @param $course_id
-     */
-    return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
+	$module_status_html = '<p class="status module-status ' . $status_class . '">'
+							. $module_status
+							. '</p>';
+
+	/**
+	 * Filter the module status.
+	 *
+	 * This fires within the sensei_get_the_module_status function.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $module_status_html
+	 * @param $module_term_id
+	 * @param $course_id
+	 */
+	return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
 
 }
 
@@ -661,7 +661,7 @@ 
  */
 function sensei_the_module_status(){
 
-    echo sensei_get_the_module_status();
+	echo sensei_get_the_module_status();
 
 }
 
@@ -682,21 +682,21 @@ 
  */
 function sensei_quiz_has_questions(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
-        return false;
-    }
+	if( !isset( $sensei_question_loop['total'] ) ){
+		return false;
+	}
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+	if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
 
-        return true;
+		return true;
 
-    }else{
+	}else{
 
-        return false;
+		return false;
 
-    }
+	}
 
 }// end sensei_quiz_has_questions
 
@@ -707,15 +707,14 @@ 
  * execution.
  *
  * @since 1.9.0
-
  */
 function sensei_setup_the_question(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $sensei_question_loop['current']++;
-    $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+	$sensei_question_loop['current']++;
+	$index = $sensei_question_loop['current'];
+	$sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
 
 
 }// end sensei_setup_the_question
@@ -728,12 +727,12 @@ 
  */
 function sensei_the_question_content(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+	// load the template that displays the question information.
+	WooThemes_Sensei_Question::load_question_template( $question_type );
 
 }// end sensei_the_question_content
 
@@ -744,26 +743,26 @@ 
  */
 function sensei_the_question_class(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    /**
-     * filter the sensei question class within
-     * the quiz question loop.
-     *
-     * @since 1.9.0
-     */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+	/**
+	 * filter the sensei question class within
+	 * the quiz question loop.
+	 *
+	 * @since 1.9.0
+	 */
+	 $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
 
-    $html_classes = '';
-    foreach( $classes as $class ){
+	$html_classes = '';
+	foreach( $classes as $class ){
 
-        $html_classes .= $class . ' ';
+		$html_classes .= $class . ' ';
 
-    }// end foreach
+	}// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+	esc_attr_e( trim( $html_classes ) );
 
 }
 
@@ -774,12 +773,12 @@ 
  */
 function sensei_get_the_question_id( ){
 
-    global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+	global $sensei_question_loop;
+	if( isset( $sensei_question_loop['current_question']->ID ) ){
 
-        return $sensei_question_loop['current_question']->ID;
+		return $sensei_question_loop['current_question']->ID;
 
-    }
+	}
 
 }// end sensei_the_question_id
 
@@ -806,63 +805,63 @@ 
  */
 function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
 
-    if( empty( $lesson_id ) ){
+	if( empty( $lesson_id ) ){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( empty( $user_id ) ){
+	if( empty( $user_id ) ){
 
-        $user_id = get_current_user_id();
+		$user_id = get_current_user_id();
 
-    }
+	}
 
-    // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+	// Check for prerequisite lesson completions
+	$pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
+	$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+	$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
 
-    $is_preview = false;
-    if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+	$is_preview = false;
+	if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
 
-        $is_preview = true;
-        $pre_requisite_complete = true;
+		$is_preview = true;
+		$pre_requisite_complete = true;
 
-    };
+	};
 
 
-    $user_can_access_lesson =  false;
+	$user_can_access_lesson =  false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+	if( is_user_logged_in() && $user_taking_course ){
 
-        $user_can_access_lesson =  true;
+		$user_can_access_lesson =  true;
 
-    }
+	}
 
 
-    $access_permission = false;
+	$access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+	if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-        $access_permission = true;
+		$access_permission = true;
 
-    }
+	}
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+	$can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
 
-    /**
-     * Filter the can user view lesson function
-     *
-     * @since 1.9.0
-     *
-     * @hooked Sensei_WC::alter_can_user_view_lesson
-     *
-     * @param bool $can_user_view_lesson
-     * @param string $lesson_id
-     * @param string $user_id
-     */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+	/**
+	 * Filter the can user view lesson function
+	 *
+	 * @since 1.9.0
+	 *
+	 * @hooked Sensei_WC::alter_can_user_view_lesson
+	 *
+	 * @param bool $can_user_view_lesson
+	 * @param string $lesson_id
+	 * @param string $user_id
+	 */
+	return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
 
 } // end sensei_can_current_user_view_lesson
 
@@ -874,49 +873,49 @@ 
  */
 function sensei_the_single_lesson_meta(){
 
-    // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+	// if the lesson meta is included within theme load that instead of the function content
+	$template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
+	if( ! empty( $template ) ){
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
-        return;
+		Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+		return;
 
-    }
-
-    // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+	}
 
-    // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
-    // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
-        ?>
+	// Get the meta info
+	$lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
+	$is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+
+	// Complete Lesson Logic
+	do_action( 'sensei_complete_lesson' );
+	// Check that the course has been started
+	if ( Sensei()->access_settings()
+		|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
+		|| $is_preview ) {
+		?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+			if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+				do_action( 'sensei_lesson_video', get_the_ID() );
 
-            }
-            ?>
+			}
+			?>
             <?php do_action( 'sensei_frontend_messages' ); ?>
 
             <?php if ( ! $is_preview
-                || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+				|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+				sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
 
-            } ?>
+			} ?>
         </section>
 
         <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+	do_action( 'sensei_lesson_meta_extra', get_the_ID() );
 
 } // end the_single_lesson_meta
 
@@ -932,16 +931,16 @@ 
  */
 function get_sensei_header(){
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+	if ( ! defined( 'ABSPATH' ) ) exit;
 
-    get_header();
+	get_header();
 
-    /**
-     * sensei_before_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
-     */
-    do_action( 'sensei_before_main_content' );
+	/**
+	 * sensei_before_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
+	 */
+	do_action( 'sensei_before_main_content' );
 
 }// end get_sensei_header
 
@@ -957,28 +956,28 @@ 
  */
 function get_sensei_footer(){
 
-    /**
-     * sensei_pagination hook
-     *
-     * @hooked sensei_pagination - 10 (outputs pagination)
-     */
-    do_action( 'sensei_pagination' );
-
-    /**
-     * sensei_after_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
-     */
-    do_action( 'sensei_after_main_content' );
-
-    /**
-     * sensei_sidebar hook
-     *
-     * @hooked sensei_get_sidebar - 10
-     */
-    do_action( 'sensei_sidebar' );
-
-    get_footer();
+	/**
+	 * sensei_pagination hook
+	 *
+	 * @hooked sensei_pagination - 10 (outputs pagination)
+	 */
+	do_action( 'sensei_pagination' );
+
+	/**
+	 * sensei_after_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
+	 */
+	do_action( 'sensei_after_main_content' );
+
+	/**
+	 * sensei_sidebar hook
+	 *
+	 * @hooked sensei_get_sidebar - 10
+	 */
+	do_action( 'sensei_sidebar' );
+
+	get_footer();
 
 }// end get_sensei_header
 
@@ -990,14 +989,14 @@ 
  */
 function the_no_permissions_title(){
 
-    /**
-     * Filter the no permissions title just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_title
-     */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+	/**
+	 * Filter the no permissions title just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_title
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
 
 }
 
@@ -1008,14 +1007,14 @@ 
  */
 function the_no_permissions_message( $post_id ){
 
-    /**
-     * Filter the no permissions message just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_message
-     */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+	/**
+	 * Filter the no permissions message just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_message
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
 
 }
 
@@ -1026,8 +1025,8 @@ 
  */
 function sensei_the_excerpt( $post_id ){
 
-    global $post;
-    the_excerpt( $post );
+	global $post;
+	the_excerpt( $post );
 
 }
 
@@ -1041,9 +1040,9 @@ 
  */
  function sensei_get_current_page_url(){
 
-     global $wp;
-     $current_page_url =  home_url( $wp->request );
-     return $current_page_url;
+	 global $wp;
+	 $current_page_url =  home_url( $wp->request );
+	 return $current_page_url;
 
  }
 
@@ -1055,7 +1054,7 @@ 
  */
 function sensei_the_my_courses_content(){
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+	echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
 
 } // sensei_the_my_courses_content
 
@@ -1070,7 +1069,7 @@ 
  */
 function sensei_load_template( $template_name ){
 
-    Sensei_Templates::get_template( $template_name );
+	Sensei_Templates::get_template( $template_name );
 
 }
 
@@ -1084,7 +1083,7 @@ 
  */
 function sensei_load_template_part( $slug, $name ){
 
-    Sensei_Templates::get_part( $slug, $name );
+	Sensei_Templates::get_part( $slug, $name );
 
 }
 
@@ -1103,17 +1102,17 @@ 
  */
 function sensei_the_lesson_excerpt( $lesson_id = '' ) {
 
-    if( empty( $lesson_id )){
+	if( empty( $lesson_id )){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
-        return;
-    }
+	if( 'lesson' != get_post_type( $lesson_id ) ){
+		return;
+	}
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+	echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
 
 }// End lesson_excerpt()
 
@@ -1123,16 +1122,16 @@ 
  * @since 1.9.0
  */
 function sensei_the_course_results_lessons(){
-    // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+	// load backwards compatible template name if it exists in the users theme
+	$located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
+	if( $located_template ){
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
-        return;
+		Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+		return;
 
-    }
+	}
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+	Sensei_Templates::get_template( 'course-results/lessons.php' );
 }
 
 /**
@@ -1144,7 +1143,7 @@ 
  */
 function sensei_courses_per_row(){
 
-    echo Sensei_Course::get_loop_number_of_columns();
+	echo Sensei_Course::get_loop_number_of_columns();
 
 }
 
@@ -1158,7 +1157,7 @@ 
  */
 function sensei_get_template( $template_name, $args, $path ){
 
-    Sensei_Templates::get_template( $template_name, $args, $path );
+	Sensei_Templates::get_template( $template_name, $args, $path );
 
 }
 
@@ -1172,14 +1171,14 @@ 
  */
 function get_the_lesson_status_class(){
 
-    $status_class = '';
-    $lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+	$status_class = '';
+	$lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
 
-    if ( $lesson_completed ) {
-        $status_class = 'completed';
-    }
+	if ( $lesson_completed ) {
+		$status_class = 'completed';
+	}
 
-    return  $status_class;
+	return  $status_class;
 
 }// end get_the_lesson_status_class
 /**
@@ -1191,5 +1190,5 @@ 
  */
 function sensei_the_lesson_status_class(){
 
-    echo get_the_lesson_status_class();
+	echo get_the_lesson_status_class();
 }

includes/class-sensei-lesson.php

Indentation +1071 added lines, -1071 removed lines

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

includes/class-sensei.php

Indentation +1021 added lines, -1021 removed lines

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

includes/class-sensei-course.php

Indentation +1478 added lines, -1478 removed lines

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

includes/class-sensei-grading.php

Indentation +419 added lines, -419 removed lines

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