woothemes / sensei

includes/emails/class-woothemes-sensei-email-teacher-started-course.php

Spacing +12 added lines, -12 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_Started_Course' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Teacher_Started_Course')) :
 
 /**
  * Teacher Started Course
@@ -31,8 +31,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'teacher-started-course';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your student has started a course', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has started a course', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your student has started a course', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your student has started a course', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -41,31 +41,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $learner_id = 0, $course_id = 0 ) {
+	function trigger($learner_id = 0, $course_id = 0) {
 		global  $sensei_email_data;
 
 		// Get learner user object
-		$this->learner = new WP_User( $learner_id );
+		$this->learner = new WP_User($learner_id);
 
 		// Get teacher ID and user object
-		$teacher_id = get_post_field( 'post_author', $course_id, 'raw' );
-		$this->teacher = new WP_User( $teacher_id );
+		$teacher_id = get_post_field('post_author', $course_id, 'raw');
+		$this->teacher = new WP_User($teacher_id);
 
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $teacher_id,
 			'learner_id'		=> $learner_id,
 			'learner_name'		=> $this->learner->display_name,
 			'course_id'			=> $course_id,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (learner)
-		$this->recipient = stripslashes( $this->teacher->user_email );
+		$this->recipient = stripslashes($this->teacher->user_email);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis User Profile List Table Class

includes/emails/class-woothemes-sensei-email-new-message-reply.php

Indentation +10 added lines, -10 removed lines

@@ -64,16 +64,16 @@
 
 		$comment_link = get_comment_link( $comment );
 
-        // setup the post type parameter
-        $content_type = get_post_type( $content_id );
-        if( !$content_type ){
-            $content_type ='';
-        }
-
-        // Construct data array
-        $sensei_email_data = apply_filters( 'sensei_email_data', array(
-            'template'			=> $this->template,
-            $content_type.'_id' => $content_id,
+		// setup the post type parameter
+		$content_type = get_post_type( $content_id );
+		if( !$content_type ){
+			$content_type ='';
+		}
+
+		// Construct data array
+		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+			'template'			=> $this->template,
+			$content_type.'_id' => $content_id,
 			'heading'			=> $this->heading,
 			'commenter_name'	=> $this->commenter->display_name,
 			'message'			=> $this->comment->comment_content,

Spacing +23 added lines, -23 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_New_Message_Reply' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_New_Message_Reply')) :
 
 /**
  * Teacher New Message
@@ -34,8 +34,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'new-message-reply';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] You have a new message', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'You have received a reply to your private message', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] You have a new message', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('You have received a reply to your private message', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -44,34 +44,34 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $comment, $message ) {
+	function trigger($comment, $message) {
 		global  $sensei_email_data;
 
 		$this->comment = $comment;
 		$this->message = $message;
 
-		$this->commenter = get_userdata( $comment->user_id );
+		$this->commenter = get_userdata($comment->user_id);
 
-		$original_sender = get_post_meta( $this->message->ID, '_sender', true );
-		$this->original_sender = get_user_by( 'login', $original_sender );
+		$original_sender = get_post_meta($this->message->ID, '_sender', true);
+		$this->original_sender = get_user_by('login', $original_sender);
 
-		$original_receiver = get_post_meta( $this->message->ID, '_receiver', true );
-		$this->original_receiver = get_user_by( 'login', $original_receiver );
+		$original_receiver = get_post_meta($this->message->ID, '_receiver', true);
+		$this->original_receiver = get_user_by('login', $original_receiver);
 
-		$content_type = get_post_meta( $this->message->ID, '_posttype', true );
-		$content_id = get_post_meta( $this->message->ID, '_post', true );
-		$content_title = get_the_title( $content_id );
+		$content_type = get_post_meta($this->message->ID, '_posttype', true);
+		$content_id = get_post_meta($this->message->ID, '_post', true);
+		$content_title = get_the_title($content_id);
 
-		$comment_link = get_comment_link( $comment );
+		$comment_link = get_comment_link($comment);
 
         // setup the post type parameter
-        $content_type = get_post_type( $content_id );
-        if( !$content_type ){
-            $content_type ='';
+        $content_type = get_post_type($content_id);
+        if ( ! $content_type) {
+            $content_type = '';
         }
 
         // Construct data array
-        $sensei_email_data = apply_filters( 'sensei_email_data', array(
+        $sensei_email_data = apply_filters('sensei_email_data', array(
             'template'			=> $this->template,
             $content_type.'_id' => $content_id,
 			'heading'			=> $this->heading,
@@ -80,17 +80,17 @@ 
 			'comment_link'		=> $comment_link,
 			'content_title'		=> $content_title,
 			'content_type'		=> $content_type,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient
-		if( $this->commenter->user_login == $original_sender ) {
-			$this->recipient = stripslashes( $this->original_receiver->user_email );
+		if ($this->commenter->user_login == $original_sender) {
+			$this->recipient = stripslashes($this->original_receiver->user_email);
 		} else {
-			$this->recipient = stripslashes( $this->original_sender->user_email );
+			$this->recipient = stripslashes($this->original_sender->user_email);
 		}
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis User Profile List Table Class

includes/admin/class-sensei-welcome.php

Indentation +38 added lines, -38 removed lines

@@ -25,45 +25,45 @@ 
 
 	/**
 	 * Hook in tabs.
-     * @since 1.8.0
+	 * @since 1.8.0
 	 */
 	public function __construct() {
 
-        add_action( 'admin_menu', array( $this, 'admin_menus') );
+		add_action( 'admin_menu', array( $this, 'admin_menus') );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
 
 	}
 
-    /**
-     * Sends user to the welcome page on first activation.
-     *
-     * Hooked into activated_plugin
-     * @since 1.8.0
-     */
-    public static function redirect( $plugin ) {
+	/**
+	 * Sends user to the welcome page on first activation.
+	 *
+	 * Hooked into activated_plugin
+	 * @since 1.8.0
+	 */
+	public static function redirect( $plugin ) {
 
-        // Bail if activating from network, or bulk, or within an iFrame
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
+		// Bail if activating from network, or bulk, or within an iFrame
+		if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
 
-            return;
+			return;
 
-        }
-        // don't run for upgrades and for pages already on the welcome screen
-        if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
-            || ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
+		}
+		// don't run for upgrades and for pages already on the welcome screen
+		if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
+			|| ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
-        exit;
-    }
+		wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
+		exit;
+	}
 
 	/**
 	 * Add admin menus/screens.
-     *
-     * @since 1.8.0
+	 *
+	 * @since 1.8.0
 	 */
 	public function admin_menus() {
 
@@ -73,17 +73,17 @@ 
 
 		$welcome_page_name  = __( 'Sensei Activation', 'woothemes-sensei' );
 		$welcome_page_title = __( 'Welcome to Sensei', 'woothemes-sensei' );
-        add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
+		add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
 
 	}
 
-    /**
-     * Output the Welcome  screen.
-     *
-     * @since 1.8.0
-     */
-    public function welcome_screen() {
-        ?>
+	/**
+	 * Output the Welcome  screen.
+	 *
+	 * @since 1.8.0
+	 */
+	public function welcome_screen() {
+		?>
         <div class="wrap about-wrap">
 
             <?php  $this->intro(); ?>
@@ -136,13 +136,13 @@ 
             </div>
         </div>
     <?php
-    }
+	}
 
 	/**
 	 * Add styles just for this page, and remove dashboard page links.
 	 */
 	public function admin_head() {
-        // remove the menu page so it is not visible in the admin side bar
+		// remove the menu page so it is not visible in the admin side bar
 		remove_submenu_page( 'index.php', 'sensei-welcome' );
 		?>
 		<style type="text/css">
@@ -266,7 +266,7 @@ 
 
 		// Random tweet - must be kept to 102 chars to "fit"
 		$tweets        = array(
-            'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
+			'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
 		);
 		shuffle( $tweets );
 		?>
@@ -288,11 +288,11 @@ 
 
 		<div class="sensei-badge">
             <?php
-                _e('Sensei by WooThemes','woothemes-sensei');
-                echo '<br />';
+				_e('Sensei by WooThemes','woothemes-sensei');
+				echo '<br />';
 
-                printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
-            ?>
+				printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
+			?>
         </div>
 
 		<p class="sensei-actions">

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
  * @version     1.8.0
 */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -29,8 +29,8 @@ 
 	 */
 	public function __construct() {
 
-        add_action( 'admin_menu', array( $this, 'admin_menus') );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
+        add_action('admin_menu', array($this, 'admin_menus'));
+		add_action('admin_head', array($this, 'admin_head'));
 
 	}
 
@@ -40,23 +40,23 @@ 
      * Hooked into activated_plugin
      * @since 1.8.0
      */
-    public static function redirect( $plugin ) {
+    public static function redirect($plugin) {
 
         // Bail if activating from network, or bulk, or within an iFrame
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi']) || defined('IFRAME_REQUEST')) {
 
             return;
 
         }
         // don't run for upgrades and for pages already on the welcome screen
-        if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
-            || ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
+        if ((isset($_GET['action']) && 'upgrade-plugin' == $_GET['action'])
+            || ( ! empty($_GET['page']) && $_GET['page'] === 'sensei-welcome')) {
 
             return;
 
         }
 
-        wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
+        wp_redirect(admin_url('index.php?page=sensei-welcome'));
         exit;
     }
 
@@ -67,13 +67,13 @@ 
 	 */
 	public function admin_menus() {
 
-		if ( ! isset( $_GET['page'] ) || 'sensei-welcome' != $_GET[ 'page' ] ) {
+		if ( ! isset($_GET['page']) || 'sensei-welcome' != $_GET['page']) {
 			return;
 		}
 
-		$welcome_page_name  = __( 'Sensei Activation', 'woothemes-sensei' );
-		$welcome_page_title = __( 'Welcome to Sensei', 'woothemes-sensei' );
-        add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
+		$welcome_page_name  = __('Sensei Activation', 'woothemes-sensei');
+		$welcome_page_title = __('Welcome to Sensei', 'woothemes-sensei');
+        add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array($this, 'welcome_screen'));
 
 	}
 
@@ -132,7 +132,7 @@ 
             <hr />
 
             <div class="return-to-dashboard">
-                <a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'woothemes-sensei-settings' ), 'admin.php' ) ) ); ?>"><?php _e( 'Go to Sensei Settings', 'woothemes-sensei' ); ?></a>
+                <a href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'woothemes-sensei-settings'), 'admin.php'))); ?>"><?php _e('Go to Sensei Settings', 'woothemes-sensei'); ?></a>
             </div>
         </div>
     <?php
