woothemes / sensei

includes/admin/class-sensei-learner-management.php

Indentation +30 added lines, -30 removed lines

@@ -79,16 +79,16 @@ 
 
 		// Load Learners JS
 		wp_enqueue_script( 'sensei-learners-general',
-            Sensei()->plugin_url . 'assets/js/learners-general' . $suffix . '.js',
-                            array('jquery','select2','sensei-chosen-ajax' ), Sensei()->version, true );
+			Sensei()->plugin_url . 'assets/js/learners-general' . $suffix . '.js',
+							array('jquery','select2','sensei-chosen-ajax' ), Sensei()->version, true );
 
 		$data = array(
 			'remove_generic_confirm' => __( 'Are you sure you want to remove this user?', 'woothemes-sensei' ),
 			'remove_from_lesson_confirm' => __( 'Are you sure you want to remove the user from this lesson?', 'woothemes-sensei' ),
 			'remove_from_course_confirm' => __( 'Are you sure you want to remove the user from this course?', 'woothemes-sensei' ),
 			'remove_user_from_post_nonce' => wp_create_nonce( 'remove_user_from_post_nonce' ),
-            'search_users_nonce' => wp_create_nonce( 'search-users' ),
-            'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
+			'search_users_nonce' => wp_create_nonce( 'search-users' ),
+			'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
 		);
 
 		wp_localize_script( 'sensei-learners-general', 'woo_learners_general_data', $data );
@@ -280,7 +280,7 @@ 
 
 				case 'course':
 
-                    $removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
+					$removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
 
 				break;
 
@@ -327,19 +327,19 @@ 
 
 		if ( $users ) {
 			foreach ( $users as $user ) {
-                $full_name = Sensei_Student::get_full_name( $user->ID );
+				$full_name = Sensei_Student::get_full_name( $user->ID );
 
-                if( trim($user->display_name ) == trim( $full_name ) ){
+				if( trim($user->display_name ) == trim( $full_name ) ){
 
-                    $name = $full_name;
+					$name = $full_name;
 
-                }else{
+				}else{
 
-                    $name = $full_name . ' ['. $user->display_name .']';
+					$name = $full_name . ' ['. $user->display_name .']';
 
-                }
+				}
 
-                $found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
+				$found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
 			}
 		}
 
@@ -383,7 +383,7 @@ 
 			break;
 
 			case 'lesson':
-                $lesson_id = absint( $_POST['add_lesson_id'] );
+				$lesson_id = absint( $_POST['add_lesson_id'] );
 				$complete = false;
 				if( isset( $_POST['add_complete_lesson'] ) && 'yes' == $_POST['add_complete_lesson'] ) {
 					$complete = true;
@@ -443,23 +443,23 @@ 
 		}
 	}
 
-    /**
-     * Return the full name and surname or the display name of the user.
-     *
-     * The user must have both name and surname otherwise display name will be returned.
-     *
-     * @deprecated since 1.9.0 use Se
-     * @since 1.8.0
-     *
-     * @param int $user_id | bool false for an invalid $user_id
-     *
-     * @return string $full_name
-     */
-    public function get_learner_full_name( $user_id ){
-
-        return Sensei_Student::get_full_name( $user_id );
-
-    } // end get_learner_full_name
+	/**
+	 * Return the full name and surname or the display name of the user.
+	 *
+	 * The user must have both name and surname otherwise display name will be returned.
+	 *
+	 * @deprecated since 1.9.0 use Se
+	 * @since 1.8.0
+	 *
+	 * @param int $user_id | bool false for an invalid $user_id
+	 *
+	 * @return string $full_name
+	 */
+	public function get_learner_full_name( $user_id ){
+
+		return Sensei_Student::get_full_name( $user_id );
+
+	} // end get_learner_full_name
 
 } // End Class
 

Spacing +132 added lines, -132 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 Class
@@ -23,30 +23,30 @@ 
 	 * @since  1.6.0
 	 * @return  void
 	 */
-	public function __construct ( $file ) {
-		$this->name = __( 'Learner Management', 'woothemes-sensei' );;
+	public function __construct($file) {
+		$this->name = __('Learner Management', 'woothemes-sensei'); ;
 		$this->file = $file;
 		$this->page_slug = 'sensei_learners';
 
 		// Admin functions
-		if ( is_admin() ) {
-			add_action( 'admin_menu', array( $this, 'learners_admin_menu' ), 30);
-			add_action( 'learners_wrapper_container', array( $this, 'wrapper_container'  ) );
-			if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-				add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-				add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (is_admin()) {
+			add_action('admin_menu', array($this, 'learners_admin_menu'), 30);
+			add_action('learners_wrapper_container', array($this, 'wrapper_container'));
+			if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+				add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+				add_action('admin_print_styles', array($this, 'enqueue_styles'));
 			}
 
-			add_action( 'admin_init', array( $this, 'add_new_learners' ) );
+			add_action('admin_init', array($this, 'add_new_learners'));
 
-			add_action( 'admin_notices', array( $this, 'add_learner_notices' ) );
+			add_action('admin_notices', array($this, 'add_learner_notices'));
 		} // End If Statement
 
 		// Ajax functions
-		if ( is_admin() ) {
-			add_action( 'wp_ajax_get_redirect_url_learners', array( $this, 'get_redirect_url' ) );
-			add_action( 'wp_ajax_remove_user_from_post', array( $this, 'remove_user_from_post' ) );
-			add_action( 'wp_ajax_sensei_json_search_users', array( $this, 'json_search_users' ) );
+		if (is_admin()) {
+			add_action('wp_ajax_get_redirect_url_learners', array($this, 'get_redirect_url'));
+			add_action('wp_ajax_remove_user_from_post', array($this, 'remove_user_from_post'));
+			add_action('wp_ajax_sensei_json_search_users', array($this, 'json_search_users'));
 		}
 	} // End __construct()
 
@@ -59,8 +59,8 @@ 
 	public function learners_admin_menu() {
 		global $menu;
 
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
-			$learners_page = add_submenu_page( 'sensei', $this->name, $this->name, 'manage_sensei_grades', $this->page_slug, array( $this, 'learners_page' ) );
+		if (current_user_can('manage_sensei_grades')) {
+			$learners_page = add_submenu_page('sensei', $this->name, $this->name, 'manage_sensei_grades', $this->page_slug, array($this, 'learners_page'));
 		}
 
 	} // End learners_admin_menu()
@@ -73,25 +73,25 @@ 
 	 * @since 1.6.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// Load Learners JS
-		wp_enqueue_script( 'sensei-learners-general',
-            Sensei()->plugin_url . 'assets/js/learners-general' . $suffix . '.js',
-                            array('jquery','select2','sensei-chosen-ajax' ), Sensei()->version, true );
+		wp_enqueue_script('sensei-learners-general',
+            Sensei()->plugin_url.'assets/js/learners-general'.$suffix.'.js',
+                            array('jquery', 'select2', 'sensei-chosen-ajax'), Sensei()->version, true);
 
 		$data = array(
-			'remove_generic_confirm' => __( 'Are you sure you want to remove this user?', 'woothemes-sensei' ),
-			'remove_from_lesson_confirm' => __( 'Are you sure you want to remove the user from this lesson?', 'woothemes-sensei' ),
-			'remove_from_course_confirm' => __( 'Are you sure you want to remove the user from this course?', 'woothemes-sensei' ),
-			'remove_user_from_post_nonce' => wp_create_nonce( 'remove_user_from_post_nonce' ),
-            'search_users_nonce' => wp_create_nonce( 'search-users' ),
-            'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
+			'remove_generic_confirm' => __('Are you sure you want to remove this user?', 'woothemes-sensei'),
+			'remove_from_lesson_confirm' => __('Are you sure you want to remove the user from this lesson?', 'woothemes-sensei'),
+			'remove_from_course_confirm' => __('Are you sure you want to remove the user from this course?', 'woothemes-sensei'),
+			'remove_user_from_post_nonce' => wp_create_nonce('remove_user_from_post_nonce'),
+            'search_users_nonce' => wp_create_nonce('search-users'),
+            'selectplaceholder'=> __('Select Learner', 'woothemes-sensei')
 		);
 
-		wp_localize_script( 'sensei-learners-general', 'woo_learners_general_data', $data );
+		wp_localize_script('sensei-learners-general', 'woo_learners_general_data', $data);
 
 	} // End enqueue_scripts()
 
@@ -103,9 +103,9 @@ 
 	 * @since 1.6.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( 'woothemes-sensei-admin' );
+		wp_enqueue_style('woothemes-sensei-admin');
 
 	} // End enqueue_styles()
 
