woothemes / sensei

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 +4 added lines, -4 removed lines

@@ -230,9 +230,9 @@ 
 		}
 
 		// Output users data
-        $user_name = Sensei_Learner::get_full_name( $item->user_id );
+		$user_name = Sensei_Learner::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>';
@@ -339,9 +339,9 @@ 
 	 */
 	public function search_button( $text = '' ) {
 
-        $text =  __( 'Search Learners', 'woothemes-sensei' );
+		$text =  __( 'Search Learners', 'woothemes-sensei' );
 
-        return $text;
+		return $text;
 
 	}
 } // End Class

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
 
 /**
  * Admin Analysis Lesson Data Table in Sensei.
@@ -18,18 +18,18 @@ 
 	 * Constructor
 	 * @since  1.2.0
 	 */
-	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()
 
 	/**
@@ -39,13 +39,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;
 	}
 
@@ -56,13 +56,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;
 	}
 
@@ -76,32 +76,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(
@@ -110,19 +110,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
-		) );
+		));
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -138,22 +138,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;
 
@@ -161,23 +161,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;
@@ -189,64 +189,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_Learner::get_full_name( $item->user_id );
+        $user_name = Sensei_Learner::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;
 	}
@@ -256,7 +256,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,
@@ -269,34 +269,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()
@@ -308,7 +308,7 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		 _e( 'No learners found.', 'woothemes-sensei' );
+		 _e('No learners found.', 'woothemes-sensei');
 	} // End no_items()
 
 	/**
@@ -317,7 +317,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()
 
 	/**
@@ -326,10 +326,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()
 
 	/**
@@ -337,9 +337,9 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	public function search_button( $text = '' ) {
+	public function search_button($text = '') {
 
-        $text =  __( 'Search Learners', 'woothemes-sensei' );
+        $text = __('Search Learners', 'woothemes-sensei');
 
         return $text;
 

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 +1417 added lines, -1417 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,356 +1581,356 @@ 
 		<?php do_action( 'sensei_after_user_courses' ); ?>
 
 		<?php
-        echo ob_get_clean();
+		echo ob_get_clean();
 
-        do_action( 'sensei_after_learner_course_content', $user );
+		do_action( 'sensei_after_learner_course_content', $user );
 
 	} // end load_user_courses_content
 
-    /**
-     * Returns a list of all courses
-     *
-     * @since 1.8.0
-     * @return array $courses{
-     *  @type $course WP_Post
-     * }
-     */
-    public static function get_all_courses(){
-
-        $args = array(
-               'post_type' => 'course',
-                'posts_per_page' 		=> -1,
-                'orderby'         	=> 'title',
-                'order'           	=> 'ASC',
-                'post_status'      	=> 'any',
-                'suppress_filters' 	=> 0,
-        );
-
-        $wp_query_obj =  new WP_Query( $args );
-
-        /**
-         * sensei_get_all_courses filter
-         *
-         * This filter runs inside Sensei_Course::get_all_courses.
-         *
-         * @param array $courses{
-         *  @type WP_Post
-         * }
-         * @param array $attributes
-         */
-        return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
-
-    }// end get_all_courses
-
-    /**
-     * Generate the course meter component
-     *
-     * @since 1.8.0
-     * @param int $progress_percentage 0 - 100
-     * @return string $progress_bar_html
-     */
-    public function get_progress_meter( $progress_percentage ){
-
-        if ( 50 < $progress_percentage ) {
-            $class = ' green';
-        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
-            $class = ' orange';
-        } else {
-            $class = ' red';
-        }
-        $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
-
-        return $progress_bar_html;
-
-    }// end get_progress_meter
-
-    /**
-     * Generate a statement that tells users
-     * how far they are in the course.
-     *
-     * @param int $course_id
-     * @param int $user_id
-     *
-     * @return string $statement_html
-     */
-    public function get_progress_statement( $course_id, $user_id ){
-
-        if( empty( $course_id ) || empty( $user_id )
-        || ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
-            return '';
-        }
-
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-        $total_lessons = count( $this->course_lessons( $course_id ) );
-
-        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
-
-        /**
-         * Filter the course completion statement.
-         * Default Currently completed $var lesson($plural) of $var in total
-         *
-         * @param string $statement
-         */
-        return apply_filters( 'sensei_course_completion_statement', $statement );
-
-    }// end generate_progress_statement
-
-    /**
-     * Output the course progress statement
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_statement( $course_id = 0, $user_id = 0 ){
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
-    }
-
-    /**
-     * Output the course progress bar
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_meter( $course_id = 0, $user_id = 0 ){
-
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
-            || ! Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
-            return;
-        }
-        $percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
-
-        echo $this->get_progress_meter( $percentage_completed );
-
-    }// end the_progress_meter
-
-    /**
-     * Checks how many lessons are completed
-     *
-     * @since 1.8.0
-     *
-     * @param int $course_id
-     * @param int $user_id
-     * @return array $completed_lesson_ids
-     */
-    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
-
-        if( !( intval( $user_id ) ) > 0 ){
-            $user_id = get_current_user_id();
-        }
+	/**
+	 * Returns a list of all courses
+	 *
+	 * @since 1.8.0
+	 * @return array $courses{
+	 *  @type $course WP_Post
+	 * }
+	 */
+	public static function get_all_courses(){
+
+		$args = array(
+			   'post_type' => 'course',
+				'posts_per_page' 		=> -1,
+				'orderby'         	=> 'title',
+				'order'           	=> 'ASC',
+				'post_status'      	=> 'any',
+				'suppress_filters' 	=> 0,
+		);
+
+		$wp_query_obj =  new WP_Query( $args );
+
+		/**
+		 * sensei_get_all_courses filter
+		 *
+		 * This filter runs inside Sensei_Course::get_all_courses.
+		 *
+		 * @param array $courses{
+		 *  @type WP_Post
+		 * }
+		 * @param array $attributes
+		 */
+		return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
+
+	}// end get_all_courses
+
+	/**
+	 * Generate the course meter component
+	 *
+	 * @since 1.8.0
+	 * @param int $progress_percentage 0 - 100
+	 * @return string $progress_bar_html
+	 */
+	public function get_progress_meter( $progress_percentage ){
+
+		if ( 50 < $progress_percentage ) {
+			$class = ' green';
+		} elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
+			$class = ' orange';
+		} else {
+			$class = ' red';
+		}
+		$progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
+
+		return $progress_bar_html;
+
+	}// end get_progress_meter
+
+	/**
+	 * Generate a statement that tells users
+	 * how far they are in the course.
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 *
+	 * @return string $statement_html
+	 */
+	public function get_progress_statement( $course_id, $user_id ){
+
+		if( empty( $course_id ) || empty( $user_id )
+		|| ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+			return '';
+		}
+
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+		$total_lessons = count( $this->course_lessons( $course_id ) );
+
+		$statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
+
+		/**
+		 * 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 );
 
-        $completed_lesson_ids = array();
+	}// end the_progress_meter
 
-        $course_lessons = $this->course_lessons( $course_id );
+	/**
+	 * Checks how many lessons are completed
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return array $completed_lesson_ids
+	 */
+	public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
+
+		$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;
+			}
+
+		}
+
+		return $completed_lesson_ids;
+
+	}// end get_completed_lesson_ids
+
+	/**
+	 * Calculate the perceantage completed in the course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return int $percentage
+	 */
+	public function get_completion_percentage( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
+
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+
+		if( ! (  $completed  > 0 ) ){
+			return 0;
+		}
+
+		$total_lessons = count( $this->course_lessons( $course_id ) );
+		$percentage = $completed / $total_lessons * 100;
+
+		/**
+		 *
+		 * Filter the percentage returned for a users course.
+		 *
+		 * @param $percentage
+		 * @param $course_id
+		 * @param $user_id
+		 * @since 1.8.0
+		 */
+		return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+
+	}// end get_completed_lesson_ids
+
+	/**
+	 * Block email notifications for the specific courses
+	 * that the user disabled the notifications.
+	 *
+	 * @since 1.8.0
+	 * @param $should_send
+	 * @return bool
+	 */
+	public function block_notification_emails( $should_send ){
+		global $sensei_email_data;
+		$email = $sensei_email_data;
+
+		$course_id = '';
+
+		if( isset( $email['course_id'] ) ){
+
+			$course_id = $email['course_id'];
+
+		}elseif( isset( $email['lesson_id'] ) ){
+
+			$course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+
+		}elseif( isset( $email['quiz_id'] ) ){
+
+			$lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
+			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+
+		}
+
+		if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
+
+			$course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
+
+			if ($course_emails_disabled) {
+
+				return false;
+
+			}
+
+		}// end if
+
+		return $should_send;
+	}// end block_notification_emails
+
+	/**
+	 * Render the course notification setting meta box
+	 *
+	 * @since 1.8.0
+	 * @param $course
+	 */
+	public function course_notification_meta_box_content( $course ){
 
-        foreach( $course_lessons as $lesson ){
+		$checked = get_post_meta( $course->ID , 'disable_notification', true );
 
-            $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;
+		// 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 get_completed_lesson_ids
+	}// 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 ){
 
-    /**
-     * 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( !isset( $_POST['_sensei_course_notification']  )
+			|| ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
+			return;
+		}
 
-    }// end get_completed_lesson_ids
+		if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
+			$new_val = true;
+		}else{
+			$new_val = false;
+		}
 
-    /**
-     * 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;
+	   update_post_meta( $course_id , 'disable_notification', $new_val );
 
-        $course_id = '';
+	}// end save notification meta box
 
-        if( isset( $email['course_id'] ) ){
+	/**
+	 * 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 ){
 
-            $course_id = $email['course_id'];
-
-        }elseif( isset( $email['lesson_id'] ) ){
+		sensei_do_deprecated_action( 'sensei_course_image','1.9.0','sensei_course_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before' );
 
-            $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+	}
 
-        }elseif( isset( $email['quiz_id'] ) ){
+	/**
+	 * 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( ){
 
-            $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		global $post;
+		sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
 
-        }
+	}
 
-        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' );
-
-    }
+	/**
+	 * Output a link to view course. The button text is different depending on the amount of preview lesson available.
+	 *
+	 * hooked into 'sensei_course_content_inside_after'
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $course_id
+	 */
+	public function the_course_free_lesson_preview( $course_id ){
+		// Meta data
+		$course = get_post( $course_id );
+		$preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
 
-    /**
-     * Backwards compatibility hooks that should be hooked into sensei_loop_course_before
-     *
-     * hooked into 'sensei_loop_course_before'
-     *
-     * @since 1.9
-     *
-     * @global WP_Post $post
-     */
-    public  function loop_before_backwards_compatibility_hooks( ){
-
-        global $post;
-        sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
-
-    }
-
-    /**
-     * Output a link to view course. The button text is different depending on the amount of preview lesson available.
-     *
-     * hooked into 'sensei_course_content_inside_after'
-     *
-     * @since 1.9.0
-     *
-     * @param integer $course_id
-     */
-    public function the_course_free_lesson_preview( $course_id ){
-        // Meta data
-        $course = get_post( $course_id );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-            ?>
+		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' ) ?>
@@ -1939,23 +1939,23 @@ 
             </p>
 
         <?php
-        }
-    }
+		}
+	}
 
-    /**
-     * Add course mata to the course meta hook
-     *
-     * @since 1.9.0
-     * @param integer $course_id
-     */
-    public function the_course_meta( $course_id ){
-        echo '<p class="sensei-course-meta">';
+	/**
+	 * Add course mata to the course meta hook
+	 *
+	 * @since 1.9.0
+	 * @param integer $course_id
+	 */
+	public function the_course_meta( $course_id ){
+		echo '<p class="sensei-course-meta">';
 
-        $course = get_post( $course_id );
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+		$course = get_post( $course_id );
+		$category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
+		$author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+		if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
 
             <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
 
@@ -1973,62 +1973,62 @@ 
 
         <?php } // End If Statement
 
-        // number of completed lessons
-        if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
-            || Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
+		// number of completed lessons
+		if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
+			|| Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
 
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+			$completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
+			$lesson_count = count( $this->course_lessons( $course->ID ) );
+			echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
 
-        }
+		}
 
-        sensei_simple_course_price( $course->ID );
+		sensei_simple_course_price( $course->ID );
 
-        echo '</p>';
-    } // end the course meta
+		echo '</p>';
+	} // end the course meta
 
-    /**
-     * Filter the classes attached to a post types for courses
-     * and add a status class for when the user is logged in.
-     *
-     * @param $classes
-     * @param $class
-     * @param $post_id
-     *
-     * @return array $classes
-     */
-    public static function add_course_user_status_class( $classes, $class, $course_id ){
+	/**
+	 * Filter the classes attached to a post types for courses
+	 * and add a status class for when the user is logged in.
+	 *
+	 * @param $classes
+	 * @param $class
+	 * @param $post_id
+	 *
+	 * @return array $classes
+	 */
+	public static function add_course_user_status_class( $classes, $class, $course_id ){
 
-        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
+		if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
 
-            if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
+			if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
 
-                $classes[] = 'user-status-completed';
+				$classes[] = 'user-status-completed';
 
-            }else{
+			}else{
 
-                $classes[] = 'user-status-active';
+				$classes[] = 'user-status-active';
 
-            }
+			}
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end add_course_user_status_class
+	}// end add_course_user_status_class
 
-    /**
-     * Prints out the course action buttons links
-     *
-     * - complete course
-     * - delete course
-     *
-     * @param WP_Post $course
-     */
-    public static function the_course_action_buttons( $course ){
+	/**
+	 * Prints out the course action buttons links
+	 *
+	 * - complete course
+	 * - delete course
+	 *
+	 * @param WP_Post $course
+	 */
+	public static function the_course_action_buttons( $course ){
 
-        if( is_user_logged_in() ) { ?>
+		if( is_user_logged_in() ) { ?>
 
             <section class="entry-actions">
                 <form method="POST" action="<?php  echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>">
@@ -2047,32 +2047,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 ); ?>
@@ -2084,456 +2084,456 @@ 
 
         <?php  }// end if is user logged in
 
-    }// end the_course_action_buttons
-
-    /**
-     * This function alter the main query on the course archive page.
-     * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
-     *
-     * This function targets only the course archives and the my courses page. Shortcodes can set their own
-     * query parameters via the arguments.
-     *
-     * This function is hooked into pre_get_posts filter
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_query_filter( $query ){
-
-        // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
-            return $query;
-        }
-
-        global $post; // used to get the current page id for my courses
-
-        // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
-        {
-            /**
-             * sensei_archive_courses_per_page
-             *
-             * Sensei courses per page on the course
-             * archive
-             *
-             * @since 1.9.0
-             * @param integer $posts_per_page default 10
-             */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
-
-        }
-        // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
-        {
-            /**
-             * sensei_my_courses_per_page
-             *
-             * Sensei courses per page on the my courses page
-             * as set in the settings
-             *
-             * @since 1.9.0
-             * @param integer $posts_per_page default 10
-             */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
-
-        }
-
-        return $query;
-
-    }// end course_query_filter
-
-    /**
-     * Determine the class of the course loop
-     *
-     * This will output .first or .last and .course-item-number-x
-     *
-     * @return array $extra_classes
-     * @since 1.9.0
-     */
-    public static function get_course_loop_content_class ()
-    {
-
-        global $sensei_course_loop;
-
-
-        if( !isset( $sensei_course_loop ) ){
-            $sensei_course_loop = array();
-        }
-
-        if (!isset($sensei_course_loop['counter'])) {
-            $sensei_course_loop['counter'] = 0;
-        }
-
-        if (!isset($sensei_course_loop['columns'])) {
-            $sensei_course_loop['columns'] = self::get_loop_number_of_columns();
-        }
-
-        // increment the counter
-        $sensei_course_loop['counter']++;
-
-        $extra_classes = array();
-        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'first';
-        }
-
-        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'last';
-        }
-
-        // add the item number to the classes as well.
-        $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
-
-        /**
-         * Filter the course loop class the fires in the  in get_course_loop_content_class function
-         * which is called from the course loop content-course.php
-         *
-         * @since 1.9.0
-         *
-         * @param array $extra_classes
-         * @param WP_Post $loop_current_course
-         */
-        return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
-
-    }// end get_course_loop_class
-
-    /**
-     * Get the number of columns set for Sensei courses
-     *
-     * @since 1.9.0
-     * @return mixed|void
-     */
-    public static function get_loop_number_of_columns(){
-
-        /**
-         * Filter the number of columns on the course archive page.
-         *
-         * @since 1.9.0
-         * @param int $number_of_columns default 1
-         */
-        return apply_filters('sensei_course_loop_number_of_columns', 1);
-
-    }
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_sorting( $query ){
-
-        // don't show on category pages and other pages
-        if( ! is_archive(  'course ') || is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * Filter the sensei archive course order by values
-         *
-         * @since 1.9.0
-         * @param array $options {
-         *  @type string $option_value
-         *  @type string $option_string
-         * }
-         */
-        $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
-            "newness"     => __( "Sort by newest first", "woothemes-sensei"),
-            "title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
-        ));
-
-        // setup the currently selected item
-        $selected = 'newness';
-        if( isset( $_GET['orderby'] ) ){
-
-            $selected =  $_GET[ 'orderby' ];
-
-        }
-
-        ?>
+	}// end the_course_action_buttons
+
+	/**
+	 * This function alter the main query on the course archive page.
+	 * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
+	 *
+	 * This function targets only the course archives and the my courses page. Shortcodes can set their own
+	 * query parameters via the arguments.
+	 *
+	 * This function is hooked into pre_get_posts filter
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_query_filter( $query ){
+
+		// exit early for no course queries and admin queries
+		if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+			return $query;
+		}
+
+		global $post; // used to get the current page id for my courses
+
+		// for the course archive page
+		if( $query->is_main_query() && is_post_type_archive('course') )
+		{
+			/**
+			 * sensei_archive_courses_per_page
+			 *
+			 * Sensei courses per page on the course
+			 * archive
+			 *
+			 * @since 1.9.0
+			 * @param integer $posts_per_page default 10
+			 */
+			$query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
+
+		}
+		// for the my courses page
+		elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+		{
+			/**
+			 * sensei_my_courses_per_page
+			 *
+			 * Sensei courses per page on the my courses page
+			 * as set in the settings
+			 *
+			 * @since 1.9.0
+			 * @param integer $posts_per_page default 10
+			 */
+			$query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
+
+		}
+
+		return $query;
+
+	}// end course_query_filter
+
+	/**
+	 * Determine the class of the course loop
+	 *
+	 * This will output .first or .last and .course-item-number-x
+	 *
+	 * @return array $extra_classes
+	 * @since 1.9.0
+	 */
+	public static function get_course_loop_content_class ()
+	{
+
+		global $sensei_course_loop;
+
+
+		if( !isset( $sensei_course_loop ) ){
+			$sensei_course_loop = array();
+		}
+
+		if (!isset($sensei_course_loop['counter'])) {
+			$sensei_course_loop['counter'] = 0;
+		}
+
+		if (!isset($sensei_course_loop['columns'])) {
+			$sensei_course_loop['columns'] = self::get_loop_number_of_columns();
+		}
+
+		// increment the counter
+		$sensei_course_loop['counter']++;
+
+		$extra_classes = array();
+		if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'first';
+		}
+
+		if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'last';
+		}
+
+		// add the item number to the classes as well.
+		$extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
+
+		/**
+		 * Filter the course loop class the fires in the  in get_course_loop_content_class function
+		 * which is called from the course loop content-course.php
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param array $extra_classes
+		 * @param WP_Post $loop_current_course
+		 */
+		return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
+
+	}// end get_course_loop_class
+
+	/**
+	 * Get the number of columns set for Sensei courses
+	 *
+	 * @since 1.9.0
+	 * @return mixed|void
+	 */
+	public static function get_loop_number_of_columns(){
+
+		/**
+		 * Filter the number of columns on the course archive page.
+		 *
+		 * @since 1.9.0
+		 * @param int $number_of_columns default 1
+		 */
+		return apply_filters('sensei_course_loop_number_of_columns', 1);
+
+	}
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_sorting( $query ){
+
+		// don't show on category pages and other pages
+		if( ! is_archive(  'course ') || is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * Filter the sensei archive course order by values
+		 *
+		 * @since 1.9.0
+		 * @param array $options {
+		 *  @type string $option_value
+		 *  @type string $option_string
+		 * }
+		 */
+		$course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
+			"newness"     => __( "Sort by newest first", "woothemes-sensei"),
+			"title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
+		));
+
+		// setup the currently selected item
+		$selected = 'newness';
+		if( isset( $_GET['orderby'] ) ){
+
+			$selected =  $_GET[ 'orderby' ];
+
+		}
+
+		?>
 
         <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr( Sensei_Utils::get_current_url() ) ; ?>" method="POST">
             <select name="course-orderby" class="orderby">
                 <?php