@@ -143,7 +143,7 @@ 
 	 */
 	public function admin_head() {
         // remove the menu page so it is not visible in the admin side bar
-		remove_submenu_page( 'index.php', 'sensei-welcome' );
+		remove_submenu_page('index.php', 'sensei-welcome');
 		?>
 		<style type="text/css">
 			/*<![CDATA[*/
@@ -262,47 +262,47 @@ 
 	private function intro() {
 
 		// Drop minor version if 0
-		$major_version = substr( Sensei()->version, 0, 3 );
+		$major_version = substr(Sensei()->version, 0, 3);
 
 		// Random tweet - must be kept to 102 chars to "fit"
 		$tweets        = array(
             'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
 		);
-		shuffle( $tweets );
+		shuffle($tweets);
 		?>
-		<h1><?php printf( __( 'Welcome to Sensei %s', 'woothemes-sensei' ), $major_version ); ?></h1>
+		<h1><?php printf(__('Welcome to Sensei %s', 'woothemes-sensei'), $major_version); ?></h1>
 
 		<div class="about-text sensei-about-text">
 			<?php
-				if ( ! empty( $_GET['sensei-installed'] ) ) {
-					$message = __( 'Thanks, all done!', 'woothemes-sensei' );
-				} elseif ( ! empty( $_GET['sensei-updated'] ) ) {
-					$message = __( 'Thank you for updating to the latest version!', 'woothemes-sensei' );
+				if ( ! empty($_GET['sensei-installed'])) {
+					$message = __('Thanks, all done!', 'woothemes-sensei');
+				} elseif ( ! empty($_GET['sensei-updated'])) {
+					$message = __('Thank you for updating to the latest version!', 'woothemes-sensei');
 				} else {
-					$message = __( 'Thanks for installing!', 'woothemes-sensei' );
+					$message = __('Thanks for installing!', 'woothemes-sensei');
 				}
 
-				printf( __( '%s We hope you enjoy using Sensei %s.', 'woothemes-sensei' ), $message, $major_version );
+				printf(__('%s We hope you enjoy using Sensei %s.', 'woothemes-sensei'), $message, $major_version);
 			?>
 		</div>
 
 		<div class="sensei-badge">
             <?php
-                _e('Sensei by WooThemes','woothemes-sensei');
+                _e('Sensei by WooThemes', 'woothemes-sensei');
                 echo '<br />';
 
-                printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
+                printf(__('Version %s', 'woothemes-sensei'), Sensei()->version);
             ?>
         </div>
 
 		<p class="sensei-actions">
-			<a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button button-primary"><?php _e( 'Settings', 'woothemes-sensei' ); ?></a>
-			<a href="<?php echo esc_url( apply_filters( 'sensei_docs_url', 'http://docs.woothemes.com/documentation/plugins/sensei/', 'woothemes-sensei' ) ); ?>" class="docs button button-primary"><?php _e( 'Docs', 'woothemes-sensei' ); ?></a>
-			<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/products/sensei" data-text="<?php echo esc_attr( $tweets[0] ); ?>" data-via="WooThemes" data-size="large">Tweet</a>
+			<a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button button-primary"><?php _e('Settings', 'woothemes-sensei'); ?></a>
+			<a href="<?php echo esc_url(apply_filters('sensei_docs_url', 'http://docs.woothemes.com/documentation/plugins/sensei/', 'woothemes-sensei')); ?>" class="docs button button-primary"><?php _e('Docs', 'woothemes-sensei'); ?></a>
+			<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/products/sensei" data-text="<?php echo esc_attr($tweets[0]); ?>" data-via="WooThemes" data-size="large">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>
 
-		<h2 > <?php _e( "What's New", 'woothemes-sensei' ); ?> </h2>
+		<h2 > <?php _e("What's New", 'woothemes-sensei'); ?> </h2>
 
 		<?php
 	}

includes/lib/woo-functions.php

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
 			global $woocommerce;
 			if( version_compare( $woocommerce->version, $version, ">=" ) ) {
-			    return true;
+				return true;
 			}
 		}
 		return false;

Braces +9 added lines, -4 removed lines

@@ -7,8 +7,9 @@ 
 	function woothemes_queue_update( $file, $file_id, $product_id ) {
 		global $woothemes_queued_updates;
 
-		if ( ! isset( $woothemes_queued_updates ) )
-			$woothemes_queued_updates = array();
+		if ( ! isset( $woothemes_queued_updates ) ) {
+					$woothemes_queued_updates = array();
+		}
 
 		$plugin             = new stdClass();
 		$plugin->file       = $file;
@@ -31,7 +32,9 @@ 
 			false !== $api ||
 			! isset( $args->slug ) ||
 			'woothemes-updater' != $args->slug
-		) return $api;
+		) {
+			return $api;
+		}
 
 		$api = new stdClass();
 		$api->name = 'WooThemes Updater';
@@ -54,7 +57,9 @@ 
 	 */
 	function woothemes_updater_notice() {
 		$active_plugins = apply_filters( 'active_plugins', get_option('active_plugins' ) );
-		if ( in_array( 'woothemes-updater/woothemes-updater.php', $active_plugins ) ) return;
+		if ( in_array( 'woothemes-updater/woothemes-updater.php', $active_plugins ) ) {
+			return;
+		}
 
 		$slug = 'woothemes-updater';
 		$install_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $slug ), 'install-plugin_' . $slug );

Spacing +25 added lines, -25 removed lines

@@ -3,11 +3,11 @@ 
 /**
  * Queue updates for the WooUpdater
  */
