woothemes / sensei

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

Braces +4 added lines, -1 removed lines

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

Spacing +15 added lines, -15 removed lines

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

Indentation +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
 	/**
 	 * trigger function.
 	 *
-     * @param int $learner_id
-     * @param int $course_id
-     *
+	 * @param int $learner_id
+	 * @param int $course_id
+	 *
 	 * @return void
 	 */
 	function trigger( $learner_id = 0, $course_id = 0 ) {

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

Braces +4 added lines, -1 removed lines

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

Indentation +33 added lines, -33 removed lines

@@ -16,38 +16,38 @@ 
  */
 class WooThemes_Sensei_Email_New_Message_Reply {
 
-    /**
-     * @var string
-     */
-    var $template;
-
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
+	var $template;
+
+	/**
+	 * @var string
+	 */
 	var $subject;
 
-    /**
-     * @var string
-     */
-    var $heading;
+	/**
+	 * @var string
+	 */
+	var $heading;
 
-    /**
-     * @var string
-     */
+	/**
+	 * @var string
+	 */
 	var $recipient;
 
 	var $original_sender;
 	var $original_receiver;
 	var $commenter;
 
-    /**
-     * @var WP_Post
-     */
+	/**
+	 * @var WP_Post
+	 */
 	var $message;
 
-    /**
-     * @var WP_Comment
-     */
+	/**
+	 * @var WP_Comment
+	 */
 	var $comment;
 
 	/**
@@ -64,9 +64,9 @@ 
 	/**
 	 * trigger function.
 	 *
-     * @param WP_Comment $comment
-     * @param string $message
-     *
+	 * @param WP_Comment $comment
+	 * @param string $message
+	 *
 	 * @return void
 	 */
 	function trigger ( $comment, $message ) {
@@ -90,16 +90,16 @@ 
 
 		$comment_link = get_comment_link( $comment );
 
-        // setup the post type parameter
-        $content_type = get_post_type( $content_id );
-        if( !$content_type ){
-            $content_type ='';
-        }
+		// setup the post type parameter
+		$content_type = get_post_type( $content_id );
+		if( !$content_type ){
+			$content_type ='';
+		}
 
-        // Construct data array
-        $sensei_email_data = apply_filters( 'sensei_email_data', array(
-            'template'			=> $this->template,
-            $content_type.'_id' => $content_id,
+		// Construct data array
+		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+			'template'			=> $this->template,
+			$content_type.'_id' => $content_id,
 			'heading'			=> $this->heading,
 			'commenter_name'	=> $this->commenter->display_name,
 			'message'			=> $this->comment->comment_content,

Spacing +23 added lines, -23 removed lines

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

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

Braces +4 added lines, -1 removed lines

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

Indentation +5 added lines, -5 removed lines

@@ -36,11 +36,11 @@
 	/**
 	 * trigger function.
 	 *
-     * @param int $user_id
-     * @param int $quiz_id
-     * @param int $grade
-     * @param int $passmark
-     *
+	 * @param int $user_id
+	 * @param int $quiz_id
+	 * @param int $grade
+	 * @param int $passmark
+	 *
 	 * @return void
 	 */
 	function trigger ( $user_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0 ) {

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/class-sensei-utils.php

Braces +41 added lines, -35 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Utilities Class
@@ -181,8 +184,7 @@ 
 				// ...use a filter to switch the encoding back
 				add_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
 			}
-		}
-		else {
+		} else {
 			$args['status'] = 'any'; // 'log' == 'sensei_user_answer'
 		}
 
@@ -307,8 +309,12 @@ 
 				}
 
 				foreach( $activities as $activity ) {
-					if( '' == $activity->comment_type ) continue;
-					if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
+					if( '' == $activity->comment_type ) {
+						continue;
+					}
+					if( strpos( 'sensei_', $activity->comment_type ) != 0 ) {
+						continue;
+					}
 					$dataset_changes = wp_delete_comment( intval( $activity->comment_ID ), true );
 					wp_cache_flush();
 				}
@@ -360,11 +366,13 @@ 
             $emails[] = $user->user_email;
         }
 
-        if ( is_email( $customer_email ) )
-            $emails[] = $customer_email;
+        if ( is_email( $customer_email ) ) {
+                    $emails[] = $customer_email;
+        }
 
-        if ( sizeof( $emails ) == 0 )
-            return false;
+        if ( sizeof( $emails ) == 0 ) {
+                    return false;
+        }
 
         return Sensei_WC::has_customer_bought_product( $user_id, $product_id );
 
@@ -379,7 +387,9 @@ 
 	 */
 	public static function sensei_text_editor( $content = '', $editor_id = 'senseitexteditor', $input_name = '' ) {
 
-		if( ! $input_name ) $input_name = $editor_id;
+		if( ! $input_name ) {
+			$input_name = $editor_id;
+		}
 
 		$buttons = 'bold,italic,underline,strikethrough,blockquote,bullist,numlist,justifyleft,justifycenter,justifyright,undo,redo,pastetext';
 
@@ -689,8 +699,7 @@ 
 				if ( $has_questions ) {
 					$status = 'passed'; // Force a pass
 					$metadata['grade'] = 0;
-				}
-				else {
+				} else {
 					$status = 'complete';
 				}
 			}
@@ -738,7 +747,9 @@ 
 	public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) {
 
 
-		if( ! $lesson_id ) return false;
+		if( ! $lesson_id ) {
+			return false;
+		}
 
 		if( intval( $user_id ) == 0 ) {
 			$user_id = get_current_user_id();
@@ -776,7 +787,9 @@ 
 	public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) {
 
 
-		if( ! $course_id ) return false;
+		if( ! $course_id ) {
+			return false;
+		}
 
 		if( intval( $user_id ) == 0 ) {
 			$user_id = get_current_user_id();
@@ -844,8 +857,7 @@ 
 		if( $question ) {
 			if ( is_object( $question ) ) {
 				$user_answer_id = $question->comment_ID;
-			}
-			else {
+			} else {
 				if( intval( $user_id ) == 0 ) {
 					$user_id = get_current_user_id();
 				}
@@ -872,8 +884,7 @@ 
 		if( $question ) {
 			if ( is_object( $question ) ) {
 				$user_answer_id = $question->comment_ID;
-			}
-			else {
+			} else {
 				if( intval( $user_id ) == 0 ) {
 					$user_id = get_current_user_id();
 				}
@@ -938,8 +949,7 @@ 
 			if ( !empty($notes) ) {
 				$user_lesson_id = WooThemes_Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
 				$activity_logged = update_comment_meta( $user_lesson_id, 'answer_note', $notes );
-			}
-			else {
+			} else {
 				$activity_logged = true;
 			}
 		}
@@ -1451,8 +1461,7 @@ 
 							$lessons_completed++;
 							break;
 					}
-				}
-				else {
+				} else {
 					switch ( $lesson_status->comment_approved ) {
 						case 'complete': // Lesson has no quiz/questions
 						case 'graded': // Lesson has quiz, but it's not important what the grade was
@@ -1500,11 +1509,9 @@ 
 		if( $course ) {
 			if ( is_object( $course ) && is_a( $course,'WP_Comment') ) {
 				$user_course_status = $course->comment_approved;
-			}
-			elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) {
+			} elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) {
 				$user_course_status = $course;
-			}
-			else {
+			} else {
 				if( ! $user_id ) {
 					$user_id = get_current_user_id();
 				}
@@ -1564,11 +1571,9 @@ 
 			if ( is_object( $lesson ) ) {
 				$user_lesson_status = $lesson->comment_approved;
 				$lesson_id = $lesson->comment_post_ID;
-			}
-			elseif ( ! is_numeric( $lesson ) ) {
+			} elseif ( ! is_numeric( $lesson ) ) {
 				$user_lesson_status = $lesson;
-			}
-			else {
+			} else {
 				if( ! $user_id ) {
 					$user_id = get_current_user_id();
 				}
@@ -1581,8 +1586,7 @@ 
 
 				if ( $_user_lesson_status ) {
 					$user_lesson_status = $_user_lesson_status->comment_approved;
-				}
-				else {
+				} else {
 					return false; // No status means not complete
 				}
 				$lesson_id = $lesson;
@@ -1683,7 +1687,9 @@ 
 
 	public static function user_passed_quiz( $quiz_id = 0, $user_id = 0 ) {
 
-		if( ! $quiz_id  ) return false;
+		if( ! $quiz_id  ) {
+			return false;
+		}
 
 		if( ! $user_id ) {
 			$user_id = get_current_user_id();
@@ -1921,7 +1927,7 @@ 
             $start_function = 'user_start_'.$post_type;
             $sensei_user_activity_id = self::$start_function( $user_id, $post_id );
 
-        }else{
+        } else{
 
             $sensei_user_activity_id = $sensei_user_status->comment_ID;
 
@@ -2138,7 +2144,7 @@ 
 
             return round( $val, $precision, $mode );
 
-        }else{
+        } else{
 
             return round( $val, $precision );
 

Indentation +492 added lines, -492 removed lines

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

Spacing +531 added lines, -531 removed lines

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

Doc Comments +20 added lines, -17 removed lines

@@ -463,6 +463,9 @@ 
 
 	} // End sensei_save_quiz_answers()
 
+	/**
+	 * @return string
+	 */
 	public static function upload_file( $file = array() ) {
 
 		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -635,7 +638,7 @@ 
      * @param integer $lesson_id
      * @param bool $complete
      *
-     * @return mixed boolean or comment_ID
+     * @return boolean|string boolean or comment_ID
      */
     public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
 
@@ -654,7 +657,7 @@ 
 	 * @param int| string $user_id default 0
      * @param bool $complete default false
      *
-     * @return mixed boolean or comment_ID
+     * @return boolean|string boolean or comment_ID
 	 */
 	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
 
@@ -833,7 +836,7 @@ 
 	/**
 	 * Returns the user_grade for a specific question and user, or sensei_user_answer entry
 	 *
-	 * @param mixed $question
+	 * @param integer $question
 	 * @param int $user_id
 	 * @return string
 	 */
@@ -861,7 +864,7 @@ 
 	 * Returns the answer_notes for a specific question and user, or sensei_user_answer entry
 	 *
      * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
-	 * @param mixed $question
+	 * @param integer $question
 	 * @param int $user_id
 	 * @return string
 	 */
@@ -974,7 +977,7 @@ 
 	 * sort_array_by_key sorts array by key
 	 * @since  1.3.0
 	 * @param  array $array by ref
-	 * @param  $key string column name in array
+	 * @param  string $key string column name in array
 	 * @return void
 	 */
 	public static function sort_array_by_key( $array, $key ) {
@@ -1021,7 +1024,7 @@ 
 	/**
 	 * Get pass mark for course
 	 * @param  integer $course_id ID of course
-	 * @return integer            Pass mark for course
+	 * @return double            Pass mark for course
 	 */
 	public static function sensei_course_pass_grade( $course_id = 0 ) {
 
@@ -1062,7 +1065,7 @@ 
 	 * Get user total grade for course
 	 * @param  integer $course_id ID of course
 	 * @param  integer $user_id   ID of user
-	 * @return integer            User's total grade
+	 * @return double            User's total grade
 	 */
 	public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) {
 
@@ -1322,7 +1325,7 @@ 
 	 * @since  1.4.8
 	 * @param  integer $user_id   User ID
 	 * @param  integer $course_id Course ID
-	 * @return mixed boolean or comment_ID
+	 * @return string|boolean boolean or comment_ID
 	 */
 	public static function user_start_course( $user_id = 0, $course_id = 0 ) {
 
@@ -1358,7 +1361,7 @@ 
 	 * @since  1.7.0
 	 * @param int $course_id
 	 * @param int $user_id
-	 * @return mixed false or comment_ID
+	 * @return false|string false or comment_ID
 	 */
 	public static function user_started_course( $course_id = 0, $user_id = 0 ) {
 
@@ -1385,7 +1388,7 @@ 
 	 * @since  1.7.0
 	 * @param  integer $course_id Course ID
 	 * @param  integer $user_id   User ID
-	 * @return int
+	 * @return boolean
 	 */
 	public static function user_complete_course( $course_id = 0, $user_id = 0 ) {
 		global  $wp_version;
@@ -1534,7 +1537,7 @@ 
 	 * @since  1.7.0
 	 * @param int $lesson_id
 	 * @param int $user_id
-	 * @return mixed false or comment_ID
+	 * @return string|false false or comment_ID
 	 */
 	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) {
 
@@ -1561,7 +1564,7 @@ 
 	 * Check if a user has completed a lesson or not
 	 *
      * @uses  Sensei()
-	 * @param mixed $lesson lesson_id or sensei_lesson_status entry
+	 * @param integer $lesson lesson_id or sensei_lesson_status entry
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1659,7 +1662,7 @@ 
 	 * @since 1.7.0
 	 * @param int $lesson_id
 	 * @param int $user_id
-	 * @return object | bool
+	 * @return integer | bool
 	 */
 	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
 
@@ -1718,11 +1721,11 @@ 
 	 * @since  1.7.0
      *
 	 * @param int|string $user_id
-	 * @param int|string $lesson_id
+	 * @param integer $lesson_id
 	 * @param string $status
 	 * @param array $metadata
      *
-	 * @return mixed false or comment_ID
+	 * @return boolean false or comment_ID
 	 */
 	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -1760,7 +1763,7 @@ 
 	 * @param int $course_id
 	 * @param string $status
 	 * @param array $metadata
-	 * @return mixed false or comment_ID
+	 * @return boolean false or comment_ID
 	 */
 	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -1950,7 +1953,7 @@ 
      *
      * @since 1.7.4
      *
-     * @param $data_key
+     * @param string $data_key
      * @param $post_id
      * @param int $user_id
      *

includes/template-functions.php

Braces +13 added lines, -8 removed lines

@@ -181,7 +181,9 @@ 
 	 * @return void
 	 */
 	function sensei_recent_comments_widget_filter( $widget_args = array() ) {
-		if ( ! isset( $widget_args['post_type'] ) ) $widget_args['post_type'] = array( 'post', 'page' );
+		if ( ! isset( $widget_args['post_type'] ) ) {
+			$widget_args['post_type'] = array( 'post', 'page' );
+		}
 		return $widget_args;
 	} // End sensei_recent_comments_widget_filter()
 	add_filter( 'widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1 );
@@ -196,8 +198,9 @@ 
 	function sensei_course_archive_filter( $query ) {
 
 
-		if ( ! $query->is_main_query() )
-        	return;
+		if ( ! $query->is_main_query() ) {
+		        	return;
+		}
 
 		// Apply Filter only if on frontend and when course archive is running
 		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
@@ -412,7 +415,7 @@ 
 
 		return false;
 
-	}else{
+	} else{
 
 		return true;
 
@@ -446,7 +449,7 @@ 
 
 			$wp_query = $modules_query;
 
-		}else{
+		} else{
 
 			wp_reset_query();
 
@@ -478,7 +481,7 @@ 
 
 		return have_posts();
 
-	}else{
+	} else{
 
         // if the loop has not been initiated check the first module has lessons
         if( -1 == $sensei_modules_loop[ 'current' ]  ){
@@ -622,7 +625,7 @@ 
 
         return true;
 
-    }else{
+    } else{
 
         return false;
 
@@ -865,7 +868,9 @@ 
  */
 function get_sensei_header(){
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+    if ( ! defined( 'ABSPATH' ) ) {
+    	exit;
+    }
 
     get_header();
 

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 * sensei_check_if_product_is_in_cart function.
 	 *
 	 * @deprecated since 1.9.0
-	 * @param int $wc_post_id (default: 0)
+	 * @param int $wc_product_id (default: 0)
 	 * @return bool
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {

Indentation +320 added lines, -321 removed lines

@@ -5,18 +5,18 @@ 
 	 * 	Output tags.
 	 ***************************************************************************************************/
 
-    /**
-     * sensei_course_archive_next_link function.
-     *
-     * @access public
-     * @param string $type (default: 'newcourses')
-     * @return void
-     */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+	/**
+	 * sensei_course_archive_next_link function.
+	 *
+	 * @access public
+	 * @param string $type (default: 'newcourses')
+	 * @return void
+	 */
+	function sensei_course_archive_next_link( $type = 'newcourses' ) {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+		_deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
 
-    } // End sensei_course_archive_next_link()
+	} // End sensei_course_archive_next_link()
 
 	 /**
 	  * course_single_lessons function.
@@ -26,14 +26,14 @@ 
 	  */
 	 function course_single_lessons() {
 
-         // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+		 // load backwards compatible template name if it exists in the users theme
+		 $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
+		 if( $located_template ){
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
-             return;
+			 Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+			 return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'single-course/lessons.php' );
 
@@ -48,8 +48,8 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
-         sensei_the_single_lesson_meta();
+		 _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+		 sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
 
@@ -60,7 +60,7 @@ 
 	  * @access public
 	  * @param bool $return (default: false)
 	  * @return void
-      * @deprecated since 1.9.0
+	  * @deprecated since 1.9.0
 	  */
 	 function quiz_questions( $return = false ) {
 
@@ -74,11 +74,11 @@ 
 	  * @access public
 	  * @since  1.3.0
 	  * @return void
-      * @deprecated
+	  * @deprecated
 	  */
 	 function quiz_question_type( $question_type = 'multiple-choice' ) {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+		 Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
 
 	 } // End lesson_single_meta()
 
@@ -89,14 +89,14 @@ 
 	/**
 	 * sensei_check_prerequisite_course function.
 	 *
-     * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
+	 * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return bool
 	 */
 	function sensei_check_prerequisite_course( $course_id ) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+		return Sensei_Course::is_prerequisite_complete( $course_id );
 
 	} // End sensei_check_prerequisite_course()
 
@@ -120,14 +120,14 @@ 
     			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
 
     		</form><?php
-    	} // End If Statement
+		} // End If Statement
 	} // End sensei_start_course_form()
 
 
 	/**
 	 * sensei_wc_add_to_cart function.
 	 *
-     * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
+	 * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return void
@@ -147,7 +147,7 @@ 
 	 * @return bool
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+		return Sensei_WC::is_product_in_cart( $wc_product_id );
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -160,17 +160,17 @@ 
 	function sensei_simple_course_price( $post_id ) {
 
 		//WooCommerce Pricing
-        if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		if ( Sensei_WC::is_woocommerce_active() ) {
+			$wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
+			if ( 0 < $wc_post_id ) {
+				// Get the product
+				$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+				if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
-    	    } // End If Statement
-    	} // End If Statement
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_simple_course_price()
 
 	/**
@@ -197,7 +197,7 @@ 
 
 
 		if ( ! $query->is_main_query() )
-        	return;
+			return;
 
 		// Apply Filter only if on frontend and when course archive is running
 		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
@@ -205,11 +205,11 @@ 
 		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
 			// Check for pagination settings
    			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
-    		} else {
-    			$amount = $query->get( 'posts_per_page' );
-    		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			} else {
+				$amount = $query->get( 'posts_per_page' );
+			} // End If Statement
+			$query->set( 'posts_per_page', $amount );
 		} // End If Statement
 	} // End sensei_course_archive_filter()
 	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
@@ -248,70 +248,70 @@ 
 			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
-
-            if( !empty( $modules )  ){
-                foreach( (array) $modules as $module ) {
-
-                    $args = array(
-                        'post_type' => 'lesson',
-                        'post_status' => 'publish',
-                        'posts_per_page' => -1,
-                        'meta_query' => array(
-                            array(
-                                'key' => '_lesson_course',
-                                'value' => intval( $lesson_course_id ),
-                                'compare' => '='
-                            )
-                        ),
-                        'tax_query' => array(
-                            array(
-                                'taxonomy' => Sensei()->modules->taxonomy,
-                                'field' => 'id',
-                                'terms' => intval( $module->term_id )
-                            )
-                        ),
-                        'meta_key' => '_order_module_' . $module->term_id,
-                        'orderby' => 'meta_value_num date',
-                        'order' => 'ASC',
-                        'suppress_filters' => 0
-                    );
-
-                    $lessons = get_posts( $args );
-                    if ( 0 < count( $lessons ) ) {
-                        foreach ($lessons as $lesson_item){
-                            $all_lessons[] = $lesson_item->ID;
-                        } // End For Loop
-                    } // End If Statement
-
-                }//end for each
-
-            }// end if empty modules
-
-            $args = array(
-                'post_type' => 'lesson',
-                'posts_per_page' => -1,
-                'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
-                'orderby' => 'meta_value_num date',
-                'order' => 'ASC',
-                'meta_query' => array(
-                    array(
-                        'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
-                    ),
-                ),
-                'post__not_in' => $all_lessons,
-            );
-
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
+			$modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+
+			if( !empty( $modules )  ){
+				foreach( (array) $modules as $module ) {
+
+					$args = array(
+						'post_type' => 'lesson',
+						'post_status' => 'publish',
+						'posts_per_page' => -1,
+						'meta_query' => array(
+							array(
+								'key' => '_lesson_course',
+								'value' => intval( $lesson_course_id ),
+								'compare' => '='
+							)
+						),
+						'tax_query' => array(
+							array(
+								'taxonomy' => Sensei()->modules->taxonomy,
+								'field' => 'id',
+								'terms' => intval( $module->term_id )
+							)
+						),
+						'meta_key' => '_order_module_' . $module->term_id,
+						'orderby' => 'meta_value_num date',
+						'order' => 'ASC',
+						'suppress_filters' => 0
+					);
+
+					$lessons = get_posts( $args );
+					if ( 0 < count( $lessons ) ) {
+						foreach ($lessons as $lesson_item){
+							$all_lessons[] = $lesson_item->ID;
+						} // End For Loop
+					} // End If Statement
+
+				}//end for each
+
+			}// end if empty modules
+
+			$args = array(
+				'post_type' => 'lesson',
+				'posts_per_page' => -1,
+				'suppress_filters' => 0,
+				'meta_key' => '_order_' . $lesson_course_id,
+				'orderby' => 'meta_value_num date',
+				'order' => 'ASC',
+				'meta_query' => array(
+					array(
+						'key' => '_lesson_course',
+						'value' => intval( $lesson_course_id ),
+					),
+				),
+				'post__not_in' => $all_lessons,
+			);
+
+			$other_lessons = get_posts( $args );
+			if ( 0 < count( $other_lessons ) ) {
 				foreach ($other_lessons as $lesson_item){
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+			if ( 0 < count( $all_lessons ) ) {
 				$found_index = false;
 				foreach ( $all_lessons as $lesson ){
 					if ( $found_index && $return_values['next_lesson'] == 0 ) {
@@ -342,9 +342,9 @@ 
    */
   function sensei_get_excerpt( $post_id = '' ) {
 
-      global $post;
-      _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
-      return get_the_excerpt();
+	  global $post;
+	  _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
+	  return get_the_excerpt();
 
   }
 
@@ -369,7 +369,7 @@ 
 */
 function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+	return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -484,27 +484,27 @@ 
 
 	}else{
 
-        // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+		// if the loop has not been initiated check the first module has lessons
+		if( -1 == $sensei_modules_loop[ 'current' ]  ){
 
-            $index = 0;
+			$index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
-                // setup the query for the module lessons
-                $course_id = $sensei_modules_loop['course_id'];
+			if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+				// setup the query for the module lessons
+				$course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+				$module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
+				$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
 
-                // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+				// setup the global wp-query only if the lessons
+				if( $modules_query->have_posts() ){
 
-                    return true;
+					return true;
 
-                }
-            }
-        }
-        // default to false if the first module doesn't have posts
+				}
+			}
+		}
+		// default to false if the first module doesn't have posts
 		return false;
 
 	}
@@ -612,46 +612,46 @@ 
 		return '';
 	}
 
-    global $sensei_modules_loop;
-    $module_title = $sensei_modules_loop['current_module']->name;
-    $module_term_id = $sensei_modules_loop['current_module']->term_id;
-    $course_id = $sensei_modules_loop['course_id'];
-    $module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
+	global $sensei_modules_loop;
+	$module_title = $sensei_modules_loop['current_module']->name;
+	$module_term_id = $sensei_modules_loop['current_module']->term_id;
+	$course_id = $sensei_modules_loop['course_id'];
+	$module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
 
-    $module_status =  '';
-    if ( $module_progress && $module_progress > 0) {
+	$module_status =  '';
+	if ( $module_progress && $module_progress > 0) {
 
-        $module_status = __('Completed', 'woothemes-sensei');
+		$module_status = __('Completed', 'woothemes-sensei');
 
-        if ($module_progress < 100) {
+		if ($module_progress < 100) {
 
-            $module_status = __('In progress', 'woothemes-sensei');
+			$module_status = __('In progress', 'woothemes-sensei');
 
-        }
+		}
 
-    }
+	}
 
 	if ( empty( $module_status ) ){
 		return '';
 	}
 
 	$status_class = strtolower( str_replace( ' ', '-', $module_status  ) );
-    $module_status_html = '<p class="status module-status ' . $status_class . '">'
-                            . $module_status
-                            . '</p>';
-
-    /**
-     * Filter the module status.
-     *
-     * This fires within the sensei_get_the_module_status function.
-     *
-     * @since 1.9.0
-     *
-     * @param $module_status_html
-     * @param $module_term_id
-     * @param $course_id
-     */
-    return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
+	$module_status_html = '<p class="status module-status ' . $status_class . '">'
+							. $module_status
+							. '</p>';
+
+	/**
+	 * Filter the module status.
+	 *
+	 * This fires within the sensei_get_the_module_status function.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $module_status_html
+	 * @param $module_term_id
+	 * @param $course_id
+	 */
+	return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
 
 }
 
@@ -661,7 +661,7 @@ 
  */
 function sensei_the_module_status(){
 
-    echo sensei_get_the_module_status();
+	echo sensei_get_the_module_status();
 
 }
 
@@ -682,21 +682,21 @@ 
  */
 function sensei_quiz_has_questions(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
-        return false;
-    }
+	if( !isset( $sensei_question_loop['total'] ) ){
+		return false;
+	}
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+	if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
 
-        return true;
+		return true;
 
-    }else{
+	}else{
 
-        return false;
+		return false;
 
-    }
+	}
 
 }// end sensei_quiz_has_questions
 
@@ -707,15 +707,14 @@ 
  * execution.
  *
  * @since 1.9.0
-
  */
 function sensei_setup_the_question(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $sensei_question_loop['current']++;
-    $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+	$sensei_question_loop['current']++;
+	$index = $sensei_question_loop['current'];
+	$sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
 
 
 }// end sensei_setup_the_question
@@ -728,12 +727,12 @@ 
  */
 function sensei_the_question_content(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+	// load the template that displays the question information.
+	WooThemes_Sensei_Question::load_question_template( $question_type );
 
 }// end sensei_the_question_content
 
@@ -744,26 +743,26 @@ 
  */
 function sensei_the_question_class(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    /**
-     * filter the sensei question class within
-     * the quiz question loop.
-     *
-     * @since 1.9.0
-     */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+	/**
+	 * filter the sensei question class within
+	 * the quiz question loop.
+	 *
+	 * @since 1.9.0
+	 */
+	 $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
 
-    $html_classes = '';
-    foreach( $classes as $class ){
+	$html_classes = '';
+	foreach( $classes as $class ){
 
-        $html_classes .= $class . ' ';
+		$html_classes .= $class . ' ';
 
-    }// end foreach
+	}// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+	esc_attr_e( trim( $html_classes ) );
 
 }
 
@@ -774,12 +773,12 @@ 
  */
 function sensei_get_the_question_id( ){
 
-    global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+	global $sensei_question_loop;
+	if( isset( $sensei_question_loop['current_question']->ID ) ){
 
-        return $sensei_question_loop['current_question']->ID;
+		return $sensei_question_loop['current_question']->ID;
 
-    }
+	}
 
 }// end sensei_the_question_id
 
@@ -806,63 +805,63 @@ 
  */
 function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
 
-    if( empty( $lesson_id ) ){
+	if( empty( $lesson_id ) ){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( empty( $user_id ) ){
+	if( empty( $user_id ) ){
 
-        $user_id = get_current_user_id();
+		$user_id = get_current_user_id();
 
-    }
+	}
 
-    // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+	// Check for prerequisite lesson completions
+	$pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
+	$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+	$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
 
-    $is_preview = false;
-    if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+	$is_preview = false;
+	if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
 
-        $is_preview = true;
-        $pre_requisite_complete = true;
+		$is_preview = true;
+		$pre_requisite_complete = true;
 
-    };
+	};
 
 
-    $user_can_access_lesson =  false;
+	$user_can_access_lesson =  false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+	if( is_user_logged_in() && $user_taking_course ){
 
-        $user_can_access_lesson =  true;
+		$user_can_access_lesson =  true;
 
-    }
+	}
 
 
-    $access_permission = false;
+	$access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+	if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-        $access_permission = true;
+		$access_permission = true;
 
-    }
+	}
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+	$can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
 
-    /**
-     * Filter the can user view lesson function
-     *
-     * @since 1.9.0
-     *
-     * @hooked Sensei_WC::alter_can_user_view_lesson
-     *
-     * @param bool $can_user_view_lesson
-     * @param string $lesson_id
-     * @param string $user_id
-     */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+	/**
+	 * Filter the can user view lesson function
+	 *
+	 * @since 1.9.0
+	 *
+	 * @hooked Sensei_WC::alter_can_user_view_lesson
+	 *
+	 * @param bool $can_user_view_lesson
+	 * @param string $lesson_id
+	 * @param string $user_id
+	 */
+	return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
 
 } // end sensei_can_current_user_view_lesson
 
@@ -874,49 +873,49 @@ 
  */
 function sensei_the_single_lesson_meta(){
 
-    // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+	// if the lesson meta is included within theme load that instead of the function content
+	$template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
+	if( ! empty( $template ) ){
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
-        return;
+		Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+		return;
 
-    }
-
-    // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+	}
 
-    // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
-    // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
-        ?>
+	// Get the meta info
+	$lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
+	$is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+
+	// Complete Lesson Logic
+	do_action( 'sensei_complete_lesson' );
+	// Check that the course has been started
+	if ( Sensei()->access_settings()
+		|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
+		|| $is_preview ) {
+		?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+			if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+				do_action( 'sensei_lesson_video', get_the_ID() );
 
-            }
-            ?>
+			}
+			?>
             <?php do_action( 'sensei_frontend_messages' ); ?>
 
             <?php if ( ! $is_preview
-                || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+				|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+				sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
 
-            } ?>
+			} ?>
         </section>
 
         <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+	do_action( 'sensei_lesson_meta_extra', get_the_ID() );
 
 } // end the_single_lesson_meta
 
