woothemes / sensei

templates/single-course/modules.php

Indentation +46 added lines, -46 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * List the Course Modules and Lesson in these modules
- *
- * Template is hooked into Single Course sensei_single_main_content. It will
- * only be shown if the course contains modules.
- *
- * All lessons shown here will not be included in the list of other lessons.
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * List the Course Modules and Lesson in these modules
+	 *
+	 * Template is hooked into Single Course sensei_single_main_content. It will
+	 * only be shown if the course contains modules.
+	 *
+	 * All lessons shown here will not be included in the list of other lessons.
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 
-    /**
-     * Hook runs inside single-course/course-modules.php
-     *
-     * It runs before the modules are shown. This hook fires on the single course page. It will show
-     * irrespective of irrespective the course has any modules or not.
-     *
-     * @since 1.8.0
-     *
-     */
-    do_action('sensei_single_course_modules_before');
+	/**
+	 * Hook runs inside single-course/course-modules.php
+	 *
+	 * It runs before the modules are shown. This hook fires on the single course page. It will show
+	 * irrespective of irrespective the course has any modules or not.
+	 *
+	 * @since 1.8.0
+	 *
+	 */
+	do_action('sensei_single_course_modules_before');
 
 ?>
 
@@ -39,19 +39,19 @@ 
 
                 <?php
 
-                /**
-                 * Hook runs inside single-course/course-modules.php
-                 *
-                 * It runs inside the if statement after the article tag opens just before the modules are shown. This hook will NOT fire if there
-                 * are no modules to show.
-                 *
-                 * @since 1.9.0
-                 *
-                 * @hooked Sensei()->modules->course_modules_title - 20
-                 */
-                do_action('sensei_single_course_modules_inside_before');
+				/**
+				 * Hook runs inside single-course/course-modules.php
+				 *
+				 * It runs inside the if statement after the article tag opens just before the modules are shown. This hook will NOT fire if there
+				 * are no modules to show.
+				 *
+				 * @since 1.9.0
+				 *
+				 * @hooked Sensei()->modules->course_modules_title - 20
+				 */
+				do_action('sensei_single_course_modules_inside_before');
 
-                ?>
+				?>
 
                 <header>
 
@@ -101,18 +101,18 @@ 
 
                 <?php
 
-                /**
-                 * Hook runs inside single-course/course-modules.php
-                 *
-                 * It runs inside the if statement before the closing article tag directly after the modules were shown.
-                 * This hook will not trigger if there are no modules to show.
-                 *
-                 * @since 1.9.0
-                 *
-                 */
-                do_action('sensei_single_course_modules_inside_after');
-
-                ?>
+				/**
+				 * Hook runs inside single-course/course-modules.php
+				 *
+				 * It runs inside the if statement before the closing article tag directly after the modules were shown.
+				 * This hook will not trigger if there are no modules to show.
+				 *
+				 * @since 1.9.0
+				 *
+				 */
+				do_action('sensei_single_course_modules_inside_after');
+
+				?>
 
             </article>
 

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * List the Course Modules and Lesson in these modules
  *
@@ -30,10 +30,10 @@ 
 
 ?>
 
-<?php if( sensei_have_modules() ): ?>
+<?php if (sensei_have_modules()): ?>
 
-    <?php while ( sensei_have_modules() ): sensei_setup_module(); ?>
-        <?php if( sensei_module_has_lessons() ): ?>
+    <?php while (sensei_have_modules()): sensei_setup_module(); ?>
+        <?php if (sensei_module_has_lessons()): ?>
 
             <article class="module">
 
@@ -57,7 +57,7 @@ 
 
                     <h2>
 
-                        <a href="<?php sensei_the_module_permalink(); ?>" title="<?php sensei_the_module_title_attribute();?>">
+                        <a href="<?php sensei_the_module_permalink(); ?>" title="<?php sensei_the_module_title_attribute(); ?>">
 
                             <?php sensei_the_module_title(); ?>
 
@@ -81,9 +81,9 @@ 
 
                         <ul class="lessons-list" >
 
-                            <?php while( sensei_module_has_lessons() ): the_post(); ?>
+                            <?php while (sensei_module_has_lessons()): the_post(); ?>
 
-                                <li class="<?php sensei_the_lesson_status_class();?>">
+                                <li class="<?php sensei_the_lesson_status_class(); ?>">
 
                                     <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute() ?>" >
 

includes/class-sensei-admin.php

Doc Comments +3 added lines, -1 removed lines

@@ -192,7 +192,6 @@ 
 	 *
 	 * @access public
 	 * @param mixed $slug
-	 * @param mixed $option
 	 * @param string $page_title (default: '')
 	 * @param string $page_content (default: '')
 	 * @param int $post_parent (default: 0)
@@ -1037,6 +1036,9 @@ 
 		?></div><?php
 	}
 
+	/**
+	 * @return string
+	 */
 	public function get_course_order() {
 		return get_option( 'sensei_course_order', '' );
 	}

Indentation +248 added lines, -248 removed lines

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

Spacing +415 added lines, -415 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Handles all admin views, assets and navigation.
@@ -14,51 +14,51 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
         //register admin styles
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles_global' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_styles_global'));
 
         //register admin scripts
-        add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
+        add_action('admin_enqueue_scripts', array($this, 'register_scripts'));
 
-		add_action( 'admin_print_styles', array( $this, 'admin_notices_styles' ) );
-		add_action( 'settings_before_form', array( $this, 'install_pages_output' ) );
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ) );
-		add_action( 'admin_head', array( $this, 'admin_menu_highlight' ) );
-		add_action( 'admin_init', array( $this, 'page_redirect' ) );
-		add_action( 'admin_init', array( $this, 'sensei_add_custom_menu_items' ) );
-        add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
+		add_action('admin_print_styles', array($this, 'admin_notices_styles'));
+		add_action('settings_before_form', array($this, 'install_pages_output'));
+		add_action('admin_menu', array($this, 'admin_menu'), 10);
+		add_action('menu_order', array($this, 'admin_menu_order'));
+		add_action('admin_head', array($this, 'admin_menu_highlight'));
+		add_action('admin_init', array($this, 'page_redirect'));
+		add_action('admin_init', array($this, 'sensei_add_custom_menu_items'));
+        add_action('admin_init', array(__CLASS__, 'install_pages'));
 
 		// Duplicate lesson & courses
-		add_filter( 'post_row_actions', array( $this, 'duplicate_action_link' ), 10, 2 );
-		add_action( 'admin_action_duplicate_lesson', array( $this, 'duplicate_lesson_action' ) );
-		add_action( 'admin_action_duplicate_course', array( $this, 'duplicate_course_action' ) );
-		add_action( 'admin_action_duplicate_course_with_lessons', array( $this, 'duplicate_course_with_lessons_action' ) );
+		add_filter('post_row_actions', array($this, 'duplicate_action_link'), 10, 2);
+		add_action('admin_action_duplicate_lesson', array($this, 'duplicate_lesson_action'));
+		add_action('admin_action_duplicate_course', array($this, 'duplicate_course_action'));
+		add_action('admin_action_duplicate_course_with_lessons', array($this, 'duplicate_course_with_lessons_action'));
 
 		// Handle lessons list table filtering
-		add_action( 'restrict_manage_posts', array( $this, 'lesson_filter_options' ) );
-		add_filter( 'request', array( $this, 'lesson_filter_actions' ) );
+		add_action('restrict_manage_posts', array($this, 'lesson_filter_options'));
+		add_filter('request', array($this, 'lesson_filter_actions'));
 
 		// Add Sensei items to 'at a glance' widget
-		add_filter( 'dashboard_glance_items', array( $this, 'glance_items' ), 10, 1 );
+		add_filter('dashboard_glance_items', array($this, 'glance_items'), 10, 1);
 
 		// Handle course and lesson deletions
-		add_action( 'trash_course', array( $this, 'delete_content' ), 10, 2 );
-		add_action( 'trash_lesson', array( $this, 'delete_content' ), 10, 2 );
+		add_action('trash_course', array($this, 'delete_content'), 10, 2);
+		add_action('trash_lesson', array($this, 'delete_content'), 10, 2);
 
 		// Delete user activity when user is deleted
-		add_action( 'deleted_user', array( $this, 'delete_user_activity' ), 10, 1 );
+		add_action('deleted_user', array($this, 'delete_user_activity'), 10, 1);
 
 		// Add notices to WP dashboard
-		add_action( 'admin_notices', array( $this, 'theme_compatibility_notices' ) );
+		add_action('admin_notices', array($this, 'theme_compatibility_notices'));
 
 		// Reset theme notices when switching themes
-		add_action( 'switch_theme', array( $this, 'reset_theme_check_notices' ) );
+		add_action('switch_theme', array($this, 'reset_theme_check_notices'));
 
 		// Allow Teacher access the admin area
-		add_filter( 'woocommerce_prevent_admin_access', array( $this, 'admin_access' ) );
+		add_filter('woocommerce_prevent_admin_access', array($this, 'admin_access'));
 
 	} // End __construct()
 