-if ( ! function_exists( 'woothemes_queue_update' ) ) {
-	function woothemes_queue_update( $file, $file_id, $product_id ) {
+if ( ! function_exists('woothemes_queue_update')) {
+	function woothemes_queue_update($file, $file_id, $product_id) {
 		global $woothemes_queued_updates;
 
-		if ( ! isset( $woothemes_queued_updates ) )
+		if ( ! isset($woothemes_queued_updates))
 			$woothemes_queued_updates = array();
 
 		$plugin             = new stdClass();
@@ -23,56 +23,56 @@ 
  * Load installer for the WooThemes Updater.
  * @return $api Object
  */
-if ( ! class_exists( 'WooThemes_Updater' ) && ! function_exists( 'woothemes_updater_install' ) ) {
-	function woothemes_updater_install( $api, $action, $args ) {
+if ( ! class_exists('WooThemes_Updater') && ! function_exists('woothemes_updater_install')) {
+	function woothemes_updater_install($api, $action, $args) {
 		$download_url = 'http://woodojo.s3.amazonaws.com/downloads/woothemes-updater/woothemes-updater.zip';
 
-		if ( 'plugin_information' != $action ||
+		if ('plugin_information' != $action ||
 			false !== $api ||
-			! isset( $args->slug ) ||
+			! isset($args->slug) ||
 			'woothemes-updater' != $args->slug
 		) return $api;
 
 		$api = new stdClass();
 		$api->name = 'WooThemes Updater';
 		$api->version = '';
-		$api->download_link = esc_url( $download_url );
+		$api->download_link = esc_url($download_url);
 		return $api;
 	}
 
-	add_filter( 'plugins_api', 'woothemes_updater_install', 10, 3 );
+	add_filter('plugins_api', 'woothemes_updater_install', 10, 3);
 }
 
 /**
  * WooUpdater Installation Prompts
  */
-if ( ! class_exists( 'WooThemes_Updater' ) && ! function_exists( 'woothemes_updater_notice' ) ) {
+if ( ! class_exists('WooThemes_Updater') && ! function_exists('woothemes_updater_notice')) {
 
 	/**
 	 * Display a notice if the "WooThemes Updater" plugin hasn't been installed.
 	 * @return void
 	 */
 	function woothemes_updater_notice() {
-		$active_plugins = apply_filters( 'active_plugins', get_option('active_plugins' ) );
-		if ( in_array( 'woothemes-updater/woothemes-updater.php', $active_plugins ) ) return;
+		$active_plugins = apply_filters('active_plugins', get_option('active_plugins'));
+		if (in_array('woothemes-updater/woothemes-updater.php', $active_plugins)) return;
 
 		$slug = 'woothemes-updater';
-		$install_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $slug ), 'install-plugin_' . $slug );
-		$activate_url = 'plugins.php?action=activate&plugin=' . urlencode( 'woothemes-updater/woothemes-updater.php' ) . '&plugin_status=all&paged=1&s&_wpnonce=' . urlencode( wp_create_nonce( 'activate-plugin_woothemes-updater/woothemes-updater.php' ) );
+		$install_url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$slug), 'install-plugin_'.$slug);
+		$activate_url = 'plugins.php?action=activate&plugin='.urlencode('woothemes-updater/woothemes-updater.php').'&plugin_status=all&paged=1&s&_wpnonce='.urlencode(wp_create_nonce('activate-plugin_woothemes-updater/woothemes-updater.php'));
 
-		$message = '<a href="' . esc_url( $install_url ) . '">Install the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.';
+		$message = '<a href="'.esc_url($install_url).'">Install the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.';
 		$is_downloaded = false;
-		$plugins = array_keys( get_plugins() );
-		foreach ( $plugins as $plugin ) {
-			if ( strpos( $plugin, 'woothemes-updater.php' ) !== false ) {
+		$plugins = array_keys(get_plugins());
+		foreach ($plugins as $plugin) {
+			if (strpos($plugin, 'woothemes-updater.php') !== false) {
 				$is_downloaded = true;
-				$message = '<a href="' . esc_url( admin_url( $activate_url ) ) . '">Activate the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.';
+				$message = '<a href="'.esc_url(admin_url($activate_url)).'">Activate the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.';
 			}
 		}
-		echo '<div class="updated fade"><p>' . $message . '</p></div>' . "\n";
+		echo '<div class="updated fade"><p>'.$message.'</p></div>'."\n";
 	}
 
-	add_action( 'admin_notices', 'woothemes_updater_notice' );
+	add_action('admin_notices', 'woothemes_updater_notice');
 }
 
 /**
@@ -81,11 +81,11 @@ 
  * @param  $version Version to check against
  * @return @boolean
  */
-if( ! function_exists( 'sensei_check_woocommerce_version' ) ) {
-	function sensei_check_woocommerce_version( $version = '2.1' ) {
-		if ( Sensei_WC::is_woocommerce_active() ) {
+if ( ! function_exists('sensei_check_woocommerce_version')) {
+	function sensei_check_woocommerce_version($version = '2.1') {
+		if (Sensei_WC::is_woocommerce_active()) {
 			global $woocommerce;
-			if( version_compare( $woocommerce->version, $version, ">=" ) ) {
+			if (version_compare($woocommerce->version, $version, ">=")) {
 			    return true;
 			}
 		}

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

Braces +9 added lines, -11 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis Lesson List Table Class
@@ -204,31 +207,26 @@ 
 			$status_class = 'graded';
 
 			$grade =  __( 'No Grade', 'woothemes-sensei' );
-		}
-		elseif( 'graded' == $item->comment_approved ) {
+		} elseif( 'graded' == $item->comment_approved ) {
 			$status = __( 'Graded', 'woothemes-sensei' ) ;
 			$status_class = 'graded';
 
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
-		}
-		elseif( 'passed' == $item->comment_approved ) {
+		} elseif( 'passed' == $item->comment_approved ) {
 			$status =  __( 'Passed', 'woothemes-sensei' );
 			$status_class = 'graded';
 
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
-		}
-		elseif( 'failed' == $item->comment_approved ) {
+		} elseif( 'failed' == $item->comment_approved ) {
 			$status = __( 'Failed', 'woothemes-sensei' );
 			$status_class = 'failed';
 
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
-		}
-		elseif( 'ungraded' == $item->comment_approved ) {
+		} elseif( 'ungraded' == $item->comment_approved ) {
 			$status =  __( 'Ungraded', 'woothemes-sensei' );
 			$status_class = 'ungraded';
 
-		}
-		else {
+		} else {
 			$status =  __( 'In Progress', 'woothemes-sensei' );
 			$user_end_date = '';
 		}

Indentation +2 added lines, -2 removed lines

@@ -234,9 +234,9 @@
 		}
 
 		// Output users data
-        $user_name = Sensei_Student::get_full_name( $item->user_id );
+		$user_name = Sensei_Student::get_full_name( $item->user_id );
 
-        if ( !$this->csv_output ) {
+		if ( !$this->csv_output ) {
 			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) );
 
 			$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $user_name . '</a></strong>';

Spacing +95 added lines, -95 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Analysis Lesson List Table Class
@@ -22,18 +22,18 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $lesson_id = 0 ) {
-		$this->lesson_id = intval( $lesson_id );
-		$this->course_id = intval( get_post_meta( $this->lesson_id, '_lesson_course', true ) );
+	public function __construct($lesson_id = 0) {
+		$this->lesson_id = intval($lesson_id);
+		$this->course_id = intval(get_post_meta($this->lesson_id, '_lesson_course', true));
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_lesson' );
+		parent::__construct('analysis_lesson');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -43,13 +43,13 @@ 
 	 */
 	function get_columns() {
 		$columns = array(
-			'title' => __( 'Learner', 'woothemes-sensei' ),
-			'started' => __( 'Date Started', 'woothemes-sensei' ),
-			'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-			'status' => __( 'Status', 'woothemes-sensei' ),
-			'grade' => __( 'Grade', 'woothemes-sensei' ),
+			'title' => __('Learner', 'woothemes-sensei'),
+			'started' => __('Date Started', 'woothemes-sensei'),
+			'completed' => __('Date Completed', 'woothemes-sensei'),
+			'status' => __('Status', 'woothemes-sensei'),
+			'grade' => __('Grade', 'woothemes-sensei'),
 		);
-		$columns = apply_filters( 'sensei_analysis_lesson_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_lesson_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -60,13 +60,13 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array(
-			'title' => array( 'title', false ),
-			'started' => array( 'started', false ),
-			'completed' => array( 'completed', false ),
-			'status' => array( 'status', false ),
-			'grade' => array( 'grade', false ),
+			'title' => array('title', false),
+			'started' => array('started', false),
+			'completed' => array('completed', false),
+			'status' => array('status', false),
+			'grade' => array('grade', false),
 		);
-		$columns = apply_filters( 'sensei_analysis_lesson_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_lesson_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -80,32 +80,32 @@ 
 
 		// Handle orderby (needs work)
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -114,19 +114,19 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
-		$this->items = $this->get_lesson_statuses( $args );
+		$this->items = $this->get_lesson_statuses($args);
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -142,22 +142,22 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
@@ -165,23 +165,23 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		$this->items = $this->get_lesson_statuses( $args );
+		$this->items = $this->get_lesson_statuses($args);
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -193,64 +193,64 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		$user_start_date = get_comment_meta( $item->comment_ID, 'start', true );
+		$user_start_date = get_comment_meta($item->comment_ID, 'start', true);
 		$user_end_date = $item->comment_date;
 		$status_class = $grade = '';
 
-		if( 'complete' == $item->comment_approved ) {
-			$status =  __( 'Completed', 'woothemes-sensei' );
+		if ('complete' == $item->comment_approved) {
+			$status = __('Completed', 'woothemes-sensei');
 			$status_class = 'graded';
 
-			$grade =  __( 'No Grade', 'woothemes-sensei' );
+			$grade = __('No Grade', 'woothemes-sensei');
 		}
-		elseif( 'graded' == $item->comment_approved ) {
-			$status = __( 'Graded', 'woothemes-sensei' ) ;
+		elseif ('graded' == $item->comment_approved) {
+			$status = __('Graded', 'woothemes-sensei');
 			$status_class = 'graded';
 
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
+			$grade = get_comment_meta($item->comment_ID, 'grade', true);
 		}
-		elseif( 'passed' == $item->comment_approved ) {
-			$status =  __( 'Passed', 'woothemes-sensei' );
+		elseif ('passed' == $item->comment_approved) {
+			$status = __('Passed', 'woothemes-sensei');
 			$status_class = 'graded';
 
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
+			$grade = get_comment_meta($item->comment_ID, 'grade', true);
 		}
-		elseif( 'failed' == $item->comment_approved ) {
-			$status = __( 'Failed', 'woothemes-sensei' );
+		elseif ('failed' == $item->comment_approved) {
+			$status = __('Failed', 'woothemes-sensei');
 			$status_class = 'failed';
 
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true);
+			$grade = get_comment_meta($item->comment_ID, 'grade', true);
 		}
-		elseif( 'ungraded' == $item->comment_approved ) {
-			$status =  __( 'Ungraded', 'woothemes-sensei' );
+		elseif ('ungraded' == $item->comment_approved) {
+			$status = __('Ungraded', 'woothemes-sensei');
 			$status_class = 'ungraded';
 
 		}
 		else {
-			$status =  __( 'In Progress', 'woothemes-sensei' );
+			$status = __('In Progress', 'woothemes-sensei');
 			$user_end_date = '';
 		}
 
 		// Output users data
-        $user_name = Sensei_Student::get_full_name( $item->user_id );
+        $user_name = Sensei_Student::get_full_name($item->user_id);
 
-        if ( !$this->csv_output ) {
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) );
+        if ( ! $this->csv_output) {
+			$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id), admin_url('admin.php'));
 
-			$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $user_name . '</a></strong>';
-			$status = sprintf( '<span class="%s">%s</span>', $item->comment_approved, $status );
-			if ( is_numeric($grade) ) {
+			$user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$user_name.'</a></strong>';
+			$status = sprintf('<span class="%s">%s</span>', $item->comment_approved, $status);
+			if (is_numeric($grade)) {
 				$grade .= '%';
 			}
 		} // End If Statement
-		$column_data = apply_filters( 'sensei_analysis_lesson_column_data', array( 'title' => $user_name,
+		$column_data = apply_filters('sensei_analysis_lesson_column_data', array('title' => $user_name,
 										'started' => $user_start_date,
 										'completed' => $user_end_date,
 										'status' => $status,
 										'grade' => $grade,
-									), $item, $this );
+									), $item, $this);
 
 		return $column_data;
 	}
@@ -260,7 +260,7 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_lesson_statuses( $args ) {
+	private function get_lesson_statuses($args) {
 
 		$activity_args = array( 
 				'post_id' => $this->lesson_id,
@@ -273,34 +273,34 @@ 
 			);
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $this->search ) {
+		if ($this->search) {
 			$user_args = array(
-				'search' => '*' . $this->search . '*',
+				'search' => '*'.$this->search.'*',
 				'fields' => 'ID',
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_analysis_lesson_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_analysis_lesson_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				// Store for reuse on counts
 				$activity_args['user_id'] = (array) $learners_search->get_results();
 			}
 		} // End If Statement
 
-		$activity_args = apply_filters( 'sensei_analysis_lesson_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_analysis_lesson_filter_statuses', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $this->total_items < $activity_args['offset'] ) {
-			$new_paged = floor( $total_statuses / $activity_args['number'] );
+		if ($this->total_items < $activity_args['offset']) {
+			$new_paged = floor($total_statuses / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($statuses) ) {
-			$statuses = array( $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = array($statuses);
 		}
 		return $statuses;
 	} // End get_lesson_statuses()
@@ -312,7 +312,7 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		 _e( 'No learners found.', 'woothemes-sensei' );
+		 _e('No learners found.', 'woothemes-sensei');
 	} // End no_items()
 
 	/**
@@ -321,7 +321,7 @@ 
 	 * @return void
 	 */
 	public function data_table_header() {
-		echo '<strong>' . __( 'Learners taking this Lesson', 'woothemes-sensei' ) . '</strong>';
+		echo '<strong>'.__('Learners taking this Lesson', 'woothemes-sensei').'</strong>';
 	} // End data_table_header()
 
 	/**
@@ -330,10 +330,10 @@ 
 	 * @return void
 	 */
 	public function data_table_footer() {
-		$lesson = get_post( $this->lesson_id );
-		$report = sanitize_title( $lesson->post_title ) . '-learners-overview';
-		$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $this->lesson_id, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$lesson = get_post($this->lesson_id);
+		$report = sanitize_title($lesson->post_title).'-learners-overview';
+		$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $this->lesson_id, 'sensei_report_download' => $report), admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	} // End data_table_footer()
 
 	/**
@@ -341,8 +341,8 @@ 
 	 * @since  1.7.0
 	 * @return void
 	 */
-	public function search_button( $text = '' ) {
-		return __( 'Search Learners', 'woothemes-sensei' );;
+	public function search_button($text = '') {
+		return __('Search Learners', 'woothemes-sensei'); ;
 	}
 } // End Class
 

includes/class-sensei-course.php

Braces +12 added lines, -10 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Course Class
@@ -614,7 +617,7 @@ 
 
 			return $results_array;
 
-		}else{
+		} else{
 
 			//reset the pagination as this widgets do not need it
 			$post_args['paged'] = 1;
@@ -835,7 +838,7 @@ 
 
             return $html;
 
-        }else{
+        } else{
 
             echo $html;
 
@@ -982,8 +985,7 @@ 
 				$has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
 				if ( $has_questions && $boolean_check ) {
 					return true;
-				}
-				elseif ( $has_questions ) {
+				} elseif ( $has_questions ) {
 					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 //					$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
 //					if( count( $questions ) > 0 ) {
@@ -1805,11 +1807,11 @@ 
 
             $course_id = $email['course_id'];
 
-        }elseif( isset( $email['lesson_id'] ) ){
+        } elseif( isset( $email['lesson_id'] ) ){
 
             $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
 
-        }elseif( isset( $email['quiz_id'] ) ){
+        } elseif( isset( $email['quiz_id'] ) ){
 
             $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
             $course_id = Sensei()->lesson->get_course_id( $lesson_id );
@@ -1870,7 +1872,7 @@ 
 
         if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
             $new_val = true;
-        }else{
+        } else{
             $new_val = false;
         }
 
@@ -2009,7 +2011,7 @@ 
 
                 $classes[] = 'user-status-completed';
 
-            }else{
+            } else{
 
                 $classes[] = 'user-status-active';
 
@@ -2826,7 +2828,7 @@ 
 
             $title = $term->name;
 
-        }else{
+        } else{
 
             $title = 'Course Category';
 

Doc Comments -2 removed lines

@@ -848,7 +848,6 @@ 
 	 * course_count function.
 	 *
 	 * @access public
-	 * @param array $exclude (default: array())
 	 * @param string $post_status (default: 'publish')
 	 * @return int
 	 */
@@ -1159,7 +1158,6 @@ 
      *
 	 * @since  1.4.0
 	 * @param  object  $user   Queried user object
-	 * @param  boolean $manage Whether the user has permission to manage the courses
 	 * @return string          HTML displayng course data
 	 */
 	public function load_user_courses_content( $user = false ) {

Indentation +1397 added lines, -1397 removed lines

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

Spacing +638 added lines, -638 removed lines

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

includes/class-sensei-templates.php

Braces +21 added lines, -9 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// security check, don't load file outside WP
 /**
  * Sensei Template Class
  *
@@ -69,8 +72,9 @@ 
      */
     public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 
-        if ( $args && is_array($args) )
-            extract( $args );
+        if ( $args && is_array($args) ) {
+                    extract( $args );
+        }
 
         $located = self::locate_template( $template_name, $template_path, $default_path );
 
@@ -99,8 +103,12 @@ 
      */
     public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
 
-        if ( ! $template_path ) $template_path = Sensei()->template_url;
-        if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
+        if ( ! $template_path ) {
+        	$template_path = Sensei()->template_url;
+        }
+        if ( ! $default_path ) {
+        	$default_path = Sensei()->plugin_path() . '/templates/';
+        }
 
         // Look within passed path within the theme - this is priority
         $template = locate_template(
@@ -261,7 +269,7 @@ 
             $find[] = $file;
             $find[] = Sensei()->template_url . $file;
 
-        }elseif( is_author()
+        } elseif( is_author()
                  && Sensei_Teacher::is_a_teacher( get_query_var('author') )
                  && ! user_can( get_query_var('author'), 'manage_options' ) ){
 
@@ -274,7 +282,9 @@ 
         if ( $file ) {
 
             $template = locate_template( $find );
-            if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+            if ( ! $template ) {
+            	$template = Sensei()->plugin_path() . '/templates/' . $file;
+            }
 
         } // End If Statement
 
@@ -305,7 +315,9 @@ 
         $find[] = Sensei()->template_url . $file;
 
         $template = locate_template( $find );
-        if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+        if ( ! $template ) {
+        	$template = Sensei()->plugin_path() . '/templates/' . $file;
+        }
 
         return $template;
 
@@ -335,7 +347,7 @@ 
                 include( $found_template );
                 get_sensei_footer();
 
-            }else{
+            } else{
 
                 include( $found_template );
 

Indentation +502 added lines, -502 removed lines

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

Spacing +152 added lines, -152 removed lines

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

includes/class-sensei-learners-main.php

Braces +6 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
 
 /**
  * Sensei Learners Overview List Table Class
@@ -409,8 +412,7 @@ 
 		if( $this->lesson_id ) {
 			$post_id = intval( $this->lesson_id );
 			$activity = 'sensei_lesson_status';
-		}
-		elseif( $this->course_id ) {
+		} elseif( $this->course_id ) {
 			$post_id = intval( $this->course_id );
 			$activity = 'sensei_course_status';
 		}
@@ -601,8 +603,7 @@ 
 			$post_type = __( 'Course', 'woothemes-sensei' );
 			$form_post_type = 'course';
 			$form_course_id = $this->course_id;
-		}
-		elseif( $this->course_id && $this->lesson_id ) {
+		} elseif( $this->course_id && $this->lesson_id ) {
 			$post_title = get_the_title( $this->lesson_id );
 			$post_type = __( 'Lesson', 'woothemes-sensei' );
 			$form_post_type = 'lesson';

Indentation +32 added lines, -32 removed lines

@@ -206,13 +206,13 @@ 
 
 	/**
 	 * Generates content for a single row of the table in the user management
-     * screen.
-     *
+	 * screen.
+	 *
 	 * @since  1.7.0
-     *
+	 *
 	 * @param object $item The current item
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	protected function get_row_data( $item ) {
 		global $wp_version;
@@ -220,8 +220,8 @@ 
 		switch ( $this->view ) {
 			case 'learners' :
 
-                // in this case the item passed in is actually the users activity on course of lesson
-                $user_activity = $item;
+				// in this case the item passed in is actually the users activity on course of lesson
+				$user_activity = $item;
 				$post_id = false;
 
 				if( $this->lesson_id ) {
@@ -240,45 +240,45 @@ 
 
 				if( 'complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved ) {
 
-                    $status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
+					$status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
 
 				} else {
 
-                    $status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
+					$status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
 
 				}
 
-                $title = Sensei_Student::get_full_name( $user_activity->user_id );
+				$title = Sensei_Student::get_full_name( $user_activity->user_id );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 
-                // get the learners order for this course if the course was purchased
+				// get the learners order for this course if the course was purchased
 
-                $course_order_id_attribute = '';
-                if( Sensei_WC::is_woocommerce_active() ){
+				$course_order_id_attribute = '';
+				if( Sensei_WC::is_woocommerce_active() ){
 
-                    $course_product_order_id = Sensei_WC::get_learner_course_active_order_id( $user_activity->user_id, $post_id  );
+					$course_product_order_id = Sensei_WC::get_learner_course_active_order_id( $user_activity->user_id, $post_id  );
 
-                    if( $course_product_order_id ){
+					if( $course_product_order_id ){
 
-                        $course_order_id_attribute = ' data-order_id="' . $course_product_order_id . '" ';
+						$course_order_id_attribute = ' data-order_id="' . $course_product_order_id . '" ';
 
-                    }
+					}
 
-                }
+				}
 
-                /**
-                 * sensei_learners_main_column_data filter
-                 *
-                 * This filter runs on the learner management screen for a specific course.
-                 * It provides the learner row column details.
-                 *
-                 * @param array $columns{
-                 *   type string $title
-                 *   type string $date_started
-                 *   type string $course_status (completed, started etc)
-                 *   type html $action_buttons
-                 * }
-                 */
+				/**
+				 * sensei_learners_main_column_data filter
+				 *
+				 * This filter runs on the learner management screen for a specific course.
+				 * It provides the learner row column details.
+				 *
+				 * @param array $columns{
+				 *   type string $title
+				 *   type string $date_started
+				 *   type string $course_status (completed, started etc)
+				 *   type html $action_buttons
+				 * }
+				 */
 				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
 						'title' => '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $user_activity->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
 						'date_started' => get_comment_meta( $user_activity->comment_ID, 'start', true),
@@ -308,7 +308,7 @@ 
 
 			case 'courses' :
 			default:
-                $course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
+				$course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
 				$title = get_the_title( $item );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 

Spacing +178 added lines, -178 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Learners Overview List Table Class
@@ -23,28 +23,28 @@ 
 	 * @since  1.6.0
 	 * @return  void
 	 */
-	public function __construct ( $course_id = 0, $lesson_id = 0 ) {
-		$this->course_id = intval( $course_id );
-		$this->lesson_id = intval( $lesson_id );
+	public function __construct($course_id = 0, $lesson_id = 0) {
+		$this->course_id = intval($course_id);
+		$this->lesson_id = intval($lesson_id);
 
-		if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'courses', 'lessons', 'learners' ) ) ) {
+		if (isset($_GET['view']) && in_array($_GET['view'], array('courses', 'lessons', 'learners'))) {
 			$this->view = $_GET['view'];
 		}
 
 		// Viewing a single lesson always sets the view to Learners
-		if( $this->lesson_id ) {
+		if ($this->lesson_id) {
 			$this->view = 'learners';
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'learners_main' );
+		parent::__construct('learners_main');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
-		add_action( 'sensei_learners_extra', array( $this, 'add_learners_box' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
+		add_action('sensei_learners_extra', array($this, 'add_learners_box'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -54,38 +54,38 @@ 
 	 */
 	function get_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'date_started' => __( 'Date Started', 'woothemes-sensei' ),
-					'user_status' => __( 'Status', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'date_started' => __('Date Started', 'woothemes-sensei'),
+					'user_status' => __('Status', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => __( 'Lesson', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Lesson', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'courses':
 			default:
 				$columns = array(
-					'title' => __( 'Course', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Course', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 		}
 		$columns['actions'] = '';
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -96,32 +96,32 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => array( 'title', false ),
+					'title' => array('title', false),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 
 			default:
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 		}
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns_sortable', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns_sortable', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -135,72 +135,72 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'DESC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle category selection
 		$category = false;
-		if ( !empty( $_GET['course_cat'] ) ) {
-			$category = intval( $_GET['course_cat'] );
+		if ( ! empty($_GET['course_cat'])) {
+			$category = intval($_GET['course_cat']);
 		} // End If Statement
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = '';
 				}
-				$this->items = $this->get_learners( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_learners(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			case 'lessons':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_lessons( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_lessons(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			default:
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_courses( compact( 'per_page', 'offset', 'orderby', 'order', 'category', 'search' ) );
+				$this->items = $this->get_courses(compact('per_page', 'offset', 'orderby', 'order', 'category', 'search'));
 
 			break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 
 	} // End prepare_items()
 
@@ -214,53 +214,53 @@ 
      *
      * @return void
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 		global $wp_version;
 
-		switch ( $this->view ) {
+		switch ($this->view) {
 			case 'learners' :
 
                 // in this case the item passed in is actually the users activity on course of lesson
                 $user_activity = $item;
 				$post_id = false;
 
-				if( $this->lesson_id ) {
+				if ($this->lesson_id) {
 
-					$post_id = intval( $this->lesson_id );
-					$object_type = __( 'lesson', 'woothemes-sensei' );
+					$post_id = intval($this->lesson_id);
+					$object_type = __('lesson', 'woothemes-sensei');
 					$post_type = 'lesson';
 
-				} elseif( $this->course_id ) {
+				} elseif ($this->course_id) {
 
-					$post_id = intval( $this->course_id );
-					$object_type = __( 'course', 'woothemes-sensei' );
+					$post_id = intval($this->course_id);
+					$object_type = __('course', 'woothemes-sensei');
 					$post_type = 'course';
 
 				}
 
-				if( 'complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved ) {
+				if ('complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved) {
 
-                    $status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
+                    $status_html = '<span class="graded">'.__('Completed', 'woothemes-sensei').'</span>';
 
 				} else {
 
-                    $status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
+                    $status_html = '<span class="in-progress">'.__('In Progress', 'woothemes-sensei').'</span>';
 
 				}
 
-                $title = Sensei_Student::get_full_name( $user_activity->user_id );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $title = Sensei_Student::get_full_name($user_activity->user_id);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
                 // get the learners order for this course if the course was purchased
 
                 $course_order_id_attribute = '';
-                if( Sensei_WC::is_woocommerce_active() ){
+                if (Sensei_WC::is_woocommerce_active()) {
 
-                    $course_product_order_id = Sensei_WC::get_learner_course_active_order_id( $user_activity->user_id, $post_id  );
+                    $course_product_order_id = Sensei_WC::get_learner_course_active_order_id($user_activity->user_id, $post_id);
 
-                    if( $course_product_order_id ){
+                    if ($course_product_order_id) {
 
-                        $course_order_id_attribute = ' data-order_id="' . $course_product_order_id . '" ';
+                        $course_order_id_attribute = ' data-order_id="'.$course_product_order_id.'" ';
 
                     }
 
@@ -279,50 +279,50 @@ 
                  *   type html $action_buttons
                  * }
                  */
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $user_activity->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
-						'date_started' => get_comment_meta( $user_activity->comment_ID, 'start', true),
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('user-edit.php?user_id='.$user_activity->user_id).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
+						'date_started' => get_comment_meta($user_activity->comment_ID, 'start', true),
 						'user_status' => $status_html,
-						'actions' => '<a class="remove-learner button" data-user_id="' . $user_activity->user_id . '" data-post_id="' . $post_id . '" data-post_type="' . $post_type . '" '. $course_order_id_attribute . '">' . sprintf( __( 'Remove from %1$s', 'woothemes-sensei' ), $object_type ) . '</a>',
-					), $item, $post_id, $post_type );
+						'actions' => '<a class="remove-learner button" data-user_id="'.$user_activity->user_id.'" data-post_id="'.$post_id.'" data-post_type="'.$post_type.'" '.$course_order_id_attribute.'">'.sprintf(__('Remove from %1$s', 'woothemes-sensei'), $object_type).'</a>',
+					), $item, $post_id, $post_type);
 
 				break;
 
 			case 'lessons' :
-				$lesson_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_lesson_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any' ) ) );
-				$title = get_the_title( $item );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+				$lesson_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_lesson_learners', array('post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any')));
+				$title = get_the_title($item);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
 				$grading_action = '';
-				if ( get_post_meta( $item->ID, '_quiz_has_questions', true ) ) {
-					$grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>';
+				if (get_post_meta($item->ID, '_quiz_has_questions', true)) {
+					$grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>';
 				}
 
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
 						'num_learners' => $lesson_learners,
 						'updated' => $item->post_modified,
-						'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action,
-					), $item, $this->course_id );
+						'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action,
+					), $item, $this->course_id);
 				break;
 
 			case 'courses' :
 			default:
-                $course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
-				$title = get_the_title( $item );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $course_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_course_learners', array('post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any')));
+				$title = get_the_title($item);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
 				$grading_action = '';
-				if ( version_compare($wp_version, '4.1', '>=') ) {
-					$grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $item->ID ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>';
+				if (version_compare($wp_version, '4.1', '>=')) {
+					$grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $item->ID), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>';
 				}
 
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
 						'num_learners' => $course_learners,
 						'updated' => $item->post_modified,
-						'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action,
-					), $item );
+						'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action,
+					), $item);
 
 				break;
 		} // switch
@@ -335,7 +335,7 @@ 
 	 * @since  1.7.0
 	 * @return array courses
 	 */
-	private function get_courses( $args ) {
+	private function get_courses($args) {
 		$course_args = array(
 			'post_type' => 'course',
 			'post_status' => 'publish',
@@ -345,7 +345,7 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $args['category'] ) {
+		if ($args['category']) {
 			$course_args['tax_query'][] = array(
 				'taxonomy' => 'course-category',
 				'field' => 'id',
@@ -353,11 +353,11 @@ 
 			);
 		}
 
-		if( $args['search'] ) {
+		if ($args['search']) {
 			$course_args['s'] = $args['search'];
 		}
 
-		$courses_query = new WP_Query( apply_filters( 'sensei_learners_filter_courses', $course_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_learners_filter_courses', $course_args));
 
 		$this->total_items = $courses_query->found_posts;
 		return $courses_query->posts;
@@ -368,7 +368,7 @@ 
 	 * @since  1.7.0
 	 * @return array lessons
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 		$lesson_args = array(
 			'post_type' => 'lesson',
 			'post_status' => 'publish',
@@ -378,18 +378,18 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $this->course_id ) {
+		if ($this->course_id) {
 			$lesson_args['meta_query'][] = array(
 				'key' => '_lesson_course',
 				'value' => $this->course_id,
 			);
 		}
 
-		if( $args['search'] ) {
+		if ($args['search']) {
 			$lesson_args['s'] = $args['search'];
 		}
 
-		$lessons_query = new WP_Query( apply_filters( 'sensei_learners_filter_lessons', $lesson_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_learners_filter_lessons', $lesson_args));
 
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
@@ -400,22 +400,22 @@ 
 	 * @since  1.7.0
 	 * @return array learners
 	 */
-	private function get_learners( $args ) {
+	private function get_learners($args) {
 
 		$user_ids = false;
 		$post_id = 0;
 		$activity = '';
 
-		if( $this->lesson_id ) {
-			$post_id = intval( $this->lesson_id );
+		if ($this->lesson_id) {
+			$post_id = intval($this->lesson_id);
 			$activity = 'sensei_lesson_status';
 		}
-		elseif( $this->course_id ) {
-			$post_id = intval( $this->course_id );
+		elseif ($this->course_id) {
+			$post_id = intval($this->course_id);
 			$activity = 'sensei_course_status';
 		}
 
-		if( ! $post_id || ! $activity ) {
+		if ( ! $post_id || ! $activity) {
 			$this->total_items = 0;
 			return array();
 		}
@@ -431,32 +431,32 @@ 
 			);
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $args['search'] ) {
+		if ($args['search']) {
 			$user_args = array(
-				'search' => '*' . $args['search'] . '*',
+				'search' => '*'.$args['search'].'*',
 				'fields' => 'ID'
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_learners_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_learners_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				$activity_args['user_id'] = $learners_search->get_results();
 			}
 		}
 
-		$activity_args = apply_filters( 'sensei_learners_filter_users', $activity_args );
+		$activity_args = apply_filters('sensei_learners_filter_users', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$total_learners = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$total_learners = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $total_learners < $activity_args['offset'] ) {
-			$new_paged = floor( $total_learners / $activity_args['number'] );
+		if ($total_learners < $activity_args['offset']) {
+			$new_paged = floor($total_learners / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$learners = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$learners = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($learners) ) {
-			$learners = array( $learners );
+		if ( ! is_array($learners)) {
+			$learners = array($learners);
 		}
 		$this->total_items = $total_learners;
 		return $learners;
@@ -469,22 +469,22 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners' :
-				$text = __( 'No learners found.', 'woothemes-sensei' );
+				$text = __('No learners found.', 'woothemes-sensei');
 				break;
 
 			case 'lessons' :
-				$text = __( 'No lessons found.', 'woothemes-sensei' );
+				$text = __('No lessons found.', 'woothemes-sensei');
 				break;
 
 			case 'courses':
 			case 'default':
 			default:
-				$text = __( 'No courses found.', 'woothemes-sensei' );
+				$text = __('No courses found.', 'woothemes-sensei');
 				break;
 		}
-		echo apply_filters( 'sensei_learners_no_items_text', $text );
+		echo apply_filters('sensei_learners_no_items_text', $text);
 	} // End no_items()
 
 	/**
@@ -495,40 +495,40 @@ 
 	public function data_table_header() {
 
 		echo '<div class="learners-selects">';
-		do_action( 'sensei_learners_before_dropdown_filters' );
+		do_action('sensei_learners_before_dropdown_filters');
 
 		// Display Course Categories only on default view
-		if( 'courses' == $this->view ) {
+		if ('courses' == $this->view) {
 
 			$selected_cat = 0;
-			if ( isset( $_GET['course_cat'] ) && '' != esc_html( $_GET['course_cat'] ) ) {
-				$selected_cat = intval( $_GET['course_cat'] );
+			if (isset($_GET['course_cat']) && '' != esc_html($_GET['course_cat'])) {
+				$selected_cat = intval($_GET['course_cat']);
 			}
 
-			$cats = get_terms( 'course-category', array( 'hide_empty' => false ) );
+			$cats = get_terms('course-category', array('hide_empty' => false));
 
-			echo '<div class="select-box">' . "\n";
+			echo '<div class="select-box">'."\n";
 
-				echo '<select id="course-category-options" data-placeholder="' . __( 'Course Category', 'woothemes-sensei' ) . '" name="learners_course_cat" class="chosen_select widefat">' . "\n";
+				echo '<select id="course-category-options" data-placeholder="'.__('Course Category', 'woothemes-sensei').'" name="learners_course_cat" class="chosen_select widefat">'."\n";
 
-					echo '<option value="0">' . __( 'All Course Categories', 'woothemes-sensei' ) . '</option>' . "\n";
+					echo '<option value="0">'.__('All Course Categories', 'woothemes-sensei').'</option>'."\n";
 
-					foreach( $cats as $cat ) {
-						echo '<option value="' . $cat->term_id . '"' . selected( $cat->term_id, $selected_cat, false ) . '>' . $cat->name . '</option>' . "\n";
+					foreach ($cats as $cat) {
+						echo '<option value="'.$cat->term_id.'"'.selected($cat->term_id, $selected_cat, false).'>'.$cat->name.'</option>'."\n";
 					}
 
-				echo '</select>' . "\n";
+				echo '</select>'."\n";
 
-			echo '</div>' . "\n";
+			echo '</div>'."\n";
 		}
 		echo '</div><!-- /.learners-selects -->';
 
 		$menu = array();
 		// Have Course no Lesson
-		if( $this->course_id && ! $this->lesson_id ) {
+		if ($this->course_id && ! $this->lesson_id) {
 
 			$learners_class = $lessons_class = '';
-			switch( $this->view ) {
+			switch ($this->view) {
 				case 'learners':
 					$learners_class = 'current';
 				break;
@@ -547,12 +547,12 @@ 
 			$learner_args['view'] = 'learners';
 			$lesson_args['view'] = 'lessons';
 
-			$menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>';
-			$menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>';
+			$menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>';
+			$menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>';
 
 		} 
 		// Have Course and Lesson
-		elseif( $this->course_id && $this->lesson_id ) {
+		elseif ($this->course_id && $this->lesson_id) {
 
 			$query_args = array(
 				'page' => $this->page_slug,
@@ -560,18 +560,18 @@ 
 				'view' => 'lessons'
 			);
 
-			$course = get_the_title( $this->course_id );
+			$course = get_the_title($this->course_id);
 
-			$menu['back'] = '<a href="' . esc_url( add_query_arg( $query_args, admin_url( 'admin.php' ) ) ) . '">' . sprintf( __( '%1$sBack to %2$s%3$s', 'woothemes-sensei' ), '<em>&larr; ', $course, '</em>' ) . '</a>';
+			$menu['back'] = '<a href="'.esc_url(add_query_arg($query_args, admin_url('admin.php'))).'">'.sprintf(__('%1$sBack to %2$s%3$s', 'woothemes-sensei'), '<em>&larr; ', $course, '</em>').'</a>';
 		}
-		$menu = apply_filters( 'sensei_learners_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu = apply_filters('sensei_learners_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 
 	} // End data_table_header()
@@ -596,50 +596,50 @@ 
 		$form_post_type = '';
 		$form_course_id = 0;
 		$form_lesson_id = 0;
-		if( $this->course_id && ! $this->lesson_id ) {
-			$post_title = get_the_title( $this->course_id );
-			$post_type = __( 'Course', 'woothemes-sensei' );
+		if ($this->course_id && ! $this->lesson_id) {
+			$post_title = get_the_title($this->course_id);
+			$post_type = __('Course', 'woothemes-sensei');
 			$form_post_type = 'course';
 			$form_course_id = $this->course_id;
 		}
-		elseif( $this->course_id && $this->lesson_id ) {
-			$post_title = get_the_title( $this->lesson_id );
-			$post_type = __( 'Lesson', 'woothemes-sensei' );
+		elseif ($this->course_id && $this->lesson_id) {
+			$post_title = get_the_title($this->lesson_id);
+			$post_type = __('Lesson', 'woothemes-sensei');
 			$form_post_type = 'lesson';
 			$form_course_id = $this->course_id;
 			$form_lesson_id = $this->lesson_id;
-			$course_title = get_the_title( $this->course_id );
+			$course_title = get_the_title($this->course_id);
 		}
-		if ( empty($form_post_type) ) {
+		if (empty($form_post_type)) {
 			return;
 		}
 		?>
 		<div class="postbox">
-			<h3><span><?php printf( __( 'Add Learner to %1$s', 'woothemes-sensei' ), $post_type ); ?></span></h3>
+			<h3><span><?php printf(__('Add Learner to %1$s', 'woothemes-sensei'), $post_type); ?></span></h3>
 			<div class="inside">
 				<form name="add_learner" action="" method="post">
 					<p>
-						<input name="add_user_id" placeholder="<?php _e( 'Find learner', 'woothemes-sensei' ) ;?>" id="add_learner_search" style="min-width:300px;" />
-						<?php if( 'lesson' == $form_post_type ) { ?>
-							<label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson"  value="yes" /> <?php _e( 'Complete lesson for learner', 'woothemes-sensei' ); ?></label>
-						<?php } elseif( 'course' == $form_post_type ) { ?>
-							<label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course"  value="yes" /> <?php _e( 'Complete course for learner', 'woothemes-sensei' ); ?></label>
+						<input name="add_user_id" placeholder="<?php _e('Find learner', 'woothemes-sensei'); ?>" id="add_learner_search" style="min-width:300px;" />
+						<?php if ('lesson' == $form_post_type) { ?>
+							<label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson"  value="yes" /> <?php _e('Complete lesson for learner', 'woothemes-sensei'); ?></label>
+						<?php } elseif ('course' == $form_post_type) { ?>
+							<label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course"  value="yes" /> <?php _e('Complete course for learner', 'woothemes-sensei'); ?></label>
 						<?php } ?>
 						<br/>
-						<span class="description"><?php _e( 'Search for a user by typing their name or username.', 'woothemes-sensei' ); ?></span>
+						<span class="description"><?php _e('Search for a user by typing their name or username.', 'woothemes-sensei'); ?></span>
 					</p>
-					<p><?php submit_button( sprintf( __( 'Add to \'%1$s\'', 'woothemes-sensei' ), $post_title ), 'primary', 'add_learner_submit', false, array() ); ?></p>
-					<?php if( 'lesson' == $form_post_type ) { ?>
-						<p><span class="description"><?php printf( __( 'Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei' ), $course_title ); ?></span></p>
+					<p><?php submit_button(sprintf(__('Add to \'%1$s\'', 'woothemes-sensei'), $post_title), 'primary', 'add_learner_submit', false, array()); ?></p>
+					<?php if ('lesson' == $form_post_type) { ?>
+						<p><span class="description"><?php printf(__('Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei'), $course_title); ?></span></p>
 					<?php } ?>
 
 					<input type="hidden" name="add_post_type" value="<?php echo $form_post_type; ?>" />
 					<input type="hidden" name="add_course_id" value="<?php echo $form_course_id; ?>" />
 					<input type="hidden" name="add_lesson_id" value="<?php echo $form_lesson_id; ?>" />
 					<?php
-						do_action( 'sensei_learners_add_learner_form' );
+						do_action('sensei_learners_add_learner_form');
 					?>
-					<?php wp_nonce_field( 'add_learner_to_sensei', 'add_learner_nonce' ); ?>
+					<?php wp_nonce_field('add_learner_to_sensei', 'add_learner_nonce'); ?>
 				</form>
 			</div>
 		</div>
@@ -651,19 +651,19 @@ 
 	 * @since  1.7.0
 	 * @return void
 	 */
-	public function search_button( $text = '' ) {
+	public function search_button($text = '') {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 
 			case 'lessons':
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 
 			default:
-				$text = __( 'Search Courses', 'woothemes-sensei' );
+				$text = __('Search Courses', 'woothemes-sensei');
 			break;
 		}
 

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

Braces +12 added lines, -17 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis Course List Table Class
@@ -359,31 +362,26 @@ 
 							$status_class = 'graded';
 
 							$grade = __( 'No Grade', 'woothemes-sensei' );
-						}
-						elseif( 'graded' == $lesson_status->comment_approved ) {
+						} elseif( 'graded' == $lesson_status->comment_approved ) {
 							$status =  __( 'Graded', 'woothemes-sensei' );
 							$status_class = 'graded';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'passed' == $lesson_status->comment_approved ) {
+						} elseif( 'passed' == $lesson_status->comment_approved ) {
 							$status =  __( 'Passed', 'woothemes-sensei' );
 							$status_class = 'graded';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'failed' == $lesson_status->comment_approved ) {
+						} elseif( 'failed' == $lesson_status->comment_approved ) {
 							$status =  __( 'Failed', 'woothemes-sensei' );
 							$status_class = 'failed';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'ungraded' == $lesson_status->comment_approved ) {
+						} elseif( 'ungraded' == $lesson_status->comment_approved ) {
 							$status =  __( 'Ungraded', 'woothemes-sensei' );
 							$status_class = 'ungraded';
 
-						}
-						elseif( 'in-progress' == $lesson_status->comment_approved ) {
+						} elseif( 'in-progress' == $lesson_status->comment_approved ) {
 							$status =  __( 'In Progress', 'woothemes-sensei' );
 							$user_end_date = '';
 						}
@@ -392,8 +390,7 @@ 
 					// Output users data
 					if ( $this->csv_output ) {
 						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-					}
-					else {
+					} else {
 						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
 						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
 
@@ -448,8 +445,7 @@ 
 					// Output lesson data
 					if ( $this->csv_output ) {
 						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-					}
-					else {
+					} else {
 						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
 						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
 
@@ -582,8 +578,7 @@ 
 	public function data_table_header() {
 		if ( $this->user_id ) {
 			$learners_text = __( 'Other Learners taking this Course', 'woothemes-sensei' );
-		}
-		else {
+		} else {
 			$learners_text = __( 'Learners taking this Course', 'woothemes-sensei' );
 		}
 		$lessons_text = __( 'Lessons in this Course', 'woothemes-sensei' );

Indentation +1 added lines, -1 removed lines

@@ -632,7 +632,7 @@
 		$course = get_post( $this->course_id );
 		$report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview';
 		if ( $this->user_id ) {
-            $user_name = Sensei_Student::get_full_name( $this->user_id );
+			$user_name = Sensei_Student::get_full_name( $this->user_id );
 			$report = sanitize_title( $user_name  ) . '-' . $report;
 		}
 

Spacing +195 added lines, -195 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Analysis Course List Table Class
@@ -25,27 +25,27 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $course_id = 0, $user_id = 0 ) {
-		$this->course_id = intval( $course_id );
-		$this->user_id = intval( $user_id );
+	public function __construct($course_id = 0, $user_id = 0) {
+		$this->course_id = intval($course_id);
+		$this->user_id = intval($user_id);
 
-		if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'user', 'lesson' ) ) ) {
+		if (isset($_GET['view']) && in_array($_GET['view'], array('user', 'lesson'))) {
 			$this->view = $_GET['view'];
 		}
 
 		// Viewing a single Learner always sets the view to Lessons
-		if( $this->user_id ) {
+		if ($this->user_id) {
 			$this->view = 'lesson';
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_course' );
+		parent::__construct('analysis_course');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 
 	} // End __construct()
 
@@ -56,45 +56,45 @@ 
 	 */
 	function get_columns() {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'started' => __( 'Date Started', 'woothemes-sensei' ),
-					'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-					'user_status' => __( 'Status', 'woothemes-sensei' ),
-					'percent' => __( 'Percent Complete', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'started' => __('Date Started', 'woothemes-sensei'),
+					'completed' => __('Date Completed', 'woothemes-sensei'),
+					'user_status' => __('Status', 'woothemes-sensei'),
+					'percent' => __('Percent Complete', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lesson' :
 			default:
-				if ( $this->user_id ) {
+				if ($this->user_id) {
 
 					$columns = array(
-						'title' => __( 'Lesson', 'woothemes-sensei' ),
-						'started' => __( 'Date Started', 'woothemes-sensei' ),
-						'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-						'user_status' => __( 'Status', 'woothemes-sensei' ),
-						'grade' => __( 'Grade', 'woothemes-sensei' ),
+						'title' => __('Lesson', 'woothemes-sensei'),
+						'started' => __('Date Started', 'woothemes-sensei'),
+						'completed' => __('Date Completed', 'woothemes-sensei'),
+						'user_status' => __('Status', 'woothemes-sensei'),
+						'grade' => __('Grade', 'woothemes-sensei'),
 					);
 
 				} else {
 
 					$columns = array(
-						'title' => __( 'Lesson', 'woothemes-sensei' ),
-						'num_learners' => __( 'Learners', 'woothemes-sensei' ),
-						'completions' => __( 'Completed', 'woothemes-sensei' ),
-						'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+						'title' => __('Lesson', 'woothemes-sensei'),
+						'num_learners' => __('Learners', 'woothemes-sensei'),
+						'completions' => __('Completed', 'woothemes-sensei'),
+						'average_grade' => __('Average Grade', 'woothemes-sensei'),
 					);
 
 				}
 				break;
 		}
 		// Backwards compatible
-		$columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns', $columns, $this);
 		// Moving forward, single filter with args
-		$columns = apply_filters( 'sensei_analysis_course_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -105,46 +105,46 @@ 
 	 */
 	function get_sortable_columns() {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$columns = array(
-					'title' => array( 'title', false ),
-					'started' => array( 'started', false ),
-					'completed' => array( 'completed', false ),
-					'user_status' => array( 'user_status', false ),
+					'title' => array('title', false),
+					'started' => array('started', false),
+					'completed' => array('completed', false),
+					'user_status' => array('user_status', false),
 //					'grade' => array( 'grade', false ),
-					'percent' => array( 'percent', false )
+					'percent' => array('percent', false)
 				);
 				break;
 
 			case 'lesson' :
 			default:
-				if ( $this->user_id ) {
+				if ($this->user_id) {
 
 					$columns = array(
-						'title' => array( 'title', false ),
-						'started' => array( 'started', false ),
-						'completed' => array( 'completed', false ),
-						'user_status' => array( 'user_status', false ),
-						'grade' => array( 'grade', false ),
+						'title' => array('title', false),
+						'started' => array('started', false),
+						'completed' => array('completed', false),
+						'user_status' => array('user_status', false),
+						'grade' => array('grade', false),
 					);
 
 				} else {
 
 					$columns = array(
-						'title' => array( 'title', false ),
-						'num_learners' => array( 'num_learners', false ),
-						'completions' => array( 'completions', false ),
-						'average_grade' => array( 'average_grade', false )
+						'title' => array('title', false),
+						'num_learners' => array('num_learners', false),
+						'completions' => array('completions', false),
+						'average_grade' => array('average_grade', false)
 					);
 
 				}
 				break;
 		}
 		// Backwards compatible
-		$columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns_sortable', $columns, $this);
 		// Moving forward, single filter with args
-		$columns = apply_filters( 'sensei_analysis_course_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -158,32 +158,32 @@ 
 
 		// Handle orderby (needs work)
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -192,28 +192,28 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$this->items = $this->get_course_statuses( $args );
+				$this->items = $this->get_course_statuses($args);
 				break;
 
 			case 'lesson':
 			default:
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -229,22 +229,22 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
@@ -252,32 +252,32 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$this->items = $this->get_course_statuses( $args );
+				$this->items = $this->get_course_statuses($args);
 				break;
 
 			case 'lesson':
 			default:
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 		}
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -289,37 +289,37 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$user_start_date = get_comment_meta( $item->comment_ID, 'start', true );
+				$user_start_date = get_comment_meta($item->comment_ID, 'start', true);
 				$user_end_date = $item->comment_date;
 
-				if( 'complete' == $item->comment_approved ) {
+				if ('complete' == $item->comment_approved) {
 
-					$status =  __( 'Completed', 'woothemes-sensei' );
+					$status = __('Completed', 'woothemes-sensei');
 					$status_class = 'graded';
 
 				} else {
 
-					$status =  __( 'In Progress', 'woothemes-sensei' );
+					$status = __('In Progress', 'woothemes-sensei');
 					$status_class = 'in-progress';
 					$user_end_date = '';
 
 				}
-				$course_percent = get_comment_meta( $item->comment_ID, 'percent', true );
+				$course_percent = get_comment_meta($item->comment_ID, 'percent', true);
 
 				// Output users data
-				$user_name = Sensei_Student::get_full_name( $item->user_id );
+				$user_name = Sensei_Student::get_full_name($item->user_id);
 
-				if ( !$this->csv_output ) {
+				if ( ! $this->csv_output) {
 
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) );
+					$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id), admin_url('admin.php'));
 
-					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $user_name . '</a></strong>';
-					$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-					if ( is_numeric($course_percent) ) {
+					$user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$user_name.'</a></strong>';
+					$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+					if (is_numeric($course_percent)) {
 
 						$course_percent .= '%';
 
@@ -327,19 +327,19 @@ 
 
 				} // End If Statement
 
-				$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $user_name,
+				$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $user_name,
 												'started' => $user_start_date,
 												'completed' => $user_end_date,
 												'user_status' => $status,
 												'percent' => $course_percent,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'lesson':
 			default:
 				// Displaying lessons for this Course for a specific User
-				if ( $this->user_id ) {
-					$status = __( 'Not started', 'woothemes-sensei' );
+				if ($this->user_id) {
+					$status = __('Not started', 'woothemes-sensei');
 					$user_start_date = $user_end_date = $status_class = $grade = '';
 
 					$lesson_args = array(
@@ -348,66 +348,66 @@ 
 							'type' => 'sensei_lesson_status',
 							'status' => 'any',
 						);
-					$lesson_status = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id ), true );
+					$lesson_status = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id), true);
 
-					if ( !empty($lesson_status) ) {
-						$user_start_date = get_comment_meta( $lesson_status->comment_ID, 'start', true );
+					if ( ! empty($lesson_status)) {
+						$user_start_date = get_comment_meta($lesson_status->comment_ID, 'start', true);
 						$user_end_date = $lesson_status->comment_date;
 
-						if( 'complete' == $lesson_status->comment_approved ) {
-							$status = __( 'Completed', 'woothemes-sensei' );
+						if ('complete' == $lesson_status->comment_approved) {
+							$status = __('Completed', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = __( 'No Grade', 'woothemes-sensei' );
+							$grade = __('No Grade', 'woothemes-sensei');
 						}
-						elseif( 'graded' == $lesson_status->comment_approved ) {
-							$status =  __( 'Graded', 'woothemes-sensei' );
+						elseif ('graded' == $lesson_status->comment_approved) {
+							$status = __('Graded', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'passed' == $lesson_status->comment_approved ) {
-							$status =  __( 'Passed', 'woothemes-sensei' );
+						elseif ('passed' == $lesson_status->comment_approved) {
+							$status = __('Passed', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'failed' == $lesson_status->comment_approved ) {
-							$status =  __( 'Failed', 'woothemes-sensei' );
+						elseif ('failed' == $lesson_status->comment_approved) {
+							$status = __('Failed', 'woothemes-sensei');
 							$status_class = 'failed';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'ungraded' == $lesson_status->comment_approved ) {
-							$status =  __( 'Ungraded', 'woothemes-sensei' );
+						elseif ('ungraded' == $lesson_status->comment_approved) {
+							$status = __('Ungraded', 'woothemes-sensei');
 							$status_class = 'ungraded';
 
 						}
-						elseif( 'in-progress' == $lesson_status->comment_approved ) {
-							$status =  __( 'In Progress', 'woothemes-sensei' );
+						elseif ('in-progress' == $lesson_status->comment_approved) {
+							$status = __('In Progress', 'woothemes-sensei');
 							$user_end_date = '';
 						}
 					} // END lesson_status
 
 					// Output users data
-					if ( $this->csv_output ) {
-						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+					if ($this->csv_output) {
+						$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 					}
 					else {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+						$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+						$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-						$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-						if ( is_numeric($grade) ) {
+						$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+						if (is_numeric($grade)) {
 							$grade .= '%';
 						}
 					} // End If Statement
-					$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title,
+					$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title,
 													'started' => $user_start_date,
 													'completed' => $user_end_date,
 													'user_status' => $status,
 													'grade' => $grade,
-												), $item, $this );
+												), $item, $this);
 				}
 				// Display lessons for this Course regardless of users
 				else {
@@ -417,51 +417,51 @@ 
 							'type' => 'sensei_lesson_status',
 							'status' => 'any',
 						);
-					$lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) );
+					$lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item));
 
 					// Get Course Completions
 					$lesson_args = array(
 							'post_id' => $item->ID,
 							'type' => 'sensei_lesson_status',
-							'status' => array( 'complete', 'graded', 'passed', 'failed' ),
+							'status' => array('complete', 'graded', 'passed', 'failed'),
 							'count' => true,
 						);
-					$lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) );
+					$lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item));
 
 					$lesson_average_grade = __('n/a', 'woothemes-sensei');
-					if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) {
+					if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) {
 						// Get Percent Complete
 						$grade_args = array(
 								'post_id' => $item->ID,
 								'type' => 'sensei_lesson_status',
-								'status' => array( 'graded', 'passed', 'failed' ),
+								'status' => array('graded', 'passed', 'failed'),
 								'meta_key' => 'grade',
 							);
-						add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) );
-						$lesson_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true );
-						remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) );
+						add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter'));
+						$lesson_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true);
+						remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter'));
 
-						$grade_count = !empty( $lesson_grades->total ) ? $lesson_grades->total : 1;
-						$grade_total = !empty( $lesson_grades->meta_sum ) ? doubleval( $lesson_grades->meta_sum ) : 0;
-						$lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+						$grade_count = ! empty($lesson_grades->total) ? $lesson_grades->total : 1;
+						$grade_total = ! empty($lesson_grades->meta_sum) ? doubleval($lesson_grades->meta_sum) : 0;
+						$lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
 					}
 					// Output lesson data
-					if ( $this->csv_output ) {
-						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+					if ($this->csv_output) {
+						$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 					}
 					else {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+						$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+						$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-						if ( is_numeric( $lesson_average_grade ) ) {
+						if (is_numeric($lesson_average_grade)) {
 							$lesson_average_grade .= '%';
 						}
 					} // End If Statement
-					$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title,
+					$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title,
 													'num_learners' => $lesson_students,
 													'completions' => $lesson_completions,
 													'average_grade' => $lesson_average_grade,
-												), $item, $this );
+												), $item, $this);
 				} // END if
 				break;
 		} // END switch
@@ -474,7 +474,7 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_course_statuses( $args ) {
+	private function get_course_statuses($args) {
 
 		$activity_args = array(
 				'post_id' => $this->course_id,
@@ -487,34 +487,34 @@ 
 			);
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $this->search ) {
+		if ($this->search) {
 			$user_args = array(
-				'search' => '*' . $this->search . '*',
+				'search' => '*'.$this->search.'*',
 				'fields' => 'ID',
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_analysis_course_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_analysis_course_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				// Store for reuse on counts
 				$activity_args['user_id'] = (array) $learners_search->get_results();
 			}
 		} // End If Statement
 
-		$activity_args = apply_filters( 'sensei_analysis_course_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_analysis_course_filter_statuses', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $this->total_items < $activity_args['offset'] ) {
-			$new_paged = floor( $this->total_items / $activity_args['number'] );
+		if ($this->total_items < $activity_args['offset']) {
+			$new_paged = floor($this->total_items / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($statuses) ) {
-			$statuses = array( $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = array($statuses);
 		}
 		return $statuses;
 	} // End get_course_statuses()
@@ -524,32 +524,32 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 
-		$lessons_args = array( 'post_type'         => 'lesson',
+		$lessons_args = array('post_type'         => 'lesson',
 							'posts_per_page'      => $args['number'],
 							'offset'              => $args['offset'],
-							'meta_key'            => '_order_' . $this->course_id,
+							'meta_key'            => '_order_'.$this->course_id,
 //							'orderby'             => $args['orderby'],
 							'order'               => $args['order'],
 							'meta_query'          => array(
 								array(
 									'key' => '_lesson_course',
-									'value' => intval( $this->course_id ),
+									'value' => intval($this->course_id),
 								),
 							),
 							'post_status'         => array('publish', 'private'),
 							'suppress_filters'    => 0
 							);
-		if ( $this->search ) {
+		if ($this->search) {
 			$lessons_args['s'] = $this->search;
 		}
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$lessons_args['posts_per_page'] = '-1';
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$lessons_query = new WP_Query( apply_filters( 'sensei_analysis_course_filter_lessons', $lessons_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_analysis_course_filter_lessons', $lessons_args));
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
 	} // End get_lessons()
@@ -561,17 +561,17 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$text = __( 'No learners found.', 'woothemes-sensei' );
+				$text = __('No learners found.', 'woothemes-sensei');
 				break;
 
 			case 'lesson':
 			default:
-				$text = __( 'No lessons found.', 'woothemes-sensei' );
+				$text = __('No lessons found.', 'woothemes-sensei');
 				break;
 		}
-		echo apply_filters( 'sensei_analysis_course_no_items_text', $text );
+		echo apply_filters('sensei_analysis_course_no_items_text', $text);
 	} // End no_items()
 
 	/**
@@ -580,25 +580,25 @@ 
 	 * @return void
 	 */
 	public function data_table_header() {
-		if ( $this->user_id ) {
-			$learners_text = __( 'Other Learners taking this Course', 'woothemes-sensei' );
+		if ($this->user_id) {
+			$learners_text = __('Other Learners taking this Course', 'woothemes-sensei');
 		}
 		else {
-			$learners_text = __( 'Learners taking this Course', 'woothemes-sensei' );
+			$learners_text = __('Learners taking this Course', 'woothemes-sensei');
 		}
-		$lessons_text = __( 'Lessons in this Course', 'woothemes-sensei' );
+		$lessons_text = __('Lessons in this Course', 'woothemes-sensei');
 
 		$url_args = array(
 			'page' => $this->page_slug,
 			'course_id' => $this->course_id,
 		);
-		$learners_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'user' ) ), admin_url( 'admin.php' ) ) );
-		$lessons_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'lesson' ) ), admin_url( 'admin.php' ) ) );
+		$learners_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'user')), admin_url('admin.php')));
+		$lessons_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'lesson')), admin_url('admin.php')));
 
 		$learners_class = $lessons_class = '';
 
 		$menu = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$learners_class = 'current';
 				break;
@@ -608,17 +608,17 @@ 
 				$lessons_class = 'current';
 				break;
 		}
-		$menu['lesson'] = sprintf( '<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text );
-		$menu['user'] = sprintf( '<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text );
-
-		$menu = apply_filters( 'sensei_analysis_course_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu['lesson'] = sprintf('<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text);
+		$menu['user'] = sprintf('<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text);
+
+		$menu = apply_filters('sensei_analysis_course_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 	} // End data_table_header()
 
@@ -629,19 +629,19 @@ 
 	 */
 	public function data_table_footer() {
 
-		$course = get_post( $this->course_id );
-		$report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview';
-		if ( $this->user_id ) {
-            $user_name = Sensei_Student::get_full_name( $this->user_id );
-			$report = sanitize_title( $user_name  ) . '-' . $report;
+		$course = get_post($this->course_id);
+		$report = sanitize_title($course->post_title).'-'.$this->view.'s-overview';
+		if ($this->user_id) {
+            $user_name = Sensei_Student::get_full_name($this->user_id);
+			$report = sanitize_title($user_name).'-'.$report;
 		}
 
-		$url_args = array( 'page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report );
-		if ( $this->user_id ) {
+		$url_args = array('page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report);
+		if ($this->user_id) {
 			$url_args['user_id'] = $this->user_id;
 		}
-		$url =  add_query_arg( $url_args, admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$url = add_query_arg($url_args, admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	} // End data_table_footer()
 
 	/**
@@ -649,15 +649,15 @@ 
 	 * @since  1.7.0
 	 * @return void
 	 */
-	public function search_button( $text = '' ) {
-		switch( $this->view ) {
+	public function search_button($text = '') {
+		switch ($this->view) {
 			case 'user':
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 
 			case 'lesson':
 			default:
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 		} // End Switch Statement