@@ -932,16 +931,16 @@ 
  */
 function get_sensei_header(){
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+	if ( ! defined( 'ABSPATH' ) ) exit;
 
-    get_header();
+	get_header();
 
-    /**
-     * sensei_before_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
-     */
-    do_action( 'sensei_before_main_content' );
+	/**
+	 * sensei_before_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
+	 */
+	do_action( 'sensei_before_main_content' );
 
 }// end get_sensei_header
 
@@ -957,28 +956,28 @@ 
  */
 function get_sensei_footer(){
 
-    /**
-     * sensei_pagination hook
-     *
-     * @hooked sensei_pagination - 10 (outputs pagination)
-     */
-    do_action( 'sensei_pagination' );
-
-    /**
-     * sensei_after_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
-     */
-    do_action( 'sensei_after_main_content' );
-
-    /**
-     * sensei_sidebar hook
-     *
-     * @hooked sensei_get_sidebar - 10
-     */
-    do_action( 'sensei_sidebar' );
-
-    get_footer();
+	/**
+	 * sensei_pagination hook
+	 *
+	 * @hooked sensei_pagination - 10 (outputs pagination)
+	 */
+	do_action( 'sensei_pagination' );
+
+	/**
+	 * sensei_after_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
+	 */
+	do_action( 'sensei_after_main_content' );
+
+	/**
+	 * sensei_sidebar hook
+	 *
+	 * @hooked sensei_get_sidebar - 10
+	 */
+	do_action( 'sensei_sidebar' );
+
+	get_footer();
 
 }// end get_sensei_header
 
