woothemes / sensei

includes/emails/class-woothemes-sensei-email-learner-graded-quiz.php

Spacing +19 added lines, -19 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Learner_Graded_Quiz' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Learner_Graded_Quiz')) :
 
 /**
  * Learner Graded Quiz
@@ -29,8 +29,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'learner-graded-quiz';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your quiz has been graded', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your quiz has been graded', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your quiz has been graded', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your quiz has been graded', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -43,48 +43,48 @@ 
      *
 	 * @return void
 	 */
-	function trigger ( $user_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0 ) {
+	function trigger($user_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0) {
 
 		global  $sensei_email_data;
 
 		// Get learner user object
-		$this->user = new WP_User( $user_id );
+		$this->user = new WP_User($user_id);
 
 		// Get passed flag
-		$passed = __( 'failed', 'woothemes-sensei' );
-		if( $grade >= $passmark ) {
-			$passed = __( 'passed', 'woothemes-sensei' );
+		$passed = __('failed', 'woothemes-sensei');
+		if ($grade >= $passmark) {
+			$passed = __('passed', 'woothemes-sensei');
 		}
 
 		// Get grade tye (auto/manual)
-		$grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		$grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
-		if( 'auto' == $grade_type ) {
-			$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] You have completed a quiz', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-			$this->heading = apply_filters( 'sensei_email_heading', __( 'You have completed a quiz', 'woothemes-sensei' ), $this->template );
+		if ('auto' == $grade_type) {
+			$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] You have completed a quiz', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+			$this->heading = apply_filters('sensei_email_heading', __('You have completed a quiz', 'woothemes-sensei'), $this->template);
 		}
 
-		$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
+		$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
 
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'user_id'			=> $user_id,
-			'user_name'         => stripslashes( $this->user->display_name ),
+			'user_name'         => stripslashes($this->user->display_name),
 			'lesson_id'			=> $lesson_id,
 			'quiz_id'			=> $quiz_id,
 			'grade'				=> $grade,
 			'passmark'			=> $passmark,
 			'passed'			=> $passed,
 			'grade_type'		=> $grade_type,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (learner)
-		$this->recipient = stripslashes( $this->user->user_email );
+		$this->recipient = stripslashes($this->user->user_email);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

includes/emails/class-sensei-email-teacher-new-course-assignment.php

Spacing +13 added lines, -13 removed lines

@@ -3,9 +3,9 @@ 
  * This email will be sent to a teacher when a course is assigned to them.
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if (  class_exists('Sensei_Email_Teacher_New_Course_Assignment') ){
+if (class_exists('Sensei_Email_Teacher_New_Course_Assignment')) {
     return;
 }
 
@@ -36,8 +36,8 @@ 
 	function __construct() {
 
         $this->template = 'teacher-new-course-assignment';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] You have been assigned to a course', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Course assigned to you', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] You have been assigned to a course', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Course assigned to you', 'woothemes-sensei'), $this->template);
         return;
 	}
 
@@ -49,30 +49,30 @@ 
      * @param $course_id
 	 * @return void
 	 */
-	function trigger( $teacher_id = 0, $course_id = 0 ) {
+	function trigger($teacher_id = 0, $course_id = 0) {
 		global $sensei_email_data;
 
-		$this->teacher = new WP_User( $teacher_id );
-        $this->recipient = stripslashes( $this->teacher->user_email );
-        $this->subject = __( 'New course assigned to you', 'woothemes-sensei' );
+		$this->teacher = new WP_User($teacher_id);
+        $this->recipient = stripslashes($this->teacher->user_email);
+        $this->subject = __('New course assigned to you', 'woothemes-sensei');
 
         //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+        $course_edit_link = admin_url('post.php?post='.$course_id.'&action=edit');
 
         // Course name
-        $course = get_post( $course_id);
+        $course = get_post($course_id);
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $teacher_id,
 			'course_id'			=> $course_id,
             'course_name'			=> $course->post_title,
             'course_edit_link' => $course_edit_link,
-		), $this->template );
+		), $this->template);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

includes/class-sensei-teacher.php

Spacing +283 added lines, -283 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Teacher class
@@ -40,58 +40,58 @@ 
      * @since 1.8.0
      * @access public
      */
-    public function __construct ( ) {
+    public function __construct( ) {
 
-        add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
-        add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
-        add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
-        add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
-        add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
+        add_action('add_meta_boxes', array($this, 'add_teacher_meta_boxes'), 10, 2);
+        add_action('save_post', array($this, 'save_teacher_meta_box'));
+        add_filter('parse_query', array($this, 'limit_teacher_edit_screen_post_types'));
+        add_filter('pre_get_posts', array($this, 'course_analysis_teacher_access_limit'));
+        add_filter('wp_count_posts', array($this, 'list_table_counts'), 10, 3);
 
-        add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
+        add_action('pre_get_posts', array($this, 'filter_queries'));
 
         //filter the quiz submissions
-        add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
+        add_filter('sensei_check_for_activity', array($this, 'filter_grading_activity_queries'));
 
         //grading totals count only those belonging to the teacher
-        add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
+        add_filter('sensei_count_statuses_args', array($this, 'limit_grading_totals'));
 
         // show the courses owned by a user on his author archive page
-        add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
+        add_filter('pre_get_posts', array($this, 'add_courses_to_author_archive'));
 
         // notify admin when a teacher creates a course
-        add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
+        add_action('transition_post_status', array($this, 'notify_admin_teacher_course_creation'), 10, 3);
 
         // limit the analysis view to only the users taking courses belong to this teacher
-        add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
+        add_filter('sensei_analysis_overview_filter_users', array($this, 'limit_analysis_learners'), 5, 1);
 
         // give teacher access to question post type
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
+        add_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20, 2);
 
         // Teacher column on the courses list on the admin edit screen
-        add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
-        add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
+        add_filter('manage_edit-course_columns', array($this, 'course_column_heading'), 10, 1);
+        add_filter('manage_course_posts_custom_column', array($this, 'course_column_data'), 10, 2);
 
         //admin edit messages query limit teacher
-        add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
+        add_filter('pre_get_posts', array($this, 'limit_edit_messages_query'));
 
         //add filter by teacher on courses list
-        add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
-        add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
+        add_action('restrict_manage_posts', array($this, 'course_teacher_filter_options'));
+        add_filter('request', array($this, 'teacher_filter_query_modify'));
 
         // Handle media library restrictions
-        add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
-        add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
+        add_filter('request', array($this, 'restrict_media_library'), 10, 1);
+        add_filter('ajax_query_attachments_args', array($this, 'restrict_media_library_modal'), 10, 1);
 
         // update lesson owner to course teacher when saved
-        add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+        add_action('save_post', array($this, 'update_lesson_teacher'));
 
         // If a Teacher logs in, redirect to /wp-admin/
-        add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
+        add_filter('wp_login', array($this, 'teacher_login_redirect'), 10, 2);
 
 
-        add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
-        add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
+        add_action('admin_menu', array($this, 'restrict_posts_menu_page'), 10);
+        add_filter('pre_get_comments', array($this, 'restrict_comment_moderation'), 10, 1);
 
 
     } // end __constructor()
@@ -106,15 +106,15 @@ 
      * @access public
      * @return void
      */