@@ -70,21 +70,21 @@ 
 	public function admin_menu() {
 		global $menu;
 		$menu_cap = '';
-		if( current_user_can( 'manage_sensei' ) ) {
+		if (current_user_can('manage_sensei')) {
 			$menu_cap = 'manage_sensei';
 		} else {
-			if( current_user_can( 'manage_sensei_grades' ) ) {
+			if (current_user_can('manage_sensei_grades')) {
 				$menu_cap = 'manage_sensei_grades';
 			}
 		}
 
-		if( $menu_cap ) {
-			$menu[] = array( '', 'read', 'separator-sensei', '', 'wp-menu-separator sensei' );
-            add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
+		if ($menu_cap) {
+			$menu[] = array('', 'read', 'separator-sensei', '', 'wp-menu-separator sensei');
+            add_menu_page('Sensei', 'Sensei', $menu_cap, 'sensei', array(Sensei()->analysis, 'analysis_page'), '', '50');
 		}
 
-		add_submenu_page( 'edit.php?post_type=course', __( 'Order Courses', 'woothemes-sensei' ), __( 'Order Courses', 'woothemes-sensei' ), 'manage_sensei', 'course-order', array( $this, 'course_order_screen' ) );
-		add_submenu_page( 'edit.php?post_type=lesson', __( 'Order Lessons', 'woothemes-sensei' ), __( 'Order Lessons', 'woothemes-sensei' ), 'edit_lessons', 'lesson-order', array( $this, 'lesson_order_screen' ) );
+		add_submenu_page('edit.php?post_type=course', __('Order Courses', 'woothemes-sensei'), __('Order Courses', 'woothemes-sensei'), 'manage_sensei', 'course-order', array($this, 'course_order_screen'));
+		add_submenu_page('edit.php?post_type=lesson', __('Order Lessons', 'woothemes-sensei'), __('Order Lessons', 'woothemes-sensei'), 'edit_lessons', 'lesson-order', array($this, 'lesson_order_screen'));
 	}
 
 	/**
@@ -93,22 +93,22 @@ 
 	 * @param  array $menu_order Existing menu order
 	 * @return array 			 Modified menu order for Sensei
 	 */
-	public function admin_menu_order( $menu_order ) {
+	public function admin_menu_order($menu_order) {
 
 		// Initialize our custom order array
 		$sensei_menu_order = array();
 
 		// Get the index of our custom separator
-		$sensei_separator = array_search( 'separator-sensei', $menu_order );
+		$sensei_separator = array_search('separator-sensei', $menu_order);
 
 		// Loop through menu order and do some rearranging
-		foreach ( $menu_order as $index => $item ) :
+		foreach ($menu_order as $index => $item) :
 
-			if ( ( ( 'sensei' ) == $item ) ) :
+			if ((('sensei') == $item)) :
 				$sensei_menu_order[] = 'separator-sensei';
 				$sensei_menu_order[] = $item;
-				unset( $menu_order[$sensei_separator] );
-			elseif ( !in_array( $item, array( 'separator-sensei' ) ) ) :
+				unset($menu_order[$sensei_separator]);
+			elseif ( ! in_array($item, array('separator-sensei'))) :
 				$sensei_menu_order[] = $item;
 			endif;
 
@@ -128,24 +128,24 @@ 
 
 		$screen = get_current_screen();
 
-		if ( $screen->base == 'post' && $post_type == 'course' ) {
+		if ($screen->base == 'post' && $post_type == 'course') {
 
-			$parent_file  = 'edit.php?post_type=course';
+			$parent_file = 'edit.php?post_type=course';
 
-		} elseif ( $screen->base == 'edit-tags' && $taxonomy == 'course-category' ) {
+		} elseif ($screen->base == 'edit-tags' && $taxonomy == 'course-category') {
 
 			$submenu_file = 'edit-tags.php?taxonomy=course-category&amp;post_type=course';
 			$parent_file  = 'edit.php?post_type=course';
 
-        } elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
+        } elseif ($screen->base == 'edit-tags' && $taxonomy == 'module') {
 
             $submenu_file = 'edit-tags.php?taxonomy=module';
             $parent_file  = 'edit.php?post_type=course';
 
-		} elseif ( in_array( $screen->id, array( 'sensei_message', 'edit-sensei_message' ) ) ) {
+		} elseif (in_array($screen->id, array('sensei_message', 'edit-sensei_message'))) {
 
             $submenu_file = 'edit.php?post_type=sensei_message';
-			$parent_file  = 'sensei';
+			$parent_file = 'sensei';
 
 		}
 	}
@@ -156,8 +156,8 @@ 
 	 * @return void
 	 */
 	public function page_redirect() {
-		if( isset( $_GET['page'] ) && $_GET['page'] == 'sensei' ) {
-			wp_safe_redirect( 'admin.php?page=sensei_analysis' );
+		if (isset($_GET['page']) && $_GET['page'] == 'sensei') {
+			wp_safe_redirect('admin.php?page=sensei_analysis');
 			exit;
 		}
 	}
@@ -172,11 +172,11 @@ 
 	 */
 	function install_pages_output() {
 
-        if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
+        if (isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
 
             ?>
             <div id="message" class="updated sensei-message sensei-connect">
-                <p><?php _e( '<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei' ); ?></p>
+                <p><?php _e('<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei'); ?></p>
                 <p><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/sensei/" data-text="A premium Learning Management plugin for #WordPress that helps you create courses. Beautifully." data-via="WooThemes" data-size="large" data-hashtags="Sensei">Tweet</a>
                 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
             </div>
@@ -198,11 +198,11 @@ 
 	 * @param int $post_parent (default: 0)
 	 * @return integer $page_id
 	 */
-	function create_page( $slug, $page_title = '', $page_content = '', $post_parent = 0 ) {
+	function create_page($slug, $page_title = '', $page_content = '', $post_parent = 0) {
 		global $wpdb;
 
-        $page_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", $slug ) );
-		if ( $page_id ) :
+        $page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", $slug));
+		if ($page_id) :
 			return $page_id;
 		endif;
 
@@ -217,7 +217,7 @@ 
 	        'comment_status' 	=> 'closed'
 	    );
 
-	    $page_id = wp_insert_post( $page_data );
+	    $page_id = wp_insert_post($page_data);
 
 	    return $page_id;
 
@@ -233,12 +233,12 @@ 
 	function create_pages() {
 
 		// Courses page
-	    $new_course_page_id = $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ),  __('Courses', 'woothemes-sensei'), '' );
-        Sensei()->settings->set( 'course_page', $new_course_page_id );
+	    $new_course_page_id = $this->create_page(esc_sql(_x('courses-overview', 'page_slug', 'woothemes-sensei')), __('Courses', 'woothemes-sensei'), '');
+        Sensei()->settings->set('course_page', $new_course_page_id);
 
         // User Dashboard page
-	    $new_my_course_page_id = $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]' );
-        Sensei()->settings->set( 'my_course_page',$new_my_course_page_id  );
+	    $new_my_course_page_id = $this->create_page(esc_sql(_x('my-courses', 'page_slug', 'woothemes-sensei')), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]');
+        Sensei()->settings->set('my_course_page', $new_my_course_page_id);
 
 	} // End create_pages()
 
@@ -248,25 +248,25 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function admin_styles_global ( $hook ) {
+	public function admin_styles_global($hook) {
 		global $post_type;
 
-		$allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question' ) );
-		$allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) );
-		$allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order' ) );
+		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question'));
+		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php'));
+		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order'));
 
 		// Global Styles for icons and menu items
-		wp_register_style( 'woothemes-sensei-global', Sensei()->plugin_url . 'assets/css/global.css', '', Sensei()->version, 'screen' );
-		wp_enqueue_style( 'woothemes-sensei-global' );
+		wp_register_style('woothemes-sensei-global', Sensei()->plugin_url.'assets/css/global.css', '', Sensei()->version, 'screen');
+		wp_enqueue_style('woothemes-sensei-global');
 
         // Select 2 styles
-        wp_enqueue_style( 'sensei-core-select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
+        wp_enqueue_style('sensei-core-select2', Sensei()->plugin_url.'assets/css/select2/select2.css', '', Sensei()->version, 'screen');
 
 		// Test for Write Panel Pages
-		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
+		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) {
 
-			wp_register_style( 'woothemes-sensei-admin-custom', Sensei()->plugin_url . 'assets/css/admin-custom.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( 'woothemes-sensei-admin-custom' );
+			wp_register_style('woothemes-sensei-admin-custom', Sensei()->plugin_url.'assets/css/admin-custom.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style('woothemes-sensei-admin-custom');
 
 		}
 
@@ -281,20 +281,20 @@ 
      * @since 1.8.2
      * @access public
      */
-    public function register_scripts( $hook ){
+    public function register_scripts($hook) {
 
         $screen = get_current_screen();
 
         // Allow developers to load non-minified versions of scripts
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
         // Select2 script used to enhance all select boxes
-        wp_register_script( 'sensei-core-select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+        wp_register_script('sensei-core-select2', Sensei()->plugin_url.'/assets/js/select2/select2'.$suffix.'.js', array('jquery'), Sensei()->version);
 
         // load edit module scripts
-        if( 'edit-module' ==  $screen->id ){
+        if ('edit-module' == $screen->id) {
 
-            wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
+            wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery.min.js', array('jquery', 'sensei-chosen'), Sensei()->version, true);
 
         }
 
@@ -312,19 +312,19 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
             <p>
-                <?php _e( '<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei'); ?>
             </p>
 
             <p class="submit">
 
-                <a href="<?php echo esc_url( add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings') ) ); ?>"
+                <a href="<?php echo esc_url(add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>"
                    class="button-primary">
 
-                    <?php _e( 'Install Sensei Pages', 'woothemes-sensei' ); ?>
+                    <?php _e('Install Sensei Pages', 'woothemes-sensei'); ?>
 
                 </a>
 
-                <a class="skip button" href="<?php echo esc_url( add_query_arg( 'skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings' ) ) ); ?>">
+                <a class="skip button" href="<?php echo esc_url(add_query_arg('skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>">
 
                     <?php _e('Skip setup', 'woothemes-sensei'); ?>
 
@@ -347,11 +347,11 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
 	    	<p>
-                <?php _e( '<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei'); ?>
             </p>
 
 			<p class="submit">
-                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e( 'Settings', 'woothemes-sensei' ); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
+                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e('Settings', 'woothemes-sensei'); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
                     <?php _e('Documentation', 'woothemes-sensei'); ?>
                 </a>
             </p>
@@ -384,11 +384,11 @@ 
 	public function language_pack_install_notice() {
 		?>
 		<div id="message" class="updated sensei-message sensei-connect">
-				<p><?php _e( '<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei' ); ?><p>
+				<p><?php _e('<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei'); ?><p>
 
 				<p class="submit">
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_install_uri() ); ?>" class="button-primary"><?php _e( 'Install', 'woothemes-sensei' ); ?></a>
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_dismiss_uri() ) ?>" class="docs button"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_install_uri()); ?>" class="button-primary"><?php _e('Install', 'woothemes-sensei'); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_dismiss_uri()) ?>" class="docs button"><?php _e('Hide this notice', 'woothemes-sensei'); ?></a>
 				</p>
 		</div>
 		<?php
@@ -404,20 +404,20 @@ 
 	function admin_notices_styles() {
 
 		// Installed notices
-	    if ( 1 == get_option( 'sensei_installed' ) ) {
+	    if (1 == get_option('sensei_installed')) {
 
-	    	wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
+	    	wp_enqueue_style('sensei-activation', plugins_url('/assets/css/activation.css', dirname(__FILE__)), '', Sensei()->version);
 
-	    	if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
-	    		add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
-	    	} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
-	    		add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
+	    	if (get_option('skip_install_sensei_pages') != 1 && Sensei()->get_page_id('course') < 1 && ! isset($_GET['install_sensei_pages']) && ! isset($_GET['skip_install_sensei_pages'])) {
+	    		add_action('admin_notices', array($this, 'admin_install_notice'));
+	    	} elseif ( ! isset($_GET['page']) || $_GET['page'] != 'woothemes-sensei-settings') {
+	    		add_action('admin_notices', array($this, 'admin_installed_notice'));
 	    	} // End If Statement
 
 	    } // End If Statement
 
-	    if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
-	    	add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
+	    if (Sensei_Language_Pack_Manager::has_language_pack_available()) {
+	    	add_action('admin_notices', array($this, 'language_pack_install_notice'));
 	    }
 
 	} // End admin_notices_styles()
@@ -428,17 +428,17 @@ 
 	 * @param  object $post    Current post
 	 * @return array           Modified actions
 	 */
-	public function duplicate_action_link( $actions, $post ) {
-		switch( $post->post_type ) {
+	public function duplicate_action_link($actions, $post) {
+		switch ($post->post_type) {
 			case 'lesson':
-				$confirm = __( 'This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = "<a onclick='return confirm(\"" . $confirm . "\");' href='" . $this->get_duplicate_link( $post->ID ) . "' title='" . esc_attr(__( 'Duplicate this lesson', 'woothemes-sensei' ) ) . "'>" .  __('Duplicate', 'woothemes-sensei' ) . "</a>";
+				$confirm = __('This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = "<a onclick='return confirm(\"".$confirm."\");' href='".$this->get_duplicate_link($post->ID)."' title='".esc_attr(__('Duplicate this lesson', 'woothemes-sensei'))."'>".__('Duplicate', 'woothemes-sensei')."</a>";
 			break;
 
 			case 'course':
-				$confirm = __( 'This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = '<a href="' . $this->get_duplicate_link( $post->ID ) . '" title="' . esc_attr(__( 'Duplicate this course', 'woothemes-sensei' ) ) . '">' .  __('Duplicate', 'woothemes-sensei' ) . '</a>';
-				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\'' . $confirm . '\');" href="' . $this->get_duplicate_link( $post->ID, true ) . '" title="' . esc_attr(__( 'Duplicate this course with its lessons', 'woothemes-sensei' ) ) . '">' .  __('Duplicate (with lessons)', 'woothemes-sensei' ) . '</a>';
+				$confirm = __('This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = '<a href="'.$this->get_duplicate_link($post->ID).'" title="'.esc_attr(__('Duplicate this course', 'woothemes-sensei')).'">'.__('Duplicate', 'woothemes-sensei').'</a>';
+				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\''.$confirm.'\');" href="'.$this->get_duplicate_link($post->ID, true).'" title="'.esc_attr(__('Duplicate this course with its lessons', 'woothemes-sensei')).'">'.__('Duplicate (with lessons)', 'woothemes-sensei').'</a>';
 			break;
 		}
 
@@ -451,17 +451,17 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return string                Duplication link
 	 */
-	private function get_duplicate_link( $post_id = 0, $with_lessons = false ) {
+	private function get_duplicate_link($post_id = 0, $with_lessons = false) {
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		$action = 'duplicate_' . $post->post_type;
+		$action = 'duplicate_'.$post->post_type;
 
-		if( 'course' == $post->post_type && $with_lessons ) {
+		if ('course' == $post->post_type && $with_lessons) {
 			$action .= '_with_lessons';
 		}
 
-		return apply_filters( $action . '_link', admin_url( 'admin.php?action=' . $action . '&post=' . $post_id ), $post_id );
+		return apply_filters($action.'_link', admin_url('admin.php?action='.$action.'&post='.$post_id), $post_id);
 	}
 
 	/**
@@ -469,7 +469,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_lesson_action() {
-		$this->duplicate_content( 'lesson' );
+		$this->duplicate_content('lesson');
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_action() {
-		$this->duplicate_content( 'course' );
+		$this->duplicate_content('course');
 	}
 
 	/**
@@ -485,7 +485,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_with_lessons_action() {
-		$this->duplicate_content( 'course', true );
+		$this->duplicate_content('course', true);
 	}
 
 	/**
@@ -494,34 +494,34 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return void
 	 */
-	private function duplicate_content( $post_type = 'lesson', $with_lessons = false ) {
-		if ( ! isset( $_GET['post'] ) ) {
-			wp_die( sprintf( __( 'Please supply a %1$s ID.', 'woothemes-sensei' ) ), $post_type );
+	private function duplicate_content($post_type = 'lesson', $with_lessons = false) {
+		if ( ! isset($_GET['post'])) {
+			wp_die(sprintf(__('Please supply a %1$s ID.', 'woothemes-sensei')), $post_type);
 		}
 
 		$post_id = $_GET['post'];
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		if( ! is_wp_error( $post ) ) {
+		if ( ! is_wp_error($post)) {
 
-			$new_post = $this->duplicate_post( $post );
+			$new_post = $this->duplicate_post($post);
 
-			if( $new_post && ! is_wp_error( $new_post ) ) {
+			if ($new_post && ! is_wp_error($new_post)) {
 
-				if( 'lesson' == $new_post->post_type ) {
-					$this->duplicate_lesson_quizzes( $post_id, $new_post->ID );
+				if ('lesson' == $new_post->post_type) {
+					$this->duplicate_lesson_quizzes($post_id, $new_post->ID);
 				}
 
-				if( 'course' == $new_post->post_type && $with_lessons ) {
-					$this->duplicate_course_lessons( $post_id, $new_post->ID );
+				if ('course' == $new_post->post_type && $with_lessons) {
+					$this->duplicate_course_lessons($post_id, $new_post->ID);
 				}
 
-				$redirect_url = admin_url( 'post.php?post=' . $new_post->ID . '&action=edit' );
+				$redirect_url = admin_url('post.php?post='.$new_post->ID.'&action=edit');
 			} else {
-				$redirect_url = admin_url( 'edit.php?post_type=' . $post->post_type . '&message=duplicate_failed' );
+				$redirect_url = admin_url('edit.php?post_type='.$post->post_type.'&message=duplicate_failed');
 			}
 
-			wp_safe_redirect( esc_url_raw( $redirect_url ) );
+			wp_safe_redirect(esc_url_raw($redirect_url));
 			exit;
 		}
 	}
@@ -532,19 +532,19 @@ 
 	 * @param  integer $new_lesson_id ID of duplicate lesson
 	 * @return void
 	 */
-	private function duplicate_lesson_quizzes( $old_lesson_id, $new_lesson_id ) {
+	private function duplicate_lesson_quizzes($old_lesson_id, $new_lesson_id) {
 
-        $old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
-        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
+        $old_quiz_id = Sensei()->lesson->lesson_quizzes($old_lesson_id);
+        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions($old_quiz_id);
 
         // duplicate the generic wp post information
-		$new_quiz = $this->duplicate_post( get_post( $old_quiz_id ), '' );
+		$new_quiz = $this->duplicate_post(get_post($old_quiz_id), '');
 
 		//update the new lesson data
-        add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
+        add_post_meta($new_lesson_id, '_lesson_quiz', $new_quiz->ID);
 
 		//update the new quiz data
-        add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
+        add_post_meta($new_quiz->ID, '_quiz_lesson', $new_lesson_id);
         wp_update_post(
             array(
                 'ID' => $new_quiz->ID,
@@ -552,15 +552,15 @@ 
             )
         );
 
-		foreach( $old_quiz_questions as $question ) {
+		foreach ($old_quiz_questions as $question) {
 
 			// copy the question order over to the new quiz
-			$old_question_order = get_post_meta( $question->ID, '_quiz_question_order'. $old_quiz_id, true );
-            $new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
-            add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
+			$old_question_order = get_post_meta($question->ID, '_quiz_question_order'.$old_quiz_id, true);
+            $new_question_order = str_ireplace($old_quiz_id, $new_quiz->ID, $old_question_order);
+            add_post_meta($question->ID, '_quiz_question_order'.$new_quiz->ID, $new_question_order);
 
 			// Add question to quiz
-			add_post_meta( $question->ID, '_quiz_id', $new_quiz->ID, false );
+			add_post_meta($question->ID, '_quiz_id', $new_quiz->ID, false);
 
 		}
 	}
@@ -571,7 +571,7 @@ 
 	 * @param  integer $new_course_id ID of duplicated course
 	 * @return void
 	 */
-	private function duplicate_course_lessons( $old_course_id, $new_course_id ) {
+	private function duplicate_course_lessons($old_course_id, $new_course_id) {
 		$lesson_args = array(
 			'post_type' => 'lesson',
 			'posts_per_page' => -1,
@@ -579,13 +579,13 @@ 
 			'meta_value' => $old_course_id,
 			'suppress_filters' 	=> 0
 		);
-		$lessons = get_posts( $lesson_args );
+		$lessons = get_posts($lesson_args);
 
-		foreach( $lessons as $lesson ) {
-			$new_lesson = $this->duplicate_post( $lesson, '', true );
-			add_post_meta( $new_lesson->ID, '_lesson_course', $new_course_id );
+		foreach ($lessons as $lesson) {
+			$new_lesson = $this->duplicate_post($lesson, '', true);
+			add_post_meta($new_lesson->ID, '_lesson_course', $new_course_id);
 
-			$this->duplicate_lesson_quizzes( $lesson->ID, $new_lesson->ID );
+			$this->duplicate_lesson_quizzes($lesson->ID, $new_lesson->ID);
 		}
 	}
 
@@ -596,24 +596,24 @@ 
 	 * @param  boolean $ignore_course Ignore lesson course when dulicating
 	 * @return object                 Duplicate post object
 	 */
-	private function duplicate_post( $post, $suffix = ' (Duplicate)', $ignore_course = false ) {
+	private function duplicate_post($post, $suffix = ' (Duplicate)', $ignore_course = false) {
 
 		$new_post = array();
 
-		foreach( $post as $k => $v ) {
-			if( ! in_array( $k, array( 'ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count' ) ) ) {
-				$new_post[ $k ] = $v;
+		foreach ($post as $k => $v) {
+			if ( ! in_array($k, array('ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count'))) {
+				$new_post[$k] = $v;
 			}
 		}
 
-		$new_post['post_title'] .= __( $suffix, 'woothemes-sensei' );
+		$new_post['post_title'] .= __($suffix, 'woothemes-sensei');
 
-		$new_post['post_date'] = current_time( 'mysql' );
-		$new_post['post_date_gmt'] = get_gmt_from_date( $new_post['post_date'] );
+		$new_post['post_date'] = current_time('mysql');
+		$new_post['post_date_gmt'] = get_gmt_from_date($new_post['post_date']);
 		$new_post['post_modified'] = $new_post['post_date'];
 		$new_post['post_modified_gmt'] = $new_post['post_date_gmt'];
 
-		switch( $post->post_type ) {
+		switch ($post->post_type) {
 			case 'course': $new_post['post_status'] = 'draft'; break;
 			case 'lesson': $new_post['post_status'] = 'draft'; break;
 			case 'quiz': $new_post['post_status'] = 'publish'; break;
@@ -621,45 +621,45 @@ 
 		}
 
 		// As per wp_update_post() we need to escape the data from the db.
-		$new_post = wp_slash( $new_post );
+		$new_post = wp_slash($new_post);
 
-		$new_post_id = wp_insert_post( $new_post );
+		$new_post_id = wp_insert_post($new_post);
 
-		if( ! is_wp_error( $new_post_id ) ) {
+		if ( ! is_wp_error($new_post_id)) {
 
-			$post_meta = get_post_custom( $post->ID );
-			if( $post_meta && count( $post_meta ) > 0 ) {
+			$post_meta = get_post_custom($post->ID);
+			if ($post_meta && count($post_meta) > 0) {
 
-				$ignore_meta = array( '_quiz_lesson', '_quiz_id', '_lesson_quiz' );
+				$ignore_meta = array('_quiz_lesson', '_quiz_id', '_lesson_quiz');
 
-				if( $ignore_course ) {
+				if ($ignore_course) {
 					$ignore_meta[] = '_lesson_course';
 				}
 
-				foreach( $post_meta as $key => $meta ) {
-					foreach( $meta as $value ) {
-						$value = maybe_unserialize( $value );
-						if( ! in_array( $key, $ignore_meta ) ) {
-							add_post_meta( $new_post_id, $key, $value );
+				foreach ($post_meta as $key => $meta) {
+					foreach ($meta as $value) {
+						$value = maybe_unserialize($value);
+						if ( ! in_array($key, $ignore_meta)) {
+							add_post_meta($new_post_id, $key, $value);
 						}
 					}
 				}
 			}
 
-			add_post_meta( $new_post_id, '_duplicate', $post->ID );
+			add_post_meta($new_post_id, '_duplicate', $post->ID);
 
-			$taxonomies = get_object_taxonomies( $post->post_type, 'objects' );
+			$taxonomies = get_object_taxonomies($post->post_type, 'objects');
 
-			foreach ( $taxonomies as $slug => $tax ) {
-				$terms = get_the_terms( $post->ID, $slug );
-				if( isset( $terms ) && is_array( $terms ) && 0 < count( $terms ) ) {
-					foreach( $terms as $term ) {
-						wp_set_object_terms( $new_post_id, $term->term_id, $slug, true );
+			foreach ($taxonomies as $slug => $tax) {
+				$terms = get_the_terms($post->ID, $slug);
+				if (isset($terms) && is_array($terms) && 0 < count($terms)) {
+					foreach ($terms as $term) {
+						wp_set_object_terms($new_post_id, $term->term_id, $slug, true);
 					}
 				}
 			}
 
-			$new_post = get_post( $new_post_id );
+			$new_post = get_post($new_post_id);
 
 			return $new_post;
 		}
@@ -674,7 +674,7 @@ 
 	public function lesson_filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
+		if (is_admin() && 'lesson' == $typenow) {
 
 			$args = array(
 				'post_type' => 'course',
@@ -684,16 +684,16 @@ 
 				'orderby' => 'menu_order date',
 				'order' => 'ASC',
 			);
-			$courses = get_posts( $args );
+			$courses = get_posts($args);
 
-			$selected = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+			$selected = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 			$course_options = '';
-			foreach( $courses as $course ) {
-				$course_options .= '<option value="' . esc_attr( $course->ID ) . '" ' . selected( $selected, $course->ID, false ) . '>' . get_the_title( $course->ID ) . '</option>';
+			foreach ($courses as $course) {
+				$course_options .= '<option value="'.esc_attr($course->ID).'" '.selected($selected, $course->ID, false).'>'.get_the_title($course->ID).'</option>';
 			}
 
 			$output = '<select name="lesson_course" id="dropdown_lesson_course">';
-			$output .= '<option value="">'.__( 'Show all courses', 'woothemes-sensei' ).'</option>';
+			$output .= '<option value="">'.__('Show all courses', 'woothemes-sensei').'</option>';
 			$output .= $course_options;
 			$output .= '</select>';
 
@@ -706,13 +706,13 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function lesson_filter_actions( $request ) {
+	public function lesson_filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
-			$lesson_course = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+		if (is_admin() && 'lesson' == $typenow) {
+			$lesson_course = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 
-			if( $lesson_course ) {
+			if ($lesson_course) {
 				$request['meta_key'] = '_lesson_course';
 				$request['meta_value'] = $lesson_course;
 				$request['meta_compare'] = '=';
@@ -727,27 +727,27 @@ 
 	 * @param  array $items Existing items
 	 * @return array        Updated items
 	 */
-	public function glance_items( $items = array() ) {
+	public function glance_items($items = array()) {
 
-		$types = array( 'course', 'lesson', 'question' );
+		$types = array('course', 'lesson', 'question');
 
-		foreach( $types as $type ) {
-			if( ! post_type_exists( $type ) ) continue;
+		foreach ($types as $type) {
+			if ( ! post_type_exists($type)) continue;
 
-			$num_posts = wp_count_posts( $type );
+			$num_posts = wp_count_posts($type);
 
-			if( $num_posts ) {
+			if ($num_posts) {
 
-				$published = intval( $num_posts->publish );
-				$post_type = get_post_type_object( $type );
+				$published = intval($num_posts->publish);
+				$post_type = get_post_type_object($type);
 
-				$text = _n( '%s ' . $post_type->labels->singular_name, '%s ' . $post_type->labels->name, $published, 'woothemes-sensei' );
-				$text = sprintf( $text, number_format_i18n( $published ) );
+				$text = _n('%s '.$post_type->labels->singular_name, '%s '.$post_type->labels->name, $published, 'woothemes-sensei');
+				$text = sprintf($text, number_format_i18n($published));
 
-				if ( current_user_can( $post_type->cap->edit_posts ) ) {
-					$items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text ) . "\n";
+				if (current_user_can($post_type->cap->edit_posts)) {
+					$items[] = sprintf('<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text)."\n";
 				} else {
-					$items[] = sprintf( '<span class="%1$s-count">%2$s</span>', $type, $text ) . "\n";
+					$items[] = sprintf('<span class="%1$s-count">%2$s</span>', $type, $text)."\n";
 				}
 			}
 		}
@@ -761,13 +761,13 @@ 
 	 * @param  object  $post    Post object
 	 * @return void
 	 */
-	public function delete_content( $post_id, $post ) {
+	public function delete_content($post_id, $post) {
 
 		$type = $post->post_type;
 
-		if( in_array( $type, array( 'lesson', 'course' ) ) ) {
+		if (in_array($type, array('lesson', 'course'))) {
 
-			$meta_key = '_' . $type . '_prerequisite';
+			$meta_key = '_'.$type.'_prerequisite';
 
 			$args = array(
 				'post_type' => $type,
@@ -777,10 +777,10 @@ 
 				'meta_value' => $post_id
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			foreach( $posts as $post ) {
-				delete_post_meta( $post->ID, $meta_key );
+			foreach ($posts as $post) {
+				delete_post_meta($post->ID, $meta_key);
 			}
 		}
 	}
@@ -790,181 +790,181 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function delete_user_activity( $user_id = 0 ) {
-		if( $user_id ) {
-			Sensei_Utils::delete_all_user_activity( $user_id );
+	public function delete_user_activity($user_id = 0) {
+		if ($user_id) {
+			Sensei_Utils::delete_all_user_activity($user_id);
 		}
 	}
 
-	public function render_settings( $settings = array(), $post_id = 0, $group_id = '' ) {
+	public function render_settings($settings = array(), $post_id = 0, $group_id = '') {
 
 		$html = '';
 
-		if( 0 == count( $settings ) ) return $html;
+		if (0 == count($settings)) return $html;
 
-		$html .= '<div class="sensei-options-panel">' . "\n";
+		$html .= '<div class="sensei-options-panel">'."\n";
 
-			$html .= '<div class="options_group" id="' . esc_attr( $group_id ) . '">' . "\n";
+			$html .= '<div class="options_group" id="'.esc_attr($group_id).'">'."\n";
 
-				foreach( $settings as $field ) {
+				foreach ($settings as $field) {
 
 					$data = '';
 
-					if( $post_id ) {
-						$data = get_post_meta( $post_id, '_' . $field['id'], true );
-						if( ! $data && isset( $field['default'] ) ) {
+					if ($post_id) {
+						$data = get_post_meta($post_id, '_'.$field['id'], true);
+						if ( ! $data && isset($field['default'])) {
 							$data = $field['default'];
 						}
 					} else {
-						$option = get_option( $field['id'] );
-						if( isset( $field['default'] ) ) {
+						$option = get_option($field['id']);
+						if (isset($field['default'])) {
 							$data = $field['default'];
-							if( $option ) {
+							if ($option) {
 								$data = $option;
 							}
 						}
 					}
 
 					$disabled = '';
-					if( isset( $field['disabled'] ) && $field['disabled'] ) {
-						$disabled = disabled( $field['disabled'], true, false );
+					if (isset($field['disabled']) && $field['disabled']) {
+						$disabled = disabled($field['disabled'], true, false);
 					}
 
-					if( 'hidden' != $field['type'] ) {
+					if ('hidden' != $field['type']) {
 
 						$class_tail = '';
 
-						if( isset( $field['class'] ) ) {
+						if (isset($field['class'])) {
 							$class_tail .= $field['class'];
 						}
 
-						if( isset( $field['disabled'] ) && $field['disabled'] ) {
+						if (isset($field['disabled']) && $field['disabled']) {
 							$class_tail .= ' disabled';
 						}
 
-						$html .= '<p class="form-field ' . esc_attr( $field['id'] ) . ' ' . esc_attr( $class_tail ) . '">' . "\n";
+						$html .= '<p class="form-field '.esc_attr($field['id']).' '.esc_attr($class_tail).'">'."\n";
 					}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '<label for="' . esc_attr( $field['id'] ) . '">' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '<label for="'.esc_attr($field['id']).'">'."\n";
 						}
 
-							if( $field['label'] ) {
-								$html .= '<span class="label">' . esc_html( $field['label'] ) . '</span>';
+							if ($field['label']) {
+								$html .= '<span class="label">'.esc_html($field['label']).'</span>';
 							}
 
-							switch( $field['type'] ) {
+							switch ($field['type']) {
 								case 'text':
 								case 'password':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$disabled.' />'."\n";
 								break;
 
 								case 'number':
 
 									$min = '';
-									if( isset( $field['min'] ) ) {
-										$min = 'min="' . esc_attr( $field['min'] ) . '"';
+									if (isset($field['min'])) {
+										$min = 'min="'.esc_attr($field['min']).'"';
 									}
 
 									$max = '';
-									if( isset( $field['max'] ) ) {
-										$max = 'max="' . esc_attr( $field['max'] ) . '"';
+									if (isset($field['max'])) {
+										$max = 'max="'.esc_attr($field['max']).'"';
 									}
 
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $min . '  ' . $max . ' class="small-text" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$min.'  '.$max.' class="small-text" '.$disabled.' />'."\n";
 								break;
 
 								case 'textarea':
-									$html .= '<textarea id="' . esc_attr( $field['id'] ) . '" rows="5" cols="50" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" ' . $disabled . '>' . $data . '</textarea><br/>'. "\n";
+									$html .= '<textarea id="'.esc_attr($field['id']).'" rows="5" cols="50" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" '.$disabled.'>'.$data.'</textarea><br/>'."\n";
 								break;
 
 								case 'checkbox':
                                     //backwards compatibility
-                                    if( empty( $data ) || 'on' == $data ){
+                                    if (empty($data) || 'on' == $data) {
                                         $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+                                    }elseif ('yes' == $data) {
 
                                         $checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+                                    }elseif ('auto' == $data) {
 
                                         $checked_value = 'auto';
 
                                     } else {
                                         $checked_value = 1;
-                                        $data = intval( $data );
+                                        $data = intval($data);
                                     }
-									$checked = checked( $checked_value, $data, false );
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" ' . $checked . ' ' . $disabled . '/>' . "\n";
+									$checked = checked($checked_value, $data, false);
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" '.$checked.' '.$disabled.'/>'."\n";
 								break;
 
 								case 'checkbox_multi':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="checkbox" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '[]" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="checkbox" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'[]" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'radio':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="radio" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="radio" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'select':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'" id="'.esc_attr($field['id']).'" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '">' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'">'.$v.'</option>'."\n";
 									}
-									$html .= '</select><br/>' . "\n";
+									$html .= '</select><br/>'."\n";
 								break;
 
 								case 'select_multi':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '[]" id="' . esc_attr( $field['id'] ) . '" multiple="multiple" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'[]" id="'.esc_attr($field['id']).'" multiple="multiple" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '" />' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'" />'.$v.'</option>'."\n";
 									}
 									$html .= '</select> . "\n"';
 								break;
 
 								case 'hidden':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" value="' . $data . '" ' . $disabled . '/>' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" value="'.$data.'" '.$disabled.'/>'."\n";
 								break;
 
 							}
 
-							if( $field['description'] ) {
-								$html .= ' <span class="description">' . esc_html( $field['description'] ) . '</span>' . "\n";
+							if ($field['description']) {
+								$html .= ' <span class="description">'.esc_html($field['description']).'</span>'."\n";
 							}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '</label>' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '</label>'."\n";
 						}
 
-					if( 'hidden' != $field['type'] ) {
-						$html .= '</p>' . "\n";
+					if ('hidden' != $field['type']) {
+						$html .= '</p>'."\n";
 					}
 
 				}
 
-			$html .= '</div>' . "\n";
+			$html .= '</div>'."\n";
 
-		$html .= '</div>' . "\n";
+		$html .= '</div>'."\n";
 
 		return $html;
 	}
@@ -975,61 +975,61 @@ 
 	 */
 	public function course_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="course-order" class="wrap course-order">
-		<h2><?php _e( 'Order Courses', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Courses', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['course-order'] ) && 0 < strlen( $_POST['course-order'] ) ) {
-			$ordered = $this->save_course_order( esc_attr( $_POST['course-order'] ) );
+		if (isset($_POST['course-order']) && 0 < strlen($_POST['course-order'])) {
+			$ordered = $this->save_course_order(esc_attr($_POST['course-order']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The course order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The course order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
 		$courses = Sensei()->course->get_all_courses();
 
-		if( 0 < count( $courses ) ) {
+		if (0 < count($courses)) {
 
             // order the courses as set by the users
             $all_course_ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
 
-                $all_course_ids[] = (string)$course->ID;
+                $all_course_ids[] = (string) $course->ID;
 
             }
             $order_string = $this->get_course_order();
 
-            if( !empty( $order_string ) ){
-                $ordered_course_ids = explode(',' , $order_string );
-                $all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
+            if ( ! empty($order_string)) {
+                $ordered_course_ids = explode(',', $order_string);
+                $all_course_ids = array_unique(array_merge($ordered_course_ids, $all_course_ids));
             }
 
 
-			$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-			$html .= '<ul class="sortable-course-list">' . "\n";
+			$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+			$html .= '<ul class="sortable-course-list">'."\n";
 			$count = 0;
-			foreach ( $all_course_ids as $course_id ) {
-                $course = get_post( $course_id );
+			foreach ($all_course_ids as $course_id) {
+                $course = get_post($course_id);
 				$count++;
 				$class = 'course';
-				if ( $count == 1 ) { $class .= ' first'; }
-				if ( $count == count( $course ) ) { $class .= ' last'; }
-				if ( $count % 2 != 0 ) {
+				if ($count == 1) { $class .= ' first'; }
+				if ($count == count($course)) { $class .= ' last'; }
+				if ($count % 2 != 0) {
 					$class .= ' alternate';
 				}
-				$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $course->ID ) . '" style="width: 100%;"> ' . $course->post_title . '</span></li>' . "\n";
+				$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($course->ID).'" style="width: 100%;"> '.$course->post_title.'</span></li>'."\n";
 			}
-			$html .= '</ul>' . "\n";
+			$html .= '</ul>'."\n";
 
-			$html .= '<input type="hidden" name="course-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-			$html .= '<input type="submit" class="button-primary" value="' . __( 'Save course order', 'woothemes-sensei' ) . '" />' . "\n";
+			$html .= '<input type="hidden" name="course-order" value="'.esc_attr($order_string).'" />'."\n";
+			$html .= '<input type="submit" class="button-primary" value="'.__('Save course order', 'woothemes-sensei').'" />'."\n";
 		}
 
 		echo $html;
@@ -1038,25 +1038,25 @@ 
 	}
 
 	public function get_course_order() {
-		return get_option( 'sensei_course_order', '' );
+		return get_option('sensei_course_order', '');
 	}
 
-	public function save_course_order( $order_string = '' ) {
-		$order = explode( ',', $order_string );
+	public function save_course_order($order_string = '') {
+		$order = explode(',', $order_string);
 
-		update_option( 'sensei_course_order', $order_string );
+		update_option('sensei_course_order', $order_string);
 
 		$i = 1;
-		foreach( $order as $course_id ) {
+		foreach ($order as $course_id) {
 
-			if( $course_id ) {
+			if ($course_id) {
 
 				$update_args = array(
 					'ID' => $course_id,
 					'menu_order' => $i,
 				);
 
-				wp_update_post( $update_args );
+				wp_update_post($update_args);
 
 				++$i;
 			}
@@ -1071,22 +1071,22 @@ 
 	 */
 	public function lesson_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="lesson-order" class="wrap lesson-order">
-		<h2><?php _e( 'Order Lessons', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Lessons', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['lesson-order'] ) ) {
+		if (isset($_POST['lesson-order'])) {
 
-			$ordered = $this->save_lesson_order( esc_attr( $_POST['lesson-order'] ), esc_attr( $_POST['course_id'] ) );
+			$ordered = $this->save_lesson_order(esc_attr($_POST['lesson-order']), esc_attr($_POST['course_id']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The lesson order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The lesson order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
@@ -1097,43 +1097,43 @@ 
 			'orderby' => 'name',
 			'order' => 'ASC',
 		);
-		$courses = get_posts( $args );
+		$courses = get_posts($args);
 
-		$html .= '<form action="' . admin_url( 'edit.php' ) . '" method="get">' . "\n";
-		$html .= '<input type="hidden" name="post_type" value="lesson" />' . "\n";
-		$html .= '<input type="hidden" name="page" value="lesson-order" />' . "\n";
-		$html .= '<select id="lesson-order-course" name="course_id">' . "\n";
-		$html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>' . "\n";
+		$html .= '<form action="'.admin_url('edit.php').'" method="get">'."\n";
+		$html .= '<input type="hidden" name="post_type" value="lesson" />'."\n";
+		$html .= '<input type="hidden" name="page" value="lesson-order" />'."\n";
+		$html .= '<select id="lesson-order-course" name="course_id">'."\n";
+		$html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'."\n";
 
-		foreach( $courses as $course ) {
+		foreach ($courses as $course) {
 			$course_id = '';
-			if( isset( $_GET['course_id'] ) ) {
-				$course_id = intval( $_GET['course_id'] );
+			if (isset($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
 			}
-			$html .= '<option value="' . esc_attr( intval( $course->ID ) ) . '" ' . selected( $course->ID, $course_id, false ) .'>' . get_the_title( $course->ID ) . '</option>' . "\n";
+			$html .= '<option value="'.esc_attr(intval($course->ID)).'" '.selected($course->ID, $course_id, false).'>'.get_the_title($course->ID).'</option>'."\n";
 		}
 
-		$html .= '</select>' . "\n";
-		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="' . __( 'Select', 'woothemes-sensei' ) . '" />' . "\n";
-		$html .= '</form>' . "\n";
+		$html .= '</select>'."\n";
+		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="'.__('Select', 'woothemes-sensei').'" />'."\n";
+		$html .= '</form>'."\n";
 
-		$html .= '<script type="text/javascript">' . "\n";
-		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});' . "\n";
-		$html .= '</script>' . "\n";
+		$html .= '<script type="text/javascript">'."\n";
+		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});'."\n";
+		$html .= '</script>'."\n";
 
-		if( isset( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
-			if( $course_id > 0 ) {
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
+			if ($course_id > 0) {
 
-				$order_string = $this->get_lesson_order( $course_id );
+				$order_string = $this->get_lesson_order($course_id);
 
-				$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
+				$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
 
 				$displayed_lessons = array();
 
-                $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+                $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-                foreach( $modules as $module ) {
+                foreach ($modules as $module) {
 
                     $args = array(
                         'post_type' => 'lesson',
@@ -1142,7 +1142,7 @@ 
                         'meta_query' => array(
                             array(
                                 'key' => '_lesson_course',
-                                'value' => intval( $course_id ),
+                                'value' => intval($course_id),
                                 'compare' => '='
                             )
                         ),
@@ -1150,66 +1150,66 @@ 
                             array(
                                 'taxonomy' => Sensei()->modules->taxonomy,
                                 'field' => 'id',
-                                'terms' => intval( $module->term_id )
+                                'terms' => intval($module->term_id)
                             )
                         ),
-                        'meta_key' => '_order_module_' . $module->term_id,
+                        'meta_key' => '_order_module_'.$module->term_id,
                         'orderby' => 'meta_value_num date',
                         'order' => 'ASC',
                         'suppress_filters' => 0
                     );
 
-                    $lessons = get_posts( $args );
+                    $lessons = get_posts($args);
 
-                    if( count( $lessons ) > 0 ) {
-                        $html .= '<h3>' . $module->name . '</h3>' . "\n";
-                        $html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
+                    if (count($lessons) > 0) {
+                        $html .= '<h3>'.$module->name.'</h3>'."\n";
+                        $html .= '<ul class="sortable-lesson-list" data-module_id="'.$module->term_id.'">'."\n";
 
                         $count = 0;
-                        foreach( $lessons as $lesson ) {
+                        foreach ($lessons as $lesson) {
                             $count++;
                             $class = 'lesson';
-                            if ( $count == 1 ) { $class .= ' first'; }
-                            if ( $count == count( $lesson ) ) { $class .= ' last'; }
-                            if ( $count % 2 != 0 ) {
+                            if ($count == 1) { $class .= ' first'; }
+                            if ($count == count($lesson)) { $class .= ' last'; }
+                            if ($count % 2 != 0) {
                                 $class .= ' alternate';
                             }
 
-                            $html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+                            $html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
                             $displayed_lessons[] = $lesson->ID;
                         }
 
-                        $html .= '</ul>' . "\n";
+                        $html .= '</ul>'."\n";
 
-                        $html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
+                        $html .= '<input type="hidden" name="lesson-order-module-'.$module->term_id.'" value="" />'."\n";
                     }
                 }
 
 
-                $lessons = Sensei()->course->course_lessons( $course_id );
+                $lessons = Sensei()->course->course_lessons($course_id);
 
-				if( 0 < count( $lessons ) ) {
+				if (0 < count($lessons)) {
 
                     //get module term ids, will be used to exclude lessons
                     $module_items_ids = array();
-                    if( ! empty( $modules ) ) {
+                    if ( ! empty($modules)) {
                         foreach ($modules as $module) {
                             $module_items_ids[] = $module->term_id;
                         }
                     }
 
-					if( 0 < count( $displayed_lessons ) ) {
-						$html .= '<h3>' . __( 'Other Lessons', 'woothemes-sensei' ) . '</h3>' . "\n";
+					if (0 < count($displayed_lessons)) {
+						$html .= '<h3>'.__('Other Lessons', 'woothemes-sensei').'</h3>'."\n";
 					}
 
-					$html .= '<ul class="sortable-lesson-list" data-module_id="0">' . "\n";
+					$html .= '<ul class="sortable-lesson-list" data-module_id="0">'."\n";
 					$count = 0;
-					foreach ( $lessons as $lesson ) {
+					foreach ($lessons as $lesson) {
 
                         // if lesson belongs to one fo the course modules then exclude it here
                         // as it is listed above
-                        if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
+                        if (has_term($module_items_ids, 'module', $lesson->ID)) {
 
                             continue;
 
@@ -1217,28 +1217,28 @@ 
 
 						$count++;
 						$class = 'lesson';
-						if ( $count == 1 ) { $class .= ' first'; }
-						if ( $count == count( $lesson ) ) { $class .= ' last'; }
-						if ( $count % 2 != 0 ) {
+						if ($count == 1) { $class .= ' first'; }
+						if ($count == count($lesson)) { $class .= ' last'; }
+						if ($count % 2 != 0) {
 
 							$class .= ' alternate';
 
 						}
-						$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+						$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
 						$displayed_lessons[] = $lesson->ID;
 					}
-					$html .= '</ul>' . "\n";
+					$html .= '</ul>'."\n";
 				} else {
-					if( 0 == count( $displayed_lessons ) ) {
-						$html .= '<p><em>' . __( 'There are no lessons in this course.', 'woothemes-sensei' ) . '</em></p>';
+					if (0 == count($displayed_lessons)) {
+						$html .= '<p><em>'.__('There are no lessons in this course.', 'woothemes-sensei').'</em></p>';
 					}
 				}
 
-				if( 0 < count( $displayed_lessons ) ) {
-					$html .= '<input type="hidden" name="lesson-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-					$html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-					$html .= '<input type="submit" class="button-primary" value="' . __( 'Save lesson order', 'woothemes-sensei' ) . '" />' . "\n";
+				if (0 < count($displayed_lessons)) {
+					$html .= '<input type="hidden" name="lesson-order" value="'.esc_attr($order_string).'" />'."\n";
+					$html .= '<input type="hidden" name="course_id" value="'.$course_id.'" />'."\n";
+					$html .= '<input type="submit" class="button-primary" value="'.__('Save lesson order', 'woothemes-sensei').'" />'."\n";
 				}
 			}
 		}
@@ -1248,29 +1248,29 @@ 
 		?></div><?php
 	}
 
-	public function get_lesson_order( $course_id = 0 ) {
-		$order_string = get_post_meta( $course_id, '_lesson_order', true );
+	public function get_lesson_order($course_id = 0) {
+		$order_string = get_post_meta($course_id, '_lesson_order', true);
 		return $order_string;
 	}
 
-	public function save_lesson_order( $order_string = '', $course_id = 0 ) {
+	public function save_lesson_order($order_string = '', $course_id = 0) {
 
-		if( $course_id ) {
+		if ($course_id) {
 
-            $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-            foreach( $modules as $module ) {
+            foreach ($modules as $module) {
 
 
-                if( isset( $_POST[ 'lesson-order-module-' . $module->term_id ] )
-                    && $_POST[ 'lesson-order-module-' . $module->term_id ] ) {
+                if (isset($_POST['lesson-order-module-'.$module->term_id])
+                    && $_POST['lesson-order-module-'.$module->term_id]) {
 
-                    $order = explode( ',', $_POST[ 'lesson-order-module-' . $module->term_id ] );
+                    $order = explode(',', $_POST['lesson-order-module-'.$module->term_id]);
                     $i = 1;
-                    foreach( $order as $lesson_id ) {
+                    foreach ($order as $lesson_id) {
 
-                        if( $lesson_id ) {
-                            update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
+                        if ($lesson_id) {
+                            update_post_meta($lesson_id, '_order_module_'.$module->term_id, $i);
                             ++$i;
                         }
 
@@ -1281,15 +1281,15 @@ 
             } // end for each modules
 
 
-			if( $order_string ) {
-				update_post_meta( $course_id, '_lesson_order', $order_string );
+			if ($order_string) {
+				update_post_meta($course_id, '_lesson_order', $order_string);
 
-				$order = explode( ',', $order_string );
+				$order = explode(',', $order_string);
 
 				$i = 1;
-				foreach( $order as $lesson_id ) {
-					if( $lesson_id ) {
-						update_post_meta( $lesson_id, '_order_' . $course_id, $i );
+				foreach ($order as $lesson_id) {
+					if ($lesson_id) {
+						update_post_meta($lesson_id, '_order_'.$course_id, $i);
 						++$i;
 					}
 				}
@@ -1304,54 +1304,54 @@ 
 	function sensei_add_custom_menu_items() {
 		global $pagenow;
 
-		if( 'nav-menus.php' == $pagenow ) {
-			add_meta_box( 'add-sensei-links', 'Sensei', array( $this, 'wp_nav_menu_item_sensei_links_meta_box' ), 'nav-menus', 'side', 'low' );
+		if ('nav-menus.php' == $pagenow) {
+			add_meta_box('add-sensei-links', 'Sensei', array($this, 'wp_nav_menu_item_sensei_links_meta_box'), 'nav-menus', 'side', 'low');
 		}
 	}
 
-	function wp_nav_menu_item_sensei_links_meta_box( $object ) {
+	function wp_nav_menu_item_sensei_links_meta_box($object) {
 		global $nav_menu_selected_id;
 
 		$menu_items = array(
-			'#senseicourses' => __( 'Courses', 'woothemes-sensei' ),
-			'#senseilessons' => __( 'Lessons', 'woothemes-sensei' ),
-			'#senseimycourses' => __( 'My Courses', 'woothemes-sensei' ),
-			'#senseilearnerprofile' => __( 'My Profile', 'woothemes-sensei' ),
-			'#senseimymessages' => __( 'My Messages', 'woothemes-sensei' ),
-			'#senseiloginlogout' => __( 'Login', 'woothemes-sensei' ) . '|' . __( 'Logout', 'woothemes-sensei' )
+			'#senseicourses' => __('Courses', 'woothemes-sensei'),
+			'#senseilessons' => __('Lessons', 'woothemes-sensei'),
+			'#senseimycourses' => __('My Courses', 'woothemes-sensei'),
+			'#senseilearnerprofile' => __('My Profile', 'woothemes-sensei'),
+			'#senseimymessages' => __('My Messages', 'woothemes-sensei'),
+			'#senseiloginlogout' => __('Login', 'woothemes-sensei').'|'.__('Logout', 'woothemes-sensei')
 		);
 
 		$menu_items_obj = array();
-		foreach ( $menu_items as $value => $title ) {
+		foreach ($menu_items as $value => $title) {
 			$menu_items_obj[$title] = new stdClass;
-			$menu_items_obj[$title]->object_id			= esc_attr( $value );
-			$menu_items_obj[$title]->title				= esc_attr( $title );
-			$menu_items_obj[$title]->url				= esc_attr( $value );
-			$menu_items_obj[$title]->description 		= 'description';
+			$menu_items_obj[$title]->object_id = esc_attr($value);
+			$menu_items_obj[$title]->title = esc_attr($title);
+			$menu_items_obj[$title]->url = esc_attr($value);
+			$menu_items_obj[$title]->description = 'description';
 			$menu_items_obj[$title]->db_id 				= 0;
 			$menu_items_obj[$title]->object 			= 'sensei';
-			$menu_items_obj[$title]->menu_item_parent 	= 0;
-			$menu_items_obj[$title]->type 				= 'custom';
+			$menu_items_obj[$title]->menu_item_parent = 0;
+			$menu_items_obj[$title]->type = 'custom';
 			$menu_items_obj[$title]->target 			= '';
-			$menu_items_obj[$title]->attr_title 		= '';
-			$menu_items_obj[$title]->classes 			= array();
-			$menu_items_obj[$title]->xfn 				= '';
+			$menu_items_obj[$title]->attr_title = '';
+			$menu_items_obj[$title]->classes = array();
+			$menu_items_obj[$title]->xfn = '';
 		}
 
-		$walker = new Walker_Nav_Menu_Checklist( array() );
+		$walker = new Walker_Nav_Menu_Checklist(array());
 		?>
 
 		<div id="sensei-links" class="senseidiv taxonomydiv">
 			<div id="tabs-panel-sensei-links-all" class="tabs-panel tabs-panel-view-all tabs-panel-active">
 
 				<ul id="sensei-linkschecklist" class="list:sensei-links categorychecklist form-no-clear">
-					<?php echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items_obj ), 0, (object)array( 'walker' => $walker ) ); ?>
+					<?php echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items_obj), 0, (object) array('walker' => $walker)); ?>
 				</ul>
 
 			</div>
 			<p class="button-controls">
 				<span class="add-to-menu">
-					<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu', 'woothemes-sensei' ); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
+					<input type="submit"<?php disabled($nav_menu_selected_id, 0); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu', 'woothemes-sensei'); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -1367,17 +1367,17 @@ 
 	 */
 	public function theme_compatibility_notices() {
 
-        if( isset( $_GET['sensei_hide_notice'] ) ) {
-        	switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
-				case 'menu_settings': add_user_meta( get_current_user_id(), 'sensei_hide_menu_settings_notice', true ); break;
-				case 'theme_check': add_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true ); break;
+        if (isset($_GET['sensei_hide_notice'])) {
+        	switch (esc_attr($_GET['sensei_hide_notice'])) {
+				case 'menu_settings': add_user_meta(get_current_user_id(), 'sensei_hide_menu_settings_notice', true); break;
+				case 'theme_check': add_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true); break;
 			}
         }
 
         // white list templates that are already support by default and do not show notice for them
-        $template = get_option( 'template' );
+        $template = get_option('template');
 
-        $white_list = array(    'twentyeleven',
+        $white_list = array('twentyeleven',
                                 'twentytwelve',
                                 'twentyfourteen',
                                 'twentyfifteen',
@@ -1385,43 +1385,43 @@ 
                                 'storefront',
                                                 );
 
-        if ( in_array( $template, $white_list ) ) {
+        if (in_array($template, $white_list)) {
 
             return;
 
         }
 
         // don't show the notice if the user chose to hide it
-        $hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
-        if(  $hide_theme_check_notice ) {
+        $hide_theme_check_notice = get_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true);
+        if ($hide_theme_check_notice) {
 
             return;
 
         }
 
         // show the notice for themes not supporting sensei
-	    if ( ! current_theme_supports( 'sensei' ) ) {
+	    if ( ! current_theme_supports('sensei')) {
             ?>
 
             <div id="message" class="error sensei-message sensei-connect">
                     <p>
                         <strong>
 
-                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei' ); ?>
+                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei'); ?>
 
                         </strong> &#8211;
 
-                        <?php _e( 'if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei' ); ?>
+                        <?php _e('if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei'); ?>
 
-                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e( 'Sensei theme', 'woothemes-sensei' ) ?> </a>
+                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e('Sensei theme', 'woothemes-sensei') ?> </a>
 
                         :)
 
                     </p>
                     <p class="submit">
-                        <a href="<?php echo esc_url( apply_filters( 'sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility' ) ); ?>" class="button-primary">
+                        <a href="<?php echo esc_url(apply_filters('sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility')); ?>" class="button-primary">
 
-                            <?php _e( 'Theme Integration Guide', 'woothemes-sensei' ); ?></a> <a class="skip button" href="<?php echo esc_url( add_query_arg( 'sensei_hide_notice', 'theme_check' ) ); ?>"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?>
+                            <?php _e('Theme Integration Guide', 'woothemes-sensei'); ?></a> <a class="skip button" href="<?php echo esc_url(add_query_arg('sensei_hide_notice', 'theme_check')); ?>"><?php _e('Hide this notice', 'woothemes-sensei'); ?>
 
                         </a>
                     </p>
@@ -1439,7 +1439,7 @@ 
 		wp_get_current_user();
         $user_id = $current_user->ID;
 
-		delete_user_meta( $user_id, 'sensei_hide_theme_check_notice' );
+		delete_user_meta($user_id, 'sensei_hide_theme_check_notice');
 	}
 
 	/**
@@ -1449,8 +1449,8 @@ 
 	 * @param  bool $prevent_access
 	 * @return bool
 	 */
-	public function admin_access( $prevent_access ) {
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
+	public function admin_access($prevent_access) {
+		if (current_user_can('manage_sensei_grades')) {
 			return false;
 		}
 
@@ -1465,12 +1465,12 @@ 
      *
      * @since 1.8.7
      */
-    public  static function install_pages(){
+    public  static function install_pages() {
 
         // only fire on the settings page
-        if( ! isset( $_GET['page'] )
+        if ( ! isset($_GET['page'])
             || 'woothemes-sensei-settings' != $_GET['page']
-            || 1 == get_option('skip_install_sensei_pages') ){
+            || 1 == get_option('skip_install_sensei_pages')) {
 
             return;
 
@@ -1507,8 +1507,8 @@ 
             // Set installed option
             update_option('sensei_installed', 0);
 
-            $complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
-            wp_redirect( $complete_url );
+            $complete_url = add_query_arg('sensei_install_complete', 'true', $settings_url);
+            wp_redirect($complete_url);
 
         }
 
@@ -1522,4 +1522,4 @@ 
  * @since 1.9.0
  * @ignore
  */
-class WooThemes_Sensei_Admin extends Sensei_Admin{ }
+class WooThemes_Sensei_Admin extends Sensei_Admin { }

Braces +12 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Handles all admin views, assets and navigation.
@@ -732,7 +735,9 @@ 
 		$types = array( 'course', 'lesson', 'question' );
 
 		foreach( $types as $type ) {
-			if( ! post_type_exists( $type ) ) continue;
+			if( ! post_type_exists( $type ) ) {
+				continue;
+			}
 
 			$num_posts = wp_count_posts( $type );
 
@@ -800,7 +805,9 @@ 
 
 		$html = '';
 
-		if( 0 == count( $settings ) ) return $html;
+		if( 0 == count( $settings ) ) {
+			return $html;
+		}
 
 		$html .= '<div class="sensei-options-panel">' . "\n";
 
@@ -882,11 +889,11 @@ 
                                     //backwards compatibility
                                     if( empty( $data ) || 'on' == $data ){
                                         $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+                                    } elseif( 'yes' == $data  ) {
 
                                         $checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+                                    } elseif( 'auto' == $data  ) {
 
                                         $checked_value = 'auto';
 

includes/class-sensei-settings.php

Doc Comments +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
     /**
      * @since 1.9.0
      *
-     * @param $setting
-     * @param $new_value
+     * @param string $setting
+     * @param integer $new_value
      */
     public function set( $setting, $new_value ){
 

Indentation +68 added lines, -68 removed lines

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

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /*
  * Sensei Settings Class
@@ -18,18 +18,18 @@ 
 	 * @access public
 	 * @since 1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 	    parent::__construct(); // Required in extended classes.
 
         $this->token = 'woothemes-sensei-settings';
-        add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action('init', array(__CLASS__, 'flush_rewrite_rules'));
 
         // Setup Admin Settings data
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $this->has_tabs 	= true;
-            $this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->menu_label	= __( 'Settings', 'woothemes-sensei' );
+            $this->name = __('Sensei Settings', 'woothemes-sensei');
+            $this->menu_label = __('Settings', 'woothemes-sensei');
             $this->page_slug	= 'woothemes-sensei-settings';
 
         } // End If Statement
@@ -46,11 +46,11 @@ 
      * @param string $setting_name
      * @return mixed
      */
-    public function get( $setting_name ){
+    public function get($setting_name) {
 
-        if( isset( $this->settings[ $setting_name ] ) ){
+        if (isset($this->settings[$setting_name])) {
 
-            return $this->settings[ $setting_name ];
+            return $this->settings[$setting_name];
 
         }
 
@@ -63,14 +63,14 @@ 
      * @param $setting
      * @param $new_value
      */
-    public function set( $setting, $new_value ){
+    public function set($setting, $new_value) {
 
-        $settings = get_option( $this->token, array() );
+        $settings = get_option($this->token, array());
 
-        if( isset(  $settings[ $setting ] ) ){
+        if (isset($settings[$setting])) {
 
-            $settings[ $setting ] = $new_value;
-            return update_option( $this->token,$settings );
+            $settings[$setting] = $new_value;
+            return update_option($this->token, $settings);
 
         }
         return false;
@@ -83,17 +83,17 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function register_settings_screen () {
+	public function register_settings_screen() {
 
 		$this->settings_version = Sensei()->version; // Use the global plugin version on this settings screen.
-		$hook = add_submenu_page( 'sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array( $this, 'settings_screen' ) );
+		$hook = add_submenu_page('sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array($this, 'settings_screen'));
 		$this->hook = $hook;
 
-		if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-			add_action( 'admin_notices', array( $this, 'settings_errors' ) );
-			add_action( 'admin_notices', array( $this, 'language_pack_notices' ) );
-			add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-			add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+			add_action('admin_notices', array($this, 'settings_errors'));
+			add_action('admin_notices', array($this, 'language_pack_notices'));
+			add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+			add_action('admin_print_styles', array($this, 'enqueue_styles'));
 		}
 	} // End register_settings_screen()
 
@@ -103,49 +103,49 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function init_sections () {
+	public function init_sections() {
 		$sections = array();
 
 		$sections['default-settings'] = array(
-			'name' 			=> __( 'General', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to the entire plugin.', 'woothemes-sensei' )
+			'name' 			=> __('General', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to the entire plugin.', 'woothemes-sensei')
 		);
 
 		$sections['course-settings'] = array(
-			'name' 			=> __( 'Courses', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Courses.', 'woothemes-sensei' )
+			'name' 			=> __('Courses', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Courses.', 'woothemes-sensei')
 		);
 
 		$sections['lesson-settings'] = array(
-			'name' 			=> __( 'Lessons', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Lessons.', 'woothemes-sensei' )
+			'name' 			=> __('Lessons', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Lessons.', 'woothemes-sensei')
 		);
 
 		$sections['email-notification-settings'] = array(
-			'name' 			=> __( 'Email Notifications', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for email notifications sent from your site.', 'woothemes-sensei' )
+			'name' 			=> __('Email Notifications', 'woothemes-sensei'),
+			'description'	=> __('Settings for email notifications sent from your site.', 'woothemes-sensei')
 		);
 
 		$sections['learner-profile-settings'] = array(
-			'name' 			=> __( 'Learner Profiles', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for public Learner Profiles.', 'woothemes-sensei' )
+			'name' 			=> __('Learner Profiles', 'woothemes-sensei'),
+			'description'	=> __('Settings for public Learner Profiles.', 'woothemes-sensei')
 		);
 
-		if ( Sensei_WC::is_woocommerce_present() ) {
+		if (Sensei_WC::is_woocommerce_present()) {
 			$sections['woocommerce-settings'] = array(
-				'name' 			=> __( 'WooCommerce', 'woothemes-sensei' ),
-				'description'	=> __( 'Optional settings for WooCommerce functions.', 'woothemes-sensei' )
+				'name' 			=> __('WooCommerce', 'woothemes-sensei'),
+				'description'	=> __('Optional settings for WooCommerce functions.', 'woothemes-sensei')
 			);
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$sections['language-settings'] = array(
-				'name' 			=> __( 'Language', 'woothemes-sensei' ),
-				'description'	=> __( 'Language options.', 'woothemes-sensei' )
+				'name' 			=> __('Language', 'woothemes-sensei'),
+				'description'	=> __('Language options.', 'woothemes-sensei')
 			);
 		}
 
-		$this->sections = apply_filters( 'sensei_settings_tabs', $sections );
+		$this->sections = apply_filters('sensei_settings_tabs', $sections);
 	} // End init_sections()
 
 	/**
@@ -155,71 +155,71 @@ 
 	 * @uses   Sensei_Utils::get_slider_types()
 	 * @return void
 	 */
-	public function init_fields () {
+	public function init_fields() {
 		global $pagenow;
 
 		$pages_array = $this->pages_array();
-		$posts_per_page_array = array( '0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20' );
-		$complete_settings = array( 'passed' => __( 'Once all the course lessons have been completed', 'woothemes-sensei' ), 'complete' => __( 'At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei' ) );
-		$course_display_settings = array( 'excerpt' => __( 'Course Excerpt', 'woothemes-sensei' ), 'full' => __( 'Full Course Content', 'woothemes-sensei' ) );
+		$posts_per_page_array = array('0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20');
+		$complete_settings = array('passed' => __('Once all the course lessons have been completed', 'woothemes-sensei'), 'complete' => __('At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei'));
+		$course_display_settings = array('excerpt' => __('Course Excerpt', 'woothemes-sensei'), 'full' => __('Full Course Content', 'woothemes-sensei'));
 
 	    $fields = array();
 
 		$fields['access_permission'] = array(
-								'name' => __( 'Access Permissions', 'woothemes-sensei' ),
-								'description' => __( 'Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei' ),
+								'name' => __('Access Permissions', 'woothemes-sensei'),
+								'description' => __('Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'default-settings'
 								);
 
 		$fields['messages_disable'] = array(
-								'name' => __( 'Disable Private Messages', 'woothemes-sensei' ),
-								'description' => __( 'Disable the private message functions between learners and teachers.', 'woothemes-sensei' ),
+								'name' => __('Disable Private Messages', 'woothemes-sensei'),
+								'description' => __('Disable the private message functions between learners and teachers.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['course_page'] = array(
-								'name' => __( 'Course Archive Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_courses_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_courses_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['my_course_page'] = array(
-								'name' => __( 'My Courses Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei' ),
+								'name' => __('My Courses Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_user_dashboard_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_user_dashboard_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['placeholder_images_enable'] = array(
-								'name' => __( 'Use placeholder images', 'woothemes-sensei' ),
-								'description' => __( 'Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei' ),
+								'name' => __('Use placeholder images', 'woothemes-sensei'),
+								'description' => __('Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['styles_disable'] = array(
-								'name' => __( 'Disable Sensei Styles', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Styles', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['js_disable'] = array(
-								'name' => __( 'Disable Sensei Javascript', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Javascript', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
@@ -228,8 +228,8 @@ 
     	// Course Settings
 
     	$fields['course_completion'] = array(
-								'name' => __( 'Courses are complete:', 'woothemes-sensei' ),
-								'description' => __( 'This will determine when courses are marked as complete.', 'woothemes-sensei' ),
+								'name' => __('Courses are complete:', 'woothemes-sensei'),
+								'description' => __('This will determine when courses are marked as complete.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'passed',
 								'section' => 'course-settings',
@@ -238,16 +238,16 @@ 
 								);
 
     	$fields['course_author'] = array(
-								'name' => __( 'Display Course Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei' ),
+								'name' => __('Display Course Author', 'woothemes-sensei'),
+								'description' => __('Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['my_course_amount'] = array(
-								'name' => __( 'My Courses Pagination', 'woothemes-sensei' ),
-								'description' => __( 'The number of courses to output for the my courses page.', 'woothemes-sensei' ),
+								'name' => __('My Courses Pagination', 'woothemes-sensei'),
+								'description' => __('The number of courses to output for the my courses page.', 'woothemes-sensei'),
 								'type' => 'range',
 								'default' => '0',
 								'section' => 'course-settings',
@@ -256,16 +256,16 @@ 
 								);
 
 		$fields['course_archive_image_enable'] = array(
-								'name' => __( 'Course Archive Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_image_width'] = array(
-								'name' => __( 'Image Width - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Archive', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -273,8 +273,8 @@ 
 								);
 
 		$fields['course_archive_image_height'] = array(
-								'name' => __( 'Image Height - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Archive', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -282,24 +282,24 @@ 
 								);
 
 		$fields['course_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Archive', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Archive', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_enable'] = array(
-								'name' => __( 'Single Course Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Single Course Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -307,8 +307,8 @@ 
 								);
 
 		$fields['course_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -316,16 +316,16 @@ 
 								);
 
 		$fields['course_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_content_display'] = array(
-								'name' => __( 'Single Course page displays:', 'woothemes-sensei' ),
-								'description' => __( 'Determines what content to display on the single course page.', 'woothemes-sensei' ),
+								'name' => __('Single Course page displays:', 'woothemes-sensei'),
+								'description' => __('Determines what content to display on the single course page.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'excerpt',
 								'section' => 'course-settings',
@@ -334,18 +334,18 @@ 
 								);
 
 		$fields['course_archive_featured_enable'] = array(
-								'name' => __( 'Featured Courses Panel', 'woothemes-sensei' ),
-								'description' => __( 'Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Featured Courses Panel', 'woothemes-sensei'),
+								'description' => __('Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_more_link_text'] = array(
-								'name' => __( 'More link text', 'woothemes-sensei' ),
-								'description' => __( 'The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei' ),
+								'name' => __('More link text', 'woothemes-sensei'),
+								'description' => __('The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => __ ( 'More', 'woothemes-sensei' ),
+								'default' => __('More', 'woothemes-sensei'),
 								'section' => 'course-settings',
 								'required' => 0
 								);
@@ -353,32 +353,32 @@ 
 		// Lesson Settings
 
 		$fields['lesson_comments'] = array(
-								'name' => __( 'Allow Comments for Lessons', 'woothemes-sensei' ),
-								'description' => __( 'This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei' ),
+								'name' => __('Allow Comments for Lessons', 'woothemes-sensei'),
+								'description' => __('This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_author'] = array(
-								'name' => __( 'Display Lesson Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei' ),
+								'name' => __('Display Lesson Author', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['course_lesson_image_enable'] = array(
-								'name' => __( 'Course Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Course Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_archive_image_width'] = array(
-								'name' => __( 'Image Width - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -386,8 +386,8 @@ 
 								);
 
 		$fields['lesson_archive_image_height'] = array(
-								'name' => __( 'Image Height - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -395,24 +395,24 @@ 
 								);
 
 		$fields['lesson_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Course Lessons', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Course Lessons', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_enable'] = array(
-								'name' => __( 'Single Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei' ),
+								'name' => __('Single Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -420,8 +420,8 @@ 
 								);
 
 		$fields['lesson_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -429,8 +429,8 @@ 
 								);
 
 		$fields['lesson_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
@@ -438,20 +438,20 @@ 
 
 		// Learner Profile settings
 
-		$profile_url_base = apply_filters( 'sensei_learner_profiles_url_base', __( 'learner', 'woothemes-sensei') );
-		$profile_url_example = trailingslashit( get_site_url() ) . $profile_url_base . '/%username%';
+		$profile_url_base = apply_filters('sensei_learner_profiles_url_base', __('learner', 'woothemes-sensei'));
+		$profile_url_example = trailingslashit(get_site_url()).$profile_url_base.'/%username%';
 
 		$fields['learner_profile_enable'] = array(
-							'name' => __( 'Public learner profiles', 'woothemes-sensei' ),
-							'description' => sprintf( __( 'Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei' ), $profile_url_example ),
+							'name' => __('Public learner profiles', 'woothemes-sensei'),
+							'description' => sprintf(__('Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei'), $profile_url_example),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
 							);
 
 		$fields['learner_profile_show_courses'] = array(
-							'name' => __( 'Show learner\'s courses', 'woothemes-sensei' ),
-							'description' => __( 'Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei' ),
+							'name' => __('Show learner\'s courses', 'woothemes-sensei'),
+							'description' => __('Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei'),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
@@ -460,70 +460,70 @@ 
 		// Email notifications
 
 		$learner_email_options = array(
-			'learner-graded-quiz' => __( 'Their quiz is graded (auto and manual grading)', 'woothemes-sensei' ),
-			'learner-completed-course' => __( 'They complete a course', 'woothemes-sensei' ),
+			'learner-graded-quiz' => __('Their quiz is graded (auto and manual grading)', 'woothemes-sensei'),
+			'learner-completed-course' => __('They complete a course', 'woothemes-sensei'),
 		);
 
 		$teacher_email_options = array(
-            'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
-            'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
-            'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
-            'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
-			'teacher-new-message' => __( 'A learner sends a private message to a teacher', 'woothemes-sensei' ),
+            'teacher-started-course' => __('A learner starts their course', 'woothemes-sensei'),
+            'teacher-completed-course' => __('A learner completes their course', 'woothemes-sensei'),
+            'teacher-completed-lesson' => __('A learner completes a lesson', 'woothemes-sensei'),
+            'teacher-quiz-submitted' => __('A learner submits a quiz for grading', 'woothemes-sensei'),
+			'teacher-new-message' => __('A learner sends a private message to a teacher', 'woothemes-sensei'),
 		);
 
 		$global_email_options = array(
-			'new-message-reply' => __( 'They receive a reply to their private message', 'woothemes-sensei' ),
+			'new-message-reply' => __('They receive a reply to their private message', 'woothemes-sensei'),
 		);
 
 		$fields['email_learners'] = array(
-								'name' => __( 'Emails Sent to Learners', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to learners.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Learners', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to learners.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $learner_email_options,
-								'defaults' => array( 'learner-graded-quiz', 'learner-completed-course' ),
+								'defaults' => array('learner-graded-quiz', 'learner-completed-course'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_teachers'] = array(
-								'name' => __( 'Emails Sent to Teachers', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to teachers.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Teachers', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to teachers.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $teacher_email_options,
-								'defaults' => array( 'teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message' ),
+								'defaults' => array('teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_global'] = array(
-								'name' => __( 'Emails Sent to All Users', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to all users.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to All Users', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to all users.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $global_email_options,
-								'defaults' => array( 'new-message-reply' ),
+								'defaults' => array('new-message-reply'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_from_name'] = array(
-								'name' => __( '"From" Name', 'woothemes-sensei' ),
-								'description' => __( 'The name from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Name', 'woothemes-sensei'),
+								'description' => __('The name from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'name' ),
+								'default' => get_bloginfo('name'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_from_address'] = array(
-								'name' => __( '"From" Address', 'woothemes-sensei' ),
-								'description' => __( 'The address from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Address', 'woothemes-sensei'),
+								'description' => __('The address from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'admin_email' ),
+								'default' => get_bloginfo('admin_email'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_header_image'] = array(
-								'name' => __( 'Header Image', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'media-new.php' ) . '">', '</a>' ),
+								'name' => __('Header Image', 'woothemes-sensei'),
+								'description' => sprintf(__('Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('media-new.php').'">', '</a>'),
 								'type' => 'text',
 								'default' => '',
 								'section' => 'email-notification-settings',
@@ -531,17 +531,17 @@ 
 								);
 
 		$fields['email_footer_text'] = array(
-								'name' => __( 'Email Footer Text', 'woothemes-sensei' ),
-								'description' => __( 'The text to appear in the footer of Sensei emails.', 'woothemes-sensei' ),
+								'name' => __('Email Footer Text', 'woothemes-sensei'),
+								'description' => __('The text to appear in the footer of Sensei emails.', 'woothemes-sensei'),
 								'type' => 'textarea',
-								'default' => sprintf( __( '%1$s - Powered by Sensei', 'woothemes-sensei' ), get_bloginfo( 'name' ) ),
+								'default' => sprintf(__('%1$s - Powered by Sensei', 'woothemes-sensei'), get_bloginfo('name')),
 								'section' => 'email-notification-settings',
 								'required' => 0
 								);
 
 		$fields['email_base_color'] = array(
-								'name' => __( 'Base Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Base Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#557da1',
 								'section' => 'email-notification-settings',
@@ -549,8 +549,8 @@ 
 								);
 
 		$fields['email_background_color'] = array(
-								'name' => __( 'Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#f5f5f5',
 								'section' => 'email-notification-settings',
@@ -558,8 +558,8 @@ 
 								);
 
 		$fields['email_body_background_color'] = array(
-								'name' => __( 'Body Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#fdfdfd',
 								'section' => 'email-notification-settings',
@@ -567,35 +567,35 @@ 
 								);
 
 		$fields['email_text_color'] = array(
-								'name' => __( 'Body Text Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Text Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#505050',
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
-		if ( Sensei_WC::is_woocommerce_present() ) {
+		if (Sensei_WC::is_woocommerce_present()) {
 			// WooCommerce Settings
     		$fields['woocommerce_enabled'] = array(
-									'name' => __( 'Enable WooCommerce Courses', 'woothemes-sensei' ),
-									'description' => __( 'Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei' ),
+									'name' => __('Enable WooCommerce Courses', 'woothemes-sensei'),
+									'description' => __('Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_free_enable'] = array(
-									'name' => __( 'Free Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Free Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_paid_enable'] = array(
-									'name' => __( 'Paid Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Paid Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
@@ -603,18 +603,18 @@ 
 
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$fields['install_language_pack'] = array(
-				'name'        => __( 'Install Language Pack', 'woothemes-sensei' ),
-				'description' => __( 'Use this action to install or re-install translation for your language if available.', 'woothemes-sensei' ),
+				'name'        => __('Install Language Pack', 'woothemes-sensei'),
+				'description' => __('Use this action to install or re-install translation for your language if available.', 'woothemes-sensei'),
 				'type'        => 'button',
 				'section'     => 'language-settings',
 				'target'      => Sensei_Language_Pack_Manager::get_install_uri(),
-				'label'       => __( 'Install', 'woothemes-sensei' )
+				'label'       => __('Install', 'woothemes-sensei')
 			);
 		}
 
-		$this->fields = apply_filters( 'sensei_settings_fields', $fields );
+		$this->fields = apply_filters('sensei_settings_fields', $fields);
 
 	} // End init_fields()
 
@@ -624,20 +624,20 @@ 
 	 * @param  $include_milliseconds (default: true) Whether or not to include milliseconds between 0 and 1.
 	 * @return array Options between 0.1 and 10 seconds.
 	 */
-	private function get_duration_options ( $include_milliseconds = true ) {
-		$numbers = array( '1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0' );
+	private function get_duration_options($include_milliseconds = true) {
+		$numbers = array('1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0');
 		$options = array();
 
-		if ( true == (bool)$include_milliseconds ) {
-			$milliseconds = array( '0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9' );
-			foreach ( $milliseconds as $k => $v ) {
+		if (true == (bool) $include_milliseconds) {
+			$milliseconds = array('0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9');
+			foreach ($milliseconds as $k => $v) {
 				$options[$v] = $v;
 			}
 		} else {
 			$options['0.5'] = '0.5';
 		}
 
-		foreach ( $numbers as $k => $v ) {
+		foreach ($numbers as $k => $v) {
 			$options[$v] = $v;
 		}
 
@@ -653,25 +653,25 @@ 
 	private function pages_array() {
 		// REFACTOR - Transform this into a field type instead.
 		// Setup an array of portfolio gallery terms for a dropdown.
-		$args = array( 'echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC' );
-		$pages_dropdown = wp_dropdown_pages( $args );
+		$args = array('echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC');
+		$pages_dropdown = wp_dropdown_pages($args);
 		$page_items = array();
 
 		// Quick string hack to make sure we get the pages with the indents.
-		$pages_dropdown = str_replace( "<select class='' name='page_id' id='page_id'>", '', $pages_dropdown );
-		$pages_dropdown = str_replace( '</select>', '', $pages_dropdown );
-		$pages_split = explode( '</option>', $pages_dropdown );
+		$pages_dropdown = str_replace("<select class='' name='page_id' id='page_id'>", '', $pages_dropdown);
+		$pages_dropdown = str_replace('</select>', '', $pages_dropdown);
+		$pages_split = explode('</option>', $pages_dropdown);
 
-		$page_items[] = __( 'Select a Page:', 'woothemes-sensei' );
+		$page_items[] = __('Select a Page:', 'woothemes-sensei');
 
-		foreach ( $pages_split as $k => $v ) {
+		foreach ($pages_split as $k => $v) {
 		    $id = '';
 		    // Get the ID value.
-		    preg_match( '/value="(.*?)"/i', $v, $matches );
+		    preg_match('/value="(.*?)"/i', $v, $matches);
 
-		    if ( isset( $matches[1] ) ) {
+		    if (isset($matches[1])) {
 		        $id = $matches[1];
-		        $page_items[$id] = trim( strip_tags( $v ) );
+		        $page_items[$id] = trim(strip_tags($v));
 		    } // End If Statement
 		} // End For Loop
 
@@ -695,10 +695,10 @@ 
      *
      * @since 1.9.0
      */
-    public static function flush_rewrite_rules(){
+    public static function flush_rewrite_rules() {
 
-        if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
-            && isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
+        if (isset($_POST['option_page']) && 'woothemes-sensei-settings' == $_POST['option_page']
+            && isset($_POST['action']) && 'update' == $_POST['action']) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -712,4 +712,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Settings extends Sensei_Settings{}
+class WooThemes_Sensei_Settings extends Sensei_Settings {}

includes/class-sensei.php

Indentation +1324 added lines, -1324 removed lines

@@ -10,1343 +10,1343 @@ 
  */
 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();
-
-        // Force WooCommerce Required Settings
-        $this->set_woocommerce_functionality();
-
-        // 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 );
-
-        // 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();
+
+		// Force WooCommerce Required Settings
+		$this->set_woocommerce_functionality();
+
+		// 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 );
+
+		// 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 );
 
-        // Setup settings
-        $this->settings = new Sensei_Settings();
+		// Setup settings
+		$this->settings = new Sensei_Settings();
 
-        // 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
-        add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
+		// load the modules class after all plugsin are loaded
+		add_action( 'plugins_loaded', array( $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(){
-
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
-
-        // WooCommerce Payment Actions
-        add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
-
-        // WooCommerce Subscriptions Actions
-        add_action( 'reactivated_subscription', array( $this, 'sensei_woocommerce_reactivate_subscription' ), 10, 2 );
-        add_action( 'subscription_expired' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_end_of_prepaid_term' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'cancelled_subscription' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_put_on-hold' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-
-        // Add Email link to course orders
-        add_action( 'woocommerce_email_after_order_table', array( $this, 'sensei_woocommerce_email_course_details' ), 10, 1 );
-
-        // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
-
-        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 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' ) ) {
-
-            $this->updates->update();
-
-        } // End If Statement
-    } // End run_updates()
-
-
-
-    /**
-     * Setup required WooCommerce settings.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function set_woocommerce_functionality() {
-        // Disable guest checkout if a course is in the cart as we need a valid user to store data for
-        add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( $this, 'disable_guest_checkout' ) );
-
-        // Mark orders with virtual products as complete rather then stay processing
-        add_filter( 'woocommerce_payment_complete_order_status', array( $this, 'virtual_order_payment_complete' ), 10, 2 );
-
-    } // End set_woocommerce_functionality()
-
-    /**
-     * Disable guest checkout if a course product is in the cart
-     * @param  boolean $guest_checkout Current guest checkout setting
-     * @return boolean                 Modified guest checkout setting
-     */
-    public function disable_guest_checkout( $guest_checkout ) {
-        global $woocommerce;
-
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-
-            if( isset( $woocommerce->cart->cart_contents ) && count( $woocommerce->cart->cart_contents ) > 0 ) {
-                foreach( $woocommerce->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
-                        $args = array(
-                            'posts_per_page' => -1,
-                            'post_type' => 'course',
-                            'meta_query' => array(
-                                array(
-                                    'key' => '_course_woocommerce_product',
-                                    'value' => $product['product_id']
-                                )
-                            )
-                        );
-                        $posts = get_posts( $args );
-                        if( $posts && count( $posts ) > 0 ) {
-                            foreach( $posts as $course ) {
-                                $guest_checkout = '';
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return $guest_checkout;
-    }
-
-    /**
-     * Change order status with virtual products to completed
-     * @since  1.1.0
-     * @param string $order_status
-     * @param int $order_id
-     * @return string
-     **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
-        $order = new WC_Order( $order_id );
-        if ( ! isset ( $order ) ) return '';
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
-            $virtual_order = true;
-
-            if ( count( $order->get_items() ) > 0 ) {
-                foreach( $order->get_items() as $item ) {
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
-                            $virtual_order = false;
-                            break;
-                        } // End If Statement
-                    } // End If Statement
-                } // End For Loop
-            } // End If Statement
-
-            // virtual order, mark as completed
-            if ( $virtual_order ) {
-                return 'completed';
-            } // End If Statement
-        } // End If Statement
-        return $order_status;
-    }
-
-    /**
-     * 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' );
-
-    } // End register_widgets()
-
-    /**
-     * 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/' );
-    } // 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 != '' ) {
-
-            // Check previous version to see if forced updates must run
-            // $old_version = get_option( 'woothemes-sensei-version', false );
-            // if( $old_version && version_compare( $old_version, '1.7.0', '<' )  ) {
-            // 	update_option( 'woothemes-sensei-force-updates', $this->version );
-            // } else {
-            // 	delete_option( 'woothemes-sensei-force-updates' );
-            // }
-
-            update_option( 'woothemes-sensei-version', $this->version );
-        }
-    } // End register_plugin_version()
-
-    /**
-     * Ensure that "post-thumbnails" support is available for those themes that don't register it.
-     * @access  public
-     * @since   1.0.1
-     * @return  void
-     */
-    public function ensure_post_thumbnails_support () {
-        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
-    } // End ensure_post_thumbnails_support()
-
-
-    /**
-     * template_loader function.
-     *
-     * @access public
-     * @param mixed $template
-     * @return void
-     * @deprecated
-     */
-    public function template_loader ( $template = '' ) {
-
-        _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
-        Sensei_Templates::template_loader( $template );
-
-    } // End template_loader()
-
-    /**
-     * Determine the relative path to the plugin's directory.
-     * @access public
-     * @since  1.0.0
-     * @return string $sensei_plugin_path
-     */
-    public function plugin_path () {
-
-        if ( $this->plugin_path ) {
-
-            $sensei_plugin_path =  $this->plugin_path;
-
-        }else{
-
-            $sensei_plugin_path = plugin_dir_path( __FILE__ );
-
-        }
-
-        return $sensei_plugin_path;
-
-    } // End plugin_path()
-
-
-    /**
-     * Retrieve the ID of a specified page setting.
-     * @access public
-     * @since  1.0.0
-     * @param  string $page
-     * @return int
-     */
-    public function get_page_id ( $page ) {
-        $page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
-        return ( $page ) ? $page : -1;
-    } // End get_page_id()
-
-
-    /**
-     * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
-     * @access public
-     * @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()  ) {
-        global $current_user;
-
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
-
-        $data_update = false;
-
-        // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
-
-        // Check if in the admin
-        if ( is_admin() ) {
-            $user_login = $order_user['user_login'];
-            $user_email = $order_user['user_email'];
-            $user_url = $order_user['user_url'];
-            $user_id = $order_user['ID'];
-        } else {
-            $user_login = $current_user->user_login;
-            $user_email = $current_user->user_email;
-            $user_url = $current_user->user_url;
-            $user_id = $current_user->ID;
-        } // End If Statement
-
-        // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
-                // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
-            }
-        }
-
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
-
-        if( ! $is_user_taking_course ) {
-
-            if ( Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product( $user_email, $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
-
-                $activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
-
-                $is_user_taking_course = false;
-                if ( true == $activity_logged ) {
-                    $is_user_taking_course = true;
-                } // End If Statement
-            } // End If Statement
-        }
-
-        return $is_user_taking_course;
-    } // End woocommerce_course_update()
-
-
-    /**
-     * check_user_permissions function.
-     *
-     * @access public
-     * @param string $page (default: '')
-     *
-     * @return bool
-     */
-    public function check_user_permissions ( $page = '' ) {
-        // REFACTOR
-        global $current_user, $post;
-
-        // if use is not logged in
-        // skipped for single lesson
-        if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission')
-            && 'lesson-single' !=  $page ){
-            $this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei' );
-            $this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
-            return false;
-        }
-
-        $user_allowed = false;
-
-        switch ( $page ) {
-            case 'course-single':
-                // check for prerequisite course or lesson,
-                $course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true);
-                $update_course = $this->woocommerce_course_update( $post->ID );
-                // Count completed lessons
-                if ( 0 < absint( $course_prerequisite_id ) ) {
-
-                    $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
-
-                }
-                else {
-                    $prerequisite_complete = true;
-                } // End If Statement
-                // Handles restrictions
-                if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
-                } else {
-                    $user_allowed = true;
-                } // End If Statement
-                break;
-            case 'lesson-single':
-                // Check for WC purchase
-                $lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
-
-                $update_course = $this->woocommerce_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 = $this->woocommerce_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;
-        }
-
-        return apply_filters( 'sensei_access_permissions', $user_allowed );
-    } // 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()
-
-    /**
-     * sensei_woocommerce_complete_order description
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
-        $order_user = array();
-        // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
-            // Get order object
-            $order = new WC_Order( $order_id );
-            $user = get_user_by( 'id', $order->get_user_id() );
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
-                foreach( $order->get_items() as $item ) {
-                    $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                        $item_id = $item['variation_id'];
-                        $product_type = 'variation';
-                    } else {
-                        $item_id = $item['product_id'];
-                    } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-                    // Get courses that use the WC product
-                    $courses = $this->post_types->course->get_product_courses( $_product->id );
-                    // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-                    } // End For Loop
-                } // End For Loop
-            } // End If Statement
-            // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
-        } // End If Statement
-    } // End sensei_woocommerce_complete_order()
-
-    /**
-     * Runs when an order is cancelled.
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
-
-        // Get order object
-        $order = new WC_Order( $order_id );
-
-        // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
-
-            // Get order user
-            $user_id = $order->__get( 'user_id' );
-
-            foreach( $order->get_items() as $item ) {
-
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    $item_id = $item['product_id'];
-                } // End If Statement
-                $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-
-                // Get courses that use the WC product
-                $courses = array();
-                $courses = $this->post_types->course->get_product_courses( $item_id );
-
-                // Loop and update those courses
-                foreach ($courses as $course_item){
-                    // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
-                } // End For Loop
-            } // End For Loop
-        } // End If Statement
-    } // End sensei_woocommerce_cancel_order()
-
-    /**
-     * Runs when an subscription is cancelled or expires.
-     * @since   1.3.3
-     * @access  public
-     * @param   integer $user_id User ID
-     * @param   integer $subscription_key Subscription Unique Key
-     * @return  void
-     */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        self::sensei_woocommerce_cancel_order( $subscription['order_id'] );
-    }
-
-    /**
-     * Runs when an subscription is re-activated after suspension.
-     * @since   1.3.3
-     * @access  public
-     * @param   integer $user_id User ID
-     * @param   integer $subscription_key Subscription Unique Key
-     * @return  void
-     */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        $order = new WC_Order( $subscription['order_id'] );
-        $user = get_user_by( 'id', $order->get_user_id() );
-        $order_user = array();
-        $order_user['ID'] = $user->ID;
-        $order_user['user_login'] = $user->user_login;
-        $order_user['user_email'] = $user->user_email;
-        $order_user['user_url'] = $user->user_url;
-        $courses = $this->post_types->course->get_product_courses( $subscription['product_id'] );
-        foreach ( $courses as $course_item ){
-            $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-        } // End For Loop
-    } // End sensei_woocommerce_reactivate_subscription
-
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @since   1.1.1
-     * @access  public
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     * @return   WC_Product $wc_product_object
-     */
-    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
-
-        $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
-
-            // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
-
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
-
-            } elseif ( function_exists( 'get_product' ) ) {
-
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
-
-            } else {
-
-                // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
-
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
-
-                } else {
-
-                    $wc_product_object = new WC_Product( $wc_product_id );
-
-                } // End If Statement
-
-            } // End If Statement
-
-        } // End If Statement
-
-        return $wc_product_object;
-
-    } // End sensei_get_woocommerce_product_object()
-
-    /**
-     * 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()
-
-    /**
-     * sensei_activate_subscription runs when a subscription product is purchased
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
-        if ( 0 < intval( $order_id ) ) {
-            $order = new WC_Order( $order_id );
-            $user = get_user_by('id', $order->user_id);
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if (sizeof($order->get_items())>0) {
-                foreach($order->get_items() as $item) {
-                    $product_type = '';
-                    if (isset($item['variation_id']) && $item['variation_id'] > 0) {
-                        $item_id = $item['variation_id'];
-                        $product_type = 'subscription_variation';
-                    } else {
-                        $item_id = $item['product_id'];
-                    } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-                    // Get courses that use the WC product
-                    $courses = array();
-                    if ( $product_type == 'subscription_variation' ) {
-                        $courses = $this->post_types->course->get_product_courses( $item_id );
-                    } // End If Statement
-                    // Loop and update those courses
-                    foreach ($courses as $course_item){
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-                    } // End For Loop
-                } // End For Loop
-            } // End If Statement
-        } // End If Statement
-    } // End sensei_activate_subscription()
-
-    /**
-     * sensei_woocommerce_email_course_details adds detail to email
-     * @since   1.4.5
-     * @access  public
-     * @param   WC_Order $order
-     * @return  void
-     */
-    public function sensei_woocommerce_email_course_details( $order ) {
-        global $woocommerce;
-
-        // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
-
-        $order_items = $order->get_items();
-        $order_id = $order->id;
-
-        //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
-
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
-            $order_contains_courses = false;
-
-
-            foreach ( $order_items as $item ) {
-
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    // If item has variation_id then its from variation
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    // If not its real product set its id to item_id
-                    $item_id = $item['product_id'];
-                } // End If Statement
-
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
-
-                if( $user_id ) {
-
-                    // Get all courses for product
-                    $args = array(
-                        'posts_per_page' => -1,
-                        'post_type' => 'course',
-                        'meta_query' => array(
-                            array(
-                                'key' => '_course_woocommerce_product',
-                                'value' => $item_id
-                            )
-                        ),
-                        'orderby' => 'menu_order date',
-                        'order' => 'ASC',
-                    );
-                    $courses = get_posts( $args );
-
-                    if( $courses && count( $courses ) > 0 ) {
-
-                        foreach( $courses as $course ) {
-
-                            $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
-                            $order_contains_courses = true;
-                            $course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
-                        }
-
-
-                    } // end if has courses
-
-                } // end if $userPid
-
-            } // end for each order item
-
-            // Output Course details
-            if( $order_contains_courses ){
-
-                echo $course_details_html;
-
-            }
-
-
-        } // end if  order items not empty
-
-    } // end func email course details
-
-    /**
-     * 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(){ ?>
+	/**
+	 * 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' ) );
+
+		// WooCommerce Payment Actions
+		add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
+		add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
+		add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
+
+		// WooCommerce Subscriptions Actions
+		add_action( 'reactivated_subscription', array( $this, 'sensei_woocommerce_reactivate_subscription' ), 10, 2 );
+		add_action( 'subscription_expired' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'subscription_end_of_prepaid_term' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'cancelled_subscription' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'subscription_put_on-hold' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+
+		// Add Email link to course orders
+		add_action( 'woocommerce_email_after_order_table', array( $this, 'sensei_woocommerce_email_course_details' ), 10, 1 );
+
+		// Filter comment counts
+		add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
+
+		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 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' ) ) {
+
+			$this->updates->update();
+
+		} // End If Statement
+	} // End run_updates()
+
+
+
+	/**
+	 * Setup required WooCommerce settings.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function set_woocommerce_functionality() {
+		// Disable guest checkout if a course is in the cart as we need a valid user to store data for
+		add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( $this, 'disable_guest_checkout' ) );
+
+		// Mark orders with virtual products as complete rather then stay processing
+		add_filter( 'woocommerce_payment_complete_order_status', array( $this, 'virtual_order_payment_complete' ), 10, 2 );
+
+	} // End set_woocommerce_functionality()
+
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public function disable_guest_checkout( $guest_checkout ) {
+		global $woocommerce;
+
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+
+			if( isset( $woocommerce->cart->cart_contents ) && count( $woocommerce->cart->cart_contents ) > 0 ) {
+				foreach( $woocommerce->cart->cart_contents as $cart_key => $product ) {
+					if( isset( $product['product_id'] ) ) {
+						$args = array(
+							'posts_per_page' => -1,
+							'post_type' => 'course',
+							'meta_query' => array(
+								array(
+									'key' => '_course_woocommerce_product',
+									'value' => $product['product_id']
+								)
+							)
+						);
+						$posts = get_posts( $args );
+						if( $posts && count( $posts ) > 0 ) {
+							foreach( $posts as $course ) {
+								$guest_checkout = '';
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $guest_checkout;
+	}
+
+	/**
+	 * Change order status with virtual products to completed
+	 * @since  1.1.0
+	 * @param string $order_status
+	 * @param int $order_id
+	 * @return string
+	 **/
+	public function virtual_order_payment_complete( $order_status, $order_id ) {
+		$order = new WC_Order( $order_id );
+		if ( ! isset ( $order ) ) return '';
+		if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+			$virtual_order = true;
+
+			if ( count( $order->get_items() ) > 0 ) {
+				foreach( $order->get_items() as $item ) {
+					if ( $item['product_id'] > 0 ) {
+						$_product = $order->get_product_from_item( $item );
+						if ( ! $_product->is_virtual() ) {
+							$virtual_order = false;
+							break;
+						} // End If Statement
+					} // End If Statement
+				} // End For Loop
+			} // End If Statement
+
+			// virtual order, mark as completed
+			if ( $virtual_order ) {
+				return 'completed';
+			} // End If Statement
+		} // End If Statement
+		return $order_status;
+	}
+
+	/**
+	 * 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' );
+
+	} // End register_widgets()
+
+	/**
+	 * 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/' );
+	} // 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 != '' ) {
+
+			// Check previous version to see if forced updates must run
+			// $old_version = get_option( 'woothemes-sensei-version', false );
+			// if( $old_version && version_compare( $old_version, '1.7.0', '<' )  ) {
+			// 	update_option( 'woothemes-sensei-force-updates', $this->version );
+			// } else {
+			// 	delete_option( 'woothemes-sensei-force-updates' );
+			// }
+
+			update_option( 'woothemes-sensei-version', $this->version );
+		}
+	} // End register_plugin_version()
+
+	/**
+	 * Ensure that "post-thumbnails" support is available for those themes that don't register it.
+	 * @access  public
+	 * @since   1.0.1
+	 * @return  void
+	 */
+	public function ensure_post_thumbnails_support () {
+		if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
+	} // End ensure_post_thumbnails_support()
+
+
+	/**
+	 * template_loader function.
+	 *
+	 * @access public
+	 * @param mixed $template
+	 * @return void
+	 * @deprecated
+	 */
+	public function template_loader ( $template = '' ) {
+
+		_deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
+		Sensei_Templates::template_loader( $template );
+
+	} // End template_loader()
+
+	/**
+	 * Determine the relative path to the plugin's directory.
+	 * @access public
+	 * @since  1.0.0
+	 * @return string $sensei_plugin_path
+	 */
+	public function plugin_path () {
+
+		if ( $this->plugin_path ) {
+
+			$sensei_plugin_path =  $this->plugin_path;
+
+		}else{
+
+			$sensei_plugin_path = plugin_dir_path( __FILE__ );
+
+		}
+
+		return $sensei_plugin_path;
+
+	} // End plugin_path()
+
+
+	/**
+	 * Retrieve the ID of a specified page setting.
+	 * @access public
+	 * @since  1.0.0
+	 * @param  string $page
+	 * @return int
+	 */
+	public function get_page_id ( $page ) {
+		$page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
+		return ( $page ) ? $page : -1;
+	} // End get_page_id()
+
+
+	/**
+	 * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 * @access public
+	 * @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()  ) {
+		global $current_user;
+
+		if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+
+		$data_update = false;
+
+		// Get the product ID
+		$wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+
+		// Check if in the admin
+		if ( is_admin() ) {
+			$user_login = $order_user['user_login'];
+			$user_email = $order_user['user_email'];
+			$user_url = $order_user['user_url'];
+			$user_id = $order_user['ID'];
+		} else {
+			$user_login = $current_user->user_login;
+			$user_email = $current_user->user_email;
+			$user_url = $current_user->user_url;
+			$user_id = $current_user->ID;
+		} // End If Statement
+
+		// This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
+		$course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
+		if( 0 < absint( $course_prerequisite_id ) ) {
+			$prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
+			if ( ! $prereq_course_complete ) {
+				// Remove all course user meta
+				return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+			}
+		}
+
+		$is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+
+		if( ! $is_user_taking_course ) {
+
+			if ( Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product( $user_email, $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
+
+				$activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
+
+				$is_user_taking_course = false;
+				if ( true == $activity_logged ) {
+					$is_user_taking_course = true;
+				} // End If Statement
+			} // End If Statement
+		}
+
+		return $is_user_taking_course;
+	} // End woocommerce_course_update()
+
+
+	/**
+	 * check_user_permissions function.
+	 *
+	 * @access public
+	 * @param string $page (default: '')
+	 *
+	 * @return bool
+	 */
+	public function check_user_permissions ( $page = '' ) {
+		// REFACTOR
+		global $current_user, $post;
+
+		// if use is not logged in
+		// skipped for single lesson
+		if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission')
+			&& 'lesson-single' !=  $page ){
+			$this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei' );
+			$this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
+			return false;
+		}
+
+		$user_allowed = false;
+
+		switch ( $page ) {
+			case 'course-single':
+				// check for prerequisite course or lesson,
+				$course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true);
+				$update_course = $this->woocommerce_course_update( $post->ID );
+				// Count completed lessons
+				if ( 0 < absint( $course_prerequisite_id ) ) {
+
+					$prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
+
+				}
+				else {
+					$prerequisite_complete = true;
+				} // End If Statement
+				// Handles restrictions
+				if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
+				} else {
+					$user_allowed = true;
+				} // End If Statement
+				break;
+			case 'lesson-single':
+				// Check for WC purchase
+				$lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
+
+				$update_course = $this->woocommerce_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 = $this->woocommerce_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;
+		}
+
+		return apply_filters( 'sensei_access_permissions', $user_allowed );
+	} // 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()
+
+	/**
+	 * sensei_woocommerce_complete_order description
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+		$order_user = array();
+		// Check for WooCommerce
+		if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+			// Get order object
+			$order = new WC_Order( $order_id );
+			$user = get_user_by( 'id', $order->get_user_id() );
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if ( 0 < sizeof( $order->get_items() ) ) {
+				foreach( $order->get_items() as $item ) {
+					$product_type = '';
+					if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+						$item_id = $item['variation_id'];
+						$product_type = 'variation';
+					} else {
+						$item_id = $item['product_id'];
+					} // End If Statement
+					$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+					// Get courses that use the WC product
+					$courses = $this->post_types->course->get_product_courses( $_product->id );
+					// Loop and update those courses
+					foreach ( $courses as $course_item ) {
+						$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+					} // End For Loop
+				} // End For Loop
+			} // End If Statement
+			// Add meta to indicate that payment has been completed successfully
+			update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+		} // End If Statement
+	} // End sensei_woocommerce_complete_order()
+
+	/**
+	 * Runs when an order is cancelled.
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_cancel_order ( $order_id ) {
+
+		// Get order object
+		$order = new WC_Order( $order_id );
+
+		// Run through each product ordered
+		if ( 0 < sizeof( $order->get_items() ) ) {
+
+			// Get order user
+			$user_id = $order->__get( 'user_id' );
+
+			foreach( $order->get_items() as $item ) {
+
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					$item_id = $item['product_id'];
+				} // End If Statement
+				$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+
+				// Get courses that use the WC product
+				$courses = array();
+				$courses = $this->post_types->course->get_product_courses( $item_id );
+
+				// Loop and update those courses
+				foreach ($courses as $course_item){
+					// Check and Remove course from courses user meta
+					$dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+				} // End For Loop
+			} // End For Loop
+		} // End If Statement
+	} // End sensei_woocommerce_cancel_order()
+
+	/**
+	 * Runs when an subscription is cancelled or expires.
+	 * @since   1.3.3
+	 * @access  public
+	 * @param   integer $user_id User ID
+	 * @param   integer $subscription_key Subscription Unique Key
+	 * @return  void
+	 */
+	public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ) {
+		$subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
+		self::sensei_woocommerce_cancel_order( $subscription['order_id'] );
+	}
+
+	/**
+	 * Runs when an subscription is re-activated after suspension.
+	 * @since   1.3.3
+	 * @access  public
+	 * @param   integer $user_id User ID
+	 * @param   integer $subscription_key Subscription Unique Key
+	 * @return  void
+	 */
+	public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ) {
+		$subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
+		$order = new WC_Order( $subscription['order_id'] );
+		$user = get_user_by( 'id', $order->get_user_id() );
+		$order_user = array();
+		$order_user['ID'] = $user->ID;
+		$order_user['user_login'] = $user->user_login;
+		$order_user['user_email'] = $user->user_email;
+		$order_user['user_url'] = $user->user_url;
+		$courses = $this->post_types->course->get_product_courses( $subscription['product_id'] );
+		foreach ( $courses as $course_item ){
+			$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+		} // End For Loop
+	} // End sensei_woocommerce_reactivate_subscription
+
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @since   1.1.1
+	 * @access  public
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 * @return   WC_Product $wc_product_object
+	 */
+	public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
+
+		$wc_product_object = false;
+		if ( 0 < intval( $wc_product_id ) ) {
+
+			// Get the product
+			if ( function_exists( 'wc_get_product' ) ) {
+
+				$wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+
+			} elseif ( function_exists( 'get_product' ) ) {
+
+				$wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+
+			} else {
+
+				// Pre WC 2.0
+				if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+
+					$wc_product_object = new WC_Product_Variation( $wc_product_id );
+
+				} else {
+
+					$wc_product_object = new WC_Product( $wc_product_id );
+
+				} // End If Statement
+
+			} // End If Statement
+
+		} // End If Statement
+
+		return $wc_product_object;
+
+	} // End sensei_get_woocommerce_product_object()
+
+	/**
+	 * 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()
+
+	/**
+	 * sensei_activate_subscription runs when a subscription product is purchased
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_activate_subscription(  $order_id = 0 ) {
+		if ( 0 < intval( $order_id ) ) {
+			$order = new WC_Order( $order_id );
+			$user = get_user_by('id', $order->user_id);
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if (sizeof($order->get_items())>0) {
+				foreach($order->get_items() as $item) {
+					$product_type = '';
+					if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+						$item_id = $item['variation_id'];
+						$product_type = 'subscription_variation';
+					} else {
+						$item_id = $item['product_id'];
+					} // End If Statement
+					$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+					// Get courses that use the WC product
+					$courses = array();
+					if ( $product_type == 'subscription_variation' ) {
+						$courses = $this->post_types->course->get_product_courses( $item_id );
+					} // End If Statement
+					// Loop and update those courses
+					foreach ($courses as $course_item){
+						$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+					} // End For Loop
+				} // End For Loop
+			} // End If Statement
+		} // End If Statement
+	} // End sensei_activate_subscription()
+
+	/**
+	 * sensei_woocommerce_email_course_details adds detail to email
+	 * @since   1.4.5
+	 * @access  public
+	 * @param   WC_Order $order
+	 * @return  void
+	 */
+	public function sensei_woocommerce_email_course_details( $order ) {
+		global $woocommerce;
+
+		// exit early if not wc-completed or wc-processing
+		if( 'wc-completed' != $order->post_status
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
+
+		$order_items = $order->get_items();
+		$order_id = $order->id;
+
+		//If object have items go through them all to find course
+		if ( 0 < sizeof( $order_items ) ) {
+
+			$course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+			$order_contains_courses = false;
+
+
+			foreach ( $order_items as $item ) {
+
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					// If item has variation_id then its from variation
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					// If not its real product set its id to item_id
+					$item_id = $item['product_id'];
+				} // End If Statement
+
+				$user_id = get_post_meta( $order_id, '_customer_user', true );
+
+				if( $user_id ) {
+
+					// Get all courses for product
+					$args = array(
+						'posts_per_page' => -1,
+						'post_type' => 'course',
+						'meta_query' => array(
+							array(
+								'key' => '_course_woocommerce_product',
+								'value' => $item_id
+							)
+						),
+						'orderby' => 'menu_order date',
+						'order' => 'ASC',
+					);
+					$courses = get_posts( $args );
+
+					if( $courses && count( $courses ) > 0 ) {
+
+						foreach( $courses as $course ) {
+
+							$title = $course->post_title;
+							$permalink = get_permalink( $course->ID );
+							$order_contains_courses = true;
+							$course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+						}
+
+
+					} // end if has courses
+
+				} // end if $userPid
+
+			} // end for each order item
+
+			// Output Course details
+			if( $order_contains_courses ){
+
+				echo $course_details_html;
+
+			}
+
+
+		} // end if  order items not empty
+
+	} // end func email course details
+
+	/**
+	 * 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>
@@ -1354,46 +1354,46 @@ 
 
     <?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(){
+	/**
+	 * 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 ) {
+		// 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');
+			update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+		}elseif( '2' == $option ) {
 
-            flush_rewrite_rules();
-            update_option('sensei_flush_rewrite_rules', '0');
+			flush_rewrite_rules();
+			update_option('sensei_flush_rewrite_rules', '0');
 
-        }
+		}
 
-    } // end flush_rewrite_rules
+	} // 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(){
+	/**
+	 * 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');
+		update_option('sensei_flush_rewrite_rules', '1');
 
-    }
+	}
 
 } // End Class
 

includes/class-sensei-utils.php

Indentation +492 added lines, -492 removed lines

@@ -25,8 +25,8 @@ 
 
 	/**
 	 * Check if WooCommerce is present.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -34,14 +34,14 @@ 
 	 */
 	public static function sensei_is_woocommerce_present () {
 
-        return Sensei_WC::is_woocommerce_present();
+		return Sensei_WC::is_woocommerce_present();
 
 	} // End sensei_is_woocommerce_present()
 
 	/**
 	 * Check if WooCommerce is active.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -186,15 +186,15 @@ 
 			add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
 		}
 
-        //Get the comments
-        /**
-         * This filter runs inside Sensei_Utils::sensei_check_for_activity
-         *
-         * It runs while getting the comments for the given request.
-         *
-         * @param int|array $comments
-         */
-        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
+		//Get the comments
+		/**
+		 * This filter runs inside Sensei_Utils::sensei_check_for_activity
+		 *
+		 * It runs while getting the comments for the given request.
+		 *
+		 * @param int|array $comments
+		 */
+		$comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
 
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
@@ -279,18 +279,18 @@ 
 		return $dataset_changes;
 	} // End sensei_delete_activities()
 
-    /**
-     * Delete all activity for specified user
-     * @access public
+	/**
+	 * Delete all activity for specified user
+	 * @access public
 	 * @since  1.5.0
-     * @param  integer $user_id User ID
-     * @return boolean
-     */
-    public static function delete_all_user_activity( $user_id = 0 ) {
+	 * @param  integer $user_id User ID
+	 * @return boolean
+	 */
+	public static function delete_all_user_activity( $user_id = 0 ) {
 
-    	$dataset_changes = false;
+		$dataset_changes = false;
 
-    	if( $user_id ) {
+		if( $user_id ) {
 
 			$activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true );
 
@@ -335,35 +335,35 @@ 
 		return $activity_value;
 	} // End sensei_get_activity_value()
 
-    /**
-     * Checks if a user (by email) has bought an item.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::has_customer_bought_product($user_id, $product_id)
-     * @access public
-     * @since  1.0.0
-     * @param  string $customer_email
-     * @param  int $user_id
-     * @param  int $product_id
-     * @return bool
-     */
-    public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
+	/**
+	 * Checks if a user (by email) has bought an item.
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::has_customer_bought_product($user_id, $product_id)
+	 * @access public
+	 * @since  1.0.0
+	 * @param  string $customer_email
+	 * @param  int $user_id
+	 * @param  int $product_id
+	 * @return bool
+	 */
+	public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
 
-        $emails = array();
+		$emails = array();
 
-        if ( $user_id ) {
-            $user = get_user_by( 'id', intval( $user_id ) );
-            $emails[] = $user->user_email;
-        }
+		if ( $user_id ) {
+			$user = get_user_by( 'id', intval( $user_id ) );
+			$emails[] = $user->user_email;
+		}
 
-        if ( is_email( $customer_email ) )
-            $emails[] = $customer_email;
+		if ( is_email( $customer_email ) )
+			$emails[] = $customer_email;
 
-        if ( sizeof( $emails ) == 0 )
-            return false;
+		if ( sizeof( $emails ) == 0 )
+			return false;
 
-        return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
+		return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
 
-    } // End sensei_customer_bought_product()
+	} // End sensei_customer_bought_product()
 
 	/**
 	 * Load the WordPress rich text editor
@@ -399,7 +399,7 @@ 
 	/**
 	 * Save quiz answers submitted by users
 	 * @param  array $submitted User's quiz answers
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean            Whether the answers were saved or not
 	 */
 	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) {
@@ -468,72 +468,72 @@ 
 
 		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 
-        /**
-         * Filter the data array for the Sensei wp_handle_upload function call
-         *
-         * This filter was mainly added for Unit Testing purposes.
-         *
-         * @since 1.7.4
-         *
-         * @param array  $file_upload_args {
-         *      array of current values
-         *
-         *     @type string test_form set to false by default
-         * }
-         */
-        $file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) );
-
-        $file_return = wp_handle_upload( $file, $file_upload_args );
-
-        if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
-            return false;
-        } else {
+		/**
+		 * Filter the data array for the Sensei wp_handle_upload function call
+		 *
+		 * This filter was mainly added for Unit Testing purposes.
+		 *
+		 * @since 1.7.4
+		 *
+		 * @param array  $file_upload_args {
+		 *      array of current values
+		 *
+		 *     @type string test_form set to false by default
+		 * }
+		 */
+		$file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) );
+
+		$file_return = wp_handle_upload( $file, $file_upload_args );
+
+		if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
+			return false;
+		} else {
 
-            $filename = $file_return['file'];
+			$filename = $file_return['file'];
 
-            $attachment = array(
-                'post_mime_type' => $file_return['type'],
-                'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
-                'post_content' => '',
-                'post_status' => 'inherit',
-                'guid' => $file_return['url']
-            );
+			$attachment = array(
+				'post_mime_type' => $file_return['type'],
+				'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
+				'post_content' => '',
+				'post_status' => 'inherit',
+				'guid' => $file_return['url']
+			);
 
-            $attachment_id = wp_insert_attachment( $attachment, $filename );
+			$attachment_id = wp_insert_attachment( $attachment, $filename );
 
-            require_once(ABSPATH . 'wp-admin/includes/image.php');
-            $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-            wp_update_attachment_metadata( $attachment_id, $attachment_data );
+			require_once(ABSPATH . 'wp-admin/includes/image.php');
+			$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+			wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-            if( 0 < intval( $attachment_id ) ) {
-            	return $attachment_id;
-            }
-        }
+			if( 0 < intval( $attachment_id ) ) {
+				return $attachment_id;
+			}
+		}
 
-        return false;
+		return false;
 	}
 
 	/**
 	 * Grade quiz automatically
-     *
-     * This function grades each question automatically if the are auto gradable.
-     * It store all question grades.
-     *
-     * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_quiz_auto instead
-     *
+	 *
+	 * This function grades each question automatically if the are auto gradable.
+	 * It store all question grades.
+	 *
+	 * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_quiz_auto instead
+	 *
 	 * @param  integer $quiz_id         ID of quiz
 	 * @param  array $submitted questions id ans answers {
-     *          @type int $question_id
-     *          @type mixed $answer
-     * }
+	 *          @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
-     *
+	 * @param string $quiz_grade_type Optional defaults to auto
+	 *
 	 * @return int $quiz_grade total sum of all question grades
 	 */
 	public static function sensei_grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
 
-        return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type );
+		return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type );
 
 	} // End sensei_grade_quiz_auto()
 
@@ -542,7 +542,7 @@ 
 	 * @param  integer $quiz_id ID of quiz
 	 * @param  integer $grade   Grade received
 	 * @param  integer $user_id ID of user being graded
-     * @param  string $quiz_grade_type default 'auto'
+	 * @param  string $quiz_grade_type default 'auto'
 	 * @return boolean
 	 */
 	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) {
@@ -566,21 +566,21 @@ 
 
 	/**
 	 * Grade question automatically
-     *
-     * This function checks the question typ and then grades it accordingly.
-     *
-     * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_question_auto instead
-     *
+	 *
+	 * This function checks the question typ and then grades it accordingly.
+	 *
+	 * @deprecated since 1.7.4 use WooThemes_Sensei_Grading::grade_question_auto instead
+	 *
 	 * @param integer $question_id
-     * @param string $question_type of the standard Sensei question types
+	 * @param string $question_type of the standard Sensei question types
 	 * @param string $answer
-     * @param int $user_id
-     *
+	 * @param int $user_id
+	 *
 	 * @return int $question_grade
 	 */
 	public static function sensei_grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
 
-       return  WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id  );
+	   return  WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id  );
 
 	} // end sensei_grade_question_auto
 
@@ -588,7 +588,7 @@ 
 	 * Grade question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $grade       Grade received
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean
 	 */
 	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) {
@@ -627,35 +627,35 @@ 
 	}
 
 
-    /**
-     * Alias to Woothemes_Sensei_Utils::sensei_start_lesson
-     *
-     * @since 1.7.4
-     *
-     * @param integer $user_id
-     * @param integer $lesson_id
-     * @param bool $complete
-     *
-     * @return mixed boolean or comment_ID
-     */
-    public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
+	/**
+	 * Alias to Woothemes_Sensei_Utils::sensei_start_lesson
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param integer $user_id
+	 * @param integer $lesson_id
+	 * @param bool $complete
+	 *
+	 * @return mixed boolean or comment_ID
+	 */
+	public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
 
-        return self::sensei_start_lesson( $lesson_id, $user_id, $complete );
+		return self::sensei_start_lesson( $lesson_id, $user_id, $complete );
 
-    }// end user_start_lesson()
+	}// end user_start_lesson()
 
 	/**
 	 * Mark a lesson as started for user
-     *
-     * Will also start the lesson course for the user if the user hans't started taking it already.
-     *
-     * @since 1.6.0
-     *
+	 *
+	 * Will also start the lesson course for the user if the user hans't started taking it already.
+	 *
+	 * @since 1.6.0
+	 *
 	 * @param  integer $lesson_id ID of lesson
 	 * @param int| string $user_id default 0
-     * @param bool $complete default false
-     *
-     * @return mixed boolean or comment_ID
+	 * @param bool $complete default false
+	 *
+	 * @return mixed boolean or comment_ID
 	 */
 	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
 
@@ -701,21 +701,21 @@ 
 				$metadata['start'] = current_time('mysql');
 				$activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata );
 
-            } else {
+			} else {
 
-                // if users is already taking the lesson  and the status changes to complete update it
-                $current_user_activity = get_comment($activity_logged);
-                if( $status=='complete' &&
-                    $status != $current_user_activity->comment_approved  ){
+				// if users is already taking the lesson  and the status changes to complete update it
+				$current_user_activity = get_comment($activity_logged);
+				if( $status=='complete' &&
+					$status != $current_user_activity->comment_approved  ){
 
-                    $comment = array();
-                    $comment['comment_ID'] = $activity_logged;
-                    $comment['comment_approved'] = $status;
-                    wp_update_comment( $comment );
+					$comment = array();
+					$comment['comment_ID'] = $activity_logged;
+					$comment['comment_approved'] = $status;
+					wp_update_comment( $comment );
 
-                }
+				}
 
-            }
+			}
 
 			if ( $complete ) {
 				// Run this *after* the lesson status has been created/updated
@@ -861,7 +861,7 @@ 
 	/**
 	 * Returns the answer_notes for a specific question and user, or sensei_user_answer entry
 	 *
-     * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
+	 * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
 	 * @param mixed $question
 	 * @param int $user_id
 	 * @return string
@@ -921,7 +921,7 @@ 
 	 * Add answer notes to question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $user_id     ID of user
-     * @param string $notes
+	 * @param string $notes
 	 * @return boolean
 	 */
 	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) {
@@ -979,17 +979,17 @@ 
 	 * @return void
 	 */
 	public static function sort_array_by_key( $array, $key ) {
-	    $sorter = array();
-	    $ret = array();
-	    reset( $array );
-	    foreach ( $array as $ii => $va ) {
-	        $sorter[$ii] = $va[$key];
-	    } // End For Loop
-	    asort( $sorter );
-	    foreach ( $sorter as $ii => $va ) {
-	        $ret[$ii] = $array[$ii];
-	    } // End For Loop
-	    $array = $ret;
+		$sorter = array();
+		$ret = array();
+		reset( $array );
+		foreach ( $array as $ii => $va ) {
+			$sorter[$ii] = $va[$key];
+		} // End For Loop
+		asort( $sorter );
+		foreach ( $sorter as $ii => $va ) {
+			$ret[$ii] = $array[$ii];
+		} // End For Loop
+		$array = $ret;
 	} // End sort_array_by_key()
 
 	/**
@@ -1002,21 +1002,21 @@ 
 		$questions_array = array();
 		if ( 0 < $quiz_id ) {
 			$question_args = array( 'post_type'         => 'question',
-                                    'posts_per_page'       => -1,
-                                    'orderby'           => 'ID',
-                                    'order'             => 'ASC',
-                                    'meta_query'		=> array(
+									'posts_per_page'       => -1,
+									'orderby'           => 'ID',
+									'order'             => 'ASC',
+									'meta_query'		=> array(
 										array(
 											'key'       => '_quiz_id',
 											'value'     => $quiz_id,
 										)
 									),
-                                    'post_status'       => 'any',
-                                    'suppress_filters'  => 0
-                                );
-            $questions_array = get_posts( $question_args );
-        } // End If Statement
-        return $questions_array;
+									'post_status'       => 'any',
+									'suppress_filters'  => 0
+								);
+			$questions_array = get_posts( $question_args );
+		} // End If Statement
+		return $questions_array;
 	} // End lesson_quiz_questions()
 
 	/**
@@ -1174,7 +1174,7 @@ 
 	 * Set the status message displayed to the user for a quiz
 	 * @param  integer $lesson_id ID of quiz lesson
 	 * @param  integer $user_id   ID of user
-     * @param  bool $is_lesson
+	 * @param  bool $is_lesson
 	 * @return array              Status code and message
 	 */
 	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) {
@@ -1257,20 +1257,20 @@ 
 					}
 				}
 
-                // add next lesson button
-                $nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
-                $next_lesson_id = absint( $nav_id_array['next_lesson'] );
+				// add next lesson button
+				$nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
+				$next_lesson_id = absint( $nav_id_array['next_lesson'] );
 
-                // Output HTML
-                if ( ( 0 < $next_lesson_id ) ) {
-                    $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
-                                . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
-                                .'</a>';
+				// Output HTML
+				if ( ( 0 < $next_lesson_id ) ) {
+					$message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
+								. '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
+								.'</a>';
 
-                }
+				}
 
 			}
-            // Lesson/Quiz not complete
+			// Lesson/Quiz not complete
 			else {
 				// Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete)
 				if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) {
@@ -1310,7 +1310,7 @@ 
 		$message = apply_filters( 'sensei_user_quiz_status_' . $status, $message );
 
 		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) {
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 			$extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' .  __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' .  __( 'View the lesson quiz', 'woothemes-sensei' )  . '</a></p>';
 		}
 
@@ -1368,9 +1368,9 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            if( ! $user_id > 0 ){
-                return false;
-            }
+			if( ! $user_id > 0 ){
+				return false;
+			}
 
 			$user_course_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID' ) );
 			if( $user_course_status_id ) {
@@ -1494,7 +1494,7 @@ 
 	 * Check if a user has completed a course or not
 	 *
 	 * @param int | WP_Post | WP_Comment $course course_id or sensei_course_status entry
-     *
+	 *
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1512,14 +1512,14 @@ 
 					$user_id = get_current_user_id();
 				}
 
-                if( is_a( $course, 'WP_Post' ) ){
-                    $course =   $course->ID;
-                }
+				if( is_a( $course, 'WP_Post' ) ){
+					$course =   $course->ID;
+				}
 
 				$user_course_status = Sensei_Utils::user_course_status( $course , $user_id );
 				if( isset( $user_course_status->comment_approved ) ){
-                    $user_course_status = $user_course_status->comment_approved;
-                }
+					$user_course_status = $user_course_status->comment_approved;
+				}
 
 			}
 			if( $user_course_status && 'complete' == $user_course_status ) {
@@ -1544,11 +1544,11 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            $activity_args = array(
-                'post_id' => $lesson_id,
-                'user_id' => $user_id,
-                'type' => 'sensei_lesson_status',
-                'field' => 'comment_ID' );
+			$activity_args = array(
+				'post_id' => $lesson_id,
+				'user_id' => $user_id,
+				'type' => 'sensei_lesson_status',
+				'field' => 'comment_ID' );
 
 			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
 			if( $user_lesson_status_id ) {
@@ -1561,7 +1561,7 @@ 
 	/**
 	 * Check if a user has completed a lesson or not
 	 *
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @param mixed $lesson lesson_id or sensei_lesson_status entry
 	 * @param int $user_id
 	 * @return boolean
@@ -1582,10 +1582,10 @@ 
 					$user_id = get_current_user_id();
 				}
 
-                // the user is not logged in
-                if( ! $user_id > 0 ){
-                    return false;
-                }
+				// the user is not logged in
+				if( ! $user_id > 0 ){
+					return false;
+				}
 				$_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id );
 
 				if ( $_user_lesson_status ) {
@@ -1664,9 +1664,9 @@ 
 	 */
 	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
 
-        if( ! $user_id ) {
-            $user_id = get_current_user_id();
-        }
+		if( ! $user_id ) {
+			$user_id = get_current_user_id();
+		}
 
 		if( $lesson_id > 0 && $user_id > 0 ) {
 
@@ -1717,12 +1717,12 @@ 
 	 * Sets the status for the lesson
 	 *
 	 * @since  1.7.0
-     *
+	 *
 	 * @param int|string $user_id
 	 * @param int|string $lesson_id
 	 * @param string $status
 	 * @param array $metadata
-     *
+	 *
 	 * @return mixed false or comment_ID
 	 */
 	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
@@ -1838,7 +1838,7 @@ 
 	/**
 	 * Adjust the comment query to be faster on the database, used by Analysis admin
 	 * @since  1.7.0
-     * @param array $pieces
+	 * @param array $pieces
 	 * @return array $pieces
 	 */
 	public static function comment_total_sum_meta_value_filter( $pieces ) {
@@ -1873,360 +1873,360 @@ 
 		return $pieces;
 	}
 
-    /**
-     *
-     * Alias to Woothemes_Sensei_Utils::update_user_data
-     * @since 1.7.4
-     *
-     * @param string $data_key maximum 39 characters allowed
-     * @param int $post_id
-     * @param mixed $value
-     * @param int $user_id
-     *
-     * @return bool $success
-     */
-    public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){
-
-        return self::update_user_data( $data_key, $post_id, $value , $user_id );
-
-    }// end add_user_data
-
-    /**
-     * add user specific data to the passed in sensei post type id
-     *
-     * This function saves comment meta on the users current status. If no status is available
-     * status will be created. It only operates on the available sensei Post types: course, lesson, quiz.
-     *
-     * @since 1.7.4
-     *
-     * @param string $data_key maximum 39 characters allowed
-     * @param int $post_id
-     * @param mixed $value
-     * @param int $user_id
-     *
-     * @return bool $success
-     */
-    public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){
-
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
-
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || !get_userdata( $user_id )
-            || ! in_array( $post_type, $supported_post_types )  ){
-
-            return false;
-        }
-
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-
-            $start_function = 'user_start_'.$post_type;
-            $sensei_user_activity_id = self::$start_function( $user_id, $post_id );
-
-        }else{
-
-            $sensei_user_activity_id = $sensei_user_status->comment_ID;
-
-        }
-
-        // store the data
-        $success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
-
-       return $success;
-
-    }//update_user_data
-
-    /**
-     * Get the user data stored on the passed in post type
-     *
-     * This function gets the comment meta on the lesson or course status
-     *
-     * @since 1.7.4
-     *
-     * @param $data_key
-     * @param $post_id
-     * @param int $user_id
-     *
-     * @return mixed $user_data_value
-     */
-    public static function get_user_data( $data_key, $post_id, $user_id = 0  ){
-
-        $user_data_value = true;
-
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
-
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
-
-            return false;
-        }
-
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-            return false;
-        }
-
-        $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true );
-
-        return $user_data_value;
-
-    }// end get_user_data
-
-    /**
-     * Delete the Sensei user data for the given key, Sensei post type and user combination.
-     *
-     * @param int $data_key
-     * @param int $post_id
-     * @param int $user_id
-     *
-     * @return bool $deleted
-     */
-    public static function delete_user_data( $data_key, $post_id , $user_id ){
-        $deleted = true;
+	/**
+	 *
+	 * Alias to Woothemes_Sensei_Utils::update_user_data
+	 * @since 1.7.4
+	 *
+	 * @param string $data_key maximum 39 characters allowed
+	 * @param int $post_id
+	 * @param mixed $value
+	 * @param int $user_id
+	 *
+	 * @return bool $success
+	 */
+	public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){
+
+		return self::update_user_data( $data_key, $post_id, $value , $user_id );
+
+	}// end add_user_data
+
+	/**
+	 * add user specific data to the passed in sensei post type id
+	 *
+	 * This function saves comment meta on the users current status. If no status is available
+	 * status will be created. It only operates on the available sensei Post types: course, lesson, quiz.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param string $data_key maximum 39 characters allowed
+	 * @param int $post_id
+	 * @param mixed $value
+	 * @param int $user_id
+	 *
+	 * @return bool $success
+	 */
+	public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){
+
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
+
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| !get_userdata( $user_id )
+			|| ! in_array( $post_type, $supported_post_types )  ){
+
+			return false;
+		}
+
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
+
+			$start_function = 'user_start_'.$post_type;
+			$sensei_user_activity_id = self::$start_function( $user_id, $post_id );
+
+		}else{
+
+			$sensei_user_activity_id = $sensei_user_status->comment_ID;
+
+		}
+
+		// store the data
+		$success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
+
+	   return $success;
+
+	}//update_user_data
+
+	/**
+	 * Get the user data stored on the passed in post type
+	 *
+	 * This function gets the comment meta on the lesson or course status
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param $data_key
+	 * @param $post_id
+	 * @param int $user_id
+	 *
+	 * @return mixed $user_data_value
+	 */
+	public static function get_user_data( $data_key, $post_id, $user_id = 0  ){
+
+		$user_data_value = true;
+
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
+
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| ! get_userdata( $user_id )
+			|| !in_array( $post_type, $supported_post_types )  ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+			return false;
+		}
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
+			return false;
+		}
 
-            return false;
-        }
+		$sensei_user_activity_id = $sensei_user_status->comment_ID;
+		$user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true );
+
+		return $user_data_value;
+
+	}// end get_user_data
+
+	/**
+	 * Delete the Sensei user data for the given key, Sensei post type and user combination.
+	 *
+	 * @param int $data_key
+	 * @param int $post_id
+	 * @param int $user_id
+	 *
+	 * @return bool $deleted
+	 */
+	public static function delete_user_data( $data_key, $post_id , $user_id ){
+		$deleted = true;
+
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
+
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| ! get_userdata( $user_id )
+			|| !in_array( $post_type, $supported_post_types )  ){
+
+			return false;
+		}
 
-        // check if there and existing Sensei status on this post type if not create it
-        // and get the  activity ID
-        $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
-            return false;
-        }
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
+			return false;
+		}
 
-        $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
+		$sensei_user_activity_id = $sensei_user_status->comment_ID;
+		$deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
 
-        return $deleted;
+		return $deleted;
 
-    }// end delete_user_data
+	}// end delete_user_data
 
 
-    /**
-     * The function creates a drop down. Never write up a Sensei select statement again.
-     *
-     * @since 1.8.0
-     *
-     * @param string $selected_value
-     * @param $options{
-     *    @type string $value the value saved in the database
-     *    @type string $option what the user will see in the list of items
-     * }
-     * @param array $attributes{
-     *   @type string $attribute  type such name or id etc.
-     *  @type string $value
-     * }
-     * @param bool $enable_none_option
-     *
-     * @return string $drop_down_element
-     */
-    public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) {
+	/**
+	 * The function creates a drop down. Never write up a Sensei select statement again.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $selected_value
+	 * @param $options{
+	 *    @type string $value the value saved in the database
+	 *    @type string $option what the user will see in the list of items
+	 * }
+	 * @param array $attributes{
+	 *   @type string $attribute  type such name or id etc.
+	 *  @type string $value
+	 * }
+	 * @param bool $enable_none_option
+	 *
+	 * @return string $drop_down_element
+	 */
+	public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) {
 
-        $drop_down_element = '';
+		$drop_down_element = '';
 
-        // setup the basic attributes
-        if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
+		// setup the basic attributes
+		if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
 
-            $attributes['name'] = 'sensei-options';
+			$attributes['name'] = 'sensei-options';
 
-        }
+		}
 
-        if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
+		if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
 
-            $attributes['id'] = 'sensei-options';
+			$attributes['id'] = 'sensei-options';
 
-        }
+		}
 
-        if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+		if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
 
-            $attributes['class'] ='chosen_select widefat';
+			$attributes['class'] ='chosen_select widefat';
 
-        }
+		}
 
-        // create element attributes
-        $combined_attributes = '';
-        foreach( $attributes as $attribute => $value ){
+		// create element attributes
+		$combined_attributes = '';
+		foreach( $attributes as $attribute => $value ){
 
-            $combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+			$combined_attributes .= $attribute . '="'.$value.'"' . ' ';
 
-        }// end for each
+		}// end for each
 
 
-        // create the select element
-        $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
+		// create the select element
+		$drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
 
-        // show the none option if the client requested
-        if( $enable_none_option ) {
-            $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
-        }
+		// show the none option if the client requested
+		if( $enable_none_option ) {
+			$drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+		}
 
-        if ( count( $options ) > 0 ) {
+		if ( count( $options ) > 0 ) {
 
-            foreach ($options as $value => $option ){
+			foreach ($options as $value => $option ){
 
-                $element = '';
-                $element.= '<option value="' . esc_attr( $value ) . '"';
-                $element .= selected( $value, $selected_value, false ) . '>';
-                $element .= esc_html(  $option ) . '</option>' . "\n";
+				$element = '';
+				$element.= '<option value="' . esc_attr( $value ) . '"';
+				$element .= selected( $value, $selected_value, false ) . '>';
+				$element .= esc_html(  $option ) . '</option>' . "\n";
 
-                // add the element to the select html
-                $drop_down_element.= $element;
-            } // End For Loop
+				// add the element to the select html
+				$drop_down_element.= $element;
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-        $drop_down_element .= '</select>' . "\n";
+		$drop_down_element .= '</select>' . "\n";
 
-        return $drop_down_element;
+		return $drop_down_element;
 
-    }// generate_drop_down
+	}// generate_drop_down
 
-    /**
-     * Wrapper for the default php round() function.
-     * This allows us to give more control to a user on how they can round Sensei
-     * decimals passed through this function.
-     *
-     * @since 1.8.5
-     *
-     * @param double $val
-     * @param int $precision
-     * @param $mode
-     * @param string $context
-     *
-     * @return double $val
-     */
-    public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){
+	/**
+	 * Wrapper for the default php round() function.
+	 * This allows us to give more control to a user on how they can round Sensei
+	 * decimals passed through this function.
+	 *
+	 * @since 1.8.5
+	 *
+	 * @param double $val
+	 * @param int $precision
+	 * @param $mode
+	 * @param string $context
+	 *
+	 * @return double $val
+	 */
+	public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){
 
-        /**å
+		/**å
          * Change the precision for the Sensei_Utils::round function.
          * the precision given will be passed into the php round function
          * @since 1.8.5
          */
-        $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
-
-        /**
-         * Change the mode for the Sensei_Utils::round function.
-         * the mode given will be passed into the php round function
-         *
-         * This applies only to PHP version 5.3.0 and greater
-         *
-         * @since 1.8.5
-         */
-        $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
+		$precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
+
+		/**
+		 * Change the mode for the Sensei_Utils::round function.
+		 * the mode given will be passed into the php round function
+		 *
+		 * This applies only to PHP version 5.3.0 and greater
+		 *
+		 * @since 1.8.5
+		 */
+		$mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
 
-        if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
+		if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
 
-            return round( $val, $precision, $mode );
+			return round( $val, $precision, $mode );
 
-        }else{
+		}else{
 
-            return round( $val, $precision );
+			return round( $val, $precision );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Returns the current url with all the query vars
-     *
-     * @since 1.9.0
-     * @return string $url
-     */
-    public static function get_current_url(){
+	/**
+	 * Returns the current url with all the query vars
+	 *
+	 * @since 1.9.0
+	 * @return string $url
+	 */
+	public static function get_current_url(){
 
-        global $wp;
-        $current_url = trailingslashit( home_url( $wp->request ) );
-        if ( isset( $_GET ) ) {
+		global $wp;
+		$current_url = trailingslashit( home_url( $wp->request ) );
+		if ( isset( $_GET ) ) {
 
-            foreach ($_GET as $param => $val ) {
+			foreach ($_GET as $param => $val ) {
 
-                $current_url = add_query_arg( $param, $val , $current_url );
+				$current_url = add_query_arg( $param, $val , $current_url );
 
-            }
-        }
+			}
+		}
 
-        return $current_url;
-    }
+		return $current_url;
+	}
 
-    /**
-     * Restore the global WP_Query
-     *
-     * @since 1.9.0
-     */
-    public static function restore_wp_query() {
+	/**
+	 * Restore the global WP_Query
+	 *
+	 * @since 1.9.0
+	 */
+	public static function restore_wp_query() {
 
-        wp_reset_query();
+		wp_reset_query();
 
-    }
+	}
 
-    /**
-     * Merge two arrays in a zip like fashion.
-     * If one array is longer than the other the elements will be apended
-     * to the end of the resulting array.
-     *
-     * @since 1.9.0
-     *
-     * @param array $array_a
-     * @param array $array_b
-     * @return array $merged_array
-     */
-    public static function array_zip_merge( $array_a, $array_b ){
+	/**
+	 * Merge two arrays in a zip like fashion.
+	 * If one array is longer than the other the elements will be apended
+	 * to the end of the resulting array.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $array_a
+	 * @param array $array_b
+	 * @return array $merged_array
+	 */
+	public static function array_zip_merge( $array_a, $array_b ){
 
-        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
-            trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
-        }
+		if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
+			trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
+		}
 
-        $merged_array = array();
-        $total_elements = count( $array_a )  + count( $array_b );
+		$merged_array = array();
+		$total_elements = count( $array_a )  + count( $array_b );
 
-        // Zip arrays
-        for ( $i = 0; $i < $total_elements; $i++) {
+		// Zip arrays
+		for ( $i = 0; $i < $total_elements; $i++) {
 
-            // if has an element at current index push a on top
-            if( isset( $array_a[ $i ] ) ){
-                $merged_array[] = $array_a[ $i ]  ;
-            }
+			// if has an element at current index push a on top
+			if( isset( $array_a[ $i ] ) ){
+				$merged_array[] = $array_a[ $i ]  ;
+			}
 
-            // next if $array_b has an element at current index push a on top of the element
-            // from a if there was one, if not the element before that.
-            if( isset( $array_b[ $i ] ) ){
-                $merged_array[] = $array_b[ $i ]  ;
-            }
+			// next if $array_b has an element at current index push a on top of the element
+			// from a if there was one, if not the element before that.
+			if( isset( $array_b[ $i ] ) ){
+				$merged_array[] = $array_b[ $i ]  ;
+			}
 
-        }
+		}
 
-        return $merged_array;
-    }
+		return $merged_array;
+	}
 
 } // End Class
 

Spacing +531 added lines, -531 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Utilities Class
@@ -18,9 +18,9 @@ 
 	 * @since   1.0.0
 	 * @return  string The URL to the placeholder thumbnail image.
 	 */
-	public static function get_placeholder_image () {
+	public static function get_placeholder_image() {
 
-		return esc_url( apply_filters( 'sensei_placeholder_thumbnail', Sensei()->plugin_url . 'assets/images/placeholder.png' ) );
+		return esc_url(apply_filters('sensei_placeholder_thumbnail', Sensei()->plugin_url.'assets/images/placeholder.png'));
 	} // End get_placeholder_image()
 
 	/**
@@ -32,7 +32,7 @@ 
 	 * @static
 	 * @return bool
 	 */
-	public static function sensei_is_woocommerce_present () {
+	public static function sensei_is_woocommerce_present() {
 
         return Sensei_WC::is_woocommerce_present();
 
@@ -47,7 +47,7 @@ 
 	 * @static
 	 * @return boolean
 	 */
-	public static function sensei_is_woocommerce_activated () {
+	public static function sensei_is_woocommerce_activated() {
 
 		return  Sensei_WC::is_woocommerce_active();
 
@@ -60,70 +60,70 @@ 
 	 * @param  array $args (default: array())
 	 * @return bool | int
 	 */
-	public static function sensei_log_activity ( $args = array() ) {
+	public static function sensei_log_activity($args = array()) {
 		global $wpdb;
 
 		// Args, minimum data required for WP
 		$data = array(
-					'comment_post_ID' => intval( $args['post_id'] ),
+					'comment_post_ID' => intval($args['post_id']),
 					'comment_author' => '', // Not needed
 					'comment_author_email' => '', // Not needed
 					'comment_author_url' => '', // Not needed
-					'comment_content' => !empty($args['data']) ? esc_html( $args['data'] ) : '',
-					'comment_type' => esc_attr( $args['type'] ),
-					'user_id' => intval( $args['user_id'] ),
-					'comment_approved' => !empty($args['status']) ? esc_html( $args['status'] ) : 'log', // 'log' == 'sensei_user_answer'
+					'comment_content' => ! empty($args['data']) ? esc_html($args['data']) : '',
+					'comment_type' => esc_attr($args['type']),
+					'user_id' => intval($args['user_id']),
+					'comment_approved' => ! empty($args['status']) ? esc_html($args['status']) : 'log', // 'log' == 'sensei_user_answer'
 				);
 		// Allow extra data
-		if ( !empty($args['username']) ) {
-			$data['comment_author'] = sanitize_user( $args['username'] );
+		if ( ! empty($args['username'])) {
+			$data['comment_author'] = sanitize_user($args['username']);
 		}
-		if ( !empty($args['user_email']) ) {
-			$data['comment_author_email'] = sanitize_email( $args['user_email'] );
+		if ( ! empty($args['user_email'])) {
+			$data['comment_author_email'] = sanitize_email($args['user_email']);
 		}
-		if ( !empty($args['user_url']) ) {
-			$data['comment_author_url'] = esc_url( $args['user_url'] );
+		if ( ! empty($args['user_url'])) {
+			$data['comment_author_url'] = esc_url($args['user_url']);
 		}
-		if ( !empty($args['parent']) ) {
+		if ( ! empty($args['parent'])) {
 			$data['comment_parent'] = $args['parent'];
 		}
 		// Sanity check
-		if ( empty($args['user_id']) ) {
-			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') );
+		if (empty($args['user_id'])) {
+			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei'));
 			return false;
 		}
 
-		do_action( 'sensei_log_activity_before', $args, $data );
+		do_action('sensei_log_activity_before', $args, $data);
 
 		$flush_cache = false;
 
 		// Custom Logic
 		// Check if comment exists first
-		$comment_id = $wpdb->get_var( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'] ) );
-		if ( ! $comment_id ) {
+		$comment_id = $wpdb->get_var($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type']));
+		if ( ! $comment_id) {
 			// Add the comment
-			$comment_id = wp_insert_comment( $data );
+			$comment_id = wp_insert_comment($data);
 
 			$flush_cache = true;
-		} elseif ( isset( $args['action'] ) && 'update' == $args['action'] ) {
+		} elseif (isset($args['action']) && 'update' == $args['action']) {
 			// Update the comment if an update was requested
 			$data['comment_ID'] = $comment_id;
 			// By default update the timestamp of the comment
-			if ( empty($args['keep_time']) ) {
+			if (empty($args['keep_time'])) {
 				$data['comment_date'] = current_time('mysql');
 			}
-			wp_update_comment( $data );
+			wp_update_comment($data);
 			$flush_cache = true;
 		} // End If Statement
 
 		// Manually Flush the Cache
-		if ( $flush_cache ) {
+		if ($flush_cache) {
 			wp_cache_flush();
 		}
 
-		do_action( 'sensei_log_activity_after', $args, $data,  $comment_id );
+		do_action('sensei_log_activity_after', $args, $data, $comment_id);
 
-		if ( 0 < $comment_id ) {
+		if (0 < $comment_id) {
 			// Return the ID so that it can be used for meta data storage
 			return $comment_id;
 		} else {
@@ -140,41 +140,41 @@ 
 	 * @param  bool $return_comments (default: false)
 	 * @return mixed | int
 	 */
-	public static function sensei_check_for_activity ( $args = array(), $return_comments = false ) {
+	public static function sensei_check_for_activity($args = array(), $return_comments = false) {
 
 		global  $wp_version;
-		if ( !$return_comments ) {
+		if ( ! $return_comments) {
 			$args['count'] = true;
 		}
 
 		// Are we only retrieving a single entry, or not care about the order...
-		if ( isset( $args['count'] ) || isset( $args['post_id'] ) ){
+		if (isset($args['count']) || isset($args['post_id'])) {
 
 			// ...then we don't need to ask the db to order the results, this overrides WP default behaviour
-			if ( version_compare( $wp_version, '4.1', '>=' ) ) {
+			if (version_compare($wp_version, '4.1', '>=')) {
 				$args['order'] = false;
 				$args['orderby'] = false;
 			}
 		}
 
 		// A user ID of 0 is in valid, so shortcut this
-		if ( isset( $args['user_id'] ) && 0 == intval ( $args['user_id'] ) ) {
-			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') );
+		if (isset($args['user_id']) && 0 == intval($args['user_id'])) {
+			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei'));
 			return false;
 		}
 		// Check for legacy code
-		if ( isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes') ) ) {
-			_deprecated_argument( __FUNCTION__, '1.7', sprintf( __('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'] ) );
+		if (isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes'))) {
+			_deprecated_argument(__FUNCTION__, '1.7', sprintf(__('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type']));
 			return false;
 		}
 		// Are we checking for specific comment_approved statuses?
-		if ( isset($args['status']) ) {
+		if (isset($args['status'])) {
 			// Temporarily store as a custom status if requesting an array...
-			if ( is_array( $args['status'] ) && version_compare($wp_version, '4.1', '<') ) {
+			if (is_array($args['status']) && version_compare($wp_version, '4.1', '<')) {
 				// Encode now, decode later
-				$args['status'] = implode( ",", $args['status'] );
+				$args['status'] = implode(",", $args['status']);
 				// ...use a filter to switch the encoding back
-				add_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
+				add_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter'));
 			}
 		}
 		else {
@@ -182,8 +182,8 @@ 
 		}
 
 		// Take into account WP < 4.1 will automatically add ' comment_approved = 1 OR comment_approved = 0 '
-		if ( ( is_array( $args['status'] ) || 'any' == $args['status'] ) && version_compare($wp_version, '4.1', '<') ) {
-			add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
+		if ((is_array($args['status']) || 'any' == $args['status']) && version_compare($wp_version, '4.1', '<')) {
+			add_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter'));
 		}
 
         //Get the comments
@@ -194,14 +194,14 @@ 
          *
          * @param int|array $comments
          */
-        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
+        $comments = apply_filters('sensei_check_for_activity', get_comments($args));
 
-		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
-		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
+		remove_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter'));
+		remove_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter'));
 		// Return comments
-		if ( $return_comments ) {
+		if ($return_comments) {
 			// Could check for array of 1 and just return the 1 item?
-			if ( is_array($comments) && 1 == count($comments) ) {
+			if (is_array($comments) && 1 == count($comments)) {
 				$comments = array_shift($comments);
 			}
 
@@ -219,31 +219,31 @@ 
 	 * @param  array $args (default: array())
 	 * @return array
 	 */
-	public static function sensei_activity_ids ( $args = array() ) {
+	public static function sensei_activity_ids($args = array()) {
 
 
-		$comments = Sensei_Utils::sensei_check_for_activity( $args, true );
+		$comments = Sensei_Utils::sensei_check_for_activity($args, true);
 		// Need to always use an array, even with only 1 item
-		if ( !is_array($comments) ) {
-			$comments = array( $comments );
+		if ( ! is_array($comments)) {
+			$comments = array($comments);
 		}
 
 		$post_ids = array();
 		// Count comments
-		if ( is_array( $comments ) && ( 0 < intval( count( $comments ) ) ) ) {
-			foreach ( $comments as $key => $value  ) {
+		if (is_array($comments) && (0 < intval(count($comments)))) {
+			foreach ($comments as $key => $value) {
 				// Add matches to id array
-				if ( isset( $args['field'] ) && 'comment' == $args['field'] ) {
-					array_push( $post_ids, $value->comment_ID );
-				} elseif( isset( $args['field'] ) && 'user_id' == $args['field'] ) {
-					array_push( $post_ids, $value->user_id );
+				if (isset($args['field']) && 'comment' == $args['field']) {
+					array_push($post_ids, $value->comment_ID);
+				} elseif (isset($args['field']) && 'user_id' == $args['field']) {
+					array_push($post_ids, $value->user_id);
 				} else {
-					array_push( $post_ids, $value->comment_post_ID );
+					array_push($post_ids, $value->comment_post_ID);
 				} // End If Statement
 			} // End For Loop
 			// Reset array indexes
-			$post_ids = array_unique( $post_ids );
-			$post_ids = array_values( $post_ids );
+			$post_ids = array_unique($post_ids);
+			$post_ids = array_values($post_ids);
 		} // End If Statement
 
 		return $post_ids;
@@ -257,20 +257,20 @@ 
 	 * @param  array $args (default: array())
 	 * @return boolean
 	 */
-	public static function sensei_delete_activities ( $args = array() ) {
+	public static function sensei_delete_activities($args = array()) {
 
 		$dataset_changes = false;
 
 		// If activity exists remove activity from log
-		$comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => intval( $args['post_id'] ), 'user_id' => intval( $args['user_id'] ), 'type' => esc_attr( $args['type'] ) ), true );
-		if( $comments ) {
+		$comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => intval($args['post_id']), 'user_id' => intval($args['user_id']), 'type' => esc_attr($args['type'])), true);
+		if ($comments) {
 			// Need to always return an array, even with only 1 item
-			if ( !is_array( $comments ) ) {
-				$comments = array( $comments );
+			if ( ! is_array($comments)) {
+				$comments = array($comments);
 			}
-			foreach ( $comments as $key => $value  ) {
-				if ( isset( $value->comment_ID ) && 0 < $value->comment_ID ) {
-					$dataset_changes = wp_delete_comment( intval( $value->comment_ID ), true );
+			foreach ($comments as $key => $value) {
+				if (isset($value->comment_ID) && 0 < $value->comment_ID) {
+					$dataset_changes = wp_delete_comment(intval($value->comment_ID), true);
 				} // End If Statement
 			} // End For Loop
 			// Manually flush the cache
@@ -286,25 +286,25 @@ 
      * @param  integer $user_id User ID
      * @return boolean
      */
-    public static function delete_all_user_activity( $user_id = 0 ) {
+    public static function delete_all_user_activity($user_id = 0) {
 
     	$dataset_changes = false;
 
-    	if( $user_id ) {
+    	if ($user_id) {
 
-			$activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true );
+			$activities = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user_id), true);
 
-			if( $activities ) {
+			if ($activities) {
 
 				// Need to always return an array, even with only 1 item
-				if ( ! is_array( $activities ) ) {
-					$activities = array( $activities );
+				if ( ! is_array($activities)) {
+					$activities = array($activities);
 				}
 
-				foreach( $activities as $activity ) {
-					if( '' == $activity->comment_type ) continue;
-					if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-					$dataset_changes = wp_delete_comment( intval( $activity->comment_ID ), true );
+				foreach ($activities as $activity) {
+					if ('' == $activity->comment_type) continue;
+					if (strpos('sensei_', $activity->comment_type) != 0) continue;
+					$dataset_changes = wp_delete_comment(intval($activity->comment_ID), true);
 					wp_cache_flush();
 				}
 			}
@@ -321,14 +321,14 @@ 
 	 * @param  array $args (default: array())
 	 * @return string
 	 */
-	public static function sensei_get_activity_value ( $args = array() ) {
+	public static function sensei_get_activity_value($args = array()) {
 
 
 		$activity_value = false;
-		if ( !empty($args['field']) ) {
-			$comment = Sensei_Utils::sensei_check_for_activity( $args, true );
+		if ( ! empty($args['field'])) {
+			$comment = Sensei_Utils::sensei_check_for_activity($args, true);
 
-			if ( isset( $comment->{$args['field']} ) && '' != $comment->{$args['field']} ) {
+			if (isset($comment->{$args['field']} ) && '' != $comment->{$args['field']} ) {
 				$activity_value = $comment->{$args['field']};
 			} // End If Statement
 		}
@@ -346,22 +346,22 @@ 
      * @param  int $product_id
      * @return bool
      */
-    public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
+    public static function sensei_customer_bought_product($customer_email, $user_id, $product_id) {
 
         $emails = array();
 
-        if ( $user_id ) {
-            $user = get_user_by( 'id', intval( $user_id ) );
+        if ($user_id) {
+            $user = get_user_by('id', intval($user_id));
             $emails[] = $user->user_email;
         }
 
-        if ( is_email( $customer_email ) )
+        if (is_email($customer_email))
             $emails[] = $customer_email;
 
-        if ( sizeof( $emails ) == 0 )
+        if (sizeof($emails) == 0)
             return false;
 
-        return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
+        return Sensei_WC::has_customer_bought_product($user_id, $product_id);
 
     } // End sensei_customer_bought_product()
 
@@ -372,9 +372,9 @@ 
 	 * @param  string $input_name Name for text area form element
 	 * @return void
 	 */
-	public static function sensei_text_editor( $content = '', $editor_id = 'senseitexteditor', $input_name = '' ) {
+	public static function sensei_text_editor($content = '', $editor_id = 'senseitexteditor', $input_name = '') {
 
-		if( ! $input_name ) $input_name = $editor_id;
+		if ( ! $input_name) $input_name = $editor_id;
 
 		$buttons = 'bold,italic,underline,strikethrough,blockquote,bullist,numlist,justifyleft,justifycenter,justifyright,undo,redo,pastetext';
 
@@ -392,7 +392,7 @@ 
 			'quicktags' => false
 		);
 
-		wp_editor( $content, $editor_id, $settings );
+		wp_editor($content, $editor_id, $settings);
 
 	} // End sensei_text_editor()
 
@@ -402,57 +402,57 @@ 
      * @param int $user_id
 	 * @return boolean            Whether the answers were saved or not
 	 */
-	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) {
+	public static function sensei_save_quiz_answers($submitted = array(), $user_id = 0) {
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$answers_saved = false;
 
-		if( $submitted && intval( $user_id ) > 0 ) {
+		if ($submitted && intval($user_id) > 0) {
 
-			foreach( $submitted as $question_id => $answer ) {
+			foreach ($submitted as $question_id => $answer) {
 
 				// Get question type
-				$question_type = Sensei()->question->get_question_type( $question_id );
+				$question_type = Sensei()->question->get_question_type($question_id);
 
 				// Sanitise answer
-				if( 0 == get_magic_quotes_gpc() ) {
-					$answer = wp_unslash( $answer );
+				if (0 == get_magic_quotes_gpc()) {
+					$answer = wp_unslash($answer);
 				}
-				switch( $question_type ) {
-					case 'multi-line': $answer = nl2br( $answer ); break;
+				switch ($question_type) {
+					case 'multi-line': $answer = nl2br($answer); break;
 					case 'single-line': break;
 					case 'gap-fill': break;
-					default: $answer = maybe_serialize( $answer ); break;
+					default: $answer = maybe_serialize($answer); break;
 				}
 				$args = array(
 							'post_id' => $question_id,
-							'data' => base64_encode( $answer ),
+							'data' => base64_encode($answer),
 							'type' => 'sensei_user_answer', /* FIELD SIZE 20 */
 							'user_id' => $user_id,
 							'action' => 'update'
 						);
-				$answers_saved = Sensei_Utils::sensei_log_activity( $args );
+				$answers_saved = Sensei_Utils::sensei_log_activity($args);
 			}
 
 			// Handle file upload questions
-			if( isset( $_FILES ) ) {
-				foreach( $_FILES as $field => $file ) {
-					if( strpos( $field, 'file_upload_' ) !== false ) {
-						$question_id = str_replace( 'file_upload_', '', $field );
-						if( $file && $question_id ) {
-							$attachment_id = self::upload_file( $file );
-							if( $attachment_id ) {
+			if (isset($_FILES)) {
+				foreach ($_FILES as $field => $file) {
+					if (strpos($field, 'file_upload_') !== false) {
+						$question_id = str_replace('file_upload_', '', $field);
+						if ($file && $question_id) {
+							$attachment_id = self::upload_file($file);
+							if ($attachment_id) {
 								$args = array(
 									'post_id' => $question_id,
-									'data' => base64_encode( $attachment_id ),
+									'data' => base64_encode($attachment_id),
 									'type' => 'sensei_user_answer', /* FIELD SIZE 20 */
 									'user_id' => $user_id,
 									'action' => 'update'
 								);
-								$answers_saved = Sensei_Utils::sensei_log_activity( $args );
+								$answers_saved = Sensei_Utils::sensei_log_activity($args);
 							}
 						}
 					}
@@ -464,9 +464,9 @@ 
 
 	} // End sensei_save_quiz_answers()
 
-	public static function upload_file( $file = array() ) {
+	public static function upload_file($file = array()) {
 
-		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+		require_once(ABSPATH.'wp-admin/includes/admin.php');
 
         /**
          * Filter the data array for the Sensei wp_handle_upload function call
@@ -481,11 +481,11 @@ 
          *     @type string test_form set to false by default
          * }
          */
-        $file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) );
+        $file_upload_args = apply_filters('sensei_file_upload_args', array('test_form' => false));
 
-        $file_return = wp_handle_upload( $file, $file_upload_args );
+        $file_return = wp_handle_upload($file, $file_upload_args);
 
-        if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
+        if (isset($file_return['error']) || isset($file_return['upload_error_handler'])) {
             return false;
         } else {
 
@@ -493,19 +493,19 @@ 
 
             $attachment = array(
                 'post_mime_type' => $file_return['type'],
-                'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
+                'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
                 'post_content' => '',
                 'post_status' => 'inherit',
                 'guid' => $file_return['url']
             );
 
-            $attachment_id = wp_insert_attachment( $attachment, $filename );
+            $attachment_id = wp_insert_attachment($attachment, $filename);
 
-            require_once(ABSPATH . 'wp-admin/includes/image.php');
-            $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-            wp_update_attachment_metadata( $attachment_id, $attachment_data );
+            require_once(ABSPATH.'wp-admin/includes/image.php');
+            $attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+            wp_update_attachment_metadata($attachment_id, $attachment_data);
 
-            if( 0 < intval( $attachment_id ) ) {
+            if (0 < intval($attachment_id)) {
             	return $attachment_id;
             }
         }
@@ -531,9 +531,9 @@ 
      *
 	 * @return int $quiz_grade total sum of all question grades
 	 */
-	public static function sensei_grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+	public static function sensei_grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') {
 
-        return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type );
+        return Sensei_Grading::grade_quiz_auto($quiz_id, $submitted, $total_questions, $quiz_grade_type);
 
 	} // End sensei_grade_quiz_auto()
 
@@ -545,20 +545,20 @@ 
      * @param  string $quiz_grade_type default 'auto'
 	 * @return boolean
 	 */
-	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_grade_quiz($quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto') {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $quiz_id ) > 0 && intval( $user_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$activity_logged = update_comment_meta( $user_lesson_status->comment_ID, 'grade', $grade );
+		if (intval($quiz_id) > 0 && intval($user_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$activity_logged = update_comment_meta($user_lesson_status->comment_ID, 'grade', $grade);
 
-			$quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) );
+			$quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true));
 
-			do_action( 'sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type );
+			do_action('sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type);
 		}
 
 		return $activity_logged;
@@ -578,9 +578,9 @@ 
      *
 	 * @return int $question_grade
 	 */
-	public static function sensei_grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
+	public static function sensei_grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) {
 
-       return  WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id  );
+       return  WooThemes_Sensei_Grading::grade_question_auto($question_id, $question_type, $answer, $user_id);
 
 	} // end sensei_grade_question_auto
 
@@ -591,20 +591,20 @@ 
      * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_grade_question($question_id = 0, $grade = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $question_id ) > 0 && intval( $user_id ) > 0 ) {
+		if (intval($question_id) > 0 && intval($user_id) > 0) {
 
-			$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-			$activity_logged = update_comment_meta( $user_answer_id, 'user_grade', $grade );
+			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+			$activity_logged = update_comment_meta($user_answer_id, 'user_grade', $grade);
 
-			$answer_notes = get_post_meta( $question_id, '_answer_feedback', true );
-			if ( !empty($answer_notes) ) {
-				update_comment_meta( $user_answer_id, 'answer_note', base64_encode( $answer_notes ) );
+			$answer_notes = get_post_meta($question_id, '_answer_feedback', true);
+			if ( ! empty($answer_notes)) {
+				update_comment_meta($user_answer_id, 'answer_note', base64_encode($answer_notes));
 			}
 
 		}
@@ -612,15 +612,15 @@ 
 		return $activity_logged;
 	}
 
-	public static function sensei_delete_question_grade( $question_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_question_grade($question_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $question_id ) > 0 ) {
-			$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-			$activity_logged = delete_comment_meta( $user_answer_id, 'user_grade' );
+		if (intval($question_id) > 0) {
+			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+			$activity_logged = delete_comment_meta($user_answer_id, 'user_grade');
 		}
 
 		return $activity_logged;
@@ -638,9 +638,9 @@ 
      *
      * @return mixed boolean or comment_ID
      */
-    public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
+    public static function user_start_lesson($user_id = 0, $lesson_id = 0, $complete = false) {
 
-        return self::sensei_start_lesson( $lesson_id, $user_id, $complete );
+        return self::sensei_start_lesson($lesson_id, $user_id, $complete);
 
     }// end user_start_lesson()
 
@@ -657,22 +657,22 @@ 
      *
      * @return mixed boolean or comment_ID
 	 */
-	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
+	public static function sensei_start_lesson($lesson_id = 0, $user_id = 0, $complete = false) {
 
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
 
-		if( intval( $lesson_id ) > 0 ) {
+		if (intval($lesson_id) > 0) {
 
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if( $course_id ) {
-				$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, $user_id );
-				if( ! $is_user_taking_course ) {
-					Sensei_Utils::user_start_course( $user_id, $course_id );
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if ($course_id) {
+				$is_user_taking_course = Sensei_Utils::user_started_course($course_id, $user_id);
+				if ( ! $is_user_taking_course) {
+					Sensei_Utils::user_start_course($user_id, $course_id);
 				}
 			}
 
@@ -680,12 +680,12 @@ 
 			$status = 'in-progress';
 
 			// Note: When this action runs the lesson status may not yet exist
-			do_action( 'sensei_user_lesson_start', $user_id, $lesson_id );
+			do_action('sensei_user_lesson_start', $user_id, $lesson_id);
 
-			if( $complete ) {
+			if ($complete) {
 
-				$has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
-				if ( $has_questions ) {
+				$has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
+				if ($has_questions) {
 					$status = 'passed'; // Force a pass
 					$metadata['grade'] = 0;
 				}
@@ -695,31 +695,31 @@ 
 			}
 
 			// Check if user is already taking the lesson
-			$activity_logged = Sensei_Utils::user_started_lesson( $lesson_id, $user_id );
-			if( ! $activity_logged ) {
+			$activity_logged = Sensei_Utils::user_started_lesson($lesson_id, $user_id);
+			if ( ! $activity_logged) {
 
 				$metadata['start'] = current_time('mysql');
-				$activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata );
+				$activity_logged = Sensei_Utils::update_lesson_status($user_id, $lesson_id, $status, $metadata);
 
             } else {
 
                 // if users is already taking the lesson  and the status changes to complete update it
                 $current_user_activity = get_comment($activity_logged);
-                if( $status=='complete' &&
-                    $status != $current_user_activity->comment_approved  ){
+                if ($status == 'complete' &&
+                    $status != $current_user_activity->comment_approved) {
 
                     $comment = array();
                     $comment['comment_ID'] = $activity_logged;
                     $comment['comment_approved'] = $status;
-                    wp_update_comment( $comment );
+                    wp_update_comment($comment);
 
                 }
 
             }
 
-			if ( $complete ) {
+			if ($complete) {
 				// Run this *after* the lesson status has been created/updated
-				do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+				do_action('sensei_user_lesson_end', $user_id, $lesson_id);
 			}
 
 		}
@@ -734,20 +734,20 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) {
+	public static function sensei_remove_user_from_lesson($lesson_id = 0, $user_id = 0, $from_course = false) {
 
 
-		if( ! $lesson_id ) return false;
+		if ( ! $lesson_id) return false;
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		// Process quiz
-		$lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
 		// Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-		Sensei_Utils::sensei_delete_quiz_answers( $lesson_quiz_id, $user_id );
+		Sensei_Utils::sensei_delete_quiz_answers($lesson_quiz_id, $user_id);
 
 		// Delete lesson status
 		$args = array(
@@ -756,10 +756,10 @@ 
 			'user_id' => $user_id,
 		);
 		// This auto deletes the corresponding meta data, such as the quiz grade, and questions asked
-		Sensei_Utils::sensei_delete_activities( $args );
+		Sensei_Utils::sensei_delete_activities($args);
 
-		if( ! $from_course ) {
-			do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
+		if ( ! $from_course) {
+			do_action('sensei_user_lesson_reset', $user_id, $lesson_id);
 		}
 
 		return true;
@@ -772,19 +772,19 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) {
+	public static function sensei_remove_user_from_course($course_id = 0, $user_id = 0) {
 
 
-		if( ! $course_id ) return false;
+		if ( ! $course_id) return false;
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
-		$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
+		$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
 
-		foreach( $lesson_ids as $lesson_id ) {
-			Sensei_Utils::sensei_remove_user_from_lesson( $lesson_id, $user_id, true );
+		foreach ($lesson_ids as $lesson_id) {
+			Sensei_Utils::sensei_remove_user_from_lesson($lesson_id, $user_id, true);
 		}
 
 		// Delete course status
@@ -794,36 +794,36 @@ 
 			'user_id' => $user_id,
 		);
 
-		Sensei_Utils::sensei_delete_activities( $args );
+		Sensei_Utils::sensei_delete_activities($args);
 
-		do_action( 'sensei_user_course_reset', $user_id, $course_id );
+		do_action('sensei_user_course_reset', $user_id, $course_id);
 
 		return true;
 	}
 
-	public static function sensei_get_quiz_questions( $quiz_id = 0 ) {
+	public static function sensei_get_quiz_questions($quiz_id = 0) {
 
 
 		$questions = array();
 
-		if( intval( $quiz_id ) > 0 ) {
-			$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
-			$questions = Sensei_Utils::array_sort_reorder( $questions );
+		if (intval($quiz_id) > 0) {
+			$questions = Sensei()->lesson->lesson_quiz_questions($quiz_id);
+			$questions = Sensei_Utils::array_sort_reorder($questions);
 		}
 
 		return $questions;
 	}
 
-	public static function sensei_get_quiz_total( $quiz_id = 0 ) {
+	public static function sensei_get_quiz_total($quiz_id = 0) {
 
 
 		$quiz_total = 0;
 
-		if( $quiz_id > 0 ) {
-			$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
+		if ($quiz_id > 0) {
+			$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
 			$question_grade = 0;
-			foreach( $questions as $question ) {
-				$question_grade = Sensei()->question->get_question_grade( $question->ID );
+			foreach ($questions as $question) {
+				$question_grade = Sensei()->question->get_question_grade($question->ID);
 				$quiz_total += $question_grade;
 			}
 		}
@@ -838,20 +838,20 @@ 
 	 * @param int $user_id
 	 * @return string
 	 */
-	public static function sensei_get_user_question_grade( $question = 0, $user_id = 0 ) {
+	public static function sensei_get_user_question_grade($question = 0, $user_id = 0) {
 		$question_grade = false;
-		if( $question ) {
-			if ( is_object( $question ) ) {
+		if ($question) {
+			if (is_object($question)) {
 				$user_answer_id = $question->comment_ID;
 			}
 			else {
-				if( intval( $user_id ) == 0 ) {
+				if (intval($user_id) == 0) {
 					$user_id = get_current_user_id();
 				}
-				$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
+				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
 			}
-			if ( $user_answer_id ) {
-				$question_grade = get_comment_meta( $user_answer_id, 'user_grade', true );
+			if ($user_answer_id) {
+				$question_grade = get_comment_meta($user_answer_id, 'user_grade', true);
 			}
 		}
 
@@ -866,52 +866,52 @@ 
 	 * @param int $user_id
 	 * @return string
 	 */
-	public static function sensei_get_user_question_answer_notes( $question = 0, $user_id = 0 ) {
+	public static function sensei_get_user_question_answer_notes($question = 0, $user_id = 0) {
 		$answer_notes = false;
-		if( $question ) {
-			if ( is_object( $question ) ) {
+		if ($question) {
+			if (is_object($question)) {
 				$user_answer_id = $question->comment_ID;
 			}
 			else {
-				if( intval( $user_id ) == 0 ) {
+				if (intval($user_id) == 0) {
 					$user_id = get_current_user_id();
 				}
-				$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
+				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
 			}
-			if ( $user_answer_id ) {
-				$answer_notes = base64_decode( get_comment_meta( $user_answer_id, 'answer_note', true ) );
+			if ($user_answer_id) {
+				$answer_notes = base64_decode(get_comment_meta($user_answer_id, 'answer_note', true));
 			}
 		}
 
 		return $answer_notes;
 	}
 
-	public static function sensei_delete_quiz_answers( $quiz_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_quiz_answers($quiz_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$delete_answers = false;
-		if( intval( $quiz_id ) > 0 ) {
-			$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-			foreach( $questions as $question ) {
-				$delete_answers = Sensei_Utils::sensei_delete_activities( array( 'post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ) );
+		if (intval($quiz_id) > 0) {
+			$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+			foreach ($questions as $question) {
+				$delete_answers = Sensei_Utils::sensei_delete_activities(array('post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer'));
 			}
 		}
 
 		return $delete_answers;
 	}
 
-	public static function sensei_delete_quiz_grade( $quiz_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_quiz_grade($quiz_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$delete_grade = false;
-		if( intval( $quiz_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$delete_grade = delete_comment_meta( $user_lesson_status->comment_ID, 'grade' );
+		if (intval($quiz_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$delete_grade = delete_comment_meta($user_lesson_status->comment_ID, 'grade');
 		}
 
 		return $delete_grade;
@@ -924,20 +924,20 @@ 
      * @param string $notes
 	 * @return boolean
 	 */
-	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_add_answer_notes($question_id = 0, $user_id = 0, $notes = '') {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
 
-		if( intval( $question_id ) > 0 ) {
-			$notes = base64_encode( $notes );
+		if (intval($question_id) > 0) {
+			$notes = base64_encode($notes);
 
 			// Don't store empty values, no point
-			if ( !empty($notes) ) {
-				$user_lesson_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-				$activity_logged = update_comment_meta( $user_lesson_id, 'answer_note', $notes );
+			if ( ! empty($notes)) {
+				$user_lesson_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+				$activity_logged = update_comment_meta($user_lesson_id, 'answer_note', $notes);
 			}
 			else {
 				$activity_logged = true;
@@ -953,16 +953,16 @@ 
 	 * @param  array $return_array data to be ordered
 	 * @return array $return_array ordered data
 	 */
-	public static function array_sort_reorder( $return_array ) {
-		if ( isset( $_GET['orderby'] ) && '' != esc_html( $_GET['orderby'] ) ) {
+	public static function array_sort_reorder($return_array) {
+		if (isset($_GET['orderby']) && '' != esc_html($_GET['orderby'])) {
 			$sort_key = '';
 			// if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->sortable_columns ) ) {
 			// 	$sort_key = esc_html( $_GET['orderby'] );
 			// } // End If Statement
-			if ( '' != $sort_key ) {
-					Sensei_Utils::sort_array_by_key($return_array,$sort_key);
-				if ( isset( $_GET['order'] ) && 'desc' == esc_html( $_GET['order'] ) ) {
-					$return_array = array_reverse( $return_array, true );
+			if ('' != $sort_key) {
+					Sensei_Utils::sort_array_by_key($return_array, $sort_key);
+				if (isset($_GET['order']) && 'desc' == esc_html($_GET['order'])) {
+					$return_array = array_reverse($return_array, true);
 				} // End If Statement
 			} // End If Statement
 			return $return_array;
@@ -978,15 +978,15 @@ 
 	 * @param  $key string column name in array
 	 * @return void
 	 */
-	public static function sort_array_by_key( $array, $key ) {
+	public static function sort_array_by_key($array, $key) {
 	    $sorter = array();
 	    $ret = array();
-	    reset( $array );
-	    foreach ( $array as $ii => $va ) {
+	    reset($array);
+	    foreach ($array as $ii => $va) {
 	        $sorter[$ii] = $va[$key];
 	    } // End For Loop
-	    asort( $sorter );
-	    foreach ( $sorter as $ii => $va ) {
+	    asort($sorter);
+	    foreach ($sorter as $ii => $va) {
 	        $ret[$ii] = $array[$ii];
 	    } // End For Loop
 	    $array = $ret;
@@ -998,10 +998,10 @@ 
 	 * @param  integer $quiz_id
 	 * @return array of quiz questions
 	 */
-	public static function lesson_quiz_questions( $quiz_id = 0 ) {
+	public static function lesson_quiz_questions($quiz_id = 0) {
 		$questions_array = array();
-		if ( 0 < $quiz_id ) {
-			$question_args = array( 'post_type'         => 'question',
+		if (0 < $quiz_id) {
+			$question_args = array('post_type'         => 'question',
                                     'posts_per_page'       => -1,
                                     'orderby'           => 'ID',
                                     'order'             => 'ASC',
@@ -1014,7 +1014,7 @@ 
                                     'post_status'       => 'any',
                                     'suppress_filters'  => 0
                                 );
-            $questions_array = get_posts( $question_args );
+            $questions_array = get_posts($question_args);
         } // End If Statement
         return $questions_array;
 	} // End lesson_quiz_questions()
@@ -1024,25 +1024,25 @@ 
 	 * @param  integer $course_id ID of course
 	 * @return integer            Pass mark for course
 	 */
-	public static function sensei_course_pass_grade( $course_id = 0 ) {
+	public static function sensei_course_pass_grade($course_id = 0) {
 
 
 		$course_passmark = 0;
 
-		if( $course_id > 0 ) {
-			$lessons = Sensei()->course->course_lessons( $course_id );
+		if ($course_id > 0) {
+			$lessons = Sensei()->course->course_lessons($course_id);
 			$lesson_count = 0;
 			$total_passmark = 0;
-			foreach( $lessons as $lesson ) {
+			foreach ($lessons as $lesson) {
 
 				// Get Quiz ID
-				$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+				$quiz_id = Sensei()->lesson->lesson_quizzes($lesson->ID);
 
 				// Check for a pass being required
-				$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-				if ( $pass_required ) {
+				$pass_required = get_post_meta($quiz_id, '_pass_required', true);
+				if ($pass_required) {
 					// Get quiz passmark
-					$quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) );
+					$quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true));
 
 					// Add up total passmark
 					$total_passmark += $quiz_passmark;
@@ -1051,12 +1051,12 @@ 
 				}
 			}
 			// Might be a case of no required lessons
-			if ( $lesson_count ) {
-				$course_passmark = ( $total_passmark / $lesson_count );
+			if ($lesson_count) {
+				$course_passmark = ($total_passmark / $lesson_count);
 			}
 		}
 
-		return Sensei_Utils::round( $course_passmark );
+		return Sensei_Utils::round($course_passmark);
 	}
 
 	/**
@@ -1065,27 +1065,27 @@ 
 	 * @param  integer $user_id   ID of user
 	 * @return integer            User's total grade
 	 */
-	public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) {
+	public static function sensei_course_user_grade($course_id = 0, $user_id = 0) {
 
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$total_grade = 0;
 
-		if( $course_id > 0 && $user_id > 0 ) {
-			$lessons = Sensei()->course->course_lessons( $course_id );
+		if ($course_id > 0 && $user_id > 0) {
+			$lessons = Sensei()->course->course_lessons($course_id);
 			$lesson_count = 0;
 			$total_grade = 0;
-			foreach( $lessons as $lesson ) {
+			foreach ($lessons as $lesson) {
 
 				// Check for lesson having questions, thus a quiz, thus having a grade
-				$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-				if ( $has_questions ) {
-					$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, $user_id );
+				$has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true);
+				if ($has_questions) {
+					$user_lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, $user_id);
 					// Get user quiz grade
-					$quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+					$quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
 
 					// Add up total grade
 					$total_grade += $quiz_grade;
@@ -1095,13 +1095,13 @@ 
 			}
 
 			// Might be a case of no lessons with quizzes
-			if ( $lesson_count ) {
-				$total_grade = ( $total_grade / $lesson_count );
+			if ($lesson_count) {
+				$total_grade = ($total_grade / $lesson_count);
 			}
 
 		}
 
-		return Sensei_Utils::round( $total_grade );
+		return Sensei_Utils::round($total_grade);
 	}
 
 	/**
@@ -1110,18 +1110,18 @@ 
 	 * @param  integer $user_id   ID of user
 	 * @return boolean
 	 */
-	public static function sensei_user_passed_course( $course_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_user_passed_course($course_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$pass = false;
 
-		if( $course_id > 0 && $user_id > 0 ) {
-			$passmark = Sensei_Utils::sensei_course_pass_grade( $course_id );
-			$user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id );
+		if ($course_id > 0 && $user_id > 0) {
+			$passmark = Sensei_Utils::sensei_course_pass_grade($course_id);
+			$user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id);
 
-			if( $user_grade >= $passmark ) {
+			if ($user_grade >= $passmark) {
 				$pass = true;
 			}
 		}
@@ -1136,38 +1136,38 @@ 
 	 * @param  integer $user_id   ID of user
 	 * @return array              Status code and message
 	 */
-	public static function sensei_user_course_status_message( $course_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_user_course_status_message($course_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$status = 'not_started';
 		$box_class = 'info';
-		$message = __( 'You have not started this course yet.', 'woothemes-sensei' );
+		$message = __('You have not started this course yet.', 'woothemes-sensei');
 
-		if( $course_id > 0 && $user_id > 0 ) {
+		if ($course_id > 0 && $user_id > 0) {
 
-			$started_course = Sensei_Utils::user_started_course( $course_id, $user_id );
+			$started_course = Sensei_Utils::user_started_course($course_id, $user_id);
 
-			if( $started_course ) {
-				$passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); // This happens inside sensei_user_passed_course()!
-				$user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); // This happens inside sensei_user_passed_course()!
-				if( $user_grade >= $passmark ) {
+			if ($started_course) {
+				$passmark = Sensei_Utils::sensei_course_pass_grade($course_id); // This happens inside sensei_user_passed_course()!
+				$user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); // This happens inside sensei_user_passed_course()!
+				if ($user_grade >= $passmark) {
 					$status = 'passed';
 					$box_class = 'tick';
-					$message = sprintf( __( 'You have passed this course with a grade of %1$d%%.', 'woothemes-sensei' ), $user_grade );
+					$message = sprintf(__('You have passed this course with a grade of %1$d%%.', 'woothemes-sensei'), $user_grade);
 				} else {
 					$status = 'failed';
 					$box_class = 'alert';
-					$message = sprintf( __( 'You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei' ), $passmark, $user_grade );
+					$message = sprintf(__('You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei'), $passmark, $user_grade);
 				}
 			}
 
 		}
 
-		$message = apply_filters( 'sensei_user_course_status_' . $status, $message );
+		$message = apply_filters('sensei_user_course_status_'.$status, $message);
 
-		return array( 'status' => $status, 'box_class' => $box_class, 'message' => $message );
+		return array('status' => $status, 'box_class' => $box_class, 'message' => $message);
 	}
 
 	/**
@@ -1177,94 +1177,94 @@ 
      * @param  bool $is_lesson
 	 * @return array              Status code and message
 	 */
-	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) {
+	public static function sensei_user_quiz_status_message($lesson_id = 0, $user_id = 0, $is_lesson = false) {
 		global  $current_user;
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = $current_user->ID;
 		}
 
 		$status = 'not_started';
 		$box_class = 'info';
-		$message = __( "You have not taken this lesson's quiz yet", 'woothemes-sensei' );
+		$message = __("You have not taken this lesson's quiz yet", 'woothemes-sensei');
 		$extra = '';
 
-		if( $lesson_id > 0 && $user_id > 0 ) {
+		if ($lesson_id > 0 && $user_id > 0) {
 
 			// Prerequisite lesson
-			$prerequisite = get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+			$prerequisite = get_post_meta($lesson_id, '_lesson_prerequisite', true);
 
 			// Course ID
-			$course_id = absint( get_post_meta( $lesson_id, '_lesson_course', true ) );
+			$course_id = absint(get_post_meta($lesson_id, '_lesson_course', true));
 
 			// Has user started course
-			$started_course = Sensei_Utils::user_started_course( $course_id, $user_id );
+			$started_course = Sensei_Utils::user_started_course($course_id, $user_id);
 
 			// Has user completed lesson
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$lesson_complete = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$lesson_complete = Sensei_Utils::user_completed_lesson($user_lesson_status);
 
 			// Quiz ID
-			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+			$quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
 			// Quiz grade
 			$quiz_grade = 0;
-			if ( $user_lesson_status ) {
-				$quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+			if ($user_lesson_status) {
+				$quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
 			}
 
 			// Quiz passmark
-			$quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) );
+			$quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true));
 			$quiz_passmark_float = (float) $quiz_passmark;
 
 			// Pass required
-			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+			$pass_required = get_post_meta($quiz_id, '_pass_required', true);
 
 			// Quiz questions
-			$has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+			$has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
 
-			if ( ! $started_course ) {
+			if ( ! $started_course) {
 
 				$status = 'not_started_course';
 				$box_class = 'info';
-				$message = sprintf( __( 'Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . esc_attr( __( 'Sign Up', 'woothemes-sensei' ) ) . '">', '</a>' );
+				$message = sprintf(__('Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($course_id)).'" title="'.esc_attr(__('Sign Up', 'woothemes-sensei')).'">', '</a>');
 
-			} elseif ( ! is_user_logged_in() ) {
+			} elseif ( ! is_user_logged_in()) {
 
 				$status = 'login_required';
 				$box_class = 'info';
-				$message = __( 'You must be logged in to take this quiz', 'woothemes-sensei' );
+				$message = __('You must be logged in to take this quiz', 'woothemes-sensei');
 
 			}
 			// Lesson/Quiz is marked as complete thus passing any quiz restrictions
-			elseif ( $lesson_complete ) {
+			elseif ($lesson_complete) {
 
 				$status = 'passed';
 				$box_class = 'tick';
 				// Lesson status will be "complete" (has no Quiz)
-				if ( ! $has_quiz_questions ) {
-					$message = sprintf( __( 'Congratulations! You have passed this lesson.', 'woothemes-sensei' ) );
+				if ( ! $has_quiz_questions) {
+					$message = sprintf(__('Congratulations! You have passed this lesson.', 'woothemes-sensei'));
 				}
 				// Lesson status will be "graded" (no passmark required so might have failed all the questions)
-				elseif ( empty( $quiz_grade ) ) {
-					$message = sprintf( __( 'Congratulations! You have completed this lesson.', 'woothemes-sensei' ) );
+				elseif (empty($quiz_grade)) {
+					$message = sprintf(__('Congratulations! You have completed this lesson.', 'woothemes-sensei'));
 				}
 				// Lesson status will be "passed" (passmark reached)
-				elseif ( ! empty( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) {
-					if( $is_lesson ) {
-						$message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) );
+				elseif ( ! empty($quiz_grade) && abs($quiz_grade) >= 0) {
+					if ($is_lesson) {
+						$message = sprintf(__('Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade));
 					} else {
-						$message = sprintf( __( 'Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_grade ) );
+						$message = sprintf(__('Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade));
 					}
 				}
 
                 // add next lesson button
-                $nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
-                $next_lesson_id = absint( $nav_id_array['next_lesson'] );
+                $nav_id_array = sensei_get_prev_next_lessons($lesson_id);
+                $next_lesson_id = absint($nav_id_array['next_lesson']);
 
                 // Output HTML
-                if ( ( 0 < $next_lesson_id ) ) {
-                    $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
-                                . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
+                if ((0 < $next_lesson_id)) {
+                    $message .= ' '.'<a class="next-lesson" href="'.esc_url(get_permalink($next_lesson_id))
+                                . '" rel="next"><span class="meta-nav"></span>'.__('Next Lesson', 'woothemes-sensei')
                                 .'</a>';
 
                 }
@@ -1273,33 +1273,33 @@ 
             // Lesson/Quiz not complete
 			else {
 				// Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete)
-				if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) {
+				if (isset($user_lesson_status->comment_approved) && 'ungraded' == $user_lesson_status->comment_approved) {
 					$status = 'complete';
 					$box_class = 'info';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . esc_attr( get_the_title( $quiz_id ) ) . '">', '</a>' );
+					if ($is_lesson) {
+						$message = sprintf(__('You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($quiz_id)).'" title="'.esc_attr(get_the_title($quiz_id)).'">', '</a>');
 					} else {
-						$message = sprintf( __( 'You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+						$message = sprintf(__('You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					}
 				}
 				// Lesson status must be "failed"
-				elseif ( isset( $user_lesson_status->comment_approved ) && 'failed' == $user_lesson_status->comment_approved ) {
+				elseif (isset($user_lesson_status->comment_approved) && 'failed' == $user_lesson_status->comment_approved) {
 					$status = 'failed';
 					$box_class = 'alert';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ),  Sensei_Utils::round( $quiz_grade ) );
+					if ($is_lesson) {
+						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade));
 					} else {
-						$message = sprintf( __( 'You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ),  Sensei_Utils::round( $quiz_grade ) );
+						$message = sprintf(__('You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade));
 					}
 				}
 				// Lesson/Quiz requires a pass
-				elseif( $pass_required ) {
+				elseif ($pass_required) {
 					$status = 'not_started';
 					$box_class = 'info';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+					if ($is_lesson) {
+						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					} else {
-						$message = sprintf( __( 'You require %1$d%% to pass this quiz.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+						$message = sprintf(__('You require %1$d%% to pass this quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					}
 				}
 			}
@@ -1307,15 +1307,15 @@ 
 		}
 
 		// Legacy filter
-		$message = apply_filters( 'sensei_user_quiz_status_' . $status, $message );
+		$message = apply_filters('sensei_user_quiz_status_'.$status, $message);
 
-		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) {
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-			$extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' .  __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' .  __( 'View the lesson quiz', 'woothemes-sensei' )  . '</a></p>';
+		if ($is_lesson && ! in_array($status, array('login_required', 'not_started_course'))) {
+            $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
+			$extra = '<p><a class="button" href="'.esc_url(get_permalink($quiz_id)).'" title="'.__('View the lesson quiz', 'woothemes-sensei').'">'.__('View the lesson quiz', 'woothemes-sensei').'</a></p>';
 		}
 
 		// Filter of all messages
-		return apply_filters( 'sensei_user_quiz_status', array( 'status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra ), $lesson_id, $user_id, $is_lesson );
+		return apply_filters('sensei_user_quiz_status', array('status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra), $lesson_id, $user_id, $is_lesson);
 	}
 
 	/**
@@ -1325,14 +1325,14 @@ 
 	 * @param  integer $course_id Course ID
 	 * @return mixed boolean or comment_ID
 	 */
-	public static function user_start_course( $user_id = 0, $course_id = 0 ) {
+	public static function user_start_course($user_id = 0, $course_id = 0) {
 
 		$activity_logged = false;
 
-		if( $user_id && $course_id ) {
+		if ($user_id && $course_id) {
 			// Check if user is already on the Course
-			$activity_logged = Sensei_Utils::user_started_course( $course_id, $user_id );
-			if ( ! $activity_logged ) {
+			$activity_logged = Sensei_Utils::user_started_course($course_id, $user_id);
+			if ( ! $activity_logged) {
 
 				// Add user to course
 				$course_metadata = array(
@@ -1341,11 +1341,11 @@ 
 					'complete' => 0,
 				);
 
-				$activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status = 'in-progress', $course_metadata );
+				$activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status = 'in-progress', $course_metadata);
 
 				// Allow further actions
-				if ( $activity_logged ) {
-					do_action( 'sensei_user_course_start', $user_id, $course_id );
+				if ($activity_logged) {
+					do_action('sensei_user_course_start', $user_id, $course_id);
 				}
 			}
 		}
@@ -1361,19 +1361,19 @@ 
 	 * @param int $user_id
 	 * @return mixed false or comment_ID
 	 */
-	public static function user_started_course( $course_id = 0, $user_id = 0 ) {
+	public static function user_started_course($course_id = 0, $user_id = 0) {
 
-		if( $course_id ) {
-			if( ! $user_id ) {
+		if ($course_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
-            if( ! $user_id > 0 ){
+            if ( ! $user_id > 0) {
                 return false;
             }
 
-			$user_course_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID' ) );
-			if( $user_course_status_id ) {
+			$user_course_status_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID'));
+			if ($user_course_status_id) {
 				return $user_course_status_id;
 			}
 		}
@@ -1388,17 +1388,17 @@ 
 	 * @param  integer $user_id   User ID
 	 * @return int
 	 */
-	public static function user_complete_course( $course_id = 0, $user_id = 0 ) {
+	public static function user_complete_course($course_id = 0, $user_id = 0) {
 		global  $wp_version;
 
-		if( $course_id ) {
-			if( ! $user_id ) {
+		if ($course_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
 			$course_status = 'in-progress';
 			$course_metadata = array();
-			$course_completion = Sensei()->settings->settings[ 'course_completion' ];
+			$course_completion = Sensei()->settings->settings['course_completion'];
 			$lessons_completed = $total_lessons = 0;
 			$lesson_status_args = array(
 					'user_id' => $user_id,
@@ -1407,8 +1407,8 @@ 
 				);
 
 			// Grab all of this Courses' lessons, looping through each...
-			$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
-			$total_lessons = count( $lesson_ids );
+			$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
+			$total_lessons = count($lesson_ids);
 				// ...if course completion not set to 'passed', and all lessons are complete or graded,
 				// ......then all lessons are 'passed'
 				// ...else if course completion is set to 'passed', check if each lesson has questions...
@@ -1421,29 +1421,29 @@ 
 			// The below checks if a lesson is fully completed, though maybe should be Utils::user_completed_lesson()
 			$all_lesson_statuses = array();
 			// In WordPress 4.1 get_comments() allows a single query to cover multiple comment_post_IDs
-			if ( version_compare($wp_version, '4.1', '>=') ) {
+			if (version_compare($wp_version, '4.1', '>=')) {
 				$lesson_status_args['post__in'] = $lesson_ids;
-				$all_lesson_statuses = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true );
+				$all_lesson_statuses = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true);
 				// Need to always return an array, even with only 1 item
-				if ( !is_array($all_lesson_statuses) ) {
-					$all_lesson_statuses = array( $all_lesson_statuses );
+				if ( ! is_array($all_lesson_statuses)) {
+					$all_lesson_statuses = array($all_lesson_statuses);
 				}
 			}
 			// ...otherwise check each one
 			else {
-				foreach( $lesson_ids as $lesson_id ) {
+				foreach ($lesson_ids as $lesson_id) {
 					$lesson_status_args['post_id'] = $lesson_id;
-					$each_lesson_status = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true );
+					$each_lesson_status = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true);
 					// Check for valid return before using
-					if ( !empty($each_lesson_status->comment_approved) ) {
+					if ( ! empty($each_lesson_status->comment_approved)) {
 						$all_lesson_statuses[] = $each_lesson_status;
 					}
 				}
 			}
-			foreach( $all_lesson_statuses as $lesson_status ) {
+			foreach ($all_lesson_statuses as $lesson_status) {
 				// If lessons are complete without needing quizzes to be passed
-				if ( 'passed' != $course_completion ) {
-					switch ( $lesson_status->comment_approved ) {
+				if ('passed' != $course_completion) {
+					switch ($lesson_status->comment_approved) {
 						// A user cannot 'complete' a course if a lesson...
 						case 'in-progress': // ...is still in progress
 						case 'ungraded': // ...hasn't yet been graded
@@ -1455,7 +1455,7 @@ 
 					}
 				}
 				else {
-					switch ( $lesson_status->comment_approved ) {
+					switch ($lesson_status->comment_approved) {
 						case 'complete': // Lesson has no quiz/questions
 						case 'graded': // Lesson has quiz, but it's not important what the grade was
 						case 'passed': // Lesson has quiz and the user passed
@@ -1469,20 +1469,20 @@ 
 					}
 				}
 			} // Each lesson
-			if ( $lessons_completed == $total_lessons ) {
+			if ($lessons_completed == $total_lessons) {
 				$course_status = 'complete';
 			}
 
 			// Update meta data on how many lessons have been completed
 			$course_metadata['complete'] = $lessons_completed;
 			// update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above
-			$course_metadata['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
+			$course_metadata['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0));
 
-			$activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status, $course_metadata );
+			$activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status, $course_metadata);
 
 			// Allow further actions
-			if ( 'complete' == $course_status ) {
-				do_action( 'sensei_user_course_end', $user_id, $course_id );
+			if ('complete' == $course_status) {
+				do_action('sensei_user_course_end', $user_id, $course_id);
 			}
 			return $activity_logged;
 		}
@@ -1498,31 +1498,31 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function user_completed_course( $course , $user_id = 0 ) {
+	public static function user_completed_course($course, $user_id = 0) {
 
-		if( $course ) {
-			if ( is_object( $course ) && is_a( $course,'WP_Comment') ) {
+		if ($course) {
+			if (is_object($course) && is_a($course, 'WP_Comment')) {
 				$user_course_status = $course->comment_approved;
 			}
-			elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) {
+			elseif ( ! is_numeric($course) && ! is_a($course, 'WP_Post')) {
 				$user_course_status = $course;
 			}
 			else {
-				if( ! $user_id ) {
+				if ( ! $user_id) {
 					$user_id = get_current_user_id();
 				}
 
-                if( is_a( $course, 'WP_Post' ) ){
-                    $course =   $course->ID;
+                if (is_a($course, 'WP_Post')) {
+                    $course = $course->ID;
                 }
 
-				$user_course_status = Sensei_Utils::user_course_status( $course , $user_id );
-				if( isset( $user_course_status->comment_approved ) ){
+				$user_course_status = Sensei_Utils::user_course_status($course, $user_id);
+				if (isset($user_course_status->comment_approved)) {
                     $user_course_status = $user_course_status->comment_approved;
                 }
 
 			}
-			if( $user_course_status && 'complete' == $user_course_status ) {
+			if ($user_course_status && 'complete' == $user_course_status) {
 				return true;
 			}
 		}
@@ -1537,10 +1537,10 @@ 
 	 * @param int $user_id
 	 * @return mixed false or comment_ID
 	 */
-	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) {
+	public static function user_started_lesson($lesson_id = 0, $user_id = 0) {
 
-		if( $lesson_id ) {
-			if( ! $user_id ) {
+		if ($lesson_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
@@ -1550,8 +1550,8 @@ 
                 'type' => 'sensei_lesson_status',
                 'field' => 'comment_ID' );
 
-			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
-			if( $user_lesson_status_id ) {
+			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value($activity_args);
+			if ($user_lesson_status_id) {
 				return $user_lesson_status_id;
 			}
 		}
@@ -1566,29 +1566,29 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function user_completed_lesson( $lesson = 0, $user_id = 0 ) {
+	public static function user_completed_lesson($lesson = 0, $user_id = 0) {
 
-		if( $lesson ) {
+		if ($lesson) {
 			$lesson_id = 0;
-			if ( is_object( $lesson ) ) {
+			if (is_object($lesson)) {
 				$user_lesson_status = $lesson->comment_approved;
 				$lesson_id = $lesson->comment_post_ID;
 			}
-			elseif ( ! is_numeric( $lesson ) ) {
+			elseif ( ! is_numeric($lesson)) {
 				$user_lesson_status = $lesson;
 			}
 			else {
-				if( ! $user_id ) {
+				if ( ! $user_id) {
 					$user_id = get_current_user_id();
 				}
 
                 // the user is not logged in
-                if( ! $user_id > 0 ){
+                if ( ! $user_id > 0) {
                     return false;
                 }
-				$_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id );
+				$_user_lesson_status = Sensei_Utils::user_lesson_status($lesson, $user_id);
 
-				if ( $_user_lesson_status ) {
+				if ($_user_lesson_status) {
 					$user_lesson_status = $_user_lesson_status->comment_approved;
 				}
 				else {
@@ -1596,12 +1596,12 @@ 
 				}
 				$lesson_id = $lesson;
 			}
-			if ( 'in-progress' != $user_lesson_status ) {
+			if ('in-progress' != $user_lesson_status) {
 				// Check for Passed or Completed Setting
 				// Should we be checking for the Course completion setting? Surely that should only affect the Course completion, not bypass each Lesson setting
 //				$course_completion = Sensei()->settings->settings[ 'course_completion' ];
 //				if ( 'passed' == $course_completion ) {
-					switch( $user_lesson_status ) {
+					switch ($user_lesson_status) {
 						case 'complete':
 						case 'graded':
 						case 'passed':
@@ -1610,13 +1610,13 @@ 
 
 						case 'failed':
 							// This may be 'completed' depending on...
-							if ( $lesson_id ) {
+							if ($lesson_id) {
 								// Get Quiz ID, this won't be needed once all Quiz meta fields are stored on the Lesson
-								$lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-								if ( $lesson_quiz_id ) {
+								$lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
+								if ($lesson_quiz_id) {
 									// ...the quiz pass setting
-									$pass_required = get_post_meta( $lesson_quiz_id, '_pass_required', true );
-									if ( empty($pass_required) ) {
+									$pass_required = get_post_meta($lesson_quiz_id, '_pass_required', true);
+									if (empty($pass_required)) {
 										// We just require the user to have done the quiz, not to have passed
 										return true;
 									}
@@ -1639,15 +1639,15 @@ 
 	 * @param int $user_id
 	 * @return object
 	 */
-	public static function user_course_status( $course_id = 0, $user_id = 0 ) {
+	public static function user_course_status($course_id = 0, $user_id = 0) {
 
 
-		if( $course_id ) {
-			if( ! $user_id ) {
+		if ($course_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
-			$user_course_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status' ), true );
+			$user_course_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status'), true);
 			return $user_course_status;
 		}
 
@@ -1662,27 +1662,27 @@ 
 	 * @param int $user_id
 	 * @return object | bool
 	 */
-	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
+	public static function user_lesson_status($lesson_id = 0, $user_id = 0) {
 
-        if( ! $user_id ) {
+        if ( ! $user_id) {
             $user_id = get_current_user_id();
         }
 
-		if( $lesson_id > 0 && $user_id > 0 ) {
+		if ($lesson_id > 0 && $user_id > 0) {
 
-			$user_lesson_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status' ), true );
+			$user_lesson_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status'), true);
 			return $user_lesson_status;
 		}
 
 		return false;
 	}
 
-	public static function is_preview_lesson( $lesson_id ) {
+	public static function is_preview_lesson($lesson_id) {
 		$is_preview = false;
 
-		if( 'lesson' == get_post_type( $lesson_id ) ) {
-			$lesson_preview = get_post_meta( $lesson_id, '_lesson_preview', true );
-			if ( isset( $lesson_preview ) && '' != $lesson_preview ) {
+		if ('lesson' == get_post_type($lesson_id)) {
+			$lesson_preview = get_post_meta($lesson_id, '_lesson_preview', true);
+			if (isset($lesson_preview) && '' != $lesson_preview) {
 				$is_preview = true;
 			}
 		}
@@ -1690,22 +1690,22 @@ 
 		return $is_preview;
 	}
 
-	public static function user_passed_quiz( $quiz_id = 0, $user_id = 0 ) {
+	public static function user_passed_quiz($quiz_id = 0, $user_id = 0) {
 
-		if( ! $quiz_id  ) return false;
+		if ( ! $quiz_id) return false;
 
-		if( ! $user_id ) {
+		if ( ! $user_id) {
 			$user_id = get_current_user_id();
 		}
-		$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
+		$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
 
 		// Quiz Grade
-		$lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-		$quiz_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+		$lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+		$quiz_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 
 		// Check if Grade is greater than or equal to pass percentage
-		$quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
-		if ( $quiz_passmark <= intval( $quiz_grade ) ) {
+		$quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
+		if ($quiz_passmark <= intval($quiz_grade)) {
 			return true;
 		}
 
@@ -1725,9 +1725,9 @@ 
      *
 	 * @return mixed false or comment_ID
 	 */
-	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
+	public static function update_lesson_status($user_id, $lesson_id, $status = 'in-progress', $metadata = array()) {
 		$comment_id = false;
-		if ( !empty($status) ) {
+		if ( ! empty($status)) {
 			$args = array(
 					'user_id'   => $user_id,
 					'post_id'   => $lesson_id,
@@ -1736,18 +1736,18 @@ 
 					'action'    => 'update', // Update the existing status...
 					'keep_time' => true, // ...but don't change the existing timestamp
 				);
-			if( 'in-progress' == $status ) {
-				unset( $args['keep_time'] ); // Keep updating what's happened
+			if ('in-progress' == $status) {
+				unset($args['keep_time']); // Keep updating what's happened
 			}
 
-			$comment_id = Sensei_Utils::sensei_log_activity( $args );
-			if ( $comment_id && !empty($metadata) ) {
-				foreach( $metadata as $key => $value ) {
-					update_comment_meta( $comment_id, $key, $value );
+			$comment_id = Sensei_Utils::sensei_log_activity($args);
+			if ($comment_id && ! empty($metadata)) {
+				foreach ($metadata as $key => $value) {
+					update_comment_meta($comment_id, $key, $value);
 				}
 			}
 
-			do_action( 'sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id );
+			do_action('sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id);
 		}
 		return $comment_id;
 	}
@@ -1763,9 +1763,9 @@ 
 	 * @param array $metadata
 	 * @return mixed false or comment_ID
 	 */
-	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) {
+	public static function update_course_status($user_id, $course_id, $status = 'in-progress', $metadata = array()) {
 		$comment_id = false;
-		if ( !empty($status) ) {
+		if ( ! empty($status)) {
 			$args = array(
 					'user_id'   => $user_id,
 					'post_id'   => $course_id,
@@ -1774,17 +1774,17 @@ 
 					'action'    => 'update', // Update the existing status...
 					'keep_time' => true, // ...but don't change the existing timestamp
 				);
-			if( 'in-progress' == $status ) {
-				unset( $args['keep_time'] ); // Keep updating what's happened
+			if ('in-progress' == $status) {
+				unset($args['keep_time']); // Keep updating what's happened
 			}
 
-			$comment_id = Sensei_Utils::sensei_log_activity( $args );
-			if ( $comment_id && !empty($metadata) ) {
-				foreach( $metadata as $key => $value ) {
-					update_comment_meta( $comment_id, $key, $value );
+			$comment_id = Sensei_Utils::sensei_log_activity($args);
+			if ($comment_id && ! empty($metadata)) {
+				foreach ($metadata as $key => $value) {
+					update_comment_meta($comment_id, $key, $value);
 				}
 			}
-			do_action( 'sensei_course_status_updated', $status, $user_id, $course_id, $comment_id );
+			do_action('sensei_course_status_updated', $status, $user_id, $course_id, $comment_id);
 		}
 		return $comment_id;
 	}
@@ -1796,9 +1796,9 @@ 
 	 * @param  array $pieces (default: array())
 	 * @return array
 	 */
-	public static function single_comment_filter( $pieces ) {
-		unset( $pieces['orderby'] );
-		unset( $pieces['order'] );
+	public static function single_comment_filter($pieces) {
+		unset($pieces['orderby']);
+		unset($pieces['order']);
 
 		return $pieces;
 	}
@@ -1810,9 +1810,9 @@ 
 	 * @param  array $pieces (default: array())
 	 * @return array
 	 */
-	public static function comment_any_status_filter( $pieces ) {
+	public static function comment_any_status_filter($pieces) {
 
-		$pieces['where'] = str_replace( array( "( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND" ), '', $pieces['where'] );
+		$pieces['where'] = str_replace(array("( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND"), '', $pieces['where']);
 
 		return $pieces;
 	}
@@ -1824,12 +1824,12 @@ 
 	 * @param  array $pieces (default: array())
 	 * @return array
 	 */
-	public static function comment_multiple_status_filter( $pieces ) {
+	public static function comment_multiple_status_filter($pieces) {
 
-		preg_match( "/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder );
-		if ( !empty($placeholder[1]) ) {
-			$statuses = explode( ',', $placeholder[1] );
-			$pieces['where'] = str_replace( "comment_approved = '" . $placeholder[1] . "'", "comment_approved IN ('". implode( "', '", $statuses ) . "')", $pieces['where'] );
+		preg_match("/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder);
+		if ( ! empty($placeholder[1])) {
+			$statuses = explode(',', $placeholder[1]);
+			$pieces['where'] = str_replace("comment_approved = '".$placeholder[1]."'", "comment_approved IN ('".implode("', '", $statuses)."')", $pieces['where']);
 		}
 
 		return $pieces;
@@ -1841,12 +1841,12 @@ 
      * @param array $pieces
 	 * @return array $pieces
 	 */
-	public static function comment_total_sum_meta_value_filter( $pieces ) {
+	public static function comment_total_sum_meta_value_filter($pieces) {
 		global $wpdb, $wp_version;
 
 		$pieces['fields'] = " COUNT(*) AS total, SUM($wpdb->commentmeta.meta_value) AS meta_sum ";
-		unset( $pieces['groupby'] );
-		if ( version_compare($wp_version, '4.1', '>=') ) {
+		unset($pieces['groupby']);
+		if (version_compare($wp_version, '4.1', '>=')) {
 			$args['order'] = false;
 			$args['orderby'] = false;
 		}
@@ -1861,12 +1861,12 @@ 
 	 * @param  array $pieces (default: array())
 	 * @return array
 	 */
-	public static function get_posts_count_only_filter( $pieces ) {
+	public static function get_posts_count_only_filter($pieces) {
 		global $wp_version;
 
 		$pieces['fields'] = " COUNT(*) AS total ";
-		unset( $pieces['groupby'] );
-		if ( version_compare($wp_version, '4.1', '>=') ) {
+		unset($pieces['groupby']);
+		if (version_compare($wp_version, '4.1', '>=')) {
 			$args['order'] = false;
 			$args['orderby'] = false;
 		}
@@ -1885,9 +1885,9 @@ 
      *
      * @return bool $success
      */
-    public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){
+    public static function add_user_data($data_key, $post_id, $value = '', $user_id = 0) {
 
-        return self::update_user_data( $data_key, $post_id, $value , $user_id );
+        return self::update_user_data($data_key, $post_id, $value, $user_id);
 
     }// end add_user_data
 
@@ -1906,18 +1906,18 @@ 
      *
      * @return bool $success
      */
-    public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){
+    public static function update_user_data($data_key, $post_id, $value = '', $user_id = 0) {
 
-        if( ! ( $user_id > 0 ) ){
+        if ( ! ($user_id > 0)) {
             $user_id = get_current_user_id();
         }
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || !get_userdata( $user_id )
-            || ! in_array( $post_type, $supported_post_types )  ){
+        $supported_post_types = array('course', 'lesson');
+        $post_type = get_post_type($post_id);
+        if (empty($post_id) || empty($data_key)
+            || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0)
+            || ! get_userdata($user_id)
+            || ! in_array($post_type, $supported_post_types)) {
 
             return false;
         }
@@ -1925,20 +1925,20 @@ 
         // check if there and existing Sensei status on this post type if not create it
         // and get the  activity ID
         $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
+        $sensei_user_status = self::$status_function($post_id, $user_id);
+        if ( ! isset($sensei_user_status->comment_ID)) {
 
             $start_function = 'user_start_'.$post_type;
-            $sensei_user_activity_id = self::$start_function( $user_id, $post_id );
+            $sensei_user_activity_id = self::$start_function($user_id, $post_id);
 
-        }else{
+        } else {
 
             $sensei_user_activity_id = $sensei_user_status->comment_ID;
 
         }
 
         // store the data
-        $success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
+        $success = update_comment_meta($sensei_user_activity_id, $data_key, $value);
 
        return $success;
 
@@ -1957,20 +1957,20 @@ 
      *
      * @return mixed $user_data_value
      */
-    public static function get_user_data( $data_key, $post_id, $user_id = 0  ){
+    public static function get_user_data($data_key, $post_id, $user_id = 0) {
 
         $user_data_value = true;
 
-        if( ! ( $user_id > 0 ) ){
+        if ( ! ($user_id > 0)) {
             $user_id = get_current_user_id();
         }
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
+        $supported_post_types = array('course', 'lesson');
+        $post_type = get_post_type($post_id);
+        if (empty($post_id) || empty($data_key)
+            || ! (intval($post_id) > 0) || ! (intval($user_id) > 0)
+            || ! get_userdata($user_id)
+            || ! in_array($post_type, $supported_post_types)) {
 
             return false;
         }
@@ -1978,13 +1978,13 @@ 
         // check if there and existing Sensei status on this post type if not create it
         // and get the  activity ID
         $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
+        $sensei_user_status = self::$status_function($post_id, $user_id);
+        if ( ! isset($sensei_user_status->comment_ID)) {
             return false;
         }
 
         $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true );
+        $user_data_value = get_comment_meta($sensei_user_activity_id, $data_key, true);
 
         return $user_data_value;
 
@@ -1999,19 +1999,19 @@ 
      *
      * @return bool $deleted
      */
-    public static function delete_user_data( $data_key, $post_id , $user_id ){
+    public static function delete_user_data($data_key, $post_id, $user_id) {
         $deleted = true;
 
-        if( ! ( $user_id > 0 ) ){
+        if ( ! ($user_id > 0)) {
             $user_id = get_current_user_id();
         }
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
+        $supported_post_types = array('course', 'lesson');
+        $post_type = get_post_type($post_id);
+        if (empty($post_id) || empty($data_key)
+            || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0)
+            || ! get_userdata($user_id)
+            || ! in_array($post_type, $supported_post_types)) {
 
             return false;
         }
@@ -2019,13 +2019,13 @@ 
         // check if there and existing Sensei status on this post type if not create it
         // and get the  activity ID
         $status_function = 'user_'.$post_type.'_status';
-        $sensei_user_status = self::$status_function( $post_id ,$user_id  );
-        if( ! isset( $sensei_user_status->comment_ID ) ){
+        $sensei_user_status = self::$status_function($post_id, $user_id);
+        if ( ! isset($sensei_user_status->comment_ID)) {
             return false;
         }
 
         $sensei_user_activity_id = $sensei_user_status->comment_ID;
-        $deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
+        $deleted = delete_comment_meta($sensei_user_activity_id, $data_key);
 
         return $deleted;
 
@@ -2050,62 +2050,62 @@ 
      *
      * @return string $drop_down_element
      */
-    public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) {
+    public static function generate_drop_down($selected_value, $options = array(), $attributes = array(), $enable_none_option = true) {
 
         $drop_down_element = '';
 
         // setup the basic attributes
-        if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
+        if ( ! isset($attributes['name']) || empty($attributes['name'])) {
 
             $attributes['name'] = 'sensei-options';
 
         }
 
-        if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
+        if ( ! isset($attributes['id']) || empty($attributes['id'])) {
 
             $attributes['id'] = 'sensei-options';
 
         }
 
-        if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+        if ( ! isset($attributes['class']) || empty($attributes['class'])) {
 
-            $attributes['class'] ='chosen_select widefat';
+            $attributes['class'] = 'chosen_select widefat';
 
         }
 
         // create element attributes
         $combined_attributes = '';
-        foreach( $attributes as $attribute => $value ){
+        foreach ($attributes as $attribute => $value) {
 
-            $combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+            $combined_attributes .= $attribute.'="'.$value.'"'.' ';
 
         }// end for each
 
 
         // create the select element
-        $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
+        $drop_down_element .= '<select '.$combined_attributes.' >'."\n";
 
         // show the none option if the client requested
-        if( $enable_none_option ) {
-            $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+        if ($enable_none_option) {
+            $drop_down_element .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
         }
 
-        if ( count( $options ) > 0 ) {
+        if (count($options) > 0) {
 
-            foreach ($options as $value => $option ){
+            foreach ($options as $value => $option) {
 
                 $element = '';
-                $element.= '<option value="' . esc_attr( $value ) . '"';
-                $element .= selected( $value, $selected_value, false ) . '>';
-                $element .= esc_html(  $option ) . '</option>' . "\n";
+                $element .= '<option value="'.esc_attr($value).'"';
+                $element .= selected($value, $selected_value, false).'>';
+                $element .= esc_html($option).'</option>'."\n";
 
                 // add the element to the select html
-                $drop_down_element.= $element;
+                $drop_down_element .= $element;
             } // End For Loop
 
         } // End If Statement
 
-        $drop_down_element .= '</select>' . "\n";
+        $drop_down_element .= '</select>'."\n";
 
         return $drop_down_element;
 
@@ -2125,14 +2125,14 @@ 
      *
      * @return double $val
      */
-    public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){
+    public static function round($val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = '') {
 
         /**å
          * Change the precision for the Sensei_Utils::round function.
          * the precision given will be passed into the php round function
          * @since 1.8.5
          */
-        $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
+        $precision = apply_filters('sensei_round_precision', $precision, $val, $context, $mode);
 
         /**
          * Change the mode for the Sensei_Utils::round function.
@@ -2142,15 +2142,15 @@ 
          *
          * @since 1.8.5
          */
-        $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
+        $mode = apply_filters('sensei_round_mode', $mode, $val, $context, $precision);
 
-        if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
 
-            return round( $val, $precision, $mode );
+            return round($val, $precision, $mode);
 
-        }else{
+        } else {
 
-            return round( $val, $precision );
+            return round($val, $precision);
 
         }
 
@@ -2162,15 +2162,15 @@ 
      * @since 1.9.0
      * @return string $url
      */
-    public static function get_current_url(){
+    public static function get_current_url() {
 
         global $wp;
-        $current_url = trailingslashit( home_url( $wp->request ) );
-        if ( isset( $_GET ) ) {
+        $current_url = trailingslashit(home_url($wp->request));
+        if (isset($_GET)) {
 
-            foreach ($_GET as $param => $val ) {
+            foreach ($_GET as $param => $val) {
 
-                $current_url = add_query_arg( $param, $val , $current_url );
+                $current_url = add_query_arg($param, $val, $current_url);
 
             }
         }
@@ -2200,27 +2200,27 @@ 
      * @param array $array_b
      * @return array $merged_array
      */
-    public static function array_zip_merge( $array_a, $array_b ){
+    public static function array_zip_merge($array_a, $array_b) {
 
-        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
+        if ( ! is_array($array_a) || ! is_array($array_b)) {
             trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
         }
 
         $merged_array = array();
-        $total_elements = count( $array_a )  + count( $array_b );
+        $total_elements = count($array_a) + count($array_b);
 
         // Zip arrays
-        for ( $i = 0; $i < $total_elements; $i++) {
+        for ($i = 0; $i < $total_elements; $i++) {
 
             // if has an element at current index push a on top
-            if( isset( $array_a[ $i ] ) ){
-                $merged_array[] = $array_a[ $i ]  ;
+            if (isset($array_a[$i])) {
+                $merged_array[] = $array_a[$i];
             }
 
             // next if $array_b has an element at current index push a on top of the element
             // from a if there was one, if not the element before that.
-            if( isset( $array_b[ $i ] ) ){
-                $merged_array[] = $array_b[ $i ]  ;
+            if (isset($array_b[$i])) {
+                $merged_array[] = $array_b[$i];
             }
 
         }
@@ -2235,4 +2235,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Utils extends Sensei_Utils{}
\ No newline at end of file
+class WooThemes_Sensei_Utils extends Sensei_Utils {}
\ No newline at end of file

includes/template-functions.php

Indentation +315 added lines, -316 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,66 +248,66 @@ 
 			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
-
-            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
-            }
-
-            $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 ) );
+
+			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
+			}
+
+			$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 ) {
@@ -338,9 +338,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();
 
   }
 
@@ -365,7 +365,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()
 
@@ -480,27 +480,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;
 
 	}
@@ -604,41 +604,41 @@ 
  */
 function sensei_get_the_module_status(){
 
-    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');
 
-        }
+		}
 
-    }
+	}
 
-    $module_status_html = '<p class="status module-status completed">'
-                            . strtolower( str_replace( ' ', '-', $module_status  ) )
-                            . '</p>';
+	$module_status_html = '<p class="status module-status completed">'
+							. strtolower( str_replace( ' ', '-', $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 );
+	/**
+	 * 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 );
 
 }
 
@@ -648,7 +648,7 @@ 
  */
 function sensei_the_module_status(){
 
-    echo sensei_get_the_module_status();
+	echo sensei_get_the_module_status();
 
 }
 
@@ -669,21 +669,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
 
@@ -694,15 +694,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
@@ -715,12 +714,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
 
@@ -731,26 +730,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 ) );
 
 }
 
@@ -761,12 +760,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
 
@@ -793,63 +792,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
 
@@ -861,49 +860,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 ) ){
-
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
-        return;
+	// 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;
 
-    // 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
 
@@ -919,16 +918,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
 
@@ -944,28 +943,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
 
@@ -977,14 +976,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'] );
 
 }
 
@@ -995,14 +994,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 );
 
 }
 
@@ -1013,8 +1012,8 @@ 
  */
 function sensei_the_excerpt( $post_id ){
 
-    global $post;
-    the_excerpt( $post );
+	global $post;
+	the_excerpt( $post );
 
 }
 
@@ -1028,9 +1027,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;
 
  }
 
@@ -1042,7 +1041,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
 
@@ -1057,7 +1056,7 @@ 
  */
 function sensei_load_template( $template_name ){
 
-    Sensei_Templates::get_template( $template_name );
+	Sensei_Templates::get_template( $template_name );
 
 }
 
@@ -1071,7 +1070,7 @@ 
  */
 function sensei_load_template_part( $slug, $name ){
 
-    Sensei_Templates::get_part( $slug, $name );
+	Sensei_Templates::get_part( $slug, $name );
 
 }
 
@@ -1090,17 +1089,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()
 
@@ -1110,16 +1109,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' );
 }
 
 /**
@@ -1131,7 +1130,7 @@ 
  */
 function sensei_courses_per_row(){
 
-    echo Sensei_Course::get_loop_number_of_columns();
+	echo Sensei_Course::get_loop_number_of_columns();
 
 }
 
@@ -1145,7 +1144,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 );
 
 }
 
@@ -1159,14 +1158,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
 /**
@@ -1178,5 +1177,5 @@ 
  */
 function sensei_the_lesson_status_class(){
 
-    echo get_the_lesson_status_class();
+	echo get_the_lesson_status_class();
 }

Spacing +193 added lines, -193 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ){ exit; } // Exit if accessed directly
+if ( ! defined('ABSPATH')) { exit; } // Exit if accessed directly
 
 	/***************************************************************************************************
 	 * 	Output tags.
@@ -12,9 +12,9 @@ 
      * @param string $type (default: 'newcourses')
      * @return void
      */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+    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()
 
@@ -27,15 +27,15 @@ 
 	 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 ){
+         $located_template = locate_template(Sensei()->template_url.'single-course/course-lessons.php');
+         if ($located_template) {
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+             Sensei_Templates::get_template('single-course/course-lessons.php');
              return;
 
         }
 
-		Sensei_Templates::get_template( 'single-course/lessons.php' );
+		Sensei_Templates::get_template('single-course/lessons.php');
 
 	 } // End course_single_lessons()
 
@@ -48,7 +48,7 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_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()
@@ -62,9 +62,9 @@ 
 	  * @return void
       * @deprecated since 1.9.0
 	  */
-	 function quiz_questions( $return = false ) {
+	 function quiz_questions($return = false) {
 
-	 	Sensei_Templates::get_template( 'single-quiz/quiz-questions.php' );
+	 	Sensei_Templates::get_template('single-quiz/quiz-questions.php');
 
 	 } // End quiz_questions()
 
@@ -76,9 +76,9 @@ 
 	  * @return void
       * @deprecated
 	  */
-	 function quiz_question_type( $question_type = 'multiple-choice' ) {
+	 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()
 
@@ -94,9 +94,9 @@ 
 	 * @param mixed $course_id
 	 * @return bool
 	 */
-	function sensei_check_prerequisite_course( $course_id ) {
+	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()
 
@@ -108,16 +108,16 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_start_course_form( $course_id ) {
+	function sensei_start_course_form($course_id) {
 
-		$prerequisite_complete = sensei_check_prerequisite_course( $course_id );
+		$prerequisite_complete = sensei_check_prerequisite_course($course_id);
 
-		if ( $prerequisite_complete ) {
-		?><form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		if ($prerequisite_complete) {
+		?><form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
-    			<input type="hidden" name="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" id="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_start_course_noonce' ) ); ?>" />
+    			<input type="hidden" name="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" id="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_start_course_noonce')); ?>" />
 
-    			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
+    			<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
@@ -132,9 +132,9 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_wc_add_to_cart( $course_id ) {
+	function sensei_wc_add_to_cart($course_id) {
 
-		Sensei_WC::the_add_to_cart_button_html( $course_id );
+		Sensei_WC::the_add_to_cart_button_html($course_id);
 
 	} // End sensei_wc_add_to_cart()
 
@@ -146,8 +146,8 @@ 
 	 * @param int $wc_post_id (default: 0)
 	 * @return bool
 	 */
-	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+	function sensei_check_if_product_is_in_cart($wc_product_id = 0) {
+        return Sensei_WC::is_product_in_cart($wc_product_id);
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -157,16 +157,16 @@ 
 	 * @param mixed $post_id
 	 * @return void
 	 */
-	function sensei_simple_course_price( $post_id ) {
+	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 ) {
+        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 );
+    	    	$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
@@ -180,11 +180,11 @@ 
 	 * @param array $widget_args (default: array())
 	 * @return array
 	 */
-	function sensei_recent_comments_widget_filter( $widget_args = array() ) {
-		if ( ! isset( $widget_args['post_type'] ) ) $widget_args['post_type'] = array( 'post', 'page' );
+	function sensei_recent_comments_widget_filter($widget_args = array()) {
+		if ( ! isset($widget_args['post_type'])) $widget_args['post_type'] = array('post', 'page');
 		return $widget_args;
 	} // End sensei_recent_comments_widget_filter()
-	add_filter( 'widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1 );
+	add_filter('widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1);
 
 	/**
 	 * sensei_course_archive_filter function.
@@ -193,26 +193,26 @@ 
 	 * @param WP_Query $query ( default: array ( ) )
 	 * @return void
 	 */
-	function sensei_course_archive_filter( $query ) {
+	function sensei_course_archive_filter($query) {
 
 
-		if ( ! $query->is_main_query() )
+		if ( ! $query->is_main_query())
         	return;
 
 		// Apply Filter only if on frontend and when course archive is running
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
 
-		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
+		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' ] );
+   			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' );
+    			$amount = $query->get('posts_per_page');
     		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+    		$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 );
+	add_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1);
 
 	/**
 	 * sensei_complete_lesson_button description
@@ -220,7 +220,7 @@ 
 	 * @return html
 	 */
 	function sensei_complete_lesson_button() {
-		do_action( 'sensei_complete_lesson_button' );
+		do_action('sensei_complete_lesson_button');
 	} // End sensei_complete_lesson_button()
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @return html
 	 */
 	function sensei_reset_lesson_button() {
-		do_action( 'sensei_reset_lesson_button' );
+		do_action('sensei_reset_lesson_button');
 	} // End sensei_reset_lesson_button()
 
 	/**
@@ -238,19 +238,19 @@ 
 	 * @param  integer $lesson_id
 	 * @return array $return_values
 	 */
-	function sensei_get_prev_next_lessons( $lesson_id = 0 ) {
+	function sensei_get_prev_next_lessons($lesson_id = 0) {
 
 		$return_values = array();
 		$return_values['prev_lesson'] = 0;
 		$return_values['next_lesson'] = 0;
-		if ( 0 < $lesson_id ) {
+		if (0 < $lesson_id) {
 			// Get the List of Lessons in the Course
-			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+			$lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($lesson_course_id));
 
-            foreach( (array) $modules as $module ) {
+            foreach ((array) $modules as $module) {
 
                 $args = array(
                     'post_type' => 'lesson',
@@ -259,7 +259,7 @@ 
                     'meta_query' => array(
                         array(
                             'key' => '_lesson_course',
-                            'value' => intval( $lesson_course_id ),
+                            'value' => intval($lesson_course_id),
                             'compare' => '='
                         )
                     ),
@@ -267,18 +267,18 @@ 
                         array(
                             'taxonomy' => Sensei()->modules->taxonomy,
                             'field' => 'id',
-                            'terms' => intval( $module->term_id )
+                            'terms' => intval($module->term_id)
                         )
                     ),
-                    'meta_key' => '_order_module_' . $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){
+                $lessons = get_posts($args);
+                if (0 < count($lessons)) {
+                    foreach ($lessons as $lesson_item) {
                         $all_lessons[] = $lesson_item->ID;
                     } // End For Loop
                 } // End If Statement
@@ -288,36 +288,36 @@ 
                 'post_type' => 'lesson',
                 'posts_per_page' => -1,
                 'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
+                '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 ),
+                        '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){
+            $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 ) {
+				foreach ($all_lessons as $lesson) {
+					if ($found_index && $return_values['next_lesson'] == 0) {
 						$return_values['next_lesson'] = $lesson;
 					} // End If Statement
-					if ( $lesson == $lesson_id ) {
+					if ($lesson == $lesson_id) {
 						// Is the current post
 						$found_index = true;
 					} // End If Statement
-					if ( !$found_index ) {
+					if ( ! $found_index) {
 						$return_values['prev_lesson'] = $lesson;
 					} // End If Statement
 				} // End For Loop
@@ -336,7 +336,7 @@ 
    * @param  int|WP_Post $post_id Optional. Defaults to current post
    * @return string $excerpt
    */
-  function sensei_get_excerpt( $post_id = '' ) {
+  function sensei_get_excerpt($post_id = '') {
 
       global $post;
       _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
@@ -344,14 +344,14 @@ 
 
   }
 
-	function sensei_has_user_started_course( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()" );
-		return Sensei_Utils::user_started_course( $post_id, $user_id );
+	function sensei_has_user_started_course($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()");
+		return Sensei_Utils::user_started_course($post_id, $user_id);
 	} // End sensei_has_user_started_course()
 
-	function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -363,9 +363,9 @@ 
  * @param int $user_id
  * @return bool
 */
-function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
+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()
 
@@ -388,7 +388,7 @@ 
  * @return bool
  *
  */
-function sensei_have_modules( $course_post_id = '' ){
+function sensei_have_modules($course_post_id = '') {
 
 	global $post, $wp_query, $sensei_modules_loop;
 
@@ -396,23 +396,23 @@ 
 	wp_reset_query();
 	$post = $wp_query->post;
 
-	if( empty( $course_post_id ) ){
+	if (empty($course_post_id)) {
 
 		$course_id = $post->ID;
 
 	}
 
 	// doesn't apply to none course post types
-	if( ! sensei_is_a_course( $course_id )  ){
+	if ( ! sensei_is_a_course($course_id)) {
 		return false;
 	}
 
 	// check the current item compared to the total number of modules
-	if( $sensei_modules_loop[ 'current' ] + 1 > $sensei_modules_loop[ 'total' ]  ){
+	if ($sensei_modules_loop['current'] + 1 > $sensei_modules_loop['total']) {
 
 		return false;
 
-	}else{
+	} else {
 
 		return true;
 
@@ -426,27 +426,27 @@ 
  *
  * @since 1.9.0
  */
-function sensei_setup_module(){
+function sensei_setup_module() {
 
 	global  $sensei_modules_loop, $wp_query;
 
 	// increment the index
-	$sensei_modules_loop[ 'current' ]++;
-	$index = $sensei_modules_loop[ 'current' ];
-	if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+	$sensei_modules_loop['current']++;
+	$index = $sensei_modules_loop['current'];
+	if (isset($sensei_modules_loop['modules'][$index])) {
 
 		$sensei_modules_loop['current_module'] = $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['current_module']->term_id;
-		$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_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() ){
+		if ($modules_query->have_posts()) {
 
 			$wp_query = $modules_query;
 
-		}else{
+		} else {
 
 			wp_reset_query();
 
@@ -470,30 +470,30 @@ 
  *
  * @return bool
  */
-function sensei_module_has_lessons(){
+function sensei_module_has_lessons() {
 
 	global $wp_query, $sensei_modules_loop;
 
-	if( 'lesson' == $wp_query->get('post_type') ){
+	if ('lesson' == $wp_query->get('post_type')) {
 
 		return have_posts();
 
-	}else{
+	} else {
 
         // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+        if ( -1 == $sensei_modules_loop['current']  ) {
 
             $index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+            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() ){
+                if ($modules_query->have_posts()) {
 
                     return true;
 
@@ -517,9 +517,9 @@ 
  * @uses sensei_the_module_title
  * @return string
  */
-function sensei_the_module_title_attribute(){
+function sensei_the_module_title_attribute() {
 
-	esc_attr_e( sensei_get_the_module_title() );
+	esc_attr_e(sensei_get_the_module_title());
 
 }
 
@@ -530,11 +530,11 @@ 
  *
  * @return string
  */
-function sensei_the_module_permalink(){
+function sensei_the_module_permalink() {
 
 	global $sensei_modules_loop;
 	$course_id = $sensei_modules_loop['course_id'];
-	$module_url = add_query_arg('course_id', $course_id, get_term_link( $sensei_modules_loop['current_module'], 'module' ) );
+	$module_url = add_query_arg('course_id', $course_id, get_term_link($sensei_modules_loop['current_module'], 'module'));
 	$module_term_id = $sensei_modules_loop['current_module']->term_id;
 
 	/**
@@ -546,7 +546,7 @@ 
 	 * @param int $module_term_id
 	 * @param string $course_id
 	 */
-	 echo esc_url_raw( apply_filters( 'sensei_the_module_permalink', $module_url, $module_term_id  ,$course_id ) );
+	 echo esc_url_raw(apply_filters('sensei_the_module_permalink', $module_url, $module_term_id, $course_id));
 
 }// end sensei_the_module_permalink
 
@@ -558,7 +558,7 @@ 
  *
  * @return string
  */
-function sensei_get_the_module_title(){
+function sensei_get_the_module_title() {
 
 	global $sensei_modules_loop;
 
@@ -577,7 +577,7 @@ 
 	 * @param $module_term_id
 	 * @param $course_id
 	 */
-	return apply_filters( 'sensei_the_module_title',  $module_title , $module_term_id, $course_id );
+	return apply_filters('sensei_the_module_title', $module_title, $module_term_id, $course_id);
 
 }
 
@@ -589,7 +589,7 @@ 
  * @uses sensei_get_the_module_title
  * @return string
  */
-function sensei_the_module_title(){
+function sensei_the_module_title() {
 
 	echo sensei_get_the_module_title();
 
@@ -602,16 +602,16 @@ 
  * @since 1.9.0
  * @return string
  */
-function sensei_get_the_module_status(){
+function sensei_get_the_module_status() {
 
     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_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');
 
@@ -624,7 +624,7 @@ 
     }
 
     $module_status_html = '<p class="status module-status completed">'
-                            . strtolower( str_replace( ' ', '-', $module_status  ) )
+                            . strtolower(str_replace(' ', '-', $module_status))
                             . '</p>';
 
     /**
@@ -638,7 +638,7 @@ 
      * @param $module_term_id
      * @param $course_id
      */
-    return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
+    return apply_filters('sensei_the_module_status_html', $module_status_html, $module_term_id, $course_id);
 
 }
 
@@ -646,7 +646,7 @@ 
  * Print out the current module status
  * @since 1.9.0
  */
-function sensei_the_module_status(){
+function sensei_the_module_status() {
 
     echo sensei_get_the_module_status();
 
@@ -667,19 +667,19 @@ 
  *
  * @return bool
  */
-function sensei_quiz_has_questions(){
+function sensei_quiz_has_questions() {
 
     global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
+    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;
 
-    }else{
+    } else {
 
         return false;
 
@@ -696,13 +696,13 @@ 
  * @since 1.9.0
 
  */
-function sensei_setup_the_question(){
+function sensei_setup_the_question() {
 
     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_question'] = $sensei_question_loop['questions'][$index];
 
 
 }// end sensei_setup_the_question
@@ -713,14 +713,14 @@ 
  * This function gets the type and loads the template that will handle it.
  *
  */
-function sensei_the_question_content(){
+function sensei_the_question_content() {
 
     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 );
+    WooThemes_Sensei_Question::load_question_template($question_type);
 
 }// end sensei_the_question_content
 
@@ -729,11 +729,11 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_question_class(){
+function sensei_the_question_class() {
 
     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
@@ -741,16 +741,16 @@ 
      *
      * @since 1.9.0
      */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+     $classes = apply_filters('sensei_question_classes', array($question_type));
 
     $html_classes = '';
-    foreach( $classes as $class ){
+    foreach ($classes as $class) {
 
-        $html_classes .= $class . ' ';
+        $html_classes .= $class.' ';
 
     }// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+    esc_attr_e(trim($html_classes));
 
 }
 
@@ -759,10 +759,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_get_the_question_id( ){
+function sensei_get_the_question_id( ) {
 
     global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+    if (isset($sensei_question_loop['current_question']->ID)) {
 
         return $sensei_question_loop['current_question']->ID;
 
@@ -791,27 +791,27 @@ 
  * @param string $lesson_id
  * @return bool
  */
-function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
+function sensei_can_user_view_lesson($lesson_id = '', $user_id = '') {
 
-    if( empty( $lesson_id ) ){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( empty( $user_id ) ){
+    if (empty($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 );
+    $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 ) ) {
+    if (Sensei_Utils::is_preview_lesson($lesson_id)) {
 
         $is_preview = true;
         $pre_requisite_complete = true;
@@ -819,24 +819,24 @@ 
     };
 
 
-    $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;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+    if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) {
 
         $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
@@ -849,7 +849,7 @@ 
      * @param string $lesson_id
      * @param string $user_id
      */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $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
 
@@ -859,51 +859,51 @@ 
  * The function should only be called on the single lesson
  *
  */
-function sensei_the_single_lesson_meta(){
+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 ) ){
+    $template = Sensei_Templates::locate_template('single-lesson/lesson-meta.php');
+    if ( ! empty($template)) {
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+        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() );
+    $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' );
+    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 ) {
+    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 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_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
 
@@ -917,9 +917,9 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_header(){
+function get_sensei_header() {
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+    if ( ! defined('ABSPATH')) exit;
 
     get_header();
 
@@ -928,7 +928,7 @@ 
      *
      * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
      */
-    do_action( 'sensei_before_main_content' );
+    do_action('sensei_before_main_content');
 
 }// end get_sensei_header
 
@@ -942,28 +942,28 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_footer(){
+function get_sensei_footer() {
 
     /**
      * sensei_pagination hook
      *
      * @hooked sensei_pagination - 10 (outputs pagination)
      */
-    do_action( 'sensei_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' );
+    do_action('sensei_after_main_content');
 
     /**
      * sensei_sidebar hook
      *
      * @hooked sensei_get_sidebar - 10
      */
-    do_action( 'sensei_sidebar' );
+    do_action('sensei_sidebar');
 
     get_footer();
 
@@ -975,7 +975,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_title(){
+function the_no_permissions_title() {
 
     /**
      * Filter the no permissions title just before it is echo'd on the
@@ -984,7 +984,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_title
      */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+    echo apply_filters('sensei_the_no_permissions_title', Sensei()->permissions_message['title']);
 
 }
 
@@ -993,7 +993,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_message( $post_id ){
+function the_no_permissions_message($post_id) {
 
     /**
      * Filter the no permissions message just before it is echo'd on the
@@ -1002,7 +1002,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_message
      */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+    echo apply_filters('sensei_the_no_permissions_message', Sensei()->permissions_message['message'], $post_id);
 
 }
 
@@ -1011,10 +1011,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_excerpt( $post_id ){
+function sensei_the_excerpt($post_id) {
 
     global $post;
-    the_excerpt( $post );
+    the_excerpt($post);
 
 }
 
@@ -1026,10 +1026,10 @@ 
  * @global WP $wp
  * @return string $current_page_url
  */
- function sensei_get_current_page_url(){
+ function sensei_get_current_page_url() {
 
      global $wp;
-     $current_page_url =  home_url( $wp->request );
+     $current_page_url = home_url($wp->request);
      return $current_page_url;
 
  }
@@ -1040,9 +1040,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_my_courses_content(){
+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
 
@@ -1055,9 +1055,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_load_template( $template_name ){
+function sensei_load_template($template_name) {
 
-    Sensei_Templates::get_template( $template_name );
+    Sensei_Templates::get_template($template_name);
 
 }
 
@@ -1069,9 +1069,9 @@ 
  * @param string $name the name of the template.
  * @since 1.9.0
  */
-function sensei_load_template_part( $slug, $name ){
+function sensei_load_template_part($slug, $name) {
 
-    Sensei_Templates::get_part( $slug, $name );
+    Sensei_Templates::get_part($slug, $name);
 
 }
 
@@ -1088,19 +1088,19 @@ 
  * @access public
  * @param string $lesson_id
  */
-function sensei_the_lesson_excerpt( $lesson_id = '' ) {
+function sensei_the_lesson_excerpt($lesson_id = '') {
 
-    if( empty( $lesson_id )){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
+    if ('lesson' != get_post_type($lesson_id)) {
         return;
     }
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+    echo Sensei_Lesson::lesson_excerpt(get_post($lesson_id), false);
 
 }// End lesson_excerpt()
 
@@ -1109,17 +1109,17 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_course_results_lessons(){
+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 ){
+    $located_template = locate_template(Sensei()->template_url.'course-results/course-lessons.php');
+    if ($located_template) {
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+        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');
 }
 
 /**
@@ -1129,7 +1129,7 @@ 
  * @uses Sensei_Course::get_loop_number_of_columns
  * @since 1.9.0
  */
-function sensei_courses_per_row(){
+function sensei_courses_per_row() {
 
     echo Sensei_Course::get_loop_number_of_columns();
 
@@ -1143,9 +1143,9 @@ 
  * @param $args
  * @param $path
  */
-function sensei_get_template( $template_name, $args, $path ){
+function sensei_get_template($template_name, $args, $path) {
 
-    Sensei_Templates::get_template( $template_name, $args, $path );
+    Sensei_Templates::get_template($template_name, $args, $path);
 
 }
 
@@ -1157,12 +1157,12 @@ 
  *
  * @return string $status_class
  */
-function get_the_lesson_status_class(){
+function get_the_lesson_status_class() {
 
     $status_class = '';
-    $lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+    $lesson_completed = Sensei_Utils::user_completed_lesson(get_the_ID(), get_current_user_id());
 
-    if ( $lesson_completed ) {
+    if ($lesson_completed) {
         $status_class = 'completed';
     }
 
@@ -1176,7 +1176,7 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_lesson_status_class(){
+function sensei_the_lesson_status_class() {
 
     echo get_the_lesson_status_class();
 }