-                foreach( $course_order_by_options as $value => $text ){
+				foreach( $course_order_by_options as $value => $text ){
 
-                    echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
+					echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
 
-                }
-                ?>
+				}
+				?>
             </select>
         </form>
 
     <?php
-    }// end course archive filters
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_filters( $query ){
-
-        // don't show on category pages
-        if( is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * filter the course archive filter buttons
-         *
-         * @since 1.9.0
-         * @param array $filters{
-         *   @type array ( $id, $url , $title )
-         * }
-         *
-         */
-        $filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
-            array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
-            array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
-        ));
-
-
-        ?>
+	}// end course archive filters
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_filters( $query ){
+
+		// don't show on category pages
+		if( is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * filter the course archive filter buttons
+		 *
+		 * @since 1.9.0
+		 * @param array $filters{
+		 *   @type array ( $id, $url , $title )
+		 * }
+		 *
+		 */
+		$filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
+			array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
+			array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
+		));
+
+
+		?>
         <ul class="sensei-course-filters clearfix" >
             <?php
 
-            //determine the current active url
-            $current_url = Sensei_Utils::get_current_url();
+			//determine the current active url
+			$current_url = Sensei_Utils::get_current_url();
 
-            foreach( $filters as $filter ) {
+			foreach( $filters as $filter ) {
 
-                $active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
+				$active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
 
-                echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
+				echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
 
-            }
-            ?>
+			}
+			?>
 
         </ul>
 
         <?php
 
-    }
+	}
 
-    /**
-     * if the featured link is clicked on the course archive page
-     * filter the courses returned to only show those featured
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_featured_filter( $query ){
-
-        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
-            //setup meta query for featured courses
-            $query->set( 'meta_value', 'featured'  );
-            $query->set( 'meta_key', '_course_featured'  );
-            $query->set( 'meta_compare', '='  );
-        }
-
-        return $query;
-    }
-
-    /**
-     * if the course order drop down is changed
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_order_by_title( $query ){
-
-        if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
-            && 'course'== $query->get('post_type') && $query->is_main_query()  ){
-            // setup the order by title for this query
-            $query->set( 'orderby', 'title'  );
-            $query->set( 'order', 'ASC'  );
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Get the link to the courses page. This will be the course post type archive
-     * page link or the page the user set in their settings
-     *
-     * @since 1.9.0
-     * @return string $course_page_url
-     */
-    public static function get_courses_page_url(){
-
-        $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
+	/**
+	 * if the featured link is clicked on the course archive page
+	 * filter the courses returned to only show those featured
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_featured_filter( $query ){
 
-        return $course_page_url;
-
-    }// get_course_url
+		if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
+			//setup meta query for featured courses
+			$query->set( 'meta_value', 'featured'  );
+			$query->set( 'meta_key', '_course_featured'  );
+			$query->set( 'meta_compare', '='  );
+		}
 
-    /**
-     * Output the headers on the course archive page
-     *
-     * Hooked into the sensei_archive_title
-     *
-     * @since 1.9.0
-     * @param string $query_type
-     * @param string $before_html
-     * @param string $after_html
-     * @return void
-     */
-    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+		return $query;
+	}
 
-        if( ! is_post_type_archive('course') ){
-            return;
-        }
+	/**
+	 * if the course order drop down is changed
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_order_by_title( $query ){
 
-        // deprecated since 1.9.0
-        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
+		if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
+			&& 'course'== $query->get('post_type') && $query->is_main_query()  ){
+			// setup the order by title for this query
+			$query->set( 'orderby', 'title'  );
+			$query->set( 'order', 'ASC'  );
+		}
 
-        $html = '';
+		return $query;
+	}
 
-        if( empty( $before_html ) ){
 
-            $before_html = '<header class="archive-header"><h1>';
+	/**
+	 * Get the link to the courses page. This will be the course post type archive
+	 * page link or the page the user set in their settings
+	 *
+	 * @since 1.9.0
+	 * @return string $course_page_url
+	 */
+	public static function get_courses_page_url(){
 
-        }
+		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
 
-        if( empty( $after_html ) ){
+		return $course_page_url;
 
-            $after_html = '</h1></header>';
+	}// get_course_url
 
-        }
+	/**
+	 * Output the headers on the course archive page
+	 *
+	 * Hooked into the sensei_archive_title
+	 *
+	 * @since 1.9.0
+	 * @param string $query_type
+	 * @param string $before_html
+	 * @param string $after_html
+	 * @return void
+	 */
+	public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+
+		if( ! is_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');
+
+		$html = '';
+
+		if( empty( $before_html ) ){
 
-        if ( is_tax( 'course-category' ) ) {
+			$before_html = '<header class="archive-header"><h1>';
 
-            global $wp_query;
+		}
+
+		if( empty( $after_html ) ){
 
-            $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;
+			$after_html = '</h1></header>';
 
-        } // End If Statement
+		}
 
-        switch ( $query_type ) {
-            case 'newcourses':
-                $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'featuredcourses':
-                $html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'freecourses':
-                $html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'paidcourses':
-                $html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            default:
-                $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-        } // End Switch Statement
+		if ( is_tax( 'course-category' ) ) {
 
-        echo apply_filters( 'course_archive_title', $html );
+			global $wp_query;
 
-    }//course_archive_header
+			$taxonomy_obj = $wp_query->get_queried_object();
+			$taxonomy_short_name = $taxonomy_obj->taxonomy;
+			$taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
+			$title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
+			echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
+			return;
 
+		} // End If Statement
 
-    /**
-     * 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 ){
+		switch ( $query_type ) {
+			case 'newcourses':
+				$html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'featuredcourses':
+				$html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'freecourses':
+				$html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'paidcourses':
+				$html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			default:
+				$html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+		} // End Switch Statement
+
+		echo apply_filters( 'course_archive_title', $html );
+
+	}//course_archive_header
+
+
+	/**
+	 * 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_singular('course') ){
 
-            return $content;
+			return $content;
 
-        }
+		}
 
-        // Content Access Permissions
-        $access_permission = false;
+		// 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;
+			$access_permission = true;
 
-        } // End If Statement
+		} // 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() );
+		// 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()) {
+		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 {
+		} else {
 
-            $has_product_attached = false;
+			$has_product_attached = false;
 
-        }
+		}
 
-        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;
+			return $content;
 
-        } else {
+		} else {
 
-            return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
+			return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
 
-        }
+		}
 
-    }// end single_course_content
+	}// end single_course_content
 
-    /**
-     * Output the the single course lessons title with markup.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_lessons_title(){
-        global $post;
-        $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
-        $course_lessons = Sensei()->course->course_lessons( $post->ID );
+	/**
+	 * 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 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');
+			$title = __('Lessons', 'woothemes-sensei');
 
-        }
+		}
 
-        /**
-         * hook document in class-woothemes-sensei-message.php
-         */
-        $title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+		/**
+		 * hook document in class-woothemes-sensei-message.php
+		 */
+		$title = apply_filters( 'sensei_single_title', $title, $post->post_type );
 
-        ob_start(); // start capturing the following output.
+		ob_start(); // start capturing the following output.
 
-        ?>
+		?>
 
             <header>
                 <h2> <?php echo $title; ?> </h2>
@@ -2541,277 +2541,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>
 
@@ -2819,111 +2819,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 +641 added lines, -641 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,19 +1923,19 @@ 
      *
      * @param integer $course_id
      */
-    public function the_course_free_lesson_preview( $course_id ){
+    public function the_course_free_lesson_preview($course_id) {
         // Meta data
-        $course = get_post( $course_id );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+        $course = get_post($course_id);
+        $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course->ID));
+        $is_user_taking_course = Sensei_Utils::user_started_course($course->ID, get_current_user_id());
 
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
+        if (0 < $preview_lesson_count && ! $is_user_taking_course) {
             ?>
             <p class="sensei-free-lessons">
                 <a href="<?php echo get_permalink(); ?>">
-                    <?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
+                    <?php _e('Preview this course', 'woothemes-sensei') ?>
                 </a>
-                - <?php echo sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ) ; ?>
+                - <?php echo sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?>
             </p>
 
         <?php
@@ -1948,42 +1948,42 @@ 
      * @since 1.9.0
      * @param integer $course_id
      */
-    public function the_course_meta( $course_id ){
+    public function the_course_meta($course_id) {
         echo '<p class="sensei-course-meta">';
 
-        $course = get_post( $course_id );
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+        $course = get_post($course_id);
+        $category_output = get_the_term_list($course->ID, 'course-category', '', ', ', '');
+        $author_display_name = get_the_author_meta('display_name', $course->post_author);
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+        if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {?>
 
-            <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
+            <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?>
 
-                <a href="<?php esc_attr_e( get_author_posts_url( $course->post_author ) ); ?>" title="<?php esc_attr_e( $author_display_name ); ?>"><?php esc_attr_e( $author_display_name   ); ?></a>
+                <a href="<?php esc_attr_e(get_author_posts_url($course->post_author)); ?>" title="<?php esc_attr_e($author_display_name); ?>"><?php esc_attr_e($author_display_name); ?></a>
 
             </span>
 
         <?php } // End If Statement ?>
 
-        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $course->ID ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?></span>
+        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($course->ID).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
 
-       <?php if ( '' != $category_output ) { ?>
+       <?php if ('' != $category_output) { ?>
 
-            <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 
         <?php } // End If Statement
 
         // number of completed lessons
-        if( Sensei_Utils::user_started_course( $course->ID,  get_current_user_id() )
-            || Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){
+        if (Sensei_Utils::user_started_course($course->ID, get_current_user_id())
+            || Sensei_Utils::user_completed_course($course->ID, get_current_user_id())) {
 
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+            $completed = count($this->get_completed_lesson_ids($course->ID, get_current_user_id()));
+            $lesson_count = count($this->course_lessons($course->ID));
+            echo '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $completed, $lesson_count).'</span>';
 
         }
 
-        sensei_simple_course_price( $course->ID );
+        sensei_simple_course_price($course->ID);
 
         echo '</p>';
     } // end the course meta
@@ -1998,15 +1998,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';
 
@@ -2026,56 +2026,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  ?>
@@ -2100,17 +2100,17 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_query_filter( $query ){
+    public static function course_query_filter($query) {
 
         // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+        if (is_admin( ) || 'course' != $query->get('post_type')) {
             return $query;
         }
 
         global $post; // used to get the current page id for my courses
 
         // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
+        if ($query->is_main_query() && is_post_type_archive('course'))
         {
             /**
              * sensei_archive_courses_per_page
@@ -2121,11 +2121,11 @@ 
              * @since 1.9.0
              * @param integer $posts_per_page default 10
              */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) );
+            $query->set('posts_per_page', apply_filters('sensei_archive_courses_per_page', 10));
 
         }
         // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+        elseif (is_page() && Sensei()->settings->get('my_course_page') == $post->ID)
         {
             /**
              * sensei_my_courses_per_page
@@ -2136,7 +2136,7 @@ 
              * @since 1.9.0
              * @param integer $posts_per_page default 10
              */
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) );
+            $query->set('posts_per_page', apply_filters('sensei_my_courses_per_page', 10));
 
         }
 
@@ -2152,21 +2152,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();
         }
 
@@ -2174,16 +2174,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
@@ -2194,7 +2194,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
 
@@ -2204,7 +2204,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.
@@ -2224,10 +2224,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;
         }
 
@@ -2240,27 +2240,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>';
 
                 }
                 ?>
@@ -2278,10 +2278,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;
         }
 
@@ -2294,9 +2294,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')),
         ));
 
 
@@ -2307,11 +2307,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>';
 
             }
             ?>
@@ -2332,13 +2332,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;
@@ -2353,13 +2353,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;
@@ -2373,10 +2373,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;
 
@@ -2393,61 +2393,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
 
@@ -2461,9 +2461,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;
 
@@ -2472,21 +2472,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 {
 
@@ -2494,15 +2494,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>';
 
         }
 
@@ -2513,14 +2513,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');
 
@@ -2529,7 +2529,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.
 
@@ -2548,7 +2548,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
 
@@ -2563,13 +2563,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;
         }
 
@@ -2581,7 +2581,7 @@ 
             'meta_query'        => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                 ),
             ),
             'post_status'       => 'public',
@@ -2589,17 +2589,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',
@@ -2609,7 +2609,7 @@ 
             );
         }
 
-        $wp_query = new WP_Query( $course_lesson_query_args );
+        $wp_query = new WP_Query($course_lesson_query_args);
 
     }// load_single_course_lessons
 
@@ -2620,16 +2620,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();
 
@@ -2645,10 +2645,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();
 
@@ -2665,60 +2665,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 = '';
@@ -2734,24 +2734,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>');
 
                     }
 
@@ -2770,19 +2770,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); ?>
@@ -2797,7 +2797,7 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
         global $post;
 
@@ -2810,7 +2810,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>
@@ -2826,30 +2826,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
 
@@ -2862,16 +2862,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;
@@ -2892,7 +2892,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,
@@ -2910,14 +2910,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());
 
         }
 
@@ -2933,4 +2933,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 +514 added lines, -514 removed lines

@@ -11,681 +11,681 @@
  */
 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 ){
+			if( $load_header_footer ){
 
-                get_sensei_header();
-                include( $found_template );
-                get_sensei_footer();
-
-            }else{
-
-                include( $found_template );
-
-            }
-
-            exit;
+				get_sensei_header();
+				include( $found_template );
+				get_sensei_footer();
+
+			}else{
+
+				include( $found_template );
+
+			}
+
+			exit;
 
-        }
+		}
 