@@ -990,14 +989,14 @@ 
  */
 function the_no_permissions_title(){
 
-    /**
-     * Filter the no permissions title just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_title
-     */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+	/**
+	 * Filter the no permissions title just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_title
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
 
 }
 
@@ -1008,14 +1007,14 @@ 
  */
 function the_no_permissions_message( $post_id ){
 
-    /**
-     * Filter the no permissions message just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_message
-     */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+	/**
+	 * Filter the no permissions message just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_message
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
 
 }
 
@@ -1026,8 +1025,8 @@ 
  */
 function sensei_the_excerpt( $post_id ){
 
-    global $post;
-    the_excerpt( $post );
+	global $post;
+	the_excerpt( $post );
 
 }
 
@@ -1041,9 +1040,9 @@ 
  */
  function sensei_get_current_page_url(){
 
-     global $wp;
-     $current_page_url =  home_url( $wp->request );
-     return $current_page_url;
+	 global $wp;
+	 $current_page_url =  home_url( $wp->request );
+	 return $current_page_url;
 
  }
 
@@ -1055,7 +1054,7 @@ 
  */
 function sensei_the_my_courses_content(){
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+	echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
 
 } // sensei_the_my_courses_content
 
@@ -1070,7 +1069,7 @@ 
  */
 function sensei_load_template( $template_name ){
 
-    Sensei_Templates::get_template( $template_name );
+	Sensei_Templates::get_template( $template_name );
 
 }
 
@@ -1084,7 +1083,7 @@ 
  */
 function sensei_load_template_part( $slug, $name ){
 
-    Sensei_Templates::get_part( $slug, $name );
+	Sensei_Templates::get_part( $slug, $name );
 
 }
 
@@ -1103,17 +1102,17 @@ 
  */
 function sensei_the_lesson_excerpt( $lesson_id = '' ) {
 
-    if( empty( $lesson_id )){
+	if( empty( $lesson_id )){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
-        return;
-    }
+	if( 'lesson' != get_post_type( $lesson_id ) ){
+		return;
+	}
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+	echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
 
 }// End lesson_excerpt()
 
@@ -1123,16 +1122,16 @@ 
  * @since 1.9.0
  */
 function sensei_the_course_results_lessons(){
-    // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+	// load backwards compatible template name if it exists in the users theme
+	$located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
+	if( $located_template ){
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
-        return;
+		Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+		return;
 
-    }
+	}
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+	Sensei_Templates::get_template( 'course-results/lessons.php' );
 }
 
 /**
@@ -1144,7 +1143,7 @@ 
  */
 function sensei_courses_per_row(){
 
-    echo Sensei_Course::get_loop_number_of_columns();
+	echo Sensei_Course::get_loop_number_of_columns();
 
 }
 
@@ -1158,7 +1157,7 @@ 
  */
 function sensei_get_template( $template_name, $args, $path ){
 
-    Sensei_Templates::get_template( $template_name, $args, $path );
+	Sensei_Templates::get_template( $template_name, $args, $path );
 
 }
 
@@ -1172,14 +1171,14 @@ 
  */
 function get_the_lesson_status_class(){
 
-    $status_class = '';
-    $lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+	$status_class = '';
+	$lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
 
-    if ( $lesson_completed ) {
-        $status_class = 'completed';
-    }
+	if ( $lesson_completed ) {
+		$status_class = 'completed';
+	}
 
-    return  $status_class;
+	return  $status_class;
 
 }// end get_the_lesson_status_class
 /**
@@ -1191,5 +1190,5 @@ 
  */
 function sensei_the_lesson_status_class(){
 
-    echo get_the_lesson_status_class();
+	echo get_the_lesson_status_class();
 }

Spacing +197 added lines, -197 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ){ exit; } // Exit if accessed directly
+if ( ! defined('ABSPATH')) { exit; } // Exit if accessed directly
 
 	/***************************************************************************************************
 	 * 	Output tags.
@@ -12,9 +12,9 @@ 
      * @param string $type (default: 'newcourses')
      * @return void
      */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+    function sensei_course_archive_next_link($type = 'newcourses') {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+        _deprecated_function('sensei_course_archive_next_link', '1.9.0', 'This is no longer used or required in Sensei.');
 
     } // End sensei_course_archive_next_link()
 
@@ -27,15 +27,15 @@ 
 	 function course_single_lessons() {
 
          // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+         $located_template = locate_template(Sensei()->template_url.'single-course/course-lessons.php');
+         if ($located_template) {
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+             Sensei_Templates::get_template('single-course/course-lessons.php');
              return;
 
         }
 
-		Sensei_Templates::get_template( 'single-course/lessons.php' );
+		Sensei_Templates::get_template('single-course/lessons.php');
 
 	 } // End course_single_lessons()
 
@@ -48,7 +48,7 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+         _deprecated_function('lesson_single_meta', '1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta');
          sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
@@ -62,9 +62,9 @@ 
 	  * @return void
       * @deprecated since 1.9.0
 	  */
-	 function quiz_questions( $return = false ) {
+	 function quiz_questions($return = false) {
 
-	 	Sensei_Templates::get_template( 'single-quiz/quiz-questions.php' );
+	 	Sensei_Templates::get_template('single-quiz/quiz-questions.php');
 
 	 } // End quiz_questions()
 
@@ -76,9 +76,9 @@ 
 	  * @return void
       * @deprecated
 	  */
-	 function quiz_question_type( $question_type = 'multiple-choice' ) {
+	 function quiz_question_type($question_type = 'multiple-choice') {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+         Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php');
 
 	 } // End lesson_single_meta()
 
@@ -94,9 +94,9 @@ 
 	 * @param mixed $course_id
 	 * @return bool
 	 */
-	function sensei_check_prerequisite_course( $course_id ) {
+	function sensei_check_prerequisite_course($course_id) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+        return Sensei_Course::is_prerequisite_complete($course_id);
 
 	} // End sensei_check_prerequisite_course()
 
@@ -108,16 +108,16 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_start_course_form( $course_id ) {
+	function sensei_start_course_form($course_id) {
 
-		$prerequisite_complete = sensei_check_prerequisite_course( $course_id );
+		$prerequisite_complete = sensei_check_prerequisite_course($course_id);
 
-		if ( $prerequisite_complete ) {
-		?><form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		if ($prerequisite_complete) {
+		?><form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
-    			<input type="hidden" name="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" id="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_start_course_noonce' ) ); ?>" />
+    			<input type="hidden" name="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" id="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_start_course_noonce')); ?>" />
 
-    			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
+    			<span><input name="course_start" type="submit" class="course-start" value="<?php _e('Start taking this Course', 'woothemes-sensei'); ?>"/></span>
 
     		</form><?php
     	} // End If Statement
@@ -132,9 +132,9 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_wc_add_to_cart( $course_id ) {
+	function sensei_wc_add_to_cart($course_id) {
 
-		Sensei_WC::the_add_to_cart_button_html( $course_id );
+		Sensei_WC::the_add_to_cart_button_html($course_id);
 
 	} // End sensei_wc_add_to_cart()
 
@@ -146,8 +146,8 @@ 
 	 * @param int $wc_post_id (default: 0)
 	 * @return bool
 	 */
-	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+	function sensei_check_if_product_is_in_cart($wc_product_id = 0) {
+        return Sensei_WC::is_product_in_cart($wc_product_id);
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -157,16 +157,16 @@ 
 	 * @param mixed $post_id
 	 * @return void
 	 */
-	function sensei_simple_course_price( $post_id ) {
+	function sensei_simple_course_price($post_id) {
 
 		//WooCommerce Pricing
-        if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
+        if (Sensei_WC::is_woocommerce_active()) {
+    	    $wc_post_id = get_post_meta($post_id, '_course_woocommerce_product', true);
+    	    if (0 < $wc_post_id) {
     	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+    	    	$product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+    	    	if (isset($product) && ! empty($product) && $product->is_purchasable() && $product->is_in_stock() && ! sensei_check_if_product_is_in_cart($wc_post_id)) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
     	    } // End If Statement
@@ -180,11 +180,11 @@ 
 	 * @param array $widget_args (default: array())
 	 * @return array
 	 */
-	function sensei_recent_comments_widget_filter( $widget_args = array() ) {
-		if ( ! isset( $widget_args['post_type'] ) ) $widget_args['post_type'] = array( 'post', 'page' );
+	function sensei_recent_comments_widget_filter($widget_args = array()) {
+		if ( ! isset($widget_args['post_type'])) $widget_args['post_type'] = array('post', 'page');
 		return $widget_args;
 	} // End sensei_recent_comments_widget_filter()
-	add_filter( 'widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1 );
+	add_filter('widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1);
 
 	/**
 	 * sensei_course_archive_filter function.
@@ -193,26 +193,26 @@ 
 	 * @param WP_Query $query ( default: array ( ) )
 	 * @return void
 	 */
-	function sensei_course_archive_filter( $query ) {
+	function sensei_course_archive_filter($query) {
 
 
-		if ( ! $query->is_main_query() )
+		if ( ! $query->is_main_query())
         	return;
 
 		// Apply Filter only if on frontend and when course archive is running
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
 
-		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
+		if ( ! is_admin() && 0 < $course_page_id && 0 < intval($query->get('page_id')) && $query->get('page_id') == $course_page_id) {
 			// Check for pagination settings
-   			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+   			if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
+    			$amount = absint(Sensei()->settings->settings['course_archive_amount']);
     		} else {
-    			$amount = $query->get( 'posts_per_page' );
+    			$amount = $query->get('posts_per_page');
     		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+    		$query->set('posts_per_page', $amount);
 		} // End If Statement
 	} // End sensei_course_archive_filter()
-	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
+	add_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1);
 
 	/**
 	 * sensei_complete_lesson_button description
@@ -220,7 +220,7 @@ 
 	 * @return html
 	 */
 	function sensei_complete_lesson_button() {
-		do_action( 'sensei_complete_lesson_button' );
+		do_action('sensei_complete_lesson_button');
 	} // End sensei_complete_lesson_button()
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @return html
 	 */
 	function sensei_reset_lesson_button() {
-		do_action( 'sensei_reset_lesson_button' );
+		do_action('sensei_reset_lesson_button');
 	} // End sensei_reset_lesson_button()
 
 	/**
@@ -238,20 +238,20 @@ 
 	 * @param  integer $lesson_id
 	 * @return array $return_values
 	 */
-	function sensei_get_prev_next_lessons( $lesson_id = 0 ) {
+	function sensei_get_prev_next_lessons($lesson_id = 0) {
 
 		$return_values = array();
 		$return_values['prev_lesson'] = 0;
 		$return_values['next_lesson'] = 0;
-		if ( 0 < $lesson_id ) {
+		if (0 < $lesson_id) {
 			// Get the List of Lessons in the Course
-			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+			$lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($lesson_course_id));
 
-            if( !empty( $modules )  ){
-                foreach( (array) $modules as $module ) {
+            if ( ! empty($modules)) {
+                foreach ((array) $modules as $module) {
 
                     $args = array(
                         'post_type' => 'lesson',
@@ -260,7 +260,7 @@ 
                         'meta_query' => array(
                             array(
                                 'key' => '_lesson_course',
-                                'value' => intval( $lesson_course_id ),
+                                'value' => intval($lesson_course_id),
                                 'compare' => '='
                             )
                         ),
@@ -268,18 +268,18 @@ 
                             array(
                                 'taxonomy' => Sensei()->modules->taxonomy,
                                 'field' => 'id',
-                                'terms' => intval( $module->term_id )
+                                'terms' => intval($module->term_id)
                             )
                         ),
-                        'meta_key' => '_order_module_' . $module->term_id,
+                        'meta_key' => '_order_module_'.$module->term_id,
                         'orderby' => 'meta_value_num date',
                         'order' => 'ASC',
                         'suppress_filters' => 0
                     );
 
-                    $lessons = get_posts( $args );
-                    if ( 0 < count( $lessons ) ) {
-                        foreach ($lessons as $lesson_item){
+                    $lessons = get_posts($args);
+                    if (0 < count($lessons)) {
+                        foreach ($lessons as $lesson_item) {
                             $all_lessons[] = $lesson_item->ID;
                         } // End For Loop
                     } // End If Statement
@@ -292,36 +292,36 @@ 
                 'post_type' => 'lesson',
                 'posts_per_page' => -1,
                 'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
+                'meta_key' => '_order_'.$lesson_course_id,
                 'orderby' => 'meta_value_num date',
                 'order' => 'ASC',
                 'meta_query' => array(
                     array(
                         'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
+                        'value' => intval($lesson_course_id),
                     ),
                 ),
                 'post__not_in' => $all_lessons,
             );
 
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
-				foreach ($other_lessons as $lesson_item){
+            $other_lessons = get_posts($args);
+            if (0 < count($other_lessons)) {
+				foreach ($other_lessons as $lesson_item) {
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+            if (0 < count($all_lessons)) {
 				$found_index = false;
-				foreach ( $all_lessons as $lesson ){
-					if ( $found_index && $return_values['next_lesson'] == 0 ) {
+				foreach ($all_lessons as $lesson) {
+					if ($found_index && $return_values['next_lesson'] == 0) {
 						$return_values['next_lesson'] = $lesson;
 					} // End If Statement
-					if ( $lesson == $lesson_id ) {
+					if ($lesson == $lesson_id) {
 						// Is the current post
 						$found_index = true;
 					} // End If Statement
-					if ( !$found_index ) {
+					if ( ! $found_index) {
 						$return_values['prev_lesson'] = $lesson;
 					} // End If Statement
 				} // End For Loop
@@ -340,7 +340,7 @@ 
    * @param  int|WP_Post $post_id Optional. Defaults to current post
    * @return string $excerpt
    */
-  function sensei_get_excerpt( $post_id = '' ) {
+  function sensei_get_excerpt($post_id = '') {
 
       global $post;
       _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
@@ -348,14 +348,14 @@ 
 
   }
 
-	function sensei_has_user_started_course( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()" );
-		return Sensei_Utils::user_started_course( $post_id, $user_id );
+	function sensei_has_user_started_course($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()");
+		return Sensei_Utils::user_started_course($post_id, $user_id);
 	} // End sensei_has_user_started_course()
 
-	function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -367,9 +367,9 @@ 
  * @param int $user_id
  * @return bool
 */
-function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
+function sensei_has_user_completed_prerequisite_lesson($current_lesson_id, $user_id) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+    return WooThemes_Sensei_Lesson::is_pre_requisite_complete($current_lesson_id, $user_id);
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -392,7 +392,7 @@ 
  * @return bool
  *
  */
-function sensei_have_modules( $course_post_id = '' ){
+function sensei_have_modules($course_post_id = '') {
 
 	global $post, $wp_query, $sensei_modules_loop;
 
@@ -400,23 +400,23 @@ 
 	wp_reset_query();
 	$post = $wp_query->post;
 
-	if( empty( $course_post_id ) ){
+	if (empty($course_post_id)) {
 
 		$course_id = $post->ID;
 
 	}
 
 	// doesn't apply to none course post types
-	if( ! sensei_is_a_course( $course_id )  ){
+	if ( ! sensei_is_a_course($course_id)) {
 		return false;
 	}
 
 	// check the current item compared to the total number of modules
-	if( $sensei_modules_loop[ 'current' ] + 1 > $sensei_modules_loop[ 'total' ]  ){
+	if ($sensei_modules_loop['current'] + 1 > $sensei_modules_loop['total']) {
 
 		return false;
 
-	}else{
+	} else {
 
 		return true;
 
@@ -430,27 +430,27 @@ 
  *
  * @since 1.9.0
  */
-function sensei_setup_module(){
+function sensei_setup_module() {
 
 	global  $sensei_modules_loop, $wp_query;
 
 	// increment the index
-	$sensei_modules_loop[ 'current' ]++;
-	$index = $sensei_modules_loop[ 'current' ];
-	if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+	$sensei_modules_loop['current']++;
+	$index = $sensei_modules_loop['current'];
+	if (isset($sensei_modules_loop['modules'][$index])) {
 
 		$sensei_modules_loop['current_module'] = $sensei_modules_loop['modules'][$index];
 		// setup the query for the module lessons
 		$course_id = $sensei_modules_loop['course_id'];
 		$module_term_id = $sensei_modules_loop['current_module']->term_id;
-		$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+		$modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id);
 
 		// setup the global wp-query only if the lessons
-		if( $modules_query->have_posts() ){
+		if ($modules_query->have_posts()) {
 
 			$wp_query = $modules_query;
 
-		}else{
+		} else {
 
 			wp_reset_query();
 
@@ -474,30 +474,30 @@ 
  *
  * @return bool
  */
-function sensei_module_has_lessons(){
+function sensei_module_has_lessons() {
 
 	global $wp_query, $sensei_modules_loop;
 
-	if( 'lesson' == $wp_query->get('post_type') ){
+	if ('lesson' == $wp_query->get('post_type')) {
 
 		return have_posts();
 
-	}else{
+	} else {
 
         // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+        if ( -1 == $sensei_modules_loop['current']  ) {
 
             $index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+            if (isset($sensei_modules_loop['modules'][$index])) {
                 // setup the query for the module lessons
                 $course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+                $module_term_id = $sensei_modules_loop['modules'][$index] ->term_id;
+                $modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id);
 
                 // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+                if ($modules_query->have_posts()) {
 
                     return true;
 
@@ -521,9 +521,9 @@ 
  * @uses sensei_the_module_title
  * @return string
  */
-function sensei_the_module_title_attribute(){
+function sensei_the_module_title_attribute() {
 
-	esc_attr_e( sensei_get_the_module_title() );
+	esc_attr_e(sensei_get_the_module_title());
 
 }
 
@@ -534,11 +534,11 @@ 
  *
  * @return string
  */
-function sensei_the_module_permalink(){
+function sensei_the_module_permalink() {
 
 	global $sensei_modules_loop;
 	$course_id = $sensei_modules_loop['course_id'];
-	$module_url = add_query_arg('course_id', $course_id, get_term_link( $sensei_modules_loop['current_module'], 'module' ) );
+	$module_url = add_query_arg('course_id', $course_id, get_term_link($sensei_modules_loop['current_module'], 'module'));
 	$module_term_id = $sensei_modules_loop['current_module']->term_id;
 
 	/**
@@ -550,7 +550,7 @@ 
 	 * @param int $module_term_id
 	 * @param string $course_id
 	 */
-	 echo esc_url_raw( apply_filters( 'sensei_the_module_permalink', $module_url, $module_term_id  ,$course_id ) );
+	 echo esc_url_raw(apply_filters('sensei_the_module_permalink', $module_url, $module_term_id, $course_id));
 
 }// end sensei_the_module_permalink
 
@@ -562,7 +562,7 @@ 
  *
  * @return string
  */
-function sensei_get_the_module_title(){
+function sensei_get_the_module_title() {
 
 	global $sensei_modules_loop;
 
@@ -581,7 +581,7 @@ 
 	 * @param $module_term_id
 	 * @param $course_id
 	 */
-	return apply_filters( 'sensei_the_module_title',  $module_title , $module_term_id, $course_id );
+	return apply_filters('sensei_the_module_title', $module_title, $module_term_id, $course_id);
 
 }
 
@@ -593,7 +593,7 @@ 
  * @uses sensei_get_the_module_title
  * @return string
  */
-function sensei_the_module_title(){
+function sensei_the_module_title() {
 
 	echo sensei_get_the_module_title();
 
@@ -606,9 +606,9 @@ 
  * @since 1.9.0
  * @return string
  */
-function sensei_get_the_module_status(){
+function sensei_get_the_module_status() {
 
-	if( ! is_user_logged_in() ){
+	if ( ! is_user_logged_in()) {
 		return '';
 	}
 
@@ -616,10 +616,10 @@ 
     $module_title = $sensei_modules_loop['current_module']->name;
     $module_term_id = $sensei_modules_loop['current_module']->term_id;
     $course_id = $sensei_modules_loop['course_id'];
-    $module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
+    $module_progress = Sensei()->modules->get_user_module_progress($module_term_id, $course_id, get_current_user_id());
 
-    $module_status =  '';
-    if ( $module_progress && $module_progress > 0) {
+    $module_status = '';
+    if ($module_progress && $module_progress > 0) {
 
         $module_status = __('Completed', 'woothemes-sensei');
 
@@ -631,12 +631,12 @@ 
 
     }
 
-	if ( empty( $module_status ) ){
+	if (empty($module_status)) {
 		return '';
 	}
 
-	$status_class = strtolower( str_replace( ' ', '-', $module_status  ) );
-    $module_status_html = '<p class="status module-status ' . $status_class . '">'
+	$status_class = strtolower(str_replace(' ', '-', $module_status));
+    $module_status_html = '<p class="status module-status '.$status_class.'">'
                             . $module_status
                             . '</p>';
 
@@ -651,7 +651,7 @@ 
      * @param $module_term_id
      * @param $course_id
      */
-    return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
+    return apply_filters('sensei_the_module_status_html', $module_status_html, $module_term_id, $course_id);
 
 }
 
@@ -659,7 +659,7 @@ 
  * Print out the current module status
  * @since 1.9.0
  */
-function sensei_the_module_status(){
+function sensei_the_module_status() {
 
     echo sensei_get_the_module_status();
 
@@ -680,19 +680,19 @@ 
  *
  * @return bool
  */
-function sensei_quiz_has_questions(){
+function sensei_quiz_has_questions() {
 
     global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
+    if ( ! isset($sensei_question_loop['total'])) {
         return false;
     }
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+    if ($sensei_question_loop['current'] + 1 < $sensei_question_loop['total']) {
 
         return true;
 
-    }else{
+    } else {
 
         return false;
 
@@ -709,13 +709,13 @@ 
  * @since 1.9.0
 
  */
-function sensei_setup_the_question(){
+function sensei_setup_the_question() {
 
     global $sensei_question_loop;
 
     $sensei_question_loop['current']++;
     $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+    $sensei_question_loop['current_question'] = $sensei_question_loop['questions'][$index];
 
 
 }// end sensei_setup_the_question
@@ -726,14 +726,14 @@ 
  * This function gets the type and loads the template that will handle it.
  *
  */
-function sensei_the_question_content(){
+function sensei_the_question_content() {
 
     global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+    $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
 
     // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+    WooThemes_Sensei_Question::load_question_template($question_type);
 
 }// end sensei_the_question_content
 
@@ -742,11 +742,11 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_question_class(){
+function sensei_the_question_class() {
 
     global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+    $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
 
     /**
      * filter the sensei question class within
@@ -754,16 +754,16 @@ 
      *
      * @since 1.9.0
      */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+     $classes = apply_filters('sensei_question_classes', array($question_type));
 
     $html_classes = '';
-    foreach( $classes as $class ){
+    foreach ($classes as $class) {
 
-        $html_classes .= $class . ' ';
+        $html_classes .= $class.' ';
 
     }// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+    esc_attr_e(trim($html_classes));
 
 }
 
@@ -772,10 +772,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_get_the_question_id( ){
+function sensei_get_the_question_id( ) {
 
     global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+    if (isset($sensei_question_loop['current_question']->ID)) {
 
         return $sensei_question_loop['current_question']->ID;
 
@@ -804,27 +804,27 @@ 
  * @param string $lesson_id
  * @return bool
  */
-function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
+function sensei_can_user_view_lesson($lesson_id = '', $user_id = '') {
 
-    if( empty( $lesson_id ) ){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( empty( $user_id ) ){
+    if (empty($user_id)) {
 
         $user_id = get_current_user_id();
 
     }
 
     // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete($lesson_id, $user_id);
+    $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
+    $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, $user_id);
 
     $is_preview = false;
-    if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+    if (Sensei_Utils::is_preview_lesson($lesson_id)) {
 
         $is_preview = true;
         $pre_requisite_complete = true;
@@ -832,24 +832,24 @@ 
     };
 
 
-    $user_can_access_lesson =  false;
+    $user_can_access_lesson = false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+    if (is_user_logged_in() && $user_taking_course) {
 
-        $user_can_access_lesson =  true;
+        $user_can_access_lesson = true;
 
     }
 
 
     $access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+    if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) {
 
         $access_permission = true;
 
     }
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+    $can_user_view_lesson = $access_permission || ($user_can_access_lesson && $pre_requisite_complete) || $is_preview;
 
     /**
      * Filter the can user view lesson function
@@ -862,7 +862,7 @@ 
      * @param string $lesson_id
      * @param string $user_id
      */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+    return apply_filters('sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id);
 
 } // end sensei_can_current_user_view_lesson
 
@@ -872,51 +872,51 @@ 
  * The function should only be called on the single lesson
  *
  */
-function sensei_the_single_lesson_meta(){
+function sensei_the_single_lesson_meta() {
 
     // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+    $template = Sensei_Templates::locate_template('single-lesson/lesson-meta.php');
+    if ( ! empty($template)) {
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+        Sensei_Templates::get_template('single-lesson/lesson-meta.php');
         return;
 
     }
 
     // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+    $lesson_course_id = absint(get_post_meta(get_the_ID(), '_lesson_course', true));
+    $is_preview = Sensei_Utils::is_preview_lesson(get_the_ID());
 
     // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
+    do_action('sensei_complete_lesson');
     // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
+    if (Sensei()->access_settings()
+        || Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id())
+        || $is_preview) {
         ?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+            if (apply_filters('sensei_video_position', 'top', get_the_ID()) == 'bottom') {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+                do_action('sensei_lesson_video', get_the_ID());
 
             }
             ?>
-            <?php do_action( 'sensei_frontend_messages' ); ?>
+            <?php do_action('sensei_frontend_messages'); ?>
 
             <?php if ( ! $is_preview
-                || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+                || Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id())) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+                sensei_do_deprecated_action('sensei_lesson_quiz_meta', '1.9.0', 'sensei_single_lesson_content_inside_before', array(get_the_ID(), get_current_user_id()));
 
             } ?>
         </section>
 
-        <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
+        <?php do_action('sensei_lesson_back_link', $lesson_course_id); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+    do_action('sensei_lesson_meta_extra', get_the_ID());
 
 } // end the_single_lesson_meta
 
@@ -930,9 +930,9 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_header(){
+function get_sensei_header() {
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+    if ( ! defined('ABSPATH')) exit;
 
     get_header();
 
@@ -941,7 +941,7 @@ 
      *
      * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
      */
-    do_action( 'sensei_before_main_content' );
+    do_action('sensei_before_main_content');
 
 }// end get_sensei_header
 
@@ -955,28 +955,28 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_footer(){
+function get_sensei_footer() {
 
     /**
      * sensei_pagination hook
      *
      * @hooked sensei_pagination - 10 (outputs pagination)
      */
-    do_action( 'sensei_pagination' );
+    do_action('sensei_pagination');
 
     /**
      * sensei_after_main_content hook
      *
      * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
      */
-    do_action( 'sensei_after_main_content' );
+    do_action('sensei_after_main_content');
 
     /**
      * sensei_sidebar hook
      *
      * @hooked sensei_get_sidebar - 10
      */
-    do_action( 'sensei_sidebar' );
+    do_action('sensei_sidebar');
 
     get_footer();
 
@@ -988,7 +988,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_title(){
+function the_no_permissions_title() {
 
     /**
      * Filter the no permissions title just before it is echo'd on the
@@ -997,7 +997,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_title
      */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+    echo apply_filters('sensei_the_no_permissions_title', Sensei()->permissions_message['title']);
 
 }
 
@@ -1006,7 +1006,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_message( $post_id ){
+function the_no_permissions_message($post_id) {
 
     /**
      * Filter the no permissions message just before it is echo'd on the
@@ -1015,7 +1015,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_message
      */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+    echo apply_filters('sensei_the_no_permissions_message', Sensei()->permissions_message['message'], $post_id);
 
 }
 
@@ -1024,10 +1024,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_excerpt( $post_id ){
+function sensei_the_excerpt($post_id) {
 
     global $post;
-    the_excerpt( $post );
+    the_excerpt($post);
 
 }
 
@@ -1039,10 +1039,10 @@ 
  * @global WP $wp
  * @return string $current_page_url
  */
- function sensei_get_current_page_url(){
+ function sensei_get_current_page_url() {
 
      global $wp;
-     $current_page_url =  home_url( $wp->request );
+     $current_page_url = home_url($wp->request);
      return $current_page_url;
 
  }
@@ -1053,9 +1053,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_my_courses_content(){
+function sensei_the_my_courses_content() {
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+    echo Sensei()->course->load_user_courses_content(wp_get_current_user());
 
 } // sensei_the_my_courses_content
 
@@ -1068,9 +1068,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_load_template( $template_name ){
+function sensei_load_template($template_name) {
 
-    Sensei_Templates::get_template( $template_name );
+    Sensei_Templates::get_template($template_name);
 
 }
 
@@ -1082,9 +1082,9 @@ 
  * @param string $name the name of the template.
  * @since 1.9.0
  */
-function sensei_load_template_part( $slug, $name ){
+function sensei_load_template_part($slug, $name) {
 
-    Sensei_Templates::get_part( $slug, $name );
+    Sensei_Templates::get_part($slug, $name);
 
 }
 
@@ -1101,19 +1101,19 @@ 
  * @access public
  * @param string $lesson_id
  */
-function sensei_the_lesson_excerpt( $lesson_id = '' ) {
+function sensei_the_lesson_excerpt($lesson_id = '') {
 
-    if( empty( $lesson_id )){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
+    if ('lesson' != get_post_type($lesson_id)) {
         return;
     }
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+    echo Sensei_Lesson::lesson_excerpt(get_post($lesson_id), false);
 
 }// End lesson_excerpt()
 
@@ -1122,17 +1122,17 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_course_results_lessons(){
+function sensei_the_course_results_lessons() {
     // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+    $located_template = locate_template(Sensei()->template_url.'course-results/course-lessons.php');
+    if ($located_template) {
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+        Sensei_Templates::get_template('course-results/course-lessons.php');
         return;
 
     }
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+    Sensei_Templates::get_template('course-results/lessons.php');
 }
 
 /**
@@ -1142,7 +1142,7 @@ 
  * @uses Sensei_Course::get_loop_number_of_columns
  * @since 1.9.0
  */
-function sensei_courses_per_row(){
+function sensei_courses_per_row() {
 
     echo Sensei_Course::get_loop_number_of_columns();
 
@@ -1156,9 +1156,9 @@ 
  * @param $args
  * @param $path
  */
-function sensei_get_template( $template_name, $args, $path ){
+function sensei_get_template($template_name, $args, $path) {
 
-    Sensei_Templates::get_template( $template_name, $args, $path );
+    Sensei_Templates::get_template($template_name, $args, $path);
 
 }
 
@@ -1170,12 +1170,12 @@ 
  *
  * @return string $status_class
  */
-function get_the_lesson_status_class(){
+function get_the_lesson_status_class() {
 
     $status_class = '';
-    $lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+    $lesson_completed = Sensei_Utils::user_completed_lesson(get_the_ID(), get_current_user_id());
 
-    if ( $lesson_completed ) {
+    if ($lesson_completed) {
         $status_class = 'completed';
     }
 
@@ -1189,7 +1189,7 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_lesson_status_class(){
+function sensei_the_lesson_status_class() {
 
     echo get_the_lesson_status_class();
 }

templates/no-permissions.php

Indentation +39 added lines, -39 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * The Template for displaying all access restriction error messages.
- *
- * Override this template by copying it to yourtheme/sensei/no-permissions.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all access restriction error messages.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/no-permissions.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php  get_sensei_header();  ?>
 
 <?php
 /**
- * This action fires inside the no-permissions.php file. It
- * is place above before all the content.
- *
- * @since 1.9.0
- * @param $post_id
- */
+	 * This action fires inside the no-permissions.php file. It
+	 * is place above before all the content.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
 do_action('sensei_no_permissions_before_content', get_the_ID() );
 ?>
 
@@ -33,15 +33,15 @@ 
     </header>
 
     <?php
-    /**
-     * This action fires inside the no-permissions.php file. It
-     * is place just before the content.
-     *
-     * @since 1.9.0
-     * @param $post_id
-     */
-    do_action('sensei_no_permissions_inside_before_content', get_the_ID() );
-    ?>
+	/**
+	 * This action fires inside the no-permissions.php file. It
+	 * is place just before the content.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
+	do_action('sensei_no_permissions_inside_before_content', get_the_ID() );
+	?>
 
     <section class="entry fix">
 
@@ -60,26 +60,26 @@ 
     </section>
 
     <?php
-    /**
-     * This action fires inside the no-permissions.php file. It
-     * is place just after the content.
-     *
-     * @since 1.9.0
-     * @param $post_id
-     */
-    do_action('sensei_no_permissions_inside_after_content', get_the_ID() );
-    ?>
+	/**
+	 * This action fires inside the no-permissions.php file. It
+	 * is place just after the content.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
+	do_action('sensei_no_permissions_inside_after_content', get_the_ID() );
+	?>
 
 </article><!-- .no-permissions -->
 
 <?php
 /**
- * This action fires inside the no-permissions.php file. It
- * is placed outside after the content.
- *
- * @since 1.9.0
- * @param $post_id
- */
+	 * This action fires inside the no-permissions.php file. It
+	 * is placed outside after the content.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
 do_action('sensei_no_permissions_after_content', get_the_ID() );
 ?>
 

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
  */
 ?>
 
-<?php  get_sensei_header();  ?>
+<?php  get_sensei_header(); ?>
 
 <?php
 /**
@@ -21,10 +21,10 @@ 
  * @since 1.9.0
  * @param $post_id
  */
-do_action('sensei_no_permissions_before_content', get_the_ID() );
+do_action('sensei_no_permissions_before_content', get_the_ID());
 ?>
 
-<article <?php post_class( 'no-permission' ) ?> >
+<article <?php post_class('no-permission') ?> >
 
     <header>
 
@@ -40,20 +40,20 @@ 
      * @since 1.9.0
      * @param $post_id
      */
-    do_action('sensei_no_permissions_inside_before_content', get_the_ID() );
+    do_action('sensei_no_permissions_inside_before_content', get_the_ID());
     ?>
 
     <section class="entry fix">
 
         <div class="sensei-message alert">
 
-            <?php the_no_permissions_message( get_the_ID() ); ?>
+            <?php the_no_permissions_message(get_the_ID()); ?>
 
         </div>
 
         <p class="excerpt">
 
-            <?php sensei_the_excerpt( get_the_ID() ); ?>
+            <?php sensei_the_excerpt(get_the_ID()); ?>
 
         </p>
 
@@ -67,7 +67,7 @@ 
      * @since 1.9.0
      * @param $post_id
      */
-    do_action('sensei_no_permissions_inside_after_content', get_the_ID() );
+    do_action('sensei_no_permissions_inside_after_content', get_the_ID());
     ?>
 
 </article><!-- .no-permissions -->
@@ -80,7 +80,7 @@ 
  * @since 1.9.0
  * @param $post_id
  */
-do_action('sensei_no_permissions_after_content', get_the_ID() );
+do_action('sensei_no_permissions_after_content', get_the_ID());
 ?>
 
 <?php get_sensei_footer(); ?>
\ No newline at end of file

includes/class-sensei-frontend.php

Braces +30 added lines, -12 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Frontend Class
@@ -668,7 +671,9 @@ 
 	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 )  ){
 
@@ -1094,17 +1099,26 @@ 
 
 						<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'] ); ?>" />
+							<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'] ); ?>" />
+							<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'] ); ?>" />
+							<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 -->
@@ -1437,8 +1451,12 @@ 
 
 		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;
@@ -1599,7 +1617,7 @@ 
 		    		//assigne the username to the creds array for further processing
 		    		$creds['user_login'] =  $user->user_login ;
 
-		    	}else{
+		    	} else{
 
 		    		// process this as a default username login
 		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
@@ -1616,7 +1634,7 @@ 
 				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
@@ -1633,14 +1651,14 @@ 
 
 				}	// 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) ) );
 		        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();
 
@@ -1762,7 +1780,7 @@ 
 
 				$message = __('Incorrect login details', 'woothemes-sensei' );
 
-			}elseif( $_GET['login'] == 'emptyfields'  ){
+			} elseif( $_GET['login'] == 'emptyfields'  ){
 
 				$message= __('Please enter your username and password', 'woothemes-sensei' );
 			}

Indentation +312 added lines, -312 removed lines

@@ -69,10 +69,10 @@ 
 		// Only show course & lesson excerpts in search results
 		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') );
+		//Use WooCommerce filter to show admin bar to Teachers.
+		add_action( 'init', array( $this, 'sensei_show_admin_bar') );
 
-        // Remove course from active courses if an order is cancelled or refunded
+		// 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 );
@@ -133,13 +133,13 @@ 
 			wp_enqueue_script( Sensei()->token . '-user-dashboard' );
 
 
-            // Course Archive javascript
-            if( is_post_type_archive( 'course' ) ){
+			// Course Archive javascript
+			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
@@ -180,7 +180,7 @@ 
 	/**
 	 * sensei_get_template_part function.
 	 *
-     * @deprecated sine 1.9.0
+	 * @deprecated sine 1.9.0
 	 * @access public
 	 * @param mixed $slug
 	 * @param string $name (default: '')
@@ -188,15 +188,15 @@ 
 	 */
 	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()
 
 	/**
 	 * sensei_get_template function.
 	 *
-     * @deprecated since 1.9.0
+	 * @deprecated since 1.9.0
 	 * @access public
 	 * @param mixed $template_name
 	 * @param array $args (default: array())
@@ -206,8 +206,8 @@ 
 	 */
 	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()
 
@@ -223,33 +223,33 @@ 
 	 */
 	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()
 
 
 	/**
 	 * sensei_output_content_wrapper function.
-     *
+	 *
 	 * @access public
 	 * @return void
 	 */
 	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',
-            'wrappers/wrapper-start.php'
-        );
+		// 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',
+			'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' );
-            return;
+			Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
+			return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'globals/wrapper-start.php' );
 
@@ -258,25 +258,25 @@ 
 
 	/**
 	 * sensei_output_content_wrapper_end function.
-     *
+	 *
 	 * @access public
 	 * @return void
 	 */
 	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',
-            'wrappers/wrapper-end.php'
-        );
+		// 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',
+			'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' );
-            return;
+			Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
+			return;
 
-        }
+		}
 
 
 		Sensei_Templates::get_template( 'globals/wrapper-end.php' );
@@ -292,55 +292,55 @@ 
 	 */
 	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 ) ){
+			// 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 ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination-posts.php' );
 
 		} 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 ) ){
+			// 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 ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination-lesson.php' );
 
 		} 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 ) ){
+			// 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 ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
+				return;
 
-            }
+			}
 
 			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 ) ){
+			// 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 ) ){
 
-                Sensei_Templates::get_template( 'wrappers/pagination.php' );
-                return;
+				Sensei_Templates::get_template( 'wrappers/pagination.php' );
+				return;
 
-            }
+			}
 
 			Sensei_Templates::get_template( 'globals/pagination.php' );
 
@@ -397,13 +397,13 @@ 
 
 				case '#senseimymessages':
 					$item->url = $my_messages_url;
-                    // if no archive link exist for sensei_message
-                    // set it back to the place holder
-                    if( ! $item->url ){
+					// if no archive link exist for sensei_message
+					// set it back to the place holder
+					if( ! $item->url ){
 
-                        $item->url = '#senseimymessages';
+						$item->url = '#senseimymessages';
 
-                    }
+					}
 					break;
 
 				case '#senseilearnerprofile':
@@ -469,7 +469,7 @@ 
 
 			// 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 ) {
+				&& '#senseimymessages' == $item->url ) {
 
 				if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) {
 
@@ -492,42 +492,42 @@ 
 
 	// add category nicenames in body and post class
 	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 ) ) ) {
-	    	$classes[] = 'post';
+		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 ) ) ) {
+			$classes[] = 'post';
 		} // End If Statement
-	    return $classes;
+		return $classes;
 	} // End sensei_search_results_classes()
 
-    /**
-     * sensei_single_title output for single page title
-     * @since  1.1.0
-     * @return void
-     * @deprecated
-     */
-    function the_single_title() {
+	/**
+	 * sensei_single_title output for single page title
+	 * @since  1.1.0
+	 * @return void
+	 * @deprecated
+	 */
+	function the_single_title() {
 
-        _deprecated_function(' WooThemes_Sensei_Frontend::the_single_title', '1.9.0');
+		_deprecated_function(' WooThemes_Sensei_Frontend::the_single_title', '1.9.0');
 
-    } // End sensei_single_title()
+	} // End sensei_single_title()
 
 	/**
 	 * sensei_course_image output for course image Please use Sensei()->course->course_image instead.
-     *
-     * @deprecated since 1.9.0
-     * @param $course_id
-     * @param string $width
-     * @param string $height
-     * @param bool|false $return
-     * @return string|void
+	 *
+	 * @deprecated since 1.9.0
+	 * @param $course_id
+	 * @param string $width
+	 * @param string $height
+	 * @param bool|false $return
+	 * @return string|void
 	 */
 	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 );
-            return '';
+			return '';
 
 		} // End If Statement
 
@@ -538,31 +538,31 @@ 
 	/**
 	 * sensei_lesson_image output for lesson image
 	 * @since  1.2.0
-     * @deprecated since 1.9.0
-     * @param $lesson_id
-     * @param string $width
-     * @param string $height
-     * @param bool|false $return
-     * @param bool|false $widget
-     * @return string
+	 * @deprecated since 1.9.0
+	 * @param $lesson_id
+	 * @param string $width
+	 * @param string $height
+	 * @param bool|false $return
+	 * @param bool|false $widget
+	 * @return string
 	 */
 	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 );
-            return '';
-        }
+			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()
 
-    /**
-     * @since 1.0.0
-     * @param WP_Query $query
-     */
-    function sensei_course_archive_pagination( $query ) {
+	/**
+	 * @since 1.0.0
+	 * @param WP_Query $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' ) ) ) {
 
@@ -585,50 +585,50 @@ 
 	 *
 	 * @access public
 	 * @since  1.2.0
-     * @deprecated since 1.9.0 use WooThemes_Sensei_Course::archive_header
+	 * @deprecated since 1.9.0 use WooThemes_Sensei_Course::archive_header
 	 * @return void
 	 */
 	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>' );
+		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>' );
 
 	} // sensei_course_archive_header()
 
 	/**
 	 * sensei_lesson_archive_header function.
 	 *
-     * @deprecated since 1.9.0
+	 * @deprecated since 1.9.0
 	 * @access public
 	 * @since  1.2.1
 	 * @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' );
-        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
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_message_archive_header( ){
-        _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
-        Sensei_Messages::the_archive_header();
+		_deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
+		Sensei_Messages::the_archive_header();
 	} // sensei_message_archive_header()
 
 	/**
 	 * sensei_course_archive_course_title output for course archive page individual course title
 	 * @since  1.2.0
-     * @param WP_Post $post_item
+	 * @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 );
-    		$post_title = $post_item->post_title;
+			$post_title = $post_item->post_title;
 		} else {
 			$post_id = get_the_ID();
-    		$post_title = get_the_title();
+			$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
 	} // End sensei_course_archive_course_title()
@@ -640,7 +640,7 @@ 
 	 */
 	public function sensei_lesson_archive_lesson_title() {
 		$post_id = get_the_ID();
-    	$post_title = get_the_title();
+		$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
 	} // End sensei_lesson_archive_lesson_title()
 
@@ -657,9 +657,9 @@ 
 
 		if( empty( $id )  ){
 
-            $id = get_the_ID();
+			$id = get_the_ID();
 
-        }
+		}
 
 		$sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' );
 		$separator = apply_filters( 'sensei_breadcrumb_separator', '&gt;' );
@@ -672,31 +672,31 @@ 
 				return;
 			}
 			$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
+		} // End If Statement
+		// Quiz
 		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>';
-    	} // End If Statement
+		} // End If Statement
 
-    	// Allow other plugins to filter html
-    	$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
-    	$html .= '</section>';
+		// Allow other plugins to filter html
+		$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
+		$html .= '</section>';
 
-    	echo $html;
+		echo $html;
 	} // End sensei_breadcrumb()
 
 
-    /**
-     * @deprecated since 1.9.0 use WooThemes_Sensei_Lesson::course_signup_link instead
-     */
+	/**
+	 * @deprecated since 1.9.0 use WooThemes_Sensei_Lesson::course_signup_link instead
+	 */
 	public function 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();
+		_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 ) {
@@ -715,27 +715,27 @@ 
 					?><section class="lesson-tags">
 		    			<?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?>
 		    		</section><?php
-		    	}
-	    	}
+				}
+			}
 		}
 	}
 
-    /**
-     * @param WP_Query $query
-     */
+	/**
+	 * @param WP_Query $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' );
+		if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
+			// Limit to lessons only
+			$query->set( 'post_type', 'lesson' );
 
-    		// Set order of lessons
-    		$query->set( 'orderby', 'menu_order' );
-    		$query->set( 'order', 'ASC' );
+			// Set order of lessons
+			$query->set( 'orderby', 'menu_order' );
+			$query->set( 'order', 'ASC' );
 
-    	}
-    }
+		}
+	}
 
-    public function lesson_tag_archive_header( $title ) {
+	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 ) );
 		}
@@ -757,13 +757,13 @@ 
 			$sanitized_submit = esc_html( $_POST['quiz_action'] );
 
 			switch ($sanitized_submit) {
-                case 'lesson-complete':
+				case 'lesson-complete':
 
 					Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true );
 
 					break;
 
-                case 'lesson-reset':
+				case 'lesson-reset':
 
 					Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID );
 
@@ -875,13 +875,13 @@ 
 		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)*/ );
-        	} // End If Statement
-        	if ( '' != $lesson_video_embed ) {
-        	?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
-        	} // End If Statement
-        } // End If Statement
+				// 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)*/ );
+			} // End If Statement
+			if ( '' != $lesson_video_embed ) {
+			?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_lesson_video()
 
 	public function sensei_complete_lesson_button() {
@@ -894,8 +894,8 @@ 
 		$pass_required = true;
 		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 ) ) {
 			?>
 			<form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
@@ -948,12 +948,12 @@ 
 		} // End If Statement
 	} // End sensei_reset_lesson_button()
 
-    /**
-     * @deprecated since 1.9.0
-     */
-    public function sensei_lesson_quiz_meta( ) {
+	/**
+	 * @deprecated since 1.9.0
+	 */
+	public function sensei_lesson_quiz_meta( ) {
 
-        Sensei_Lesson::footer_quiz_call_to_action();
+		Sensei_Lesson::footer_quiz_call_to_action();
 
 	} // End sensei_lesson_quiz_meta()
 
@@ -979,38 +979,38 @@ 
         	</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 ); ?>
+				$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()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_single_main_content() {
-	    _deprecated_function('Woothemes_Sensei_Frontend::sensei_single_main_content', '1.9.0');
+		_deprecated_function('Woothemes_Sensei_Frontend::sensei_single_main_content', '1.9.0');
 	} // End sensei_single_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @deprecated since 1.9.0
+	 */
 	public function sensei_lesson_archive_main_content() {
-        _deprecated_function('Sensei_Frontend::sensei_lesson_archive_main_content', '1.9.0', 'Please include loop-lesson.php directly');
+		_deprecated_function('Sensei_Frontend::sensei_lesson_archive_main_content', '1.9.0', 'Please include loop-lesson.php directly');
 	} // End sensei_lesson_archive_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @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' );
 	} // End sensei_lesson_archive_main_content()
 
-    /**
-    * @deprecated since 1.9.0
-    */
+	/**
+	 * @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() {
@@ -1058,7 +1058,7 @@ 
 				<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>
 
@@ -1139,12 +1139,12 @@ 
 
 		//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' );
-    	    } // End If Statement
-    	}
-    	return $preview_text;
+			$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 ) {
@@ -1176,8 +1176,8 @@ 
 		$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 ) {
+			&& 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 );
@@ -1196,35 +1196,35 @@ 
 		} // End If Statement
 	} // End sensei_course_start()
 
-    /**
-     * @deprecated since 1.9.0
-     */
+	/**
+	 * @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
-     */
+	/**
+	 * @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()' );
-        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()
 
-    /**
-     * This function shows the WooCommerce cart notice if the user has
-     * added the current course to cart. It does not show if the user is already taking
-     * the course.
-     *
-     * @since 1.0.2
-     * @return void;
-     */
-    public function sensei_woocommerce_in_cart_message() {
+	/**
+	 * This function shows the WooCommerce cart notice if the user has
+	 * added the current course to cart. It does not show if the user is already taking
+	 * the course.
+	 *
+	 * @since 1.0.2
+	 * @return void;
+	 */
+	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() );
+		$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 ) ) {
@@ -1272,7 +1272,7 @@ 
 				$item_id = $item['product_id'];
 			} 
 
-            if ( $item_id > 0 ) {
+			if ( $item_id > 0 ) {
 
 				$user_id = get_post_meta( $order_id, '_customer_user', true );
 
@@ -1352,15 +1352,15 @@ 
 
 					$items = $order->get_items();
 					foreach( $items as $item ) {
-                                            if (isset($item['variation_id']) && $item['variation_id'] > 0) {
-                                                $item_id = $item['variation_id'];
-                                                $product_type = 'variation';
-                                            } else {
-                                                $item_id = $item['product_id'];
-                                            }
+											if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+												$item_id = $item['variation_id'];
+												$product_type = 'variation';
+											} else {
+												$item_id = $item['product_id'];
+											}
 
-                                            $product_ids[] = $item_id;
-                                            }
+											$product_ids[] = $item_id;
+											}
 
 					$order_ids[] = $post_id;
 				}
@@ -1468,32 +1468,32 @@ 
 				$items = $order->get_items();
 				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') ){
+					// handle product bundles
+					if( is_object( $product ) &&  $product->is_type('bundle') ){
 
-                        $bundled_product = new WC_Product_Bundle( $product->id );
-                        $bundled_items = $bundled_product->get_bundled_items();
+						$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 );
-                                return;
-                            }
+							if( $bundled_item->product_id == $course_product_id ) {
+								Sensei_Utils::user_start_course( $user_id, $course_id );
+								return;
+							}
 
-                        }
+						}
 
-                    } else {
+					} else {
 
-                    // handle regular products
-                        if( $item['product_id'] == $course_product_id ) {
-                            Sensei_Utils::user_start_course( $user_id, $course_id );
-                            return;
-                        }
+					// handle regular products
+						if( $item['product_id'] == $course_product_id ) {
+							Sensei_Utils::user_start_course( $user_id, $course_id );
+							return;
+						}
 
-                    }
+					}
 				}
 			}
 
@@ -1524,21 +1524,21 @@ 
 
 		//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 ;
 
-	    }
+		}
 
-    	// Get the reffering page, where did the post submission come from?
-    	$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
+		// Get the reffering page, where did the post submission come from?
+		$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')){
-	        // 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) ) );
-	    	exit;
-    	}
+		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) ) );
+			exit;
+		}
 	}// End sensei_login_fail_redirect_to_front_end_login
 
 	/**
@@ -1549,92 +1549,92 @@ 
 	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' ) ){
-		    	return;
-		    }
+			// Validate the login request nonce
+			if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
+				return;
+			}
 
-		    //get the page where the sensei log form is located
-		    $referrer = $_REQUEST['_wp_http_referer'];
-		    //$redirect = $_REQUEST['_sensei_redirect'];
+			//get the page where the sensei log form is located
+			$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();
+				// 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'] ) )  ){
-		    		// query wordpress for the users details
-		    		$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
+				// check if the requests login is an email address
+				if( is_email(  trim( $_REQUEST['log'] ) )  ){
+					// query wordpress for the users details
+					$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
 
-		    		// validate the user object
-		    		if( !$user ){
+					// validate the user object
+					if( !$user ){
 
-		    			// the email doesnt exist
-                        wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
-		        		exit;
+						// the email doesnt exist
+						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 ;
+					//assigne the username to the creds array for further processing
+					$creds['user_login'] =  $user->user_login ;
 
-		    	}else{
+				}else{
 
-		    		// process this as a default username login
-		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
+					// process this as a default username login
+					$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 ;
 
 				//attempt logging in with the given details
-			    $secure_cookie = is_ssl() ? true : false;
-			    $user = wp_signon( $creds, $secure_cookie );
+				$secure_cookie = is_ssl() ? true : false;
+				$user = wp_signon( $creds, $secure_cookie );
 
 				if ( is_wp_error($user) ){ // on login failure
-                    wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
-                    exit;
+					wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+					exit;
 				}else{ // on login success
 
 					/**
-					* change the redirect url programatically
-					*
-					* @since 1.6.1
-					*
-					* @param string $referrer the page where the current url wheresensei login form was posted from
-					*/
+					 * change the redirect url programatically
+					 *
+					 * @since 1.6.1
+					 *
+					 * @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 ) );
 
 					wp_redirect( esc_url_raw( $success_redirect_url ) );
-		        	exit;
+					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) ) );
-		        exit;
+				wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
+				exit;
 
-		    } // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
+			} // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
 
-	    }elseif( ( isset( $_GET['login'] ) ) ) {
-	    	// else if this request is a redircect from a previously faile login request
-	    	$this->login_message_process();
+		}elseif( ( isset( $_GET['login'] ) ) ) {
+			// else if this request is a redircect from a previously faile login request
+			$this->login_message_process();
 
 			//exit the handle login request function
 			return;
-	    }
+		}
 
-	    // if none of the above
-	    return;
+		// if none of the above
+		return;
 
 	} // End  sensei_login_fail_redirect_to_front_end_login
 
@@ -1737,7 +1737,7 @@ 
 	 */
 	public function login_message_process(){
 
-            // setup the message variables
+			// setup the message variables
 			$message = '';
 
 			//only output message if the url contains login=failed and login=emptyfields
@@ -1756,22 +1756,22 @@ 
 	}// end login_message_process
 
 
-    /**
-     * sensei_show_admin_bar(). Use WooCommerce filter
-     * to show admin bar to Teachers as well.
-     *
-     * @return void redirect
-     *
-     */
-    public function sensei_show_admin_bar () {
+	/**
+	 * sensei_show_admin_bar(). Use WooCommerce filter
+	 * to show admin bar to Teachers as well.
+	 *
+	 * @return void redirect
+	 *
+	 */
+	public function sensei_show_admin_bar () {
 
-        if (current_user_can('edit_courses')) {
+		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);
 
-        }
+		}
 
-    }
+	}
 
 } // End Class
 

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,48 +1560,48 @@ 
 		    $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
 			    $secure_cookie = is_ssl() ? true : false;
-			    $user = wp_signon( $creds, $secure_cookie );
+			    $user = wp_signon($creds, $secure_cookie);
 
-				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
@@ -1611,21 +1611,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();
 
@@ -1644,87 +1644,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)()
@@ -1735,23 +1735,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
 
@@ -1763,11 +1763,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);
 
         }
 
@@ -1780,4 +1780,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/admin/class-sensei-learner-management.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
 	/**
 	 * Constructor
 	 * @since  1.6.0
+	 * @param string $file
 	 * @return  void
 	 */
 	public function __construct ( $file ) {

Braces +14 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Learners Class
@@ -342,7 +345,7 @@ 
 
                     $name = $full_name;
 
-                }else{
+                } else{
 
                     $name = $full_name . ' ['. $user->display_name .']';
 
@@ -359,11 +362,17 @@ 
 
 		$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'] );

Indentation +50 added lines, -50 removed lines

@@ -78,16 +78,16 @@ 
 
 		// 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 );
+			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' )
+			'search_users_nonce' => wp_create_nonce( 'search-users' ),
+			'selectplaceholder'=> __( 'Select Learner', 'woothemes-sensei' )
 		);
 
 		wp_localize_script( 'sensei-learners-general', 'woo_learners_general_data', $data );
@@ -186,7 +186,7 @@ 
 	/**
 	 * learners_headers outputs Learners general headers
 	 * @since  1.6.0
-     * @param array $args
+	 * @param array $args
 	 * @return void
 	 */
 	public function learners_headers( $args = array( 'nav' => 'default' ) ) {
@@ -252,38 +252,38 @@ 
 
 	public function remove_user_from_post() {
 
-        // Parse POST data
-        $data = sanitize_text_field( $_POST['data'] );
-        $action_data = array();
-        parse_str( $data, $action_data );
+		// Parse POST data
+		$data = sanitize_text_field( $_POST['data'] );
+		$action_data = array();
+		parse_str( $data, $action_data );
 
 		// Security checks
-        // ensure the current user may remove users from post
-        // only teacher or admin can remove users
+		// ensure the current user may remove users from post
+		// only teacher or admin can remove users
 
-        // check the nonce, valid post
+		// check the nonce, valid 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() ){
+		// validate the user
+		$may_remove_user = false;
+		if( current_user_can('manage_sensei')
+			||  $post->post_author == get_current_user_id() ){
 
-            $may_remove_user = true;
+			$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('');
+			die('');
 
-        }
+		}
 
 		if( $action_data['user_id'] && $action_data['post_id'] && $action_data['post_type'] ) {
 
@@ -297,7 +297,7 @@ 
 
 				case 'course':
 
-                    $removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
+					$removed = Sensei_Utils::sensei_remove_user_from_course( $post_id, $user_id );
 
 				break;
 
@@ -344,19 +344,19 @@ 
 
 		if ( $users ) {
 			foreach ( $users as $user ) {
-                $full_name = Sensei_Learner::get_full_name( $user->ID );
+				$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;
+					$name = $full_name;
 
-                }else{
+				}else{
 
-                    $name = $full_name . ' ['. $user->display_name .']';
+					$name = $full_name . ' ['. $user->display_name .']';
 
-                }
+				}
 
-                $found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
+				$found_users[ $user->ID ] = $name  . ' (#' . $user->ID . ' – ' . sanitize_email( $user->user_email ) . ')';
 			}
 		}
 
@@ -400,7 +400,7 @@ 
 			break;
 
 			case 'lesson':
-                $lesson_id = absint( $_POST['add_lesson_id'] );
+				$lesson_id = absint( $_POST['add_lesson_id'] );
 				$complete = false;
 				if( isset( $_POST['add_complete_lesson'] ) && 'yes' == $_POST['add_complete_lesson'] ) {
 					$complete = true;
@@ -460,23 +460,23 @@ 
 		}
 	}
 
-    /**
-     * Return the full name and surname or the display name of the user.
-     *
-     * The user must have both name and surname otherwise display name will be returned.
-     *
-     * @deprecated since 1.9.0 use Se
-     * @since 1.8.0
-     *
-     * @param int $user_id | bool false for an invalid $user_id
-     *
-     * @return string $full_name
-     */
-    public function get_learner_full_name( $user_id ){
-
-        return Sensei_Learner::get_full_name( $user_id );
-
-    } // end get_learner_full_name
+	/**
+	 * Return the full name and surname or the display name of the user.
+	 *
+	 * The user must have both name and surname otherwise display name will be returned.
+	 *
+	 * @deprecated since 1.9.0 use Se
+	 * @since 1.8.0
+	 *
+	 * @param int $user_id | bool false for an invalid $user_id
+	 *
+	 * @return string $full_name
+	 */
+	public function get_learner_full_name( $user_id ){
+
+		return Sensei_Learner::get_full_name( $user_id );
+
+	} // end get_learner_full_name
 
 } // End Class
 

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/theme-integrations/theme-integration-loader.php

Indentation +86 added lines, -86 removed lines

@@ -10,91 +10,91 @@
  */
 class Sensei_Theme_Integration_Loader {
 
-    /**
-     * @var array
-     * Holding a reference core supported themes
-     */
-    protected $themes;
-
-    /**
-     * @var string
-     * reference to the theme currently active on this site
-     */
-    protected $active_theme;
-
-    public function __construct() {
-
-        $this->setup_themes();
-        $this->setup_currently_active_theme();
-        $this->possibly_load_supported_theme_wrappers();
-
-    }
-
-    /**
-     * Setup the theme slugs supported by Sensei Core
-     *
-     * @since 1.9.0
-     */
-    private function setup_themes(){
-
-        $this->themes = array(
-            'twentyeleven',
-            'twentytwelve',
-            'twentythirteen',
-            'twentyfourteen',
-            'twentyfifteen',
-            'twentysixteen',
-            'storefront',
-        );
-
-    }// end setup themes
-
-    /**
-     * Setup the currently active theme
-     *
-     * @since 1.9.0
-     */
-    private function setup_currently_active_theme(){
-
-        $this->active_theme = get_option('template');
-
-    }
-
-    /**
-     * Remove default Sensei wrappers and load
-     * supported wrappers if the current theme is
-     * a theme we have an integration for within core.
-     *
-     * @since 1.9.0
-     */
-    private function possibly_load_supported_theme_wrappers(){
-
-        if ( in_array( $this->active_theme, $this->themes ) ){
-
-            // setup file and class names
-            $supported_theme_class_file = trailingslashit( Sensei()->plugin_path ) . 'includes/theme-integrations/' . $this->active_theme . '.php';
-            $supported_theme_class_name  = 'Sensei_'. ucfirst( $this->active_theme  );
-
-            // load the file or exit if there is no file for this theme
-            if( ! file_exists( $supported_theme_class_file ) ){
-                return;
-            }
-            include_once( $supported_theme_class_file );
-            include_once( 'twentytwelve.php' );
-            //initialize the class or exit if there is no class for this theme
-            if( ! class_exists( $supported_theme_class_name ) ){
-                return;
-            }
-            $supported_theme = new $supported_theme_class_name;
-
-            // remove default wrappers
-            remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
-            remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
-
-            // load the supported theme wrappers
-            add_action( 'sensei_before_main_content', array( $supported_theme, 'wrapper_start' ), 10 );
-            add_action( 'sensei_after_main_content', array( $supported_theme, 'wrapper_end' ), 10 );
-        }
-    }
+	/**
+	 * @var array
+	 * Holding a reference core supported themes
+	 */
+	protected $themes;
+
+	/**
+	 * @var string
+	 * reference to the theme currently active on this site
+	 */
+	protected $active_theme;
+
+	public function __construct() {
+
+		$this->setup_themes();
+		$this->setup_currently_active_theme();
+		$this->possibly_load_supported_theme_wrappers();
+
+	}
+
+	/**
+	 * Setup the theme slugs supported by Sensei Core
+	 *
+	 * @since 1.9.0
+	 */
+	private function setup_themes(){
+
+		$this->themes = array(
+			'twentyeleven',
+			'twentytwelve',
+			'twentythirteen',
+			'twentyfourteen',
+			'twentyfifteen',
+			'twentysixteen',
+			'storefront',
+		);
+
+	}// end setup themes
+
+	/**
+	 * Setup the currently active theme
+	 *
+	 * @since 1.9.0
+	 */
+	private function setup_currently_active_theme(){
+
+		$this->active_theme = get_option('template');
+
+	}
+
+	/**
+	 * Remove default Sensei wrappers and load
+	 * supported wrappers if the current theme is
+	 * a theme we have an integration for within core.
+	 *
+	 * @since 1.9.0
+	 */
+	private function possibly_load_supported_theme_wrappers(){
+
+		if ( in_array( $this->active_theme, $this->themes ) ){
+
+			// setup file and class names
+			$supported_theme_class_file = trailingslashit( Sensei()->plugin_path ) . 'includes/theme-integrations/' . $this->active_theme . '.php';
+			$supported_theme_class_name  = 'Sensei_'. ucfirst( $this->active_theme  );
+
+			// load the file or exit if there is no file for this theme
+			if( ! file_exists( $supported_theme_class_file ) ){
+				return;
+			}
+			include_once( $supported_theme_class_file );
+			include_once( 'twentytwelve.php' );
+			//initialize the class or exit if there is no class for this theme
+			if( ! class_exists( $supported_theme_class_name ) ){
+				return;
+			}
+			$supported_theme = new $supported_theme_class_name;
+
+			// remove default wrappers
+			remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
+			remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+
+			// load the supported theme wrappers
+			add_action( 'sensei_before_main_content', array( $supported_theme, 'wrapper_start' ), 10 );
+			add_action( 'sensei_after_main_content', array( $supported_theme, 'wrapper_end' ), 10 );
+		}
+	}
 
 } /// end class
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @since 1.9.0
      */
-    private function setup_themes(){
+    private function setup_themes() {
 
         $this->themes = array(
             'twentyeleven',
@@ -54,7 +54,7 @@ 
      *
      * @since 1.9.0
      */
-    private function setup_currently_active_theme(){
+    private function setup_currently_active_theme() {
 
         $this->active_theme = get_option('template');
 
@@ -67,33 +67,33 @@ 
      *
      * @since 1.9.0
      */
-    private function possibly_load_supported_theme_wrappers(){
+    private function possibly_load_supported_theme_wrappers() {
 
-        if ( in_array( $this->active_theme, $this->themes ) ){
+        if (in_array($this->active_theme, $this->themes)) {
 
             // setup file and class names
-            $supported_theme_class_file = trailingslashit( Sensei()->plugin_path ) . 'includes/theme-integrations/' . $this->active_theme . '.php';
-            $supported_theme_class_name  = 'Sensei_'. ucfirst( $this->active_theme  );
+            $supported_theme_class_file = trailingslashit(Sensei()->plugin_path).'includes/theme-integrations/'.$this->active_theme.'.php';
+            $supported_theme_class_name = 'Sensei_'.ucfirst($this->active_theme);
 
             // load the file or exit if there is no file for this theme
-            if( ! file_exists( $supported_theme_class_file ) ){
+            if ( ! file_exists($supported_theme_class_file)) {
                 return;
             }
-            include_once( $supported_theme_class_file );
-            include_once( 'twentytwelve.php' );
+            include_once($supported_theme_class_file);
+            include_once('twentytwelve.php');
             //initialize the class or exit if there is no class for this theme
-            if( ! class_exists( $supported_theme_class_name ) ){
+            if ( ! class_exists($supported_theme_class_name)) {
                 return;
             }
             $supported_theme = new $supported_theme_class_name;
 
             // remove default wrappers
-            remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
-            remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+            remove_action('sensei_before_main_content', array(Sensei()->frontend, 'sensei_output_content_wrapper'), 10);
+            remove_action('sensei_after_main_content', array(Sensei()->frontend, 'sensei_output_content_wrapper_end'), 10);
 
             // load the supported theme wrappers
-            add_action( 'sensei_before_main_content', array( $supported_theme, 'wrapper_start' ), 10 );
-            add_action( 'sensei_after_main_content', array( $supported_theme, 'wrapper_end' ), 10 );
+            add_action('sensei_before_main_content', array($supported_theme, 'wrapper_start'), 10);
+            add_action('sensei_after_main_content', array($supported_theme, 'wrapper_end'), 10);
         }
     }