-    public function create_role ( ) {
+    public function create_role( ) {
 
         // check if the role exists
-        $this->teacher_role = get_role( 'teacher' );
+        $this->teacher_role = get_role('teacher');
 
         // if the the teacher is not a valid WordPress role create it
-       if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
+       if ( ! is_a($this->teacher_role, 'WP_Role')) {
            // create the role
-           $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
+           $this->teacher_role = add_role('teacher', __('Teacher', 'woothemes-sensei'));
        }
 
        // add the capabilities before returning
@@ -128,10 +128,10 @@ 
      * @since 1.8.0
      * @access protected
      */
-    protected function add_capabilities ( ) {
+    protected function add_capabilities( ) {
 
         // if this is not a valid WP_Role object exit without adding anything
-        if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
+        if ( ! is_a($this->teacher_role, 'WP_Role') || empty($this->teacher_role)) {
             return;
         }
 
@@ -142,7 +142,7 @@ 
          * @param array $capabilities
          * keys: (string) $cap_name => (bool) $grant
          */
-        $caps = apply_filters( 'sensei_teacher_role_capabilities', array(
+        $caps = apply_filters('sensei_teacher_role_capabilities', array(
             // General access rules
             'read' => true,
             'manage_sensei_grades' => true,
@@ -199,7 +199,7 @@ 
 
         ));
 
-        foreach ( $caps as $cap => $grant ) {
+        foreach ($caps as $cap => $grant) {
 
             // load the capability on to the teacher role
             $this->teacher_role->add_cap($cap, $grant);
@@ -219,12 +219,12 @@ 
      * @parameter WP_Post $post
      * @return void
      */
-    public function add_teacher_meta_boxes ( $post ) {
+    public function add_teacher_meta_boxes($post) {
 
-        if( !current_user_can('manage_options') ){
+        if ( ! current_user_can('manage_options')) {
             return;
         }
-        add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
+        add_meta_box('sensei-teacher', __('Teacher', 'woothemes-sensei'), array($this, 'teacher_meta_box_content'),
             'course',
             'side',
             'core'
@@ -241,7 +241,7 @@ 
      * @access public
      * @parameters
      */
-    public function teacher_meta_box_content ( $post ) {
+    public function teacher_meta_box_content($post) {
 
         // get the current author
         $current_author = $post->post_author;
@@ -252,12 +252,12 @@ 
     ?>
         <select name="sensei-course-teacher-author" class="sensei course teacher">
 
-            <?php foreach ( $users as $user_id ) { ?>
+            <?php foreach ($users as $user_id) { ?>
 
                     <?php
                         $user = get_user_by('id', $user_id);
                     ?>
-                    <option <?php selected(  $current_author , $user_id , true ); ?> value="<?php echo $user_id; ?>" >
+                    <option <?php selected($current_author, $user_id, true); ?> value="<?php echo $user_id; ?>" >
                         <?php echo  $user->display_name; ?>
                     </option>
 
@@ -279,7 +279,7 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function get_teachers_and_authors ( ){
+    public function get_teachers_and_authors( ) {
 
         $author_query_args = array(
             'blog_id'      => $GLOBALS['blog_id'],
@@ -287,7 +287,7 @@ 
             'who'          => 'authors'
         );
 
-        $authors = get_users( $author_query_args );
+        $authors = get_users($author_query_args);
 
         $teacher_query_args = array(
             'blog_id'      => $GLOBALS['blog_id'],
@@ -295,9 +295,9 @@ 
             'role'         => 'teacher',
         );
 
-        $teachers = get_users( $teacher_query_args );
+        $teachers = get_users($teacher_query_args);
 
-        return  array_unique( array_merge( $teachers, $authors ) );
+        return  array_unique(array_merge($teachers, $authors));
 
     }// end get_teachers_and_authors
 
@@ -313,43 +313,43 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function save_teacher_meta_box ( $course_id ){
+    public function save_teacher_meta_box($course_id) {
 
         // check if this is a post from saving the teacher, if not exit early
-        if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
+        if ( ! isset($_POST['sensei-course-teacher-author']) || ! isset($_POST['post_ID'])) {
             return;
         }
 
         //don't fire this hook again
-        remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
+        remove_action('save_post', array($this, 'save_teacher_meta_box'));
 
         // get the current post object
-        $post = get_post( $course_id );
+        $post = get_post($course_id);
 
         // get the current teacher/author
-        $current_author = absint( $post->post_author );
-        $new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
+        $current_author = absint($post->post_author);
+        $new_author = absint($_POST['sensei-course-teacher-author']);
 
         // loop through all post lessons to update their authors as well
-        $this->update_course_lessons_author( $course_id , $new_author );
+        $this->update_course_lessons_author($course_id, $new_author);
 
         // do not do any processing if the selected author is the same as the current author
-        if( $current_author == $new_author ){
+        if ($current_author == $new_author) {
             return;
         }
 
         // save the course  author
         $post_updates = array(
-            'ID' => $post->ID ,
+            'ID' => $post->ID,
             'post_author' => $new_author
         );
-        wp_update_post( $post_updates );
+        wp_update_post($post_updates);
 
         // ensure the the modules are update so that then new teacher has access to them
-        Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
+        Sensei_Teacher::update_course_modules_author($course_id, $new_author);
 
         // notify the new teacher
-        $this->teacher_course_assigned_notification( $new_author, $course_id );
+        $this->teacher_course_assigned_notification($new_author, $course_id);
 
     } // end save_teacher_meta_box
 
@@ -363,56 +363,56 @@ 
      * @param $new_teacher_id
      * @return void
      */
-    public static function update_course_modules_author( $course_id ,$new_teacher_id ){
+    public static function update_course_modules_author($course_id, $new_teacher_id) {
 
-        if( empty( $course_id ) || empty( $new_teacher_id ) ){
+        if (empty($course_id) || empty($new_teacher_id)) {
             return;
         }
 
-        $terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
+        $terms_selected_on_course = wp_get_object_terms($course_id, 'module');
 
-        if( empty( $terms_selected_on_course ) ){
+        if (empty($terms_selected_on_course)) {
             return;
         }
 
-        foreach( $terms_selected_on_course as $term ){
+        foreach ($terms_selected_on_course as $term) {
 
-            $term_author = Sensei_Core_Modules::get_term_author( $term->slug );
-            if( $new_teacher_id != $term_author->ID  ){
+            $term_author = Sensei_Core_Modules::get_term_author($term->slug);
+            if ($new_teacher_id != $term_author->ID) {
 
                 $new_term = '';
 
                 //if the new teacher is admin first check to see if the term with this name already exists
-                if( user_can( $new_teacher_id, 'manage_options' ) ){
+                if (user_can($new_teacher_id, 'manage_options')) {
 
-                    $slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
-                    $term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
-                    $existing_admin_terms = get_terms( 'module', $term_args );
-                    if( !empty( $existing_admin_terms ) ){
+                    $slug_without_teacher_id = str_ireplace(' ', '-', trim($term->name));
+                    $term_args = array('slug'=> $slug_without_teacher_id, 'hide_empty' => false,);
+                    $existing_admin_terms = get_terms('module', $term_args);
+                    if ( ! empty($existing_admin_terms)) {
                         // insert it even if it exists
-                        $new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
+                        $new_term = get_term($existing_admin_terms[0]->term_id, 'module', ARRAY_A);
                     }
                 }
 
-                if( empty ( $new_term ) ){
+                if (empty ($new_term)) {
 
                    //setup the new slug
-                   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
+                   $new_author_term_slug = $new_teacher_id.'-'.str_ireplace(' ', '-', trim($term->name));
 
                    // create new term and set it
-                   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
+                   $new_term = wp_insert_term($term->name, 'module', array('slug'=> $new_author_term_slug));
 
                 }
 
 
 
                 // if term exists
-                if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
+                if (is_wp_error($new_term) && isset($new_term->errors['term_exists'])) {
 
-                    $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
+                    $existing_term = get_term_by('slug', $new_author_term_slug, 'module');
                     $term_id = $existing_term->term_id;
 
-                }else{
+                } else {
 
                     // for a new term simply get the term from the returned value
                     $term_id = $new_term['term_id'];
@@ -420,21 +420,21 @@ 
                 } // end if term exist
 
                 // set the terms selected on the course
-                wp_set_object_terms( $course_id, $term_id , 'module', true );
+                wp_set_object_terms($course_id, $term_id, 'module', true);
 
                 // remove old term
-                wp_remove_object_terms( $course_id, $term->term_id, 'module' );
+                wp_remove_object_terms($course_id, $term->term_id, 'module');
 
                 // update the lessons within the current module term
-                $lessons = Sensei()->course->course_lessons( $course_id );
-                foreach( $lessons as $lesson  ){
+                $lessons = Sensei()->course->course_lessons($course_id);
+                foreach ($lessons as $lesson) {
 
-                    if( has_term( $term->slug, 'module', $lesson ) ){
+                    if (has_term($term->slug, 'module', $lesson)) {
 
                         // add the new term, the false at the end says to replace all terms on this module
                         // with the new term.
-                        wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
-                        update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
+                        wp_set_object_terms($lesson->ID, $term_id, 'module', false);
+                        update_post_meta($lesson->ID, '_order_module_'.intval($term_id), 0);
                     }
 
                 }// end for each
@@ -454,50 +454,50 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function update_course_lessons_author ( $course_id, $new_author  ){
+    public function update_course_lessons_author($course_id, $new_author) {
 
 
-        if( empty( $course_id ) || empty( $new_author ) ){
+        if (empty($course_id) || empty($new_author)) {
             return false;
         }
 
         //get a list of course lessons
-        $lessons = Sensei()->course->course_lessons( $course_id );
+        $lessons = Sensei()->course->course_lessons($course_id);
 
-        if( empty( $lessons )  ||  ! is_array( $lessons )  ){
+        if (empty($lessons) || ! is_array($lessons)) {
             return false;
         }
 
         // update each lesson and quiz author
-        foreach( $lessons as $lesson ){
+        foreach ($lessons as $lesson) {
 
             // don't update if the author is tha same as the new author
-            if( $new_author == $lesson->post_author ){
+            if ($new_author == $lesson->post_author) {
                 continue;
             }
 
             // update lesson author
-            wp_update_post( array(
+            wp_update_post(array(
                 'ID'=> $lesson->ID,
                 'post_author' => $new_author
-                ) );
+                ));
 
             // update quiz author
             //get the lessons quiz
-            $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-            if( is_array( $lesson_quizzes ) ){
-                foreach ( $lesson_quizzes as $quiz_id ) {
+            $lesson_quizzes = Sensei()->lesson->lesson_quizzes($lesson->ID);
+            if (is_array($lesson_quizzes)) {
+                foreach ($lesson_quizzes as $quiz_id) {
                     // update quiz with new author
-                    wp_update_post( array(
+                    wp_update_post(array(
                         'ID'           => $quiz_id,
                         'post_author' =>  $new_author
-                    ) );
+                    ));
                 }
-            }else{
-                wp_update_post( array(
+            } else {
+                wp_update_post(array(
                     'ID'           => $lesson_quizzes,
                     'post_author' =>  $new_author
-                ) );
+                ));
             }
 
         } // end for each lessons
@@ -518,30 +518,30 @@ 
      * @parameters $query
      * @return array $users user id array
      */
-    public function course_analysis_teacher_access_limit ( $query ) {
+    public function course_analysis_teacher_access_limit($query) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
             return $query;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return $query;
         }
 
         $screen = get_current_screen();
-        $sensei_post_types = array('course', 'lesson', 'question' );
+        $sensei_post_types = array('course', 'lesson', 'question');
 
         // exit early for the following conditions
-        $limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
+        $limit_screen_ids = array('sensei_page_sensei_analysis', 'course_page_module-order');
 
-        if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
-            || ! in_array( $query->query['post_type'], $sensei_post_types ) ){
+        if ( ! $this->is_admin_teacher() || empty($screen) || ! in_array($screen->id, $limit_screen_ids)
+            || ! in_array($query->query['post_type'], $sensei_post_types)) {
             return $query;
         }
 
         global $current_user;
         // set the query author to the current user to only show those those posts
-        $query->set( 'author', $current_user->ID );
+        $query->set('author', $current_user->ID);
         return $query;
 
     }// end course_analysis_teacher_access_limit
@@ -557,14 +557,14 @@ 
      * @parameters array $wp_query
      * @return bool $is_admin_teacher
      */
-    public function is_admin_teacher ( ){
+    public function is_admin_teacher( ) {
 
-        if( ! is_user_logged_in()){
+        if ( ! is_user_logged_in()) {
             return false;
         }
         $is_admin_teacher = false;
 
-        if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
+        if (is_admin() && Sensei_Teacher::is_a_teacher(get_current_user_id())) {
 
             $is_admin_teacher = true;
 
@@ -584,14 +584,14 @@ 
      * @param  string $perm   User permission level
      * @return object         Modified status counts
      */
-    public function list_table_counts( $counts, $type, $perm ) {
+    public function list_table_counts($counts, $type, $perm) {
         global $current_user;
 
-        if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
+        if ( ! in_array($type, array('course', 'lesson', 'question'))) {
             return $counts;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $counts;
         }
 
@@ -605,10 +605,10 @@ 
         $stati = get_post_stati();
 
         // Update count object
-        foreach( $stati as $status ) {
+        foreach ($stati as $status) {
             $args['post_status'] = $status;
-            $posts = get_posts( $args );
-            $counts->$status = count( $posts );
+            $posts = get_posts($args);
+            $counts->$status = count($posts);
         }
 
         return $counts;
@@ -622,22 +622,22 @@ 
      * @since 1.8.0
      *
      */
-    public function filter_queries ( $query ) {
+    public function filter_queries($query) {
         global $current_user;
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return;
         }
 
         $screen = get_current_screen();
-        if( empty( $screen ) ) {
+        if (empty($screen)) {
             return $query;
         }
-        switch( $screen->id ) {
+        switch ($screen->id) {
             case 'sensei_page_sensei_grading':
             case 'sensei_page_sensei_analysis':
             case 'sensei_page_sensei_learners':
@@ -656,7 +656,7 @@ 
              * @param string $screen_id
              *
              */
-            $query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
+            $query->set('author', apply_filters('sensei_filter_queries_set_author', $current_user->ID, $screen->id));
             break;
         }
     }
@@ -671,31 +671,31 @@ 
      *
      * @return array $comments
      */
-    public function filter_grading_activity_queries( $comments ){
+    public function filter_grading_activity_queries($comments) {
 
-        if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
-            return $comments ;
+        if ( ! is_admin() || ! $this->is_admin_teacher() || is_numeric($comments) || ! is_array($comments)) {
+            return $comments;
         }
 
         //check if we're on the grading screen
         $screen = get_current_screen();
 
-        if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
+        if (empty($screen) || 'sensei_page_sensei_grading' != $screen->id) {
             return $comments;
         }
 
         // get the course and determine if the current teacher is the owner
         // if not remove it from the list of comments to be returned
-        foreach( $comments as $key => $comment){
-            $lesson = get_post( $comment->comment_post_ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson->ID );
-            $course = get_post( $course_id );
-            if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
+        foreach ($comments as $key => $comment) {
+            $lesson = get_post($comment->comment_post_ID);
+            $course_id = Sensei()->lesson->get_course_id($lesson->ID);
+            $course = get_post($course_id);
+            if ( ! isset($course->post_author) || intval($course->post_author) != intval(get_current_user_id())) {
                 //remove this as the teacher should see this.
-                unset( $comments[ $key ] );
+                unset($comments[$key]);
             }
         }
-        return $comments ;
+        return $comments;
 
     }// end function filter grading
 
@@ -711,34 +711,34 @@ 
      *
      * @return array  $args
      */
-    public function limit_grading_totals( $args ){
+    public function limit_grading_totals($args) {
 
-        if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
-            return $args ;
+        if ( ! is_admin() || ! $this->is_admin_teacher() || ! is_array($args)) {
+            return $args;
         }
 
         //get the teachers courses
         // the query is already filtered to only the teacher
-        $courses =  Sensei()->course->get_all_courses();
+        $courses = Sensei()->course->get_all_courses();
 
-        if( empty(  $courses ) || ! is_array( $courses ) ){
+        if (empty($courses) || ! is_array($courses)) {
             return $args;
         }
 
         //setup the lessons quizzes  to limit the grading totals to
         $quiz_scope = array();
-        foreach( $courses as $course ){
+        foreach ($courses as $course) {
 
-            $course_lessons = Sensei()->course->course_lessons( $course->ID );
+            $course_lessons = Sensei()->course->course_lessons($course->ID);
 
-            if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
+            if ( ! empty($course_lessons) && is_array($course_lessons)) {
 
-                foreach(  $course_lessons as $lesson ){
+                foreach ($course_lessons as $lesson) {
 
-                    $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-                    if( !empty( $quiz_id ) ) {
+                    $quiz_id = Sensei()->lesson->lesson_quizzes($lesson->ID);
+                    if ( ! empty($quiz_id)) {
 
-                        array_push( $quiz_scope, $quiz_id );
+                        array_push($quiz_scope, $quiz_id);
 
                     }
 
@@ -761,41 +761,41 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public function add_courses_to_author_archive( $query ) {
+    public function add_courses_to_author_archive($query) {
 
-        if ( is_admin() || ! $query->is_author() ){
+        if (is_admin() || ! $query->is_author()) {
             return $query;
         }
 
         // this should only apply to users with the teacher role
-        $current_page_user = get_user_by('login', $query->get('author_name') );
-        if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
+        $current_page_user = get_user_by('login', $query->get('author_name'));
+        if ( ! $current_page_user || ! in_array('teacher', $current_page_user->roles)) {
 
             return $query;
 
         }
 
         // Change post types depending on what is set already
-        $current_post_types = $query->get( 'post_type' );
-        if( empty( $current_post_types  ) ){
+        $current_post_types = $query->get('post_type');
+        if (empty($current_post_types)) {
 
             // if empty it means post by default, so add post so that it also includes that for now
-            $new_post_types = array( 'post', 'course' );
+            $new_post_types = array('post', 'course');
 
-        } elseif( is_array( $current_post_types  ) ) {
+        } elseif (is_array($current_post_types)) {
 
             // merge the post types instead of overwriting it
-            $new_post_types = array_merge( $current_post_types, array( 'course' ) );
+            $new_post_types = array_merge($current_post_types, array('course'));
 
-        }else{
+        } else {
 
             // in this instance it is probably just one post type in string format
-            $new_post_types =  array( $current_post_types , 'course');
+            $new_post_types = array($current_post_types, 'course');
 
         }
 
         // change the query before returning it
-        $query->set('post_type', $new_post_types );
+        $query->set('post_type', $new_post_types);
 
         /**
          * Change the query on the teacher author archive template
@@ -803,7 +803,7 @@ 
          * @since 1.8.4
          * @param WP_Query $query
          */
-        return apply_filters( 'sensei_teacher_archive_query', $query );
+        return apply_filters('sensei_teacher_archive_query', $query);
 
     }
 
@@ -816,21 +816,21 @@ 
      * @param $course_id
      * @return bool
      */
-    public function teacher_course_assigned_notification( $teacher_id, $course_id ){
+    public function teacher_course_assigned_notification($teacher_id, $course_id) {
 
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
+        if ('course' != get_post_type($course_id) || ! get_userdata($teacher_id)) {
             return false;
         }
 
         // if new user is the same as the current logged user, they don't need an email
-        if( $teacher_id == get_current_user_id() ){
+        if ($teacher_id == get_current_user_id()) {
             return true;
         }
 
         // load the email class
         include('emails/class-sensei-email-teacher-new-course-assignment.php');
         $email = new Sensei_Email_Teacher_New_Course_Assignment();
-        $email->trigger( $teacher_id, $course_id );
+        $email->trigger($teacher_id, $course_id);
 
         return true;
     } // end  teacher_course_assigned_notification
@@ -844,12 +844,12 @@ 
      * @param int $course_id
      * @return bool
      */
-    public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
+    public function notify_admin_teacher_course_creation($new_status, $old_status, $post) {
 
         $course_id = $post->ID;
 
-        if( 'publish'== $old_status || 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
-            || 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
+        if ('publish' == $old_status || 'course' != get_post_type($course_id) || 'auto-draft' == get_post_status($course_id)
+            || 'trash' == get_post_status($course_id) || 'draft' == get_post_status($course_id)) {
 
             return false;
 
@@ -863,19 +863,19 @@ 
          *
          * @param bool $on default true
          */
-        if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
+        if ( ! apply_filters('sensei_notify_admin_new_course_creation', true)) {
             return false;
         }
 
         // setting up the data needed by the email template
         global $sensei_email_data;
         $template = 'admin-teacher-new-course-created';
-        $course = get_post( $course_id );
-        $teacher = new WP_User( $course->post_author );
+        $course = get_post($course_id);
+        $teacher = new WP_User($course->post_author);
         $recipient = get_option('admin_email', true);
 
         // don't send if the course is created by admin
-        if( $recipient == $teacher->user_email || current_user_can( 'manage_options' )){
+        if ($recipient == $teacher->user_email || current_user_can('manage_options')) {
             return false;
         }
 
@@ -885,7 +885,7 @@ 
          * @since 1.8.0
          * @param string $template
          */
-        $heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
+        $heading = apply_filters('sensei_email_heading', __('New course created.', 'woothemes-sensei'), $template);
 
         /**
          * Filter the email subject for the the
@@ -896,11 +896,11 @@ 
          * @param string $template
          */
         $subject = apply_filters('sensei_email_subject',
-                                '['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
-                                $template );
+                                '['.get_bloginfo('name', 'display').'] '.__('New course created by', 'woothemes-sensei').' '.$teacher->display_name,
+                                $template);
 
         //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+        $course_edit_link = admin_url('post.php?post='.$course_id.'&action=edit');
 
         // Construct data array
         $email_data = array(
@@ -919,10 +919,10 @@ 
          * @param array $email_data
          * @param string $template
          */
-        $sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
+        $sensei_email_data = apply_filters('sensei_email_data', $email_data, $template);
 
         // Send mail
-        Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
+        Sensei()->emails->send($recipient, $subject, Sensei()->emails->get_content($template));
 
     }// end notify admin of course creation
 
@@ -933,10 +933,10 @@ 
      * @param array $args WP_User_Query arguments
      * @return array $learners_query_results
      */
-    public function limit_analysis_learners( $args ){
+    public function limit_analysis_learners($args) {
 
         // show default for none teachers
-        if( ! Sensei()->teacher->is_admin_teacher() ) {
+        if ( ! Sensei()->teacher->is_admin_teacher()) {
                 return $args;
         }
 
@@ -945,31 +945,31 @@ 
         $teacher_courses = Sensei()->course->get_all_courses();
 
         // if the user has no courses they should see no users
-        if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
+        if (empty($teacher_courses) || ! is_array($teacher_courses)) {
             // tell the query to return 0 students
-            $args[ 'include'] = array( 0 );
+            $args['include'] = array(0);
             return $args;
 
         }
 
         $learner_ids_for_teacher_courses = array();
-        foreach( $teacher_courses as $course ){
+        foreach ($teacher_courses as $course) {
 
             $course_learner_ids = array();
-            $activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
+            $activity_comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id'), true);
 
-            if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
+            if (empty($activity_comments) || (is_array($activity_comments) && ! (count($activity_comments) > 0))) {
                 continue; // skip to the next course as there are no users on this course
             }
 
             // it could be an array of comments or a single comment
-            if( is_array( $activity_comments ) ){
+            if (is_array($activity_comments)) {
 
-                foreach( $activity_comments as $comment ){
+                foreach ($activity_comments as $comment) {
 
-                    $user = get_userdata( $comment->user_id );
+                    $user = get_userdata($comment->user_id);
 
-                    if( empty( $user ) ){
+                    if (empty($user)) {
                         // next comment in this array
                         continue;
                     }
@@ -977,26 +977,26 @@ 
                     $course_learner_ids[] = $user->ID;
                 }
 
-            }else{
+            } else {
 
-                $user = get_userdata( $activity_comments->user_id );
+                $user = get_userdata($activity_comments->user_id);
                 $course_learner_ids[] = $user->ID;
 
             }
 
             // add learners on this course to the all courses learner list
-            $learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
+            $learner_ids_for_teacher_courses = array_merge($learner_ids_for_teacher_courses, $course_learner_ids);
 
         }
 
         // if there are no students taking the courses by this teacher don't show them any of the other users
-        if( empty( $learner_ids_for_teacher_courses ) ){
+        if (empty($learner_ids_for_teacher_courses)) {
 
-            $args[ 'include'] = array( 0 );
+            $args['include'] = array(0);
 
-        }else{
+        } else {
 
-            $args[ 'include'] = $learner_ids_for_teacher_courses;
+            $args['include'] = $learner_ids_for_teacher_courses;
 
         }
 
@@ -1013,35 +1013,35 @@ 
      * @param $questions
      * @return mixed
      */
-    public function allow_teacher_access_to_questions( $questions, $quiz_id ){
+    public function allow_teacher_access_to_questions($questions, $quiz_id) {
 
-        if( ! $this->is_admin_teacher() ){
+        if ( ! $this->is_admin_teacher()) {
             return $questions;
         }
 
         $screen = get_current_screen();
 
         // don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
-        remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
+        remove_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20);
 
-        if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
+        if ( ! empty($screen) && 'lesson' == $screen->post_type) {
 
             $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+            if ( ! empty($admin_user)) {
 
                 $current_teacher_id = get_current_user_id();
 
                 // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
-                $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
+                wp_set_current_user($admin_user->ID);
+                $questions = Sensei()->lesson->lesson_quiz_questions($quiz_id);
 
                 // set the teacher as the current use again
-                wp_set_current_user( $current_teacher_id );
+                wp_set_current_user($current_teacher_id);
             }
 
         }
         // attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
+        add_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20, 2);
 
         return $questions;
     }
@@ -1053,30 +1053,30 @@ 
      * @param $wp_query
      * @return mixed
      */
-    public function give_access_to_all_questions( $wp_query ){
+    public function give_access_to_all_questions($wp_query) {
 
-        if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
+        if ( ! $this->is_admin_teacher() || ! function_exists('get_current_screen') || 'question' != $wp_query->get('post_type')) {
 
             return $wp_query;
         }
 
         $screen = get_current_screen();
-        if( ( isset($screen->id) && 'lesson' == $screen->id )
-            || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
+        if ((isset($screen->id) && 'lesson' == $screen->id)
+            || (defined('DOING_AJAX') && DOING_AJAX)) {
 
             $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+            if ( ! empty($admin_user)) {
 
                 $current_teacher_id = get_current_user_id();
 
                 // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
+                wp_set_current_user($admin_user->ID);
 
                 //run new query as admin
-                $wp_query = new WP_Query( $wp_query->query );
+                $wp_query = new WP_Query($wp_query->query);
 
                 //set the teache as current use again
-                wp_set_current_user( $current_teacher_id );
+                wp_set_current_user($current_teacher_id);
 
             }
         }
@@ -1093,7 +1093,7 @@ 
      */
     public function course_column_heading($columns) {
 
-        if( $this->is_admin_teacher() ){
+        if ($this->is_admin_teacher()) {
             return $columns;
         }
         $new_columns = array(
@@ -1110,20 +1110,20 @@ 
      * @param $column
      * @param $course_id
      */
-    public function course_column_data( $column, $course_id  ){
+    public function course_column_data($column, $course_id) {
 
-        if( $this->is_admin_teacher() || 'teacher' != $column  ){
+        if ($this->is_admin_teacher() || 'teacher' != $column) {
             return;
         }
 
-        $course = get_post( $course_id );
-        $teacher = get_userdata( $course->post_author );
+        $course = get_post($course_id);
+        $teacher = get_userdata($course->post_author);
 
-        if( !$teacher ){
+        if ( ! $teacher) {
             return;
         }
 
-        echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
+        echo '<a href="'.get_edit_user_link($teacher->ID).'" >'.$teacher->display_name.'</a>';
 
     }// end course_column_ data
 
@@ -1138,31 +1138,31 @@ 
      *
      * @return array $teachers_courses
      */
-    public function get_teacher_courses( $teacher_id, $return_ids_only= false){
+    public function get_teacher_courses($teacher_id, $return_ids_only = false) {
 
         $teachers_courses = array();
 
-        if( empty( $teacher_id  ) ){
+        if (empty($teacher_id)) {
             $teacher_id = get_current_user_id();
         }
 
         $all_courses = Sensei()->course->get_all_courses();
 
-        if( empty( $all_courses ) ){
+        if (empty($all_courses)) {
             return $all_courses;
         }
 
-        foreach( $all_courses as $course ){
+        foreach ($all_courses as $course) {
 
-            if( $course->post_author != $teacher_id  ){
+            if ($course->post_author != $teacher_id) {
                 continue;
             }
 
-            if( $return_ids_only ){
+            if ($return_ids_only) {
 
                 $teachers_courses[] = $course->ID;
 
-            }else{
+            } else {
 
                 $teachers_courses[] = $course;
 
@@ -1182,21 +1182,21 @@ 
      * @param $query
      * @return mixed
      */
-    public function limit_edit_messages_query( $query ){
-        if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
+    public function limit_edit_messages_query($query) {
+        if ( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type')) {
             return $query;
         }
 
         $teacher = wp_get_current_user();
 
-        $query->set( 'meta_key', '_receiver' );
+        $query->set('meta_key', '_receiver');
         $meta_query_args = array(
             'key'     => '_receiver',
-            'value'   => $teacher->get('user_login') ,
+            'value'   => $teacher->get('user_login'),
             'compare' => '='
         );
 
-        $query->set('meta_query', $meta_query_args  );
+        $query->set('meta_query', $meta_query_args);
 
         return $query;
     }
@@ -1212,7 +1212,7 @@ 
     public function course_teacher_filter_options() {
         global $typenow;
 
-        if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
+        if ( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei')) {
             return;
         }
 
@@ -1222,31 +1222,31 @@ 
         // get roles with the course edit capability
         // and then get the users with those roles
         $users_who_can_edit_courses = array();
-        foreach( $roles as $role_item ){
+        foreach ($roles as $role_item) {
 
-            $role = get_role( strtolower( $role_item['name'] ) );
+            $role = get_role(strtolower($role_item['name']));
 
-            if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
+            if (is_a($role, 'WP_Role') && $role->has_cap('edit_courses')) {
 
-                $user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
-                $role_users_who_can_edit_courses = get_users( $user_query_args );
+                $user_query_args = array('role' => $role->name, 'fields' => array('ID', 'display_name'));
+                $role_users_who_can_edit_courses = get_users($user_query_args);
 
                 // add user from the current $user_role to all users
-                $users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
+                $users_who_can_edit_courses = array_merge($users_who_can_edit_courses, $role_users_who_can_edit_courses);
 
             }
 
         }
 
         // Create the select element with the given users who can edit course
-        $selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+        $selected = isset($_GET['course_teacher']) ? $_GET['course_teacher'] : '';
         $course_options = '';
-        foreach( $users_who_can_edit_courses as $user ) {
-            $course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
+        foreach ($users_who_can_edit_courses as $user) {
+            $course_options .= '<option value="'.esc_attr($user->ID).'" '.selected($selected, $user->ID, false).'>'.$user->display_name.'</option>';
         }
 
         $output = '<select name="course_teacher" id="dropdown_course_teachers">';
-        $output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
+        $output .= '<option value="">'.__('Show all teachers', 'woothemes-sensei').'</option>';
         $output .= $course_options;
         $output .= '</select>';
 
@@ -1261,15 +1261,15 @@ 
      * @param $query
      * @return $query
      */
-    public function teacher_filter_query_modify( $query ){
+    public function teacher_filter_query_modify($query) {
         global $typenow;
 
-        if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
+        if ( ! is_admin() && 'course' != $typenow || ! current_user_can('manage_sensei')) {
             return $query;
         }
-        $course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+        $course_teacher = isset($_GET['course_teacher']) ? $_GET['course_teacher'] : '';
 
-        if( empty( $course_teacher ) ) {
+        if (empty($course_teacher)) {
             return $query;
         }
 
@@ -1282,23 +1282,23 @@ 
      * @param  array $request Default request arguments
      * @return array          Modified request arguments
      */
-    public function restrict_media_library( $request = array() ) {
+    public function restrict_media_library($request = array()) {
 
-        if( ! is_admin() ) {
+        if ( ! is_admin()) {
             return $request;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $request;
         }
 
         $screen = get_current_screen();
 
-        if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
-            $teacher = intval( get_current_user_id() );
+        if (in_array($screen->id, array('upload', 'course', 'lesson', 'question'))) {
+            $teacher = intval(get_current_user_id());
 
-            if( $teacher ) {
-                $request['author__in'] = array( $teacher );
+            if ($teacher) {
+                $request['author__in'] = array($teacher);
             }
         }
 
@@ -1310,20 +1310,20 @@ 
      * @param  array $query Default query arguments
      * @return array        Modified query arguments
      */
-    public function restrict_media_library_modal( $query = array() ) {
+    public function restrict_media_library_modal($query = array()) {
 
-        if( ! is_admin() ) {
+        if ( ! is_admin()) {
             return $query;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $query;
         }
 
-        $teacher = intval( get_current_user_id() );
+        $teacher = intval(get_current_user_id());
 
-        if( $teacher ) {
-            $query['author__in'] = array( $teacher );
+        if ($teacher) {
+            $query['author__in'] = array($teacher);
         }
 
         return $query;
@@ -1336,28 +1336,28 @@ 
      *
      * @param int $lesson_id
      */
-    public function update_lesson_teacher( $lesson_id ){
+    public function update_lesson_teacher($lesson_id) {
 
-        if( 'lesson'!= get_post_type() ){
+        if ('lesson' != get_post_type()) {
             return;
         }
 
         // this should only run once per request cycle
-        remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+        remove_action('save_post', array($this, 'update_lesson_teacher'));
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+        $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
-        if(  empty( $course_id ) || ! $course_id ){
+        if (empty($course_id) || ! $course_id) {
             return;
         }
 
-        $course = get_post( $course_id );
+        $course = get_post($course_id);
 
-        $lesson_update_args= array(
-            'ID' => $lesson_id ,
+        $lesson_update_args = array(
+            'ID' => $lesson_id,
             'post_author' => $course->post_author
         );
-        wp_update_post( $lesson_update_args );
+        wp_update_post($lesson_update_args);
 
     } // end update_lesson_teacher
 
@@ -1371,21 +1371,21 @@ 
      * @parameters array $wp_query
      * @return WP_Query $wp_query
      */
-    public function limit_teacher_edit_screen_post_types( $wp_query ) {
+    public function limit_teacher_edit_screen_post_types($wp_query) {
         global $current_user;
 
         //exit early
-        if( ! $this->is_admin_teacher() ){
+        if ( ! $this->is_admin_teacher()) {
             return $wp_query;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return $wp_query;
         }
 
         $screen = get_current_screen();
 
-        if( empty( $screen ) ){
+        if (empty($screen)) {
             return $wp_query;
         }
 
@@ -1398,10 +1398,10 @@ 
             'lesson_page_lesson-order',
         );
 
-        if(  in_array($screen->id  , $limit_screens ) ) {
+        if (in_array($screen->id, $limit_screens)) {
 
             // set the query author to the current user to only show those those posts
-            $wp_query->set( 'author', $current_user->ID );
+            $wp_query->set('author', $current_user->ID);
         }
 
         return $wp_query;
@@ -1421,7 +1421,7 @@ 
      * @return void
      */
 
-    public function teacher_login_redirect( $user_login, $user  ) {
+    public function teacher_login_redirect($user_login, $user) {
 
         if (user_can($user, 'edit_courses')) {
 
@@ -1471,9 +1471,9 @@ 
          * @param bool $restrict default true
          */
 
-        $restrict = apply_filters('sensei_restrict_posts_menu_page', true );
+        $restrict = apply_filters('sensei_restrict_posts_menu_page', true);
 
-        if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
+        if (in_array('teacher', (array) $user->roles) && ! current_user_can('delete_posts') && $restrict) {
 
             remove_menu_page('edit.php');
 
@@ -1503,11 +1503,11 @@ 
      * @return WP_Comment_Query  $clauses
      */
 
-    public function restrict_comment_moderation ( $clauses ) {
+    public function restrict_comment_moderation($clauses) {
 
         global $pagenow;
 
-        if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
+        if (self::is_a_teacher(get_current_user_id()) && $pagenow == "edit-comments.php") {
 
             $clauses->query_vars['post_author'] = get_current_user_id();
 
@@ -1524,15 +1524,15 @@ 
      *
      * @return bool
      */
-    public static function is_a_teacher( $user_id ){
+    public static function is_a_teacher($user_id) {
 
         $user = get_user_by('id', $user_id);
 
-        if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
+        if (isset($user->roles) && in_array('teacher', $user->roles)) {
 
             return true;
 
-        }else{
+        } else {
 
             return false;
 
@@ -1545,14 +1545,14 @@ 
      *
      * @since 1.9.0
      */
-    public static function archive_title(){
+    public static function archive_title() {
 
-        $author = get_user_by( 'id', get_query_var( 'author' ) );
+        $author = get_user_by('id', get_query_var('author'));
         $author_name = $author->display_name;
         ?>
             <h2 class="teacher-archive-title">
 
-                <?php echo sprintf( __( 'All courses by %s', 'woothemes-sensei') , $author_name ); ?>
+                <?php echo sprintf(__('All courses by %s', 'woothemes-sensei'), $author_name); ?>
 
             </h2>
         <?php
@@ -1564,9 +1564,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function remove_course_meta_on_teacher_archive(){
+    public static function remove_course_meta_on_teacher_archive() {
 
-        remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
+        remove_action('sensei_course_content_inside_before', array(Sensei()->course, 'the_course_meta'));
 
     }
 

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

Spacing +137 added lines, -137 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
@@ -22,30 +22,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()
 
@@ -58,8 +58,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()
@@ -72,25 +72,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','sensei-core-select2','sensei-chosen-ajax' ), Sensei()->version, true );
+		wp_enqueue_script('sensei-learners-general',
+            Sensei()->plugin_url.'assets/js/learners-general'.$suffix.'.js',
+                            array('jquery', 'sensei-core-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()
 
@@ -102,9 +102,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()
 
@@ -116,11 +116,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()
 
 	/**
@@ -189,14 +189,14 @@ 
      * @param array $args
 	 * @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()
 
@@ -206,10 +206,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()
@@ -220,18 +220,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()
 
@@ -240,22 +240,22 @@ 
 		// 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();
 	}
 
 	public function remove_user_from_post() {
 
         // Parse POST data
-        $data = sanitize_text_field( $_POST['data'] );
+        $data = sanitize_text_field($_POST['data']);
         $action_data = array();
-        parse_str( $data, $action_data );
+        parse_str($data, $action_data);
 
 		// Security checks
         // ensure the current user may remove users from post
@@ -263,54 +263,54 @@ 
 
         // check the nonce, valid post
 		$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']);
 		}
-        $post =  get_post( intval( $action_data[ 'post_id' ] ) );
+        $post = get_post(intval($action_data['post_id']));
 
         // validate the user
         $may_remove_user = false;
-        if( current_user_can('manage_sensei')
-            ||  $post->post_author == get_current_user_id() ){
+        if (current_user_can('manage_sensei')
+            ||  $post->post_author == get_current_user_id()) {
 
             $may_remove_user = true;
 
         }
 
-        if( ! wp_verify_nonce( $nonce, 'remove_user_from_post_nonce' )
-            || ! is_a( $post ,'WP_Post' )
-            || ! $may_remove_user ){
+        if ( ! wp_verify_nonce($nonce, 'remove_user_from_post_nonce')
+            || ! is_a($post, 'WP_Post')
+            || ! $may_remove_user) {
 
             die('');
 
         }
 
-		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 ) {
-				die( 'removed' );
+			if ($removed) {
+				die('removed');
 			}
 
 		}
@@ -321,109 +321,109 @@ 
 	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_Learner::get_full_name( $user->ID );
+		if ($users) {
+			foreach ($users as $user) {
+                $full_name = Sensei_Learner::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;
 			}
 
@@ -433,23 +433,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'),
 				);
 			}
 			?>
@@ -472,9 +472,9 @@ 
      *
      * @return string $full_name
      */
-    public function get_learner_full_name( $user_id ){
+    public function get_learner_full_name($user_id) {
 
-        return Sensei_Learner::get_full_name( $user_id );
+        return Sensei_Learner::get_full_name($user_id);
 
     } // end get_learner_full_name
 
@@ -485,4 +485,4 @@ 
  * @ignore only 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-lesson.php

Spacing +1091 added lines, -1091 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
@@ -19,83 +19,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
@@ -108,34 +108,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()
 
@@ -146,30 +146,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;
 
@@ -181,31 +181,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;
@@ -217,20 +217,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;
@@ -243,32 +243,32 @@ 
 	 * @param int $post_id
 	 * @return integer $post_id
 	 */
-	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()
@@ -280,37 +280,37 @@ 
 	 * @access public
 	 * @return integer|boolean $post_id or false
 	 */
-	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 false;
 		}
 
 		// 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',
@@ -320,84 +320,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';
@@ -405,8 +405,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'];
 		}
@@ -422,18 +422,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 {
 
@@ -444,15 +444,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()
@@ -463,30 +463,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(
@@ -496,67 +496,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;
@@ -564,32 +564,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
@@ -598,20 +598,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
@@ -619,15 +619,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;
@@ -636,68 +636,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>';
 
@@ -716,47 +716,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
 		}
@@ -765,161 +765,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>';
 					    	}
 
@@ -934,79 +934,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="" />';
@@ -1015,44 +1015,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">';
@@ -1060,17 +1060,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">';
@@ -1078,8 +1078,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;
 						}
 
@@ -1088,36 +1088,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>';
 				}
@@ -1128,7 +1128,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',
@@ -1137,14 +1137,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',
@@ -1162,7 +1162,7 @@ 
 			}
 		}
 
-		if( $question_type ) {
+		if ($question_type) {
 			$args['tax_query'][] = array(
 				'taxonomy' => 'question-type',
 				'field' => 'slug',
@@ -1170,7 +1170,7 @@ 
 			);
 		}
 
-		if( $question_category ) {
+		if ($question_category) {
 			$args['tax_query'][] = array(
 				'taxonomy' => 'question-category',
 				'field' => 'slug',
@@ -1178,19 +1178,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
@@ -1199,39 +1199,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;
@@ -1244,58 +1244,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>';
 			}
 
@@ -1303,53 +1303,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;
 							}
@@ -1357,23 +1357,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 {
 
@@ -1384,115 +1384,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;
 			}
@@ -1501,32 +1501,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;
@@ -1535,19 +1535,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;
@@ -1560,17 +1560,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()
 
@@ -1587,53 +1587,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;
@@ -1643,15 +1643,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,
@@ -1662,17 +1662,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',
@@ -1680,23 +1680,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);
 	}
 
 	/**
@@ -1705,38 +1705,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', 'sensei-core-select2' ,'jquery-ui-sortable' ), Sensei()->version, true );
-			wp_enqueue_script( 'sensei-lesson-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true );
-			wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-lesson-chosen' ), Sensei()->version, true );
+			wp_enqueue_script('sensei-lesson-metadata', Sensei()->plugin_url.'assets/js/lesson-metadata'.$suffix.'.js', array('jquery', 'sensei-core-select2', 'jquery-ui-sortable'), Sensei()->version, true);
+			wp_enqueue_script('sensei-lesson-chosen', Sensei()->plugin_url.'assets/chosen/chosen.jquery'.$suffix.'.js', array('jquery'), Sensei()->version, true);
+			wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery'.$suffix.'.js', array('jquery', 'sensei-lesson-chosen'), Sensei()->version, true);
 
             // Load the bulk edit screen script
-            if( 'edit.php' == $hook && 'lesson'==$_GET['post_type'] ) {
-                wp_enqueue_script( 'sensei-lessons-bulk-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-bulk-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
+            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);
 			}
 
 		}
@@ -1750,16 +1750,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()
@@ -1771,12 +1771,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;
@@ -1790,23 +1790,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:
@@ -1820,14 +1820,14 @@ 
 	 * @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' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_course_nonce')
+            || ! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 		// Parse POST data
@@ -1849,14 +1849,14 @@ 
 	 * @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' )
-            ||  ! current_user_can( 'edit_questions' )) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_question_nonce')
+            ||  ! current_user_can('edit_questions')) {
 
 			die('');
 
@@ -1866,30 +1866,30 @@ 
 		// 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
 
@@ -1904,49 +1904,49 @@ 
 
 		//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' )
-            || ! current_user_can( 'edit_lessons' ) ) {
-			die( $return );
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_multiple_questions_nonce')
+            || ! current_user_can('edit_lessons')) {
+			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));
 				}
 			}
 		}
@@ -1960,25 +1960,25 @@ 
 
 		//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' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_remove_multiple_questions_nonce')
+        || ! current_user_can('edit_lessons')) {
 			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() {
@@ -1989,11 +1989,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;
 			}
 		}
@@ -2007,45 +2007,45 @@ 
 
 		//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' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_add_existing_questions_nonce')
+        || ! current_user_can('edit_lessons')) {
 			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);
 				}
 			}
 		}
@@ -2057,14 +2057,14 @@ 
 
 	public function lesson_update_grade_type() {
 		//Add nonce security to the request
-		if ( isset($_POST['lesson_update_grade_type_nonce']) ) {
+		if (isset($_POST['lesson_update_grade_type_nonce'])) {
 
-			$nonce = esc_html( $_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' )
-        || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_grade_type_nonce')
+        || ! current_user_can('edit_lessons')) {
 
 			die('');
 
@@ -2074,18 +2074,18 @@ 
 		$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' )
-            ||! current_user_can( 'edit_lessons' ) ) {
+        if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_nonce')
+            ||! current_user_can('edit_lessons')) {
 			die('');
 		} // End If Statement
 
@@ -2093,25 +2093,25 @@ 
 		$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' )
-            || ! current_user_can( 'edit_lessons' ) ) {
+		if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_random_nonce')
+            || ! current_user_can('edit_lessons')) {
 
 			die('');
 
@@ -2120,7 +2120,7 @@ 
 		$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();
 	}
 
@@ -2131,7 +2131,7 @@ 
 	 * @param array $data (default: array())
 	 * @return integer|boolean $course_id or false
 	 */
-	private function lesson_save_course( $data = array() ) {
+	private function lesson_save_course($data = array()) {
 		global $current_user;
 		$return = false;
 		// Setup the course data
@@ -2140,58 +2140,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;
@@ -2205,7 +2205,7 @@ 
 	 * @param array $data (default: array())
 	 * @return integer|boolean $question_id or false
 	 */
-	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
@@ -2217,130 +2217,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'];
@@ -2350,86 +2350,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;
@@ -2443,20 +2443,20 @@ 
 	 * @param array $data (default: array())
 	 * @return boolean
 	 */
-	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);
 				}
 			}
 
@@ -2475,9 +2475,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;
@@ -2492,9 +2492,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',
@@ -2502,7 +2502,7 @@ 
 							'suppress_filters'  => 0,
 							'fields'            => 'ids',
 							);
-		if( $course_id ) {
+		if ($course_id) {
 			$post_args['meta_query'][] = array(
 				'key' => '_lesson_course',
 				'value' => $course_id,
@@ -2519,10 +2519,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()
 
 
@@ -2535,11 +2535,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',
@@ -2548,7 +2548,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;
@@ -2571,37 +2571,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(
@@ -2615,7 +2615,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;
@@ -2625,20 +2625,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;
 				}
 
@@ -2650,24 +2650,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',
@@ -2684,14 +2684,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;
 						}
 					}
@@ -2703,29 +2703,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;
 							}
 						}
@@ -2736,12 +2736,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) {
@@ -2764,7 +2764,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()
 
@@ -2772,13 +2772,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',
@@ -2794,11 +2794,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++;
 				}
 			}
@@ -2817,36 +2817,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'];
@@ -2857,23 +2857,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;
 
@@ -2885,9 +2885,9 @@ 
      * @since 1.9.0
      * @param integer $lesson_id
      */
-    public static function the_lesson_image( $lesson_id = 0 ){
+    public static function the_lesson_image($lesson_id = 0) {
 
-        echo Sensei()->lesson->lesson_image( $lesson_id );
+        echo Sensei()->lesson->lesson_image($lesson_id);
 
     }
 
@@ -2898,17 +2898,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()
 
@@ -2921,20 +2921,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;
 
@@ -2961,11 +2961,11 @@ 
      * @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
-            || ! current_user_can( 'edit_lessons' ) ) {
+        if ('lesson' != $post_type || 'lesson-course' != $column_name
+            || ! current_user_can('edit_lessons')) {
             return;
         }
 
@@ -2973,41 +2973,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);
 
                     ?>
 
@@ -3020,34 +3020,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>
@@ -3066,17 +3066,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
 
@@ -3090,48 +3090,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);
 
@@ -3142,9 +3142,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);
 
                 }
 
@@ -3168,31 +3168,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
 
@@ -3205,19 +3205,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';
 
@@ -3225,14 +3225,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);
 
         }
 
@@ -3246,56 +3246,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>
 
@@ -3304,33 +3304,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
 
@@ -3353,19 +3353,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);
     }
 
 
@@ -3376,14 +3376,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;
@@ -3398,20 +3398,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);
 
     }
 
@@ -3426,27 +3426,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
 
@@ -3455,20 +3455,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">
@@ -3488,11 +3488,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;
 
@@ -3502,24 +3502,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>
 
@@ -3528,12 +3528,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);
 
                             ?>
 
@@ -3542,23 +3542,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>
 
@@ -3576,14 +3576,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);
 
         }
 
@@ -3595,7 +3595,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');
 
@@ -3611,9 +3611,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()
 
@@ -3623,7 +3623,7 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
         global $post;
 
@@ -3636,7 +3636,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>
@@ -3654,16 +3654,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();
 
@@ -3680,21 +3680,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);
 
         }
         ?>
@@ -3702,19 +3702,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>
 
@@ -3725,11 +3725,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();
 
@@ -3746,20 +3746,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();
 
@@ -3775,26 +3775,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
@@ -3810,4 +3810,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Lesson extends Sensei_Lesson{}
+class WooThemes_Sensei_Lesson extends Sensei_Lesson {}

includes/class-sensei-modules.php

Spacing +261 added lines, -261 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Sensei Modules Class
@@ -21,33 +21,33 @@ 
     private $order_page_slug;
     public $taxonomy;
 
-    public function __construct( $file )
+    public function __construct($file)
     {
         $this->file = $file;
         $this->dir = dirname($this->file);
-        $this->assets_dir = trailingslashit($this->dir) . 'assets';
+        $this->assets_dir = trailingslashit($this->dir).'assets';
         $this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
         $this->taxonomy = 'module';
         $this->order_page_slug = 'module-order';
 
         // setup taxonomy
-        add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
+        add_action('init', array($this, 'setup_modules_taxonomy'), 10);
 
         // Manage lesson meta boxes for taxonomy
-        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
+        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2);
 
         // Save lesson meta box
         add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
 
         //Reset the none modules lessons transient
-        add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
+        add_action('save_post', array('Sensei_Core_Modules', 'reset_none_modules_transient'));
 
         // Frontend styling
         add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
 
         // Admin styling
         add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
+        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 20, 2);
 
         // Handle module completion record
         add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
@@ -55,20 +55,20 @@ 
         add_action('wp', array($this, 'save_module_progress'), 10);
 
         // Handle module ordering
-        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
+        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30);
         add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
         add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
 
         // Ensure modules always show under courses
-        add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
+        add_action('admin_menu', array($this, 'remove_lessons_menu_model_taxonomy'), 10);
+        add_action('admin_menu', array($this, 'remove_courses_menu_model_taxonomy'), 10);
+        add_action('admin_menu', array($this, 'redirect_to_lesson_module_taxonomy_to_course'), 20);
 
         // Add course field to taxonomy
-        add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
-        add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
-        add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+        add_action($this->taxonomy.'_add_form_fields', array($this, 'add_module_fields'), 50, 1);
+        add_action($this->taxonomy.'_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
+        add_action('edited_'.$this->taxonomy, array($this, 'save_module_course'), 10, 2);
+        add_action('created_'.$this->taxonomy, array($this, 'save_module_course'), 10, 2);
         add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
 
         // Manage module taxonomy archive page
@@ -80,10 +80,10 @@ 
         add_filter('body_class', array($this, 'module_archive_body_class'));
 
         // add modules to the single course template
-        add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
+        add_action('sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template'), 8);
 
         //Single Course modules actions. Add to single-course/course-modules.php
-        add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
+        add_action('sensei_single_course_modules_before', array($this, 'course_modules_title'), 20);
 
         // Set up display on single lesson page
         add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
@@ -95,22 +95,22 @@ 
         add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
 
         // Manage module taxonomy columns
-        add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
-        add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
+        add_filter('manage_edit-'.$this->taxonomy.'_columns', array($this, 'taxonomy_column_headings'), 1, 1);
+        add_filter('manage_'.$this->taxonomy.'_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
         add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
 
         //store new modules created on the course edit screen
-        add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
+        add_action('wp_ajax_sensei_add_new_module_term', array('Sensei_Core_Modules', 'add_new_module_term'));
 
         // for non admin users, only show taxonomies that belong to them
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
-        add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
+        add_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
+        add_filter('get_object_terms', array($this, 'filter_course_selected_terms'), 20, 3);
 
         // add the teacher name next to the module term in for admin users
-        add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
+        add_filter('get_terms', array($this, 'append_teacher_name_to_module'), 70, 3);
 
         // remove the default modules  metabox
-        add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
+        add_action('admin_init', array('Sensei_Core_Modules', 'remove_default_modules_box'));
 
     } // end constructor
 
@@ -127,9 +127,9 @@ 
      * @return void
      * @deprecated since 1.9.0
      */
-    public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
+    public function change_module_term_slug($term_id, $tt_id, $taxonomy) {
 
-        _deprecated_function('change_module_term_slug', '1.9.0' );
+        _deprecated_function('change_module_term_slug', '1.9.0');
 
     }// end add_module_term_group
 
@@ -143,20 +143,20 @@ 
      *
      * @return void
      */
-    public function modules_metaboxes( $post_type, $post )
+    public function modules_metaboxes($post_type, $post)
     {
-        if ('lesson' == $post_type ) {
+        if ('lesson' == $post_type) {
 
             // Remove default taxonomy meta box from Lesson edit screen
-            remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
+            remove_meta_box($this->taxonomy.'div', 'lesson', 'side');
 
             // Add custom meta box to limit module selection to one per lesson
-            add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
+            add_meta_box($this->taxonomy.'_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
         }
 
-        if( 'course' == $post_type ){
+        if ('course' == $post_type) {
             // Course modules selection metabox
-            add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
+            add_meta_box($this->taxonomy.'_course_mb', __('Course Modules', 'woothemes-sensei'), array($this, 'course_module_metabox'), 'course', 'side', 'core');
         }
     }
 
@@ -192,21 +192,21 @@ 
             $modules = $this->get_course_modules($lesson_course);
 
             // Build the HTML to output
-            $html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
+            $html .= '<input type="hidden" name="'.esc_attr('woo_lesson_'.$this->taxonomy.'_nonce').'" id="'.esc_attr('woo_lesson_'.$this->taxonomy.'_nonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename($this->file))).'" />';
             if (is_array($modules) && count($modules) > 0) {
-                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
-                $html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">'."\n";
+                $html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
                 foreach ($modules as $module) {
-                    $html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
+                    $html .= '<option value="'.esc_attr(absint($module->term_id)).'"'.selected($module->term_id, $lesson_module, false).'>'.esc_html($module->name).'</option>'."\n";
                 }
-                $html .= '</select>' . "\n";
+                $html .= '</select>'."\n";
             } else {
-                $course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
-                $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
+                $course_url = admin_url('post.php?post='.urlencode($lesson_course).'&action=edit');
+                $html .= '<p>'.sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="'.esc_url($course_url).'">', '</a>').'</p>';
             } // End If Statement
 
         } else {
-            $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
+            $html .= '<p>'.sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>').'</p>';
         } // End If Statement
 
         // Output the HTML
@@ -225,38 +225,38 @@ 
         global $post;
 
         // Verify post type and nonce
-        if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
-            ||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
+        if ((get_post_type() != 'lesson') || ! isset($_POST['woo_lesson_'.$this->taxonomy.'_nonce'])
+            ||! wp_verify_nonce($_POST['woo_lesson_'.$this->taxonomy.'_nonce'], plugin_basename($this->file))) {
             return $post_id;
         }
 
         // Check if user has permissions to edit lessons
         $post_type = get_post_type_object($post->post_type);
-        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;
         }
 
         // Check if user has permissions to edit this specific post
-        if (!current_user_can('edit_post', $post_id)) {
+        if ( ! current_user_can('edit_post', $post_id)) {
             return $post_id;
         }
 
         // Cast module ID as an integer if selected, otherwise leave as empty string
-        if ( isset( $_POST['lesson_module'] ) ) {
+        if (isset($_POST['lesson_module'])) {
 
-            if( empty ( $_POST['lesson_module'] ) ){
-                wp_delete_object_term_relationships($post_id, $this->taxonomy  );
+            if (empty ($_POST['lesson_module'])) {
+                wp_delete_object_term_relationships($post_id, $this->taxonomy);
                 return true;
             }
 
-            $module_id = intval( $_POST['lesson_module'] );
+            $module_id = intval($_POST['lesson_module']);
 
             // Assign lesson to selected module
             wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
 
             // Set default order for lesson inside module
-            if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
-                update_post_meta($post_id, '_order_module_' . $module_id, 0);
+            if ( ! get_post_meta($post_id, '_order_module_'.$module_id, true)) {
+                update_post_meta($post_id, '_order_module_'.$module_id, 0);
             }
         }
 
@@ -314,7 +314,7 @@ 
         $module_courses = array();
         if (isset($courses) && is_array($courses)) {
             foreach ($courses as $course) {
-                $module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
+                $module_courses[] = array('id' =>$course->ID, 'details'=>$course->post_title);
             }
         }
 
@@ -324,8 +324,8 @@ 
                     for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label></th>
             <td>
                 <input type="hidden"
-                       data-defaults="<?php echo esc_attr( json_encode($module_courses)); ?>"
-                       value="<?php echo esc_attr( json_encode($module_courses) ); ?>"
+                       data-defaults="<?php echo esc_attr(json_encode($module_courses)); ?>"
+                       value="<?php echo esc_attr(json_encode($module_courses)); ?>"
                        id="module_courses" name="module_courses"
                        class="ajax_chosen_select_courses"
                        placeholder="<?php esc_attr_e('Search for courses...', 'woothemes-sensei'); ?>"
@@ -370,11 +370,11 @@ 
         }
 
         // Add module to selected courses
-        if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
+        if (isset($_POST['module_courses']) && ! empty($_POST['module_courses'])) {
 
-            $course_ids = explode( ",", $_POST['module_courses'] );
+            $course_ids = explode(",", $_POST['module_courses']);
 
-            foreach ( $course_ids as $course_id ) {
+            foreach ($course_ids as $course_id) {
 
                 wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
 
@@ -438,11 +438,11 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function single_course_modules(){
+    public function single_course_modules() {
 
-        _deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
+        _deprecated_function('Sensei_Modules->single_course_modules', 'Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
         // only show modules on the course that has modules
-        if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
+        if (is_singular('course') && has_term('', 'module')) {
 
             $this->load_course_module_content_template();
 
@@ -459,15 +459,15 @@ 
 
         if (method_exists('Sensei_Utils', 'is_preview_lesson') && Sensei_Utils::is_preview_lesson($lesson_id)) {
             $is_user_taking_course = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
-            if (!$is_user_taking_course) {
+            if ( ! $is_user_taking_course) {
                 if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
                     $title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
                     // Remove brackets for display here
                     $title_text = str_replace('(', '', $title_text);
                     $title_text = str_replace(')', '', $title_text);
-                    $title_text = '<span class="preview-label">' . $title_text . '</span>';
+                    $title_text = '<span class="preview-label">'.$title_text.'</span>';
                 }
-                $title .= ' ' . $title_text;
+                $title .= ' '.$title_text;
             }
         }
 
@@ -481,8 +481,8 @@ 
         if (is_singular('lesson')) {
             if (has_term('', $this->taxonomy, $post->ID)) {
                 $module = $this->get_lesson_module($post->ID);
-                if( $module ) {
-                    $html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
+                if ($module) {
+                    $html .= ' '.$separator.' <a href="'.esc_url($module->url).'" title="'.__('Back to the module', 'woothemes-sensei').'">'.$module->name.'</a>';
                 }
             }
         }
@@ -490,7 +490,7 @@ 
         if (is_tax($this->taxonomy)) {
             if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
                 $course_id = intval($_GET['course_id']);
-                $html .= '<a href="' . esc_url(get_permalink($course_id)) . '" title="' .  __('Back to the course', 'woothemes-sensei') . '">' . get_the_title($course_id) . '</a>';
+                $html .= '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Back to the course', 'woothemes-sensei').'">'.get_the_title($course_id).'</a>';
             }
         }
         return $html;
@@ -505,18 +505,18 @@ 
      */
     public function module_archive_template($template) {
 
-        if ( ! is_tax($this->taxonomy) ) {
+        if ( ! is_tax($this->taxonomy)) {
             return $template;
         }
 
         $file = 'archive-lesson.php';
-        $find = array( $file, Sensei()->template_url . $file );
+        $find = array($file, Sensei()->template_url.$file);
 
         // locate the template file
         $template = locate_template($find);
-        if (!$template) {
+        if ( ! $template) {
 
-            $template = Sensei()->plugin_path() . 'templates/' . $file;
+            $template = Sensei()->plugin_path().'templates/'.$file;
 
         }
 
@@ -542,7 +542,7 @@ 
             // Set order of lessons
             if (version_compare(Sensei()->version, '1.6.0', '>=')) {
                 $module_id = $query->queried_object_id;
-                $query->set('meta_key', '_order_module_' . $module_id);
+                $query->set('meta_key', '_order_module_'.$module_id);
                 $query->set('orderby', 'meta_value_num date');
             } else {
                 $query->set('orderby', 'menu_order');
@@ -603,10 +603,10 @@ 
                     $status = __('In progress', 'woothemes-sensei');
                     $class = 'in-progress';
                 }
-                echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
+                echo '<p class="status '.esc_attr($class).'">'.$status.'</p>';
             }
 
-            echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
+            echo '<p class="archive-description module-description">'.apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id).'</p>';
         }
     }
 
@@ -731,7 +731,7 @@ 
     public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
     {
         $module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
-        update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
+        update_user_meta(intval($user_id), '_module_progress_'.intval($course_id).'_'.intval($module_id), intval($module_progress));
 
         do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
     }
@@ -748,9 +748,9 @@ 
      */
     public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
     {
-        $module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
+        $module_progress = get_user_meta(intval($user_id), '_module_progress_'.intval($course_id).'_'.intval($module_id), true);
         if ($module_progress) {
-            return (float)$module_progress;
+            return (float) $module_progress;
         }
         return false;
     }
@@ -803,7 +803,7 @@ 
         }
         $module_progress = ($completed_count / $lesson_count) * 100;
 
-        return (float)$module_progress;
+        return (float) $module_progress;
     }
 
     /**
@@ -816,7 +816,7 @@ 
     public function register_modules_admin_menu_items()
     {
         //add the modules link under the Course main menu
-        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
+        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module', '');
 
         // Regsiter new admin page for module ordering
         $hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
@@ -843,19 +843,19 @@ 
             $ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
 
             if ($ordered) {
-                $html .= '<div class="updated fade">' . "\n";
-                $html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
-                $html .= '</div>' . "\n";
+                $html .= '<div class="updated fade">'."\n";
+                $html .= '<p>'.__('The module order has been saved for this course.', 'woothemes-sensei').'</p>'."\n";
+                $html .= '</div>'."\n";
             }
         }
 
         $courses = Sensei()->course->get_all_courses();
 
-        $html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
-        $html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
-        $html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
-        $html .= '<select id="module-order-course" name="course_id">' . "\n";
-        $html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
+        $html .= '<form action="'.admin_url('edit.php').'" method="get">'."\n";
+        $html .= '<input type="hidden" name="post_type" value="course" />'."\n";
+        $html .= '<input type="hidden" name="page" value="'.esc_attr($this->order_page_slug).'" />'."\n";
+        $html .= '<select id="module-order-course" name="course_id">'."\n";
+        $html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'."\n";
 
         foreach ($courses as $course) {
             if (has_term('', $this->taxonomy, $course->ID)) {
@@ -863,30 +863,30 @@ 
                 if (isset($_GET['course_id'])) {
                     $course_id = intval($_GET['course_id']);
                 }
-                $html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
+                $html .= '<option value="'.esc_attr(intval($course->ID)).'" '.selected($course->ID, $course_id, false).'>'.get_the_title($course->ID).'</option>'."\n";
             }
         }
 
-        $html .= '</select>' . "\n";
-        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
-        $html .= '</form>' . "\n";
+        $html .= '</select>'."\n";
+        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="'.__('Select', 'woothemes-sensei').'" />'."\n";
+        $html .= '</form>'."\n";
 
         if (isset($_GET['course_id'])) {
             $course_id = intval($_GET['course_id']);
             if ($course_id > 0) {
                 $modules = $this->get_course_modules($course_id);
-                $modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
+                $modules = $this->append_teacher_name_to_module($modules, array('module'), array());
                 if ($modules) {
 
                     $order = $this->get_course_module_order($course_id);
 
-                    $order_string='';
+                    $order_string = '';
                     if ($order) {
                         $order_string = implode(',', $order);
                     }
 
-                    $html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-                    $html .= '<ul class="sortable-module-list">' . "\n";
+                    $html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+                    $html .= '<ul class="sortable-module-list">'."\n";
                     $count = 0;
                     foreach ($modules as $module) {
                         $count++;
@@ -900,14 +900,14 @@ 
                         if ($count % 2 != 0) {
                             $class .= ' alternate';
                         }
-                        $html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
+                        $html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($module->term_id).'" style="width: 100%;"> '.$module->name.'</span></li>'."\n";
                     }
-                    $html .= '</ul>' . "\n";
+                    $html .= '</ul>'."\n";
 
-                    $html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
-                    $html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-                    $html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
-                    $html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
+                    $html .= '<input type="hidden" name="module-order" value="'.$order_string.'" />'."\n";
+                    $html .= '<input type="hidden" name="course_id" value="'.$course_id.'" />'."\n";
+                    $html .= '<input type="submit" class="button-primary" value="'.__('Save module order', 'woothemes-sensei').'" />'."\n";
+                    $html .= '<a href="'.admin_url('post.php?post='.$course_id.'&action=edit').'" class="button-secondary">'.__('Edit course', 'woothemes-sensei').'</a>'."\n";
                 }
             }
         }
@@ -944,7 +944,7 @@ 
     {
         if ($column == 'module_order') {
             if (has_term('', $this->taxonomy, $course_id)) {
-                echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
+                echo '<a class="button-secondary" href="'.admin_url('edit.php?post_type=course&page=module-order&course_id='.urlencode(intval($course_id))).'">'.__('Order modules', 'woothemes-sensei').'</a>';
             }
         }
     }
@@ -1036,7 +1036,7 @@ 
                 $args['post_type'] = 'lesson';
                 $lessons = get_posts($args);
                 $total_lessons = count($lessons);
-                $column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
+                $column_data = '<a href="'.admin_url('edit.php?module='.urlencode($module->slug).'&post_type=lesson').'">'.intval($total_lessons).'</a>';
                 break;
         }
 
@@ -1054,7 +1054,7 @@ 
     public function analysis_overview_column_title($columns)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $new_columns = array();
             if (is_array($columns) && 0 < count($columns)) {
                 foreach ($columns as $column => $title) {
@@ -1082,15 +1082,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated column data
      */
-    public function analysis_overview_column_data($columns, $lesson )
+    public function analysis_overview_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $lesson_module = '';
             $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
             if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
                 foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+                    $lesson_module = '<a href="'.esc_url(admin_url('edit-tags.php?action=edit&taxonomy='.urlencode($this->taxonomy).'&tag_ID='.urlencode($single_module->term_id))).'">'.$single_module->name.'</a>';
                     break;
                 }
             }
@@ -1111,7 +1111,7 @@ 
      */
     public function analysis_course_column_title($columns)
     {
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $columns['lesson_module'] = __('Module', 'woothemes-sensei');
         }
         return $columns;
@@ -1126,15 +1126,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated columns data
      */
-    public function analysis_course_column_data($columns, $lesson )
+    public function analysis_course_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['course_id'] ) ) {
+        if (isset($_GET['course_id'])) {
             $lesson_module = '';
             $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
             if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
                 foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+                    $lesson_module = '<a href="'.esc_url(admin_url('edit-tags.php?action=edit&taxonomy='.urlencode($this->taxonomy).'&tag_ID='.urlencode($single_module->term_id))).'">'.$single_module->name.'</a>';
                     break;
                 }
             }
@@ -1161,7 +1161,7 @@ 
     public function get_lesson_module($lesson_id = 0)
     {
         $lesson_id = intval($lesson_id);
-        if ( ! ( intval( $lesson_id > 0) ) ) {
+        if ( ! (intval($lesson_id > 0))) {
             return false;
         }
 
@@ -1169,9 +1169,9 @@ 
         $modules = wp_get_post_terms($lesson_id, $this->taxonomy);
 
         //check if error returned
-        if(    empty( $modules )
-            || is_wp_error( $modules )
-            || isset( $modules['errors'] ) ){
+        if (empty($modules)
+            || is_wp_error($modules)
+            || isset($modules['errors'])) {
 
             return false;
 
@@ -1179,7 +1179,7 @@ 
 
        // get the last item in the array there should be only be 1 really.
        // this method works for all php versions.
-       foreach( $modules as $module ){
+       foreach ($modules as $module) {
            break;
        }
 
@@ -1192,7 +1192,7 @@ 
         if (isset($course_id) && 0 < $course_id) {
 
             // the course should contain the same module taxonomy term for this to be valid
-            if( ! has_term( $module, $this->taxonomy, $course_id)){
+            if ( ! has_term($module, $this->taxonomy, $course_id)) {
                 return false;
             }
 
@@ -1264,8 +1264,8 @@ 
      */
     public function enqueue_styles() {
 
-        wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-frontend');
+        wp_register_style($this->taxonomy.'-frontend', esc_url($this->assets_url).'css/modules-frontend.css', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-frontend');
 
     }
 
@@ -1276,37 +1276,37 @@ 
      *
      * @return void
      */
-    public function admin_enqueue_scripts( $hook ) {
+    public function admin_enqueue_scripts($hook) {
 
         /**
          * Filter the page hooks where modules admin script can be loaded on.
          *
          * @param array $white_listed_pages
          */
-        $script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
+        $script_on_pages_white_list = apply_filters('sensei_module_admin_script_page_white_lists', array(
             'edit-tags.php',
             'course_page_module-order',
             'post-new.php',
             'post.php'
-        ) );
+        ));
 
-        if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
+        if ( ! in_array($hook, $script_on_pages_white_list)) {
             return;
         }
 
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-        wp_enqueue_script( 'sensei-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-chosen' ), Sensei()->version , true );
-        wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'sensei-core-select2' ), Sensei()->version, true );
+        wp_enqueue_script('sensei-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-chosen'), Sensei()->version, true);
+        wp_enqueue_script($this->taxonomy.'-admin', esc_url($this->assets_url).'js/modules-admin'.$suffix.'.js', array('jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'sensei-core-select2'), Sensei()->version, true);
 
         // localized module data
         $localize_modulesAdmin = array(
-            'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
-            'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
+            'search_courses_nonce' => wp_create_nonce('search-courses'),
+            'selectPlaceholder'    => __('Search for courses', 'woothemes-sensei')
         );
 
-        wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
+        wp_localize_script($this->taxonomy.'-admin', 'modulesAdmin', $localize_modulesAdmin);
     }
 
     /**
@@ -1318,8 +1318,8 @@ 
      */
     public function admin_enqueue_styles() {
 
-        wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-sortable');
+        wp_register_style($this->taxonomy.'-sortable', esc_url($this->assets_url).'css/modules-admin.css', '', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-sortable');
 
     }
 
@@ -1333,9 +1333,9 @@ 
      */
     public function course_modules_title( ) {
 
-       if( sensei_module_has_lessons() ){
+       if (sensei_module_has_lessons()) {
 
-            echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
+            echo '<header><h2>'.__('Modules', 'woothemes-sensei').'</h2></header>';
 
         }
 
@@ -1348,18 +1348,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function load_course_module_content_template(){
+    public function load_course_module_content_template() {
 
         // load backwards compatible template name if it exists in the users theme
-        $located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
-        if( $located_template ){
+        $located_template = locate_template(Sensei()->template_url.'single-course/course-modules.php');
+        if ($located_template) {
 
-            Sensei_Templates::get_template( 'single-course/course-modules.php' );
+            Sensei_Templates::get_template('single-course/course-modules.php');
             return;
 
         }
 
-        Sensei_Templates::get_template( 'single-course/modules.php' );
+        Sensei_Templates::get_template('single-course/modules.php');
 
     } // end course_module_content
 
@@ -1372,15 +1372,15 @@ 
      * @param $term_id
      * @return array $lessons
      */
-    public function get_lessons( $course_id , $term_id ){
+    public function get_lessons($course_id, $term_id) {
 
-        $lesson_query = $this->get_lessons_query( $course_id, $term_id );
+        $lesson_query = $this->get_lessons_query($course_id, $term_id);
 
-        if( isset( $lesson_query->posts ) ){
+        if (isset($lesson_query->posts)) {
 
             return $lesson_query->posts;
 
-        }else{
+        } else {
 
             return array();
 
@@ -1397,9 +1397,9 @@ 
      * @param $term_id
      * @return WP_Query $lessons_query
      */
-    public function get_lessons_query( $course_id , $term_id ){
+    public function get_lessons_query($course_id, $term_id) {
 
-        if( empty( $term_id ) || empty( $course_id ) ){
+        if (empty($term_id) || empty($course_id)) {
 
             return array();
 
@@ -1420,7 +1420,7 @@ 
                 array(
                     'taxonomy' => 'module',
                     'field' => 'id',
-                    'terms' => intval( $term_id )
+                    'terms' => intval($term_id)
                 )
             ),
             'orderby' => 'menu_order',
@@ -1428,12 +1428,12 @@ 
             'suppress_filters' => 0
         );
 
-        if (version_compare( Sensei()->version, '1.6.0', '>=')) {
-            $args['meta_key'] = '_order_module_' . intval( $term_id );
+        if (version_compare(Sensei()->version, '1.6.0', '>=')) {
+            $args['meta_key'] = '_order_module_'.intval($term_id);
             $args['orderby'] = 'meta_value_num date';
         }
 
-        $lessons_query = new WP_Query( $args );
+        $lessons_query = new WP_Query($args);
 
         return $lessons_query;
 
@@ -1448,37 +1448,37 @@ 
      *
      * @return array $non_module_lessons
      */
-    public function get_none_module_lessons( $course_id ){
+    public function get_none_module_lessons($course_id) {
 
         $non_module_lessons = array();
 
         //exit if there is no course id passed in
-        if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
+        if (empty($course_id) || 'course' != get_post_type($course_id)) {
 
             return $non_module_lessons;
         }
 
         //save some time and check if we already have the saved
-        if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
+        if (get_transient('sensei_'.$course_id.'_none_module_lessons')) {
 
-            return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
+            return get_transient('sensei_'.$course_id.'_none_module_lessons');
 
         }
 
         // create terms array which must be excluded from other arrays
-        $course_modules = $this->get_course_modules( $course_id );
+        $course_modules = $this->get_course_modules($course_id);
 
         //exit if there are no module on this course
-        if( empty( $course_modules ) || ! is_array( $course_modules ) ){
+        if (empty($course_modules) || ! is_array($course_modules)) {
 
-            return  Sensei()->course->course_lessons( $course_id );
+            return  Sensei()->course->course_lessons($course_id);
 
         }
 
         $terms = array();
-        foreach( $course_modules as $module ){
+        foreach ($course_modules as $module) {
 
-            array_push( $terms ,  $module->term_id );
+            array_push($terms, $module->term_id);
 
         }
 
@@ -1489,7 +1489,7 @@ 
             'meta_query' => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                     'compare' => '='
                 )
             ),
@@ -1506,11 +1506,11 @@ 
             'suppress_filters' => 0
         );
 
-        $wp_lessons_query = new WP_Query( $args );
+        $wp_lessons_query = new WP_Query($args);
 
-        if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
+        if (isset($wp_lessons_query->posts) && count($wp_lessons_query->posts) > 0) {
             $non_module_lessons = $wp_lessons_query->get_posts();
-            set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
+            set_transient('sensei_'.$course_id.'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS);
         }
 
         return $non_module_lessons;
@@ -1521,7 +1521,7 @@ 
      *
      * @since 1.8.0
      */
-    public function setup_modules_taxonomy(){
+    public function setup_modules_taxonomy() {
 
         $labels = array(
             'name' => __('Modules', 'woothemes-sensei'),
@@ -1558,11 +1558,11 @@ 
             'show_in_nav_menus' => false,
             'show_in_quick_edit' => false,
             'show_ui' => true,
-            'rewrite' => array('slug' => $modules_rewrite_slug ),
+            'rewrite' => array('slug' => $modules_rewrite_slug),
             'labels' => $labels
         );
 
-        register_taxonomy( 'module' , array('course', 'lesson'), $args);
+        register_taxonomy('module', array('course', 'lesson'), $args);
 
     }// end setup_modules_taxonomy
 
@@ -1574,12 +1574,12 @@ 
      * @since 1.8.0
      * @return void
      */
-    function redirect_to_lesson_module_taxonomy_to_course( ){
+    function redirect_to_lesson_module_taxonomy_to_course( ) {
 
-        global $typenow , $taxnow;
+        global $typenow, $taxnow;
 
-        if( 'lesson'== $typenow && 'module'==$taxnow ){
-            wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
+        if ('lesson' == $typenow && 'module' == $taxnow) {
+            wp_safe_redirect(esc_url_raw('edit-tags.php?taxonomy=module&post_type=course'));
         }
 
     }// end redirect to course taxonomy
@@ -1592,18 +1592,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_lessons_menu_model_taxonomy(){
+    public function remove_lessons_menu_model_taxonomy() {
         global $submenu;
 
-        if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
+        if ( ! isset($submenu['edit.php?post_type=lesson']) || ! is_array($submenu['edit.php?post_type=lesson'])) {
             return; // exit
         }
 
         $lesson_main_menu = $submenu['edit.php?post_type=lesson'];
-        foreach( $lesson_main_menu as $index => $sub_item ){
+        foreach ($lesson_main_menu as $index => $sub_item) {
 
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=lesson'][ $index ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=lesson'][$index]);
             }
         }
 
@@ -1617,18 +1617,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_courses_menu_model_taxonomy(){
+    public function remove_courses_menu_model_taxonomy() {
         global $submenu;
 
-        if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
+        if ( ! isset($submenu['edit.php?post_type=course']) || ! is_array($submenu['edit.php?post_type=course'])) {
             return; // exit
         }
 
         $course_main_menu = $submenu['edit.php?post_type=course'];
-        foreach( $course_main_menu as $index => $sub_item ){
+        foreach ($course_main_menu as $index => $sub_item) {
 
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=course'][ $index ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=course'][$index]);
             }
         }
 
@@ -1644,12 +1644,12 @@ 
      * @param string $term_name
      * @return array $owners { type WP_User }. Empty array if none if found.
      */
-    public static function get_term_authors( $term_name ){
+    public static function get_term_authors($term_name) {
 
-        $terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
+        $terms = get_terms(array('module'), array('name__like'=>$term_name, 'hide_empty' => false));
 
         $owners = array();
-        if( empty( $terms ) ){
+        if (empty($terms)) {
 
             return $owners;
 
@@ -1659,11 +1659,11 @@ 
 
 
         //if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
-        foreach( $terms as $term){
-            if( $term->name == $term_name ){
+        foreach ($terms as $term) {
+            if ($term->name == $term_name) {
 
                 // look for the author in the slug
-                $owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
+                $owners[] = Sensei_Core_Modules::get_term_author($term->slug);
 
             }// end if term name
 
@@ -1684,30 +1684,30 @@ 
      * @param $slug
      * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
      */
-    public static function get_term_author( $slug='' ){
+    public static function get_term_author($slug = '') {
 
-        $term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
+        $term_owner = get_user_by('email', get_bloginfo('admin_email'));
 
-        if( empty( $slug ) ){
+        if (empty($slug)) {
 
             return $term_owner;
 
         }
 
         // look for the author in the slug
-        $slug_parts = explode( '-', $slug );
+        $slug_parts = explode('-', $slug);
 
-        if( count( $slug_parts ) > 1 ){
+        if (count($slug_parts) > 1) {
 
             // get the user data
             $possible_user_id = $slug_parts[0];
-            $author = get_userdata( $possible_user_id );
+            $author = get_userdata($possible_user_id);
 
             // if the user doesnt exist for the first part of the slug
             // then this slug was also created by admin
-            if( is_a( $author, 'WP_User' ) ){
+            if (is_a($author, 'WP_User')) {
 
-                $term_owner =  $author;
+                $term_owner = $author;
 
             }
         }
@@ -1724,48 +1724,48 @@ 
      *
      * @param WP_Post $post Post object.
      */
-    public function course_module_metabox( $post ) {
+    public function course_module_metabox($post) {
 
         $tax_name = 'module';
-        $taxonomy = get_taxonomy( 'module' );
+        $taxonomy = get_taxonomy('module');
 
         ?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
-                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
             </ul>
 
             <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
                 <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-                    <?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+                    <?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
                 </ul>
             </div>
 
             <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
                 <?php
-                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                $name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
                 echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
                 ?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
-                    <?php wp_terms_checklist( $post->ID, array( 'taxonomy'=>$tax_name , 'popular_cats' => $popular_ids ) ); ?>
+                    <?php wp_terms_checklist($post->ID, array('taxonomy'=>$tax_name, 'popular_cats' => $popular_ids)); ?>
                 </ul>
             </div>
-            <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+            <?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
                 <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
                     <h4>
                         <a id="sensei-<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
                             <?php
                             /* translators: %s: add new taxonomy label */
-                            printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+                            printf(__('+ %s'), $taxonomy->labels->add_new_item);
                             ?>
                         </a>
                     </h4>
                     <p id="sensei-<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
-                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr( $taxonomy->labels->add_new_item ); ?></a>
-                        <?php wp_nonce_field( '_ajax_nonce-add-' . $tax_name, 'add_module_nonce' ); ?>
+                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
+                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr($taxonomy->labels->add_new_item); ?></a>
+                        <?php wp_nonce_field('_ajax_nonce-add-'.$tax_name, 'add_module_nonce'); ?>
                         <span id="<?php echo $tax_name; ?>-ajax-response"></span>
                     </p>
                 </div>
@@ -1785,55 +1785,55 @@ 
     public static function add_new_module_term( ) {
 
 
-        if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
-            wp_send_json_error( array('error'=> 'wrong security nonce') );
+        if ( ! isset($_POST['security']) || ! wp_verify_nonce($_POST['security'], '_ajax_nonce-add-module')) {
+            wp_send_json_error(array('error'=> 'wrong security nonce'));
         }
 
         // get the term an create the new term storing infomration
-        $term_name = sanitize_text_field( $_POST['newTerm'] );
+        $term_name = sanitize_text_field($_POST['newTerm']);
 
-        if( current_user_can('manage_options' ) ) {
+        if (current_user_can('manage_options')) {
 
-            $term_slug = str_ireplace(' ', '-', trim( $term_name ) );
+            $term_slug = str_ireplace(' ', '-', trim($term_name));
 
         } else {
 
-            $term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
+            $term_slug = get_current_user_id().'-'.str_ireplace(' ', '-', trim($term_name));
 
         }
 
-        $course_id = sanitize_text_field( $_POST['course_id'] );
+        $course_id = sanitize_text_field($_POST['course_id']);
 
         // save the term
-        $slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
+        $slug = wp_insert_term($term_name, 'module', array('slug'=> $term_slug));
 
         // send error for all errors except term exits
-        if( is_wp_error( $slug ) ){
+        if (is_wp_error($slug)) {
 
             // prepare for possible term name and id to be passed down if term exists
             $term_data = array();
 
             // if term exists also send back the term name and id
-            if( isset( $slug->errors['term_exists'] ) ){
+            if (isset($slug->errors['term_exists'])) {
 
-                $term = get_term_by( 'slug', $term_slug, 'module');
+                $term = get_term_by('slug', $term_slug, 'module');
                 $term_data['name'] = $term_name;
                 $term_data['id'] = $term->term_id;
 
                 // set the object terms
-                wp_set_object_terms( $course_id, $term->term_id, 'module', true );
+                wp_set_object_terms($course_id, $term->term_id, 'module', true);
             }
 
-            wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
+            wp_send_json_error(array('errors'=>$slug->errors, 'term'=> $term_data));
 
         }
 
         //make sure the new term is checked for this course
 
-        wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
+        wp_set_object_terms($course_id, $slug['term_id'], 'module', true);
 
         // Handle request then generate response using WP_Ajax_Response
-        wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
+        wp_send_json_success(array('termId' => $slug['term_id'], 'termName' => $term_name));
 
     }
 
@@ -1845,26 +1845,26 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_module_terms( $terms, $taxonomies, $args ){
+    public function filter_module_terms($terms, $taxonomies, $args) {
 
         //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
+        if (current_user_can('manage_options') || ! in_array('module', $taxonomies) || ! is_admin()) {
             return $terms;
         }
 
         // avoid infinite call loop
-        remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+        remove_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
 
         // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
             // change only scrub the terms ids form the array keys
-            $terms = array_keys( $terms );
+            $terms = array_keys($terms);
         }
 
-        $teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
+        $teachers_terms = $this->filter_terms_by_owner($terms, get_current_user_id());
 
         // add filter again as removed above
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+        add_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
 
         return $teachers_terms;
     }// end filter_module_terms
@@ -1877,25 +1877,25 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
+    public function filter_course_selected_terms($terms, $course_ids_array, $taxonomies) {
 
         //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
+        if (current_user_can('manage_options') || ! is_admin() || empty($terms)
             // only apply this to module only taxonomy queries so 1 taxonomy only:
-            ||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
+            ||  count($taxonomies) > 1 || ! in_array('module', $taxonomies)) {
             return $terms;
         }
 
-        $term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
+        $term_objects = $this->filter_terms_by_owner($terms, get_current_user_id());
 
         // if term objects were passed in send back objects
         // if term id were passed in send that back
-        if( is_object( $terms[0] ) ){
+        if (is_object($terms[0])) {
             return $term_objects;
         }
 
         $terms = array();
-        foreach( $term_objects as $term_object ){
+        foreach ($term_objects as $term_object) {
             $terms[] = $term_object->term_id;
         }
 
@@ -1913,20 +1913,20 @@ 
      * @param $user_id
      * @return array
      */
-    public function filter_terms_by_owner( $terms, $user_id ){
+    public function filter_terms_by_owner($terms, $user_id) {
 
         $users_terms = array();
 
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $term = get_term($term, 'module');
             }
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+            $author = Sensei_Core_Modules::get_term_author($term->slug);
 
-            if ( $user_id == $author->ID ) {
+            if ($user_id == $author->ID) {
                 // add the term to the teachers terms
                 $users_terms[] = $term;
             }
@@ -1945,34 +1945,34 @@ 
      *
      * @since 1.8.0
      */
-    public function append_teacher_name_to_module( $terms, $taxonomies, $args )
+    public function append_teacher_name_to_module($terms, $taxonomies, $args)
     {
 
         // only for admin users ont he module taxonomy
-        if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
+        if (empty($terms) || ! current_user_can('manage_options') || ! in_array('module', $taxonomies) || ! is_admin()) {
             return $terms;
         }
 
         // in certain cases the array is passed in as reference to the parent term_id => parent_id
         // simply return this as wp doesn't need an array of stdObject Term
-        if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
 
             return $terms;
 
         }
 
         // loop through and update all terms adding the author name
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $term = get_term($term, 'module');
             }
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+            $author = Sensei_Core_Modules::get_term_author($term->slug);
 
-            if( ! user_can( $author, 'manage_options' ) && isset( $term->name ) ) {
-                $term->name = $term->name . ' (' . $author->display_name . ') ';
+            if ( ! user_can($author, 'manage_options') && isset($term->name)) {
+                $term->name = $term->name.' ('.$author->display_name.') ';
             }
 
             // add the term to the teachers terms
@@ -2001,23 +2001,23 @@ 
      * @sine 1.9.0
      * @param $post_id
      */
-    public static function reset_none_modules_transient ( $post_id ){
+    public static function reset_none_modules_transient($post_id) {
 
         // this should only apply to course and lesson post types
-        if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
+        if (in_array(get_post_type($post_id), array('course', 'lesson'))) {
 
             $course_id = '';
 
-            if( 'lesson' == get_post_type( $post_id ) ){
+            if ('lesson' == get_post_type($post_id)) {
 
-                $course_id = Sensei()->lesson->get_course_id( $post_id );
+                $course_id = Sensei()->lesson->get_course_id($post_id);
 
             }
 
 
-            if( !empty( $course_id ) ){
+            if ( ! empty($course_id)) {
 
-                delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
+                delete_transient('sensei_'.$course_id.'_none_module_lessons');
 
             }
 
@@ -2032,9 +2032,9 @@ 
      * @deprecated since 1.9.0
      *
      */
-    public static function deprecate_sensei_single_course_modules_content(){
+    public static function deprecate_sensei_single_course_modules_content() {
 
-        sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
+        sensei_do_deprecated_action('sensei_single_course_modules_content', '1.9.0', 'sensei_single_course_modules_before or sensei_single_course_modules_after');
 
     }
 
@@ -2045,12 +2045,12 @@ 
      *
      * @since 1.9.0
      */
-    public static function setup_single_course_module_loop(){
+    public static function setup_single_course_module_loop() {
 
         global $sensei_modules_loop, $post;
         $course_id = $post->ID;
 
-        $modules = Sensei()->modules->get_course_modules( $course_id );
+        $modules = Sensei()->modules->get_course_modules($course_id);
 
         //initial setup
         $sensei_modules_loop['total'] = 0;
@@ -2058,22 +2058,22 @@ 
         $sensei_modules_loop['current'] = -1;
 
         // exit if this course doesn't have modules
-        if( !$modules || empty( $modules )  ){
+        if ( ! $modules || empty($modules)) {
             return;
         }
 
 
         $lessons_in_all_modules = array();
-        foreach( $modules as $term ){
+        foreach ($modules as $term) {
 
-            $lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
-            $lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
+            $lessons_in_this_module = Sensei()->modules->get_lessons($course_id, $term->term_id);
+            $lessons_in_all_modules = array_merge($lessons_in_all_modules, $lessons_in_this_module);
 
         }
 
 
         //setup all of the modules loop variables
-        $sensei_modules_loop['total'] = count( $modules );
+        $sensei_modules_loop['total'] = count($modules);
         $sensei_modules_loop['modules'] = $modules;
         $sensei_modules_loop['current'] = -1;
         $sensei_modules_loop['course_id'] = $course_id;
@@ -2086,7 +2086,7 @@ 
      * @since 1.9.0
      *
      */
-    public static function teardown_single_course_module_loop(){
+    public static function teardown_single_course_module_loop() {
 
         global $sensei_modules_loop, $wp_query, $post;
 

includes/class-sensei-frontend.php

Spacing +450 added lines, -450 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Frontend Class
@@ -20,78 +20,78 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Template output actions
-		add_action( 'sensei_before_main_content', array( $this, 'sensei_output_content_wrapper' ), 10 );
-		add_action( 'sensei_after_main_content', array( $this, 'sensei_output_content_wrapper_end' ), 10 );
-		add_action( 'sensei_lesson_archive_lesson_title', array( $this, 'sensei_lesson_archive_lesson_title' ), 10 );
+		add_action('sensei_before_main_content', array($this, 'sensei_output_content_wrapper'), 10);
+		add_action('sensei_after_main_content', array($this, 'sensei_output_content_wrapper_end'), 10);
+		add_action('sensei_lesson_archive_lesson_title', array($this, 'sensei_lesson_archive_lesson_title'), 10);
 
 		// 1.2.1
-		add_action( 'wp_head', array( $this, 'sensei_complete_lesson' ), 10 );
-		add_action( 'wp_head', array( $this, 'sensei_complete_course' ), 10 );
-		add_action( 'sensei_frontend_messages', array( $this, 'sensei_frontend_messages' ) );
-		add_action( 'sensei_lesson_video', array( $this, 'sensei_lesson_video' ), 10, 1 );
-		add_action( 'sensei_complete_lesson_button', array( $this, 'sensei_complete_lesson_button' ) );
-		add_action( 'sensei_reset_lesson_button', array( $this, 'sensei_reset_lesson_button' ) );
+		add_action('wp_head', array($this, 'sensei_complete_lesson'), 10);
+		add_action('wp_head', array($this, 'sensei_complete_course'), 10);
+		add_action('sensei_frontend_messages', array($this, 'sensei_frontend_messages'));
+		add_action('sensei_lesson_video', array($this, 'sensei_lesson_video'), 10, 1);
+		add_action('sensei_complete_lesson_button', array($this, 'sensei_complete_lesson_button'));
+		add_action('sensei_reset_lesson_button', array($this, 'sensei_reset_lesson_button'));
 
-		add_action( 'sensei_course_archive_meta', array( $this, 'sensei_course_archive_meta' ) );
+		add_action('sensei_course_archive_meta', array($this, 'sensei_course_archive_meta'));
 
-		add_action( 'sensei_lesson_tag_main_content', array( $this, 'sensei_lesson_archive_main_content' ), 10 );
-		add_action( 'sensei_no_permissions_main_content', array( $this, 'sensei_no_permissions_main_content' ), 10 );
+		add_action('sensei_lesson_tag_main_content', array($this, 'sensei_lesson_archive_main_content'), 10);
+		add_action('sensei_no_permissions_main_content', array($this, 'sensei_no_permissions_main_content'), 10);
 
-		add_action( 'sensei_lesson_meta', array( $this, 'sensei_lesson_meta' ), 10 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'sensei_course_start' ), 10 );
+		add_action('sensei_lesson_meta', array($this, 'sensei_lesson_meta'), 10);
+		add_action('sensei_single_course_content_inside_before', array($this, 'sensei_course_start'), 10);
 
 		// add_filter( 'get_comments_number', array( $this, 'sensei_lesson_comment_count' ), 1 );
-		add_filter( 'the_title', array( $this, 'sensei_lesson_preview_title' ), 10, 2 );
+		add_filter('the_title', array($this, 'sensei_lesson_preview_title'), 10, 2);
 
 		//1.6.2
-		add_filter( 'wp_login_failed', array( $this, 'sensei_login_fail_redirect' ), 10 );
-		add_filter( 'init', array( $this, 'sensei_handle_login_request' ), 10 );
+		add_filter('wp_login_failed', array($this, 'sensei_login_fail_redirect'), 10);
+		add_filter('init', array($this, 'sensei_handle_login_request'), 10);
 		//1.6.3
-		add_action( 'init', array( $this, 'sensei_process_registration' ), 2 );
+		add_action('init', array($this, 'sensei_process_registration'), 2);
 		//1.7.0
-		add_action( 'sensei_pagination', array( $this, 'sensei_breadcrumb' ), 80, 1 );
+		add_action('sensei_pagination', array($this, 'sensei_breadcrumb'), 80, 1);
 
 		// Fix pagination for course archive pages when filtering by course type
-		add_filter( 'pre_get_posts', array( $this, 'sensei_course_archive_pagination' ) );
+		add_filter('pre_get_posts', array($this, 'sensei_course_archive_pagination'));
 
 		// Scripts and Styles
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Custom Menu Item filters
-		add_filter( 'wp_setup_nav_menu_item', array( $this, 'sensei_setup_nav_menu_item' ) );
-		add_filter( 'wp_nav_menu_objects', array( $this, 'sensei_wp_nav_menu_objects' ) );
+		add_filter('wp_setup_nav_menu_item', array($this, 'sensei_setup_nav_menu_item'));
+		add_filter('wp_nav_menu_objects', array($this, 'sensei_wp_nav_menu_objects'));
 		// Search Results filters
-		add_filter( 'post_class', array( $this, 'sensei_search_results_classes' ), 10 );
+		add_filter('post_class', array($this, 'sensei_search_results_classes'), 10);
 		// Only show course & lesson excerpts in search results
-		add_filter( 'the_content', array( $this, 'sensei_search_results_excerpt' ) );
+		add_filter('the_content', array($this, 'sensei_search_results_excerpt'));
 
         //Use WooCommerce filter to show admin bar to Teachers.
-        add_action( 'init', array( $this, 'sensei_show_admin_bar') );
+        add_action('init', array($this, 'sensei_show_admin_bar'));
 
         // Remove course from active courses if an order is cancelled or refunded
-		add_action( 'woocommerce_order_status_processing_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_processing_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
+		add_action('woocommerce_order_status_processing_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_processing_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'remove_active_course'), 10, 1);
 
 		// Make sure correct courses are marked as active for users
-		add_action( 'sensei_before_my_courses', array( $this, 'activate_purchased_courses' ), 10, 1 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'activate_purchased_single_course' ), 10 );
+		add_action('sensei_before_my_courses', array($this, 'activate_purchased_courses'), 10, 1);
+		add_action('sensei_single_course_content_inside_before', array($this, 'activate_purchased_single_course'), 10);
 
 		// Lesson tags
-		add_action( 'sensei_lesson_meta_extra', array( $this, 'lesson_tags_display' ), 10, 1 );
-		add_action( 'pre_get_posts', array( $this, 'lesson_tag_archive_filter' ), 10, 1 );
-		add_filter( 'sensei_lessons_archive_text', array( $this, 'lesson_tag_archive_header' ) );
-		add_action( 'sensei_loop_lesson_inside_before', array( $this, 'lesson_tag_archive_description' ), 11 );
+		add_action('sensei_lesson_meta_extra', array($this, 'lesson_tags_display'), 10, 1);
+		add_action('pre_get_posts', array($this, 'lesson_tag_archive_filter'), 10, 1);
+		add_filter('sensei_lessons_archive_text', array($this, 'lesson_tag_archive_header'));
+		add_action('sensei_loop_lesson_inside_before', array($this, 'lesson_tag_archive_description'), 11);
 
 		// Hide Sensei activity comments from lesson and course pages
-		add_filter( 'wp_list_comments_args', array( $this, 'hide_sensei_activity' ) );
+		add_filter('wp_list_comments_args', array($this, 'hide_sensei_activity'));
 	} // End __construct()
 
 	/**
@@ -101,11 +101,11 @@ 
 	 * @since  1.7.3
 	 * @return array|mixed
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( 'lesson' == $key || 'course' == $key ) {
-			if ( WP_DEBUG ) {
-				trigger_error( sprintf( 'Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3' ) );
+		if ('lesson' == $key || 'course' == $key) {
+			if (WP_DEBUG) {
+				trigger_error(sprintf('Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3'));
 			}
 			return Sensei()->$key;
 		}
@@ -118,32 +118,32 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
 		$disable_js = false;
-		if ( isset( Sensei()->settings->settings[ 'js_disable' ] ) ) {
-			$disable_js = Sensei()->settings->settings[ 'js_disable' ];
+		if (isset(Sensei()->settings->settings['js_disable'])) {
+			$disable_js = Sensei()->settings->settings['js_disable'];
 		} // End If Statement
-		if ( ! $disable_js ) {
+		if ( ! $disable_js) {
 
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+			$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 			// My Courses tabs script
-			wp_register_script( Sensei()->token . '-user-dashboard', esc_url( Sensei()->plugin_url . 'assets/js/user-dashboard' . $suffix . '.js' ), array( 'jquery-ui-tabs' ), Sensei()->version, true );
-			wp_enqueue_script( Sensei()->token . '-user-dashboard' );
+			wp_register_script(Sensei()->token.'-user-dashboard', esc_url(Sensei()->plugin_url.'assets/js/user-dashboard'.$suffix.'.js'), array('jquery-ui-tabs'), Sensei()->version, true);
+			wp_enqueue_script(Sensei()->token.'-user-dashboard');
 
 
             // Course Archive javascript
-            if( is_post_type_archive( 'course' ) ){
+            if (is_post_type_archive('course')) {
 
-                wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true );
-                wp_enqueue_script( 'sensei-course-archive-js' );
+                wp_register_script('sensei-course-archive-js', esc_url(Sensei()->plugin_url.'assets/js/frontend/course-archive'.$suffix.'.js'), array('jquery'), '1', true);
+                wp_enqueue_script('sensei-course-archive-js');
 
             }
 
 
 			// Allow additional scripts to be loaded
-			do_action( 'sensei_additional_scripts' );
+			do_action('sensei_additional_scripts');
 
 		} // End If Statement
 
@@ -154,23 +154,23 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
 		$disable_styles = false;
-		if ( isset( Sensei()->settings->settings[ 'styles_disable' ] ) ) {
-			$disable_styles = Sensei()->settings->settings[ 'styles_disable' ];
+		if (isset(Sensei()->settings->settings['styles_disable'])) {
+			$disable_styles = Sensei()->settings->settings['styles_disable'];
 		} // End If Statement
 
 		// Add filter for theme overrides
-		$disable_styles = apply_filters( 'sensei_disable_styles', $disable_styles );
+		$disable_styles = apply_filters('sensei_disable_styles', $disable_styles);
 
-		if ( ! $disable_styles ) {
+		if ( ! $disable_styles) {
 
-			wp_register_style( Sensei()->token . '-frontend', Sensei()->plugin_url . 'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( Sensei()->token . '-frontend' );
+			wp_register_style(Sensei()->token.'-frontend', Sensei()->plugin_url.'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style(Sensei()->token.'-frontend');
 
 			// Allow additional stylesheets to be loaded
-			do_action( 'sensei_additional_styles' );
+			do_action('sensei_additional_styles');
 
 		} // End If Statement
 
@@ -186,10 +186,10 @@ 
 	 * @param string $name (default: '')
 	 * @return void
 	 */
-	function sensei_get_template_part( $slug, $name = '' ) {
+	function sensei_get_template_part($slug, $name = '') {
 
-        _deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' );
-        Sensei_Templates::get_part( $slug, $name );
+        _deprecated_function('class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part');
+        Sensei_Templates::get_part($slug, $name);
 
 	} // End sensei_get_template_part()
 
@@ -204,10 +204,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	function sensei_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' );
-        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path  );
+        _deprecated_function('sensei_get_template', '1.9.0', 'Sensei_Templates::get_template');
+        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path);
 
 	} // End sensei_get_template()
 
@@ -221,10 +221,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	function sensei_locate_template($template_name, $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' );
-        Sensei_Templates::locate_template( $template_name, $template_path, $default_path );
+        _deprecated_function('sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template');
+        Sensei_Templates::locate_template($template_name, $template_path, $default_path);
 
 	} // End sensei_locate_template()
 
@@ -238,20 +238,20 @@ 
 	function sensei_output_content_wrapper() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-start.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-start.php',
             'wrappers/wrapper-start.php'
         );
 
-        $template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $template ) ){
+        $template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-start.php');
             return;
 
         }
 
-		Sensei_Templates::get_template( 'globals/wrapper-start.php' );
+		Sensei_Templates::get_template('globals/wrapper-start.php');
 
 	} // End sensei_output_content_wrapper()
 
@@ -265,21 +265,21 @@ 
 	function sensei_output_content_wrapper_end() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-end.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-end.php',
             'wrappers/wrapper-end.php'
         );
 
-        $backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $backwards_compatible_template ) ){
+        $backwards_compatible_template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($backwards_compatible_template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-end.php');
             return;
 
         }
 
 
-		Sensei_Templates::get_template( 'globals/wrapper-end.php' );
+		Sensei_Templates::get_template('globals/wrapper-end.php');
 
 	} // End sensei_output_content_wrapper_end()
 
@@ -292,57 +292,57 @@ 
 	 */
 	public static function load_content_pagination() {
 
-        if( is_singular('course') ) {
+        if (is_singular('course')) {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-posts.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
+                Sensei_Templates::get_template('wrappers/pagination-posts.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-posts.php' );
+			Sensei_Templates::get_template('globals/pagination-posts.php');
 
-		} elseif( is_singular('lesson') ) {
+		} elseif (is_singular('lesson')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-lesson.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
+                Sensei_Templates::get_template('wrappers/pagination-lesson.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-lesson.php' );
+			Sensei_Templates::get_template('globals/pagination-lesson.php');
 
-		} elseif( is_singular('quiz') ) {
+		} elseif (is_singular('quiz')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-quiz.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
+                Sensei_Templates::get_template('wrappers/pagination-quiz.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-quiz.php' );
+			Sensei_Templates::get_template('globals/pagination-quiz.php');
 
 		} else {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination.php' );
+                Sensei_Templates::get_template('wrappers/pagination.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination.php' );
+			Sensei_Templates::get_template('globals/pagination.php');
 
 		} // End If Statement
 
@@ -368,21 +368,21 @@ 
 	 * @param object $item
 	 * @return object $item
 	 */
-	public function sensei_setup_nav_menu_item( $item ) {
+	public function sensei_setup_nav_menu_item($item) {
 		global $pagenow, $wp_rewrite;
 
-		if( 'nav-menus.php' != $pagenow && !defined('DOING_AJAX') && isset( $item->url ) && 'custom' == $item->type ) {
+		if ('nav-menus.php' != $pagenow && ! defined('DOING_AJAX') && isset($item->url) && 'custom' == $item->type) {
 
 			// Set up Sensei menu links
-			$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-			$my_account_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+			$course_page_id = intval(Sensei()->settings->settings['course_page']);
+			$my_account_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
 			$course_page_url = Sensei_Course::get_courses_page_url();
-			$lesson_archive_url = get_post_type_archive_link( 'lesson' );
-			$my_courses_url = get_permalink( $my_account_page_id );
-			$my_messages_url = get_post_type_archive_link( 'sensei_message' );
+			$lesson_archive_url = get_post_type_archive_link('lesson');
+			$my_courses_url = get_permalink($my_account_page_id);
+			$my_messages_url = get_post_type_archive_link('sensei_message');
 
-			switch ( $item->url ) {
+			switch ($item->url) {
 				case '#senseicourses':
 					$item->url = $course_page_url;
 					break;
@@ -399,7 +399,7 @@ 
 					$item->url = $my_messages_url;
                     // if no archive link exist for sensei_message
                     // set it back to the place holder
-                    if( ! $item->url ){
+                    if ( ! $item->url) {
 
                         $item->url = '#senseimymessages';
 
@@ -407,21 +407,21 @@ 
 					break;
 
 				case '#senseilearnerprofile':
-					$item->url = esc_url( Sensei()->learner_profiles->get_permalink() );
+					$item->url = esc_url(Sensei()->learner_profiles->get_permalink());
 					break;
 
 				case '#senseiloginlogout':
-						$logout_url = wp_logout_url( home_url() );
+						$logout_url = wp_logout_url(home_url());
 						// Login link links to the My Courses page, to avoid the WP dashboard.
 						$login_url = $my_courses_url;
 
-						$item->url = ( is_user_logged_in() ? $logout_url : $login_url );
+						$item->url = (is_user_logged_in() ? $logout_url : $login_url);
 
 						// determine the menu title login or logout
-						if ( is_user_logged_in() ) {
-							$menu_title =  __( 'Logout'  ,'woothemes-sensei');
+						if (is_user_logged_in()) {
+							$menu_title = __('Logout', 'woothemes-sensei');
 						} else {
-							$menu_title =  __( 'Login'  ,'woothemes-sensei');
+							$menu_title = __('Login', 'woothemes-sensei');
 						}
 
 						/**
@@ -431,7 +431,7 @@ 
 						 *
 						 * @param $menu_title
 						 */
-						$item->title = apply_filters( 'sensei_login_logout_menu_title', $menu_title );
+						$item->title = apply_filters('sensei_login_logout_menu_title', $menu_title);
 
 					break;
 
@@ -439,12 +439,12 @@ 
 					break;
 			}
 
-			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
-			$item_url = untrailingslashit( $item->url );
-			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
+			$_root_relative_current = untrailingslashit($_SERVER['REQUEST_URI']);
+			$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_root_relative_current);
+			$item_url = untrailingslashit($item->url);
+			$_indexless_current = untrailingslashit(preg_replace('/'.preg_quote($wp_rewrite->index, '/').'$/', '', $current_url));
 			// Highlight current menu item
-			if ( $item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+			if ($item_url && in_array($item_url, array($current_url, $_indexless_current, $_root_relative_current))) {
 				$item->classes[] = 'current-menu-item current_page_item';
 			}
 
@@ -463,26 +463,26 @@ 
 	 * @param object $sorted_menu_items
 	 * @return object $sorted_menu_items
 	 */
-	public function sensei_wp_nav_menu_objects( $sorted_menu_items ) {
+	public function sensei_wp_nav_menu_objects($sorted_menu_items) {
 
-		foreach( $sorted_menu_items as $k=>$item ) {
+		foreach ($sorted_menu_items as $k=>$item) {
 
 			// Remove the My Messages link for logged out users or if Private Messages are disabled
-			if( ! get_post_type_archive_link( 'sensei_message' )
-                && '#senseimymessages' == $item->url ) {
+			if ( ! get_post_type_archive_link('sensei_message')
+                && '#senseimymessages' == $item->url) {
 
-				if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) {
+				if ( ! is_user_logged_in() || (isset(Sensei()->settings->settings['messages_disable']) && Sensei()->settings->settings['messages_disable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
 			// Remove the My Profile link for logged out users.
-			if( Sensei()->learner_profiles->get_permalink() == $item->url ) {
+			if (Sensei()->learner_profiles->get_permalink() == $item->url) {
 
-				if ( !is_user_logged_in() || ! ( isset( Sensei()->settings->settings[ 'learner_profile_enable' ] ) && Sensei()->settings->settings[ 'learner_profile_enable' ] ) ) {
+				if ( ! is_user_logged_in() || ! (isset(Sensei()->settings->settings['learner_profile_enable']) && Sensei()->settings->settings['learner_profile_enable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
@@ -494,7 +494,7 @@ 
 	function sensei_search_results_classes($classes) {
 	    global $post;
 	    // Handle Search Classes for Courses, Lessons, and WC Products
-	    if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) {
+	    if (isset($post->post_type) && (('course' == $post->post_type) || ('lesson' == $post->post_type) || ('product' == $post->post_type))) {
 	    	$classes[] = 'post';
 		} // End If Statement
 	    return $classes;
@@ -522,16 +522,16 @@ 
      * @param bool|false $return
      * @return string|void
 	 */
-	function sensei_course_image( $course_id, $width = '100', $height = '100', $return = false ) {
+	function sensei_course_image($course_id, $width = '100', $height = '100', $return = false) {
 
-    	if ( ! $return ) {
+    	if ( ! $return) {
 
-			echo Sensei()->course->course_image( $course_id, $width, $height );
+			echo Sensei()->course->course_image($course_id, $width, $height);
             return '';
 
 		} // End If Statement
 
-		return Sensei()->course->course_image( $course_id, $width, $height );
+		return Sensei()->course->course_image($course_id, $width, $height);
 
 	} // End sensei_course_image()
 
@@ -546,15 +546,15 @@ 
      * @param bool|false $widget
      * @return string
 	 */
-	function sensei_lesson_image( $lesson_id, $width = '100', $height = '100', $return = false, $widget = false ) {
+	function sensei_lesson_image($lesson_id, $width = '100', $height = '100', $return = false, $widget = false) {
 
-        if( ! $return ){
+        if ( ! $return) {
 
-            echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+            echo Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
             return '';
         }
 
-        return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+        return Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
 
 	} // End sensei_lesson_image()
 
@@ -562,20 +562,20 @@ 
      * @since 1.0.0
      * @param WP_Query $query
      */
-    function sensei_course_archive_pagination( $query ) {
+    function sensei_course_archive_pagination($query) {
 
-		if( ! is_admin() && $query->is_main_query() && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'newcourses', 'featuredcourses', 'freecourses', 'paidcourses' ) ) ) {
+		if ( ! is_admin() && $query->is_main_query() && isset($_GET['action']) && in_array($_GET['action'], array('newcourses', 'featuredcourses', 'freecourses', 'paidcourses'))) {
 
 			$amount = 0;
-			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
+				$amount = absint(Sensei()->settings->settings['course_archive_amount']);
 			}
 
-			if( $amount ) {
-				$query->set( 'posts_per_page', $amount );
+			if ($amount) {
+				$query->set('posts_per_page', $amount);
 			}
 
-			$query->set( 'orderby', 'menu_order date' );
+			$query->set('orderby', 'menu_order date');
 
 		}
 	}
@@ -591,7 +591,7 @@ 
 	function sensei_course_archive_header(  ) {
 
         trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header ');
-        WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' );
+        WooThemes_Sensei_Course::archive_header('', '<header class="archive-header"><h1>', '</h1></header>');
 
 	} // sensei_course_archive_header()
 
@@ -604,15 +604,15 @@ 
 	 * @return void
 	 */
 	public function sensei_lesson_archive_header( ) {
-        _deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' );
+        _deprecated_function('WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header');
         Sensei()->lesson->the_archive_header();
 	} // sensei_course_archive_header()
 
     /**
      * @deprecated since 1.9.0
      */
-	public function sensei_message_archive_header( ){
-        _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
+	public function sensei_message_archive_header( ) {
+        _deprecated_function('Sensei_Frontend::sensei_message_archive_header', 'Please use: Sense');
         Sensei_Messages::the_archive_header();
 	} // sensei_message_archive_header()
 
@@ -622,15 +622,15 @@ 
      * @param WP_Post $post_item
 	 * @return void
 	 */
-	function sensei_course_archive_course_title( $post_item ) {
-		if ( isset( $post_item->ID ) && ( 0 < $post_item->ID ) ) {
-			$post_id = absint( $post_item->ID );
+	function sensei_course_archive_course_title($post_item) {
+		if (isset($post_item->ID) && (0 < $post_item->ID)) {
+			$post_id = absint($post_item->ID);
     		$post_title = $post_item->post_title;
 		} else {
 			$post_id = get_the_ID();
     		$post_title = get_the_title();
 		} // End If Statement
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_course_archive_course_title()
 
 	/**
@@ -641,7 +641,7 @@ 
 	public function sensei_lesson_archive_lesson_title() {
 		$post_id = get_the_ID();
     	$post_title = get_the_title();
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_lesson_archive_lesson_title()
 
 	/**
@@ -650,40 +650,40 @@ 
 	 * @param  integer $id course, lesson or quiz id
 	 * @return void
 	 */
-	public function sensei_breadcrumb( $id = 0 ) {
+	public function sensei_breadcrumb($id = 0) {
 
 		// Only output on lesson, quiz and taxonomy (module) pages
-		if( ! ( is_tax( 'module' ) || is_singular( 'lesson' ) || is_singular( 'quiz' ) ) ) return;
+		if ( ! (is_tax('module') || is_singular('lesson') || is_singular('quiz'))) return;
 
-		if( empty( $id )  ){
+		if (empty($id)) {
 
             $id = get_the_ID();
 
         }
 
-		$sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' );
-		$separator = apply_filters( 'sensei_breadcrumb_separator', '&gt;' );
+		$sensei_breadcrumb_prefix = __('Back to: ', 'woothemes-sensei');
+		$separator = apply_filters('sensei_breadcrumb_separator', '&gt;');
 
-		$html = '<section class="sensei-breadcrumb">' . $sensei_breadcrumb_prefix;
+		$html = '<section class="sensei-breadcrumb">'.$sensei_breadcrumb_prefix;
 		// Lesson
-		if ( is_singular( 'lesson' ) && 0 < intval( $id ) ) {
-			$course_id = intval( get_post_meta( $id, '_lesson_course', true ) );
-			if( ! $course_id ) {
+		if (is_singular('lesson') && 0 < intval($id)) {
+			$course_id = intval(get_post_meta($id, '_lesson_course', true));
+			if ( ! $course_id) {
 				return;
 			}
-			$html .= '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Back to the course', 'woothemes-sensei' ) . '">' . get_the_title( $course_id ) . '</a>';
+			$html .= '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Back to the course', 'woothemes-sensei').'">'.get_the_title($course_id).'</a>';
     	} // End If Statement
     	// Quiz
-		if ( is_singular( 'quiz' ) && 0 < intval( $id ) ) {
-			$lesson_id = intval( get_post_meta( $id, '_quiz_lesson', true ) );
-			if( ! $lesson_id ) {
+		if (is_singular('quiz') && 0 < intval($id)) {
+			$lesson_id = intval(get_post_meta($id, '_quiz_lesson', true));
+			if ( ! $lesson_id) {
 				return;
 			}
-			 $html .= '<a href="' . esc_url( get_permalink( $lesson_id ) ) . '" title="' .  __( 'Back to the lesson', 'woothemes-sensei' ) . '">' . get_the_title( $lesson_id ) . '</a>';
+			 $html .= '<a href="'.esc_url(get_permalink($lesson_id)).'" title="'.__('Back to the lesson', 'woothemes-sensei').'">'.get_the_title($lesson_id).'</a>';
     	} // End If Statement
 
     	// Allow other plugins to filter html
-    	$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
+    	$html = apply_filters('sensei_breadcrumb_output', $html, $separator);
     	$html .= '</section>';
 
     	echo $html;
@@ -695,25 +695,25 @@ 
      */
 	public function sensei_lesson_course_signup_link( ) {
 
-        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' );
+        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link');
         WooThemes_Sensei_Lesson::course_signup_link();
 	}
 
-	public function lesson_tags_display( $lesson_id = 0 ) {
-		if( $lesson_id ) {
-			$tags = wp_get_post_terms( $lesson_id, 'lesson-tag' );
-			if( $tags && count( $tags ) > 0 ) {
+	public function lesson_tags_display($lesson_id = 0) {
+		if ($lesson_id) {
+			$tags = wp_get_post_terms($lesson_id, 'lesson-tag');
+			if ($tags && count($tags) > 0) {
 				$tag_list = '';
-				foreach( $tags as $tag ) {
-					$tag_link = get_term_link( $tag, 'lesson-tag' );
-					if( ! is_wp_error( $tag_link ) ) {
-						if( $tag_list ) { $tag_list .= ', '; }
-						$tag_list .= '<a href="' . $tag_link . '">' . $tag->name . '</a>';
+				foreach ($tags as $tag) {
+					$tag_link = get_term_link($tag, 'lesson-tag');
+					if ( ! is_wp_error($tag_link)) {
+						if ($tag_list) { $tag_list .= ', '; }
+						$tag_list .= '<a href="'.$tag_link.'">'.$tag->name.'</a>';
 					}
 				}
-				if( $tag_list ) {
+				if ($tag_list) {
 					?><section class="lesson-tags">
-		    			<?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?>
+		    			<?php printf(__('Lesson tags: %1$s', 'woothemes-sensei'), $tag_list); ?>
 		    		</section><?php
 		    	}
 	    	}
@@ -723,51 +723,51 @@ 
     /**
      * @param WP_Query $query
      */
-	public function lesson_tag_archive_filter( $query ) {
-    	if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
+	public function lesson_tag_archive_filter($query) {
+    	if (is_tax('lesson-tag') && $query->is_main_query()) {
     		// Limit to lessons only
-    		$query->set( 'post_type', 'lesson' );
+    		$query->set('post_type', 'lesson');
 
     		// Set order of lessons
-    		$query->set( 'orderby', 'menu_order' );
-    		$query->set( 'order', 'ASC' );
+    		$query->set('orderby', 'menu_order');
+    		$query->set('order', 'ASC');
 
     	}
     }
 
-    public function lesson_tag_archive_header( $title ) {
-		if( is_tax( 'lesson-tag' ) ) {
-			$title = sprintf( __( 'Lesson tag: %1$s', 'woothemes-sensei' ), apply_filters( 'sensei_lesson_tag_archive_title', get_queried_object()->name ) );
+    public function lesson_tag_archive_header($title) {
+		if (is_tax('lesson-tag')) {
+			$title = sprintf(__('Lesson tag: %1$s', 'woothemes-sensei'), apply_filters('sensei_lesson_tag_archive_title', get_queried_object()->name));
 		}
 		return $title;
 	}
 
 	public function lesson_tag_archive_description() {
-		if( is_tax( 'lesson-tag' ) ) {
+		if (is_tax('lesson-tag')) {
 			$tag = get_queried_object();
-			echo '<p class="archive-description lesson-description">' . apply_filters( 'sensei_lesson_tag_archive_description', nl2br( $tag->description ), $tag->term_id ) . '</p>';
+			echo '<p class="archive-description lesson-description">'.apply_filters('sensei_lesson_tag_archive_description', nl2br($tag->description), $tag->term_id).'</p>';
 		}
 	}
 
 	public function sensei_complete_lesson() {
-		global $post,  $current_user;
+		global $post, $current_user;
 		// Handle Quiz Completion
-		if ( isset( $_POST['quiz_action'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_lesson_noonce' ], 'woothemes_sensei_complete_lesson_noonce' ) ) {
+		if (isset($_POST['quiz_action']) && wp_verify_nonce($_POST['woothemes_sensei_complete_lesson_noonce'], 'woothemes_sensei_complete_lesson_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['quiz_action'] );
+			$sanitized_submit = esc_html($_POST['quiz_action']);
 
 			switch ($sanitized_submit) {
                 case 'lesson-complete':
 
-					Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true );
+					Sensei_Utils::sensei_start_lesson($post->ID, $current_user->ID, $complete = true);
 
 					break;
 
                 case 'lesson-reset':
 
-					Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_lesson($post->ID, $current_user->ID);
 
-					$this->messages = '<div class="sensei-message note">' .  __( 'Lesson Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+					$this->messages = '<div class="sensei-message note">'.__('Lesson Reset Successfully.', 'woothemes-sensei').'</div>';
 					break;
 
 				default:
@@ -781,14 +781,14 @@ 
 	} // End sensei_complete_lesson()
 
 	public function sensei_complete_course() {
-		global $post,  $current_user, $wp_query;
-		if ( isset( $_POST['course_complete'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_course_noonce' ], 'woothemes_sensei_complete_course_noonce' ) ) {
+		global $post, $current_user, $wp_query;
+		if (isset($_POST['course_complete']) && wp_verify_nonce($_POST['woothemes_sensei_complete_course_noonce'], 'woothemes_sensei_complete_course_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['course_complete'] );
-			$sanitized_course_id = absint( esc_html( $_POST['course_complete_id'] ) );
+			$sanitized_submit = esc_html($_POST['course_complete']);
+			$sanitized_course_id = absint(esc_html($_POST['course_complete_id']));
 			// Handle submit data
 			switch ($sanitized_submit) {
-				case __( 'Mark as Complete', 'woothemes-sensei' ):
+				case __('Mark as Complete', 'woothemes-sensei'):
 
 					// Add user to course
 					$course_metadata = array(
@@ -796,15 +796,15 @@ 
 						'percent' => 0, // No completed lessons yet
 						'complete' => 0,
 					);
-					$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata );
+					$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata);
 
-					if ( $activity_logged ) {
+					if ($activity_logged) {
 						// Get all course lessons
-						$course_lesson_ids = Sensei()->course->course_lessons( $sanitized_course_id, 'any', 'ids' );
+						$course_lesson_ids = Sensei()->course->course_lessons($sanitized_course_id, 'any', 'ids');
 						// Mark all quiz user meta lessons as complete
-						foreach ( $course_lesson_ids as $lesson_item_id ){
+						foreach ($course_lesson_ids as $lesson_item_id) {
 							// Mark lesson as complete
-							$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_item_id, $current_user->ID, $complete = true );
+							$activity_logged = Sensei_Utils::sensei_start_lesson($lesson_item_id, $current_user->ID, $complete = true);
 						} // End For Loop
 
 						// Update with final stats
@@ -812,22 +812,22 @@ 
 							'percent' => 100,
 							'complete' => count($course_lesson_ids),
 						);
-						$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'complete', $course_metadata );
+						$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'complete', $course_metadata);
 
-						do_action( 'sensei_user_course_end', $current_user->ID, $sanitized_course_id );
+						do_action('sensei_user_course_end', $current_user->ID, $sanitized_course_id);
 
 						// Success message
-						$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s marked as complete.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+						$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s marked as complete.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					} // End If Statement
 
 					break;
 
-				case __( 'Delete Course', 'woothemes-sensei' ):
+				case __('Delete Course', 'woothemes-sensei'):
 
-					Sensei_Utils::sensei_remove_user_from_course( $sanitized_course_id, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_course($sanitized_course_id, $current_user->ID);
 
 					// Success message
-					$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s deleted.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+					$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s deleted.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					break;
 
 				default:
@@ -843,25 +843,25 @@ 
 	 * @param int $lesson_id
 	 * @return array
 	 */
-	public function sensei_get_user_quiz_answers( $lesson_id = 0 ) {
+	public function sensei_get_user_quiz_answers($lesson_id = 0) {
 		global $current_user;
 
 		$user_answers = array();
 
-		if ( 0 < intval( $lesson_id ) ) {
-			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $lesson_id );
-			foreach( $lesson_quiz_questions as $question ) {
-				$answer = maybe_unserialize( base64_decode( Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content' ) ) ) );
-				$user_answers[ $question->ID ] = $answer;
+		if (0 < intval($lesson_id)) {
+			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($lesson_id);
+			foreach ($lesson_quiz_questions as $question) {
+				$answer = maybe_unserialize(base64_decode(Sensei_Utils::sensei_get_activity_value(array('post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content'))));
+				$user_answers[$question->ID] = $answer;
 			}
 		}
 
 		return $user_answers;
 	} // End sensei_get_user_quiz_answers()
 
-	public function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	public function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -871,14 +871,14 @@ 
 		Sensei()->notices->print_notices();
 	} // End sensei_frontend_messages()
 
-	public function sensei_lesson_video( $post_id = 0 ) {
-		if ( 0 < intval( $post_id ) ) {
-			$lesson_video_embed = get_post_meta( $post_id, '_lesson_video_embed', true );
-			if ( 'http' == substr( $lesson_video_embed, 0, 4) ) {
+	public function sensei_lesson_video($post_id = 0) {
+		if (0 < intval($post_id)) {
+			$lesson_video_embed = get_post_meta($post_id, '_lesson_video_embed', true);
+			if ('http' == substr($lesson_video_embed, 0, 4)) {
         		// V2 - make width and height a setting for video embed
-        		$lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ );
+        		$lesson_video_embed = wp_oembed_get(esc_url($lesson_video_embed)/*, array( 'width' => 100 , 'height' => 100)*/);
         	} // End If Statement
-        	if ( '' != $lesson_video_embed ) {
+        	if ('' != $lesson_video_embed) {
         	?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
         	} // End If Statement
         } // End If Statement
@@ -890,19 +890,19 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$pass_required = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-	    	$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+	    	$pass_required = get_post_meta($quiz_id, '_pass_required', true);
 	    }
-		if( ! $quiz_id || ( $quiz_id && ! $pass_required ) ) {
+		if ( ! $quiz_id || ($quiz_id && ! $pass_required)) {
 			?>
-			<form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+			<form class="lesson_button_form" method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 	            <input type="hidden"
                        name="woothemes_sensei_complete_lesson_noonce"
                        id="woothemes_sensei_complete_lesson_noonce"
-                       value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>"
+                       value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>"
                 />
 
 	            <input type="hidden" name="quiz_action" value="lesson-complete" />
@@ -910,7 +910,7 @@ 
                 <input type="submit"
                        name="quiz_complete"
                        class="quiz-submit complete"
-                       value="<?php _e( 'Complete Lesson', 'woothemes-sensei' ); ?>"/>
+                       value="<?php _e('Complete Lesson', 'woothemes-sensei'); ?>"/>
 
 	        </form>
 			<?php
@@ -923,25 +923,25 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$reset_allowed = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-			$reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+			$reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
 		}
-		if ( ! $quiz_id || !empty($reset_allowed) ) {
+		if ( ! $quiz_id || ! empty($reset_allowed)) {
 		?>
-		<form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		<form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
             <input
             type="hidden"
-            name="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            id="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>" />
+            name="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            id="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>" />
 
             <input type="hidden" name="quiz_action" value="lesson-reset" />
 
-            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e( 'Reset Lesson', 'woothemes-sensei' ); ?>"/>
+            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e('Reset Lesson', 'woothemes-sensei'); ?>"/>
 
         </form>
 		<?php
@@ -964,23 +964,23 @@ 
 		$post_title = get_the_title();
 		$author_display_name = get_the_author();
 		$author_id = get_the_author_meta('ID');
-		$category_output = get_the_term_list( $post_id, 'course-category', '', ', ', '' );
-		$free_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $post_id ) );
+		$category_output = get_the_term_list($post_id, 'course-category', '', ', ', '');
+		$free_lesson_count = intval(Sensei()->course->course_lesson_preview_count($post_id));
 		?><section class="entry">
         	<p class="sensei-course-meta">
-           	<?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>
-		   	<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+           	<?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?>
+		   	<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . '&nbsp;' . __( 'Lessons', 'woothemes-sensei' ); ?></span>
-		   	<?php if ( '' != $category_output ) { ?>
-		   	<span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
+		   	<?php if ('' != $category_output) { ?>
+		   	<span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<?php sensei_simple_course_price( $post_id ); ?>
+		   	<?php sensei_simple_course_price($post_id); ?>
         	</p>
         	<p class="course-excerpt"><?php the_excerpt(); ?></p>
-        	<?php if ( 0 < $free_lesson_count ) {
-                $free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?>
-                <p class="sensei-free-lessons"><a href="<?php echo get_permalink( $post_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?></a> - <?php echo $free_lessons; ?></p>
+        	<?php if (0 < $free_lesson_count) {
+                $free_lessons = sprintf(__('You can access %d of this course\'s lessons for free', 'woothemes-sensei'), $free_lesson_count); ?>
+                <p class="sensei-free-lessons"><a href="<?php echo get_permalink($post_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?></a> - <?php echo $free_lessons; ?></p>
             <?php } ?>
 		</section><?php
 	} // End sensei_course_archive_meta()
@@ -1003,33 +1003,33 @@ 
     * @deprecated since 1.9.0
     */
 	public function sensei_message_archive_main_content() {
-		_deprecated_function( 'Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed' );
+		_deprecated_function('Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed');
 	} // End sensei_lesson_archive_main_content()
 
     /**
     * @deprecated since 1.9.0
     */
 	public function sensei_no_permissions_main_content() {
-        _deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' );
+        _deprecated_function('Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed');
 	} // End sensei_no_permissions_main_content()
 
 	public function sensei_course_category_main_content() {
 		global $post;
-		if ( have_posts() ) { ?>
+		if (have_posts()) { ?>
 
 			<section id="main-course" class="course-container">
 
-                <?php do_action( 'sensei_course_archive_header' ); ?>
+                <?php do_action('sensei_course_archive_header'); ?>
 
-                <?php while ( have_posts() ) { the_post(); ?>
+                <?php while (have_posts()) { the_post(); ?>
 
-                    <article class="<?php echo join( ' ', get_post_class( array( 'course', 'post' ), get_the_ID() ) ); ?>">
+                    <article class="<?php echo join(' ', get_post_class(array('course', 'post'), get_the_ID())); ?>">
 
-	    			    <?php sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', get_the_ID() ); ?>
+	    			    <?php sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', get_the_ID()); ?>
 
-	    			    <?php sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before', $post ); ?>
+	    			    <?php sensei_do_deprecated_action('sensei_course_archive_course_title', '1.9.0', 'sensei_course_content_inside_before', $post); ?>
 
-	    			    <?php do_action( 'sensei_course_archive_meta' ); ?>
+	    			    <?php do_action('sensei_course_archive_meta'); ?>
 
 	    		    </article>
 
@@ -1041,7 +1041,7 @@ 
 
 			<p>
 
-                <?php _e( 'No courses found that match your selection.', 'woothemes-sensei' ); ?>
+                <?php _e('No courses found that match your selection.', 'woothemes-sensei'); ?>
 
             </p>
 
@@ -1058,12 +1058,12 @@ 
 				<div class="col-1">
 					<?php
 					// output the actual form markup
-                    Sensei_Templates::get_template( 'user/login-form.php');
+                    Sensei_Templates::get_template('user/login-form.php');
 					?>
 				</div>
 
 			<?php
-			if ( get_option('users_can_register') ) {
+			if (get_option('users_can_register')) {
 
 				// get current url
 				$action_url = get_permalink();
@@ -1071,38 +1071,38 @@ 
 				?>
 
 				<div class="col-2">
-					<h2><?php _e( 'Register', 'woothemes-sensei' ); ?></h2>
+					<h2><?php _e('Register', 'woothemes-sensei'); ?></h2>
 
-					<form method="post" class="register"  action="<?php echo esc_url( $action_url ); ?>" >
+					<form method="post" class="register"  action="<?php echo esc_url($action_url); ?>" >
 
-						<?php do_action( 'sensei_register_form_start' ); ?>
+						<?php do_action('sensei_register_form_start'); ?>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_username"><?php _e( 'Username', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty( $_POST['sensei_reg_username'] ) ) esc_attr_e( $_POST['sensei_reg_username'] ); ?>" />
+							<label for="sensei_reg_username"><?php _e('Username', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty($_POST['sensei_reg_username'])) esc_attr_e($_POST['sensei_reg_username']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_email"><?php _e( 'Email address', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty( $_POST['sensei_reg_email'] ) ) esc_attr_e( $_POST['sensei_reg_email'] ); ?>" />
+							<label for="sensei_reg_email"><?php _e('Email address', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty($_POST['sensei_reg_email'])) esc_attr_e($_POST['sensei_reg_email']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_password"><?php _e( 'Password', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty( $_POST['sensei_reg_password'] ) ) esc_attr_e( $_POST['sensei_reg_password'] ); ?>" />
+							<label for="sensei_reg_password"><?php _e('Password', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty($_POST['sensei_reg_password'])) esc_attr_e($_POST['sensei_reg_password']); ?>" />
 						</p>
 
 						<!-- Spam Trap -->
-						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woothemes-sensei' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
+						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e('Anti-spam', 'woothemes-sensei'); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
 
-						<?php do_action( 'sensei_register_form_fields' ); ?>
-						<?php do_action( 'register_form' ); ?>
+						<?php do_action('sensei_register_form_fields'); ?>
+						<?php do_action('register_form'); ?>
 
 						<p class="form-row">
-							<input type="submit" class="button" name="register" value="<?php _e( 'Register', 'woothemes-sensei' ); ?>" />
+							<input type="submit" class="button" name="register" value="<?php _e('Register', 'woothemes-sensei'); ?>" />
 						</p>
 
-						<?php do_action( 'sensei_register_form_end' ); ?>
+						<?php do_action('sensei_register_form_end'); ?>
 
 					</form>
 				</div>
@@ -1115,17 +1115,17 @@ 
 		<?php
 	} // End sensei_login_form()
 
-	public function sensei_lesson_meta( $post_id = 0 ) {
+	public function sensei_lesson_meta($post_id = 0) {
 		global $post;
-		if ( 0 < intval( $post_id ) ) {
-		$lesson_course_id = absint( get_post_meta( $post_id, '_lesson_course', true ) );
+		if (0 < intval($post_id)) {
+		$lesson_course_id = absint(get_post_meta($post_id, '_lesson_course', true));
 		?><section class="entry">
             <p class="sensei-course-meta">
-			    <?php if ( isset( Sensei()->settings->settings[ 'lesson_author' ] ) && ( Sensei()->settings->settings[ 'lesson_author' ] ) ) { ?>
-			    <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+			    <?php if (isset(Sensei()->settings->settings['lesson_author']) && (Sensei()->settings->settings['lesson_author'])) { ?>
+			    <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 			    <?php } ?>
-                <?php if ( 0 < intval( $lesson_course_id ) ) { ?>
-                <span class="lesson-course"><?php echo '&nbsp;' . sprintf( __( 'Part of: %s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '" title="' . __( 'View course', 'woothemes-sensei' ) . '"><em>' . get_the_title( $lesson_course_id ) . '</em></a>' ); ?></span>
+                <?php if (0 < intval($lesson_course_id)) { ?>
+                <span class="lesson-course"><?php echo '&nbsp;'.sprintf(__('Part of: %s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($lesson_course_id)).'" title="'.__('View course', 'woothemes-sensei').'"><em>'.get_the_title($lesson_course_id).'</em></a>'); ?></span>
                 <?php } ?>
             </p>
             <p class="lesson-excerpt"><?php the_excerpt( ); ?></p>
@@ -1133,36 +1133,36 @@ 
 		} // End If Statement
 	} // sensei_lesson_meta()
 
-	public function sensei_lesson_preview_title_text( $course_id ) {
+	public function sensei_lesson_preview_title_text($course_id) {
 
-		$preview_text = __( ' (Preview)', 'woothemes-sensei' );
+		$preview_text = __(' (Preview)', 'woothemes-sensei');
 
 		//if this is a paid course
-		if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	$preview_text = __( ' (Free Preview)', 'woothemes-sensei' );
+		if (Sensei_WC::is_woocommerce_active()) {
+    	    $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
+    	    if (0 < $wc_post_id) {
+    	    	$preview_text = __(' (Free Preview)', 'woothemes-sensei');
     	    } // End If Statement
     	}
     	return $preview_text;
 	}
 
-	public function sensei_lesson_preview_title( $title = '', $id = 0 ) {
+	public function sensei_lesson_preview_title($title = '', $id = 0) {
 		global $post, $current_user;
 
 		// Limit to lessons and check if lesson ID matches filtered post ID
 		// @see https://github.com/woothemes/sensei/issues/574
-		if( isset( $post->ID ) && $id == $post->ID && 'lesson' == get_post_type( $post ) ) {
+		if (isset($post->ID) && $id == $post->ID && 'lesson' == get_post_type($post)) {
 
 			// Limit to main query only
-			if( is_main_query() ) {
+			if (is_main_query()) {
 
 				// Get the course ID
-				$course_id = get_post_meta( $post->ID, '_lesson_course', true );
+				$course_id = get_post_meta($post->ID, '_lesson_course', true);
 
 				// Check if the user is taking the course
-				if( is_singular( 'lesson' ) && Sensei_Utils::is_preview_lesson( $post->ID ) && ! Sensei_Utils::user_started_course( $course_id, $current_user->ID ) && $post->ID == $id ) {
-					$title .= ' ' . $this->sensei_lesson_preview_title_text( $course_id );
+				if (is_singular('lesson') && Sensei_Utils::is_preview_lesson($post->ID) && ! Sensei_Utils::user_started_course($course_id, $current_user->ID) && $post->ID == $id) {
+					$title .= ' '.$this->sensei_lesson_preview_title_text($course_id);
 				}
 			}
 		}
@@ -1173,23 +1173,23 @@ 
 		global $post, $current_user;
 
 		// Check if the user is taking the course
-		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		$is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID);
 		// Handle user starting the course
-		if ( isset( $_POST['course_start'] )
-		    && wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' )
-		    && !$is_user_taking_course ) {
+		if (isset($_POST['course_start'])
+		    && wp_verify_nonce($_POST['woothemes_sensei_start_course_noonce'], 'woothemes_sensei_start_course_noonce')
+		    && ! $is_user_taking_course) {
 
 			// Start the course
-			$activity_logged = Sensei_Utils::user_start_course( $current_user->ID, $post->ID );
+			$activity_logged = Sensei_Utils::user_start_course($current_user->ID, $post->ID);
 			$this->data = new stdClass();
 			$this->data->is_user_taking_course = false;
-			if ( $activity_logged ) {
+			if ($activity_logged) {
 				$this->data->is_user_taking_course = true;
 
 				// Refresh page to avoid re-posting
 				?>
 
-			    <script type="text/javascript"> window.location = '<?php echo get_permalink( $post->ID ); ?>'; </script>
+			    <script type="text/javascript"> window.location = '<?php echo get_permalink($post->ID); ?>'; </script>
 
 			    <?php
 			} // End If Statement
@@ -1200,15 +1200,15 @@ 
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' );
-        Sensei()->course->the_course_meta( get_post() );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta', '1.9.0', 'Sensei_Course::the_course_meta()');
+        Sensei()->course->the_course_meta(get_post());
 	} // End sensei_course_meta()
 
     /**
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta_video() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta_video', '1.9.0', 'Sensei_Course::the_course_video()');
         Sensei_Course::the_course_video();
 	} // End sensei_course_meta_video()
 
@@ -1223,12 +1223,12 @@ 
     public function sensei_woocommerce_in_cart_message() {
 		global $post, $woocommerce;
 
-		$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() );
-		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+		$wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
+        $user_course_status_id = Sensei_Utils::user_started_course($post->ID, get_current_user_id());
+		if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-			if ( Sensei_WC::is_product_in_cart( $wc_post_id ) ) {
-				echo '<div class="sensei-message info">' . sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei') . '</div>', '<a class="cart-complete" href="' . $woocommerce->cart->get_checkout_url() . '" title="' . __('complete the purchase', 'woothemes-sensei') . '">' . __('complete the purchase', 'woothemes-sensei') . '</a>' );
+			if (Sensei_WC::is_product_in_cart($wc_post_id)) {
+				echo '<div class="sensei-message info">'.sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei').'</div>', '<a class="cart-complete" href="'.$woocommerce->cart->get_checkout_url().'" title="'.__('complete the purchase', 'woothemes-sensei').'">'.__('complete the purchase', 'woothemes-sensei').'</a>');
 			} // End If Statement
 
 		} // End If Statement
@@ -1236,7 +1236,7 @@ 
 	} // End sensei_woocommerce_in_cart_message()
 
 	// Deprecated
-	public function sensei_lesson_comment_count( $count ) {
+	public function sensei_lesson_comment_count($count) {
 		return $count;
 	} // End sensei_lesson_comment_count()
 
@@ -1245,11 +1245,11 @@ 
 	 * @param  string $content Original content
 	 * @return string          Modified content
 	 */
-	public function sensei_search_results_excerpt( $content ) {
+	public function sensei_search_results_excerpt($content) {
 		global $post;
 
-		if( is_search() && in_array( $post->post_type, array( 'course', 'lesson' ) ) ) {
-			$content = '<p class="course-excerpt">' . the_excerpt( ) . '</p>';
+		if (is_search() && in_array($post->post_type, array('course', 'lesson'))) {
+			$content = '<p class="course-excerpt">'.the_excerpt( ).'</p>';
 		}
 
 		return $content;
@@ -1260,11 +1260,11 @@ 
 	 * @param  integer $order_id ID of order
 	 * @return void
 	 */
-	public function remove_active_course( $order_id ) {
-		$order = new WC_Order( $order_id );
+	public function remove_active_course($order_id) {
+		$order = new WC_Order($order_id);
 
-		foreach ( $order->get_items() as $item ) {
-			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+		foreach ($order->get_items() as $item) {
+			if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 				// If item has variation_id then its a variation of the product
 				$item_id = $item['variation_id'];
 			} else {
@@ -1272,11 +1272,11 @@ 
 				$item_id = $item['product_id'];
 			} 
 
-            if ( $item_id > 0 ) {
+            if ($item_id > 0) {
 
-				$user_id = get_post_meta( $order_id, '_customer_user', true );
+				$user_id = get_post_meta($order_id, '_customer_user', true);
 
-				if( $user_id ) {
+				if ($user_id) {
 
 					// Get all courses for product
 					$args = array(
@@ -1292,13 +1292,13 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $args );
+					$course_ids = get_posts($args);
 
-					if( $course_ids && count( $course_ids ) > 0 ) {
-						foreach( $course_ids as $course_id ) {
+					if ($course_ids && count($course_ids) > 0) {
+						foreach ($course_ids as $course_id) {
 
 							// Remove all course user meta
-							Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+							Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
 
 						} // End For Loop
 					} // End If Statement
@@ -1314,16 +1314,16 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function activate_purchased_courses( $user_id = 0 ) {
+	public function activate_purchased_courses($user_id = 0) {
 
-		if( $user_id ) {
+		if ($user_id) {
 
-			if( Sensei_WC::is_woocommerce_active() ) {
+			if (Sensei_WC::is_woocommerce_active()) {
 
 				// Get all user's orders
 				$order_args = array(
 					'post_type' => 'shop_order',
-					'post_status' =>  array( 'wc-processing', 'wc-completed' ),
+					'post_status' =>  array('wc-processing', 'wc-completed'),
 					'posts_per_page' => -1,
 					'meta_query' => array(
 						array(
@@ -1333,25 +1333,25 @@ 
 					),
 				);
 
-				$orders = get_posts( $order_args );
+				$orders = get_posts($order_args);
 
 				$product_ids = array();
 				$order_ids = array();
 
-				foreach( $orders as $post_id ) {
+				foreach ($orders as $post_id) {
 
 					// Only process each order once
-					$processed = get_post_meta( $post_id, 'sensei_products_processed', true );
+					$processed = get_post_meta($post_id, 'sensei_products_processed', true);
 
-					if( $processed && $processed == 'processed' ) {
+					if ($processed && $processed == 'processed') {
 						continue;
 					}
 
 					// Get course product IDs from order
-					$order = new WC_Order( $post_id );
+					$order = new WC_Order($post_id);
 
 					$items = $order->get_items();
-					foreach( $items as $item ) {
+					foreach ($items as $item) {
                                             if (isset($item['variation_id']) && $item['variation_id'] > 0) {
                                                 $item_id = $item['variation_id'];
                                                 $product_type = 'variation';
@@ -1365,7 +1365,7 @@ 
 					$order_ids[] = $post_id;
 				}
 
-				if( count( $product_ids ) > 0 ) {
+				if (count($product_ids) > 0) {
 
 					// Get all courses from user's orders
 					$course_args = array(
@@ -1382,31 +1382,31 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $course_args );
+					$course_ids = get_posts($course_args);
 
-					foreach( $course_ids as $course_id ) {
+					foreach ($course_ids as $course_id) {
 
-						$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+						$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 						// Ignore course if already completed
-						if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+						if (Sensei_Utils::user_completed_course($user_course_status)) {
 							continue;
 						}
 
 						// Ignore course if already started
-						if( $user_course_status ) {
+						if ($user_course_status) {
 							continue;
 						}
 
 						// Mark course as started by user
-						Sensei_Utils::user_start_course( $user_id, $course_id );
+						Sensei_Utils::user_start_course($user_id, $course_id);
 					}
 				}
 
-				if( count( $order_ids ) > 0 ) {
-					foreach( $order_ids as $order_id ) {
+				if (count($order_ids) > 0) {
+					foreach ($order_ids as $order_id) {
 						// Mark order as processed
-						update_post_meta( $order_id, 'sensei_products_processed', 'processed' );
+						update_post_meta($order_id, 'sensei_products_processed', 'processed');
 					}
 				}
 			}
@@ -1420,28 +1420,28 @@ 
 	public function activate_purchased_single_course() {
 		global $post, $current_user;
 
-		if( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 
-			if( ! is_user_logged_in() ) return;
-			if( ! isset( $post->ID ) ) return;
+			if ( ! is_user_logged_in()) return;
+			if ( ! isset($post->ID)) return;
 
 			$user_id = $current_user->ID;
 			$course_id = $post->ID;
-			$course_product_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
-			if( ! $course_product_id ) {
+			$course_product_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true);
+			if ( ! $course_product_id) {
 				return;
 			}
 
-			$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+			$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 			// Ignore course if already completed
-			if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+			if (Sensei_Utils::user_completed_course($user_course_status)) {
 
 				return;
 			}
 
 			// Ignore course if already started
-			if( $user_course_status ) {
+			if ($user_course_status) {
 				return;
 			}
 
@@ -1449,7 +1449,7 @@ 
 			$order_args = array(
 				'post_type' => 'shop_order',
 				'posts_per_page' => -1,
-				'post_status' => array( 'wc-processing', 'wc-completed' ),
+				'post_status' => array('wc-processing', 'wc-completed'),
 				'meta_query' => array(
 					array(
 						'key' => '_customer_user',
@@ -1458,28 +1458,28 @@ 
 				),
 				'fields' => 'ids',
 			);
-			$orders = get_posts( $order_args );
+			$orders = get_posts($order_args);
 
-			foreach( $orders as $order_post_id ) {
+			foreach ($orders as $order_post_id) {
 
 				// Get course product IDs from order
-				$order = new WC_Order( $order_post_id );
+				$order = new WC_Order($order_post_id);
 
 				$items = $order->get_items();
-				foreach( $items as $item ) {
+				foreach ($items as $item) {
 
-                    $product = wc_get_product( $item['product_id'] );
+                    $product = wc_get_product($item['product_id']);
 
                     // handle product bundles
-                    if( is_object( $product ) &&  $product->is_type('bundle') ){
+                    if (is_object($product) && $product->is_type('bundle')) {
 
-                        $bundled_product = new WC_Product_Bundle( $product->id );
+                        $bundled_product = new WC_Product_Bundle($product->id);
                         $bundled_items = $bundled_product->get_bundled_items();
 
-                        foreach( $bundled_items as $bundled_item ){
+                        foreach ($bundled_items as $bundled_item) {
 
-                            if( $bundled_item->product_id == $course_product_id ) {
-                                Sensei_Utils::user_start_course( $user_id, $course_id );
+                            if ($bundled_item->product_id == $course_product_id) {
+                                Sensei_Utils::user_start_course($user_id, $course_id);
                                 return;
                             }
 
@@ -1488,8 +1488,8 @@ 
                     } else {
 
                     // handle regular products
-                        if( $item['product_id'] == $course_product_id ) {
-                            Sensei_Utils::user_start_course( $user_id, $course_id );
+                        if ($item['product_id'] == $course_product_id) {
+                            Sensei_Utils::user_start_course($user_id, $course_id);
                             return;
                         }
 
@@ -1505,9 +1505,9 @@ 
 	 * @param  array  $args Default arguments
 	 * @return array        Modified arguments
 	 */
-	public function hide_sensei_activity( $args = array() ) {
+	public function hide_sensei_activity($args = array()) {
 
-		if( is_singular( 'lesson' ) || is_singular( 'course' ) ) {
+		if (is_singular('lesson') || is_singular('course')) {
 			$args['type'] = 'comment';
 		}
 
@@ -1524,9 +1524,9 @@ 
 
 		//if not posted from the sensei login form let
 		// WordPress or any other party handle the failed request
-	    if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form']  ){
+	    if ( ! isset($_REQUEST['form']) || 'sensei-login' != $_REQUEST['form']) {
 
-	    	return ;
+	    	return;
 
 	    }
 
@@ -1534,9 +1534,9 @@ 
     	$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
 
    		 // if there's a valid referrer, and it's not the default log-in screen
-	    if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){
+	    if ( ! empty($referrer) && ! strstr($referrer, 'wp-login') && ! strstr($referrer, 'wp-admin')) {
 	        // let's append some information (login=failed) to the URL for the theme to use
-	        wp_redirect( esc_url_raw( add_query_arg('login', 'failed',  $referrer) ) );
+	        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 	    	exit;
     	}
 	}// End sensei_login_fail_redirect_to_front_end_login
@@ -1549,10 +1549,10 @@ 
 	function sensei_handle_login_request( ) {
 
 		// Check that it is a sensei login request and if it has a valid nonce
-	    if(  isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) {
+	    if (isset($_REQUEST['form']) && 'sensei-login' == $_REQUEST['form']) {
 
 	    	// Validate the login request nonce
-		    if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
+		    if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'sensei-login')) {
 		    	return;
 		    }
 
@@ -1560,47 +1560,47 @@ 
 		    $referrer = $_REQUEST['_wp_http_referer'];
 		    //$redirect = $_REQUEST['_sensei_redirect'];
 
-		    if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) )
-		    	 && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){
+		    if ((isset($_REQUEST['log']) && ! empty($_REQUEST['log']))
+		    	 && (isset($_REQUEST['pwd']) && ! empty($_REQUEST['pwd']))) {
 
 		    	// when the user has entered a password or username do the sensei login
 		    	$creds = array();
 
 		    	// check if the requests login is an email address
-		    	if( is_email(  trim( $_REQUEST['log'] ) )  ){
+		    	if (is_email(trim($_REQUEST['log']))) {
 		    		// query wordpress for the users details
-		    		$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
+		    		$user = get_user_by('email', sanitize_email($_REQUEST['log']));
 
 		    		// validate the user object
-		    		if( !$user ){
+		    		if ( ! $user) {
 
 		    			// the email doesnt exist
-                        wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+                        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 		        		exit;
 
 		    		}
 
 		    		//assigne the username to the creds array for further processing
-		    		$creds['user_login'] =  $user->user_login ;
+		    		$creds['user_login'] = $user->user_login;
 
-		    	}else{
+		    	} else {
 
 		    		// process this as a default username login
-		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
+		    		$creds['user_login'] = sanitize_text_field($_REQUEST['log']);
 
 		    	}
 
 				// get setup the rest of the creds array
-				$creds['user_password'] = sanitize_text_field( $_REQUEST['pwd'] );
-				$creds['remember'] = isset( $_REQUEST['rememberme'] ) ? true : false ;
+				$creds['user_password'] = sanitize_text_field($_REQUEST['pwd']);
+				$creds['remember'] = isset($_REQUEST['rememberme']) ? true : false;
 
 				//attempt logging in with the given details
-				$user = wp_signon( $creds, false );
+				$user = wp_signon($creds, false);
 
-				if ( is_wp_error($user) ){ // on login failure
-                    wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+				if (is_wp_error($user)) { // on login failure
+                    wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
                     exit;
-				}else{ // on login success
+				} else { // on login success
 
 					/**
 					* change the redirect url programatically
@@ -1610,21 +1610,21 @@ 
 					* @param string $referrer the page where the current url wheresensei login form was posted from
 					*/
 
-					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg( 'login', $referrer ) );
+					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg('login', $referrer));
 
-					wp_redirect( esc_url_raw( $success_redirect_url ) );
+					wp_redirect(esc_url_raw($success_redirect_url));
 		        	exit;
 
 				}	// end is_wp_error($user)
 
-		    }else{ // if username or password is empty
+		    } else { // if username or password is empty
 
-                wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
+                wp_redirect(esc_url_raw(add_query_arg('login', 'emptyfields', $referrer)));
 		        exit;
 
 		    } // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
 
-	    }elseif( ( isset( $_GET['login'] ) ) ) {
+	    }elseif ((isset($_GET['login']))) {
 	    	// else if this request is a redircect from a previously faile login request
 	    	$this->login_message_process();
 
@@ -1643,87 +1643,87 @@ 
 	 * @return void redirect
 	 *
 	 */
-	public function sensei_process_registration(){
+	public function sensei_process_registration() {
 		global 	 $current_user;
 		// check the for the sensei specific registration requests
-		if( !isset( $_POST['sensei_reg_username'] ) && ! isset( $_POST['sensei_reg_email'] ) && !isset( $_POST['sensei_reg_password'] )){
+		if ( ! isset($_POST['sensei_reg_username']) && ! isset($_POST['sensei_reg_email']) && ! isset($_POST['sensei_reg_password'])) {
 			// exit if this is not a sensei registration request
-			return ;
+			return;
 		}
 		// check for spam throw cheating huh
-		if( isset( $_POST['email_2'] ) &&  '' !== $_POST['email_2']   ){
+		if (isset($_POST['email_2']) && '' !== $_POST['email_2']) {
 			$message = 'Error:  The spam field should be empty';
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 			return;
 		}
 
 		// retreive form variables
-		$new_user_name		= sanitize_user( $_POST['sensei_reg_username'] );
-		$new_user_email		= $_POST['sensei_reg_email'];
-		$new_user_password	= $_POST['sensei_reg_password'];
+		$new_user_name = sanitize_user($_POST['sensei_reg_username']);
+		$new_user_email = $_POST['sensei_reg_email'];
+		$new_user_password = $_POST['sensei_reg_password'];
 
 		// Check the username
 		$username_error_notice = '';
-		if ( $new_user_name == '' ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: Please enter a username.' );
-		} elseif ( ! validate_username( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' );
-		} elseif ( username_exists( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' );
+		if ($new_user_name == '') {
+			$username_error_notice = __('<strong>ERROR</strong>: Please enter a username.');
+		} elseif ( ! validate_username($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.');
+		} elseif (username_exists($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is already registered. Please choose another one.');
 		}
 
 		// exit on username error
-		if( '' !== $username_error_notice ){
-			Sensei()->notices->add_notice( $username_error_notice , 'alert');
+		if ('' !== $username_error_notice) {
+			Sensei()->notices->add_notice($username_error_notice, 'alert');
 			return;
 		}
 
 		// Check the e-mail address
 		$email_error_notice = '';
-		if ( $new_user_email == '' ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: Please type your e-mail address.' );
-		} elseif ( ! is_email( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' );
-		} elseif ( email_exists( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' );
+		if ($new_user_email == '') {
+			$email_error_notice = __('<strong>ERROR</strong>: Please type your e-mail address.');
+		} elseif ( ! is_email($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: The email address isn&#8217;t correct.');
+		} elseif (email_exists($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: This email is already registered, please choose another one.');
 		}
 
 		// exit on email address error
-		if( '' !== $email_error_notice ){
-			Sensei()->notices->add_notice( $email_error_notice , 'alert');
+		if ('' !== $email_error_notice) {
+			Sensei()->notices->add_notice($email_error_notice, 'alert');
 			return;
 		}
 
 		//check user password
 
 		// exit on email address error
-		if( empty( $new_user_password ) ){
-			Sensei()->notices->add_notice(  __( '<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.' )  , 'alert');
+		if (empty($new_user_password)) {
+			Sensei()->notices->add_notice(__('<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.'), 'alert');
 			return;
 		}
 
 		// register user
-		$user_id = wp_create_user( $new_user_name, $new_user_password, $new_user_email );
-		if ( ! $user_id || is_wp_error( $user_id ) ) {
-			Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ), 'alert');
+		$user_id = wp_create_user($new_user_name, $new_user_password, $new_user_email);
+		if ( ! $user_id || is_wp_error($user_id)) {
+			Sensei()->notices->add_notice(sprintf(__('<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')), 'alert');
 		}
 
 		// notify the user
-		wp_new_user_notification( $user_id, $new_user_password );
+		wp_new_user_notification($user_id, $new_user_password);
 
 		// set global current user aka log the user in
-		$current_user = get_user_by( 'id', $user_id );
-		wp_set_auth_cookie( $user_id, true );
+		$current_user = get_user_by('id', $user_id);
+		wp_set_auth_cookie($user_id, true);
 
 		// Redirect
 		global $wp;
-		if ( wp_get_referer() ) {
-			$redirect = esc_url( wp_get_referer() );
+		if (wp_get_referer()) {
+			$redirect = esc_url(wp_get_referer());
 		} else {
-			$redirect = esc_url( home_url( $wp->request ) );
+			$redirect = esc_url(home_url($wp->request));
 		}
 
-		wp_redirect( apply_filters( 'sensei_registration_redirect', $redirect ) );
+		wp_redirect(apply_filters('sensei_registration_redirect', $redirect));
 		exit;
 
 	} // end  sensei_process_registration)()
@@ -1734,23 +1734,23 @@ 
 	 * @return void redirect
 	 * @since 1.7.0
 	 */
-	public function login_message_process(){
+	public function login_message_process() {
 
             // setup the message variables
 			$message = '';
 
 			//only output message if the url contains login=failed and login=emptyfields
 
-			if( $_GET['login'] == 'failed' ){
+			if ($_GET['login'] == 'failed') {
 
-				$message = __('Incorrect login details', 'woothemes-sensei' );
+				$message = __('Incorrect login details', 'woothemes-sensei');
 
-			}elseif( $_GET['login'] == 'emptyfields'  ){
+			}elseif ($_GET['login'] == 'emptyfields') {
 
-				$message= __('Please enter your username and password', 'woothemes-sensei' );
+				$message = __('Please enter your username and password', 'woothemes-sensei');
 			}
 
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 
 	}// end login_message_process
 
@@ -1762,11 +1762,11 @@ 
      * @return void redirect
      *
      */
-    public function sensei_show_admin_bar () {
+    public function sensei_show_admin_bar() {
 
         if (current_user_can('edit_courses')) {
 
-            add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1);
+            add_filter('woocommerce_disable_admin_bar', '__return_false', 10, 1);
 
         }
 
@@ -1779,4 +1779,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Frontend extends Sensei_Frontend{}
+class WooThemes_Sensei_Frontend extends Sensei_Frontend {}

includes/class-sensei-question.php

Spacing +287 added lines, -287 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Question Class
@@ -19,35 +19,35 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
         $this->token = 'question';
 		$this->question_types = $this->question_types();
-		$this->meta_fields = array( 'question_right_answer', 'question_wrong_answers' );
-		if ( is_admin() ) {
+		$this->meta_fields = array('question_right_answer', 'question_wrong_answers');
+		if (is_admin()) {
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-question_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
-			add_action( 'add_meta_boxes', array( $this, 'question_edit_panel_metabox' ), 10, 2 );
+			add_filter('manage_edit-question_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
+			add_action('add_meta_boxes', array($this, 'question_edit_panel_metabox'), 10, 2);
 
 			// Quesitno list table filters
-			add_action( 'restrict_manage_posts', array( $this, 'filter_options' ) );
-			add_filter( 'request', array( $this, 'filter_actions' ) );
+			add_action('restrict_manage_posts', array($this, 'filter_options'));
+			add_filter('request', array($this, 'filter_actions'));
 
-			add_action( 'save_post', array( $this, 'save_question' ), 10, 1 );
+			add_action('save_post', array($this, 'save_question'), 10, 1);
 		} // End If Statement
 	} // End __construct()
 
 	public function question_types() {
 		$types = array(
-			'multiple-choice' => __( 'Multiple Choice', 'woothemes-sensei' ),
-			'boolean' => __( 'True/False', 'woothemes-sensei' ),
-			'gap-fill' => __( 'Gap Fill', 'woothemes-sensei' ),
-			'single-line' => __( 'Single Line', 'woothemes-sensei' ),
-			'multi-line' => __( 'Multi Line', 'woothemes-sensei' ),
-			'file-upload' => __( 'File Upload', 'woothemes-sensei' ),
+			'multiple-choice' => __('Multiple Choice', 'woothemes-sensei'),
+			'boolean' => __('True/False', 'woothemes-sensei'),
+			'gap-fill' => __('Gap Fill', 'woothemes-sensei'),
+			'single-line' => __('Single Line', 'woothemes-sensei'),
+			'multi-line' => __('Multi Line', 'woothemes-sensei'),
+			'file-upload' => __('File Upload', 'woothemes-sensei'),
 		);
 
-		return apply_filters( 'sensei_question_types', $types );
+		return apply_filters('sensei_question_types', $types);
 	}
 
 	/**
@@ -57,12 +57,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( 'Question', 'column name', 'woothemes-sensei' );
-		$new_columns['question-type'] = _x( 'Type', 'column name', 'woothemes-sensei' );
-		$new_columns['question-category'] = _x( 'Categories', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['title'] = _x('Question', 'column name', 'woothemes-sensei');
+		$new_columns['question-type'] = _x('Type', 'column name', 'woothemes-sensei');
+		$new_columns['question-category'] = _x('Categories', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 
@@ -77,27 +77,27 @@ 
 	 * @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 'question-type':
-				$question_type = strip_tags( get_the_term_list( $id, 'question-type', '', ', ', '' ) );
+				$question_type = strip_tags(get_the_term_list($id, 'question-type', '', ', ', ''));
 				$output = '&mdash;';
-				if( isset( $this->question_types[ $question_type ] ) ) {
-					$output = $this->question_types[ $question_type ];
+				if (isset($this->question_types[$question_type])) {
+					$output = $this->question_types[$question_type];
 				}
 				echo $output;
 			break;
 
 			case 'question-category':
-				$output = strip_tags( get_the_term_list( $id, 'question-category', '', ', ', '' ) );
-				if( ! $output ) {
+				$output = strip_tags(get_the_term_list($id, 'question-category', '', ', ', ''));
+				if ( ! $output) {
 					$output = '&mdash;';
 				}
 				echo $output;
@@ -110,49 +110,49 @@ 
 
 	} // End add_column_data()
 
-	public function question_edit_panel_metabox( $post_type, $post ) {
-		if( in_array( $post_type, array( 'question', 'multiple_question' ) ) ) {
+	public function question_edit_panel_metabox($post_type, $post) {
+		if (in_array($post_type, array('question', 'multiple_question'))) {
 
-			$metabox_title = __( 'Question', 'woothemes-sensei' );
+			$metabox_title = __('Question', 'woothemes-sensei');
 
-			if( isset( $post->ID ) ) {
+			if (isset($post->ID)) {
 
-                $question_type = Sensei()->question->get_question_type( $post->ID );
+                $question_type = Sensei()->question->get_question_type($post->ID);
 
-				if( $question_type ) {
-					$type = $this->question_types[ $question_type ];
-					if( $type ) {
+				if ($question_type) {
+					$type = $this->question_types[$question_type];
+					if ($type) {
 						$metabox_title = $type;
 					}
 				}
 			}
-			add_meta_box( 'question-edit-panel', $metabox_title, array( $this, 'question_edit_panel' ), 'question', 'normal', 'high' );
-			add_meta_box( 'question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'question', 'side', 'default' );
-			add_meta_box( 'multiple-question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'multiple_question', 'side', 'default' );
+			add_meta_box('question-edit-panel', $metabox_title, array($this, 'question_edit_panel'), 'question', 'normal', 'high');
+			add_meta_box('question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'question', 'side', 'default');
+			add_meta_box('multiple-question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'multiple_question', 'side', 'default');
 		}
 	}
 
 	public function question_edit_panel() {
 		global  $post, $pagenow;
 
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_styles' ) );
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_styles'));
 
 		$html = '<div id="lesson-quiz" class="single-question"><div id="add-question-main">';
 
-		if( 'post-new.php' == $pagenow ) {
+		if ('post-new.php' == $pagenow) {
 
 			$html .= '<div id="add-question-actions">';
-				$html .= Sensei()->lesson->quiz_panel_add( 'question' );
+				$html .= Sensei()->lesson->quiz_panel_add('question');
 			$html .= '</div>';
 
 		} else {
 			$question_id = $post->ID;
 
-			$question_type =  Sensei()->question->get_question_type( $post->ID );
+			$question_type = Sensei()->question->get_question_type($post->ID);
 
 			$html .= '<div id="add-question-metadata"><table class="widefat">';
-				$html .= Sensei()->lesson->quiz_panel_question( $question_type, 0, $question_id, 'question' );
+				$html .= Sensei()->lesson->quiz_panel_question($question_type, 0, $question_id, 'question');
 			$html .= '</table></div>';
 		}
 
@@ -164,20 +164,20 @@ 
 	public function question_lessons_panel() {
 		global $post;
 
-		$no_lessons = sprintf( __( '%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei' ), '<em>', '</em>' );
+		$no_lessons = sprintf(__('%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei'), '<em>', '</em>');
 
-		if( ! isset( $post->ID ) ) {
+		if ( ! isset($post->ID)) {
 			echo $no_lessons;
 			return;
 		}
 
 		// This retrieves those quizzes the question is directly connected to.
-		$quizzes = get_post_meta( $post->ID, '_quiz_id', false );
+		$quizzes = get_post_meta($post->ID, '_quiz_id', false);
 
 		// Collate all 'multiple_question' quizzes the question is part of.
-		$categories_of_question = wp_get_post_terms( $post->ID, 'question-category', array( 'fields' => 'ids' ) );
-		if ( ! empty( $categories_of_question ) ) {
-			foreach ( $categories_of_question as $term_id ) {
+		$categories_of_question = wp_get_post_terms($post->ID, 'question-category', array('fields' => 'ids'));
+		if ( ! empty($categories_of_question)) {
+			foreach ($categories_of_question as $term_id) {
 				$qargs = array(
 					'fields'           => 'ids',
 					'post_type'        => 'multiple_question',
@@ -191,41 +191,41 @@ 
 					'post_status'      => 'any',
 					'suppress_filters' => 0,
 				);
-				$cat_question_ids = get_posts( $qargs );
-				foreach( $cat_question_ids as $cat_question_id ) {
-					$cat_quizzes = get_post_meta( $cat_question_id, '_quiz_id', false );
-					$quizzes = array_merge( $quizzes, $cat_quizzes );
+				$cat_question_ids = get_posts($qargs);
+				foreach ($cat_question_ids as $cat_question_id) {
+					$cat_quizzes = get_post_meta($cat_question_id, '_quiz_id', false);
+					$quizzes = array_merge($quizzes, $cat_quizzes);
 				}
 			}
-			$quizzes = array_unique( array_filter( $quizzes ) );
+			$quizzes = array_unique(array_filter($quizzes));
 		}
 
-		if( 0 == count( $quizzes ) ) {
+		if (0 == count($quizzes)) {
 			echo $no_lessons;
 			return;
 		}
 
 		$lessons = false;
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			$lesson_id = get_post_meta( $quiz, '_quiz_lesson', true );
+			$lesson_id = get_post_meta($quiz, '_quiz_lesson', true);
 
-			if( ! $lesson_id ) continue;
+			if ( ! $lesson_id) continue;
 
-			$lessons[ $lesson_id ]['title'] = get_the_title( $lesson_id );
-			$lessons[ $lesson_id ]['link'] = admin_url( 'post.php?post=' . $lesson_id . '&action=edit' );
+			$lessons[$lesson_id]['title'] = get_the_title($lesson_id);
+			$lessons[$lesson_id]['link'] = admin_url('post.php?post='.$lesson_id.'&action=edit');
 		}
 
-		if( ! $lessons ) {
+		if ( ! $lessons) {
 			echo $no_lessons;
 			return;
 		}
 
 		$html = '<ul>';
 
-		foreach( $lessons as $id => $lesson ) {
-			$html .= '<li><a href="' . esc_url( $lesson['link'] ) . '">' . esc_html( $lesson['title'] ) . '</a></li>';
+		foreach ($lessons as $id => $lesson) {
+			$html .= '<li><a href="'.esc_url($lesson['link']).'">'.esc_html($lesson['title']).'</a></li>';
 		}
 
 		$html .= '</ul>';
@@ -234,30 +234,30 @@ 
 
 	}
 
-	public function save_question( $post_id = 0 ) {
+	public function save_question($post_id = 0) {
 
-		if( ! isset( $_POST['post_type']
-            ) || 'question' != $_POST['post_type'] ) {
+		if ( ! isset($_POST['post_type']
+            ) || 'question' != $_POST['post_type']) {
             return;
         }
 
 
 
         //setup the data for saving
-		$data = $_POST ;
+		$data = $_POST;
         $data['quiz_id'] = 0;
 		$data['question_id'] = $post_id;
 
-		if ( ! wp_is_post_revision( $post_id ) ){
+		if ( ! wp_is_post_revision($post_id)) {
 
 			// Unhook function to prevent infinite loops
-			remove_action( 'save_post', array( $this, 'save_question' ) );
+			remove_action('save_post', array($this, 'save_question'));
 
 			// Update question data
-			$question_id = Sensei()->lesson->lesson_save_question( $data, 'question' );
+			$question_id = Sensei()->lesson->lesson_save_question($data, 'question');
 
 			// Re-hook same function
-			add_action( 'save_post', array( $this, 'save_question' ) );
+			add_action('save_post', array($this, 'save_question'));
 		}
 
 		return;
@@ -270,15 +270,15 @@ 
 	public function filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			$output = '';
 
 			// Question type
-			$selected = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			$type_options = '<option value="">' . __( 'All types', 'woothemes-sensei' ) . '</option>';
-			foreach( $this->question_types as $label => $type ) {
-				$type_options .= '<option value="' . esc_attr( $label ) . '" ' . selected( $selected, $label, false ) . '>' . esc_html( $type ) . '</option>';
+			$selected = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			$type_options = '<option value="">'.__('All types', 'woothemes-sensei').'</option>';
+			foreach ($this->question_types as $label => $type) {
+				$type_options .= '<option value="'.esc_attr($label).'" '.selected($selected, $label, false).'>'.esc_html($type).'</option>';
 			}
 
 			$output .= '<select name="question_type" id="dropdown_question_type">';
@@ -286,12 +286,12 @@ 
 			$output .= '</select>';
 
 			// Question category
-			$cats = get_terms( 'question-category', array( 'hide_empty' => false ) );
-			if ( ! empty( $cats ) && ! is_wp_error( $cats ) ) {
-				$selected = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-				$cat_options = '<option value="">' . __( 'All categories', 'woothemes-sensei' ) . '</option>';
-				foreach( $cats as $cat ) {
-					$cat_options .= '<option value="' . esc_attr( $cat->slug ) . '" ' . selected( $selected, $cat->slug, false ) . '>' . esc_html( $cat->name ) . '</option>';
+			$cats = get_terms('question-category', array('hide_empty' => false));
+			if ( ! empty($cats) && ! is_wp_error($cats)) {
+				$selected = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+				$cat_options = '<option value="">'.__('All categories', 'woothemes-sensei').'</option>';
+				foreach ($cats as $cat) {
+					$cat_options .= '<option value="'.esc_attr($cat->slug).'" '.selected($selected, $cat->slug, false).'>'.esc_html($cat->name).'</option>';
 				}
 
 				$output .= '<select name="question_cat" id="dropdown_question_cat">';
@@ -308,14 +308,14 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function filter_actions( $request ) {
+	public function filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			// Question type
-			$question_type = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			if( $question_type ) {
+			$question_type = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			if ($question_type) {
 				$type_query = array(
 					'taxonomy' => 'question-type',
 					'terms' => $question_type,
@@ -325,8 +325,8 @@ 
 			}
 
 			// Question category
-			$question_cat = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-			if( $question_cat ) {
+			$question_cat = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+			if ($question_cat) {
 				$cat_query = array(
 					'taxonomy' => 'question-category',
 					'terms' => $question_cat,
@@ -351,16 +351,16 @@ 
      *
      * @return string $question_type | bool
      */
-    public function get_question_type( $question_id ){
+    public function get_question_type($question_id) {
 
-        if( empty( $question_id ) || ! intval( $question_id ) > 0
-            || 'question' != get_post_type( $question_id )   ){
+        if (empty($question_id) || ! intval($question_id) > 0
+            || 'question' != get_post_type($question_id)) {
             return false;
         }
 
         $question_type = 'multiple-choice';
-        $question_types = wp_get_post_terms( $question_id, 'question-type' );
-        foreach( $question_types as $type ) {
+        $question_types = wp_get_post_terms($question_id, 'question-type');
+        foreach ($question_types as $type) {
             $question_type = $type->slug;
         }
 
@@ -377,21 +377,21 @@ 
 	 *
 	 * @return int $question_grade | bool
 	 */
-	public function get_question_grade( $question_id ) {
+	public function get_question_grade($question_id) {
 
-		if ( empty( $question_id ) || ! intval( $question_id ) > 0
-			|| 'question' != get_post_type( $question_id ) ) {
+		if (empty($question_id) || ! intval($question_id) > 0
+			|| 'question' != get_post_type($question_id)) {
 			return false;
 		}
 
-		$question_grade_raw = get_post_meta( $question_id, '_question_grade', true );
+		$question_grade_raw = get_post_meta($question_id, '_question_grade', true);
 		// If not set then default to 1...
-		if ( false === $question_grade_raw || $question_grade_raw == '' ) {
+		if (false === $question_grade_raw || $question_grade_raw == '') {
 			$question_grade = 1;
 		}
 		// ...but allow a grade of 0 for non-marked questions
 		else {
-			$question_grade = intval( $question_grade_raw );
+			$question_grade = intval($question_grade_raw);
 		}
 		return $question_grade;
 
@@ -404,9 +404,9 @@ 
      * @since 1.9.0
      * @param $question_type
      */
-    public static function load_question_template( $question_type ){
+    public static function load_question_template($question_type) {
 
-        Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
+        Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php');
     }
 
     /**
@@ -417,9 +417,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_title( $question_id ){
+    public static function the_question_title($question_id) {
 
-        echo self::get_the_question_title( $question_id );
+        echo self::get_the_question_title($question_id);
 
     }// end the_question_title
 
@@ -431,7 +431,7 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_title( $question_id ){
+    public static function get_the_question_title($question_id) {
 
         /**
          * Filter the sensei question title
@@ -439,17 +439,17 @@ 
          * @since 1.3.0
          * @param $question_title
          */
-        $title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
+        $title = apply_filters('sensei_question_title', get_the_title($question_id));
 
         /**
          * hook document in class-woothemes-sensei-message.php the_title()
          */
-        $title = apply_filters( 'sensei_single_title', $title, 'question');
+        $title = apply_filters('sensei_single_title', $title, 'question');
 
         $title_html  = '<span class="question question-title">';
         $title_html .= $title;
         $title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
-        $title_html .='</span>';
+        $title_html .= '</span>';
 
         return $title_html;
     }
@@ -460,14 +460,14 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_description( $question_id ){
+    public static function get_the_question_description($question_id) {
 
-        $question = get_post( $question_id );
+        $question = get_post($question_id);
 
         /**
          * Already documented within WordPress Core
          */
-        return apply_filters( 'the_content', $question->post_content );
+        return apply_filters('the_content', $question->post_content);
 
     }
 
@@ -477,9 +477,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_description( $question_id  ){
+    public static function the_question_description($question_id) {
 
-        echo self::get_the_question_description( $question_id );
+        echo self::get_the_question_description($question_id);
 
     }
 
@@ -490,38 +490,38 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_media( $question_id ){
+    public static function get_the_question_media($question_id) {
 
-        $question_media = get_post_meta( $question_id, '_question_media', true );
+        $question_media = get_post_meta($question_id, '_question_media', true);
         $question_media_link = '';
-        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] ) {
+        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_type = $mimetype_array[0];
-                    $question_media_url = wp_get_attachment_url( $question_media );
-                    $attachment = get_post( $question_media );
+                    $question_media_url = wp_get_attachment_url($question_media);
+                    $attachment = get_post($question_media);
                     $question_media_title = $attachment->post_title;
                     $question_media_description = $attachment->post_content;
-                    switch( $question_media_type ) {
+                    switch ($question_media_type) {
                         case 'image':
-                            $image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
-                            $attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
+                            $image_size = apply_filters('sensei_question_image_size', 'medium', $question_id);
+                            $attachment_src = wp_get_attachment_image_src($question_media, $image_size);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank"><img src="'.$attachment_src[0].'" width="'.$attachment_src[1].'" height="'.$attachment_src[2].'" /></a>';
                             break;
 
                         case 'audio':
-                            $question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_audio_shortcode(array('src' => $question_media_url));
                             break;
 
                         case 'video':
-                            $question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_video_shortcode(array('src' => $question_media_url));
                             break;
 
                         default:
-                            $question_media_filename = basename( $question_media_url );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
+                            $question_media_filename = basename($question_media_url);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank">'.$question_media_filename.'</a>';
                             break;
                     }
                 }
@@ -529,21 +529,21 @@ 
         }
 
         $output = '';
-        if( $question_media_link ) {
+        if ($question_media_link) {
 
                 $output .= '<div class="question_media_display">';
-                $output .=      $question_media_link;
+                $output .= $question_media_link;
                 $output .= '<dl>';
 
-                if( $question_media_title ) {
+                if ($question_media_title) {
 
-                   $output .= '<dt>'. $question_media_title. '</dt>';
+                   $output .= '<dt>'.$question_media_title.'</dt>';
 
                  }
 
-                if( $question_media_description ) {
+                if ($question_media_description) {
 
-                    $output .= '<dd>' . $question_media_description . '</dd>';
+                    $output .= '<dd>'.$question_media_description.'</dd>';
 
                 }
 
@@ -564,9 +564,9 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_question_media( $question_id ){
+    public static function the_question_media($question_id) {
 
-        echo self::get_the_question_media( $question_id );
+        echo self::get_the_question_media($question_id);
 
     }
 
@@ -577,11 +577,11 @@ 
      *
      * @param $question_id
      */
-    public static function the_question_hidden_fields( $question_id ){
+    public static function the_question_hidden_fields($question_id) {
         ?>
 
-            <input type="hidden" name="question_id_<?php $question_id;?>" value="<?php $question_id;?>" />
-            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e( $question_id ); ?>" />
+            <input type="hidden" name="question_id_<?php $question_id; ?>" value="<?php $question_id; ?>" />
+            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e($question_id); ?>" />
 
         <?php
     }
@@ -592,27 +592,27 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function answer_feedback_notes( $question_id ){
+    public static function answer_feedback_notes($question_id) {
 
         //IDS
         $quiz_id = get_the_ID();
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
         // Data to check before showing feedback
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $not_empty_user_quiz_grade = !empty( $user_quiz_grade );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+        $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, get_current_user_id());
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $not_empty_user_quiz_grade = ! empty($user_quiz_grade);
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $lesson_completed = Sensei_Utils::user_completed_lesson($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
-        if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
-            ||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
-            || ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
+        if (($lesson_completed && $not_empty_user_quiz_grade)
+            ||  ($lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type)
+            || ('auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade)) {
 
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, get_current_user_id());
 
-            if( $answer_notes ) { ?>
+            if ($answer_notes) { ?>
 
                 <div class="sensei-message info info-special answer-feedback">
 
@@ -626,7 +626,7 @@ 
                          * @param string $question_id
                          * @param string $lesson_id
                          */
-                        echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
+                        echo apply_filters('sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id);
 
                     ?>
 
@@ -645,72 +645,72 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_answer_result_indication( $question_id ){
+    public static function the_answer_result_indication($question_id) {
 
-        global $post,  $current_user, $sensei_question_loop;
+        global $post, $current_user, $sensei_question_loop;
 
         // Post Data
         $quiz_id = $sensei_question_loop['quiz_id'];
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $question_item = $sensei_question_loop['current_question'];
 
         // Setup variable needed to determine if the message should show and what it should show
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $lesson_complete = Sensei_Utils::user_completed_lesson($lesson_id, get_current_user_id());
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
         // retrieve the question total grade
-        $question_grade = Sensei()->question->get_question_grade( $question_id );
+        $question_grade = Sensei()->question->get_question_grade($question_id);
 
         // retrieve grade the user achieved
-        $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
+        $user_question_grade = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
 
         // Question ID
         $question_id = $question_item->ID;
 
         // conditions to check
-        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
-        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
-        $grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
+        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '';
+        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete && $user_quiz_grade != '' && ! $reset_quiz_allowed;
+        $grade_type_auto_a_valid_grade_and_reset_not_allowed = 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '';
 
-        if (  $completed_with_valid_grade
+        if ($completed_with_valid_grade
             || $completed_with_valid_grade_and_reset_not_allowed
-            || $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
+            || $grade_type_auto_a_valid_grade_and_reset_not_allowed) {
 
             $user_correct = false;
-            $answer_message = __( 'Incorrect', 'woothemes-sensei' );
+            $answer_message = __('Incorrect', 'woothemes-sensei');
             $answer_message_class = 'user_wrong';
             // For zero grade mark as 'correct' but add no classes
-            if ( 0 == $question_grade ) {
+            if (0 == $question_grade) {
 
                 $user_correct = true;
                 $answer_message = '';
                 $answer_message_class = '';
 
-            } else if( $user_question_grade > 0 ) {
+            } else if ($user_question_grade > 0) {
 
                 $user_correct = true;
-                $answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
+                $answer_message = sprintf(__('Grade: %d', 'woothemes-sensei'), $user_question_grade);
                 $answer_message_class = 'user_right';
 
             }
 
             // attach the correct answer if the question is auto gradable and user got it wrong
-            if( !$reset_quiz_allowed && !$user_correct ){
+            if ( ! $reset_quiz_allowed && ! $user_correct) {
 
-                $answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
+                $answer_message .= ' - '.__('Right Answer:', 'woothemes-sensei').' '.self::get_correct_answer($question_item->ID);
 
             }
 
             // answer feedback
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
-            if( $answer_notes ) {
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, $current_user->ID);
+            if ($answer_notes) {
                 $answer_message_class .= ' has_notes';
             }
             ?>
 
-            <div class="answer_message <?php esc_attr_e( $answer_message_class ); ?>">
+            <div class="answer_message <?php esc_attr_e($answer_message_class); ?>">
 
                 <span><?php echo $answer_message; ?></span>
 
@@ -731,39 +731,39 @@ 
      * @param $quiz_id
      * @return array $question_data
      */
-    public static function get_template_data( $question_id, $quiz_id ){
+    public static function get_template_data($question_id, $quiz_id) {
 
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
-        $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+        $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
         //backwards compatibility
-        if( 'on' == $reset_allowed ) {
+        if ('on' == $reset_allowed) {
             $reset_allowed = 1;
         }
 
         // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
+        $user_lesson_end = Sensei_Utils::user_completed_lesson(Sensei()->quiz->get_lesson_id($quiz_id), get_current_user_id());
         $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
+        if ($user_lesson_end) {
             $user_lesson_complete = true;
         }
 
         //setup the question data
-        $data[ 'ID' ]                     = $question_id;
-        $data[ 'title' ]                  = get_the_title( $question_id );
-        $data[ 'content' ]                = get_post( $question_id )->post_content;
-        $data[ 'quiz_id' ]                = $quiz_id;
-        $data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
-        $data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
-        $data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
-        $data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
-        $data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
-        $data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
-        $data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
-        $data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
-        $data[ 'reset_quiz_allowed' ]     = $reset_allowed;
-        $data[ 'lesson_complete' ]        = $user_lesson_complete;
+        $data['ID']                     = $question_id;
+        $data['title']                  = get_the_title($question_id);
+        $data['content']                = get_post($question_id)->post_content;
+        $data['quiz_id']                = $quiz_id;
+        $data['lesson_id']              = Sensei()->quiz->get_lesson_id($quiz_id);
+        $data['type']                   = Sensei()->question->get_question_type($question_id);
+        $data['question_grade']         = Sensei()->question->get_question_grade($question_id);
+        $data['user_question_grade']    = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
+        $data['question_right_answer']  = get_post_meta($question_id, '_question_right_answer', true);
+        $data['question_wrong_answers'] = get_post_meta($question_id, '_question_wrong_answers', true);
+        $data['user_answer_entry']      = Sensei()->quiz->get_user_question_answer($lesson_id, $question_id, get_current_user_id());
+        $data['lesson_completed']       = Sensei_Utils::user_completed_course($lesson_id, get_current_user_id( ));
+        $data['quiz_grade_type']        = get_post_meta($quiz_id, '_quiz_grade_type', true);
+        $data['reset_quiz_allowed']     = $reset_allowed;
+        $data['lesson_complete']        = $user_lesson_complete;
 
         /**
          * Filter the question template data. This filter fires  in
@@ -777,7 +777,7 @@ 
          * @param string $question_id
          * @param string $quiz_id
          */
-        return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
+        return apply_filters('sensei_get_question_template_data', $data, $question_id, $quiz_id);
 
     }
 
@@ -793,28 +793,28 @@ 
      *
      * @return array()
      */
-    public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
+    public static function file_upload_load_question_data($question_data, $question_id, $quiz_id) {
 
 
-        if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('file-upload' == Sensei()->question->get_question_type($question_id)) {
 
             // Get uploaded file
-            $attachment_id = $question_data[ 'user_answer_entry' ];
+            $attachment_id = $question_data['user_answer_entry'];
             $answer_media_url = $answer_media_filename = '';
 
 
             $question_helptext = '';
-            if( isset( $question_data['question_wrong_answers'][0] ) ) {
+            if (isset($question_data['question_wrong_answers'][0])) {
 
-                $question_helptext =  $question_data['question_wrong_answers'][0];
+                $question_helptext = $question_data['question_wrong_answers'][0];
 
             }
 
 
-            if( 0 < intval( $attachment_id ) ) {
+            if (0 < intval($attachment_id)) {
 
-                $answer_media_url = wp_get_attachment_url( $attachment_id );
-                $answer_media_filename = basename( $answer_media_url );
+                $answer_media_url = wp_get_attachment_url($attachment_id);
+                $answer_media_filename = basename($answer_media_url);
 
             }
 
@@ -822,11 +822,11 @@ 
             // Get max upload file size, formatted for display
             // Code copied from wp-admin/includes/media.php:1515
             $upload_size_unit = $max_upload_size = wp_max_upload_size();
-            $sizes = array( 'KB', 'MB', 'GB' );
-            for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+            $sizes = array('KB', 'MB', 'GB');
+            for ($u = -1; $upload_size_unit > 1024 && $u < count($sizes) - 1; $u++) {
                 $upload_size_unit /= 1024;
             }
-            if ( $u < 0 ) {
+            if ($u < 0) {
 
                 $upload_size_unit = 0;
                 $u = 0;
@@ -836,14 +836,14 @@ 
                 $upload_size_unit = (int) $upload_size_unit;
 
             }
-            $max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
+            $max_upload_size = sprintf(__('Maximum upload file size: %d%s'), esc_html($upload_size_unit), esc_html($sizes[$u]));
 
             // Assemble all the data needed by the file upload template
-            $question_data[ 'answer_media_url' ]      = $answer_media_url;
-            $question_data[ 'answer_media_filename' ] = $answer_media_filename;
-            $question_data[ 'max_upload_size' ]       = $max_upload_size;
+            $question_data['answer_media_url']      = $answer_media_url;
+            $question_data['answer_media_filename'] = $answer_media_filename;
+            $question_data['max_upload_size']       = $max_upload_size;
 
-            $question_data[ 'question_helptext' ]     = $question_helptext;
+            $question_data['question_helptext']     = $question_helptext;
 
         }// end if is file upload type
 
@@ -863,27 +863,27 @@ 
      *
      * @return array()
      */
-    public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function multiple_choice_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('multiple-choice' == Sensei()->question->get_question_type($question_id)) {
 
 
             $answer_type = 'radio';
-            if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
+            if (is_array($question_data['question_right_answer']) && (1 < count($question_data['question_right_answer']))) {
 
                 $answer_type = 'checkbox';
 
             }
 
             // Merge right and wrong answers
-            if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
+            if (is_array($question_data['question_right_answer'])) {
 
-                $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+                $merged_options = array_merge($question_data['question_wrong_answers'], $question_data['question_right_answer']);
 
-            }  else {
+            } else {
 
-                array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
-                $merged_options = $question_data[ 'question_wrong_answers' ];
+                array_push($question_data['question_wrong_answers'], $question_data['question_right_answer']);
+                $merged_options = $question_data['question_wrong_answers'];
 
             }
 
@@ -891,24 +891,24 @@ 
             $question_answers_options = array();
             $count = 0;
 
-            foreach( $merged_options as $answer ) {
+            foreach ($merged_options as $answer) {
 
                 $count++;
                 $question_option = array();
 
-                if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
+                if (($question_data['lesson_completed'] && $question_data['user_quiz_grade'] != '')
+                    || ($question_data['lesson_completed'] && ! $question_data['reset_quiz_allowed'] && $question_data['user_quiz_grade'] != '')
+                    || ('auto' == $question_data['quiz_grade_type'] && ! $question_data['reset_quiz_allowed'] && ! empty($question_data['user_quiz_grade']))) {
 
                     $user_correct = false;
 
 
                     // For zero grade mark as 'correct' but add no classes
-                    if ( 0 == $question_data[ 'question_grade' ] ) {
+                    if (0 == $question_data['question_grade']) {
 
                         $user_correct = true;
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+                    } else if ($question_data['user_question_grade'] > 0) {
 
                         $user_correct = true;
 
@@ -918,20 +918,20 @@ 
 
                 // setup the option specific classes
                 $answer_class = '';
-                if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
-                    if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
+                if (isset($user_correct) && 0 < $question_data['question_grade']) {
+                    if (is_array($question_data['question_right_answer']) && in_array($answer, $question_data['question_right_answer'])) {
 
                         $answer_class .= ' right_answer';
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+                    }  elseif ( ! is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer) {
 
                         $answer_class .= ' right_answer';
 
-                    } elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
-                        ||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
+                    } elseif ((is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry']))
+                        ||  ( ! $question_data['user_answer_entry'] && $question_data['user_answer_entry'] == $answer)) {
 
                         $answer_class = 'user_wrong';
-                        if( $user_correct ) {
+                        if ($user_correct) {
 
                             $answer_class = 'user_right';
 
@@ -943,76 +943,76 @@ 
 
                 // determine if the current option must be checked
                 $checked = '';
-                if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
-                    if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
+                if (isset($question_data['user_answer_entry']) && 0 < count($question_data['user_answer_entry'])) {
+                    if (is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry'])) {
 
                         $checked = 'checked="checked"';
 
-                    } elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
+                    } elseif ( ! is_array($question_data['user_answer_entry'])) {
 
-                        $checked = checked( $answer, $question_data['user_answer_entry'] , false );
+                        $checked = checked($answer, $question_data['user_answer_entry'], false);
 
                     }
 
                 } // End If Statement
 
                 //Load the answer option data
-                $question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
-                $question_option[ 'answer' ]      = $answer;
-                $question_option[ 'option_class'] = $answer_class;
-                $question_option[ 'checked']      = $checked;
-                $question_option[ 'count' ]       = $count;
-                $question_option[ 'type' ] = $answer_type;
+                $question_option['ID']          = Sensei()->lesson->get_answer_id($answer);
+                $question_option['answer']      = $answer;
+                $question_option['option_class'] = $answer_class;
+                $question_option['checked']      = $checked;
+                $question_option['count']       = $count;
+                $question_option['type'] = $answer_type;
 
                 // add the speci  fic option to the list of options for this question
-                $question_answers_options[$question_option[ 'ID' ]] = $question_option;
+                $question_answers_options[$question_option['ID']] = $question_option;
 
             } // end for each option
 
 
             // Shuffle the array depending on the settings
             $answer_options_sorted = array();
-            $random_order = get_post_meta( $question_data['ID'], '_random_order', true );
-            if(  $random_order && $random_order == 'yes' ) {
+            $random_order = get_post_meta($question_data['ID'], '_random_order', true);
+            if ($random_order && $random_order == 'yes') {
 
                 $answer_options_sorted = $question_answers_options;
-                shuffle( $answer_options_sorted );
+                shuffle($answer_options_sorted);
 
             } else {
 
                 $answer_order = array();
-                $answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
-                if( $answer_order_string ) {
+                $answer_order_string = get_post_meta($question_data['ID'], '_answer_order', true);
+                if ($answer_order_string) {
 
-                    $answer_order = array_filter( explode( ',', $answer_order_string ) );
-                    if( count( $answer_order ) > 0 ) {
+                    $answer_order = array_filter(explode(',', $answer_order_string));
+                    if (count($answer_order) > 0) {
 
-                        foreach( $answer_order as $answer_id ) {
+                        foreach ($answer_order as $answer_id) {
 
-                            if( isset( $question_answers_options[ $answer_id ] ) ) {
+                            if (isset($question_answers_options[$answer_id])) {
 
-                                $answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
-                                unset( $question_answers_options[ $answer_id ] );
+                                $answer_options_sorted[$answer_id] = $question_answers_options[$answer_id];
+                                unset($question_answers_options[$answer_id]);
 
                             }
 
                         }
 
-                        if( count( $question_answers_options ) > 0 ) {
-                            foreach( $question_answers_options as $id => $answer ) {
+                        if (count($question_answers_options) > 0) {
+                            foreach ($question_answers_options as $id => $answer) {
 
-                                $answer_options_sorted[ $id ] = $answer;
+                                $answer_options_sorted[$id] = $answer;
 
                             }
                         }
 
-                    }else{
+                    } else {
 
                         $answer_options_sorted = $question_answers_options;
 
                     }
 
-                }else{
+                } else {
 
                     $answer_options_sorted = $question_answers_options;
 
@@ -1022,7 +1022,7 @@ 
 
 
             // assemble and setup the data for the templates data array
-            $question_data[ 'answer_options' ]    =  $answer_options_sorted;
+            $question_data['answer_options'] = $answer_options_sorted;
 
         }
 
@@ -1042,14 +1042,14 @@ 
      *
      * @return array()
      */
-    public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function gap_fill_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('gap-fill' == Sensei()->question->get_question_type($question_id)) {
 
-            $gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
-            $question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
-            $question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
-            $question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+            $gapfill_array = explode('||', $question_data['question_right_answer']);
+            $question_data['gapfill_pre']  = isset($gapfill_array[0]) ? $gapfill_array[0] : '';
+            $question_data['gapfill_gap']  = isset($gapfill_array[1]) ? $gapfill_array[1] : '';
+            $question_data['gapfill_post'] = isset($gapfill_array[2]) ? $gapfill_array[2] : '';
 
         }
 
@@ -1064,32 +1064,32 @@ 
      * @param $question_id
      * @return string $correct_answer or empty
      */
-    public static function get_correct_answer( $question_id ){
+    public static function get_correct_answer($question_id) {
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $type = Sensei()->question->get_question_type( $question_id );
-        $type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+        $right_answer = get_post_meta($question_id, '_question_right_answer', true);
+        $type = Sensei()->question->get_question_type($question_id);
+        $type_name = __('Multiple Choice', 'woothemes-sensei');
         $grade_type = 'manual-grade';
 
-        if ('boolean'== $type ) {
+        if ('boolean' == $type) {
 
             $right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+        }elseif ('multiple-choice' == $type) {
 
             $right_answer = (array) $right_answer;
-            $right_answer = implode( ', ', $right_answer );
+            $right_answer = implode(', ', $right_answer);
 
-        }elseif( 'gap-fill' == $type ) {
+        }elseif ('gap-fill' == $type) {
 
-            $right_answer_array = explode( '||', $right_answer );
-            if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-            if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-            if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+            $right_answer_array = explode('||', $right_answer);
+            if (isset($right_answer_array[0])) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+            if (isset($right_answer_array[1])) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+            if (isset($right_answer_array[2])) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-            $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
+            $right_answer = $gapfill_pre.' <span class="highlight">'.$gapfill_gap.'</span> '.$gapfill_post;
 
-        }else{
+        } else {
 
             // for non auto gradable question types no answer should be returned.
             $right_answer = '';
@@ -1107,4 +1107,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Question extends Sensei_Question{}
+class WooThemes_Sensei_Question extends Sensei_Question {}

includes/class-sensei-analysis.php

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * All functionality pertaining to the Admin Analysis in Sensei.
@@ -19,24 +19,24 @@ 
 	 * @since  1.0.0
 	 * @param string $file
 	 */
-	public function __construct ( $file ) {
+	public function __construct($file) {
 		$this->name = __('Analysis', 'woothemes-sensei');
 		$this->file = $file;
 		$this->page_slug = 'sensei_analysis';
 
 		// Admin functions
-		if ( is_admin() ) {
-			add_action( 'admin_menu', array( $this, 'analysis_admin_menu' ), 10);
-			add_action( 'analysis_wrapper_container', array( $this, 'wrapper_container'  ) );
-			if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
+		if (is_admin()) {
+			add_action('admin_menu', array($this, 'analysis_admin_menu'), 10);
+			add_action('analysis_wrapper_container', array($this, 'wrapper_container'));
+			if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
 
-				add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+				add_action('admin_print_styles', array($this, 'enqueue_styles'));
 
 			}
 
-			add_action( 'admin_init', array( $this, 'report_download_page' ) );
+			add_action('admin_init', array($this, 'report_download_page'));
 
-			add_filter( 'user_search_columns', array( $this, 'user_search_columns_filter' ), 10, 3 );
+			add_filter('user_search_columns', array($this, 'user_search_columns_filter'), 10, 3);
 		} // End If Statement
 	} // End __construct()
 
@@ -50,9 +50,9 @@ 
 	public function analysis_admin_menu() {
 		global $menu, $woocommerce;
 
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
+		if (current_user_can('manage_sensei_grades')) {
 
-            add_submenu_page( 'sensei', __('Analysis', 'woothemes-sensei'),  __('Analysis', 'woothemes-sensei') , 'manage_sensei_grades', 'sensei_analysis', array( $this, 'analysis_page' ) );
+            add_submenu_page('sensei', __('Analysis', 'woothemes-sensei'), __('Analysis', 'woothemes-sensei'), 'manage_sensei_grades', 'sensei_analysis', array($this, 'analysis_page'));
 
 		}
 
@@ -66,11 +66,11 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( 'woothemes-sensei-admin' );
+		wp_enqueue_style('woothemes-sensei-admin');
 
-		wp_enqueue_style( 'woothemes-sensei-settings-api', Sensei()->plugin_url . 'assets/css/settings.css', '', Sensei()->version );
+		wp_enqueue_style('woothemes-sensei-settings-api', Sensei()->plugin_url.'assets/css/settings.css', '', Sensei()->version);
 
 	} // End enqueue_styles()
 
@@ -82,14 +82,14 @@ 
 	public function load_data_table_files() {
 
 		// Load Analysis Classes
-		$classes_to_load = array(	'list-table',
+		$classes_to_load = array('list-table',
 									'analysis-overview',
 									'analysis-user-profile',
 									'analysis-course',
 									'analysis-lesson'
 									);
-		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()
 
@@ -100,13 +100,13 @@ 
 	 * @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 = 'Sensei_Analysis_' . $name . '_List_Table';
-		if ( is_null($optional_data) ) {
-			$sensei_analysis_object = new $object_name( $data );
+		$object_name = 'Sensei_Analysis_'.$name.'_List_Table';
+		if (is_null($optional_data)) {
+			$sensei_analysis_object = new $object_name($data);
 		} else {
-			$sensei_analysis_object = new $object_name( $data, $optional_data );
+			$sensei_analysis_object = new $object_name($data, $optional_data);
 		}
 		$sensei_analysis_object->prepare_items();
 		return $sensei_analysis_object;
@@ -123,40 +123,40 @@ 
 		$course_id = 0;
 		$lesson_id = 0;
 		$user_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']);
 		}
-		if( isset( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
+		if (isset($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
 		}
-		$type = isset( $_GET['view'] ) ? esc_html( $_GET['view'] ) : false;
+		$type = isset($_GET['view']) ? esc_html($_GET['view']) : false;
 
-		if ( 0 < $lesson_id ) {
+		if (0 < $lesson_id) {
 			// Viewing a specific Lesson and all its Learners
-			$this->analysis_lesson_users_view( $lesson_id );
+			$this->analysis_lesson_users_view($lesson_id);
 		}
-		elseif ( 0 < $course_id && !$user_id && 'user' == $type ) {
+		elseif (0 < $course_id && ! $user_id && 'user' == $type) {
 			// Viewing a specific Course and all its Learners
-			$this->analysis_course_users_view( $course_id );
+			$this->analysis_course_users_view($course_id);
 		}
-		elseif ( 0 < $course_id && 0 < $user_id ) {
+		elseif (0 < $course_id && 0 < $user_id) {
 			// Viewing a specific Learner on a specific Course, showing their Lessons
-			$this->analysis_user_course_view( $course_id, $user_id );
+			$this->analysis_user_course_view($course_id, $user_id);
 		}
-		elseif( 0 < $course_id ) {
+		elseif (0 < $course_id) {
 			// Viewing a specific Course and all it's Lessons
-			$this->analysis_course_view( $course_id );
+			$this->analysis_course_view($course_id);
 		}
-		elseif ( 0 < $user_id ) {
+		elseif (0 < $user_id) {
 			// Viewing a specific Learner, and their Courses
-			$this->analysis_user_profile_view( $user_id );
+			$this->analysis_user_profile_view($user_id);
 		}
 		else {
 			// Overview of all Learners, all Courses, or all Lessons
-			$this->analysis_default_view( $type );
+			$this->analysis_default_view($type);
 		} // End If Statement
 	} // End analysis_page()
 
@@ -165,35 +165,35 @@ 
 	 * @since  1.2.0
 	 * @return void
 	 */
-	public function analysis_default_view( $type ) {
+	public function analysis_default_view($type) {
 
 		// Load Analysis data
-		$sensei_analysis_overview = $this->load_data_object( 'Overview', $type );
+		$sensei_analysis_overview = $this->load_data_object('Overview', $type);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
 		$this->analysis_headers();
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap">
 			<div class="sensei-analysis-sidebar">
 				<?php
-				do_action( 'sensei_analysis_before_stats_boxes' );
-				foreach ( $sensei_analysis_overview->stats_boxes() as $key => $value ) {
-					$this->render_stats_box( esc_html( $key ), esc_html( $value ) );
+				do_action('sensei_analysis_before_stats_boxes');
+				foreach ($sensei_analysis_overview->stats_boxes() as $key => $value) {
+					$this->render_stats_box(esc_html($key), esc_html($value));
 				} // End For Loop
-				do_action( 'sensei_analysis_after_stats_boxes' );
+				do_action('sensei_analysis_after_stats_boxes');
 				?>
 			</div>
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_overview->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_default_view()
 
 	/**
@@ -202,26 +202,26 @@ 
 	 * @param integer $user_id
 	 * @return void
 	 */
-	public function analysis_user_profile_view( $user_id ) {
+	public function analysis_user_profile_view($user_id) {
 
 		// Load Analysis data
-		$sensei_analysis_user_profile = $this->load_data_object( 'User_Profile', $user_id );
+		$sensei_analysis_user_profile = $this->load_data_object('User_Profile', $user_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'user_profile' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'user_profile'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap user-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_user_profile->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_user_profile_view()
 
 	/**
@@ -230,26 +230,26 @@ 
 	 * @param integer $course_id
 	 * @return void
 	 */
-	public function analysis_course_view( $course_id ) {
+	public function analysis_course_view($course_id) {
 
 		// Load Analysis data
-		$sensei_analysis_course = $this->load_data_object( 'Course', $course_id );
+		$sensei_analysis_course = $this->load_data_object('Course', $course_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'course' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'course'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_course->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_course_view()
 
 	/**
@@ -259,26 +259,26 @@ 
 	 * @param integer $user_id
 	 * @return void
 	 */
-	public function analysis_user_course_view( $course_id, $user_id ) {
+	public function analysis_user_course_view($course_id, $user_id) {
 
 		// Load Analysis data
-		$sensei_analysis_user_course = $this->load_data_object( 'Course', $course_id, $user_id );
+		$sensei_analysis_user_course = $this->load_data_object('Course', $course_id, $user_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'user_course' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'user_course'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_user_course->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_user_course_view()
 
 	/**
@@ -287,26 +287,26 @@ 
 	 * @param integer $course_id
 	 * @return void
 	 */
-	public function analysis_course_users_view( $course_id ) {
+	public function analysis_course_users_view($course_id) {
 
 		// Load Analysis data
-		$sensei_analysis_course_users = $this->load_data_object( 'Course', $course_id );
+		$sensei_analysis_course_users = $this->load_data_object('Course', $course_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'course_users' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'course_users'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_course_users->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_course_users_view()
 
 	/**
@@ -315,26 +315,26 @@ 
 	 * @param integer $lesson_id
 	 * @return void
 	 */
-	public function analysis_lesson_users_view( $lesson_id ) {
+	public function analysis_lesson_users_view($lesson_id) {
 
 		// Load Analysis data
-		$sensei_analysis_lesson_users = $this->load_data_object( 'Lesson', $lesson_id );
+		$sensei_analysis_lesson_users = $this->load_data_object('Lesson', $lesson_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'lesson_users' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'lesson_users'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_lesson_users->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_lesson_users_view()
 
 	/**
@@ -344,7 +344,7 @@ 
 	 * @param  $data string stats data
 	 * @return void
 	 */
-	public function render_stats_box( $title, $data ) {
+	public function render_stats_box($title, $data) {
 		?><div class="postbox">
 			<h2><span><?php echo $title; ?></span></h2>
 			<div class="inside">
@@ -358,14 +358,14 @@ 
 	 * @since  1.2.0
 	 * @return void
 	 */
-	public function analysis_headers( $args = array( 'nav' => 'default' ) ) {
+	public function analysis_headers($args = array('nav' => 'default')) {
 
-		$function = 'analysis_' . $args['nav'] . '_nav';
+		$function = 'analysis_'.$args['nav'].'_nav';
 		$this->$function();
 		?>
 			<p class="powered-by-woo">
 
-                <?php _e( 'Powered by', 'woothemes-sensei' ); ?>
+                <?php _e('Powered by', 'woothemes-sensei'); ?>
 
                 <a href="http://www.woothemes.com/" title="WooThemes">
 
@@ -376,7 +376,7 @@ 
             </p>
 
 		<?php
-		do_action( 'sensei_analysis_after_headers' );
+		do_action('sensei_analysis_after_headers');
 	} // End analysis_headers()
 
 	/**
@@ -385,10 +385,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()
@@ -400,24 +400,24 @@ 
 	 */
 	public function analysis_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 ) );
-		$view = isset($_GET['view']) ? esc_html( $_GET['view'] ) : '';
-		switch ( $view ) { 
+		$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));
+		$view = isset($_GET['view']) ? esc_html($_GET['view']) : '';
+		switch ($view) { 
 			case 'courses' :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Courses', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', __('Courses', 'woothemes-sensei'));
 				break;
 
 			case 'lessons' :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Lessons', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;%s</span>', __('Lessons', 'woothemes-sensei'));
 				break;
 
 			case 'users' :
 			default :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Learners', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;%s</span>', __('Learners', 'woothemes-sensei'));
 				break;
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_default_nav()
 
@@ -428,17 +428,17 @@ 
 	 */
 	public function analysis_user_profile_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['user_id'] ) && 0 < intval( $_GET['user_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['user_id']) && 0 < intval($_GET['user_id'])) {
 
-			$user_id = intval( $_GET['user_id'] );
-			$url = esc_url( add_query_arg( array( 'page' => $this->page_slug, 'user' => $user_id ), admin_url( 'admin.php' ) ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
+			$user_id = intval($_GET['user_id']);
+			$url = esc_url(add_query_arg(array('page' => $this->page_slug, 'user' => $user_id), admin_url('admin.php')));
+            $user_name = Sensei_Learner::get_full_name($user_id);
+			$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name);
 
 		} // End If Statement
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_user_profile_nav()
 
@@ -449,22 +449,22 @@ 
 	 */
 	public function analysis_user_course_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['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
-			$user_data = get_userdata( $user_id );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $user_id ), admin_url( 'admin.php' ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
-            $title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), $user_data->display_name );
+		$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['user_id']) && 0 < intval($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
+			$user_data = get_userdata($user_id);
+			$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $user_id), admin_url('admin.php'));
+            $user_name = Sensei_Learner::get_full_name($user_id);
+            $title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name);
+			$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), $user_data->display_name);
 		} // End If Statement
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), 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['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), 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));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_user_course_nav()
 
@@ -475,14 +475,14 @@ 
 	 */
 	public function analysis_course_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', 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 ), 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>', 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), 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));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_course_nav()
 
@@ -493,14 +493,14 @@ 
 	 */
 	public function analysis_course_users_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', 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 ), 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>', 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), 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));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_course_users_nav()
 
@@ -511,17 +511,17 @@ 
 	 */
 	public function analysis_lesson_users_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['lesson_id'] ) ) { 
-			$lesson_id = intval( $_GET['lesson_id'] );
-			$course_id = intval( get_post_meta( $lesson_id, '_lesson_course', true ) );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), 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 ) );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $lesson_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['lesson_id'])) { 
+			$lesson_id = intval($_GET['lesson_id']);
+			$course_id = intval(get_post_meta($lesson_id, '_lesson_course', true));
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), 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));
+			$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($lesson_id));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_lesson_users_nav()
 
@@ -532,59 +532,59 @@ 
 	 */
 	public function report_download_page() {
 		// Check if is a report
-		if ( !empty( $_GET['sensei_report_download'] ) ) {
-			$report = sanitize_text_field( $_GET['sensei_report_download'] );
+		if ( ! empty($_GET['sensei_report_download'])) {
+			$report = sanitize_text_field($_GET['sensei_report_download']);
 
 			// Simple verification to ensure intent, Note that a Nonce is per user, so the URL can't be shared
-			if ( !wp_verify_nonce( $_REQUEST['_sdl_nonce'], 'sensei_csv_download-' . $report ) ) {
-				wp_die( __('Invalid request', 'woothemes-sensei') );
+			if ( ! wp_verify_nonce($_REQUEST['_sdl_nonce'], 'sensei_csv_download-'.$report)) {
+				wp_die(__('Invalid request', 'woothemes-sensei'));
 			}
 
 			// Setup the variables we might need
-			$filename = apply_filters( 'sensei_csv_export_filename', $report );
+			$filename = apply_filters('sensei_csv_export_filename', $report);
 			$course_id = 0;
 			$lesson_id = 0;
 			$user_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']);
 			}
-			if( isset( $_GET['user_id'] ) ) {
-				$user_id = intval( $_GET['user_id'] );
+			if (isset($_GET['user_id'])) {
+				$user_id = intval($_GET['user_id']);
 			}
-			$type = isset( $_GET['view'] ) ? esc_html( $_GET['view'] ) : false;
+			$type = isset($_GET['view']) ? esc_html($_GET['view']) : false;
 
-			if ( 0 < $lesson_id ) {
+			if (0 < $lesson_id) {
 				// Viewing a specific Lesson and all its Learners
-				$sensei_analysis_report_object = $this->load_report_object( 'Lesson', $lesson_id );
+				$sensei_analysis_report_object = $this->load_report_object('Lesson', $lesson_id);
 			}
-			elseif ( 0 < $course_id && 0 < $user_id ) {
+			elseif (0 < $course_id && 0 < $user_id) {
 				// Viewing a specific User on a specific Course
-				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id, $user_id );
+				$sensei_analysis_report_object = $this->load_report_object('Course', $course_id, $user_id);
 			}
-			elseif( 0 < $course_id ) {
+			elseif (0 < $course_id) {
 				// Viewing a specific Course and all it's Lessons, or it's Learners
-				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id );
+				$sensei_analysis_report_object = $this->load_report_object('Course', $course_id);
 			}
-			elseif ( 0 < $user_id ) {
+			elseif (0 < $user_id) {
 				// Viewing a specific Learner, and their Courses
-				$sensei_analysis_report_object = $this->load_report_object( 'User_Profile', $user_id );
+				$sensei_analysis_report_object = $this->load_report_object('User_Profile', $user_id);
 			}
 			else {
 				// Overview of all Learners, all Courses, or all Lessons
-				$sensei_analysis_report_object = $this->load_report_object( 'Overview', $type );
+				$sensei_analysis_report_object = $this->load_report_object('Overview', $type);
 			} // End If Statement
 
 			// Handle the headers
-			$this->report_set_headers( $filename );
+			$this->report_set_headers($filename);
 
 			// Collate the data, there could be many different reports for a single object
-			$report_data_array = $sensei_analysis_report_object->generate_report( $report );
+			$report_data_array = $sensei_analysis_report_object->generate_report($report);
 
 			// Output the data
-			$this->report_write_download( $report_data_array );
+			$this->report_write_download($report_data_array);
 
 			// Cleanly exit
 			exit;
@@ -597,9 +597,9 @@ 
 	 * @param  string $filename name of report file
 	 * @return void
 	 */
-	public function report_set_headers( $filename = '' ) {
-		header( 'Content-Type: text/csv' );
-		header( 'Content-Disposition: attachment;filename=' . $filename . '.csv');
+	public function report_set_headers($filename = '') {
+		header('Content-Type: text/csv');
+		header('Content-Disposition: attachment;filename='.$filename.'.csv');
 	} // End report_set_headers()
 
 	/**
@@ -610,12 +610,12 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_report_object( $name = '', $data = 0, $optional_data = null ) {
-		$object_name = 'WooThemes_Sensei_Analysis_' . $name . '_List_Table';
-		if ( is_null($optional_data) ) {
-			$sensei_analysis_report_object = new $object_name( $data );
+	public function load_report_object($name = '', $data = 0, $optional_data = null) {
+		$object_name = 'WooThemes_Sensei_Analysis_'.$name.'_List_Table';
+		if (is_null($optional_data)) {
+			$sensei_analysis_report_object = new $object_name($data);
 		} else {
-			$sensei_analysis_report_object = new $object_name( $data, $optional_data );
+			$sensei_analysis_report_object = new $object_name($data, $optional_data);
 		}
 		return $sensei_analysis_report_object;
 	} // End load_report_object()
@@ -626,7 +626,7 @@ 
 	 * @param  array  $report_data data array
 	 * @return void
 	 */
-	public function report_write_download( $report_data = array() ) {
+	public function report_write_download($report_data = array()) {
 		$fp = fopen('php://output', 'w');
 		foreach ($report_data as $row) {
 			fputcsv($fp, $row);
@@ -642,9 +642,9 @@ 
 	 * @param  object $user_query_object     WP_User_Query Object
 	 * @return array $search_columns         array of user columns to search
 	 */
-	public function user_search_columns_filter( $search_columns, $search, $user_query_object ) {
+	public function user_search_columns_filter($search_columns, $search, $user_query_object) {
 		// Alter $search_columns to include the fields you want to search on
-		array_push( $search_columns, 'display_name' );
+		array_push($search_columns, 'display_name');
 		return $search_columns;
 	}