@@ -117,11 +117,11 @@ 
 	public function load_data_table_files() {
 
 		// Load Learners Classes
-		$classes_to_load = array(	'list-table',
+		$classes_to_load = array('list-table',
 									'learners-main',
 									);
-		foreach ( $classes_to_load as $class_file ) {
-			Sensei()->load_class( $class_file );
+		foreach ($classes_to_load as $class_file) {
+			Sensei()->load_class($class_file);
 		} // End For Loop
 	} // End load_data_table_files()
 
@@ -133,15 +133,15 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_data_object( $name = '', $data = 0, $optional_data = null ) {
+	public function load_data_object($name = '', $data = 0, $optional_data = null) {
 		// Load Analysis data
-		$object_name = 'WooThemes_Sensei_Learners_' . $name;
-		if ( is_null($optional_data) ) {
-			$sensei_learners_object = new $object_name( $data );
+		$object_name = 'WooThemes_Sensei_Learners_'.$name;
+		if (is_null($optional_data)) {
+			$sensei_learners_object = new $object_name($data);
 		} else {
-			$sensei_learners_object = new $object_name( $data, $optional_data );
+			$sensei_learners_object = new $object_name($data, $optional_data);
 		} // End If Statement
-		if ( 'Main' == $name ) {
+		if ('Main' == $name) {
 			$sensei_learners_object->prepare_items();
 		} // End If Statement
 		return $sensei_learners_object;
@@ -158,16 +158,16 @@ 
 		// Load Learners data
 		$course_id = 0;
 		$lesson_id = 0;
-		if( isset( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
 		}
-		if( isset( $_GET['lesson_id'] ) ) {
-			$lesson_id = intval( $_GET['lesson_id'] );
+		if (isset($_GET['lesson_id'])) {
+			$lesson_id = intval($_GET['lesson_id']);
 		}
-		$sensei_learners_main = $this->load_data_object( 'Main', $course_id, $lesson_id );
+		$sensei_learners_main = $this->load_data_object('Main', $course_id, $lesson_id);
 		// Wrappers
-		do_action( 'learners_before_container' );
-		do_action( 'learners_wrapper_container', 'top' );
+		do_action('learners_before_container');
+		do_action('learners_wrapper_container', 'top');
 		$this->learners_headers();
 		?>
 		<div id="poststuff" class="sensei-learners-wrap">
@@ -175,12 +175,12 @@ 
 				<?php $sensei_learners_main->display(); ?>
 			</div>
 			<div class="sensei-learners-extra">
-				<?php do_action( 'sensei_learners_extra' ); ?>
+				<?php do_action('sensei_learners_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'learners_wrapper_container', 'bottom' );
-		do_action( 'learners_after_container' );
+		do_action('learners_wrapper_container', 'bottom');
+		do_action('learners_after_container');
 	} // End learners_default_view()
 
 	/**
@@ -188,15 +188,15 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function learners_headers( $args = array( 'nav' => 'default' ) ) {
+	public function learners_headers($args = array('nav' => 'default')) {
 
 
-		$function = 'learners_' . $args['nav'] . '_nav';
+		$function = 'learners_'.$args['nav'].'_nav';
 		$this->$function();
 		?>
-			<p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
+			<p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
 		<?php
-		do_action( 'sensei_learners_after_headers' );
+		do_action('sensei_learners_after_headers');
 	} // End learners_headers()
 
 	/**
@@ -205,10 +205,10 @@ 
 	 * @param $which string
 	 * @return void
 	 */
-	public function wrapper_container( $which ) {
-		if ( 'top' == $which ) {
+	public function wrapper_container($which) {
+		if ('top' == $which) {
 			?><div id="woothemes-sensei" class="wrap woothemes-sensei"><?php
-		} elseif ( 'bottom' == $which ) {
+		} elseif ('bottom' == $which) {
 			?></div><!--/#woothemes-sensei--><?php
 		} // End If Statement
 	} // End wrapper_container()
@@ -219,18 +219,18 @@ 
 	 * @return void
 	 */
 	public function learners_default_nav() {
-		$title = sprintf( '<a href="%s">%s</a>', esc_url( add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id, 'view' => 'learners' ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id, 'view' => 'learners'), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 		}
-		if ( isset( $_GET['lesson_id'] ) ) { 
-			$lesson_id = intval( $_GET['lesson_id'] );
-			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;' . get_the_title( intval( $lesson_id ) ) . '</span>'; 
+		if (isset($_GET['lesson_id'])) { 
+			$lesson_id = intval($_GET['lesson_id']);
+			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;'.get_the_title(intval($lesson_id)).'</span>'; 
 		}
 		?>
-			<h2><?php echo apply_filters( 'sensei_learners_nav_title', $title ); ?></h2>
+			<h2><?php echo apply_filters('sensei_learners_nav_title', $title); ?></h2>
 		<?php
 	} // End learners_default_nav()
 
@@ -239,13 +239,13 @@ 
 		// Parse POST data
 		$data = $_POST['data'];
 		$course_data = array();
-		parse_str( $data, $course_data );
+		parse_str($data, $course_data);
 
-		$course_cat = intval( $course_data['course_cat'] );
+		$course_cat = intval($course_data['course_cat']);
 
-		$redirect_url = apply_filters( 'sensei_ajax_redirect_url', add_query_arg( array( 'page' => $this->page_slug, 'course_cat' => $course_cat ), admin_url( 'admin.php' ) ) );
+		$redirect_url = apply_filters('sensei_ajax_redirect_url', add_query_arg(array('page' => $this->page_slug, 'course_cat' => $course_cat), admin_url('admin.php')));
 
-		echo esc_url_raw( $redirect_url );
+		echo esc_url_raw($redirect_url);
 		die();
 	}
 
@@ -256,157 +256,157 @@ 
 
 		// Security check
 		$nonce = '';
-		if ( isset($_POST['remove_user_from_post_nonce']) ) {
-			$nonce = esc_html( $_POST['remove_user_from_post_nonce'] );
+		if (isset($_POST['remove_user_from_post_nonce'])) {
+			$nonce = esc_html($_POST['remove_user_from_post_nonce']);
 		}
-		if ( ! wp_verify_nonce( $nonce, 'remove_user_from_post_nonce' ) ) {
-			die( $return );
+		if ( ! wp_verify_nonce($nonce, 'remove_user_from_post_nonce')) {
+			die($return);
 		}
 
 		// Parse POST data
 		$data = $_POST['data'];
 		$action_data = array();
-		parse_str( $data, $action_data );
+		parse_str($data, $action_data);
 
-		if( $action_data['user_id'] && $action_data['post_id'] && $action_data['post_type'] ) {
+		if ($action_data['user_id'] && $action_data['post_id'] && $action_data['post_type']) {
 
-			$user_id = intval( $action_data['user_id'] );
-			$post_id = intval( $action_data['post_id'] );
-			$post_type = sanitize_text_field( $action_data['post_type'] );
+			$user_id = intval($action_data['user_id']);
+			$post_id = intval($action_data['post_id']);
+			$post_type = sanitize_text_field($action_data['post_type']);
 
-			$user = get_userdata( $user_id );
+			$user = get_userdata($user_id);
 
-			switch( $post_type ) {
+			switch ($post_type) {
 
 				case 'course':
 
-                    $removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
+                    $removed = Sensei_Utils::sensei_remove_user_from_course($post_id, $user_id);
 
 				break;
 
 				case 'lesson':
 
-					$removed = Sensei_Utils::sensei_remove_user_from_lesson( $post_id, $user_id );
+					$removed = Sensei_Utils::sensei_remove_user_from_lesson($post_id, $user_id);
 
 				break;
 
 			}
 
-			if( $removed ) {
+			if ($removed) {
 				$return = 'removed';
 			}
 
 		}
 
-		die( $return );
+		die($return);
 	}
 
 	public function json_search_users() {
 
 
-		check_ajax_referer( 'search-users', 'security' );
+		check_ajax_referer('search-users', 'security');
 
-		$term = sanitize_text_field( stripslashes( $_GET['term'] ) );
+		$term = sanitize_text_field(stripslashes($_GET['term']));
 
-		if ( empty( $term ) ) {
+		if (empty($term)) {
 			die();
 		}
 
-		$default = isset( $_GET['default'] ) ? $_GET['default'] : __( 'None', 'woocommerce' );
+		$default = isset($_GET['default']) ? $_GET['default'] : __('None', 'woocommerce');
 
-		$found_users = array( '' => $default );
+		$found_users = array('' => $default);
 
-		$users_query = new WP_User_Query( apply_filters( 'sensei_json_search_users_query', array(
+		$users_query = new WP_User_Query(apply_filters('sensei_json_search_users_query', array(
 			'fields'         => 'all',
 			'orderby'        => 'display_name',
-			'search'         => '*' . $term . '*',
-			'search_columns' => array( 'ID', 'user_login', 'user_email', 'user_nicename','user_firstname','user_lastname' )
-		), $term ) );
+			'search'         => '*'.$term.'*',
+			'search_columns' => array('ID', 'user_login', 'user_email', 'user_nicename', 'user_firstname', 'user_lastname')
+		), $term));
 
 		$users = $users_query->get_results();
 
-		if ( $users ) {
-			foreach ( $users as $user ) {
-                $full_name = Sensei_Student::get_full_name( $user->ID );
+		if ($users) {
+			foreach ($users as $user) {
+                $full_name = Sensei_Student::get_full_name($user->ID);
 
-                if( trim($user->display_name ) == trim( $full_name ) ){
+                if (trim($user->display_name) == trim($full_name)) {
 
                     $name = $full_name;
 
-                }else{
+                } else {
 
-                    $name = $full_name . ' ['. $user->display_name .']';
+                    $name = $full_name.' ['.$user->display_name.']';
 
                 }
 
-                $found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' &ndash; ' . sanitize_email( $user->user_email ) . ')';
+                $found_users[$user->ID] = $name.' (#'.$user->ID.' &ndash; '.sanitize_email($user->user_email).')';
 			}
 		}
 
-		wp_send_json( $found_users );
+		wp_send_json($found_users);
 	}
 
 	public function add_new_learners() {
 
 		$result = false;
 
-		if( ! isset( $_POST['add_learner_submit'] ) ) return $result;
+		if ( ! isset($_POST['add_learner_submit'])) return $result;
 
-		if ( ! isset( $_POST['add_learner_nonce'] ) || ! wp_verify_nonce( $_POST['add_learner_nonce'], 'add_learner_to_sensei' ) ) return $result;
+		if ( ! isset($_POST['add_learner_nonce']) || ! wp_verify_nonce($_POST['add_learner_nonce'], 'add_learner_to_sensei')) return $result;
 
-		if( ( ! isset( $_POST['add_user_id'] ) || '' ==  $_POST['add_user_id'] ) || ! isset( $_POST['add_post_type'] ) || ! isset( $_POST['add_course_id'] ) || ! isset( $_POST['add_lesson_id'] ) ) return $result;
+		if (( ! isset($_POST['add_user_id']) || '' == $_POST['add_user_id']) || ! isset($_POST['add_post_type']) || ! isset($_POST['add_course_id']) || ! isset($_POST['add_lesson_id'])) return $result;
 
 		$post_type = $_POST['add_post_type'];
-		$user_id = absint( $_POST['add_user_id'] );
-		$course_id = absint( $_POST['add_course_id'] );
+		$user_id = absint($_POST['add_user_id']);
+		$course_id = absint($_POST['add_course_id']);
 
-		switch( $post_type ) {
+		switch ($post_type) {
 			case 'course':
 
-				$result = Sensei_Utils::user_start_course( $user_id, $course_id );
+				$result = Sensei_Utils::user_start_course($user_id, $course_id);
 
 				// Complete each lesson if course is set to be completed
-				if( isset( $_POST['add_complete_course'] ) && 'yes' == $_POST['add_complete_course'] ) {
+				if (isset($_POST['add_complete_course']) && 'yes' == $_POST['add_complete_course']) {
 
-					$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
+					$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
 
-					foreach( $lesson_ids as $id ) {
-						Sensei_Utils::sensei_start_lesson( $id, $user_id, true );
+					foreach ($lesson_ids as $id) {
+						Sensei_Utils::sensei_start_lesson($id, $user_id, true);
 					}
 
 					// 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);
 
-					do_action( 'sensei_user_course_end', $user_id, $course_id );
+					do_action('sensei_user_course_end', $user_id, $course_id);
 				}
 
 			break;
 
 			case 'lesson':
-                $lesson_id = absint( $_POST['add_lesson_id'] );
+                $lesson_id = absint($_POST['add_lesson_id']);
 				$complete = false;
-				if( isset( $_POST['add_complete_lesson'] ) && 'yes' == $_POST['add_complete_lesson'] ) {
+				if (isset($_POST['add_complete_lesson']) && 'yes' == $_POST['add_complete_lesson']) {
 					$complete = true;
 				}
 
-				$result = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id, $complete );
+				$result = Sensei_Utils::sensei_start_lesson($lesson_id, $user_id, $complete);
 
 				// 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);
 
 			break;
 		}
 
 		// Set redirect URL after adding user to course/lesson
-		$query_args = array( 'page' => $this->page_slug, 'view' => 'learners' );
+		$query_args = array('page' => $this->page_slug, 'view' => 'learners');
 
-		if( $result ) {
+		if ($result) {
 
-			if( $course_id ) {
+			if ($course_id) {
 				$query_args['course_id'] = $course_id;
 			}
 
-			if( $lesson_id ) {
+			if ($lesson_id) {
 				$query_args['lesson_id'] = $lesson_id;
 			}
 
@@ -416,23 +416,23 @@ 
 			$query_args['message'] = 'error';
 		}
 
-		$redirect_url = apply_filters( 'sensei_learners_add_learner_redirect_url', add_query_arg( $query_args, admin_url( 'admin.php' ) ) );
+		$redirect_url = apply_filters('sensei_learners_add_learner_redirect_url', add_query_arg($query_args, admin_url('admin.php')));
 
-		wp_safe_redirect( esc_url_raw( $redirect_url ) );
+		wp_safe_redirect(esc_url_raw($redirect_url));
 		exit;
 	}
 
 	public function add_learner_notices() {
-		if( isset( $_GET['page'] ) && $this->page_slug == $_GET['page'] && isset( $_GET['message'] ) && $_GET['message'] ) {
-			if( 'success' == $_GET['message'] ) {
+		if (isset($_GET['page']) && $this->page_slug == $_GET['page'] && isset($_GET['message']) && $_GET['message']) {
+			if ('success' == $_GET['message']) {
 				$msg = array(
 					'updated',
-					__( 'Learner added successfully!', 'woothemes-sensei' ),
+					__('Learner added successfully!', 'woothemes-sensei'),
 				);
 			} else {
 				$msg = array(
 					'error',
-					__( 'Error adding learner.', 'woothemes-sensei' ),
+					__('Error adding learner.', 'woothemes-sensei'),
 				);
 			}
 			?>
@@ -455,9 +455,9 @@ 
      *
      * @return string $full_name
      */
-    public function get_learner_full_name( $user_id ){
+    public function get_learner_full_name($user_id) {
 
-        return Sensei_Student::get_full_name( $user_id );
+        return Sensei_Student::get_full_name($user_id);
 
     } // end get_learner_full_name
 
@@ -468,4 +468,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Learners extends Sensei_Learner_Management{}
+class WooThemes_Sensei_Learners extends Sensei_Learner_Management {}

includes/class-sensei-learners-main.php

Indentation +24 added lines, -24 removed lines

@@ -206,13 +206,13 @@ 
 
 	/**
 	 * Generates content for a single row of the table in the user management
-     * screen.
-     *
+	 * screen.
+	 *
 	 * @since  1.7.0
-     *
+	 *
 	 * @param object $item The current item
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	protected function get_row_data( $item ) {
 		global $wp_version;
@@ -220,8 +220,8 @@ 
 		switch ( $this->view ) {
 			case 'learners' :
 
-                // in this case the item passed in is actually the users activity on course of lesson
-                $user_activity = $item;
+				// in this case the item passed in is actually the users activity on course of lesson
+				$user_activity = $item;
 				$post_id = false;
 
 				if( $this->lesson_id ) {
@@ -240,30 +240,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_Student::get_full_name( $user_activity->user_id );
+				$title = Sensei_Student::get_full_name( $user_activity->user_id );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 
-                /**
-                 * 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),
@@ -293,7 +293,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
@@ -23,28 +23,28 @@ 
 	 * @since  1.6.0
 	 * @return  void
 	 */
-	public function __construct ( $course_id = 0, $lesson_id = 0 ) {
-		$this->course_id = intval( $course_id );
-		$this->lesson_id = intval( $lesson_id );
+	public function __construct($course_id = 0, $lesson_id = 0) {
+		$this->course_id = intval($course_id);
+		$this->lesson_id = intval($lesson_id);
 
-		if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'courses', 'lessons', 'learners' ) ) ) {
+		if (isset($_GET['view']) && in_array($_GET['view'], array('courses', 'lessons', 'learners'))) {
 			$this->view = $_GET['view'];
 		}
 
 		// Viewing a single lesson always sets the view to Learners
-		if( $this->lesson_id ) {
+		if ($this->lesson_id) {
 			$this->view = 'learners';
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'learners_main' );
+		parent::__construct('learners_main');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
-		add_action( 'sensei_learners_extra', array( $this, 'add_learners_box' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
+		add_action('sensei_learners_extra', array($this, 'add_learners_box'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -54,38 +54,38 @@ 
 	 */
 	function get_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'date_started' => __( 'Date Started', 'woothemes-sensei' ),
-					'user_status' => __( 'Status', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'date_started' => __('Date Started', 'woothemes-sensei'),
+					'user_status' => __('Status', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => __( 'Lesson', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Lesson', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'courses':
 			default:
 				$columns = array(
-					'title' => __( 'Course', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Course', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 		}
 		$columns['actions'] = '';
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -96,32 +96,32 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => array( 'title', false ),
+					'title' => array('title', false),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 
 			default:
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 		}
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns_sortable', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns_sortable', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -135,72 +135,72 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'DESC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle category selection
 		$category = false;
-		if ( !empty( $_GET['course_cat'] ) ) {
-			$category = intval( $_GET['course_cat'] );
+		if ( ! empty($_GET['course_cat'])) {
+			$category = intval($_GET['course_cat']);
 		} // End If Statement
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = '';
 				}
-				$this->items = $this->get_learners( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_learners(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			case 'lessons':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_lessons( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_lessons(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			default:
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_courses( compact( 'per_page', 'offset', 'orderby', 'order', 'category', 'search' ) );
+				$this->items = $this->get_courses(compact('per_page', 'offset', 'orderby', 'order', 'category', 'search'));
 
 			break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 
 	} // End prepare_items()
 
@@ -214,42 +214,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_Student::get_full_name( $user_activity->user_id );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $title = Sensei_Student::get_full_name($user_activity->user_id);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
                 /**
                  * sensei_learners_main_column_data filter
@@ -264,50 +264,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
@@ -320,7 +320,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',
@@ -330,7 +330,7 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $args['category'] ) {
+		if ($args['category']) {
 			$course_args['tax_query'][] = array(
 				'taxonomy' => 'course-category',
 				'field' => 'id',
@@ -338,11 +338,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;
@@ -353,7 +353,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',
@@ -363,18 +363,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;
@@ -385,22 +385,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();
 		}
@@ -416,32 +416,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;
@@ -454,22 +454,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()
 
 	/**
@@ -480,40 +480,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;
@@ -532,12 +532,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,
@@ -545,18 +545,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()
@@ -581,50 +581,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>
@@ -636,19 +636,19 @@ 
 	 * @since  1.7.0
 	 * @return void
 	 */
-	public function search_button( $text = '' ) {
+	public function search_button($text = '') {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 
 			case 'lessons':
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 
 			default:
-				$text = __( 'Search Courses', 'woothemes-sensei' );
+				$text = __('Search Courses', 'woothemes-sensei');
 			break;
 		}
 

includes/class-sensei-lesson.php

Spacing +1080 added lines, -1080 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;
 
@@ -2866,17 +2866,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()
 
@@ -2889,20 +2889,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;
 
@@ -2929,10 +2929,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;
         }
 
@@ -2940,41 +2940,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);
 
                     ?>
 
@@ -2987,34 +2987,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>
@@ -3033,17 +3033,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
 
@@ -3057,48 +3057,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);
 
@@ -3109,9 +3109,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);
 
                 }
 
@@ -3135,31 +3135,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
 
@@ -3172,19 +3172,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';
 
@@ -3192,14 +3192,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);
 
         }
 
@@ -3213,56 +3213,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>
 
@@ -3271,33 +3271,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
 
@@ -3320,19 +3320,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);
     }
 
 
@@ -3343,14 +3343,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;
@@ -3365,20 +3365,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);
 
     }
 
@@ -3393,27 +3393,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
 
@@ -3422,20 +3422,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">
@@ -3455,11 +3455,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;
 
@@ -3469,24 +3469,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>
 
@@ -3495,12 +3495,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);
 
                             ?>
 
@@ -3509,23 +3509,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>
 
@@ -3543,14 +3543,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);
 
         }
 
@@ -3562,7 +3562,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');
 
@@ -3578,9 +3578,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()
 
@@ -3590,7 +3590,7 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
         global $post;
 
@@ -3603,7 +3603,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>
@@ -3621,16 +3621,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();
 
@@ -3647,21 +3647,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);
 
         }
         ?>
@@ -3669,19 +3669,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>
 
@@ -3692,11 +3692,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();
 
@@ -3713,20 +3713,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();
 
@@ -3742,26 +3742,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
@@ -3777,4 +3777,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Lesson extends Sensei_Lesson{}
+class WooThemes_Sensei_Lesson extends Sensei_Lesson {}

includes/class-sensei-notices.php

Indentation +24 added lines, -24 removed lines

@@ -16,28 +16,28 @@ 
 class Sensei_Notices{
 
 	/**
-	*  @var $notices
-	*/
+	 *  @var $notices
+	 */
 	protected $notices;
 
 	/**
-	*  constructor 
- 	*/
+	 *  constructor 
+	 */
 	public function __construct(){
 		//initialize the notices variable
 		$this->notices = array();
 	}
 
 	/**
-	*  Add a notice to the array of notices for display at a later stage.
-	* 
-	*
-	* 
-	* @param string $message 
-	* @param string $type defaults to alert options( alert, tick , download , info   )
-	*
-	* @return void
-	*/
+	 *  Add a notice to the array of notices for display at a later stage.
+	 * 
+	 *
+	 * 
+	 * @param string $message 
+	 * @param string $type defaults to alert options( alert, tick , download , info   )
+	 *
+	 * @return void
+	 */
 
 	public function add_notice( $content ,  $type = 'alert'   ){
 		// append the new notice
@@ -45,13 +45,13 @@ 
 	} // end add_notice()
 
 	/**
-	*  Output all notices added 
-	* 
-	* @param string $message 
-	* @param string $type
-	*
-	* @return void
-	*/
+	 *  Output all notices added 
+	 * 
+	 * @param string $message 
+	 * @param string $type
+	 *
+	 * @return void
+	 */
 
 	public function print_notices(){
 		if(  count( $this->notices ) > 0  ){
@@ -68,10 +68,10 @@ 
 	} // end print_notice()
 
 	/**
-	*  Clear all notices  
-	* 
-	* @return void
-	*/
+	 *  Clear all notices  
+	 * 
+	 * @return void
+	 */
 
 	public function clear_notices(){
 		// assign an empty array to clear all existing notices

includes/sensei-functions.php

Indentation +56 added lines, -56 removed lines

@@ -45,16 +45,16 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
-
-    /**
-     * Filter sensei_all_access function result
-     * which determinse if the current user
-     * can access all of Sensei without restrictions
-     *
-     * @since 1.4.0
-     * @param bool $access
-     */
+	$access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+
+	/**
+	 * Filter sensei_all_access function result
+	 * which determinse if the current user
+	 * can access all of Sensei without restrictions
+	 *
+	 * @since 1.4.0
+	 * @param bool $access
+	 */
 	return apply_filters( 'sensei_all_access', $access );
 
 } // End sensei_all_access()
@@ -72,7 +72,7 @@ 
 	 */
 	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
 
-	    $hex = str_replace( '#', '', $color );
+		$hex = str_replace( '#', '', $color );
 
 		$c_r = hexdec( substr( $hex, 0, 2 ) );
 		$c_g = hexdec( substr( $hex, 2, 2 ) );
@@ -119,15 +119,15 @@ 
 		$color = '#';
 
 		foreach ($base as $k => $v) :
-	        $amount = $v / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v - $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+			$amount = $v / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v - $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 		endforeach;
 
 		return $color;
@@ -148,17 +148,17 @@ 
 		$base = sensei_rgb_from_hex( $color );
 		$color = '#';
 
-	    foreach ($base as $k => $v) :
-	        $amount = 255 - $v;
-	        $amount = $amount / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v + $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+		foreach ($base as $k => $v) :
+			$amount = 255 - $v;
+			$amount = $amount / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v + $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 	   	endforeach;
 
 	   	return $color;
@@ -172,14 +172,14 @@ 
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
 if ( ! function_exists( 'is_woocommerce_active' ) ) {
-    function is_woocommerce_active() {
-        // calling is present instead of is active here
-        // as this function can override other is_woocommerce_active
-        // function in other woo plugins and Sensei_WC::is_woocommerce_active
-        // also check the sensei settings for enable WooCommerce support, which
-        // other plugins should not check against.
-        return Sensei_WC::is_woocommerce_present();
-    }
+	function is_woocommerce_active() {
+		// calling is present instead of is active here
+		// as this function can override other is_woocommerce_active
+		// function in other woo plugins and Sensei_WC::is_woocommerce_active
+		// also check the sensei settings for enable WooCommerce support, which
+		// other plugins should not check against.
+		return Sensei_WC::is_woocommerce_present();
+	}
 }
 
 /**
@@ -195,20 +195,20 @@ 
  */
 function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
 
-    if( has_action( $hook_tag ) ){
+	if( has_action( $hook_tag ) ){
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+		$error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
 
-        if( !empty( $alternative ) ){
+		if( !empty( $alternative ) ){
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+			$error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
 
-        }
+		}
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+		trigger_error( $error_message );
+		do_action( $hook_tag , $args );
 
-    }
+	}
 
 }// end sensei_do_deprecated_action
 
@@ -238,18 +238,18 @@ 
  */
 function sensei_user_login_url(){
 
-    $my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
-    $page = get_post( $my_courses_page_id );
+	$my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
+	$page = get_post( $my_courses_page_id );
 
-    if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
+	if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
 
-        return get_permalink( $page->ID );
+		return get_permalink( $page->ID );
 
-    } else {
+	} else {
 
-        return wp_login_url();
+		return wp_login_url();
 
-    }
+	}
 
 }// end sensei_user_login_link
 
@@ -262,8 +262,8 @@ 
  */
 function sensei_is_login_required(){
 
-    $login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
+	$login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
 
-    return $login_required;
+	return $login_required;
 
 }
\ No newline at end of file

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Global Sensei functions
@@ -11,21 +11,21 @@ 
 
 	$is_sensei = false;
 
-	$post_types = array( 'lesson', 'course', 'quiz', 'question' );
-	$taxonomies = array( 'course-category', 'quiz-type', 'question-type', 'lesson-tag' );
+	$post_types = array('lesson', 'course', 'quiz', 'question');
+	$taxonomies = array('course-category', 'quiz-type', 'question-type', 'lesson-tag');
 
-	if( is_post_type_archive( $post_types ) || is_singular( $post_types ) || is_tax( $taxonomies ) ) {
+	if (is_post_type_archive($post_types) || is_singular($post_types) || is_tax($taxonomies)) {
 
 		$is_sensei = true;
 
 	}
 
-	if( is_object( $post ) && ! is_wp_error( $post ) ) {
+	if (is_object($post) && ! is_wp_error($post)) {
 
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
+		$my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
-		if( in_array( $post->ID, array( $course_page_id, $my_courses_page_id ) ) ) {
+		if (in_array($post->ID, array($course_page_id, $my_courses_page_id))) {
 
 			$is_sensei = true;
 
@@ -33,7 +33,7 @@ 
 
 	}
 
-	return apply_filters( 'is_sensei', $is_sensei, $post );
+	return apply_filters('is_sensei', $is_sensei, $post);
 }
 
 /**
@@ -45,7 +45,7 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+    $access = current_user_can('manage_sensei') || current_user_can('manage_sensei_grades');
 
     /**
      * Filter sensei_all_access function result
@@ -55,11 +55,11 @@ 
      * @since 1.4.0
      * @param bool $access
      */
-	return apply_filters( 'sensei_all_access', $access );
+	return apply_filters('sensei_all_access', $access);
 
 } // End sensei_all_access()
 
-if ( ! function_exists( 'sensei_light_or_dark' ) ) {
+if ( ! function_exists('sensei_light_or_dark')) {
 
 	/**
 	 * Detect if we should use a light or dark colour on a background colour
@@ -70,20 +70,20 @@ 
 	 * @param string $light (default: '#FFFFFF')
 	 * @return string
 	 */
-	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
+	function sensei_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
 
-	    $hex = str_replace( '#', '', $color );
+	    $hex = str_replace('#', '', $color);
 
-		$c_r = hexdec( substr( $hex, 0, 2 ) );
-		$c_g = hexdec( substr( $hex, 2, 2 ) );
-		$c_b = hexdec( substr( $hex, 4, 2 ) );
-		$brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+		$c_r = hexdec(substr($hex, 0, 2));
+		$c_g = hexdec(substr($hex, 2, 2));
+		$c_b = hexdec(substr($hex, 4, 2));
+		$brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
 		return $brightness > 155 ? $dark : $light;
 	}
 }
 
-if ( ! function_exists( 'sensei_rgb_from_hex' ) ) {
+if ( ! function_exists('sensei_rgb_from_hex')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -92,19 +92,19 @@ 
 	 * @param mixed $color
 	 * @return string
 	 */
-	function sensei_rgb_from_hex( $color ) {
-		$color = str_replace( '#', '', $color );
+	function sensei_rgb_from_hex($color) {
+		$color = str_replace('#', '', $color);
 		// Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-		$color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+		$color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
-		$rgb['R'] = hexdec( $color{0}.$color{1} );
-		$rgb['G'] = hexdec( $color{2}.$color{3} );
-		$rgb['B'] = hexdec( $color{4}.$color{5} );
+		$rgb['R'] = hexdec($color{0}.$color{1} );
+		$rgb['G'] = hexdec($color{2}.$color{3} );
+		$rgb['B'] = hexdec($color{4}.$color{5} );
 		return $rgb;
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_darker' ) ) {
+if ( ! function_exists('sensei_hex_darker')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -114,8 +114,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_darker( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_darker($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 		foreach ($base as $k => $v) :
@@ -124,7 +124,7 @@ 
 	        $new_decimal = $v - $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -134,7 +134,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_lighter' ) ) {
+if ( ! function_exists('sensei_hex_lighter')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -144,8 +144,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_lighter( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_lighter($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 	    foreach ($base as $k => $v) :
@@ -155,7 +155,7 @@ 
 	        $new_decimal = $v + $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -171,7 +171,7 @@ 
  * @since 1.9.0
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
-if ( ! function_exists( 'is_woocommerce_active' ) ) {
+if ( ! function_exists('is_woocommerce_active')) {
     function is_woocommerce_active() {
         // calling is present instead of is active here
         // as this function can override other is_woocommerce_active
@@ -193,20 +193,20 @@ 
  * @param $alternative
  * @param array $args
  */
-function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
+function sensei_do_deprecated_action($hook_tag, $version, $alternative = "", $args = array()) {
 
-    if( has_action( $hook_tag ) ){
+    if (has_action($hook_tag)) {
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+        $error_message = sprintf(__("SENSEI: The hook '%s', has been deprecated since '%s'.", 'woothemes-sensei'), $hook_tag, $version);
 
-        if( !empty( $alternative ) ){
+        if ( ! empty($alternative)) {
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+            $error_message .= sprintf(__("Please use '%s' instead.", 'woothemes-sensei'), $alternative);
 
         }
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+        trigger_error($error_message);
+        do_action($hook_tag, $args);
 
     }
 
@@ -221,9 +221,9 @@ 
  * @param $post_id
  * @return bool
  */
-function sensei_is_a_course( $post ){
+function sensei_is_a_course($post) {
 
-	return "course" == get_post_type( $post );
+	return "course" == get_post_type($post);
 
 }
 
@@ -236,14 +236,14 @@ 
  *
  * @since 1.9.0
  */
-function sensei_user_login_url(){
+function sensei_user_login_url() {
 
-    $my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
-    $page = get_post( $my_courses_page_id );
+    $my_courses_page_id = intval(Sensei()->settings->get('my_course_page'));
+    $page = get_post($my_courses_page_id);
 
-    if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
+    if ($my_courses_page_id && isset($page->ID) && 'page' == get_post_type($page->ID)) {
 
-        return get_permalink( $page->ID );
+        return get_permalink($page->ID);
 
     } else {
 
@@ -260,9 +260,9 @@ 
  * @since 1.9.0
  * @return bool
  */
-function sensei_is_login_required(){
+function sensei_is_login_required() {
 
-    $login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
+    $login_required = isset(Sensei()->settings->settings['access_permission']) && (true == Sensei()->settings->settings['access_permission']);
 
     return $login_required;
 

includes/shortcodes/class-sensei-shortcode-loader.php

Indentation +161 added lines, -161 removed lines

@@ -15,172 +15,172 @@
  */
 class Sensei_Shortcode_Loader{
 
-    /**
-     * @var array {
-     *  type string $shortcode
-     *  type Sensei_Shortcode
-     * } all the shortcodes and which class to instantiate when they are called from
-     * WordPress's do_shortcode() function.
-     *
-     */
-    protected $shortcode_classes;
-
-    /**
-     * Run all the functions that needs to be hooked into WordPress
-     *
-     * @since 1.9.0
-     */
-    public function __construct(){
-
-        // create a list of shortcodes and the class that handles them
-        $this->setup_shortcode_class_map();
-
-        // setup all the shortcodes and load the listener into WP
-        $this->initialize_shortcodes();
-
-        // add sensei body class for shortcodes
-        add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
-
-        // array( $this, 'add_body_class')
-
-    }
-
-    /**
-     * Array of shortcode classes that should be instantiated when WordPress loads
-     * a Sensei specific shortcode.
-     * This list contains:
-     * $shortcode => $class_name
-     *
-     * $shortcode is the actual shortcode the user will add to the editor
-     * $class_name is the name of the class that will be instantiated to handle
-     * the rendering of the shortcode.
-     *
-     * NOTE: When adding a new shortcode here be sure to load your shortcodes class
-     * in class-sensei-autoloader class_file_map function
-     */
-    public function setup_shortcode_class_map(){
-
-        $this->shortcode_classes = array(
-            'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
-            'sensei_user_courses'        => 'Sensei_Shortcode_User_Courses',
-            'sensei_courses'             => 'Sensei_Shortcode_Courses',
-            'sensei_teachers'            => 'Sensei_Shortcode_Teachers',
-            'sensei_user_messages'       => 'Sensei_Shortcode_User_Messages',
-            'sensei_course_page'         => 'Sensei_Shortcode_Course_Page',
-            'sensei_lesson_page'         => 'Sensei_Shortcode_Lesson_Page',
-            'sensei_course_categories'   => 'Sensei_Shortcode_Course_Categories',
-            'sensei_unpurchased_courses' => 'Sensei_Shortcode_Unpurchased_Courses',
-        );
-
-        // legacy shortcode handling:
-        Sensei_Legacy_Shortcodes::init();
-
-    }
-
-    /**
-     * Add all shortcodes here
-     *
-     * This function adds shortcodes to WP that links to other functionality.
-     * @since 1.9.0
-     */
-    public function initialize_shortcodes(){
-
-        // shortcodes should only respond to front end calls
-        if( is_admin() || defined( 'DOING_AJAX' ) ){
-            return;
-        }
-
-        /**
-         * Tell WP to run this classes load_shortcode function for all the
-         * shortcodes registered here in.
-         *
-         * With this method we only load shortcode classes when we need them.
-         */
-        foreach( $this->shortcode_classes as $shortcode => $class ){
-
-            // all Sensei shortcodes are rendered by this loader class
-            // it acts as an interface between wp and the shortcodes registered
-            // above
-            add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
-
-        }
-
-    }
-
-    /**
-     * Respond to WordPress do_shortcode calls
-     * for shortcodes registered in the initialize_shortcodes function.
-     *
-     * @since 1.9.0
-     *
-     * @param $attributes
-     * @param $content
-     * @param $code the shortcode that is being requested
-     *
-     * @return string
-     */
-    public function render_shortcode( $attributes='', $content='', $code ){
-
-        // only respond if the shortcode that we've added shortcode
-        // classes for.
-        if( ! isset( $this->shortcode_classes[ $code ] ) ){
-            return '';
-        }
-
-        // create an instances of the current requested shortcode
-        $shortcode_handling_class = $this->shortcode_classes[ $code ];
-        $shortcode = new $shortcode_handling_class( $attributes, $content, $code );
-
-        // we expect the sensei class instantiated to implement the Sensei_Shortcode interface
-        if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
-
-            $message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
-            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
-
-        }
-
-        return $shortcode->render();
-
-    }
-
-    /**
-     * Add the Sensei body class if
-     * the current page has a Sensei shortcode.
-     *
-     * Note: legacy shortcodes not supported here.
-     *
-     * @since 1.9.0
-     *
-     * @param array $classes
-     * @return array
-     */
-    public function possibly_add_body_class ( $classes ) {
-
-        global $post;
-
-        $has_sensei_shortcode = false;
-
-        if ( is_a( $post, 'WP_Post' ) ) {
-
-            // check all registered Sensei shortcodes (not legacy shortcodes)
-            foreach ( $this->shortcode_classes as $shortcode => $class ){
-
-                if ( has_shortcode( $post->post_content, $shortcode ) ) {
+	/**
+	 * @var array {
+	 *  type string $shortcode
+	 *  type Sensei_Shortcode
+	 * } all the shortcodes and which class to instantiate when they are called from
+	 * WordPress's do_shortcode() function.
+	 *
+	 */
+	protected $shortcode_classes;
+
+	/**
+	 * Run all the functions that needs to be hooked into WordPress
+	 *
+	 * @since 1.9.0
+	 */
+	public function __construct(){
+
+		// create a list of shortcodes and the class that handles them
+		$this->setup_shortcode_class_map();
+
+		// setup all the shortcodes and load the listener into WP
+		$this->initialize_shortcodes();
+
+		// add sensei body class for shortcodes
+		add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
+
+		// array( $this, 'add_body_class')
+
+	}
+
+	/**
+	 * Array of shortcode classes that should be instantiated when WordPress loads
+	 * a Sensei specific shortcode.
+	 * This list contains:
+	 * $shortcode => $class_name
+	 *
+	 * $shortcode is the actual shortcode the user will add to the editor
+	 * $class_name is the name of the class that will be instantiated to handle
+	 * the rendering of the shortcode.
+	 *
+	 * NOTE: When adding a new shortcode here be sure to load your shortcodes class
+	 * in class-sensei-autoloader class_file_map function
+	 */
+	public function setup_shortcode_class_map(){
+
+		$this->shortcode_classes = array(
+			'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
+			'sensei_user_courses'        => 'Sensei_Shortcode_User_Courses',
+			'sensei_courses'             => 'Sensei_Shortcode_Courses',
+			'sensei_teachers'            => 'Sensei_Shortcode_Teachers',
+			'sensei_user_messages'       => 'Sensei_Shortcode_User_Messages',
+			'sensei_course_page'         => 'Sensei_Shortcode_Course_Page',
+			'sensei_lesson_page'         => 'Sensei_Shortcode_Lesson_Page',
+			'sensei_course_categories'   => 'Sensei_Shortcode_Course_Categories',
+			'sensei_unpurchased_courses' => 'Sensei_Shortcode_Unpurchased_Courses',
+		);
+
+		// legacy shortcode handling:
+		Sensei_Legacy_Shortcodes::init();
+
+	}
+
+	/**
+	 * Add all shortcodes here
+	 *
+	 * This function adds shortcodes to WP that links to other functionality.
+	 * @since 1.9.0
+	 */
+	public function initialize_shortcodes(){
+
+		// shortcodes should only respond to front end calls
+		if( is_admin() || defined( 'DOING_AJAX' ) ){
+			return;
+		}
+
+		/**
+		 * Tell WP to run this classes load_shortcode function for all the
+		 * shortcodes registered here in.
+		 *
+		 * With this method we only load shortcode classes when we need them.
+		 */
+		foreach( $this->shortcode_classes as $shortcode => $class ){
+
+			// all Sensei shortcodes are rendered by this loader class
+			// it acts as an interface between wp and the shortcodes registered
+			// above
+			add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
+
+		}
+
+	}
+
+	/**
+	 * Respond to WordPress do_shortcode calls
+	 * for shortcodes registered in the initialize_shortcodes function.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $attributes
+	 * @param $content
+	 * @param $code the shortcode that is being requested
+	 *
+	 * @return string
+	 */
+	public function render_shortcode( $attributes='', $content='', $code ){
+
+		// only respond if the shortcode that we've added shortcode
+		// classes for.
+		if( ! isset( $this->shortcode_classes[ $code ] ) ){
+			return '';
+		}
+
+		// create an instances of the current requested shortcode
+		$shortcode_handling_class = $this->shortcode_classes[ $code ];
+		$shortcode = new $shortcode_handling_class( $attributes, $content, $code );
+
+		// we expect the sensei class instantiated to implement the Sensei_Shortcode interface
+		if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
+
+			$message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
+			_doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
+
+		}
+
+		return $shortcode->render();
+
+	}
+
+	/**
+	 * Add the Sensei body class if
+	 * the current page has a Sensei shortcode.
+	 *
+	 * Note: legacy shortcodes not supported here.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public function possibly_add_body_class ( $classes ) {
+
+		global $post;
+
+		$has_sensei_shortcode = false;
+
+		if ( is_a( $post, 'WP_Post' ) ) {
+
+			// check all registered Sensei shortcodes (not legacy shortcodes)
+			foreach ( $this->shortcode_classes as $shortcode => $class ){
+
+				if ( has_shortcode( $post->post_content, $shortcode ) ) {
 
-                    $has_sensei_shortcode = true;
-                }
+					$has_sensei_shortcode = true;
+				}
 
-            }
-        }
+			}
+		}
 
-        if( $has_sensei_shortcode ) {
-            $classes[] = 'sensei' ;
-        }
+		if( $has_sensei_shortcode ) {
+			$classes[] = 'sensei' ;
+		}
 
 
-        return $classes;
-
-    }
+		return $classes;
+
+	}
 
 } // end class Sensei_Shortcodes
 new Sensei_Shortcode_Loader();

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check
+if ( ! defined('ABSPATH')) exit; // security check
 /**
  * Sensei Shortcode Loader Class
  *
@@ -13,7 +13,7 @@ 
  * @category Shortcodes
  * @since 1.9.0
  */
-class Sensei_Shortcode_Loader{
+class Sensei_Shortcode_Loader {
 
     /**
      * @var array {
@@ -30,7 +30,7 @@ 
      *
      * @since 1.9.0
      */
-    public function __construct(){
+    public function __construct() {
 
         // create a list of shortcodes and the class that handles them
         $this->setup_shortcode_class_map();
@@ -39,7 +39,7 @@ 
         $this->initialize_shortcodes();
 
         // add sensei body class for shortcodes
-        add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
+        add_filter('body_class', array($this, 'possibly_add_body_class'));
 
         // array( $this, 'add_body_class')
 
@@ -58,7 +58,7 @@ 
      * NOTE: When adding a new shortcode here be sure to load your shortcodes class
      * in class-sensei-autoloader class_file_map function
      */
-    public function setup_shortcode_class_map(){
+    public function setup_shortcode_class_map() {
 
         $this->shortcode_classes = array(
             'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
@@ -83,10 +83,10 @@ 
      * This function adds shortcodes to WP that links to other functionality.
      * @since 1.9.0
      */
-    public function initialize_shortcodes(){
+    public function initialize_shortcodes() {
 
         // shortcodes should only respond to front end calls
-        if( is_admin() || defined( 'DOING_AJAX' ) ){
+        if (is_admin() || defined('DOING_AJAX')) {
             return;
         }
 
@@ -96,12 +96,12 @@ 
          *
          * With this method we only load shortcode classes when we need them.
          */
-        foreach( $this->shortcode_classes as $shortcode => $class ){
+        foreach ($this->shortcode_classes as $shortcode => $class) {
 
             // all Sensei shortcodes are rendered by this loader class
             // it acts as an interface between wp and the shortcodes registered
             // above
-            add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
+            add_shortcode($shortcode, array($this, 'render_shortcode'));
 
         }
 
@@ -119,23 +119,23 @@ 
      *
      * @return string
      */
-    public function render_shortcode( $attributes='', $content='', $code ){
+    public function render_shortcode($attributes = '', $content = '', $code) {
 
         // only respond if the shortcode that we've added shortcode
         // classes for.
-        if( ! isset( $this->shortcode_classes[ $code ] ) ){
+        if ( ! isset($this->shortcode_classes[$code])) {
             return '';
         }
 
         // create an instances of the current requested shortcode
-        $shortcode_handling_class = $this->shortcode_classes[ $code ];
-        $shortcode = new $shortcode_handling_class( $attributes, $content, $code );
+        $shortcode_handling_class = $this->shortcode_classes[$code];
+        $shortcode = new $shortcode_handling_class($attributes, $content, $code);
 
         // we expect the sensei class instantiated to implement the Sensei_Shortcode interface
-        if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
+        if ( ! in_array('Sensei_Shortcode_Interface', class_implements($shortcode))) {
 
             $message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
-            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
+            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode', $message, '1.9.0');
 
         }
 
@@ -154,18 +154,18 @@ 
      * @param array $classes
      * @return array
      */
-    public function possibly_add_body_class ( $classes ) {
+    public function possibly_add_body_class($classes) {
 
         global $post;
 
         $has_sensei_shortcode = false;
 
-        if ( is_a( $post, 'WP_Post' ) ) {
+        if (is_a($post, 'WP_Post')) {
 
             // check all registered Sensei shortcodes (not legacy shortcodes)
-            foreach ( $this->shortcode_classes as $shortcode => $class ){
+            foreach ($this->shortcode_classes as $shortcode => $class) {
 
-                if ( has_shortcode( $post->post_content, $shortcode ) ) {
+                if (has_shortcode($post->post_content, $shortcode)) {
 
                     $has_sensei_shortcode = true;
                 }
@@ -173,8 +173,8 @@ 
             }
         }
 
-        if( $has_sensei_shortcode ) {
-            $classes[] = 'sensei' ;
+        if ($has_sensei_shortcode) {
+            $classes[] = 'sensei';
         }
 
 

includes/shortcodes/class-sensei-shortcode-unpurchased-courses.php

Indentation +115 added lines, -115 removed lines

@@ -14,148 +14,148 @@
  */
 class Sensei_Shortcode_Unpurchased_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
-
-    /**
-     * @var string number of items to show on the current page
-     * Default: all.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
-
-            $this->order =  'ASC';
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: all.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
 
-        // course query parameters to be used for all courses
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            // the number specified by the user will be used later in this function
-            'posts_per_page' => 1000,
-            'orderby'          => $this->orderby,
-            'order'            => $this->order
-        );
+		// course query parameters to be used for all courses
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			// the number specified by the user will be used later in this function
+			'posts_per_page' => 1000,
+			'orderby'          => $this->orderby,
+			'order'            => $this->order
+		);
 
-        // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
+		// get all the courses that has a product attached
+		$all_courses_query = new WP_Query( $query_args );
 
-        $paid_courses_not_taken = array();
-        // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
+		$paid_courses_not_taken = array();
+		// look through all course and find the purchasable ones that user has not purchased
+		foreach( $all_courses_query->posts as $course ){
 
-            // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
-                &&
-                ! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
+			// only keep the courses with a product including only  courses that the user not taking
+			$course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
+			if( is_numeric( $course_product_id )
+				&&
+				! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
+			){
 
-                    $paid_courses_not_taken[] = $course->ID;
+					$paid_courses_not_taken[] = $course->ID;
 
-                }
+				}
 
-        } // end foreach
+		} // end foreach
 
-        // setup the course query again and only use the course the user has not purchased.
-        // this query will be loaded into the global WP_Query in the render function.
-        $query_args[ 'post__in' ] = $paid_courses_not_taken;
-        $query_args[ 'posts_per_page' ] = $this->number;
+		// setup the course query again and only use the course the user has not purchased.
+		// this query will be loaded into the global WP_Query in the render function.
+		$query_args[ 'post__in' ] = $paid_courses_not_taken;
+		$query_args[ 'posts_per_page' ] = $this->number;
 
-        $this->query = new WP_Query( $query_args );
+		$this->query = new WP_Query( $query_args );
 
-    }// end setup _course_query
+	}// end setup _course_query
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in() ) {
 
-            $anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
-            $anchor_after = '</a>';
-            $notice = sprintf(
-                __('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
-                $anchor_before,
-                $anchor_after
-            );
+			$anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
+			$anchor_after = '</a>';
+			$notice = sprintf(
+				__('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
+				$anchor_before,
+				$anchor_after
+			);
 
-            Sensei()->notices->add_notice( $notice, 'info' );
-            Sensei()->notices->print_notices();
+			Sensei()->notices->add_notice( $notice, 'info' );
+			Sensei()->notices->print_notices();
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        ob_start();
-        Sensei()->notices->print_notices();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+		ob_start();
+		Sensei()->notices->print_notices();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_unpurchased_courses] shortcode when a user is logged in. If the user is not logged in
@@ -45,21 +45,21 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'title';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'DESC';
 
         }
 
@@ -73,7 +73,7 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
 
         // course query parameters to be used for all courses
@@ -87,18 +87,18 @@ 
         );
 
         // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
+        $all_courses_query = new WP_Query($query_args);
 
         $paid_courses_not_taken = array();
         // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
+        foreach ($all_courses_query->posts as $course) {
 
             // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
+            $course_product_id = get_post_meta($course->ID, '_course_woocommerce_product', true);
+            if (is_numeric($course_product_id)
                 &&
-                ! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
+                ! Sensei_Utils::user_started_course($course->ID, get_current_user_id())
+            ) {
 
                     $paid_courses_not_taken[] = $course->ID;
 
@@ -108,10 +108,10 @@ 
 
         // setup the course query again and only use the course the user has not purchased.
         // this query will be loaded into the global WP_Query in the render function.
-        $query_args[ 'post__in' ] = $paid_courses_not_taken;
-        $query_args[ 'posts_per_page' ] = $this->number;
+        $query_args['post__in'] = $paid_courses_not_taken;
+        $query_args['posts_per_page'] = $this->number;
 
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
@@ -120,13 +120,13 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
-        if ( ! is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
 
-            $anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
+            $anchor_before = '<a href="'.esc_url(sensei_user_login_url()).'" >';
             $anchor_after = '</a>';
             $notice = sprintf(
                 __('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
@@ -134,7 +134,7 @@ 
                 $anchor_after
             );
 
-            Sensei()->notices->add_notice( $notice, 'info' );
+            Sensei()->notices->add_notice($notice, 'info');
             Sensei()->notices->print_notices();
 
             return '';
@@ -149,7 +149,7 @@ 
         ob_start();
         Sensei()->notices->print_notices();
         Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         //restore old query
         $wp_query = $current_global_query;