woothemes / sensei

includes/class-sensei-quiz.php

Spacing +286 added lines, -286 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Quiz Class
@@ -23,24 +23,24 @@ 
 	 *
 	 * @param $file
 	 */
-	public function __construct ( $file = __FILE__ ) {
+	public function __construct($file = __FILE__) {
 		$this->file = $file;
-		$this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' );
-		add_action( 'save_post', array( $this, 'update_author' ));
+		$this->meta_fields = array('quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required', 'enable_quiz_reset');
+		add_action('save_post', array($this, 'update_author'));
 
 		// listen to the reset button click
-		add_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
+		add_action('template_redirect', array($this, 'reset_button_click_listener'));
 
         // fire the complete quiz button submit for grading action
-        add_action( 'sensei_complete_quiz', array( $this, 'user_quiz_submit_listener' ) );
+        add_action('sensei_complete_quiz', array($this, 'user_quiz_submit_listener'));
 
 		// fire the save user answers quiz button click responder
-		add_action( 'sensei_complete_quiz', array( $this, 'user_save_quiz_answers_listener' ) );
+		add_action('sensei_complete_quiz', array($this, 'user_save_quiz_answers_listener'));
 
         // fire the load global data function
-        add_action( 'sensei_complete_quiz', array( $this, 'load_global_quiz_data' ), 80 );
+        add_action('sensei_complete_quiz', array($this, 'load_global_quiz_data'), 80);
 
-        add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
+        add_action('template_redirect', array($this, 'quiz_has_no_questions'));
 
 
     } // End __construct()
@@ -51,26 +51,26 @@ 
 	* @param int $post_id
 	* @return void
 	*/
-	public function update_author( $post_id ){
+	public function update_author($post_id) {
 
 
 		// If this isn't a 'lesson' post, don't update it.
         // if this is a revision don't save it
-	    if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
-            || wp_is_post_revision( $post_id ) ) {
+	    if (isset($_POST['post_type']) && 'lesson' != $_POST['post_type']
+            || wp_is_post_revision($post_id)) {
 
                 return;
 
         }
 	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+	    $saved_post = get_post($post_id);
+	    $new_lesson_author_id = $saved_post->post_author;
 
 	    //get the lessons quiz
-		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		$lesson_quizzes = Sensei()->lesson->lesson_quizzes($post_id);
+	    foreach ((array) $lesson_quizzes as $quiz_item) {
 
-	    	if( ! $quiz_item ) {
+	    	if ( ! $quiz_item) {
 	    		continue;
 	    	}
 
@@ -81,10 +81,10 @@ 
 			);
 
             // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+            remove_action('save_post', array($this, 'update_author'));
 
 			// Update the post into the database
-		  	wp_update_post( $my_post );
+		  	wp_update_post($my_post);
 	    }
 
 	    return;
@@ -98,19 +98,19 @@ 
 	 * @param int $quiz_id
 	 * @return int @lesson_id
 	 */
-	public function get_lesson_id( $quiz_id ){
+	public function get_lesson_id($quiz_id) {
 
-		if( empty( $quiz_id ) || ! intval( $quiz_id ) > 0 ){
+		if (empty($quiz_id) || ! intval($quiz_id) > 0) {
 			global $post;
-			if( 'quiz' == get_post_type( $post ) ){
+			if ('quiz' == get_post_type($post)) {
 				$quiz_id = $post->ID;
-			}else{
+			} else {
 				return false;
 			}
 
 		}
 
-		$quiz = get_post( $quiz_id );
+		$quiz = get_post($quiz_id);
 		$lesson_id = $quiz->post_parent;
 
 		return $lesson_id;
@@ -125,23 +125,23 @@ 
      * @since 1.7.3
      * @return bool $saved;
      */
-    public function user_save_quiz_answers_listener(){
+    public function user_save_quiz_answers_listener() {
 
-        if( ! isset( $_POST[ 'quiz_save' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
+        if ( ! isset($_POST['quiz_save'])
+            || ! isset($_POST['sensei_question'])
+            || empty($_POST['sensei_question'])
+            ||  ! wp_verify_nonce($_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce') > 1) {
             return;
         }
 
         global $post;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+        $lesson_id = $this->get_lesson_id($post->ID);
+        $quiz_answers = $_POST['sensei_question'];
         // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+        self::save_user_answers($quiz_answers, $_FILES, $lesson_id, get_current_user_id());
 
         // remove the hook as it should only fire once per click
-        remove_action( 'sensei_complete_quiz', 'user_save_quiz_answers_listener' );
+        remove_action('sensei_complete_quiz', 'user_save_quiz_answers_listener');
 
     } // end user_save_quiz_answers_listener
 
@@ -160,17 +160,17 @@ 
 	 *
 	 * @return false or int $answers_saved
 	 */
-	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
+	public static function save_user_answers($quiz_answers, $files = array(), $lesson_id, $user_id = 0) {
 
-        if( ! ( $user_id > 0 ) ){
+        if ( ! ($user_id > 0)) {
             $user_id = get_current_user_id();
         }
 
         // make sure the parameters are valid before continuing
-		if( empty( $lesson_id ) || empty( $user_id )
-			|| 'lesson' != get_post_type( $lesson_id )
-			||!get_userdata( $user_id )
-			|| !is_array( $quiz_answers ) ){
+		if (empty($lesson_id) || empty($user_id)
+			|| 'lesson' != get_post_type($lesson_id)
+			||! get_userdata($user_id)
+			|| ! is_array($quiz_answers)) {
 
 			return false;
 
@@ -178,23 +178,23 @@ 
 
 
         // start the lesson before saving the data in case the user has not started the lesson
-        $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+        $activity_logged = Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
 
 		//prepare the answers
-		$prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files );
+		$prepared_answers = self::prepare_form_submitted_answers($quiz_answers, $files);
 
 		// save the user data
-        $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
+        $answers_saved = Sensei_Utils::add_user_data('quiz_answers', $lesson_id, $prepared_answers, $user_id);
 
 		// were the answers saved correctly?
-		if( intval( $answers_saved ) > 0){
+		if (intval($answers_saved) > 0) {
 
             // save transient to make retrieval faster
             $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+            set_transient($transient_key, $prepared_answers, 10 * DAY_IN_SECONDS);
 
             // update the message showed to user
-            Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+            Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Saved Successfully.', 'woothemes-sensei').'</div>';
         }
 
 		return $answers_saved;
@@ -216,41 +216,41 @@ 
 	 *
 	 * @return array $answers or false
 	 */
-	public function get_user_answers( $lesson_id, $user_id ){
+	public function get_user_answers($lesson_id, $user_id) {
 
 		$answers = false;
 
-		if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-		|| ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+		if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+		|| ! intval($user_id) > 0 || ! get_userdata($user_id)) {
 			return false;
 		}
 
         // save some time and get the transient cached data
         $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $transient_cached_answers = get_transient( $transient_key );
+        $transient_cached_answers = get_transient($transient_key);
 
         // return the transient or get the values get the values from the comment meta
-        if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
+        if ( ! empty($transient_cached_answers) && false != $transient_cached_answers) {
 
             $encoded_user_answers = $transient_cached_answers;
 
-        }else{
+        } else {
 
-            $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
+            $encoded_user_answers = Sensei_Utils::get_user_data('quiz_answers', $lesson_id, $user_id);
 
         } // end if transient check
 
-		if( ! is_array( $encoded_user_answers ) ){
+		if ( ! is_array($encoded_user_answers)) {
 			return false;
 		}
 
         //set the transient with the new valid data for faster retrieval in future
-        set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
+        set_transient($transient_key, $encoded_user_answers, 10 * DAY_IN_SECONDS);
 
 		// decode an unserialize all answers
-		foreach( $encoded_user_answers as $question_id => $encoded_answer ) {
-			$decoded_answer = base64_decode( $encoded_answer );
-			$answers[$question_id] = maybe_unserialize( $decoded_answer );
+		foreach ($encoded_user_answers as $question_id => $encoded_answer) {
+			$decoded_answer = base64_decode($encoded_answer);
+			$answers[$question_id] = maybe_unserialize($decoded_answer);
 		}
 
 		return $answers;
@@ -267,23 +267,23 @@ 
 	 *
 	 * @return void;
 	 */
-	public function reset_button_click_listener( ){
+	public function reset_button_click_listener( ) {
 
-		if( ! isset( $_POST[ 'quiz_reset' ])
-			||  ! wp_verify_nonce( $_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce'  ) > 1 ) {
+		if ( ! isset($_POST['quiz_reset'])
+			||  ! wp_verify_nonce($_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce') > 1) {
 
 			return; // exit
 		}
 
 		global $post;
 		$current_quiz_id = $post->ID;
-		$lesson_id = $this->get_lesson_id( $current_quiz_id );
+		$lesson_id = $this->get_lesson_id($current_quiz_id);
 
         // reset all user data
-        $this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
+        $this->reset_user_lesson_data($lesson_id, get_current_user_id());
 
 		//this function should only run once
-		remove_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
+		remove_action('template_redirect', array($this, 'reset_button_click_listener'));
 
 	} // end reset_button_click_listener
 
@@ -302,18 +302,18 @@ 
 	public function user_quiz_submit_listener() {
 
         // only respond to valid quiz completion submissions
-        if( ! isset( $_POST[ 'quiz_complete' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
+        if ( ! isset($_POST['quiz_complete'])
+            || ! isset($_POST['sensei_question'])
+            || empty($_POST['sensei_question'])
+            ||  ! wp_verify_nonce($_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce') > 1) {
             return;
         }
 
         global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+        $lesson_id = $this->get_lesson_id($post->ID);
+        $quiz_answers = $_POST['sensei_question'];
 
-        self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
+        self::submit_answers_for_grading($quiz_answers, $_FILES, $lesson_id, $current_user->ID);
 
 	} // End sensei_complete_quiz()
 
@@ -327,7 +327,7 @@ 
      * @access public
      *
      */
-    public function load_global_quiz_data(){
+    public function load_global_quiz_data() {
 
         global  $post, $current_user;
         $this->data = new stdClass();
@@ -336,46 +336,46 @@ 
         $grade = 0;
 
         // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($post->ID);
 
-        $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
+        $quiz_lesson_id = absint(get_post_meta($post->ID, '_quiz_lesson', true));
 
         // Get quiz grade type
-        $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
+        $quiz_grade_type = get_post_meta($post->ID, '_quiz_grade_type', true);
 
         // Get quiz pass setting
-        $pass_required = get_post_meta( $post->ID, '_pass_required', true );
+        $pass_required = get_post_meta($post->ID, '_pass_required', true);
 
         // Get quiz pass mark
-        $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
+        $quiz_passmark = abs(round(doubleval(get_post_meta($post->ID, '_quiz_passmark', true)), 2));
 
         // Get latest quiz answers and grades
-        $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
-        $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
+        $lesson_id = Sensei()->quiz->get_lesson_id($post->ID);
+        $user_quizzes = Sensei()->quiz->get_user_answers($lesson_id, get_current_user_id());
+        $user_lesson_status = Sensei_Utils::user_lesson_status($quiz_lesson_id, $current_user->ID);
         $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+        if (isset($user_lesson_status->comment_ID)) {
+            $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
         }
 
-        if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
+        if ( ! is_array($user_quizzes)) { $user_quizzes = array(); }
 
         // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+        $user_lesson_end = Sensei_Utils::user_completed_lesson($user_lesson_status);
         $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
+        if ($user_lesson_end) {
             $user_lesson_complete = true;
         } // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+        $reset_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true);
         //backwards compatibility
-        if( 'on' == $reset_allowed ) {
+        if ('on' == $reset_allowed) {
             $reset_allowed = 1;
         }
 
         // Build frontend data object for backwards compatibility
         // using this is no longer recommended
-        $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+        $this->data->user_quiz_grade = $user_quiz_grade; // Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
         $this->data->quiz_passmark = $quiz_passmark;
         $this->data->quiz_lesson = $quiz_lesson_id;
         $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
@@ -400,41 +400,41 @@ 
 	 * @param $files
 	 * @return array
 	 */
-	public static function prepare_form_submitted_answers( $unprepared_answers,  $files ){
+	public static function prepare_form_submitted_answers($unprepared_answers, $files) {
 
 
 		$prepared_answers = array();
 
 		// validate incoming answers
-		if( empty( $unprepared_answers  ) || ! is_array( $unprepared_answers ) ){
+		if (empty($unprepared_answers) || ! is_array($unprepared_answers)) {
 			return false;
 		}
 
 		// Loop through submitted quiz answers and save them appropriately
-		foreach( $unprepared_answers as $question_id => $answer ) {
+		foreach ($unprepared_answers as $question_id => $answer) {
 
 			//get the current questions 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);
 			}
 
             // compress the answer for saving
-			if( 'multi-line' == $question_type ) {
-                $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
-                $file_key = 'file_upload_' . $question_id;
-                if( isset( $files[ $file_key ] ) ) {
-                        $attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
-                        if( $attachment_id ) {
+			if ('multi-line' == $question_type) {
+                $answer = esc_html($answer);
+            }elseif ('file-upload' == $question_type) {
+                $file_key = 'file_upload_'.$question_id;
+                if (isset($files[$file_key])) {
+                        $attachment_id = Sensei_Utils::upload_file($files[$file_key]);
+                        if ($attachment_id) {
                             $answer = $attachment_id;
                         }
                     }
             } // end if
 
-			$prepared_answers[ $question_id ] =  base64_encode( maybe_serialize( $answer ) );
+			$prepared_answers[$question_id] = base64_encode(maybe_serialize($answer));
 
 		}// end for each $quiz_answers
 
@@ -454,54 +454,54 @@ 
      * @param int $user_id
      * @param int $lesson_id
      */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+    public function reset_user_lesson_data($lesson_id, $user_id = 0) {
 
         //make sure the parameters are valid
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            || ! get_userdata( $user_id ) ){
+        if (empty($lesson_id) || empty($user_id)
+            || 'lesson' != get_post_type($lesson_id)
+            || ! get_userdata($user_id)) {
             return false;
         }
 
 
 
         //get the users lesson status to make
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-        if( ! isset( $user_lesson_status->comment_ID ) ) {
+        $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+        if ( ! isset($user_lesson_status->comment_ID)) {
             // this user is not taking this lesson so this process is not needed
             return false;
         }
 
         //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+        $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
+        $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         // reset the transients
         $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
         $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
         $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-        delete_transient( $answers_transient_key );
-        delete_transient( $grades_transient_key );
-        delete_transient( $answers_feedback_transient_key );
+        delete_transient($answers_transient_key);
+        delete_transient($grades_transient_key);
+        delete_transient($answers_feedback_transient_key);
 
         // reset the quiz answers and feedback notes
-        $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
-        $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
-        $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+        $deleted_answers = Sensei_Utils::delete_user_data('quiz_answers', $lesson_id, $user_id);
+        $deleted_grades = Sensei_Utils::delete_user_data('quiz_grades', $lesson_id, $user_id);
+        $deleted_user_feedback = Sensei_Utils::delete_user_data('quiz_answers_feedback', $lesson_id, $user_id);
 
         // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-        Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+        Sensei_Utils::sensei_delete_quiz_answers($quiz_id, $user_id);
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+        Sensei_Utils::update_lesson_status($user_id, $lesson_id, 'in-progress', array('questions_asked' => '', 'grade' => ''));
 
         // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_id );
+        Sensei_Utils::update_course_status($user_id, $course_id);
 
         // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
-        do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
-        Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+        do_action('sensei_user_lesson_reset', $user_id, $lesson_id);
+        Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Reset Successfully.', 'woothemes-sensei').'</div>';
 
-        return ( $deleted_answers && $deleted_grades ) ;
+        return ($deleted_answers && $deleted_grades);
 
     } // end reset_user_lesson_data
 
@@ -521,20 +521,20 @@ 
       *
       * @return bool $answers_submitted
       */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+     public static function submit_answers_for_grading($quiz_answers, $files = array(), $lesson_id, $user_id = 0) {
 
          $answers_submitted = false;
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
          // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_answers ) ){
+         if (empty($lesson_id) || empty($user_id)
+             || 'lesson' != get_post_type($lesson_id)
+             ||! get_userdata($user_id)
+             || ! is_array($quiz_answers)) {
 
              return false;
 
@@ -544,38 +544,38 @@ 
          $grade = 0;
 
          // Get Quiz ID
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+         $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
          // Get quiz grade type
-         $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+         $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
          // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+         $pass_required = get_post_meta($quiz_id, '_pass_required', true);
 
          // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+         $quiz_pass_percentage = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
 
          // Handle Quiz Questions asked
          // This is to ensure we save the questions that we've asked this user and that this can't be change unless
          // the quiz is reset by admin or user( user: only if the setting is enabled ).
          // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
-         if( empty( $questions_asked ) ){
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+         $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true);
+         if (empty($questions_asked)) {
 
-             $questions_asked = array_keys( $quiz_answers );
-             $questions_asked_string = implode( ',', $questions_asked );
+             $questions_asked = array_keys($quiz_answers);
+             $questions_asked_string = implode(',', $questions_asked);
 
              // Save questions that were asked in this quiz
-             update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
+             update_comment_meta($user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string);
 
          }
 
          // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
-         self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
+         self::save_user_answers($quiz_answers, $files, $lesson_id, $user_id);
 
          // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+         $grade = Sensei_Grading::grade_quiz_auto($quiz_id, $quiz_answers, 0, $quiz_grade_type);
 
          // Get Lesson Grading Setting
          $lesson_metadata = array();
@@ -585,13 +585,13 @@ 
          $answers_submitted = true;
 
          // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+         if ('auto' == $quiz_grade_type && ! is_wp_error($grade)) {
 
              // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+             if ('on' == $pass_required) {
 
                  // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+                 if ($quiz_pass_percentage <= $grade) {
 
                      $lesson_status = 'passed';
 
@@ -612,9 +612,9 @@ 
 
          } // end if ! is_wp_error( $grade ...
 
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+         Sensei_Utils::update_lesson_status($user_id, $lesson_id, $lesson_status, $lesson_metadata);
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+         if ('passed' == $lesson_status || 'graded' == $lesson_status) {
 
              /**
               * Lesson end action hook
@@ -624,7 +624,7 @@ 
               * @param int $user_id
               * @param int $lesson_id
               */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+             do_action('sensei_user_lesson_end', $user_id, $lesson_id);
 
          }
 
@@ -640,7 +640,7 @@ 
           * @param string $quiz_pass_percentage
           * @param string $quiz_grade_type
           */
-         do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
+         do_action('sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type);
 
          return $answers_submitted;
 
@@ -660,38 +660,38 @@ 
       *
       * @return bool $answers_submitted
       */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_answer($lesson_id, $question_id, $user_id = 0) {
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
-         if( ! ( intval( $user_id ) > 0 )   ){
+         if ( ! (intval($user_id) > 0)) {
              $user_id = get_current_user_id();
          }
 
-         $users_answers = $this->get_user_answers( $lesson_id, $user_id );
+         $users_answers = $this->get_user_answers($lesson_id, $user_id);
 
-         if( !$users_answers || empty( $users_answers )
-         ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
+         if ( ! $users_answers || empty($users_answers)
+         ||  ! is_array($users_answers) || ! isset($users_answers[$question_id])) {
 
              //Fallback for pre 1.7.4 data
-             $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
+             $comment = Sensei_Utils::sensei_check_for_activity(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer'), true);
 
-             if( ! isset( $comment->comment_content ) ){
+             if ( ! isset($comment->comment_content)) {
                  return false;
              }
 
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
+             return maybe_unserialize(base64_decode($comment->comment_content));
          }
 
-         return $users_answers[ $question_id ];
+         return $users_answers[$question_id];
 
      }// end get_user_question_answer
 
@@ -712,18 +712,18 @@ 
       *
       * @return bool
       */
-     public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
+     public function set_user_grades($quiz_grades, $lesson_id, $user_id = 0) {
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
          // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_grades ) ){
+         if (empty($lesson_id) || empty($user_id)
+             || 'lesson' != get_post_type($lesson_id)
+             ||! get_userdata($user_id)
+             || ! is_array($quiz_grades)) {
 
              return false;
 
@@ -732,15 +732,15 @@ 
          $success = false;
 
          // save that data for the user on the lesson comment meta
-         $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
+         $comment_meta_id = Sensei_Utils::add_user_data('quiz_grades', $lesson_id, $quiz_grades, $user_id);
 
          // were the grades save successfully ?
-         if( intval( $comment_meta_id ) > 0 ) {
+         if (intval($comment_meta_id) > 0) {
 
              $success = true;
              // save transient
-             $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-             set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
+             $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+             set_transient($transient_key, $quiz_grades, 10 * DAY_IN_SECONDS);
          }
 
          return $success;
@@ -759,36 +759,36 @@ 
       *
       * @return array $user_quiz_grades or false if none exists for this users
       */
-     public function get_user_grades( $lesson_id, $user_id = 0 ){
+     public function get_user_grades($lesson_id, $user_id = 0) {
 
          $user_grades = array();
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+         if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+             || ! intval($user_id) > 0 || ! get_userdata($user_id)) {
              return false;
          }
 
          // save some time and get the transient cached data
-         $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-         $user_grades = get_transient( $transient_key );
+         $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+         $user_grades = get_transient($transient_key);
 
          // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
+         if (empty($user_grades) || false != $user_grades) {
 
-             $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
+             $user_grades = Sensei_Utils::get_user_data('quiz_grades', $lesson_id, $user_id);
 
              //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
+             set_transient($transient_key, $user_grades, 10 * DAY_IN_SECONDS);
 
          } // end if transient check
 
          // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
+         if ( ! is_array($user_grades)) {
              return false;
          }
 
@@ -811,21 +811,21 @@ 
       *
       * @return bool $question_grade
       */
-     public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_grade($lesson_id, $question_id, $user_id = 0) {
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+         $all_user_grades = self::get_user_grades($lesson_id, $user_id);
 
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+         if ( ! $all_user_grades || ! isset($all_user_grades[$question_id])) {
 
              //fallback to data pre 1.7.4
              $args = array(
@@ -834,17 +834,17 @@ 
                  'type'    => 'sensei_user_answer'
              );
 
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+             $question_activity = Sensei_Utils::sensei_check_for_activity($args, true);
              $fall_back_grade = false;
-             if( isset( $question_activity->comment_ID ) ){
-                 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
+             if (isset($question_activity->comment_ID)) {
+                 $fall_back_grade = get_comment_meta($question_activity->comment_ID, 'user_grade', true);
              }
 
              return $fall_back_grade;
 
          } // end if $all_user_grades...
 
-         return $all_user_grades[ $question_id ];
+         return $all_user_grades[$question_id];
 
      }// end get_user_question_grade
 
@@ -866,13 +866,13 @@ 
       *
       * @return false or int $feedback_saved
       */
-    public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
+    public function save_user_answers_feedback($answers_feedback, $lesson_id, $user_id = 0) {
 
         // make sure the parameters are valid before continuing
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            ||!get_userdata( $user_id )
-            || !is_array( $answers_feedback ) ){
+        if (empty($lesson_id) || empty($user_id)
+            || 'lesson' != get_post_type($lesson_id)
+            ||! get_userdata($user_id)
+            || ! is_array($answers_feedback)) {
 
             return false;
 
@@ -880,25 +880,25 @@ 
 
 
         // check if the lesson is started before saving, if not start the lesson for the user
-        if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
-            Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+        if ( ! (0 < intval(Sensei_Utils::user_started_lesson($lesson_id, $user_id)))) {
+            Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
         }
 
         // encode the feedback
-        $encoded_answers_feedback =  array();
-        foreach( $answers_feedback as $question_id => $feedback ){
-            $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
+        $encoded_answers_feedback = array();
+        foreach ($answers_feedback as $question_id => $feedback) {
+            $encoded_answers_feedback[$question_id] = base64_encode($feedback);
         }
 
         // save the user data
-        $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
+        $feedback_saved = Sensei_Utils::add_user_data('quiz_answers_feedback', $lesson_id, $encoded_answers_feedback, $user_id);
 
         //Were the the question feedback save correctly?
-        if( intval( $feedback_saved ) > 0){
+        if (intval($feedback_saved) > 0) {
 
             // save transient to make retrieval faster in future
              $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-             set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
+             set_transient($transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS);
 
         }
 
@@ -923,42 +923,42 @@ 
       *  $type string $question_feedback
       * }
       */
-     public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+     public function get_user_answers_feedback($lesson_id, $user_id = 0) {
 
          $answers_feedback = array();
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+         if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+             || ! intval($user_id) > 0 || ! get_userdata($user_id)) {
              return false;
          }
 
          // first check the transient to save a few split seconds
          $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-         $encoded_feedback = get_transient( $transient_key );
+         $encoded_feedback = get_transient($transient_key);
 
          // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
+         if (empty($encoded_feedback) || ! $encoded_feedback) {
 
-             $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+             $encoded_feedback = Sensei_Utils::get_user_data('quiz_answers_feedback', $lesson_id, $user_id);
 
              //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
+             set_transient($transient_key, $encoded_feedback, 10 * DAY_IN_SECONDS);
 
          } // end if transient check
 
          // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
+         if ( ! is_array($encoded_feedback)) {
              return false;
          }
 
-         foreach( $encoded_feedback as $question_id => $feedback ){
+         foreach ($encoded_feedback as $question_id => $feedback) {
 
-             $answers_feedback[ $question_id ] = base64_decode( $feedback );
+             $answers_feedback[$question_id] = base64_decode($feedback);
 
          }
 
@@ -981,25 +981,25 @@ 
       *
       * @return string $feedback or bool if false
       */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_feedback($lesson_id, $question_id, $user_id = 0) {
 
          $feedback = false;
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
          // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+         $all_feedback = $this->get_user_answers_feedback($lesson_id, $user_id);
 
-         if( !$all_feedback || empty( $all_feedback )
-             || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
+         if ( ! $all_feedback || empty($all_feedback)
+             || ! is_array($all_feedback) || ! isset($all_feedback[$question_id])) {
 
              //fallback to data pre 1.7.4
 
@@ -1009,23 +1009,23 @@ 
                  'user_id' => $user_id,
                  'type'    => 'sensei_user_answer'
              );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+             $question_activity = Sensei_Utils::sensei_check_for_activity($args, true);
 
              // set the default to false and return that if no old data is available.
-             if( isset( $question_activity->comment_ID ) ){
-                 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
+             if (isset($question_activity->comment_ID)) {
+                 $feedback = base64_decode(get_comment_meta($question_activity->comment_ID, 'answer_note', true));
              }
 
              // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+             if (empty($feedback)) {
+                 $feedback = get_post_meta($question_id, '_answer_feedback', true);
              }
 
              return $feedback;
 
          }
 
-         return $all_feedback[ $question_id ];
+         return $all_feedback[$question_id];
 
      } // end get_user_question_feedback
 
@@ -1044,7 +1044,7 @@ 
      public function quiz_has_no_questions() {
 
 
-         if( ! is_singular( 'quiz' ) )  {
+         if ( ! is_singular('quiz')) {
              return;
          }
 
@@ -1052,11 +1052,11 @@ 
 
          $lesson_id = $this->get_lesson_id($post->ID);
 
-         $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+         $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
 
          $lesson = get_post($lesson_id);
 
-         if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
+         if (is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name") {
 
              wp_redirect(get_permalink($lesson->ID), 301);
              exit;
@@ -1070,7 +1070,7 @@ 
   *
   * @deprecated since 1.9.0
   */
- public static function deprecate_quiz_sensei_single_main_content_hook(){
+ public static function deprecate_quiz_sensei_single_main_content_hook() {
 
      sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
@@ -1080,7 +1080,7 @@ 
      *
      * @deprecated since 1.9.0
      */
-     public static function deprecate_quiz_sensei_quiz_single_title_hook(){
+     public static function deprecate_quiz_sensei_quiz_single_title_hook() {
 
          sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
@@ -1093,29 +1093,29 @@ 
       * @param int $id title post id
       * @return string $quiz_title
       */
-     public static function single_quiz_title( $title, $post_id ){
+     public static function single_quiz_title($title, $post_id) {
 
-         if( 'quiz' == get_post_type( $post_id ) ){
+         if ('quiz' == get_post_type($post_id)) {
 
              $title_with_no_quizzes = $title;
 
              // if the title has quiz, remove it: legacy titles have the word quiz stored.
-             if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
+             if (1 < substr_count(strtoupper($title_with_no_quizzes), 'QUIZ')) {
 
                  // remove all possible appearances of quiz
-                 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
-                 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
-                 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
+                 $title_with_no_quizzes = str_replace('quiz', '', $title);
+                 $title_with_no_quizzes = str_replace('Quiz', '', $title_with_no_quizzes);
+                 $title_with_no_quizzes = str_replace('QUIZ', '', $title_with_no_quizzes);
 
              }
 
-             $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
+             $title = $title_with_no_quizzes.' '.__('Quiz', 'woothemes-sensei');
          }
 
          /**
           * hook document in class-woothemes-sensei-message.php
           */
-         return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
+         return apply_filters('sensei_single_title', $title, get_post_type( ));
 
      }
 
@@ -1127,21 +1127,21 @@ 
       * @since 1.9.0
       *
       */
-     public static function start_quiz_questions_loop(){
+     public static function start_quiz_questions_loop() {
 
          global $sensei_question_loop;
 
          //intialize the questions loop object
          $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
+         $sensei_question_loop['total']   = 0;
          $sensei_question_loop['questions'] = array();
 
 
-         $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
+         $questions = Sensei()->lesson->lesson_quiz_questions(get_the_ID());
 
-         if( count( $questions  ) > 0  ){
+         if (count($questions) > 0) {
 
-             $sensei_question_loop['total']   =  count( $questions );
+             $sensei_question_loop['total']   = count($questions);
              $sensei_question_loop['questions'] = $questions;
              $sensei_question_loop['quiz_id'] = get_the_ID();
 
@@ -1157,9 +1157,9 @@ 
       * @since 1.9.0
       *
       */
-     public static function stop_quiz_questions_loop(){
+     public static function stop_quiz_questions_loop() {
 
-         $sensei_question_loop['total']   =  0;
+         $sensei_question_loop['total']   = 0;
          $sensei_question_loop['questions'] = array();
          $sensei_question_loop['quiz_id'] = '';
 
@@ -1170,7 +1170,7 @@ 
       *
       * @since 1.9.0
       */
-     public static function the_title(){
+     public static function the_title() {
          ?>
          <header>
 
@@ -1180,7 +1180,7 @@ 
                  /**
                   * Filter documented in class-sensei-messages.php the_title
                   */
-                 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
+                 echo apply_filters('sensei_single_title', get_the_title(get_post()), get_post_type(get_the_ID()));
                  ?>
 
              </h1>
@@ -1195,11 +1195,11 @@ 
       *
       * @param $quiz_id
       */
-    public static function  the_user_status_message( $quiz_id ){
+    public static function  the_user_status_message($quiz_id) {
 
-        $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
-        echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
+        $status = Sensei_Utils::sensei_user_quiz_status_message($lesson_id, get_current_user_id());
+        echo '<div class="sensei-message '.$status['box_class'].'">'.$status['message'].'</div>';
 
     }
 
@@ -1210,9 +1210,9 @@ 
       * @since 1.9.0
       * @deprecated
       */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+     public static function deprecate_sensei_quiz_action_buttons_hook() {
 
-         sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
+         sensei_do_deprecated_action('sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
 
      }
 
@@ -1226,50 +1226,50 @@ 
 
          global $post, $current_user;
 
-         $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
-         $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-         $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+         $lesson_id = (int) get_post_meta($post->ID, '_quiz_lesson', true);
+         $lesson_course_id = (int) get_post_meta($lesson_id, '_lesson_course', true);
+         $lesson_prerequisite = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true);
          $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $current_user->ID);
 
          //setup quiz grade
          $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+         if ( ! empty($user_lesson_status)) {
+             $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
          }
 
 
-         if( intval( $lesson_prerequisite ) > 0 ) {
+         if (intval($lesson_prerequisite) > 0) {
 
              // If the user hasn't completed the prereq then hide the current actions
-             $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
+             $show_actions = Sensei_Utils::user_completed_lesson($lesson_prerequisite, $current_user->ID);
 
          }
-         if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+         if ($show_actions && is_user_logged_in() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) {
 
              // Get Reset Settings
-             $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
+             $reset_quiz_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true); ?>
 
              <!-- Action Nonce's -->
              <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_complete_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_quiz_nonce')); ?>" />
              <input type="hidden" name="woothemes_sensei_reset_quiz_nonce" id="woothemes_sensei_reset_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_reset_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_reset_quiz_nonce')); ?>" />
              <input type="hidden" name="woothemes_sensei_save_quiz_nonce" id="woothemes_sensei_save_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_save_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_save_quiz_nonce')); ?>" />
              <!--#end Action Nonce's -->
 
-             <?php if ( '' == $user_quiz_grade) { ?>
+             <?php if ('' == $user_quiz_grade) { ?>
 
-                 <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php  _e( 'Complete Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php  _e('Complete Quiz', 'woothemes-sensei'); ?>"/></span>
 
-                 <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e( 'Save Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e('Save Quiz', 'woothemes-sensei'); ?>"/></span>
 
              <?php } // End If Statement ?>
 
-             <?php if ( isset( $reset_quiz_allowed ) && $reset_quiz_allowed ) { ?>
+             <?php if (isset($reset_quiz_allowed) && $reset_quiz_allowed) { ?>
 
-                 <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e( 'Reset Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e('Reset Quiz', 'woothemes-sensei'); ?>"/></span>
 
              <?php } ?>
 
@@ -1287,13 +1287,13 @@ 
       *
       * @return double $user_quiz_grade
       */
-     public static function get_user_quiz_grade( $lesson_id, $user_id ){
+     public static function get_user_quiz_grade($lesson_id, $user_id) {
 
          // get the quiz grade
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
          $user_quiz_grade = 0;
-         if( isset( $user_lesson_status->comment_ID ) ) {
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+         if (isset($user_lesson_status->comment_ID)) {
+             $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
          }
 
          return (double) $user_quiz_grade;
@@ -1311,13 +1311,13 @@ 
       * @param int $lesson_id
       * @return bool
       */
-     public static function is_reset_allowed( $lesson_id ){
+     public static function is_reset_allowed($lesson_id) {
 
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+         $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+         $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
          //backwards compatibility
-         if( 'on' == $reset_allowed ) {
+         if ('on' == $reset_allowed) {
              $reset_allowed = 1;
          }
 
@@ -1334,4 +1334,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Quiz extends Sensei_Quiz{}
+class WooThemes_Sensei_Quiz extends Sensei_Quiz {}

widgets/widget-woothemes-sensei-course-component.php

Spacing +72 added lines, -72 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.

+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly.

 

 /**

  * Sensei Course Component Widget

@@ -26,30 +26,30 @@ 
 	public function __construct() {

 		/* Widget variable settings. */

 		$this->woo_widget_cssclass = 'widget_sensei_course_component';

-		$this->woo_widget_description = __( 'This widget will output a list of Courses - New, Featured, Free, Paid, Active, Completed.', 'woothemes-sensei' );

+		$this->woo_widget_description = __('This widget will output a list of Courses - New, Featured, Free, Paid, Active, Completed.', 'woothemes-sensei');

 		$this->woo_widget_idbase = 'sensei_course_component';

-		$this->woo_widget_title = __( 'Sensei - Course Component', 'woothemes-sensei' );

+		$this->woo_widget_title = __('Sensei - Course Component', 'woothemes-sensei');

 

 		$this->woo_widget_componentslist = array(

-												'usercourses' => __( 'New Courses', 'woothemes-sensei' ),

-												'featuredcourses' => __( 'Featured Courses', 'woothemes-sensei' ),

-												'activecourses' => __( 'My Active Courses', 'woothemes-sensei' ),

-												'completedcourses' => __( 'My Completed Courses', 'woothemes-sensei' ),

+												'usercourses' => __('New Courses', 'woothemes-sensei'),

+												'featuredcourses' => __('Featured Courses', 'woothemes-sensei'),

+												'activecourses' => __('My Active Courses', 'woothemes-sensei'),

+												'completedcourses' => __('My Completed Courses', 'woothemes-sensei'),

 												);

 

 		// Add support for the WooCommerce shelf.

-		if ( Sensei_WC::is_woocommerce_active() ) {

-			$this->woo_widget_componentslist['freecourses'] = __( 'Free Courses', 'woothemes-sensei' );

-			$this->woo_widget_componentslist['paidcourses'] = __( 'Paid Courses', 'woothemes-sensei' );

+		if (Sensei_WC::is_woocommerce_active()) {

+			$this->woo_widget_componentslist['freecourses'] = __('Free Courses', 'woothemes-sensei');

+			$this->woo_widget_componentslist['paidcourses'] = __('Paid Courses', 'woothemes-sensei');

 		}

 		/* Widget settings. */

-		$widget_ops = array( 'classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description );

+		$widget_ops = array('classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description);

 

 		/* Widget control settings. */

-		$control_ops = array( 'width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase );

+		$control_ops = array('width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase);

 

 		/* Create the widget. */

-		parent::__construct( $this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops );

+		parent::__construct($this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops);

 	} // End __construct()

 

 	/**

@@ -59,44 +59,44 @@ 
 	 * @param  array $instance Widget settings for this instance.

 	 * @return void

 	 */

-	public function widget( $args, $instance ) {

+	public function widget($args, $instance) {

 

-		remove_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );

+		remove_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1);

 

-		if ( in_array( $instance['component'], array_keys( $this->woo_widget_componentslist ) )

-            && ( 'activecourses' == $instance['component'] || 'completedcourses' == $instance['component'] )

-            && !is_user_logged_in() ) {

+		if (in_array($instance['component'], array_keys($this->woo_widget_componentslist))

+            && ('activecourses' == $instance['component'] || 'completedcourses' == $instance['component'])

+            && ! is_user_logged_in()) {

 

 			// No Output

             return;

 

 		} else {

 			/* Our variables from the widget settings. */

-			$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

+			$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);

 

 			/* Before widget (defined by themes). */

 			echo $args['before_widget'];

 

 			/* Display the widget title if one was input (before and after defined by themes). */

-			if ( $title ) { echo $args['before_title'] . $title . $args['after_title']; }

+			if ($title) { echo $args['before_title'].$title.$args['after_title']; }

 

 			/* Widget content. */

 			// Add actions for plugins/themes to hook onto.

-			do_action( $this->woo_widget_cssclass . '_top' );

+			do_action($this->woo_widget_cssclass.'_top');

 

-			if ( in_array( $instance['component'], array_keys( $this->woo_widget_componentslist ) ) ) {

-				$this->load_component( $instance );

+			if (in_array($instance['component'], array_keys($this->woo_widget_componentslist))) {

+				$this->load_component($instance);

 			}

 

 			// Add actions for plugins/themes to hook onto.

-			do_action( $this->woo_widget_cssclass . '_bottom' );

+			do_action($this->woo_widget_cssclass.'_bottom');

 

 			/* After widget (defined by themes). */

 			echo $args['after_widget'];

 

 		} // End If Statement

 

-		add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );

+		add_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1);

 

 	} // End widget()

 

@@ -107,17 +107,17 @@ 
 	 * @param  array $old_instance Previous settings.

 	 * @return array               Updated settings.

 	 */

-	public function update ( $new_instance, $old_instance ) {

+	public function update($new_instance, $old_instance) {

 		$instance = $old_instance;

 

 		/* Strip tags for title and name to remove HTML (important for text inputs). */

-		$instance['title'] = strip_tags( $new_instance['title'] );

+		$instance['title'] = strip_tags($new_instance['title']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['component'] = esc_attr( $new_instance['component'] );

+		$instance['component'] = esc_attr($new_instance['component']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['limit'] = esc_attr( $new_instance['limit'] );

+		$instance['limit'] = esc_attr($new_instance['limit']);

 

 

 		return $instance;

@@ -130,7 +130,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+    public function form($instance) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -140,26 +140,26 @@ 
 						'limit' => 3

 					);

 

-		$instance = wp_parse_args( (array) $instance, $defaults );

+		$instance = wp_parse_args((array) $instance, $defaults);

 ?>

 		<!-- Widget Title: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"  value="<?php echo esc_attr( $instance['title'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>"  value="<?php echo esc_attr($instance['title']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" />

 		</p>

 		<!-- Widget Component: Select Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'component' ) ); ?>"><?php _e( 'Component:', 'woothemes-sensei' ); ?></label>

-			<select name="<?php echo esc_attr( $this->get_field_name( 'component' ) ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'component' ) ); ?>">

-			<?php foreach ( $this->woo_widget_componentslist as $k => $v ) { ?>

-				<option value="<?php echo esc_attr( $k ); ?>"<?php selected( $instance['component'], $k ); ?>><?php echo $v; ?></option>

+			<label for="<?php echo esc_attr($this->get_field_id('component')); ?>"><?php _e('Component:', 'woothemes-sensei'); ?></label>

+			<select name="<?php echo esc_attr($this->get_field_name('component')); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('component')); ?>">

+			<?php foreach ($this->woo_widget_componentslist as $k => $v) { ?>

+				<option value="<?php echo esc_attr($k); ?>"<?php selected($instance['component'], $k); ?>><?php echo $v; ?></option>

 			<?php } ?>

 			</select>

 		</p>

 		<!-- Widget Limit: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>"><?php _e( 'Number of Courses (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'limit' ) ); ?>"  value="<?php echo esc_attr( $instance['limit'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('limit')); ?>"><?php _e('Number of Courses (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('limit')); ?>"  value="<?php echo esc_attr($instance['limit']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('limit')); ?>" />

 		</p>

 

 <?php

@@ -172,28 +172,28 @@ 
 	 * @since  1.0.0

 	 * @return void

 	 */

-	protected function load_component ( $instance ) {

+	protected function load_component($instance) {

 		global  $current_user;

 

 		get_currentuserinfo();

 

 		$course_ids = array();

-		if ( 'activecourses' == esc_attr( $instance['component'] ) ) {

-			$courses = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $current_user->ID, 'type' => 'sensei_course_status', 'status' => 'in-progress' ), true );

+		if ('activecourses' == esc_attr($instance['component'])) {

+			$courses = Sensei_Utils::sensei_check_for_activity(array('user_id' => $current_user->ID, 'type' => 'sensei_course_status', 'status' => 'in-progress'), true);

 			// Need to always return an array, even with only 1 item

-			if ( !is_array($courses) ) {

-				$courses = array( $courses );

+			if ( ! is_array($courses)) {

+				$courses = array($courses);

 			}

-			foreach( $courses AS $course ) {

+			foreach ($courses AS $course) {

 				$course_ids[] = $course->comment_post_ID;

 			}

-		} elseif( 'completedcourses' == esc_attr( $instance['component'] ) ) {

-			$courses = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $current_user->ID, 'type' => 'sensei_course_status', 'status' => 'complete' ), true );

+		} elseif ('completedcourses' == esc_attr($instance['component'])) {

+			$courses = Sensei_Utils::sensei_check_for_activity(array('user_id' => $current_user->ID, 'type' => 'sensei_course_status', 'status' => 'complete'), true);

 			// Need to always return an array, even with only 1 item

-			if ( !is_array($courses) ) {

-				$courses = array( $courses );

+			if ( ! is_array($courses)) {

+				$courses = array($courses);

 			}

-			foreach( $courses AS $course ) {

+			foreach ($courses AS $course) {

 				$course_ids[] = $course->comment_post_ID;

 			}

 		} // End If Statement

@@ -201,19 +201,19 @@ 
 		$posts_array = array();

 

 		// course_query() is buggy, it doesn't honour the 1st arg if includes are provided, so instead slice the includes

-		if ( !empty($instance['limit']) && intval( $instance['limit'] ) >= 1 && intval( $instance['limit'] ) < count($course_ids) ) {

+		if ( ! empty($instance['limit']) && intval($instance['limit']) >= 1 && intval($instance['limit']) < count($course_ids)) {

 

-			$course_ids = array_slice( $course_ids, 0, intval( $instance['limit'] ) ); // This does mean the order by is effectively ignored

+			$course_ids = array_slice($course_ids, 0, intval($instance['limit'])); // This does mean the order by is effectively ignored

 

 		}

 

-        if ( ! empty( $course_ids ) ) {

+        if ( ! empty($course_ids)) {

 

-            $posts_array = Sensei()->course->course_query( intval( $instance['limit'] ), esc_attr( $instance['component'] ), $course_ids );

+            $posts_array = Sensei()->course->course_query(intval($instance['limit']), esc_attr($instance['component']), $course_ids);

 

 		} else {

 

-            if ( 'activecourses' == esc_attr( $instance['component'] ) || 'completedcourses' == esc_attr( $instance['component'] ) ) {

+            if ('activecourses' == esc_attr($instance['component']) || 'completedcourses' == esc_attr($instance['component'])) {

 				$posts_array = array();

 

             } else {

@@ -226,43 +226,43 @@ 
                     'posts_per_page' => $instance['limit'],

                 );

 

-				$posts_array = get_posts( $course_args );

+				$posts_array = get_posts($course_args);

 			}

 

 		} // End If Statement

 

-		if ( count( $posts_array ) > 0 ) { ?>

+		if (count($posts_array) > 0) { ?>

 			<ul>

-			<?php foreach ($posts_array as $post_item){

-		    	$post_id = absint( $post_item->ID );

+			<?php foreach ($posts_array as $post_item) {

+		    	$post_id = absint($post_item->ID);

 		    	$post_title = $post_item->post_title;

-		    	$user_info = get_userdata( absint( $post_item->post_author ) );

-		    	$author_link = get_author_posts_url( absint( $post_item->post_author ) );

+		    	$user_info = get_userdata(absint($post_item->post_author));

+		    	$author_link = get_author_posts_url(absint($post_item->post_author));

 		    	$author_display_name = $user_info->display_name;

 		    	$author_id = $post_item->post_author;

 		    ?>

 		    	<li class="fix">

-		    		<?php do_action( 'sensei_course_image', $post_id ); ?>

-		    		<a href="<?php echo esc_url( get_permalink( $post_id ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a>

+		    		<?php do_action('sensei_course_image', $post_id); ?>

+		    		<a href="<?php echo esc_url(get_permalink($post_id)); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a>

 		    		<br />

-		    		<?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>

-    					<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><a href="<?php echo esc_url( $author_link ); ?>" title="<?php echo esc_attr( $author_display_name ); ?>"><?php echo esc_html( $author_display_name ); ?></a></span>

+		    		<?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?>

+    					<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><a href="<?php echo esc_url($author_link); ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span>

     					<br />

     				<?php } // End If Statement ?>

-    				<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . '&nbsp;' . __( 'Lessons', 'woothemes-sensei' ); ?></span>

+    				<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>

     				<br />

-    				<?php sensei_simple_course_price( $post_id ); ?>

+    				<?php sensei_simple_course_price($post_id); ?>

 		    	</li>

 		    <?php } // End For Loop ?>

-		    <?php if ( 'activecourses' == esc_attr( $instance['component'] ) || 'completedcourses' == esc_attr( $instance['component'] ) ) {

-		    	$my_account_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );

-		    	echo '<li class="my-account fix"><a href="'. esc_url( get_permalink( $my_account_page_id ) ) .'">'.__('My Courses', 'woothemes-sensei').' <span class="meta-nav"></span></a></li>';

+		    <?php if ('activecourses' == esc_attr($instance['component']) || 'completedcourses' == esc_attr($instance['component'])) {

+		    	$my_account_page_id = intval(Sensei()->settings->settings['my_course_page']);

+		    	echo '<li class="my-account fix"><a href="'.esc_url(get_permalink($my_account_page_id)).'">'.__('My Courses', 'woothemes-sensei').' <span class="meta-nav"></span></a></li>';

 		    } // End If Statement ?>

 		</ul>

 		<?php } else {

 			// No posts returned. This means the user either has no active or no completed courses.

-			$course_status = substr( esc_attr( $instance['component'] ) , 0, -7);

-			echo sprintf( __( 'You have no %1s courses.', 'woothemes-sensei' ), $course_status );

+			$course_status = substr(esc_attr($instance['component']), 0, -7);

+			echo sprintf(__('You have no %1s courses.', 'woothemes-sensei'), $course_status);

 		} // End If Statement

 	} // End load_component()

 } // End Class
\ No newline at end of file

includes/shortcodes/class-sensei-shortcode-user-messages.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_user_messages] shortcode. The current users messages.
@@ -29,7 +29,7 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
         $this->setup_messages_query();
 
@@ -40,7 +40,7 @@ 
      *
      * @return mixed
      */
-    public function setup_messages_query(){
+    public function setup_messages_query() {
 
         $user = wp_get_current_user();
 
@@ -59,7 +59,7 @@ 
             ),
         );
 
-        $this->messages_query  = new WP_Query( $args );
+        $this->messages_query = new WP_Query($args);
     }
 
     /**
@@ -67,22 +67,22 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( !is_user_logged_in() ){
+        if ( ! is_user_logged_in()) {
 
-            Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
+            Sensei()->notices->add_notice(__('Please login to view your messages.', 'woothemes-sensei'), 'alert');
 
-        } elseif( 0 == $this->messages_query->post_count ){
+        } elseif (0 == $this->messages_query->post_count) {
 
-            Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
+            Sensei()->notices->add_notice(__('You do not have any messages.', 'woothemes-sensei'), 'alert');
         }
 
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
+        $messages_disabled_in_settings = ! ( ! isset(Sensei()->settings->settings['messages_disable'])
+                                            || ! Sensei()->settings->settings['messages_disable']);
 
         // don't show anything if messages are disable
-        if( $messages_disabled_in_settings ){
+        if ($messages_disabled_in_settings) {
             return '';
         }
 

includes/class-sensei-autoloader.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 /**
  * Sensei Autoloader Class
  *
@@ -27,21 +27,21 @@ 
      * Constructor
      * @since 1.9.0
      */
-    public function __construct(){
+    public function __construct() {
 
         // make sure we do not override an existing autoload function
-        if( function_exists('__autoload') ){
-           spl_autoload_register( '__autoload' );
+        if (function_exists('__autoload')) {
+           spl_autoload_register('__autoload');
         }
 
         // setup a relative path for the current autoload instance
-        $this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
+        $this->include_path = trailingslashit(untrailingslashit(dirname(__FILE__)));
 
         //setup the class file map
         $this->initialize_class_file_map();
 
         // add Sensei custom auto loader
-        spl_autoload_register( array( $this, 'autoload' )  );
+        spl_autoload_register(array($this, 'autoload'));
 
     }
 
@@ -51,7 +51,7 @@ 
      *
      * @since 1.9.0
      */
-    public function initialize_class_file_map(){
+    public function initialize_class_file_map() {
 
         $this->class_file_map = array(
 
@@ -63,8 +63,8 @@ 
             /**
              * Admin
              */
-            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
-            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
+            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php',
+            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php',
 
             /**
              * Shortcodes
@@ -93,38 +93,38 @@ 
     /**
      * Autoload all sensei files as the class names are used.
      */
-    public function autoload( $class ){
+    public function autoload($class) {
 
         // only handle classes with the word `sensei` in it
-        if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
+        if ( ! is_numeric(strpos(strtolower($class), 'sensei'))) {
 
             return;
 
         }
 
         // exit if we didn't provide mapping for this class
-        if( isset( $this->class_file_map[ $class ] ) ){
+        if (isset($this->class_file_map[$class])) {
 
-            $file_location = $this->include_path . $this->class_file_map[ $class ];
-            require_once( $file_location);
+            $file_location = $this->include_path.$this->class_file_map[$class];
+            require_once($file_location);
             return;
 
         }
 
         // check for file in the main includes directory
-        $class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
-        if( file_exists( $class_file_path ) ){
+        $class_file_path = $this->include_path.'class-'.str_replace('_', '-', strtolower($class)).'.php';
+        if (file_exists($class_file_path)) {
 
-            require_once( $class_file_path );
+            require_once($class_file_path);
             return;
         }
 
         // lastly check legacy types
-        $stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
-        $legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
-        if( file_exists( $legacy_class_file_path ) ){
+        $stripped_woothemes_from_class = str_replace('woothemes_', '', strtolower($class)); // remove woothemes
+        $legacy_class_file_path = $this->include_path.'class-'.str_replace('_', '-', strtolower($stripped_woothemes_from_class)).'.php';
+        if (file_exists($legacy_class_file_path)) {
 
-            require_once( $legacy_class_file_path );
+            require_once($legacy_class_file_path);
             return;
         }
 

includes/class-sensei-posttypes.php

Spacing +237 added lines, -237 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Post Types Class
@@ -41,43 +41,43 @@ 
 	 * Constructor
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Setup Post Types
 		$this->labels = array();
         $this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
-		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_multiple_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_sensei_message_post_type' ), 100 );
+		add_action('init', array($this, 'setup_course_post_type'), 100);
+		add_action('init', array($this, 'setup_lesson_post_type'), 100);
+		add_action('init', array($this, 'setup_quiz_post_type'), 100);
+		add_action('init', array($this, 'setup_question_post_type'), 100);
+		add_action('init', array($this, 'setup_multiple_question_post_type'), 100);
+		add_action('init', array($this, 'setup_sensei_message_post_type'), 100);
 
 		// Setup Taxonomies
-		add_action( 'init', array( $this, 'setup_course_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_tag_taxonomy' ), 100 );
+		add_action('init', array($this, 'setup_course_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_quiz_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_lesson_tag_taxonomy'), 100);
 
 		// Load Post Type Objects
-		$default_post_types = array( 'course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages' ) ;
-		$this->load_posttype_objects( $default_post_types );
+		$default_post_types = array('course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages');
+		$this->load_posttype_objects($default_post_types);
 
 		// Admin functions
-		if ( is_admin() ) {
-			$this->set_role_cap_defaults( $default_post_types );
+		if (is_admin()) {
+			$this->set_role_cap_defaults($default_post_types);
 			global $pagenow;
-			if ( ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) ) {
-				add_filter( 'enter_title_here', array( $this, 'enter_title_here' ), 10 );
-				add_filter( 'post_updated_messages', array( $this, 'setup_post_type_messages' ) );
+			if (($pagenow == 'post.php' || $pagenow == 'post-new.php')) {
+				add_filter('enter_title_here', array($this, 'enter_title_here'), 10);
+				add_filter('post_updated_messages', array($this, 'setup_post_type_messages'));
 			} // End If Statement
 		} // End If Statement
 
 		// Add 'Edit Quiz' link to admin bar
-		add_action( 'admin_bar_menu', array( $this, 'quiz_admin_bar_menu' ), 81 );
+		add_action('admin_bar_menu', array($this, 'quiz_admin_bar_menu'), 81);
 
 	} // End __construct()
 
@@ -88,12 +88,12 @@ 
 	 * @param array $posttypes (default: array())
 	 * @return void
 	 */
-	public function load_posttype_objects( $posttypes = array() ) {
+	public function load_posttype_objects($posttypes = array()) {
 
-		foreach ( $posttypes as $posttype_token => $posttype_name ) {
+		foreach ($posttypes as $posttype_token => $posttype_name) {
 
 			// Load the files
-			$class_name = 'WooThemes_Sensei_' . $posttype_name;
+			$class_name = 'WooThemes_Sensei_'.$posttype_name;
 			$this->$posttype_token = new $class_name();
 			$this->$posttype_token->token = $posttype_token;
 
@@ -107,10 +107,10 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_course_post_type () {
+	public function setup_course_post_type() {
 
 		$args = array(
-		    'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
+		    'labels'              => $this->create_post_type_labels($this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu']),
 		    'public'              => true,
 		    'publicly_queryable'  => true,
 		    'show_ui'             => true,
@@ -118,7 +118,7 @@ 
 		    'show_in_admin_bar'   => true,
 		    'query_var'           => true,
 		    'rewrite'             => array(
-                'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_course_slug', _x('course', 'post type single url base', 'woothemes-sensei'))),
                 'with_front' => true,
                 'feeds' => true,
                 'pages' => true
@@ -128,7 +128,7 @@ 
             'has_archive'         => $this->get_course_post_type_archive_slug(),
 		    'hierarchical'        => false,
 		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+		    'supports'            => array('title', 'editor', 'excerpt', 'thumbnail')
 		);
 
         /**
@@ -137,7 +137,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
+		register_post_type('course', apply_filters('sensei_register_post_type_course', $args));
 
 	} // End setup_course_post_type()
 
@@ -156,17 +156,17 @@ 
      *
      * @return false|string
      */
-    public function get_course_post_type_archive_slug(){
+    public function get_course_post_type_archive_slug() {
 
-        $settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
+        $settings_course_page = get_post(Sensei()->settings->get('course_page'));
 
         // for a valid post that doesn't have any of the old short codes set the archive the same
         // as the page URI
-        if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
+        if (is_a($settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes($settings_course_page->post_content)) {
 
-             return get_page_uri( $settings_course_page->ID );
+             return get_page_uri($settings_course_page->ID);
 
-        }else{
+        } else {
 
             return 'courses';
 
@@ -184,12 +184,12 @@ 
      *
      * @return bool
      */
-    public function has_old_shortcodes( $content ){
+    public function has_old_shortcodes($content) {
 
-        return  ( has_shortcode( $content, 'newcourses')
-        || has_shortcode( $content, 'featuredcourses')
-        || has_shortcode( $content, 'freecourses')
-        || has_shortcode( $content, 'paidcourses') );
+        return  (has_shortcode($content, 'newcourses')
+        || has_shortcode($content, 'featuredcourses')
+        || has_shortcode($content, 'freecourses')
+        || has_shortcode($content, 'paidcourses'));
 
     }// end has old shortcodes
 
@@ -200,27 +200,27 @@ 
 	 * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_lesson_post_type () {
+	public function setup_lesson_post_type() {
 
 
-		$supports_array = array( 'title', 'editor', 'excerpt', 'thumbnail', 'page-attributes' );
+		$supports_array = array('title', 'editor', 'excerpt', 'thumbnail', 'page-attributes');
 		$allow_comments = false;
-		if ( isset( Sensei()->settings->settings[ 'lesson_comments' ] ) ) {
-			$allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
+		if (isset(Sensei()->settings->settings['lesson_comments'])) {
+			$allow_comments = Sensei()->settings->settings['lesson_comments'];
 		} // End If Statement
-		if ( $allow_comments ) {
-			array_push( $supports_array, 'comments' );
+		if ($allow_comments) {
+			array_push($supports_array, 'comments');
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu']),
 		    'public' => true,
 		    'publicly_queryable' => true,
 		    'show_ui' => true,
 		    'show_in_menu' => true,
 		    'query_var' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_lesson_slug', _x('lesson', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -239,7 +239,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
+		register_post_type('lesson', apply_filters('sensei_register_post_type_lesson', $args));
 
 	} // End setup_lesson_post_type()
 
@@ -249,7 +249,7 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_quiz_post_type () {
+	public function setup_quiz_post_type() {
 
 
 		$args = array(
@@ -266,7 +266,7 @@ 
 		    'query_var' => true,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_quiz_slug', _x('quiz', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -276,7 +276,7 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+		    'supports' => array('')
 		);
 
         /**
@@ -285,7 +285,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
+		register_post_type('quiz', apply_filters('sensei_register_post_type_quiz', $args));
 
 	} // End setup_quiz_post_type()
 
@@ -295,10 +295,10 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_question_post_type () {
+	public function setup_question_post_type() {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu']),
 		    'public' => false,
 		    'publicly_queryable' => true,
 		    'show_ui' => true,
@@ -307,7 +307,7 @@ 
 		    'query_var' => true,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_question_slug', _x('question', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -317,7 +317,7 @@ 
 		    'has_archive' => true,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+		    'supports' => array('title')
 		);
 
         /**
@@ -326,7 +326,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
+		register_post_type('question', apply_filters('sensei_register_post_type_question', $args));
 
 	} // End setup_question_post_type()
 
@@ -335,10 +335,10 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_multiple_question_post_type () {
+	public function setup_multiple_question_post_type() {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu']),
 		    'public' => false,
 		    'publicly_queryable' => false,
 		    'show_ui' => false,
@@ -347,7 +347,7 @@ 
 		    'query_var' => false,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_multiple_question_slug', _x('multiple_question', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  false,
                 'feeds' => false,
                 'pages' => false
@@ -357,10 +357,10 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+		    'supports' => array('title', 'custom-fields')
 		);
 
-		register_post_type( 'multiple_question', $args );
+		register_post_type('multiple_question', $args);
 	} // End setup_multiple_question_post_type()
 
 	/**
@@ -368,13 +368,13 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_sensei_message_post_type () {
+	public function setup_sensei_message_post_type() {
 
 
-		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
+		if ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable']) {
 
 			$args = array(
-			    'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
+			    'labels' => $this->create_post_type_labels($this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu']),
 			    'public' => true,
 			    'publicly_queryable' => true,
 			    'show_ui' => true,
@@ -383,7 +383,7 @@ 
 			    'query_var' => true,
 			    'exclude_from_search' => true,
 			    'rewrite' => array(
-                    'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                    'slug' => esc_attr(apply_filters('sensei_messages_slug', _x('messages', 'post type single slug', 'woothemes-sensei'))),
                     'with_front' =>  false,
                     'feeds' => false,
                     'pages' => true
@@ -393,7 +393,7 @@ 
 			    'has_archive' => true,
 			    'hierarchical' => false,
 			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+			    'supports' => array('title', 'editor', 'comments'),
 			);
 
             /**
@@ -402,7 +402,7 @@ 
              * @since 1.9.0
              * @param array $args
              */
-			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
+			register_post_type('sensei_message', apply_filters('sensei_register_post_type_sensei_message', $args));
 		}
 	} // End setup_sensei_message_post_type()
 
@@ -411,20 +411,20 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	public function setup_course_category_taxonomy () {
+	public function setup_course_category_taxonomy() {
 		// "Course Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Course Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Course Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Course Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Course Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Course Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Course Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Course Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Course Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Course Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Course Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Course Categories', 'woothemes-sensei' ),
+			'name' => _x('Course Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Course Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Course Categories', 'woothemes-sensei'),
+			'all_items' => __('All Course Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Course Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Course Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Course Category', 'woothemes-sensei'),
+			'update_item' => __('Update Course Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Course Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Course Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Course Categories', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -439,10 +439,10 @@ 
                 'edit_terms'   => 'edit_courses',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_courses',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_course_category_slug', _x( 'course-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_course_category_slug', _x('course-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'course-category', array( 'course' ), $args );
+		register_taxonomy('course-category', array('course'), $args);
 
 	} // End setup_course_category_taxonomy()
 
@@ -451,20 +451,20 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_quiz_type_taxonomy () {
+	public function setup_quiz_type_taxonomy() {
 		// "Quiz Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Quiz Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Quiz Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Quiz Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Quiz Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Quiz Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Quiz Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Quiz Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Quiz Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Quiz Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Quiz Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Quiz Types', 'woothemes-sensei' ),
+			'name' => _x('Quiz Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Quiz Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Quiz Types', 'woothemes-sensei'),
+			'all_items' => __('All Quiz Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Quiz Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Quiz Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Quiz Type', 'woothemes-sensei'),
+			'update_item' => __('Update Quiz Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Quiz Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Quiz Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Quiz Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -475,10 +475,10 @@ 
 			'query_var' => true,
 			'show_in_nav_menus' => false,
             'public' => false,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_quiz_type_slug', _x('quiz-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'quiz-type', array( 'quiz' ), $args );
+		register_taxonomy('quiz-type', array('quiz'), $args);
 	} // End setup_quiz_type_taxonomy()
 
 	/**
@@ -486,20 +486,20 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_type_taxonomy () {
+	public function setup_question_type_taxonomy() {
 		// "Question Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Question Types', 'woothemes-sensei' ),
+			'name' => _x('Question Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Types', 'woothemes-sensei'),
+			'all_items' => __('All Question Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Type', 'woothemes-sensei'),
+			'update_item' => __('Update Question Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Question Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -511,10 +511,10 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_type_slug', _x( 'question-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_type_slug', _x('question-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-type', array( 'question' ), $args );
+		register_taxonomy('question-type', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -522,20 +522,20 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_category_taxonomy () {
+	public function setup_question_category_taxonomy() {
 		// "Question Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Categories', 'woothemes-sensei' ),
+			'name' => _x('Question Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Categories', 'woothemes-sensei'),
+			'all_items' => __('All Question Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Category', 'woothemes-sensei'),
+			'update_item' => __('Update Question Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Categories', 'woothemes-sensei'),
 		);
 
 		$args = array(
@@ -551,10 +551,10 @@ 
                 'edit_terms'   => 'edit_questions',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_questions',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_category_slug', _x( 'question-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_category_slug', _x('question-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-category', array( 'question' ), $args );
+		register_taxonomy('question-category', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -562,20 +562,20 @@ 
 	 * @since  1.5.0
 	 * @return void
 	 */
-	public function setup_lesson_tag_taxonomy () {
+	public function setup_lesson_tag_taxonomy() {
 		// "Lesson Tags" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Lesson Tags', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Lesson Tag', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Lesson Tags', 'woothemes-sensei' ),
-			'all_items' => __( 'All Lesson Tags', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Tag', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Tag:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Lesson Tag', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Lesson Tag', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Lesson Tag', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Tag Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Lesson Tags', 'woothemes-sensei' )
+			'name' => _x('Lesson Tags', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Lesson Tag', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Lesson Tags', 'woothemes-sensei'),
+			'all_items' => __('All Lesson Tags', 'woothemes-sensei'),
+			'parent_item' => __('Parent Tag', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Tag:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Lesson Tag', 'woothemes-sensei'),
+			'update_item' => __('Update Lesson Tag', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Lesson Tag', 'woothemes-sensei'),
+			'new_item_name' => __('New Tag Name', 'woothemes-sensei'),
+			'menu_name' => __('Lesson Tags', 'woothemes-sensei')
 		);
 
 		$args = array(
@@ -589,10 +589,10 @@ 
                 'edit_terms'   => 'edit_lessons',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_lessons',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_lesson_tag_slug', _x( 'lesson-tag', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_lesson_tag_slug', _x('lesson-tag', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'lesson-tag', array( 'lesson' ), $args );
+		register_taxonomy('lesson-tag', array('lesson'), $args);
 	} // End setup_lesson_tag_taxonomy()
 
 	/**
@@ -600,15 +600,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_post_type_labels_base () {
-		$this->labels = array( 'course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array() );
+	private function setup_post_type_labels_base() {
+		$this->labels = array('course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array());
 
-		$this->labels['course'] = array( 'singular' => __( 'Course', 'woothemes-sensei' ), 'plural' => __( 'Courses', 'woothemes-sensei' ), 'menu' => __( 'Courses', 'woothemes-sensei' ) );
-		$this->labels['lesson'] = array( 'singular' => __( 'Lesson', 'woothemes-sensei' ), 'plural' => __( 'Lessons', 'woothemes-sensei' ), 'menu' => __( 'Lessons', 'woothemes-sensei' ) );
-		$this->labels['quiz'] = array( 'singular' => __( 'Quiz', 'woothemes-sensei' ), 'plural' => __( 'Quizzes', 'woothemes-sensei' ), 'menu' => __( 'Quizzes', 'woothemes-sensei' ) );
-		$this->labels['question'] = array( 'singular' => __( 'Question', 'woothemes-sensei' ), 'plural' => __( 'Questions', 'woothemes-sensei' ), 'menu' => __( 'Questions', 'woothemes-sensei' ) );
-		$this->labels['multiple_question'] = array( 'singular' => __( 'Multiple Question', 'woothemes-sensei' ), 'plural' => __( 'Multiple Questions', 'woothemes-sensei' ), 'menu' => __( 'Multiple Questions', 'woothemes-sensei' ) );
-		$this->labels['sensei_message'] = array( 'singular' => __( 'Message', 'woothemes-sensei' ), 'plural' => __( 'Messages', 'woothemes-sensei' ), 'menu' => __( 'Messages', 'woothemes-sensei' ) );
+		$this->labels['course'] = array('singular' => __('Course', 'woothemes-sensei'), 'plural' => __('Courses', 'woothemes-sensei'), 'menu' => __('Courses', 'woothemes-sensei'));
+		$this->labels['lesson'] = array('singular' => __('Lesson', 'woothemes-sensei'), 'plural' => __('Lessons', 'woothemes-sensei'), 'menu' => __('Lessons', 'woothemes-sensei'));
+		$this->labels['quiz'] = array('singular' => __('Quiz', 'woothemes-sensei'), 'plural' => __('Quizzes', 'woothemes-sensei'), 'menu' => __('Quizzes', 'woothemes-sensei'));
+		$this->labels['question'] = array('singular' => __('Question', 'woothemes-sensei'), 'plural' => __('Questions', 'woothemes-sensei'), 'menu' => __('Questions', 'woothemes-sensei'));
+		$this->labels['multiple_question'] = array('singular' => __('Multiple Question', 'woothemes-sensei'), 'plural' => __('Multiple Questions', 'woothemes-sensei'), 'menu' => __('Multiple Questions', 'woothemes-sensei'));
+		$this->labels['sensei_message'] = array('singular' => __('Message', 'woothemes-sensei'), 'plural' => __('Messages', 'woothemes-sensei'), 'menu' => __('Messages', 'woothemes-sensei'));
 
 	} // End setup_post_type_labels_base()
 
@@ -620,21 +620,21 @@ 
 	 * @param  string $menu     The menu item label
 	 * @return array            An array of the labels to be used
 	 */
-	private function create_post_type_labels ( $singular, $plural, $menu ) {
+	private function create_post_type_labels($singular, $plural, $menu) {
 		$labels = array(
-		    'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
-		    'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
-		    'add_new' => __( 'Add New', 'woothemes-sensei' ),
-		    'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
-		    'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
-		    'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
-		    'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
-		    'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
-		    'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
-		    'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+		    'name' => sprintf(_x('%s', 'post type general name', 'woothemes-sensei'), $plural),
+		    'singular_name' => sprintf(_x('%s', 'post type singular name', 'woothemes-sensei'), $singular),
+		    'add_new' => __('Add New', 'woothemes-sensei'),
+		    'add_new_item' => sprintf(__('Add New %s', 'woothemes-sensei'), $singular),
+		    'edit_item' => sprintf(__('Edit %s', 'woothemes-sensei'), $singular),
+		    'new_item' => sprintf(__('New %s', 'woothemes-sensei'), $singular),
+		    'all_items' => sprintf(__('All %s', 'woothemes-sensei'), $plural),
+		    'view_item' => sprintf(__('View %s', 'woothemes-sensei'), $singular),
+		    'search_items' => sprintf(__('Search %s', 'woothemes-sensei'), $plural),
+		    'not_found' =>  sprintf(__('No %s found', 'woothemes-sensei'), mb_strtolower($plural, 'UTF-8')),
+		    'not_found_in_trash' => sprintf(__('No %s found in Trash', 'woothemes-sensei'), mb_strtolower($plural, 'UTF-8')),
 		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+		    'menu_name' => sprintf(__('%s', 'woothemes-sensei'), $menu)
 		  );
 
 		return $labels;
@@ -646,14 +646,14 @@ 
 	 * @param  array $messages The existing array of messages for post types.
 	 * @return array           The modified array of messages for post types.
 	 */
-	public function setup_post_type_messages ( $messages ) {
+	public function setup_post_type_messages($messages) {
 		global $post, $post_ID;
 
-		$messages['course'] = $this->create_post_type_messages( 'course' );
-		$messages['lesson'] = $this->create_post_type_messages( 'lesson' );
-		$messages['quiz'] = $this->create_post_type_messages( 'quiz' );
-		$messages['question'] = $this->create_post_type_messages( 'question' );
-		$messages['multiple_question'] = $this->create_post_type_messages( 'multiple_question' );
+		$messages['course'] = $this->create_post_type_messages('course');
+		$messages['lesson'] = $this->create_post_type_messages('lesson');
+		$messages['quiz'] = $this->create_post_type_messages('quiz');
+		$messages['question'] = $this->create_post_type_messages('question');
+		$messages['multiple_question'] = $this->create_post_type_messages('multiple_question');
 
 		return $messages;
 	} // End setup_post_type_messages()
@@ -664,23 +664,23 @@ 
 	 * @param  string $post_type The post type for which to create messages.
 	 * @return array            An array of messages (empty array if the post type isn't one we're looking to work with).
 	 */
-	private function create_post_type_messages ( $post_type ) {
+	private function create_post_type_messages($post_type) {
 		global $post, $post_ID;
 
-		if ( ! isset( $this->labels[$post_type] ) ) { return array(); }
+		if ( ! isset($this->labels[$post_type])) { return array(); }
 
 		$messages = array(
 			0 => '',
-			1 => sprintf( __( '%1$s updated. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			2 => __( 'Custom field updated.' , 'woothemes-sensei' ),
-			3 => __( 'Custom field deleted.' , 'woothemes-sensei' ),
-			4 => sprintf( __( '%1$s updated.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			5 => isset( $_GET['revision'] ) ? sprintf( __( '%1$s restored to revision from %2$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6 => sprintf( __( '%1$s published. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			7 => sprintf( __( '%1$s saved.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			8 => sprintf( __( '%1$s submitted. %2$sPreview %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', '</a>' ),
-			9 => sprintf( __( '%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<strong>' . date_i18n( __( 'M j, Y @ G:i' , 'woothemes-sensei' ), strtotime( $post->post_date ) ) . '</strong>', '<a target="_blank" href="' . esc_url( get_permalink( $post_ID ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
-			10 => sprintf( __( '%1$s draft updated. %2$sPreview %3$s%4$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
+			1 => sprintf(__('%1$s updated. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			2 => __('Custom field updated.', 'woothemes-sensei'),
+			3 => __('Custom field deleted.', 'woothemes-sensei'),
+			4 => sprintf(__('%1$s updated.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			5 => isset($_GET['revision']) ? sprintf(__('%1$s restored to revision from %2$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6 => sprintf(__('%1$s published. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			7 => sprintf(__('%1$s saved.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			8 => sprintf(__('%1$s submitted. %2$sPreview %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', '</a>'),
+			9 => sprintf(__('%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<strong>'.date_i18n(__('M j, Y @ G:i', 'woothemes-sensei'), strtotime($post->post_date)).'</strong>', '<a target="_blank" href="'.esc_url(get_permalink($post_ID)).'">', $this->labels[$post_type]['singular'], '</a>'),
+			10 => sprintf(__('%1$s draft updated. %2$sPreview %3$s%4$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', $this->labels[$post_type]['singular'], '</a>'),
 		);
 
 		return $messages;
@@ -693,11 +693,11 @@ 
 	 * @param  string $title
 	 * @return string $title
 	 */
-	public function enter_title_here ( $title ) {
-		if ( get_post_type() == 'course' ) {
-			$title = __( 'Enter a title for this course here', 'woothemes-sensei' );
-		} elseif ( get_post_type() == 'lesson' ) {
-			$title = __( 'Enter a title for this lesson here', 'woothemes-sensei' );
+	public function enter_title_here($title) {
+		if (get_post_type() == 'course') {
+			$title = __('Enter a title for this course here', 'woothemes-sensei');
+		} elseif (get_post_type() == 'lesson') {
+			$title = __('Enter a title for this lesson here', 'woothemes-sensei');
 		}
 
 		return $title;
@@ -711,60 +711,60 @@ 
 	 * @param array $post_types
 	 * @return void
 	 */
-	public function set_role_cap_defaults( $post_types = array() ) {
+	public function set_role_cap_defaults($post_types = array()) {
 
-		foreach ( $post_types as $post_type_item => $post_type_name ) {
+		foreach ($post_types as $post_type_item => $post_type_name) {
 			// Super Admin
-			$this->role_caps[] =  array(	'administrator' 	=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+			$this->role_caps[] = array('administrator' 	=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s',
 																			'manage_sensei',
-																			'manage_sensei_grades' ),
-											'editor' 			=> array(	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																		 	'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+																			'manage_sensei_grades'),
+											'editor' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																		 	'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'author' 			=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'author' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'contributor' 		=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'contributor' 		=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's' ),
-											'subscriber' 		=> array( 	'read' )
+																			'delete_'.$post_type_item.'s'),
+											'subscriber' 		=> array('read')
 
 										);
 		} // End For Loop
@@ -778,16 +778,16 @@ 
      * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
-	public function quiz_admin_bar_menu( $bar ) {
-		if ( is_single() && 'quiz' == get_queried_object()->post_type ) {
-			$lesson_id = get_post_meta( get_queried_object()->ID, '_quiz_lesson', true );
-			if ( $lesson_id ) {
+	public function quiz_admin_bar_menu($bar) {
+		if (is_single() && 'quiz' == get_queried_object()->post_type) {
+			$lesson_id = get_post_meta(get_queried_object()->ID, '_quiz_lesson', true);
+			if ($lesson_id) {
 				$object_type = get_post_type_object('quiz');
-				$bar->add_menu( array(
+				$bar->add_menu(array(
 					'id' => 'edit',
 					'title' => $object_type->labels->edit_item,
-					'href' => get_edit_post_link( $lesson_id ),
-				) );
+					'href' => get_edit_post_link($lesson_id),
+				));
 			}
 		}
 	}
@@ -799,4 +799,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_PostTypes extends Sensei_PostTypes{}
+class WooThemes_Sensei_PostTypes extends Sensei_PostTypes {}

includes/class-sensei-updates.php

Spacing +481 added lines, -481 removed lines

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

includes/class-sensei-settings.php

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /*
  * Sensei Settings Class
@@ -20,18 +20,18 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function __construct () {
+	public function __construct() {
 	    parent::__construct(); // Required in extended classes.
 
         $this->token = 'woothemes-sensei-settings';
-        add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action('init', array(__CLASS__, 'flush_rewrite_rules'));
 
         // Setup Admin Settings data
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $this->has_tabs 	= true;
-            $this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->menu_label	= __( 'Settings', 'woothemes-sensei' );
+            $this->name = __('Sensei Settings', 'woothemes-sensei');
+            $this->menu_label = __('Settings', 'woothemes-sensei');
             $this->page_slug	= 'woothemes-sensei-settings';
 
         } // End If Statement
@@ -48,11 +48,11 @@ 
      * @param string $setting_name
      * @return mixed
      */
-    public function get( $setting_name ){
+    public function get($setting_name) {
 
-        if( isset( $this->settings[ $setting_name ] ) ){
+        if (isset($this->settings[$setting_name])) {
 
-            return $this->settings[ $setting_name ];
+            return $this->settings[$setting_name];
 
         }
 
@@ -65,17 +65,17 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function register_settings_screen () {
+	public function register_settings_screen() {
 
 		$this->settings_version = Sensei()->version; // Use the global plugin version on this settings screen.
-		$hook = add_submenu_page( 'sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array( $this, 'settings_screen' ) );
+		$hook = add_submenu_page('sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array($this, 'settings_screen'));
 		$this->hook = $hook;
 
-		if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-			add_action( 'admin_notices', array( $this, 'settings_errors' ) );
-			add_action( 'admin_notices', array( $this, 'language_pack_notices' ) );
-			add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-			add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+			add_action('admin_notices', array($this, 'settings_errors'));
+			add_action('admin_notices', array($this, 'language_pack_notices'));
+			add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+			add_action('admin_print_styles', array($this, 'enqueue_styles'));
 		}
 	} // End register_settings_screen()
 
@@ -85,49 +85,49 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function init_sections () {
+	public function init_sections() {
 		$sections = array();
 
 		$sections['default-settings'] = array(
-			'name' 			=> __( 'General', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to the entire plugin.', 'woothemes-sensei' )
+			'name' 			=> __('General', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to the entire plugin.', 'woothemes-sensei')
 		);
 
 		$sections['course-settings'] = array(
-			'name' 			=> __( 'Courses', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Courses.', 'woothemes-sensei' )
+			'name' 			=> __('Courses', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Courses.', 'woothemes-sensei')
 		);
 
 		$sections['lesson-settings'] = array(
-			'name' 			=> __( 'Lessons', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Lessons.', 'woothemes-sensei' )
+			'name' 			=> __('Lessons', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Lessons.', 'woothemes-sensei')
 		);
 
 		$sections['email-notification-settings'] = array(
-			'name' 			=> __( 'Email Notifications', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for email notifications sent from your site.', 'woothemes-sensei' )
+			'name' 			=> __('Email Notifications', 'woothemes-sensei'),
+			'description'	=> __('Settings for email notifications sent from your site.', 'woothemes-sensei')
 		);
 
 		$sections['learner-profile-settings'] = array(
-			'name' 			=> __( 'Learner Profiles', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for public Learner Profiles.', 'woothemes-sensei' )
+			'name' 			=> __('Learner Profiles', 'woothemes-sensei'),
+			'description'	=> __('Settings for public Learner Profiles.', 'woothemes-sensei')
 		);
 
-		if ( Sensei_WC::is_woocommerce_present() ) {
+		if (Sensei_WC::is_woocommerce_present()) {
 			$sections['woocommerce-settings'] = array(
-				'name' 			=> __( 'WooCommerce', 'woothemes-sensei' ),
-				'description'	=> __( 'Optional settings for WooCommerce functions.', 'woothemes-sensei' )
+				'name' 			=> __('WooCommerce', 'woothemes-sensei'),
+				'description'	=> __('Optional settings for WooCommerce functions.', 'woothemes-sensei')
 			);
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$sections['language-settings'] = array(
-				'name' 			=> __( 'Language', 'woothemes-sensei' ),
-				'description'	=> __( 'Language options.', 'woothemes-sensei' )
+				'name' 			=> __('Language', 'woothemes-sensei'),
+				'description'	=> __('Language options.', 'woothemes-sensei')
 			);
 		}
 
-		$this->sections = apply_filters( 'sensei_settings_tabs', $sections );
+		$this->sections = apply_filters('sensei_settings_tabs', $sections);
 	} // End init_sections()
 
 	/**
@@ -137,71 +137,71 @@ 
 	 * @uses   Sensei_Utils::get_slider_types()
 	 * @return void
 	 */
-	public function init_fields () {
+	public function init_fields() {
 		global $pagenow;
 
 		$pages_array = $this->pages_array();
-		$posts_per_page_array = array( '0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20' );
-		$complete_settings = array( 'passed' => __( 'Once all the course lessons have been completed', 'woothemes-sensei' ), 'complete' => __( 'At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei' ) );
-		$course_display_settings = array( 'excerpt' => __( 'Course Excerpt', 'woothemes-sensei' ), 'full' => __( 'Full Course Content', 'woothemes-sensei' ) );
+		$posts_per_page_array = array('0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20');
+		$complete_settings = array('passed' => __('Once all the course lessons have been completed', 'woothemes-sensei'), 'complete' => __('At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei'));
+		$course_display_settings = array('excerpt' => __('Course Excerpt', 'woothemes-sensei'), 'full' => __('Full Course Content', 'woothemes-sensei'));
 
 	    $fields = array();
 
 		$fields['access_permission'] = array(
-								'name' => __( 'Access Permissions', 'woothemes-sensei' ),
-								'description' => __( 'Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei' ),
+								'name' => __('Access Permissions', 'woothemes-sensei'),
+								'description' => __('Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'default-settings'
 								);
 
 		$fields['messages_disable'] = array(
-								'name' => __( 'Disable Private Messages', 'woothemes-sensei' ),
-								'description' => __( 'Disable the private message functions between learners and teachers.', 'woothemes-sensei' ),
+								'name' => __('Disable Private Messages', 'woothemes-sensei'),
+								'description' => __('Disable the private message functions between learners and teachers.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['course_page'] = array(
-								'name' => __( 'Course Archive Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_courses_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_courses_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['my_course_page'] = array(
-								'name' => __( 'My Courses Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei' ),
+								'name' => __('My Courses Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_user_dashboard_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_user_dashboard_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['placeholder_images_enable'] = array(
-								'name' => __( 'Use placeholder images', 'woothemes-sensei' ),
-								'description' => __( 'Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei' ),
+								'name' => __('Use placeholder images', 'woothemes-sensei'),
+								'description' => __('Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['styles_disable'] = array(
-								'name' => __( 'Disable Sensei Styles', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Styles', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['js_disable'] = array(
-								'name' => __( 'Disable Sensei Javascript', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Javascript', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
@@ -210,8 +210,8 @@ 
     	// Course Settings
 
     	$fields['course_completion'] = array(
-								'name' => __( 'Courses are complete:', 'woothemes-sensei' ),
-								'description' => __( 'This will determine when courses are marked as complete.', 'woothemes-sensei' ),
+								'name' => __('Courses are complete:', 'woothemes-sensei'),
+								'description' => __('This will determine when courses are marked as complete.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'passed',
 								'section' => 'course-settings',
@@ -220,16 +220,16 @@ 
 								);
 
     	$fields['course_author'] = array(
-								'name' => __( 'Display Course Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei' ),
+								'name' => __('Display Course Author', 'woothemes-sensei'),
+								'description' => __('Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['my_course_amount'] = array(
-								'name' => __( 'My Courses Pagination', 'woothemes-sensei' ),
-								'description' => __( 'The number of courses to output for the my courses page.', 'woothemes-sensei' ),
+								'name' => __('My Courses Pagination', 'woothemes-sensei'),
+								'description' => __('The number of courses to output for the my courses page.', 'woothemes-sensei'),
 								'type' => 'range',
 								'default' => '0',
 								'section' => 'course-settings',
@@ -238,16 +238,16 @@ 
 								);
 
 		$fields['course_archive_image_enable'] = array(
-								'name' => __( 'Course Archive Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_image_width'] = array(
-								'name' => __( 'Image Width - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Archive', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -255,8 +255,8 @@ 
 								);
 
 		$fields['course_archive_image_height'] = array(
-								'name' => __( 'Image Height - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Archive', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -264,24 +264,24 @@ 
 								);
 
 		$fields['course_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Archive', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Archive', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_enable'] = array(
-								'name' => __( 'Single Course Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Single Course Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -289,8 +289,8 @@ 
 								);
 
 		$fields['course_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -298,16 +298,16 @@ 
 								);
 
 		$fields['course_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_content_display'] = array(
-								'name' => __( 'Single Course page displays:', 'woothemes-sensei' ),
-								'description' => __( 'Determines what content to display on the single course page.', 'woothemes-sensei' ),
+								'name' => __('Single Course page displays:', 'woothemes-sensei'),
+								'description' => __('Determines what content to display on the single course page.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'excerpt',
 								'section' => 'course-settings',
@@ -316,18 +316,18 @@ 
 								);
 
 		$fields['course_archive_featured_enable'] = array(
-								'name' => __( 'Featured Courses Panel', 'woothemes-sensei' ),
-								'description' => __( 'Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Featured Courses Panel', 'woothemes-sensei'),
+								'description' => __('Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_more_link_text'] = array(
-								'name' => __( 'More link text', 'woothemes-sensei' ),
-								'description' => __( 'The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei' ),
+								'name' => __('More link text', 'woothemes-sensei'),
+								'description' => __('The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => __ ( 'More', 'woothemes-sensei' ),
+								'default' => __('More', 'woothemes-sensei'),
 								'section' => 'course-settings',
 								'required' => 0
 								);
@@ -335,32 +335,32 @@ 
 		// Lesson Settings
 
 		$fields['lesson_comments'] = array(
-								'name' => __( 'Allow Comments for Lessons', 'woothemes-sensei' ),
-								'description' => __( 'This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei' ),
+								'name' => __('Allow Comments for Lessons', 'woothemes-sensei'),
+								'description' => __('This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_author'] = array(
-								'name' => __( 'Display Lesson Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei' ),
+								'name' => __('Display Lesson Author', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['course_lesson_image_enable'] = array(
-								'name' => __( 'Course Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Course Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_archive_image_width'] = array(
-								'name' => __( 'Image Width - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -368,8 +368,8 @@ 
 								);
 
 		$fields['lesson_archive_image_height'] = array(
-								'name' => __( 'Image Height - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -377,24 +377,24 @@ 
 								);
 
 		$fields['lesson_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Course Lessons', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Course Lessons', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_enable'] = array(
-								'name' => __( 'Single Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei' ),
+								'name' => __('Single Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -402,8 +402,8 @@ 
 								);
 
 		$fields['lesson_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -411,8 +411,8 @@ 
 								);
 
 		$fields['lesson_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
@@ -420,20 +420,20 @@ 
 
 		// Learner Profile settings
 
-		$profile_url_base = apply_filters( 'sensei_learner_profiles_url_base', __( 'learner', 'woothemes-sensei') );
-		$profile_url_example = trailingslashit( get_site_url() ) . $profile_url_base . '/%username%';
+		$profile_url_base = apply_filters('sensei_learner_profiles_url_base', __('learner', 'woothemes-sensei'));
+		$profile_url_example = trailingslashit(get_site_url()).$profile_url_base.'/%username%';
 
 		$fields['learner_profile_enable'] = array(
-							'name' => __( 'Public learner profiles', 'woothemes-sensei' ),
-							'description' => sprintf( __( 'Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei' ), $profile_url_example ),
+							'name' => __('Public learner profiles', 'woothemes-sensei'),
+							'description' => sprintf(__('Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei'), $profile_url_example),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
 							);
 
 		$fields['learner_profile_show_courses'] = array(
-							'name' => __( 'Show learner\'s courses', 'woothemes-sensei' ),
-							'description' => __( 'Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei' ),
+							'name' => __('Show learner\'s courses', 'woothemes-sensei'),
+							'description' => __('Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei'),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
@@ -442,70 +442,70 @@ 
 		// Email notifications
 
 		$learner_email_options = array(
-			'learner-graded-quiz' => __( 'Their quiz is graded (auto and manual grading)', 'woothemes-sensei' ),
-			'learner-completed-course' => __( 'They complete a course', 'woothemes-sensei' ),
+			'learner-graded-quiz' => __('Their quiz is graded (auto and manual grading)', 'woothemes-sensei'),
+			'learner-completed-course' => __('They complete a course', 'woothemes-sensei'),
 		);
 
 		$teacher_email_options = array(
-            'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
-            'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
-            'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
-            'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
-			'teacher-new-message' => __( 'A learner sends a private message to a teacher', 'woothemes-sensei' ),
+            'teacher-started-course' => __('A learner starts their course', 'woothemes-sensei'),
+            'teacher-completed-course' => __('A learner completes their course', 'woothemes-sensei'),
+            'teacher-completed-lesson' => __('A learner completes a lesson', 'woothemes-sensei'),
+            'teacher-quiz-submitted' => __('A learner submits a quiz for grading', 'woothemes-sensei'),
+			'teacher-new-message' => __('A learner sends a private message to a teacher', 'woothemes-sensei'),
 		);
 
 		$global_email_options = array(
-			'new-message-reply' => __( 'They receive a reply to their private message', 'woothemes-sensei' ),
+			'new-message-reply' => __('They receive a reply to their private message', 'woothemes-sensei'),
 		);
 
 		$fields['email_learners'] = array(
-								'name' => __( 'Emails Sent to Learners', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to learners.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Learners', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to learners.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $learner_email_options,
-								'defaults' => array( 'learner-graded-quiz', 'learner-completed-course' ),
+								'defaults' => array('learner-graded-quiz', 'learner-completed-course'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_teachers'] = array(
-								'name' => __( 'Emails Sent to Teachers', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to teachers.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Teachers', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to teachers.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $teacher_email_options,
-								'defaults' => array( 'teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message' ),
+								'defaults' => array('teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_global'] = array(
-								'name' => __( 'Emails Sent to All Users', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to all users.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to All Users', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to all users.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $global_email_options,
-								'defaults' => array( 'new-message-reply' ),
+								'defaults' => array('new-message-reply'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_from_name'] = array(
-								'name' => __( '"From" Name', 'woothemes-sensei' ),
-								'description' => __( 'The name from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Name', 'woothemes-sensei'),
+								'description' => __('The name from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'name' ),
+								'default' => get_bloginfo('name'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_from_address'] = array(
-								'name' => __( '"From" Address', 'woothemes-sensei' ),
-								'description' => __( 'The address from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Address', 'woothemes-sensei'),
+								'description' => __('The address from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'admin_email' ),
+								'default' => get_bloginfo('admin_email'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_header_image'] = array(
-								'name' => __( 'Header Image', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'media-new.php' ) . '">', '</a>' ),
+								'name' => __('Header Image', 'woothemes-sensei'),
+								'description' => sprintf(__('Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('media-new.php').'">', '</a>'),
 								'type' => 'text',
 								'default' => '',
 								'section' => 'email-notification-settings',
@@ -513,17 +513,17 @@ 
 								);
 
 		$fields['email_footer_text'] = array(
-								'name' => __( 'Email Footer Text', 'woothemes-sensei' ),
-								'description' => __( 'The text to appear in the footer of Sensei emails.', 'woothemes-sensei' ),
+								'name' => __('Email Footer Text', 'woothemes-sensei'),
+								'description' => __('The text to appear in the footer of Sensei emails.', 'woothemes-sensei'),
 								'type' => 'textarea',
-								'default' => sprintf( __( '%1$s - Powered by Sensei', 'woothemes-sensei' ), get_bloginfo( 'name' ) ),
+								'default' => sprintf(__('%1$s - Powered by Sensei', 'woothemes-sensei'), get_bloginfo('name')),
 								'section' => 'email-notification-settings',
 								'required' => 0
 								);
 
 		$fields['email_base_color'] = array(
-								'name' => __( 'Base Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Base Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#557da1',
 								'section' => 'email-notification-settings',
@@ -531,8 +531,8 @@ 
 								);
 
 		$fields['email_background_color'] = array(
-								'name' => __( 'Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#f5f5f5',
 								'section' => 'email-notification-settings',
@@ -540,8 +540,8 @@ 
 								);
 
 		$fields['email_body_background_color'] = array(
-								'name' => __( 'Body Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#fdfdfd',
 								'section' => 'email-notification-settings',
@@ -549,35 +549,35 @@ 
 								);
 
 		$fields['email_text_color'] = array(
-								'name' => __( 'Body Text Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Text Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#505050',
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
-		if ( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 			// WooCommerce Settings
     		$fields['woocommerce_enabled'] = array(
-									'name' => __( 'Enable WooCommerce Courses', 'woothemes-sensei' ),
-									'description' => __( 'Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei' ),
+									'name' => __('Enable WooCommerce Courses', 'woothemes-sensei'),
+									'description' => __('Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_free_enable'] = array(
-									'name' => __( 'Free Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Free Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_paid_enable'] = array(
-									'name' => __( 'Paid Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Paid Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
@@ -585,18 +585,18 @@ 
 
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$fields['install_language_pack'] = array(
-				'name'        => __( 'Install Language Pack', 'woothemes-sensei' ),
-				'description' => __( 'Use this action to install or re-install translation for your language if available.', 'woothemes-sensei' ),
+				'name'        => __('Install Language Pack', 'woothemes-sensei'),
+				'description' => __('Use this action to install or re-install translation for your language if available.', 'woothemes-sensei'),
 				'type'        => 'button',
 				'section'     => 'language-settings',
 				'target'      => Sensei_Language_Pack_Manager::get_install_uri(),
-				'label'       => __( 'Install', 'woothemes-sensei' )
+				'label'       => __('Install', 'woothemes-sensei')
 			);
 		}
 
-		$this->fields = apply_filters( 'sensei_settings_fields', $fields );
+		$this->fields = apply_filters('sensei_settings_fields', $fields);
 
 	} // End init_fields()
 
@@ -606,20 +606,20 @@ 
 	 * @param  $include_milliseconds (default: true) Whether or not to include milliseconds between 0 and 1.
 	 * @return array Options between 0.1 and 10 seconds.
 	 */
-	private function get_duration_options ( $include_milliseconds = true ) {
-		$numbers = array( '1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0' );
+	private function get_duration_options($include_milliseconds = true) {
+		$numbers = array('1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0');
 		$options = array();
 
-		if ( true == (bool)$include_milliseconds ) {
-			$milliseconds = array( '0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9' );
-			foreach ( $milliseconds as $k => $v ) {
+		if (true == (bool) $include_milliseconds) {
+			$milliseconds = array('0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9');
+			foreach ($milliseconds as $k => $v) {
 				$options[$v] = $v;
 			}
 		} else {
 			$options['0.5'] = '0.5';
 		}
 
-		foreach ( $numbers as $k => $v ) {
+		foreach ($numbers as $k => $v) {
 			$options[$v] = $v;
 		}
 
@@ -635,25 +635,25 @@ 
 	private function pages_array() {
 		// REFACTOR - Transform this into a field type instead.
 		// Setup an array of portfolio gallery terms for a dropdown.
-		$args = array( 'echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC' );
-		$pages_dropdown = wp_dropdown_pages( $args );
+		$args = array('echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC');
+		$pages_dropdown = wp_dropdown_pages($args);
 		$page_items = array();
 
 		// Quick string hack to make sure we get the pages with the indents.
-		$pages_dropdown = str_replace( "<select class='' name='page_id' id='page_id'>", '', $pages_dropdown );
-		$pages_dropdown = str_replace( '</select>', '', $pages_dropdown );
-		$pages_split = explode( '</option>', $pages_dropdown );
+		$pages_dropdown = str_replace("<select class='' name='page_id' id='page_id'>", '', $pages_dropdown);
+		$pages_dropdown = str_replace('</select>', '', $pages_dropdown);
+		$pages_split = explode('</option>', $pages_dropdown);
 
-		$page_items[] = __( 'Select a Page:', 'woothemes-sensei' );
+		$page_items[] = __('Select a Page:', 'woothemes-sensei');
 
-		foreach ( $pages_split as $k => $v ) {
+		foreach ($pages_split as $k => $v) {
 		    $id = '';
 		    // Get the ID value.
-		    preg_match( '/value="(.*?)"/i', $v, $matches );
+		    preg_match('/value="(.*?)"/i', $v, $matches);
 
-		    if ( isset( $matches[1] ) ) {
+		    if (isset($matches[1])) {
 		        $id = $matches[1];
-		        $page_items[$id] = trim( strip_tags( $v ) );
+		        $page_items[$id] = trim(strip_tags($v));
 		    } // End If Statement
 		} // End For Loop
 
@@ -677,10 +677,10 @@ 
      *
      * @since 1.9.0
      */
-    public static function flush_rewrite_rules(){
+    public static function flush_rewrite_rules() {
 
-        if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
-            && isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
+        if (isset($_POST['option_page']) && 'woothemes-sensei-settings' == $_POST['option_page']
+            && isset($_POST['action']) && 'update' == $_POST['action']) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -694,4 +694,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Settings extends Sensei_Settings{}
+class WooThemes_Sensei_Settings extends Sensei_Settings {}

includes/theme-integrations/theme-integration-loader.php

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);
         }
     }
 

includes/theme-integrations/twentyfifteen.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
      * Output opening wrappers
      * @since 1.9.0
      */
-    public function wrapper_start(){
+    public function wrapper_start() {
 
         // output inline styles
         $this->print_styles();
@@ -30,7 +30,7 @@ 
      *
      * @since 1.9.0
      */
-    private function print_styles(){?>
+    private function print_styles() {?>
 
         <style>
             @media screen and (min-width: 59.6875em){