-    }
+	}
 
 
-    /**
-     * Hooks the deprecated archive content hook into the hook again just in
-     * case other developers have used it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecated_archive_course_content_hook(){
-
-        sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
-
-    }// end deprecated_archive_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 ){
-
-        // ID passed in
-        if( is_numeric( $post ) ){
-            $post = get_post( $post );
-        }
-
-        /**
-         * Filter the template html tag for the title
-         *
-         * @since 1.9.0
-         *
-         * @param $title_html_tag default is 'h3'
-         */
-        $title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
-
-        /**
-         * Filter the title classes
-         *
-         * @since 1.9.0
-         * @param string $title_classes defaults to $post_type-title
-         */
-        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
-
-        $html= '';
-        $html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
-        $html .= '<a href="' . get_permalink( $post->ID ) . '" >';
-        $html .= $post->post_title ;
-        $html .= '</a>';
-        $html .= '</'. $title_html_tag. '>';
-        echo $html;
-
-    }// end the title
-
-    /**
-     * This function adds the hooks inside and above the single course content for
-     * backwards compatibility sake.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_course_inside_before_hooks(){
-
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
-        sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-
-    }// end deprecated_single_course_inside_before_hooks
-
-    /**
-     * This function adds the hooks to sensei_course_single_lessons for
-     * backwards compatibility sake.  and provides developers with an alternative.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecate_sensei_course_single_lessons_hook(){
+	/**
+	 * A generic function for echoing the post title
+	 *
+	 * @since 1.9.0
+	 * @param  WP_Post $post
+	 */
+	public static function the_title( $post ){
+
+		// ID passed in
+		if( is_numeric( $post ) ){
+			$post = get_post( $post );
+		}
+
+		/**
+		 * Filter the template html tag for the title
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param $title_html_tag default is 'h3'
+		 */
+		$title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
+
+		/**
+		 * Filter the title classes
+		 *
+		 * @since 1.9.0
+		 * @param string $title_classes defaults to $post_type-title
+		 */
+		$title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
+
+		$html= '';
+		$html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
+		$html .= '<a href="' . get_permalink( $post->ID ) . '" >';
+		$html .= $post->post_title ;
+		$html .= '</a>';
+		$html .= '</'. $title_html_tag. '>';
+		echo $html;
+
+	}// end the title
+
+	/**
+	 * This function adds the hooks inside and above the single course content for
+	 * backwards compatibility sake.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_course_inside_before_hooks(){
+
+		sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
+		sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+
+	}// end deprecated_single_course_inside_before_hooks
+
+	/**
+	 * This function adds the hooks to sensei_course_single_lessons for
+	 * backwards compatibility sake.  and provides developers with an alternative.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecate_sensei_course_single_lessons_hook(){
 
-        sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
+		sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
 
-    }// deprecate_sensei_course_single_lessons_hook
+	}// deprecate_sensei_course_single_lessons_hook
 
-    /**
-     * Deprecated all deprecated_single_main_content_hook hooked actions.
-     *
-     * The content must be dealt with inside the respective templates.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_main_content_hook(){
+	/**
+	 * Deprecated all deprecated_single_main_content_hook hooked actions.
+	 *
+	 * The content must be dealt with inside the respective templates.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_main_content_hook(){
 
-            if( is_singular( 'course' ) ) {
+			if( is_singular( 'course' ) ) {
 
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
-
-            } elseif( is_singular( 'message' ) ){
-
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
-            }
-
-    }// end deprecated_single_course_single_main_content_hook
-
-    /**
-     * Deprecate the  old sensei modules
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_before_hook(){
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
+
+			} elseif( is_singular( 'message' ) ){
+
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
+			}
+
+	}// end deprecated_single_course_single_main_content_hook
+
+	/**
+	 * Deprecate the  old sensei modules
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_before_hook(){
 
-        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
+		sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
 
-    }
-
-    /**
-     * Deprecate the  old sensei modules after hooks
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_after_hook(){
+	}
+
+	/**
+	 * Deprecate the  old sensei modules after hooks
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_after_hook(){
 
-        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
+		sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
 
-    }
+	}
 
-    /**
-     * Deprecate the single message hooks for post types.
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_all_post_type_single_title_hooks(){
+	/**
+	 * Deprecate the single message hooks for post types.
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_all_post_type_single_title_hooks(){
 
-        if( is_singular( 'sensei_message' ) ){
+		if( is_singular( 'sensei_message' ) ){
 
-            sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
+			sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * course_single_meta function.
-     *
-     * @access public
-     * @return void
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_course_single_meta_hooks() {
+	/**
+	 * course_single_meta function.
+	 *
+	 * @access public
+	 * @return void
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_course_single_meta_hooks() {
 
-        // deprecate all these hooks
-        sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
+		// deprecate all these hooks
+		sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
 
-    } // End deprecate_course_single_meta_hooks
+	} // End deprecate_course_single_meta_hooks
 
-    /**
-     * Run the deprecated hooks on the single lesson page
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
+	/**
+	 * Run the deprecated hooks on the single lesson page
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
 
-        if( is_singular( 'lesson' ) ){
+		if( is_singular( 'lesson' ) ){
 
-            sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
-            sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
+			sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
+			sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
 
-        }
+		}
 
-    }// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
+	}// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
 
-    /**
-     * Deprecate the hook sensei_lesson_course_signup.
-     *
-     * The hook content will be linked directly on the recommended
-     * sensei_single_lesson_content_inside_after
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_course_signup_hook(){
+	/**
+	 * Deprecate the hook sensei_lesson_course_signup.
+	 *
+	 * The hook content will be linked directly on the recommended
+	 * sensei_single_lesson_content_inside_after
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_course_signup_hook(){
 
-        $lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+		$lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
+		$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
 
-        if(  !$user_taking_course ) {
+		if(  !$user_taking_course ) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
+			sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
 
-        }
-    }// end deprecate_sensei_lesson_course_signup_hook
+		}
+	}// end deprecate_sensei_lesson_course_signup_hook
 
-    /**
-     * Running the deprecated hook: sensei_lesson_single_meta
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_meta_hook(){
+	/**
+	 * Running the deprecated hook: sensei_lesson_single_meta
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_meta_hook(){
 
-        if ( sensei_can_user_view_lesson()  ) {
+		if ( sensei_can_user_view_lesson()  ) {
 
-            sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
+			sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
 
 
-        }
+		}
 
-    }// end deprecate_sensei_lesson_single_meta_hook
+	}// end deprecate_sensei_lesson_single_meta_hook
 
-    /**
-     * Deprecate the sensei lesson single title hook
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_title(){
+	/**
+	 * Deprecate the sensei lesson single title hook
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_title(){
 
-        sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+		sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-    }// end deprecate_sensei_lesson_single_title
+	}// end deprecate_sensei_lesson_single_title
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_single_main_content_hook(){
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_single_main_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_image_hook(){
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_image_hook(){
 
-        sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+		sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    /**
-     * hook in the deprecated sensei_login_form hook for backwards
-     * compatibility
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_login_form_hook(){
+	/**
+	 * hook in the deprecated sensei_login_form hook for backwards
+	 * compatibility
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_login_form_hook(){
 
-        sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
+		sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
 
-    } // end deprecate_sensei_login_form_hook
+	} // end deprecate_sensei_login_form_hook
 
-    /**
-     * Fire the sensei_complete_course action.
-     *
-     * This is just a backwards compatible function to add the action
-     * to a template. This should not be used as the function from this
-     * hook will be added directly to my-courses page via one of the hooks there.
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_sensei_complete_course_hook(){
+	/**
+	 * Fire the sensei_complete_course action.
+	 *
+	 * This is just a backwards compatible function to add the action
+	 * to a template. This should not be used as the function from this
+	 * hook will be added directly to my-courses page via one of the hooks there.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_sensei_complete_course_hook(){
 
-        do_action( 'sensei_complete_course' );
+		do_action( 'sensei_complete_course' );
 
-    } //fire_sensei_complete_course_hook
+	} //fire_sensei_complete_course_hook
 
-    /**
-     * Fire the frontend message hook
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_frontend_messages_hook(){
+	/**
+	 * Fire the frontend message hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_frontend_messages_hook(){
 
-        do_action( 'sensei_frontend_messages' );
+		do_action( 'sensei_frontend_messages' );
 
-    }// end sensei_complete_course_action
+	}// end sensei_complete_course_action
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_before.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_before_user_course_content_hook(){
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_before.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_before_user_course_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
+		sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
 
-    }// deprecate_sensei_before_user_course_content_hook
+	}// deprecate_sensei_before_user_course_content_hook
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_after hook.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_after_user_course_content_hook(){
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_after hook.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_after_user_course_content_hook(){
 
-        sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
+		sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
 
-    }// deprecate_sensei_after_user_course_content_hook
+	}// deprecate_sensei_after_user_course_content_hook
 
-    /**
-     * Deprecate the 2 main hooks on the archive message template
-     *
-     * @deprecated since 1.9.0
-     * @since 1.9.0
-     */
-    public static function deprecated_archive_message_hooks (){
-
-        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
-        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
+	/**
+	 * Deprecate the 2 main hooks on the archive message template
+	 *
+	 * @deprecated since 1.9.0
+	 * @since 1.9.0
+	 */
+	public static function deprecated_archive_message_hooks (){
+
+		sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
+		sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
 
-    }
+	}
 
-    /**
-     * Run the sensei_complete_quiz for those still hooking
-     * into but deprecated it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_complete_quiz_action(){
+	/**
+	 * Run the sensei_complete_quiz for those still hooking
+	 * into but deprecated it.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_complete_quiz_action(){
 
-        sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
 
-    }
+	}
 
-    /**
-     * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
-     * it to provide user with a better alternative.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_quiz_question_type_action(){
+	/**
+	 * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
+	 * it to provide user with a better alternative.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_quiz_question_type_action(){
 
-        // Question Type
-        global $sensei_question_loop;
-        $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
-        sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
-
-    }
+		// Question Type
+		global $sensei_question_loop;
+		$question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
+		sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
+
+	}
 }//end class

Spacing +154 added lines, -154 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,11 +366,11 @@ 
      * @since 1.9.0
      * @param  WP_Post $post
      */
-    public static function the_title( $post ){
+    public static function the_title($post) {
 
         // ID passed in
-        if( is_numeric( $post ) ){
-            $post = get_post( $post );
+        if (is_numeric($post)) {
+            $post = get_post($post);
         }
 
         /**
@@ -380,7 +380,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
@@ -388,14 +388,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
@@ -407,11 +407,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
 
@@ -422,9 +422,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
 
@@ -436,13 +436,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');
             }
@@ -454,9 +454,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');
 
     }
 
@@ -465,9 +465,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');
 
     }
 
@@ -477,11 +477,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');
 
         }
 
@@ -497,10 +497,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
 
@@ -510,10 +510,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());
 
         }
 
@@ -527,14 +527,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
@@ -545,11 +545,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');
 
 
         }
@@ -560,9 +560,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
 
@@ -570,9 +570,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
 
@@ -580,9 +580,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
 
@@ -593,9 +593,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
 
@@ -608,9 +608,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
 
@@ -619,9 +619,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
 
@@ -631,9 +631,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
 
@@ -643,9 +643,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
 
@@ -655,10 +655,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');
 
     }
 
@@ -668,9 +668,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');
 
     }
 
@@ -680,7 +680,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 +24 added lines, -24 removed lines

@@ -205,13 +205,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;
@@ -219,8 +219,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 ) {
@@ -239,30 +239,30 @@ 
 
 				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_Learner::get_full_name( $user_activity->user_id );
+				$title = Sensei_Learner::get_full_name( $user_activity->user_id );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 
-                /**
-                 * 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),
@@ -292,7 +292,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 +174 added lines, -174 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
@@ -22,28 +22,28 @@ 
 	 * Constructor
 	 * @since  1.6.0
 	 */
-	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()
 
 	/**
@@ -53,38 +53,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;
 	}
 
@@ -95,32 +95,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;
 	}
 
@@ -134,72 +134,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()
 
@@ -213,42 +213,42 @@ 
      *
      * @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_Learner::get_full_name( $user_activity->user_id );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $title = Sensei_Learner::get_full_name($user_activity->user_id);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
                 /**
                  * sensei_learners_main_column_data filter
@@ -263,50 +263,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 . '">' . 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.'">'.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
@@ -319,7 +319,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',
@@ -329,7 +329,7 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $args['category'] ) {
+		if ($args['category']) {
 			$course_args['tax_query'][] = array(
 				'taxonomy' => 'course-category',
 				'field' => 'id',
@@ -337,11 +337,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;
@@ -352,7 +352,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',
@@ -362,18 +362,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;
@@ -384,22 +384,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();
 		}
@@ -415,32 +415,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;
@@ -453,22 +453,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()
 
 	/**
@@ -479,40 +479,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;
@@ -531,12 +531,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,
@@ -544,18 +544,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()
@@ -580,50 +580,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>
@@ -635,19 +635,19 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	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

@@ -627,7 +627,7 @@
 		$course = get_post( $this->course_id );
 		$report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview';
 		if ( $this->user_id ) {
-            $user_name = Sensei_Learner::get_full_name( $this->user_id );
+			$user_name = Sensei_Learner::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
 
 /**
  * Admin Analysis Course Data Table in Sensei.
@@ -20,27 +20,27 @@ 
 	 * Constructor
 	 * @since  1.2.0
 	 */
-	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()
 
@@ -51,45 +51,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;
 	}
 
@@ -100,46 +100,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;
 	}
 
@@ -153,32 +153,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(
@@ -187,28 +187,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
-		) );
+		));
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -224,22 +224,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;
 
@@ -247,32 +247,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;
@@ -284,37 +284,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_Learner::get_full_name( $item->user_id );
+				$user_name = Sensei_Learner::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 .= '%';
 
@@ -322,19 +322,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(
@@ -343,66 +343,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 {
@@ -412,51 +412,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
@@ -469,7 +469,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,
@@ -482,34 +482,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()
@@ -519,32 +519,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()
@@ -556,17 +556,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()
 
 	/**
@@ -575,25 +575,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;
@@ -603,17 +603,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()
 
@@ -624,19 +624,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_Learner::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_Learner::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()
 
 	/**
@@ -644,15 +644,15 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	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
 

includes/class-sensei-updates.php

Indentation +25 added lines, -25 removed lines

@@ -70,9 +70,9 @@ 
 								'1.7.2' => array( 	'auto' 		=> array( 'index_comment_status_field' => array( 'title' => __( 'Add database index to comment statuses', 'woothemes-sensei' ), 'desc' => __( 'This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei' ) ), ),
 													/*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
 												),
-                                '1.8.0' => array(   'auto' => array( 'enhance_teacher_role' => array( 'title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.' ), ),
-                            						'manual' 	=> array()
-                    							),
+								'1.8.0' => array(   'auto' => array( 'enhance_teacher_role' => array( 'title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.' ), ),
+													'manual' 	=> array()
+												),
 							);
 
 		$this->updates = apply_filters( 'sensei_upgrade_functions', $this->updates, $this->updates );
@@ -329,7 +329,7 @@ 
 				} // End For Loop
 			} // End For Loop
 
-            $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+			$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
 			update_option( $this->token . '-upgrades', $this->updates_run );
 			return true;
 
@@ -446,7 +446,7 @@ 
 	 */
 	private function set_update_run( $update ) {
 		array_push( $this->updates_run, $update );
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+		$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
 		update_option( $this->token . '-upgrades', $this->updates_run );
 	}
 
@@ -918,11 +918,11 @@ 
 				update_post_meta( $lesson->ID, '_order_' . $course_id, 0 );
 			}
 
-            $module = Sensei()->modules->get_lesson_module( $lesson->ID );
+			$module = Sensei()->modules->get_lesson_module( $lesson->ID );
 
-            if( $module ) {
-                update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
-            }
+			if( $module ) {
+				update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
+			}
 
 		}
 
@@ -1732,22 +1732,22 @@ 
 
 	}
 
-     /**
-     * WooThemes_Sensei_Updates::enhance_teacher_role
-     *
-     * This runs the update to create the teacher role
-     * @access public
-     * @since 1.8.0
-     * @return bool;
-     */
-    public  function enhance_teacher_role ( ) {
-
-        require_once('class-sensei-teacher.php');
-        $teacher = new Sensei_Teacher();
-        $teacher->create_role();
-        return true;
-
-    }// end enhance_teacher_role
+	 /**
+	  * WooThemes_Sensei_Updates::enhance_teacher_role
+	  *
+	  * This runs the update to create the teacher role
+	  * @access public
+	  * @since 1.8.0
+	  * @return bool;
+	  */
+	public  function enhance_teacher_role ( ) {
+
+		require_once('class-sensei-teacher.php');
+		$teacher = new Sensei_Teacher();
+		$teacher->create_role();
+		return true;
+
+	}// end enhance_teacher_role
 
 } // End Class
 

Braces +44 added lines, -26 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Updates Class
@@ -769,9 +772,15 @@ 
 		$all_activity = get_comments( array( 'status' => 'approve' ) );
 		$activity_count = array();
 		foreach( $all_activity as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+			if( '' == $activity->comment_type ) {
+				continue;
+			}
+			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) {
+				continue;
+			}
+			if( 0 == $activity->user_id ) {
+				continue;
+			}
 			$activity_count[] = $activity->comment_ID;
 		}
 
@@ -784,9 +793,15 @@ 
 		$activities = get_comments( $args );
 
 		foreach( $activities as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+			if( '' == $activity->comment_type ) {
+				continue;
+			}
+			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) {
+				continue;
+			}
+			if( 0 == $activity->user_id ) {
+				continue;
+			}
 
 			$user_exists = get_userdata( $activity->user_id );
 
@@ -845,7 +860,9 @@ 
 
 		foreach( $questions as $question ) {
 
-			if( ! isset( $question->ID ) ) continue;
+			if( ! isset( $question->ID ) ) {
+				continue;
+			}
 
 			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
 
@@ -882,7 +899,9 @@ 
 
 		foreach( $quizzes as $quiz ) {
 
-			if( ! isset( $quiz->ID ) ) continue;
+			if( ! isset( $quiz->ID ) ) {
+				continue;
+			}
 
 			if( isset( $lesson_completion ) && 'passed' == $lesson_completion ) {
 				update_post_meta( $quiz->ID, '_pass_required', 'on' );
@@ -910,7 +929,9 @@ 
 
 		foreach( $lessons as $lesson ) {
 
-			if( ! isset( $lesson->ID ) ) continue;
+			if( ! isset( $lesson->ID ) ) {
+				continue;
+			}
 
 			$course_id = get_post_meta( $lesson->ID, '_lesson_course', true);
 
@@ -984,11 +1005,15 @@ 
 
 		foreach( $quizzes as $quiz ) {
 
-			if( ! isset( $quiz->ID ) || 0 != $quiz->post_parent ) continue;
+			if( ! isset( $quiz->ID ) || 0 != $quiz->post_parent ) {
+				continue;
+			}
 
 			$lesson_id = get_post_meta( $quiz->ID, '_quiz_lesson', true );
 
-			if( empty( $lesson_id ) ) continue;
+			if( empty( $lesson_id ) ) {
+				continue;
+			}
 
 			$data = array(
 				'ID' => $quiz->ID,
@@ -1071,8 +1096,7 @@ 
 				delete_post_meta( $quiz_id, '_quiz_passmark' );
 				delete_post_meta( $lesson_id, '_quiz_has_questions' );
 				$d_count++;
-			}
-			else if ( in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
+			} else if ( in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
 
 				// Quiz has no questions, drop the corresponding data
 				update_post_meta( $lesson_id, '_quiz_has_questions', true );
@@ -1222,20 +1246,16 @@ 
 							// Check if the user has to get the passmark and has or not
 							if ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] <= $quiz_grade ) {
 								$status = 'passed';
-							}
-							elseif ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] > $quiz_grade ) {
+							} elseif ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] > $quiz_grade ) {
 								$status = 'failed';
-							}
-							else {
+							} else {
 								$status = 'graded';
 							}
-						}
-						else {
+						} else {
 							// If the lesson has a quiz, but the user doesn't have a grade, it's not yet been graded
 							$status = 'ungraded';
 						}
-					}
-					else {
+					} else {
 						// Lesson has no quiz, so it can only ever be this status
 						$status = 'complete';
 					}
@@ -1374,8 +1394,7 @@ 
 					}
 					$meta_data['complete'] = $lessons_completed;
 					$meta_data['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
-				}
-				else {
+				} else {
 					// Course has no lessons, therefore cannot be 'complete'
 					$status = 'in-progress';
 				}
@@ -1506,8 +1525,7 @@ 
 									$lessons_completed++;
 									break;
 							}
-						}
-						else {
+						} else {
 							switch ( $lesson_status ) {
 								case 'complete': // Lesson has no quiz/questions
 								case 'graded': // Lesson has quiz, but it's not important what the grade was

Spacing +481 added lines, -481 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Updates Class
@@ -27,59 +27,59 @@ 
 	 * @param   string $parent The main Sensei object by Ref.
 	 * @return  void
 	 */
-	public function __construct ( $parent ) {
+	public function __construct($parent) {
 
 		// Setup object data
 		$this->parent = $parent;
-		$this->updates_run = get_option( 'woothemes-sensei-upgrades', array() );
+		$this->updates_run = get_option('woothemes-sensei-upgrades', array());
 
 		// The list of upgrades to run
-		$this->updates = array( '1.1.0' => array( 	'auto' 		=> array( 'assign_role_caps' => array( 'title' => __( 'Assign role capabilities', 'woothemes-sensei' ), 'desc' => __( 'Assigns Sensei capabilites to the relevant user roles.', 'woothemes-sensei' ), 'product' => 'Sensei' ) ),
+		$this->updates = array('1.1.0' => array('auto' 		=> array('assign_role_caps' => array('title' => __('Assign role capabilities', 'woothemes-sensei'), 'desc' => __('Assigns Sensei capabilites to the relevant user roles.', 'woothemes-sensei'), 'product' => 'Sensei')),
 													'manual' 	=> array()
 												),
-								'1.3.0' => array( 	'auto' 		=> array( 'set_default_quiz_grade_type' => array( 'title' => __( 'Set default quiz grade type', 'woothemes-sensei' ), 'desc' => __( 'Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei' ) ),
-																		  'set_default_question_type' => array( 'title' => __( 'Set default question type', 'woothemes-sensei' ), 'desc' => __( 'Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei' ) )
+								'1.3.0' => array('auto' 		=> array('set_default_quiz_grade_type' => array('title' => __('Set default quiz grade type', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei')),
+																		  'set_default_question_type' => array('title' => __('Set default question type', 'woothemes-sensei'), 'desc' => __('Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei'))
 													),
-													'manual' 	=> array( 'update_question_answer_data' => array( 'title' => __( 'Update question answer data', 'woothemes-sensei' ), 'desc' => __( 'Updates questions to use the new question types structure.', 'woothemes-sensei' ) ) )
+													'manual' 	=> array('update_question_answer_data' => array('title' => __('Update question answer data', 'woothemes-sensei'), 'desc' => __('Updates questions to use the new question types structure.', 'woothemes-sensei')))
 												),
-								'1.4.0' => array( 	'auto' 		=> array( 'update_question_grade_points' => array( 'title' => __( 'Update question grade points', 'woothemes-sensei' ), 'desc' => __( 'Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei' ) ) ),
+								'1.4.0' => array('auto' 		=> array('update_question_grade_points' => array('title' => __('Update question grade points', 'woothemes-sensei'), 'desc' => __('Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei'))),
 													'manual' 	=> array()
 												),
-								'1.5.0' => array( 	'auto' 		=> array( 'convert_essay_paste_questions' => array( 'title' => __( 'Convert essay paste questions into multi-line questions', 'woothemes-sensei' ), 'desc' => __( 'Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei' ) ) ),
-													'manual' 	=> array( 'set_random_question_order' => array( 'title' => __( 'Set all quizzes to have a random question order', 'woothemes-sensei' ), 'desc' => __( 'Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei' ) ),
-																		  'set_default_show_question_count' => array( 'title' => __( 'Set all quizzes to show all questions', 'woothemes-sensei' ), 'desc' => __( 'Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei' ) ),
-																		  'remove_deleted_user_activity' => array( 'title' => __( 'Remove Sensei activity for deleted users', 'woothemes-sensei' ), 'desc' => __( 'Removes all course, lesson &amp; quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei' ) ) )
+								'1.5.0' => array('auto' 		=> array('convert_essay_paste_questions' => array('title' => __('Convert essay paste questions into multi-line questions', 'woothemes-sensei'), 'desc' => __('Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei'))),
+													'manual' 	=> array('set_random_question_order' => array('title' => __('Set all quizzes to have a random question order', 'woothemes-sensei'), 'desc' => __('Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei')),
+																		  'set_default_show_question_count' => array('title' => __('Set all quizzes to show all questions', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei')),
+																		  'remove_deleted_user_activity' => array('title' => __('Remove Sensei activity for deleted users', 'woothemes-sensei'), 'desc' => __('Removes all course, lesson &amp; quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei')))
 												),
-								'1.6.0' => array( 	'auto' 		=> array( 'add_teacher_role' => array( 'title' => __( 'Add \'Teacher\' role', 'woothemes-sensei' ), 'desc' => __( 'Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei' ) ),
-																		  'add_sensei_caps' => array( 'title' => __( 'Add administrator capabilities', 'woothemes-sensei' ), 'desc' => __( 'Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei' ) ),
-																		  'restructure_question_meta' => array( 'title' => __( 'Restructure question meta data', 'woothemes-sensei' ), 'desc' => __( 'Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei' ) ),
-																		  'update_quiz_settings' => array( 'title' => __( 'Add new quiz settings', 'woothemes-sensei' ), 'desc' => __( 'Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei' ) ),
-																		  'reset_lesson_order_meta' => array( 'title' => __( 'Set default order of lessons', 'woothemes-sensei' ), 'desc' => __( 'Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei' ) ), ),
+								'1.6.0' => array('auto' 		=> array('add_teacher_role' => array('title' => __('Add \'Teacher\' role', 'woothemes-sensei'), 'desc' => __('Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei')),
+																		  'add_sensei_caps' => array('title' => __('Add administrator capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei')),
+																		  'restructure_question_meta' => array('title' => __('Restructure question meta data', 'woothemes-sensei'), 'desc' => __('Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei')),
+																		  'update_quiz_settings' => array('title' => __('Add new quiz settings', 'woothemes-sensei'), 'desc' => __('Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei')),
+																		  'reset_lesson_order_meta' => array('title' => __('Set default order of lessons', 'woothemes-sensei'), 'desc' => __('Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei')),),
 													'manual' 	=> array()
 												),
-								'1.7.0' => array( 	'auto' 		=> array( 'add_editor_caps' => array( 'title' => __( 'Add Editor capabilities', 'woothemes-sensei' ), 'desc' => __( 'Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei' ) ), ),
-													'forced' 	=> array(  'update_question_gap_fill_separators' => array( 'title' => __( 'Update Gap Fill questions', 'woothemes-sensei' ), 'desc' => __( 'Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei' ) ),
-																		  'update_quiz_lesson_relationship' => array( 'title' => __( 'Restructure quiz lesson relationship', 'woothemes-sensei' ), 'desc' => __( 'Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei' ) ),
-																		  'status_changes_fix_lessons' => array( 'title' => __( 'Update lesson statuses', 'woothemes-sensei' ), 'desc' => __( 'Update existing lesson statuses.', 'woothemes-sensei' ) ),
-																		  'status_changes_convert_lessons' => array( 'title' => __( 'Convert lesson statuses', 'woothemes-sensei' ), 'desc' => __( 'Convert to new lesson statuses.', 'woothemes-sensei' ) ),
-																		  'status_changes_convert_courses' => array( 'title' => __( 'Convert course statuses', 'woothemes-sensei' ), 'desc' => __( 'Convert to new course statuses.', 'woothemes-sensei' ) ),
-																		  'status_changes_convert_questions' => array( 'title' => __( 'Convert question statuses', 'woothemes-sensei' ), 'desc' => __( 'Convert to new question statuses.', 'woothemes-sensei' ) ),
-																		  'update_legacy_sensei_comments_status' => array( 'title' => __( 'Convert legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei' ) ),
-																		  'update_comment_course_lesson_comment_counts' => array( 'title' => __( 'Update comment counts', 'woothemes-sensei' ), 'desc' => __( 'Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei' ) ), ),
+								'1.7.0' => array('auto' 		=> array('add_editor_caps' => array('title' => __('Add Editor capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei')),),
+													'forced' 	=> array('update_question_gap_fill_separators' => array('title' => __('Update Gap Fill questions', 'woothemes-sensei'), 'desc' => __('Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei')),
+																		  'update_quiz_lesson_relationship' => array('title' => __('Restructure quiz lesson relationship', 'woothemes-sensei'), 'desc' => __('Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei')),
+																		  'status_changes_fix_lessons' => array('title' => __('Update lesson statuses', 'woothemes-sensei'), 'desc' => __('Update existing lesson statuses.', 'woothemes-sensei')),
+																		  'status_changes_convert_lessons' => array('title' => __('Convert lesson statuses', 'woothemes-sensei'), 'desc' => __('Convert to new lesson statuses.', 'woothemes-sensei')),
+																		  'status_changes_convert_courses' => array('title' => __('Convert course statuses', 'woothemes-sensei'), 'desc' => __('Convert to new course statuses.', 'woothemes-sensei')),
+																		  'status_changes_convert_questions' => array('title' => __('Convert question statuses', 'woothemes-sensei'), 'desc' => __('Convert to new question statuses.', 'woothemes-sensei')),
+																		  'update_legacy_sensei_comments_status' => array('title' => __('Convert legacy Sensei activity types', 'woothemes-sensei'), 'desc' => __('Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei')),
+																		  'update_comment_course_lesson_comment_counts' => array('title' => __('Update comment counts', 'woothemes-sensei'), 'desc' => __('Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei')),),
 												),
-								'1.7.2' => array( 	'auto' 		=> array( 'index_comment_status_field' => array( 'title' => __( 'Add database index to comment statuses', 'woothemes-sensei' ), 'desc' => __( 'This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei' ) ), ),
+								'1.7.2' => array('auto' 		=> array('index_comment_status_field' => array('title' => __('Add database index to comment statuses', 'woothemes-sensei'), 'desc' => __('This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei')),),
 													/*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
 												),
-                                '1.8.0' => array(   'auto' => array( 'enhance_teacher_role' => array( 'title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.' ), ),
+                                '1.8.0' => array('auto' => array('enhance_teacher_role' => array('title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.'),),
                             						'manual' 	=> array()
                     							),
 							);
 
-		$this->updates = apply_filters( 'sensei_upgrade_functions', $this->updates, $this->updates );
-		$this->version = get_option( 'woothemes-sensei-version' );
+		$this->updates = apply_filters('sensei_upgrade_functions', $this->updates, $this->updates);
+		$this->version = get_option('woothemes-sensei-version');
 
 		// Manual Update Screen
-		add_action('admin_menu', array( $this, 'add_update_admin_screen' ), 50 );
+		add_action('admin_menu', array($this, 'add_update_admin_screen'), 50);
 
 	} // End __construct()
 
@@ -91,8 +91,8 @@ 
 	 * @return void
 	 */
 	public function add_update_admin_screen() {
-		if ( current_user_can( 'manage_options' ) ) {
-			add_submenu_page( 'sensei', __( 'Sensei Updates', 'woothemes-sensei' ), __( 'Data Updates', 'woothemes-sensei' ), 'manage_options', 'sensei_updates', array( $this, 'sensei_updates_page' ) );
+		if (current_user_can('manage_options')) {
+			add_submenu_page('sensei', __('Sensei Updates', 'woothemes-sensei'), __('Data Updates', 'woothemes-sensei'), 'manage_options', 'sensei_updates', array($this, 'sensei_updates_page'));
 		}
 	} // End add_update_admin_screen()
 
@@ -106,80 +106,80 @@ 
 	public function sensei_updates_page() {
 
 		// Only allow admins to load this page and run the update functions
-		if( current_user_can( 'manage_options' ) ) {
+		if (current_user_can('manage_options')) {
 			?>
 			<div class="wrap">
 
 				<div id="icon-woothemes-sensei" class="icon32"><br></div>
-				<h2><?php _e( 'Sensei Updates', 'woothemes-sensei' ); ?></h2>
+				<h2><?php _e('Sensei Updates', 'woothemes-sensei'); ?></h2>
 
 				<?php
-				if ( isset( $_GET['action'] ) && $_GET['action'] == 'update' && isset( $_GET['n'] ) && intval( $_GET['n'] ) >= 0 && ( ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) || ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) ) ) {
+				if (isset($_GET['action']) && $_GET['action'] == 'update' && isset($_GET['n']) && intval($_GET['n']) >= 0 && ((isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) || (isset($_GET['functions']) && '' != $_GET['functions']))) {
 
 					// Setup the data variables
-					$n = intval( $_GET['n'] );
+					$n = intval($_GET['n']);
 					$functions_list = '';
 					$done_processing = false;
 
 					// Check for updates to run
-					if ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) {
+					if (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) {
 
-						foreach ( $_POST['checked'] as $key => $value ) {
+						foreach ($_POST['checked'] as $key => $value) {
 
 							// Dynamic function call
-							if ( method_exists( $this, $value) ) {
-								$done_processing = call_user_func_array( array( $this, $value ), array( 50, $n ) );
+							if (method_exists($this, $value)) {
+								$done_processing = call_user_func_array(array($this, $value), array(50, $n));
 							} else {
-								$done_processing = call_user_func_array( $value, array( 50, $n ) );
+								$done_processing = call_user_func_array($value, array(50, $n));
 							} // End If Statement
 
 							// Add to functions list get args
-							if ( '' == $functions_list ) {
+							if ('' == $functions_list) {
 								$functions_list .= $value;
 							} else {
-								$functions_list .= '+' . $value;
+								$functions_list .= '+'.$value;
 							} // End If Statement
 
 							// Mark update has having been run
-							$this->set_update_run( $value );
+							$this->set_update_run($value);
 
 						} // End For Loop
 
 					} // End If Statement
 
 					// Check for updates to run
-					if ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) {
+					if (isset($_GET['functions']) && '' != $_GET['functions']) {
 
 						// Existing functions from GET variables instead of POST
 						$functions_array = $_GET['functions'];
 
-						foreach ( $functions_array as $key => $value ) {
+						foreach ($functions_array as $key => $value) {
 
 							// Dynamic function call
-							if ( method_exists( $this, $value) ) {
-								$done_processing = call_user_func_array( array( $this, $value ), array( 50, $n ) );
+							if (method_exists($this, $value)) {
+								$done_processing = call_user_func_array(array($this, $value), array(50, $n));
 							} else {
-								$done_processing = call_user_func_array( $value, array( 50, $n ) );
+								$done_processing = call_user_func_array($value, array(50, $n));
 							} // End If Statement
 
 							// Add to functions list get args
-							if ( '' == $functions_list ) {
+							if ('' == $functions_list) {
 								$functions_list .= $value;
 							} else {
-								$functions_list .= '+' . $value;
+								$functions_list .= '+'.$value;
 							} // End If Statement
 
-							$this->set_update_run( $value );
+							$this->set_update_run($value);
 
 						} // End For Loop
 
 					} // End If Statement
 
-					if ( ! $done_processing ) { ?>
+					if ( ! $done_processing) { ?>
 
-						<h3><?php _e( 'Processing Updates...', 'woothemes-sensei' ); ?></h3>
+						<h3><?php _e('Processing Updates...', 'woothemes-sensei'); ?></h3>
 
-						<p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this button:', 'woothemes-sensei' ); ?>&nbsp;&nbsp;<a class="button" href="admin.php?page=sensei_updates&action=update&n=<?php echo ($n + 50) ?>&functions[]=<?php echo $functions_list; ?>"><?php _e( 'Next', 'woothemes-sensei' ); ?></a></p>
+						<p><?php _e('If your browser doesn&#8217;t start loading the next page automatically, click this button:', 'woothemes-sensei'); ?>&nbsp;&nbsp;<a class="button" href="admin.php?page=sensei_updates&action=update&n=<?php echo ($n + 50) ?>&functions[]=<?php echo $functions_list; ?>"><?php _e('Next', 'woothemes-sensei'); ?></a></p>
 						<script type='text/javascript'>
 						<!--
 						function sensei_nextpage() {
@@ -191,48 +191,48 @@ 
 
 					} else { ?>
 
-						<p><strong><?php _e( 'Update completed successfully!', 'woothemes-sensei' ); ?></strong></p>
-						<p><a href="<?php echo admin_url('edit.php?post_type=lesson'); ?>"><?php _e( 'Create a new lesson', 'woothemes-sensei' ); ?></a> or <a href="<?php echo admin_url('admin.php?page=sensei_updates'); ?>"><?php _e( 'run some more updates', 'woothemes-sensei' ); ?></a>.</p>
+						<p><strong><?php _e('Update completed successfully!', 'woothemes-sensei'); ?></strong></p>
+						<p><a href="<?php echo admin_url('edit.php?post_type=lesson'); ?>"><?php _e('Create a new lesson', 'woothemes-sensei'); ?></a> or <a href="<?php echo admin_url('admin.php?page=sensei_updates'); ?>"><?php _e('run some more updates', 'woothemes-sensei'); ?></a>.</p>
 
 					<?php } // End If Statement
 
 				} else { ?>
 
-					<h3><?php _e( 'Updates', 'woothemes-sensei' ); ?></h3>
-					<p><?php printf( __( 'These are updates that have been made available as new Sensei versions have been released. Updates of type %1$sAuto%2$s will run as you update Sensei to the relevant version - other updates need to be run manually and you can do that here.', 'woothemes-sensei' ), '<code>', '</code>' ); ?></p>
+					<h3><?php _e('Updates', 'woothemes-sensei'); ?></h3>
+					<p><?php printf(__('These are updates that have been made available as new Sensei versions have been released. Updates of type %1$sAuto%2$s will run as you update Sensei to the relevant version - other updates need to be run manually and you can do that here.', 'woothemes-sensei'), '<code>', '</code>'); ?></p>
 
-					<div class="updated"><p><strong><?php _e( 'Only run these updates if you have been instructed to do so by WooThemes support staff.', 'woothemes-sensei' ); ?></strong></p></div>
+					<div class="updated"><p><strong><?php _e('Only run these updates if you have been instructed to do so by WooThemes support staff.', 'woothemes-sensei'); ?></strong></p></div>
 
 					<table class="widefat" cellspacing="0" id="update-plugins-table">
 
 						<thead>
 							<tr>
-								<th scope="col" class="manage-column"><?php _e( 'Update', 'woothemes-sensei' ); ?></th>
-								<th scope="col" class="manage-column"><?php _e( 'Type', 'woothemes-sensei' ); ?></th>
-								<th scope="col" class="manage-column"><?php _e( 'Action', 'woothemes-sensei' ); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Update', 'woothemes-sensei'); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Type', 'woothemes-sensei'); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Action', 'woothemes-sensei'); ?></th>
 							</tr>
 						</thead>
 
 						<tfoot>
 							<tr>
-								<th scope="col" class="manage-column"><?php _e( 'Update', 'woothemes-sensei' ); ?></th>
-								<th scope="col" class="manage-column"><?php _e( 'Type', 'woothemes-sensei' ); ?></th>
-								<th scope="col" class="manage-column"><?php _e( 'Action', 'woothemes-sensei' ); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Update', 'woothemes-sensei'); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Type', 'woothemes-sensei'); ?></th>
+								<th scope="col" class="manage-column"><?php _e('Action', 'woothemes-sensei'); ?></th>
 							</tr>
 						</tfoot>
 
 						<tbody class="updates">
 							<?php
 							// Sort updates with the latest at the top
-							uksort( $this->updates, array( $this, 'sort_updates' ) );
-							$this->updates = array_reverse( $this->updates, true );
+							uksort($this->updates, array($this, 'sort_updates'));
+							$this->updates = array_reverse($this->updates, true);
 							$class = 'alternate';
-							foreach( $this->updates as $version => $version_updates ) {
-								foreach( $version_updates as $type => $updates ) {
-									foreach( $updates as $update => $data ) {
-										$update_run = $this->has_update_run( $update );
+							foreach ($this->updates as $version => $version_updates) {
+								foreach ($version_updates as $type => $updates) {
+									foreach ($updates as $update => $data) {
+										$update_run = $this->has_update_run($update);
 										$product = 'Sensei';
-										if ( isset( $data['product'] ) && '' != $data['product'] ) {
+										if (isset($data['product']) && '' != $data['product']) {
 											$product = $data['product'];
 										} // End If Statement
 										?>
@@ -242,21 +242,21 @@ 
 													<p>
 														<input type="hidden" name="checked[]" value="<?php echo $update; ?>">
 														<strong><?php echo $data['title']; ?></strong><br><?php echo $data['desc']; ?><br>
-														<em><?php printf( __( 'Originally included in %s v%s', 'woothemes-sensei' ), $product, $version ); ?></em>
+														<em><?php printf(__('Originally included in %s v%s', 'woothemes-sensei'), $product, $version); ?></em>
 													</p>
 												</td>
 												<?php
-												$type_label = __( 'Auto', 'woothemes-sensei' );
-												if( $type != 'auto' ) {
-													$type_label = __( 'Manual', 'woothemes-sensei' );
+												$type_label = __('Auto', 'woothemes-sensei');
+												if ($type != 'auto') {
+													$type_label = __('Manual', 'woothemes-sensei');
 												}
 												?>
 												<td><p><?php echo $type_label; ?></p></td>
-												<td><p><input onclick="javascript:return confirm('<?php echo addslashes( sprintf( __( 'Are you sure you want to run the \'%s\' update?', 'woothemes-sensei' ), $data['title'] ) ); ?>');" id="update-sensei" class="button<?php if( ! $update_run ) { echo ' button-primary'; } ?>" type="submit" value="<?php if( $update_run ) { _e( 'Re-run Update', 'woothemes-sensei' ); } else { _e( 'Run Update', 'woothemes-sensei' ); } ?>" name="update"></p></td>
+												<td><p><input onclick="javascript:return confirm('<?php echo addslashes(sprintf(__('Are you sure you want to run the \'%s\' update?', 'woothemes-sensei'), $data['title'])); ?>');" id="update-sensei" class="button<?php if ( ! $update_run) { echo ' button-primary'; } ?>" type="submit" value="<?php if ($update_run) { _e('Re-run Update', 'woothemes-sensei'); } else { _e('Run Update', 'woothemes-sensei'); } ?>" name="update"></p></td>
 											</tr>
 										</form>
 										<?php
-										if( 'alternate' == $class ) {
+										if ('alternate' == $class) {
 											$class = '';
 										} else {
 											$class = 'alternate';
@@ -283,8 +283,8 @@ 
 	 * @param  string $b Second key
 	 * @return integer
 	 */
-	private function sort_updates( $a, $b ) {
-		return strcmp( $a, $b );
+	private function sort_updates($a, $b) {
+		return strcmp($a, $b);
 	}
 
 	/**
@@ -295,32 +295,32 @@ 
 	 * @access public
 	 * @return boolean
 	 */
-	public function update ( $type = 'auto' ) {
+	public function update($type = 'auto') {
 
 		// Only allow admins to run update functions
-		if( current_user_can( 'manage_options' ) ) {
+		if (current_user_can('manage_options')) {
 
 			$this->force_updates();
 
 			// Run through all functions
-			foreach ( $this->updates as $version => $value ) {
-				foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
-					if ( $upgrade_type == $type ) {
+			foreach ($this->updates as $version => $value) {
+				foreach ($this->updates[$version] as $upgrade_type => $function_to_run) {
+					if ($upgrade_type == $type) {
 						$updated = false;
 						// Run the update function
-						foreach ( $function_to_run as $function_name => $update_data ) {
-							if ( isset( $function_name ) && '' != $function_name ) {
-								if ( ! in_array( $function_name, $this->updates_run ) ) {
+						foreach ($function_to_run as $function_name => $update_data) {
+							if (isset($function_name) && '' != $function_name) {
+								if ( ! in_array($function_name, $this->updates_run)) {
 									$updated = false;
-									if ( method_exists( $this, $function_name ) ) {
-										$updated = call_user_func( array( $this, $function_name ) );
-									} elseif( function_exists( $function_name ) ) {
-										$updated = call_user_func( $function_name );
+									if (method_exists($this, $function_name)) {
+										$updated = call_user_func(array($this, $function_name));
+									} elseif (function_exists($function_name)) {
+										$updated = call_user_func($function_name);
 									} else {
 										// Nothing to see here...
 									} // End If Statement
-									if ( $updated ) {
-										array_push( $this->updates_run, $function_name );
+									if ($updated) {
+										array_push($this->updates_run, $function_name);
 									} // End If Statement
 								}
 							} // End If Statement
@@ -329,8 +329,8 @@ 
 				} // End For Loop
 			} // End For Loop
 
-            $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-			update_option( Sensei()->token . '-upgrades', $this->updates_run );
+            $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+			update_option(Sensei()->token.'-upgrades', $this->updates_run);
 			return true;
 
 		}
@@ -339,7 +339,7 @@ 
 
 	private function force_updates() {
 
-		if( ! isset( $_GET['page'] ) || 'sensei_updates' != $_GET['page'] ) {
+		if ( ! isset($_GET['page']) || 'sensei_updates' != $_GET['page']) {
 
 			// $skip_forced_updates = false;
 			// if( ! get_option( 'woothemes-sensei-force-updates', false ) ) {
@@ -348,8 +348,8 @@ 
 
 			// Force critical updates if only if lessons already exist
 			$skip_forced_updates = false;
-			$lesson_posts = wp_count_posts( 'lesson' );
-			if( ! isset( $lesson_posts->publish ) || ! $lesson_posts->publish ) {
+			$lesson_posts = wp_count_posts('lesson');
+			if ( ! isset($lesson_posts->publish) || ! $lesson_posts->publish) {
 				$skip_forced_updates = true;
 			}
 
@@ -357,69 +357,69 @@ 
 
 			$updates_to_run = array();
 
-			foreach ( $this->updates as $version => $value ) {
-				foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
-					if ( $upgrade_type == 'forced' ) {
-						foreach ( $function_to_run as $function_name => $update_data ) {
+			foreach ($this->updates as $version => $value) {
+				foreach ($this->updates[$version] as $upgrade_type => $function_to_run) {
+					if ($upgrade_type == 'forced') {
+						foreach ($function_to_run as $function_name => $update_data) {
 
-							if( $skip_forced_updates ) {
-								$this->set_update_run( $function_name );
+							if ($skip_forced_updates) {
+								$this->set_update_run($function_name);
 								continue;
 							}
 
-							$update_run = $this->has_update_run( $function_name );
+							$update_run = $this->has_update_run($function_name);
 
-							if( ! $update_run ) {
+							if ( ! $update_run) {
 								$use_the_force = true;
-								$updates_to_run[ $function_name ] = $update_data;
+								$updates_to_run[$function_name] = $update_data;
 							}
 						}
 					}
 				}
 			}
 
-			if( $skip_forced_updates ) {
+			if ($skip_forced_updates) {
 				return;
 			}
 
-			if( $use_the_force && 0 < count( $updates_to_run ) ) {
+			if ($use_the_force && 0 < count($updates_to_run)) {
 
-				$update_title = __( 'Important Sensei updates required', 'woothemes-sensei' );
+				$update_title = __('Important Sensei updates required', 'woothemes-sensei');
 
-				$update_message = '<h1>' . __( 'Important Sensei upgrades required!', 'woothemes-sensei' ) . '</h1>' . "\n";
+				$update_message = '<h1>'.__('Important Sensei upgrades required!', 'woothemes-sensei').'</h1>'."\n";
 
 				// $update_message .= '<h4>' . sprintf( __( 'These updates are only required if you are updating from a previous version of Sensei. If you are installing Sensei for the first time, %1$syou can dismiss this page by clicking here%2$s.', 'woothemes-sensei' ), '<a href="' . add_query_arg( array( 'sensei_skip_forced_updates' => 'true' ) ) . '">', '</a>' ) . '</h4>' ."\n";
 
-				$update_message .= '<p>' . __( 'The latest version of Sensei requires some important database upgrades. In order to run these upgrades you will need to follow the step by step guide below. Your site will not function correctly unless you run these critical updates.', 'woothemes-sensei' ) . '</p>' . "\n";
+				$update_message .= '<p>'.__('The latest version of Sensei requires some important database upgrades. In order to run these upgrades you will need to follow the step by step guide below. Your site will not function correctly unless you run these critical updates.', 'woothemes-sensei').'</p>'."\n";
 
-				$update_message .= '<p><b>' . __( 'To run the upgrades click on each of the links below in the order that they appear.', 'woothemes-sensei' ) . '</b></p>' . "\n";
+				$update_message .= '<p><b>'.__('To run the upgrades click on each of the links below in the order that they appear.', 'woothemes-sensei').'</b></p>'."\n";
 
-				$update_message .= '<p>' . __( 'Clicking each link will open up a new window/tab - do not close that window/tab until you see the message \'Update completed successfully\'. Once you see that message you can close the window/tab and start the next upgrade by clicking on the next link in the list.', 'woothemes-sensei' ) . '</p>' . "\n";
+				$update_message .= '<p>'.__('Clicking each link will open up a new window/tab - do not close that window/tab until you see the message \'Update completed successfully\'. Once you see that message you can close the window/tab and start the next upgrade by clicking on the next link in the list.', 'woothemes-sensei').'</p>'."\n";
 
-				$update_message .= '<p><b>' . __( 'Once all the upgrades have been completed you will be able to use your WordPress site again.', 'woothemes-sensei' ) . '</b></p>' . "\n";
+				$update_message .= '<p><b>'.__('Once all the upgrades have been completed you will be able to use your WordPress site again.', 'woothemes-sensei').'</b></p>'."\n";
 
-				$update_message .= '<ol>' . "\n";
+				$update_message .= '<ol>'."\n";
 
-					foreach( $updates_to_run as $function => $data ) {
+					foreach ($updates_to_run as $function => $data) {
 
-						if( ! isset( $data['title'] ) ) {
+						if ( ! isset($data['title'])) {
 							break;
 						}
 
-						$update_message .= '<li style="margin:5px 0;"><a href="' . admin_url( 'admin.php?page=sensei_updates&action=update&n=0&functions[]=' . $function ) . '" target="_blank">' . $data['title'] . '</a></li>';
+						$update_message .= '<li style="margin:5px 0;"><a href="'.admin_url('admin.php?page=sensei_updates&action=update&n=0&functions[]='.$function).'" target="_blank">'.$data['title'].'</a></li>';
 					}
 
-				$update_message .= '</ol>' . "\n";
+				$update_message .= '</ol>'."\n";
 
-				switch( $version ) {
+				switch ($version) {
 
 					case '1.7.0':
-						$update_message .= '<p><em>' . sprintf( __( 'Want to know what these upgrades are all about? %1$sFind out more here%2$s.', 'woothemes-sensei' ), '<a href="http://develop.woothemes.com/sensei/2014/12/03/important-information-about-sensei-1-7" target="_blank">', '</a>' ) . '</em></p>' . "\n";
+						$update_message .= '<p><em>'.sprintf(__('Want to know what these upgrades are all about? %1$sFind out more here%2$s.', 'woothemes-sensei'), '<a href="http://develop.woothemes.com/sensei/2014/12/03/important-information-about-sensei-1-7" target="_blank">', '</a>').'</em></p>'."\n";
 					break;
 
 				}
 
-				wp_die( $update_message, $update_title );
+				wp_die($update_message, $update_title);
 			}
 		}
 	}
@@ -431,8 +431,8 @@ 
 	 * @since  1.4.0
 	 * @return boolean
 	 */
-	private function has_update_run( $update ) {
-		if ( in_array( $update, $this->updates_run ) ) {
+	private function has_update_run($update) {
+		if (in_array($update, $this->updates_run)) {
 			return true;
 		}
 		return false;
@@ -444,10 +444,10 @@ 
 	 * @param string $update Update to process
 	 * @since  1.4.0
 	 */
-	private function set_update_run( $update ) {
-		array_push( $this->updates_run, $update );
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-		update_option( Sensei()->token . '-upgrades', $this->updates_run );
+	private function set_update_run($update) {
+		array_push($this->updates_run, $update);
+        $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+		update_option(Sensei()->token.'-upgrades', $this->updates_run);
 	}
 
 	/**
@@ -458,15 +458,15 @@ 
 	 * @return void
 	 */
 	public function assign_role_caps() {
-		foreach ( $this->parent->post_types->role_caps as $role_cap_set  ) {
-			foreach ( $role_cap_set as $role_key => $capabilities_array ) {
+		foreach ($this->parent->post_types->role_caps as $role_cap_set) {
+			foreach ($role_cap_set as $role_key => $capabilities_array) {
 				/* Get the role. */
-				$role = get_role( $role_key );
-				foreach ( $capabilities_array as $cap_name  ) {
+				$role = get_role($role_key);
+				foreach ($capabilities_array as $cap_name) {
 					/* If the role exists, add required capabilities for the plugin. */
-					if ( !empty( $role ) ) {
-						if ( !$role->has_cap( $cap_name ) ) {
-							$role->add_cap( $cap_name );
+					if ( ! empty($role)) {
+						if ( ! $role->has_cap($cap_name)) {
+							$role->add_cap($cap_name);
 						} // End If Statement
 					} // End If Statement
 				} // End For Loop
@@ -483,16 +483,16 @@ 
 	 * @return void
 	 */
 	public function set_default_quiz_grade_type() {
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
-			update_post_meta( $quiz->ID, '_quiz_grade_type', 'auto' );
-			update_post_meta( $quiz->ID, '_quiz_grade_type_disabled', '' );
+		foreach ($quizzes as $quiz) {
+			update_post_meta($quiz->ID, '_quiz_grade_type', 'auto');
+			update_post_meta($quiz->ID, '_quiz_grade_type_disabled', '');
 		}
 		return true;
 	} // End set_default_quiz_grade_type
@@ -505,23 +505,23 @@ 
 	 * @return void
 	 */
 	public function set_default_question_type() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
 		$already_run = true;
-		foreach( $questions as $question ) {
-			if( $already_run ) {
-				$terms = wp_get_post_terms( $question->ID, 'question-type' );
-				if( is_array( $terms ) && count( $terms ) > 0 ) {
+		foreach ($questions as $question) {
+			if ($already_run) {
+				$terms = wp_get_post_terms($question->ID, 'question-type');
+				if (is_array($terms) && count($terms) > 0) {
 					break;
 				}
 			}
 			$already_run = false;
-			wp_set_post_terms( $question->ID, array( 'multiple-choice' ), 'question-type' );
+			wp_set_post_terms($question->ID, array('multiple-choice'), 'question-type');
 		}
 
 		return true;
@@ -534,90 +534,90 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function update_question_answer_data( $n = 50, $offset = 0 ) {
+	public function update_question_answer_data($n = 50, $offset = 0) {
 
 		// Get Total Number of Updates to run
-		$quiz_count_object = wp_count_posts( 'quiz' );
+		$quiz_count_object = wp_count_posts('quiz');
 		$quiz_count_published = $quiz_count_object->publish;
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
-		$total_pages = intval( $quiz_count_published / $n );
+		$total_pages = intval($quiz_count_published / $n);
 
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
 		$old_answers = array();
 		$right_answers = array();
 		$old_user_answers = array();
 
-		if( is_array( $quizzes ) ) {
-			foreach( $quizzes as $quiz ) {
+		if (is_array($quizzes)) {
+			foreach ($quizzes as $quiz) {
 				$quiz_id = $quiz->ID;
 
 				// Get current user answers
-				$comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $quiz_id, 'type' => 'sensei_quiz_answers' ), true  );
+				$comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => $quiz_id, 'type' => 'sensei_quiz_answers'), true);
 				// Need to always return an array, even with only 1 item
-				if ( !is_array($comments) ) {
-					$comments = array( $comments );
+				if ( ! is_array($comments)) {
+					$comments = array($comments);
 				}
-				foreach ( $comments as $comment ) {
+				foreach ($comments as $comment) {
 					$user_id = $comment->user_id;
-					$content = maybe_unserialize( base64_decode( $comment->comment_content ) );
-					$old_user_answers[ $quiz_id ][ $user_id ] = $content;
+					$content = maybe_unserialize(base64_decode($comment->comment_content));
+					$old_user_answers[$quiz_id][$user_id] = $content;
 				}
 
 				// Get correct answers
-				$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-				if( is_array( $questions ) ) {
-					foreach( $questions as $question ) {
-						$right_answer = get_post_meta( $question->ID, '_question_right_answer', true );
-						$right_answers[ $quiz_id ][ $question->ID ] = $right_answer;
+				$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+				if (is_array($questions)) {
+					foreach ($questions as $question) {
+						$right_answer = get_post_meta($question->ID, '_question_right_answer', true);
+						$right_answers[$quiz_id][$question->ID] = $right_answer;
 					}
 				}
 			}
 		}
 
-		if( is_array( $right_answers ) ) {
-			foreach( $right_answers as $quiz_id => $question ) {
+		if (is_array($right_answers)) {
+			foreach ($right_answers as $quiz_id => $question) {
 				$count = 0;
-				if( is_array( $question ) ) {
-					foreach( $question as $question_id => $answer ) {
+				if (is_array($question)) {
+					foreach ($question as $question_id => $answer) {
 						++$count;
-						if( isset( $old_user_answers[ $quiz_id ] ) ) {
-							$answers_linkup[ $quiz_id ][ $count ] = $question_id;
+						if (isset($old_user_answers[$quiz_id])) {
+							$answers_linkup[$quiz_id][$count] = $question_id;
 						}
 					}
 				}
 			}
 		}
 
-		if( is_array( $old_user_answers ) ) {
-			foreach( $old_user_answers as $quiz_id => $user_answers ) {
-				foreach( $user_answers as $user_id => $answers ) {
-					foreach( $answers as $answer_id => $user_answer ) {
-						$question_id = $answers_linkup[ $quiz_id ][ $answer_id ];
-						$new_user_answers[ $question_id ] = $user_answer;
-						Sensei_Utils::sensei_grade_question_auto( $question_id, '', $user_answer, $user_id );
+		if (is_array($old_user_answers)) {
+			foreach ($old_user_answers as $quiz_id => $user_answers) {
+				foreach ($user_answers as $user_id => $answers) {
+					foreach ($answers as $answer_id => $user_answer) {
+						$question_id = $answers_linkup[$quiz_id][$answer_id];
+						$new_user_answers[$question_id] = $user_answer;
+						Sensei_Utils::sensei_grade_question_auto($question_id, '', $user_answer, $user_id);
 					}
-					$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-					Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
-					Sensei_Utils::sensei_save_quiz_answers( $new_user_answers, $user_id );
+					$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+					Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
+					Sensei_Utils::sensei_save_quiz_answers($new_user_answers, $user_id);
 				}
 			}
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -632,15 +632,15 @@ 
 	 * @return boolean
 	 */
 	public function update_question_grade_points() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
-			update_post_meta( $question->ID, '_question_grade', '1' );
+		foreach ($questions as $question) {
+			update_post_meta($question->ID, '_question_grade', '1');
 		}
 		return true;
 	} // End update_question_grade_points
@@ -652,7 +652,7 @@ 
 	 * @return boolean
 	 */
 	public function convert_essay_paste_questions() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'tax_query'			=> array(
@@ -664,14 +664,14 @@ 
 						),
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
-			wp_set_object_terms( $question->ID, 'multi-line', 'question-type', false );
+		foreach ($questions as $question) {
+			wp_set_object_terms($question->ID, 'multi-line', 'question-type', false);
 
-			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
-			if( 0 < intval( $quiz_id ) ) {
-				add_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $quiz_id . '0000', true );
+			$quiz_id = get_post_meta($question->ID, '_quiz_id', true);
+			if (0 < intval($quiz_id)) {
+				add_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $quiz_id.'0000', true);
 			}
 		}
 		return true;
@@ -683,33 +683,33 @@ 
 	 * @since  1.5.0
 	 * @return boolean
 	 */
-	public function set_random_question_order( $n = 50, $offset = 0 ) {
+	public function set_random_question_order($n = 50, $offset = 0) {
 
 		// Get Total Number of Updates to run
-		$quiz_count_object = wp_count_posts( 'quiz' );
+		$quiz_count_object = wp_count_posts('quiz');
 		$quiz_count_published = $quiz_count_object->publish;
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
-		$total_pages = intval( $quiz_count_published / $n );
+		$total_pages = intval($quiz_count_published / $n);
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'post_status'		=> 'any',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
-			update_post_meta( $quiz->ID, '_random_question_order', 'yes' );
+		foreach ($quizzes as $quiz) {
+			update_post_meta($quiz->ID, '_random_question_order', 'yes');
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -723,37 +723,37 @@ 
 	 * @since  1.5.0
 	 * @return boolean
 	 */
-	public function set_default_show_question_count( $n = 50, $offset = 0 ) {
+	public function set_default_show_question_count($n = 50, $offset = 0) {
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'post_status'		=> 'any',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'meta_key'			=> '_show_questions',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		$total_quizzes = count( $quizzes );
+		$total_quizzes = count($quizzes);
 
-		if( 0 == intval( $total_quizzes ) ) {
+		if (0 == intval($total_quizzes)) {
 			return true;
 		}
 
-		foreach( $quizzes as $quiz ) {
-			delete_post_meta( $quiz->ID, '_show_questions' );
+		foreach ($quizzes as $quiz) {
+			delete_post_meta($quiz->ID, '_show_questions');
 		}
 
-		$total_pages = intval( $total_quizzes / $n );
+		$total_pages = intval($total_quizzes / $n);
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -761,17 +761,17 @@ 
 
 	}
 
-	public function remove_deleted_user_activity( $n = 50, $offset = 0 ) {
+	public function remove_deleted_user_activity($n = 50, $offset = 0) {
 
 
 //		remove_filter( 'comments_clauses', array( Sensei()->admin, 'comments_admin_filter' ) );
 
-		$all_activity = get_comments( array( 'status' => 'approve' ) );
+		$all_activity = get_comments(array('status' => 'approve'));
 		$activity_count = array();
-		foreach( $all_activity as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+		foreach ($all_activity as $activity) {
+			if ('' == $activity->comment_type) continue;
+			if (strpos('sensei_', $activity->comment_type) != 0) continue;
+			if (0 == $activity->user_id) continue;
 			$activity_count[] = $activity->comment_ID;
 		}
 
@@ -781,35 +781,35 @@ 
 			'status' => 'approve'
 		);
 
-		$activities = get_comments( $args );
+		$activities = get_comments($args);
 
-		foreach( $activities as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+		foreach ($activities as $activity) {
+			if ('' == $activity->comment_type) continue;
+			if (strpos('sensei_', $activity->comment_type) != 0) continue;
+			if (0 == $activity->user_id) continue;
 
-			$user_exists = get_userdata( $activity->user_id );
+			$user_exists = get_userdata($activity->user_id);
 
-			if( ! $user_exists ) {
-				wp_delete_comment( intval( $activity->comment_ID ), true );
+			if ( ! $user_exists) {
+				wp_delete_comment(intval($activity->comment_ID), true);
 				wp_cache_flush();
 			}
 		}
 
-		$total_activities = count( $activity_count );
+		$total_activities = count($activity_count);
 
-		$total_pages = intval( $total_activities / $n );
+		$total_pages = intval($total_activities / $n);
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
 
 //		add_filter( 'comments_clauses', array( Sensei()->admin, 'comments_admin_filter' ) );
 
-		if ( $current_page >= $total_pages ) {
+		if ($current_page >= $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -818,16 +818,16 @@ 
 	}
 
 	public function add_teacher_role() {
-		add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ), array( 'read' => true, 'manage_sensei_grades' => true ) );
+		add_role('teacher', __('Teacher', 'woothemes-sensei'), array('read' => true, 'manage_sensei_grades' => true));
 		return true;
 	}
 
 	public function add_sensei_caps() {
-		$role = get_role( 'administrator' );
+		$role = get_role('administrator');
 
-		if( ! is_null( $role ) ) {
-			$role->add_cap( 'manage_sensei' );
-			$role->add_cap( 'manage_sensei_grades' );
+		if ( ! is_null($role)) {
+			$role->add_cap('manage_sensei');
+			$role->add_cap('manage_sensei_grades');
 		}
 
 		return true;
@@ -841,16 +841,16 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
+		foreach ($questions as $question) {
 
-			if( ! isset( $question->ID ) ) continue;
+			if ( ! isset($question->ID)) continue;
 
-			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
+			$quiz_id = get_post_meta($question->ID, '_quiz_id', true);
 
-			$question_order = get_post_meta( $question->ID, '_quiz_question_order', true );
-			update_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $question_order );
+			$question_order = get_post_meta($question->ID, '_quiz_question_order', true);
+			update_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $question_order);
 
 		}
 
@@ -859,15 +859,15 @@ 
 
 	public function update_quiz_settings() {
 
-		$settings = get_option( 'woothemes-sensei-settings', array() );
+		$settings = get_option('woothemes-sensei-settings', array());
 
 		$lesson_completion = false;
-		if( isset( $settings['lesson_completion'] ) ) {
+		if (isset($settings['lesson_completion'])) {
 			$lesson_completion = $settings['lesson_completion'];
 		}
 
 		$reset_quiz_allowed = false;
-		if( isset( $settings['quiz_reset_allowed'] ) ) {
+		if (isset($settings['quiz_reset_allowed'])) {
 			$reset_quiz_allowed = $settings['quiz_reset_allowed'];
 		}
 
@@ -878,20 +878,20 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			if( ! isset( $quiz->ID ) ) continue;
+			if ( ! isset($quiz->ID)) continue;
 
-			if( isset( $lesson_completion ) && 'passed' == $lesson_completion ) {
-				update_post_meta( $quiz->ID, '_pass_required', 'on' );
+			if (isset($lesson_completion) && 'passed' == $lesson_completion) {
+				update_post_meta($quiz->ID, '_pass_required', 'on');
 			} else {
-				update_post_meta( $quiz->ID, '_quiz_passmark', 0 );
+				update_post_meta($quiz->ID, '_quiz_passmark', 0);
 			}
 
-			if( isset( $reset_quiz_allowed ) && $reset_quiz_allowed ) {
-				update_post_meta( $quiz->ID, '_enable_quiz_reset', 'on' );
+			if (isset($reset_quiz_allowed) && $reset_quiz_allowed) {
+				update_post_meta($quiz->ID, '_enable_quiz_reset', 'on');
 			}
 		}
 
@@ -906,22 +906,22 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$lessons = get_posts( $args );
+		$lessons = get_posts($args);
 
-		foreach( $lessons as $lesson ) {
+		foreach ($lessons as $lesson) {
 
-			if( ! isset( $lesson->ID ) ) continue;
+			if ( ! isset($lesson->ID)) continue;
 
-			$course_id = get_post_meta( $lesson->ID, '_lesson_course', true);
+			$course_id = get_post_meta($lesson->ID, '_lesson_course', true);
 
-			if( $course_id ) {
-				update_post_meta( $lesson->ID, '_order_' . $course_id, 0 );
+			if ($course_id) {
+				update_post_meta($lesson->ID, '_order_'.$course_id, 0);
 			}
 
-            $module = Sensei()->modules->get_lesson_module( $lesson->ID );
+            $module = Sensei()->modules->get_lesson_module($lesson->ID);
 
-            if( $module ) {
-                update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
+            if ($module) {
+                update_post_meta($lesson->ID, '_order_module_'.$module->term_id, 0);
             }
 
 		}
@@ -930,10 +930,10 @@ 
 	}
 
 	public function add_editor_caps() {
-		$role = get_role( 'editor' );
+		$role = get_role('editor');
 
-		if( ! is_null( $role ) ) {
-			$role->add_cap( 'manage_sensei_grades' );
+		if ( ! is_null($role)) {
+			$role->add_cap('manage_sensei_grades');
 		}
 
 		return true;
@@ -952,26 +952,26 @@ 
 					WHERE m.meta_key = '_question_right_answer' AND m.meta_value LIKE '%|%' AND m.meta_value NOT LIKE '%||%'
 						AND m.post_id = tr.object_id AND tr.term_taxonomy_id = tt.term_taxonomy_id AND tt.term_id = t.term_id
 						AND tt.taxonomy = 'question-type' AND t.slug = 'gap-fill'";
-		$wpdb->query( $sql );
+		$wpdb->query($sql);
 
 		return true;
 	}
 
-	public function update_quiz_lesson_relationship( $n = 50, $offset = 0 ) {
-		$count_object = wp_count_posts( 'quiz' );
+	public function update_quiz_lesson_relationship($n = 50, $offset = 0) {
+		$count_object = wp_count_posts('quiz');
 
 		$count_published = 0;
-		foreach ( $count_object AS $status => $count ) {
+		foreach ($count_object AS $status => $count) {
 			$count_published += $count;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		$args = array(
 			'post_type' => 'quiz',
@@ -980,52 +980,52 @@ 
 			'post_status' => 'any'
 		);
 
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			if( ! isset( $quiz->ID ) || 0 != $quiz->post_parent ) continue;
+			if ( ! isset($quiz->ID) || 0 != $quiz->post_parent) continue;
 
-			$lesson_id = get_post_meta( $quiz->ID, '_quiz_lesson', true );
+			$lesson_id = get_post_meta($quiz->ID, '_quiz_lesson', true);
 
-			if( empty( $lesson_id ) ) continue;
+			if (empty($lesson_id)) continue;
 
 			$data = array(
 				'ID' => $quiz->ID,
 				'post_parent' => $lesson_id,
 			);
-			wp_update_post( $data );
+			wp_update_post($data);
 
-			update_post_meta( $lesson_id, '_lesson_quiz', $quiz->ID );
+			update_post_meta($lesson_id, '_lesson_quiz', $quiz->ID);
 		}
 
-		if ( $current_page == $total_pages || 0 == $total_pages ) {
+		if ($current_page == $total_pages || 0 == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_fix_lessons( $n = 50, $offset = 0 ) {
+	function status_changes_fix_lessons($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$count_object = wp_count_posts( 'lesson' );
+		$count_object = wp_count_posts('lesson');
 		$count_published = 0;
-		foreach ( $count_object AS $status => $count ) {
+		foreach ($count_object AS $status => $count) {
 			$count_published += $count;
 		}
 
-		if ( 0 == $count_published ) {
+		if (0 == $count_published) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		// Get all Lessons with (and without) Quizzes...
 		$args = array(
@@ -1035,26 +1035,26 @@ 
 			'offset' => $offset,
 			'fields' => 'ids'
 		);
-		$lesson_ids = get_posts( $args );
+		$lesson_ids = get_posts($args);
 
 		// ...get all Quiz IDs for the above Lessons
-		$id_list = join( ',', $lesson_ids );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', $lesson_ids);
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['meta_value'];
 				$quiz_id = $metarow['post_id'];
-				$lesson_quiz_ids[ $lesson_id ] = $quiz_id;
+				$lesson_quiz_ids[$lesson_id] = $quiz_id;
 			}
 		}
 
 		// ...check all Quiz IDs for questions
-		$id_list = join( ',', array_values($lesson_quiz_ids) );
-		$meta_list = $wpdb->get_results( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_id' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', array_values($lesson_quiz_ids));
+		$meta_list = $wpdb->get_results("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_id' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids_with_questions = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$quiz_id = $metarow['meta_value'];
 				$lesson_quiz_ids_with_questions[] = $quiz_id;
 			}
@@ -1062,49 +1062,49 @@ 
 
 		// For each quiz check there are questions, if not remove the corresponding meta keys from Quizzes and Lessons
 		// if there are questions on the quiz add the corresponding meta keys to Quizzes and Lessons
-		$d_count = $a_count =0;
-		foreach ( $lesson_quiz_ids AS $lesson_id => $quiz_id ) {
-			if ( !in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
+		$d_count = $a_count = 0;
+		foreach ($lesson_quiz_ids AS $lesson_id => $quiz_id) {
+			if ( ! in_array($quiz_id, $lesson_quiz_ids_with_questions)) {
 
 				// Quiz has no questions, drop the corresponding data
-				delete_post_meta( $quiz_id, '_pass_required' );
-				delete_post_meta( $quiz_id, '_quiz_passmark' );
-				delete_post_meta( $lesson_id, '_quiz_has_questions' );
+				delete_post_meta($quiz_id, '_pass_required');
+				delete_post_meta($quiz_id, '_quiz_passmark');
+				delete_post_meta($lesson_id, '_quiz_has_questions');
 				$d_count++;
 			}
-			else if ( in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
+			else if (in_array($quiz_id, $lesson_quiz_ids_with_questions)) {
 
 				// Quiz has no questions, drop the corresponding data
-				update_post_meta( $lesson_id, '_quiz_has_questions', true );
+				update_post_meta($lesson_id, '_quiz_has_questions', true);
 				$a_count++;
 			}
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_lessons( $n = 50, $offset = 0 ) {
+	function status_changes_convert_lessons($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		// Get all Lessons with Quizzes...
 		$args = array(
@@ -1119,34 +1119,34 @@ 
 			),
 			'fields' => 'ids'
 		);
-		$lesson_ids_with_quizzes = get_posts( $args );
+		$lesson_ids_with_quizzes = get_posts($args);
 		// ...get all Quiz IDs for the above Lessons
-		$id_list = join( ',', $lesson_ids_with_quizzes );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', $lesson_ids_with_quizzes);
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['meta_value'];
 				$quiz_id = $metarow['post_id'];
-				$lesson_quiz_ids[ $lesson_id ] = $quiz_id;
+				$lesson_quiz_ids[$lesson_id] = $quiz_id;
 			}
 		}
 
 		// ...get all Pass Required & Passmarks for the above Lesson/Quizzes
-		$id_list = join( ',', array_values($lesson_quiz_ids) );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE ( meta_key = '_pass_required' OR meta_key = '_quiz_passmark' ) AND post_id IN ($id_list)", ARRAY_A );
+		$id_list = join(',', array_values($lesson_quiz_ids));
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE ( meta_key = '_pass_required' OR meta_key = '_quiz_passmark' ) AND post_id IN ($id_list)", ARRAY_A);
 		$quizzes_pass_required = $quizzes_passmarks = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
-				if ( !empty($metarow['meta_value']) ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
+				if ( ! empty($metarow['meta_value'])) {
 					$quiz_id = $metarow['post_id'];
 					$key = $metarow['meta_key'];
 					$value = $metarow['meta_value'];
-					if ( '_pass_required' == $key ) {
-						$quizzes_pass_required[ $quiz_id ] = $value;
+					if ('_pass_required' == $key) {
+						$quizzes_pass_required[$quiz_id] = $value;
 					}
-					if ( '_quiz_passmark' == $key ) {
-						$quizzes_passmarks[ $quiz_id ] = $value;
+					if ('_quiz_passmark' == $key) {
+						$quizzes_passmarks[$quiz_id] = $value;
 					}
 				}
 			}
@@ -1160,41 +1160,41 @@ 
 		$check_existing_sql = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = 'sensei_lesson_status' ";
 
 		// $per_page users at a time, could be batch run via an admin ajax command, 1 user at a time?
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			$lesson_ends = $lesson_grades = $lesson_answers = array();
 
 			// Pre-process the lesson ends
-			$_lesson_ends = $wpdb->get_results( $wpdb->prepare($end_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_ends as $lesson_end ) {
+			$_lesson_ends = $wpdb->get_results($wpdb->prepare($end_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_ends as $lesson_end) {
 				// This will overwrite existing entries with the newer ones
-				$lesson_ends[ $lesson_end['comment_post_ID'] ] = $lesson_end['comment_date'];
+				$lesson_ends[$lesson_end['comment_post_ID']] = $lesson_end['comment_date'];
 			}
-			unset( $_lesson_ends );
+			unset($_lesson_ends);
 
 			// Pre-process the lesson grades
-			$_lesson_grades = $wpdb->get_results( $wpdb->prepare($grade_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_grades as $lesson_grade ) {
+			$_lesson_grades = $wpdb->get_results($wpdb->prepare($grade_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_grades as $lesson_grade) {
 				// This will overwrite existing entries with the newer ones (assuming the grade is higher)
-				if ( empty($lesson_grades[ $lesson_grade['comment_post_ID'] ]) || $lesson_grades[ $lesson_grade['comment_post_ID'] ] < $lesson_grade['comment_content'] ) {
-					$lesson_grades[ $lesson_grade['comment_post_ID'] ] = $lesson_grade['comment_content'];
+				if (empty($lesson_grades[$lesson_grade['comment_post_ID']]) || $lesson_grades[$lesson_grade['comment_post_ID']] < $lesson_grade['comment_content']) {
+					$lesson_grades[$lesson_grade['comment_post_ID']] = $lesson_grade['comment_content'];
 				}
 			}
-			unset( $_lesson_grades );
+			unset($_lesson_grades);
 
 			// Pre-process the lesson answers
-			$_lesson_answers = $wpdb->get_results( $wpdb->prepare($answers_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_answers as $lesson_answer ) {
+			$_lesson_answers = $wpdb->get_results($wpdb->prepare($answers_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_answers as $lesson_answer) {
 				// This will overwrite existing entries with the newer ones
-				$lesson_answers[ $lesson_answer['comment_post_ID'] ] = $lesson_answer['comment_content'];
+				$lesson_answers[$lesson_answer['comment_post_ID']] = $lesson_answer['comment_content'];
 			}
-			unset( $_lesson_answers );
+			unset($_lesson_answers);
 
 			// Grab all the lesson starts for the user
-			$lesson_starts = $wpdb->get_results( $wpdb->prepare($start_sql, $user_id), ARRAY_A );
-			foreach ( $lesson_starts as $lesson_log ) {
+			$lesson_starts = $wpdb->get_results($wpdb->prepare($start_sql, $user_id), ARRAY_A);
+			foreach ($lesson_starts as $lesson_log) {
 
 				$lesson_id = $lesson_log['comment_post_ID'];
 
@@ -1207,23 +1207,23 @@ 
 					'start' => $status_date,
 				);
 				// Check if there is a lesson end
-				if ( !empty($lesson_ends[$lesson_id]) ) {
+				if ( ! empty($lesson_ends[$lesson_id])) {
 					$status_date = $lesson_ends[$lesson_id];
 					// Check lesson has quiz
-					if ( !empty( $lesson_quiz_ids[$lesson_id] ) ) {
+					if ( ! empty($lesson_quiz_ids[$lesson_id])) {
 						// Check for the quiz answers
-						if ( !empty($lesson_answers[$quiz_id]) ) {
+						if ( ! empty($lesson_answers[$quiz_id])) {
 							$meta_data['questions_asked'] = $lesson_answers[$quiz_id];
 						}
 						// Check if there is a quiz grade
 						$quiz_id = $lesson_quiz_ids[$lesson_id];
-						if ( !empty($lesson_grades[$quiz_id]) ) {
+						if ( ! empty($lesson_grades[$quiz_id])) {
 							$meta_data['grade'] = $quiz_grade = $lesson_grades[$quiz_id];
 							// Check if the user has to get the passmark and has or not
-							if ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] <= $quiz_grade ) {
+							if ( ! empty($quizzes_pass_required[$quiz_id]) && $quizzes_passmarks[$quiz_id] <= $quiz_grade) {
 								$status = 'passed';
 							}
-							elseif ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] > $quiz_grade ) {
+							elseif ( ! empty($quizzes_pass_required[$quiz_id]) && $quizzes_passmarks[$quiz_id] > $quiz_grade) {
 								$status = 'failed';
 							}
 							else {
@@ -1251,26 +1251,26 @@ 
 						'comment_author' => '',
 					);
 				// Check it doesn't already exist
-				$sql = $wpdb->prepare( $check_existing_sql, $lesson_id, $user_id );
-				$comment_ID = $wpdb->get_var( $sql );
-				if ( !$comment_ID ) {
+				$sql = $wpdb->prepare($check_existing_sql, $lesson_id, $user_id);
+				$comment_ID = $wpdb->get_var($sql);
+				if ( ! $comment_ID) {
 					// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
 					$wpdb->insert($wpdb->comments, $data);
 					$comment_ID = (int) $wpdb->insert_id;
 
-					if ( $comment_ID && !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+					if ($comment_ID && ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP add_comment_meta(() so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1278,40 +1278,40 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_courses( $n = 50, $offset = 0 ) {
+	function status_changes_convert_courses($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		// Get all Lesson => Course relationships
-		$meta_list = $wpdb->get_results( "SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course'", ARRAY_A );
+		$meta_list = $wpdb->get_results("SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course'", ARRAY_A);
 		$course_lesson_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['post_id'];
 				$course_id = $metarow['meta_value'];
-				$course_lesson_ids[ $course_id ][] = $lesson_id;
+				$course_lesson_ids[$course_id][] = $lesson_id;
 			}
 		}
 
@@ -1321,13 +1321,13 @@ 
 		$check_existing_sql = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = 'sensei_course_status' ";
 
 		// $per_page users at a time, could be batch run via an admin ajax command, 1 user at a time?
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			// Grab all the course starts for the user
-			$course_starts = $wpdb->get_results( $wpdb->prepare($start_sql, $user_id), ARRAY_A );
-			foreach ( $course_starts as $course_log ) {
+			$course_starts = $wpdb->get_results($wpdb->prepare($start_sql, $user_id), ARRAY_A);
+			foreach ($course_starts as $course_log) {
 
 				$course_id = $course_log['comment_post_ID'];
 
@@ -1342,23 +1342,23 @@ 
 					'percent' => 0,
 				);
 				// Check if the course has lessons
-				if ( !empty( $course_lesson_ids[$course_id] ) ) {
+				if ( ! empty($course_lesson_ids[$course_id])) {
 
 					$lessons_completed = 0;
-					$total_lessons = count( $course_lesson_ids[ $course_id ] );
+					$total_lessons = count($course_lesson_ids[$course_id]);
 
 					// Don't use prepare as we need to provide the id join
-					$sql = sprintf($lessons_sql, $user_id, join(', ', $course_lesson_ids[ $course_id ]) );
+					$sql = sprintf($lessons_sql, $user_id, join(', ', $course_lesson_ids[$course_id]));
 					// Get all lesson statuses for this Courses' lessons
-					$lesson_statuses = $wpdb->get_results( $sql, ARRAY_A );
+					$lesson_statuses = $wpdb->get_results($sql, ARRAY_A);
 					// Not enough lesson statuses, thus cannot be complete
-					if ( $total_lessons > count($lesson_statuses) ) {
+					if ($total_lessons > count($lesson_statuses)) {
 						$status = 'in-progress';
 					}
 					// Count each lesson to work out the overall percentage
-					foreach ( $lesson_statuses as $lesson_status ) {
+					foreach ($lesson_statuses as $lesson_status) {
 						$status_date = $lesson_status['comment_date'];
-						switch ( $lesson_status['status'] ) {
+						switch ($lesson_status['status']) {
 							case 'complete': // Lesson has no quiz/questions
 							case 'graded': // Lesson has quiz, but it's not important what the grade was
 							case 'passed':
@@ -1373,7 +1373,7 @@ 
 						}
 					}
 					$meta_data['complete'] = $lessons_completed;
-					$meta_data['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
+					$meta_data['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0));
 				}
 				else {
 					// Course has no lessons, therefore cannot be 'complete'
@@ -1390,26 +1390,26 @@ 
 						'comment_author' => '',
 					);
 				// Check it doesn't already exist
-				$sql = $wpdb->prepare( $check_existing_sql, $course_id, $user_id );
-				$comment_ID = $wpdb->get_var( $sql );
-				if ( !$comment_ID ) {
+				$sql = $wpdb->prepare($check_existing_sql, $course_id, $user_id);
+				$comment_ID = $wpdb->get_var($sql);
+				if ( ! $comment_ID) {
 					// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
 					$wpdb->insert($wpdb->comments, $data);
 					$comment_ID = (int) $wpdb->insert_id;
 
-					if ( $comment_ID && !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+					if ($comment_ID && ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1417,7 +1417,7 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -1433,70 +1433,70 @@ 
 	 * @param type $offset
 	 * @return boolean
 	 */
-	function status_changes_repair_course_statuses( $n = 50, $offset = 0 ) {
+	function status_changes_repair_course_statuses($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$count_object = wp_count_posts( 'lesson' );
+		$count_object = wp_count_posts('lesson');
 		$count_published = $count_object->publish;
 
-		if ( 0 == $count_published ) {
+		if (0 == $count_published) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		$course_lesson_ids = $lesson_user_statuses = array();
 
 		// Get all Lesson => Course relationships
-		$meta_list = $wpdb->get_results( "SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course' LIMIT $n OFFSET $offset ", ARRAY_A );
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		$meta_list = $wpdb->get_results("SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course' LIMIT $n OFFSET $offset ", ARRAY_A);
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['post_id'];
 				$course_id = $metarow['meta_value'];
-				$course_lesson_ids[ $course_id ][] = $lesson_id;
+				$course_lesson_ids[$course_id][] = $lesson_id;
 			}
 		}
 
 		// Get all Lesson => Course relationships
-		$status_list = $wpdb->get_results( "SELECT user_id, comment_post_ID, comment_approved FROM $wpdb->comments WHERE comment_type = 'sensei_lesson_status' GROUP BY user_id, comment_post_ID ", ARRAY_A );
-		if ( !empty($status_list) ) {
-			foreach ( $status_list as $status ) {
-				$lesson_user_statuses[ $status['comment_post_ID'] ][ $status['user_id'] ] = $status['comment_approved'];
+		$status_list = $wpdb->get_results("SELECT user_id, comment_post_ID, comment_approved FROM $wpdb->comments WHERE comment_type = 'sensei_lesson_status' GROUP BY user_id, comment_post_ID ", ARRAY_A);
+		if ( ! empty($status_list)) {
+			foreach ($status_list as $status) {
+				$lesson_user_statuses[$status['comment_post_ID']][$status['user_id']] = $status['comment_approved'];
 			}
 		}
 
-		$course_completion = Sensei()->settings->settings[ 'course_completion' ];
+		$course_completion = Sensei()->settings->settings['course_completion'];
 
 		$per_page = 40;
 		$comment_id_offset = $count = 0;
 
 		$course_sql = "SELECT * FROM $wpdb->comments WHERE comment_type = 'sensei_course_status' AND comment_ID > %d LIMIT $per_page";
 		// $per_page users at a time
-		while ( $course_statuses = $wpdb->get_results( $wpdb->prepare($course_sql, $comment_id_offset) ) ) {
+		while ($course_statuses = $wpdb->get_results($wpdb->prepare($course_sql, $comment_id_offset))) {
 
-			foreach ( $course_statuses AS $course_status ) {
+			foreach ($course_statuses AS $course_status) {
 				$user_id = $course_status->user_id;
 				$course_id = $course_status->comment_post_ID;
-				$total_lessons = count( $course_lesson_ids[ $course_id ] );
-				if ( $total_lessons <= 0 ) {
+				$total_lessons = count($course_lesson_ids[$course_id]);
+				if ($total_lessons <= 0) {
 					$total_lessons = 1; // Fix division of zero error, some courses have no lessons
 				}
 				$lessons_completed = 0;
 				$status = 'in-progress';
 
 				// Some Courses have no lessons... (can they ever be complete?)
-				if ( !empty($course_lesson_ids[ $course_id ]) ) {
-					foreach( $course_lesson_ids[ $course_id ] AS $lesson_id ) {
-						$lesson_status = $lesson_user_statuses[ $lesson_id ][ $user_id ];
+				if ( ! empty($course_lesson_ids[$course_id])) {
+					foreach ($course_lesson_ids[$course_id] AS $lesson_id) {
+						$lesson_status = $lesson_user_statuses[$lesson_id][$user_id];
 						// If lessons are complete without needing quizzes to be passed
-						if ( 'passed' != $course_completion ) {
-							switch ( $lesson_status ) {
+						if ('passed' != $course_completion) {
+							switch ($lesson_status) {
 								// A user cannot 'complete' a course if a lesson...
 								case 'in-progress': // ...is still in progress
 								case 'ungraded': // ...hasn't yet been graded
@@ -1508,7 +1508,7 @@ 
 							}
 						}
 						else {
-							switch ( $lesson_status ) {
+							switch ($lesson_status) {
 								case 'complete': // Lesson has no quiz/questions
 								case 'graded': // Lesson has quiz, but it's not important what the grade was
 								case 'passed': // Lesson has quiz and the user passed
@@ -1523,79 +1523,79 @@ 
 						}
 					} // Each lesson
 				} // Check for lessons
-				if ( $lessons_completed == $total_lessons ) {
+				if ($lessons_completed == $total_lessons) {
 					$status = 'complete';
 				}
 				// update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above
 				$metadata = array(
 					'complete' => $lessons_completed,
-					'percent' => abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) ),
+					'percent' => abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0)),
 				);
-				Sensei_Utils::update_course_status( $user_id, $course_id, $status, $metadata );
+				Sensei_Utils::update_course_status($user_id, $course_id, $status, $metadata);
 				$count++;
 
 			} // per course status
 			$comment_id_offset = $course_status->comment_ID;
 		} // all course statuses
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_questions( $n = 50, $offset = 0 ) {
+	function status_changes_convert_questions($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		$users_sql = "SELECT ID FROM $wpdb->users ORDER BY ID ASC LIMIT %d OFFSET %d";
 		$answers_sql = "SELECT * FROM $wpdb->comments WHERE comment_type = 'sensei_user_answer' AND user_id = %d GROUP BY comment_post_ID ";
 		$grades_sql = "SELECT comment_post_ID, comment_content FROM $wpdb->comments WHERE comment_type = 'sensei_user_grade' AND user_id = %d GROUP BY comment_post_ID ";
 		$notes_sql = "SELECT comment_post_ID, comment_content FROM $wpdb->comments WHERE comment_type = 'sensei_answer_notes' AND user_id = %d GROUP BY comment_post_ID ";
 
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			$answer_grades = $answer_notes = array();
 
 			// Pre-process the answer grades
-			$_answer_grades = $wpdb->get_results( $wpdb->prepare($grades_sql, $user_id), ARRAY_A );
-			foreach ( $_answer_grades as $answer_grade ) {
+			$_answer_grades = $wpdb->get_results($wpdb->prepare($grades_sql, $user_id), ARRAY_A);
+			foreach ($_answer_grades as $answer_grade) {
 				// This will overwrite existing entries with the newer ones
-				$answer_grades[ $answer_grade['comment_post_ID'] ] = $answer_grade['comment_content'];
+				$answer_grades[$answer_grade['comment_post_ID']] = $answer_grade['comment_content'];
 			}
-			unset( $_answer_grades );
+			unset($_answer_grades);
 
 			// Pre-process the answer notes
-			$_answer_notes = $wpdb->get_results( $wpdb->prepare($notes_sql, $user_id), ARRAY_A );
-			foreach ( $_answer_notes as $answer_note ) {
+			$_answer_notes = $wpdb->get_results($wpdb->prepare($notes_sql, $user_id), ARRAY_A);
+			foreach ($_answer_notes as $answer_note) {
 				// This will overwrite existing entries with the newer ones
-				$answer_notes[ $answer_note['comment_post_ID'] ] = $answer_note['comment_content'];
+				$answer_notes[$answer_note['comment_post_ID']] = $answer_note['comment_content'];
 			}
-			unset( $_answer_notes );
+			unset($_answer_notes);
 
 			// Grab all the questions for the user
 			$sql = $wpdb->prepare($answers_sql, $user_id);
-			$answers = $wpdb->get_results( $sql, ARRAY_A );
-			foreach ( $answers as $answer ) {
+			$answers = $wpdb->get_results($sql, ARRAY_A);
+			foreach ($answers as $answer) {
 
 				// Excape data
 				$answer = wp_slash($answer);
@@ -1605,12 +1605,12 @@ 
 				$meta_data = array();
 
 				// Check if the question has been graded, add as meta
-				if ( !empty($answer_grades[ $answer['comment_post_ID'] ]) ) {
-					$meta_data['user_grade'] = $answer_grades[ $answer['comment_post_ID'] ];
+				if ( ! empty($answer_grades[$answer['comment_post_ID']])) {
+					$meta_data['user_grade'] = $answer_grades[$answer['comment_post_ID']];
 				}
 				// Check if there is an answer note, add as meta
-				if ( !empty($answer_notes[ $answer['comment_post_ID'] ]) ) {
-					$meta_data['answer_note'] = $answer_notes[ $answer['comment_post_ID'] ];
+				if ( ! empty($answer_notes[$answer['comment_post_ID']])) {
+					$meta_data['answer_note'] = $answer_notes[$answer['comment_post_ID']];
 				}
 
 				// Wipe the unnessary data from the main comment
@@ -1623,21 +1623,21 @@ 
 					);
 				$data = array_merge($answer, $data);
 
-				$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
-				if ( $rval ) {
-					if ( !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+				$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
+				if ($rval) {
+					if ( ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1645,7 +1645,7 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -1662,10 +1662,10 @@ 
 		global $wpdb;
 
 		// Update 'sensei_user_answer' entries to use comment_approved = 'log' so they don't appear in counts
-		$wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'log' WHERE comment_type = 'sensei_user_answer' " );
+		$wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'log' WHERE comment_type = 'sensei_user_answer' ");
 
 		// Mark all old Sensei comment types with comment_approved = 'legacy' so they no longer appear in counts, but can be restored if required
-		$wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'legacy' WHERE comment_type IN ('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_answer_notes', 'sensei_quiz_grade') " );
+		$wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'legacy' WHERE comment_type IN ('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_answer_notes', 'sensei_quiz_grade') ");
 
 		return true;
 	}
@@ -1678,50 +1678,50 @@ 
 	 * @param type $offset
 	 * @return boolean
 	 */
-	public function update_comment_course_lesson_comment_counts( $n = 50, $offset = 0 ) {
+	public function update_comment_course_lesson_comment_counts($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$item_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') " );
+		$item_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') ");
 
-		if ( 0 == $item_count_result ) {
+		if (0 == $item_count_result) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $item_count_result / $n );
+		$total_pages = ceil($item_count_result / $n);
 
 		// Recalculate all counts
-		$items = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') LIMIT %d OFFSET %d", $n, $offset ) );
-		foreach ( (array) $items as $post ) {
+		$items = $wpdb->get_results($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') LIMIT %d OFFSET %d", $n, $offset));
+		foreach ((array) $items as $post) {
 			// Code copied from wp_update_comment_count_now()
-			$new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post->ID) );
-			$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post->ID) );
+			$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post->ID));
+			$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post->ID));
 
-			clean_post_cache( $post->ID );
+			clean_post_cache($post->ID);
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	public function remove_legacy_comments () {
+	public function remove_legacy_comments() {
 		global $wpdb;
 
-		$result = $wpdb->delete( $wpdb->comments, array( 'comment_approved' => 'legacy' ) );
+		$result = $wpdb->delete($wpdb->comments, array('comment_approved' => 'legacy'));
 
 		return true;
 	}
 
-	public function index_comment_status_field () {
+	public function index_comment_status_field() {
 		global $wpdb;
 
 		$wpdb->query("ALTER TABLE `$wpdb->comments` ADD INDEX `comment_type` ( `comment_type` )");
@@ -1740,7 +1740,7 @@ 
      * @since 1.8.0
      * @return bool;
      */
-    public  function enhance_teacher_role ( ) {
+    public  function enhance_teacher_role( ) {
 
         require_once('class-sensei-teacher.php');
         $teacher = new Sensei_Teacher();

Doc Comments +4 added lines, -4 removed lines

@@ -1424,8 +1424,8 @@ 
 	 *
 	 * @global type $woothemes_sensei
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	function status_changes_repair_course_statuses( $n = 50, $offset = 0 ) {
@@ -1669,8 +1669,8 @@ 
 	 * Update the comment counts for all Courses and Lessons now that sensei comments will no longer be counted.
 	 *
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	public function update_comment_course_lesson_comment_counts( $n = 50, $offset = 0 ) {

includes/class-sensei-lesson.php

Braces +28 added lines, -16 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Lessons Class
@@ -378,8 +381,7 @@ 
 		$quiz_questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
 		if( 0 < count( $quiz_questions ) ) {
 			update_post_meta( $post_id, '_quiz_has_questions', '1' );
-		}
-		else {
+		} else {
 			delete_post_meta( $post_id, '_quiz_has_questions' );
 		}
 
@@ -390,7 +392,9 @@ 
 
 	public function get_submitted_setting_value( $field = false ) {
 
-		if( ! $field ) return;
+		if( ! $field ) {
+			return;
+		}
 
 		$value = false;
 
@@ -1507,7 +1511,7 @@ 
 
             $field_name = 'answer_feedback_boolean';
 
-        }elseif( 'multiple-choice' == $question_type ){
+        } elseif( 'multiple-choice' == $question_type ){
 
             $field_name = 'answer_feedback_multiple_choice';
 
@@ -1603,7 +1607,9 @@ 
 
 		$html = '';
 
-		if( ! $lesson_id && ! $quiz_id ) return $html;
+		if( ! $lesson_id && ! $quiz_id ) {
+			return $html;
+		}
 
 		$settings = $this->get_quiz_settings( $quiz_id );
 
@@ -2258,11 +2264,11 @@ 
 
             $answer_feedback = $data[ 'answer_feedback_boolean' ];
 
-		}elseif( isset( $data[ 'answer_feedback_multiple_choice' ] ) && !empty( $data[ 'answer_feedback_multiple_choice' ] ) ){
+		} elseif( isset( $data[ 'answer_feedback_multiple_choice' ] ) && !empty( $data[ 'answer_feedback_multiple_choice' ] ) ){
 
             $answer_feedback = $data[ 'answer_feedback_multiple_choice' ];
 
-        }elseif( isset( $data[ 'answer_feedback' ] )  ){
+        } elseif( isset( $data[ 'answer_feedback' ] )  ){
 
             $answer_feedback = $data[ 'answer_feedback' ];
 
@@ -2275,8 +2281,7 @@ 
 		// Handle the extended question text
 		if ( isset( $data[ 'question_description' ] ) && ( '' != $data[ 'question_description' ] ) ) {
 			$post_content = $data[ 'question_description' ];
-		}
-		else {
+		} else {
 			$post_content = '';
 		}
 		// Question Query Arguments
@@ -2484,8 +2489,7 @@ 
 				'key' => '_lesson_course',
 				'value' => $course_id,
 			);
-		}
-		else {
+		} else {
 			// Simple check for connection to a Course
 			$post_args['meta_query'][] = array(
 				'key' => '_lesson_course',
@@ -2613,9 +2617,13 @@ 
 				// Fetch each question in the order in which they were asked
 				$questions = array();
 				foreach( $selected_questions as $question_id ) {
-					if( ! $question_id ) continue;
+					if( ! $question_id ) {
+						continue;
+					}
 					$question = get_post( $question_id );
-					if( ! isset( $question ) || ! isset( $question->ID ) ) continue;
+					if( ! isset( $question ) || ! isset( $question->ID ) ) {
+						continue;
+					}
 					$questions[] = $question;
 				}
 
@@ -2628,7 +2636,9 @@ 
 
 				// Set array of questions that already exist so we can prevent duplicates from appearing
 				foreach( $questions_array as $question ) {
-					if( 'question' != $question->post_type ) continue;
+					if( 'question' != $question->post_type ) {
+						continue;
+					}
 					$existing_questions[] = $question->ID;
 				}
 
@@ -2668,7 +2678,9 @@ 
 
 						// Add selected questions to existing questions array to prevent duplicates from being added
 						foreach( $questions_array as $cat_question ) {
-							if( in_array( $cat_question->ID, $existing_questions ) ) continue;
+							if( in_array( $cat_question->ID, $existing_questions ) ) {
+								continue;
+							}
 							$existing_questions[] = $cat_question->ID;
 						}
 					}

Spacing +1082 added lines, -1082 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -2898,7 +2898,7 @@
      * @access public
      *
      * @param int $lesson_id
-     * @return int|bool $course_id or bool when nothing is found.
+     * @return integer $course_id or bool when nothing is found.
      */
      public function get_course_id( $lesson_id ){
 

Indentation +1027 added lines, -1027 removed lines

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

includes/class-sensei-analysis-user-profile-list-table.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 
 		if( 'complete' == $item->comment_approved ) {
 
-            $status =  __( 'Completed', 'woothemes-sensei' );
+			$status =  __( 'Completed', 'woothemes-sensei' );
 			$status_class = 'graded';
 
 			$course_end_date = $item->comment_date;

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

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Analysis User Profile Data Table in Sensei.
@@ -18,17 +18,17 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $user_id = 0 ) {
-		$this->user_id = intval( $user_id );
+	public function __construct($user_id = 0) {
+		$this->user_id = intval($user_id);
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_user_profile' );
+		parent::__construct('analysis_user_profile');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -38,14 +38,14 @@ 
 	 */
 	function get_columns() {
 		$columns = array(
-			'title' => __( 'Course', 'woothemes-sensei' ),
-			'started' => __( 'Date Started', 'woothemes-sensei' ),
-			'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-			'status' => __( 'Status', 'woothemes-sensei' ),
+			'title' => __('Course', 'woothemes-sensei'),
+			'started' => __('Date Started', 'woothemes-sensei'),
+			'completed' => __('Date Completed', 'woothemes-sensei'),
+			'status' => __('Status', 'woothemes-sensei'),
 //			'grade' => __( 'Grade', 'woothemes-sensei' ),
-			'percent' => __( 'Percent Complete', 'woothemes-sensei' ),
+			'percent' => __('Percent Complete', 'woothemes-sensei'),
 		);
-		$columns = apply_filters( 'sensei_analysis_user_profile_columns', $columns );
+		$columns = apply_filters('sensei_analysis_user_profile_columns', $columns);
 		return $columns;
 	}
 
@@ -56,14 +56,14 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array(
-			'title' => array( 'title', false ),
-			'started' => array( 'started', false ),
-			'completed' => array( 'completed', false ),
-			'status' => array( 'status', false ),
+			'title' => array('title', false),
+			'started' => array('started', false),
+			'completed' => array('completed', false),
+			'status' => array('status', false),
 //			'grade' => array( 'grade', false ),
-			'percent' => array( 'percent', false )
+			'percent' => array('percent', false)
 		);
-		$columns = apply_filters( 'sensei_analysis_user_profile_columns_sortable', $columns );
+		$columns = apply_filters('sensei_analysis_user_profile_columns_sortable', $columns);
 		return $columns;
 	}
 
@@ -77,32 +77,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(
@@ -111,19 +111,19 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
-		$this->items = $this->get_course_statuses( $args );
+		$this->items = $this->get_course_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
-		) );
+		));
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -139,22 +139,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;
 
@@ -162,23 +162,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_course_statuses( $args );
+		$this->items = $this->get_course_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;
@@ -189,43 +189,43 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		$course_title =  get_the_title( $item->comment_post_ID );
-		$course_percent = get_comment_meta( $item->comment_ID, 'percent', true );
-		$course_start_date = get_comment_meta( $item->comment_ID, 'start', true );
+		$course_title = get_the_title($item->comment_post_ID);
+		$course_percent = get_comment_meta($item->comment_ID, 'percent', true);
+		$course_start_date = get_comment_meta($item->comment_ID, 'start', true);
 		$course_end_date = '';
 
-		if( 'complete' == $item->comment_approved ) {
+		if ('complete' == $item->comment_approved) {
 
-            $status =  __( 'Completed', 'woothemes-sensei' );
+            $status = __('Completed', 'woothemes-sensei');
 			$status_class = 'graded';
 
 			$course_end_date = $item->comment_date;
 
 		} else {
 
-			$status =  __( 'In Progress', 'woothemes-sensei' );
+			$status = __('In Progress', 'woothemes-sensei');
 			$status_class = 'in-progress';
 
 		}
 
 		// Output users data
-		if ( !$this->csv_output ) {
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID ), admin_url( 'admin.php' ) );
+		if ( ! $this->csv_output) {
+			$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID), admin_url('admin.php'));
 
-			$course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $course_title . '</a></strong>';
-			$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-			if ( is_numeric($course_percent) ) {
+			$course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.$course_title.'</a></strong>';
+			$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+			if (is_numeric($course_percent)) {
 				$course_percent .= '%';
 			}
 		} // End If Statement
-		$column_data = apply_filters( 'sensei_analysis_user_profile_column_data', array( 'title' => $course_title,
+		$column_data = apply_filters('sensei_analysis_user_profile_column_data', array('title' => $course_title,
 										'started' => $course_start_date,
 										'completed' => $course_end_date,
 										'status' => $status,
 										'percent' => $course_percent,
-									), $item );
+									), $item);
 
 		return $column_data;
 	}
@@ -235,7 +235,7 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_course_statuses( $args ) {
+	private function get_course_statuses($args) {
 
 		$activity_args = array( 
 				'user_id' => $this->user_id,
@@ -247,23 +247,23 @@ 
 				'status' => 'any',
 			);
 
-		$activity_args = apply_filters( 'sensei_analysis_user_profile_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_analysis_user_profile_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'] ) {
+		if ($this->total_items < $activity_args['offset']) {
 
-			$new_paged = floor( $this->total_items / $activity_args['number'] );
+			$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;
@@ -276,7 +276,7 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		echo  __( 'No courses found.', 'woothemes-sensei' );
+		echo  __('No courses found.', 'woothemes-sensei');
 	} // End no_items()
 
 	/**
@@ -285,7 +285,7 @@ 
 	 * @return void
 	 */
 	public function data_table_header() {
-		echo '<strong>' . __( 'Courses', 'woothemes-sensei' ) . '</strong>';
+		echo '<strong>'.__('Courses', 'woothemes-sensei').'</strong>';
 	}
 
 	/**
@@ -294,10 +294,10 @@ 
 	 * @return void
 	 */
 	public function data_table_footer() {
-		$user = get_user_by( 'id', $this->user_id );
-		$report = sanitize_title( $user->display_name ) . '-course-overview';
-		$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_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>';
+		$user = get_user_by('id', $this->user_id);
+		$report = sanitize_title($user->display_name).'-course-overview';
+		$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_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>';
 	}
 
 	/**
@@ -305,8 +305,8 @@ 
 	 * @since  1.7.0
 	 * @return string
 	 */
-	public function search_button( $text = '' ) {
-		return __( 'Search Courses', 'woothemes-sensei' );
+	public function search_button($text = '') {
+		return __('Search Courses', 'woothemes-sensei');
 	}
 
 } // End Class