woothemes / sensei

includes/class-sensei-quiz.php

Doc Comments +4 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
      *
      * This function hooks into the quiz page and accepts the answer form save post.
      * @since 1.7.3
-     * @return bool $saved;
+     * @return boolean|null $saved;
      */
     public function user_save_quiz_answers_listener(){
 
@@ -214,7 +214,7 @@ 
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
-	 * @return array $answers or false
+	 * @return boolean $answers or false
 	 */
 	public function get_user_answers( $lesson_id, $user_id ){
 
@@ -707,7 +707,7 @@ 
       *      @type int $question_id
       *      @type int $question_grade
       * }
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return bool
@@ -754,7 +754,7 @@ 
       *
       * @since 1.7.4
       *
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return array $user_quiz_grades or false if none exists for this users
@@ -1090,7 +1090,6 @@ 
       * Filter the single title and add the Quiz to it.
       *
       * @param string $title
-      * @param int $id title post id
       * @return string $quiz_title
       */
      public static function single_quiz_title( $title, $post_id ){

Braces +7 added lines, -4 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Quiz Class
@@ -104,7 +107,7 @@ 
 			global $post;
 			if( 'quiz' == get_post_type( $post ) ){
 				$quiz_id = $post->ID;
-			}else{
+			} else{
 				return false;
 			}
 
@@ -234,7 +237,7 @@ 
 
             $encoded_user_answers = $transient_cached_answers;
 
-        }else{
+        } else{
 
             $encoded_user_answers = WooThemes_Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
 
@@ -424,7 +427,7 @@ 
             // compress the answer for saving
 			if( 'multi-line' == $question_type ) {
                 $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
+            } elseif( 'file-upload' == $question_type  ){
                 $file_key = 'file_upload_' . $question_id;
                 if( isset( $files[ $file_key ] ) ) {
                         $attachment_id = WooThemes_Sensei_Utils::upload_file(  $files[ $file_key ] );

Indentation +882 added lines, -882 removed lines

@@ -31,63 +31,63 @@ 
 		// listen to the reset button click
 		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' ) );
+		// fire the complete quiz button submit for grading action
+		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' ) );
 
-        // fire the load global data function
-        add_action( 'sensei_complete_quiz', array( $this, 'load_global_quiz_data' ), 80 );
+		// fire the load global data function
+		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()
+	} // End __construct()
 
 	/**
-	* Update the quiz author when the lesson post type is save
-	*
-	* @param int $post_id
-	* @return void
-	*/
+	 * Update the quiz author when the lesson post type is save
+	 *
+	 * @param int $post_id
+	 * @return void
+	 */
 	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 this is a revision don't save it
+		if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
+			|| wp_is_post_revision( $post_id ) ) {
 
-                return;
+				return;
 
-        }
-	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+		}
+		// get the lesson author id to be use late
+		$saved_post = get_post( $post_id );
+		$new_lesson_author_id =  $saved_post->post_author;
 
-	    //get the lessons quiz
+		//get the lessons quiz
 		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		foreach ( (array) $lesson_quizzes as $quiz_item ) {
 
-	    	if( ! $quiz_item ) {
-	    		continue;
-	    	}
+			if( ! $quiz_item ) {
+				continue;
+			}
 
-		    // setup the quiz items new author value
+			// setup the quiz items new author value
 			$my_post = array(
-			      'ID'           => $quiz_item,
-			      'post_author' =>  $new_lesson_author_id
+				  'ID'           => $quiz_item,
+				  'post_author' =>  $new_lesson_author_id
 			);
 
-            // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+			// remove the action so that it doesn't fire again
+			remove_action( 'save_post', array( $this, 'update_author' ));
 
 			// Update the post into the database
 		  	wp_update_post( $my_post );
-	    }
+		}
 
-	    return;
+		return;
 	}// end update_author
 
 
@@ -118,32 +118,32 @@ 
 	} // end lesson
 
 
-    /**
-     * user_save_quiz_answers_listener
-     *
-     * This function hooks into the quiz page and accepts the answer form save post.
-     * @since 1.7.3
-     * @return bool $saved;
-     */
-    public function user_save_quiz_answers_listener(){
+	/**
+	 * user_save_quiz_answers_listener
+	 *
+	 * This function hooks into the quiz page and accepts the answer form save post.
+	 * @since 1.7.3
+	 * @return bool $saved;
+	 */
+	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 ) {
-            return;
-        }
+		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' ];
-        // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+		global $post;
+		$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() );
 
-        // remove the hook as it should only fire once per click
-        remove_action( 'sensei_complete_quiz', 'user_save_quiz_answers_listener' );
+		// remove the hook as it should only fire once per click
+		remove_action( 'sensei_complete_quiz', 'user_save_quiz_answers_listener' );
 
-    } // end user_save_quiz_answers_listener
+	} // end user_save_quiz_answers_listener
 
 	/**
 	 * Save the user answers for the given lesson's quiz
@@ -154,7 +154,7 @@ 
 	 * @access public
 	 *
 	 * @param array $quiz_answers
-     * @param array $files from global $_FILES
+	 * @param array $files from global $_FILES
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
@@ -162,11 +162,11 @@ 
 	 */
 	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        // make sure the parameters are valid before continuing
+		// 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 )
@@ -177,25 +177,25 @@ 
 		}
 
 
-        // 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 );
+		// 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 );
 
 		//prepare the answers
 		$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){
 
-            // save transient to make retrieval faster
-            $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+			// save transient to make retrieval faster
+			$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+			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>';
-        }
+			// update the message showed to user
+			Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+		}
 
 		return $answers_saved;
 
@@ -203,9 +203,9 @@ 
 
 	/**
 	 * Get the user answers for the given lesson's quiz.
-     *
-     * This function returns the data that is stored on the lesson as meta and is not compatible with
-     * retrieving data for quiz answer before sensei 1.7.4
+	 *
+	 * This function returns the data that is stored on the lesson as meta and is not compatible with
+	 * retrieving data for quiz answer before sensei 1.7.4
 	 *
 	 *
 	 * @since 1.7.4
@@ -225,27 +225,27 @@ 
 			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 );
+		// save some time and get the transient cached data
+		$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$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 ){
+		// return the transient or get the values get the values from the comment meta
+		if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
 
-            $encoded_user_answers = $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
+		} // end if transient check
 
 		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 the transient with the new valid data for faster retrieval in future
+		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 ) {
@@ -279,8 +279,8 @@ 
 		$current_quiz_id = $post->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() );
+		// reset all user data
+		$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'  ) );
@@ -291,7 +291,7 @@ 
 	 * Complete/ submit  quiz hooked function
 	 *
 	 * This function listens to the complete button submit action and processes the users submitted answers
-     * not that this function submits the given users quiz answers for grading.
+	 * not that this function submits the given users quiz answers for grading.
 	 *
 	 * @since  1.7.4
 	 * @access public
@@ -301,90 +301,90 @@ 
 	 */
 	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 ) {
-            return;
-        }
+		// 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 ) {
+			return;
+		}
 
-        global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+		global $post, $current_user;
+		$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()
 
-    /**
-     * This function set's up the data need for the quiz page
-     *
-     * This function hooks into sensei_complete_quiz and load the global data for the
-     * current quiz.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     */
-    public function load_global_quiz_data(){
+	/**
+	 * This function set's up the data need for the quiz page
+	 *
+	 * This function hooks into sensei_complete_quiz and load the global data for the
+	 * current quiz.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 */
+	public function load_global_quiz_data(){
 
-        global  $post, $current_user;
-        $this->data = new stdClass();
+		global  $post, $current_user;
+		$this->data = new stdClass();
 
-        // Default grade
-        $grade = 0;
+		// Default grade
+		$grade = 0;
 
-        // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+		// Get Quiz Questions
+		$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 );
+		// Get quiz grade type
+		$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 );
+		// Get quiz pass setting
+		$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 ) );
+		// Get quiz pass mark
+		$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 );
-        $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-        }
+		// 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 );
+		$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 ( ! 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_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        } // End If Statement
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		} // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
+		$reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+		//backwards compatibility
+		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->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 );
-        $this->data->user_lesson_end = $user_lesson_end;
-        $this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $this->data->lesson_quiz_questions = $lesson_quiz_questions;
-        $this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
+		// 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->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 );
+		$this->data->user_lesson_end = $user_lesson_end;
+		$this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$this->data->lesson_quiz_questions = $lesson_quiz_questions;
+		$this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
 
-    } // end load_global_quiz_data
+	} // end load_global_quiz_data
 
 
 	/**
@@ -414,25 +414,25 @@ 
 		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 );
 			}
 
-            // compress the answer for saving
+			// 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 ) {
-                            $answer = $attachment_id;
-                        }
-                    }
-            } // end if
+				$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 ) );
 
@@ -441,814 +441,814 @@ 
 		return $prepared_answers;
 	} // prepare_form_submitted_answers
 
-    /**
-     * Reset user submitted questions
-     *
-     * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
-     * the save_user_answers as currently the saved and submitted answers are stored differently.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     * @return bool $reset_success
-     * @param int $user_id
-     * @param int $lesson_id
-     */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+	/**
+	 * Reset user submitted questions
+	 *
+	 * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
+	 * the save_user_answers as currently the saved and submitted answers are stored differently.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 * @return bool $reset_success
+	 * @param int $user_id
+	 * @param int $lesson_id
+	 */
+	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 ) ){
+			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 ) ) {
+			// 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 );
+
+		// 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 );
+
+		// 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 );
+
+		// 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::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 );
 
-        //make sure the parameters are valid
-        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 ) ) {
-            // this user is not taking this lesson so this process is not needed
-            return false;
-        }
+		// 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>';
 
-        //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		return ( $deleted_answers && $deleted_grades ) ;
 
-        // 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 );
+	} // end reset_user_lesson_data
 
-        // 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 );
+	 /**
+	  * Submit the users quiz answers for grading
+	  *
+	  * This function accepts users answers and stores it but also initiates the grading
+	  * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
+	  *
+	  * @since 1.7.4
+	  * @access public
+	  *
+	  * @param array $quiz_answers
+	  * @param array $files from $_FILES
+	  * @param int $user_id
+	  * @param int $lesson_id
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
 
-        // 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 );
+		 $answers_submitted = false;
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-        // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_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 ) ){
 
-        // 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>';
+			 return false;
 
-        return ( $deleted_answers && $deleted_grades ) ;
+		 }
 
-    } // end reset_user_lesson_data
+		 // Default grade
+		 $grade = 0;
 
-     /**
-      * Submit the users quiz answers for grading
-      *
-      * This function accepts users answers and stores it but also initiates the grading
-      * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
-      *
-      * @since 1.7.4
-      * @access public
-      *
-      * @param array $quiz_answers
-      * @param array $files from $_FILES
-      * @param int $user_id
-      * @param int $lesson_id
-      *
-      * @return bool $answers_submitted
-      */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+		 // Get Quiz ID
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 
-         $answers_submitted = false;
+		 // Get quiz grade type
+		 $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
+		 // Get quiz pass setting
+		 $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
 
-         // 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 ) ){
+		 // Get the minimum percentage need to pass this quiz
+		 $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
 
-             return false;
+		 // 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 ) ){
 
-         }
+			 $questions_asked = array_keys( $quiz_answers );
+			 $questions_asked_string = implode( ',', $questions_asked );
 
-         // Default grade
-         $grade = 0;
+			 // Save questions that were asked in this quiz
+			 update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
 
-         // Get Quiz 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 );
+		 // 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 );
 
-         // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+		 // Grade quiz
+		 $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
 
-         // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+		 // Get Lesson Grading Setting
+		 $lesson_metadata = array();
+		 $lesson_status = 'ungraded'; // Default when completing a quiz
 
-         // 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 ) ){
+		 // At this point the answers have been submitted
+		 $answers_submitted = true;
 
-             $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 );
+		 // if this condition is false the quiz should manually be graded by admin
+		 if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
 
-         }
+			 // Quiz has been automatically Graded
+			 if ( 'on' == $pass_required ) {
 
-         // 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 );
+				 // Student has reached the pass mark and lesson is complete
+				 if ( $quiz_pass_percentage <= $grade ) {
 
-         // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+					 $lesson_status = 'passed';
 
-         // Get Lesson Grading Setting
-         $lesson_metadata = array();
-         $lesson_status = 'ungraded'; // Default when completing a quiz
+				 } else {
 
-         // At this point the answers have been submitted
-         $answers_submitted = true;
+					 $lesson_status = 'failed';
 
-         // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+				 } // End If Statement
 
-             // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+			 } else {
 
-                 // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+				 // Student only has to partake the quiz
+				 $lesson_status = 'graded';
+
+			 }
+
+			 $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
+
+		 } // end if ! is_wp_error( $grade ...
+
+		 Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
 
-                     $lesson_status = 'passed';
+		 if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
 
-                 } else {
+			 /**
+			  * Lesson end action hook
+			  *
+			  * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
+			  *
+			  * @param int $user_id
+			  * @param int $lesson_id
+			  */
+			 do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
 
-                     $lesson_status = 'failed';
+		 }
 
-                 } // End If Statement
+		 /**
+		  * User quiz has been submitted
+		  *
+		  * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
+		  * results.
+		  *
+		  * @param int $user_id
+		  * @param int $quiz_id
+		  * @param string $grade
+		  * @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 );
 
-             } else {
+		 return $answers_submitted;
 
-                 // Student only has to partake the quiz
-                 $lesson_status = 'graded';
-
-             }
-
-             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
-
-         } // end if ! is_wp_error( $grade ...
-
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+	 }// end submit_answers_for_grading
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+	 /**
+	  * Get the user question answer
+	  *
+	  * This function gets the the users saved answer on given quiz for the given question parameter
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
 
-             /**
-              * Lesson end action hook
-              *
-              * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
-              *
-              * @param int $user_id
-              * @param int $lesson_id
-              */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+		 // 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 )) {
 
-         }
+			 return false;
+		 }
+
+		 if( ! ( intval( $user_id ) > 0 )   ){
+			 $user_id = get_current_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 ] ) ){
+
+			 //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 );
+
+			 if( ! isset( $comment->comment_content ) ){
+				 return false;
+			 }
+
+			 return maybe_unserialize( base64_decode( $comment->comment_content ) );
+		 }
+
+		 return $users_answers[ $question_id ];
+
+	 }// end get_user_question_answer
+
+	 /**
+	  * Saving the users quiz question grades
+	  *
+	  * This function save all the grades for all the question in a given quiz on the lesson
+	  * comment meta. It makes use of transients to save the grades for easier access at a later stage
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param array $quiz_grades{
+	  *      @type int $question_id
+	  *      @type int $question_grade
+	  * }
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return bool
+	  */
+	 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 ) {
+			 $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 ) ){
+
+			 return false;
+
+		 }
+
+		 $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   );
+
+		 // were the grades save successfully ?
+		 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 );
+		 }
+
+		 return $success;
+
+	 }// end set_user_grades
+
+	 /**
+	  * Retrieve the users quiz question grades
+	  *
+	  * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return array $user_quiz_grades or false if none exists for this users
+	  */
+	 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 ) {
+			 $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 )  ) {
+			 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 );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $user_grades  ) || false != $user_grades ){
+
+			 $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 );
+
+		 } // end if transient check
+
+		 // if there is no data for this user
+		 if( ! is_array( $user_grades ) ){
+			 return false;
+		 }
+
+		 return $user_grades;
+
+	 }// end  get_user_grades
+
+	 /**
+	  * Get the user question grade
+	  *
+	  * This function gets the grade on a quiz for the given question parameter
+	  * It does NOT do any grading. It simply retrieves the data that was stored during grading.
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $question_grade
+	  */
+	 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 )) {
+
+			 return false;
+		 }
+
+		 $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+
+		 if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+
+			 //fallback to data pre 1.7.4
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+
+			 $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 );
+			 }
+
+			 return $fall_back_grade;
+
+		 } // end if $all_user_grades...
+
+		 return $all_user_grades[ $question_id ];
+
+	 }// end get_user_question_grade
+
+	 /**
+	  * Save the user's answers feedback
+	  *
+	  * For this function you must supply all three parameters. If will return false one is left out.
+	  * The data will be saved on the lesson ID supplied.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false or int $feedback_saved
+	  */
+	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 ) ){
+
+			return false;
+
+		}
+
+
+		// 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 );
+		}
 
-         /**
-          * User quiz has been submitted
-          *
-          * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
-          * results.
-          *
-          * @param int $user_id
-          * @param int $quiz_id
-          * @param string $grade
-          * @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 );
+		// encode the 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 ) ;
+
+		//Were the the question feedback save correctly?
+		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 );
 
-         return $answers_submitted;
+		}
+
+		return $feedback_saved;
+
+	} // end save_user_answers_feedback
+
+	 /**
+	  * Get the user's answers feedback.
+	  *
+	  * This function returns the feedback submitted by the teacher/admin
+	  * during grading. Grading occurs manually or automatically.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false | array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  */
+	 public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+
+		 $answers_feedback = array();
 
-     }// end submit_answers_for_grading
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-     /**
-      * Get the user question answer
-      *
-      * This function gets the the users saved answer on given quiz for the given question parameter
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $answers_submitted
-      */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+		 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 );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $encoded_feedback  ) || !$encoded_feedback ){
 
-         // 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 )) {
+			 $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);
+
+		 } // end if transient check
 
-             return false;
-         }
-
-         if( ! ( intval( $user_id ) > 0 )   ){
-             $user_id = get_current_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 ] ) ){
-
-             //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 );
-
-             if( ! isset( $comment->comment_content ) ){
-                 return false;
-             }
-
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
-         }
-
-         return $users_answers[ $question_id ];
-
-     }// end get_user_question_answer
-
-     /**
-      * Saving the users quiz question grades
-      *
-      * This function save all the grades for all the question in a given quiz on the lesson
-      * comment meta. It makes use of transients to save the grades for easier access at a later stage
-      *
-      * @since 1.7.4
-      *
-      * @param array $quiz_grades{
-      *      @type int $question_id
-      *      @type int $question_grade
-      * }
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return bool
-      */
-     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 ) {
-             $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 ) ){
-
-             return false;
-
-         }
-
-         $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   );
-
-         // were the grades save successfully ?
-         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 );
-         }
-
-         return $success;
-
-     }// end set_user_grades
-
-     /**
-      * Retrieve the users quiz question grades
-      *
-      * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
-      *
-      * @since 1.7.4
-      *
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return array $user_quiz_grades or false if none exists for this users
-      */
-     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 ) {
-             $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 )  ) {
-             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 );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
-
-             $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 );
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
-             return false;
-         }
-
-         return $user_grades;
-
-     }// end  get_user_grades
-
-     /**
-      * Get the user question grade
-      *
-      * This function gets the grade on a quiz for the given question parameter
-      * It does NOT do any grading. It simply retrieves the data that was stored during grading.
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $question_grade
-      */
-     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 )) {
-
-             return false;
-         }
-
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
-
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
-
-             //fallback to data pre 1.7.4
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-
-             $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 );
-             }
-
-             return $fall_back_grade;
-
-         } // end if $all_user_grades...
-
-         return $all_user_grades[ $question_id ];
-
-     }// end get_user_question_grade
-
-     /**
-      * Save the user's answers feedback
-      *
-      * For this function you must supply all three parameters. If will return false one is left out.
-      * The data will be saved on the lesson ID supplied.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false or int $feedback_saved
-      */
-    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 ) ){
-
-            return false;
-
-        }
-
-
-        // 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 );
-        }
-
-        // encode the 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 ) ;
-
-        //Were the the question feedback save correctly?
-        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 );
-
-        }
-
-        return $feedback_saved;
-
-    } // end save_user_answers_feedback
-
-     /**
-      * Get the user's answers feedback.
-      *
-      * This function returns the feedback submitted by the teacher/admin
-      * during grading. Grading occurs manually or automatically.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false | array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      */
-     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 ) {
-             $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 )  ) {
-             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 );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
-
-             $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);
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
-             return false;
-         }
+		 // if there is no data for this user
+		 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 );
 
-         }
+		 }
 
-         return $answers_feedback;
+		 return $answers_feedback;
 
-     } // end get_user_answers_feedback
+	 } // end get_user_answers_feedback
 
-     /**
-      * Get the user's answer feedback for a specific question.
-      *
-      * This function gives you a single answer note/feedback string
-      * for the user on the given question.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $question_id
-      * @param int $user_id
-      *
-      * @return string $feedback or bool if false
-      */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+	 /**
+	  * Get the user's answer feedback for a specific question.
+	  *
+	  * This function gives you a single answer note/feedback string
+	  * for the user on the given question.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $question_id
+	  * @param int $user_id
+	  *
+	  * @return string $feedback or bool if false
+	  */
+	 public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
 
-         $feedback = false;
+		 $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 )) {
+		 // 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 )) {
 
-             return false;
-         }
+			 return false;
+		 }
 
-         // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+		 // get all the feedback for the user on the given lesson
+		 $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
+			 //fallback to data pre 1.7.4
 
-             // setup the sensei data query
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 // setup the sensei data query
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+			 $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 ) );
-             }
+			 // 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 ) );
+			 }
 
-             // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
-             }
+			 // finally use the default question feedback
+			 if( empty( $feedback ) ){
+				 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+			 }
 
-             return $feedback;
+			 return $feedback;
 
-         }
+		 }
 
-         return $all_feedback[ $question_id ];
+		 return $all_feedback[ $question_id ];
 
-     } // end get_user_question_feedback
+	 } // end get_user_question_feedback
 
-     /**
-      * Check if a quiz has no questions, and redirect back to lesson.
-      *
-      * Though a quiz is created for each lesson, it should not be visible
-      * unless it has questions.
-      *
-      * @since 1.9.0
-      * @access public
-      * @param none
-      * @return void
-      */
+	 /**
+	  * Check if a quiz has no questions, and redirect back to lesson.
+	  *
+	  * Though a quiz is created for each lesson, it should not be visible
+	  * unless it has questions.
+	  *
+	  * @since 1.9.0
+	  * @access public
+	  * @param none
+	  * @return void
+	  */
 
-     public function quiz_has_no_questions() {
+	 public function quiz_has_no_questions() {
 
 
-         if( ! is_singular( 'quiz' ) )  {
-             return;
-         }
+		 if( ! is_singular( 'quiz' ) )  {
+			 return;
+		 }
 
-         global $post;
+		 global $post;
 
-         $lesson_id = $this->get_lesson_id($post->ID);
+		 $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);
+		 $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;
+			 wp_redirect(get_permalink($lesson->ID), 301);
+			 exit;
 
-         }
+		 }
 
-     } // end quiz_has_no_questions
+	 } // end quiz_has_no_questions
 
 /**
-  * Deprecate the sensei_single_main_content on the single-quiz template.
-  *
-  * @deprecated since 1.9.0
-  */
+ * Deprecate the sensei_single_main_content on the single-quiz template.
+ *
+ * @deprecated since 1.9.0
+ */
  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');
+	 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
  }
-    /*
+	/*
      * Deprecate the sensei_quiz_single_title on the single-quiz template.
      *
      * @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 ');
+		 sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
-     }
+	 }
 
-     /**
-      * Filter the single title and add the Quiz to it.
-      *
-      * @param string $title
-      * @param int $id title post id
-      * @return string $quiz_title
-      */
-     public static function single_quiz_title( $title, $post_id ){
+	 /**
+	  * Filter the single title and add the Quiz to it.
+	  *
+	  * @param string $title
+	  * @param int $id title post id
+	  * @return string $quiz_title
+	  */
+	 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;
+			 $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 the title has quiz, remove it: legacy titles have the word quiz stored.
+			 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  );
+				 // 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 = $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( ) );
+		 /**
+		  * hook document in class-woothemes-sensei-message.php
+		  */
+		 return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
 
-     }
+	 }
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function start_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function start_quiz_questions_loop(){
 
-         global $sensei_question_loop;
+		 global $sensei_question_loop;
 
-         //intialize the questions loop object
-         $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
+		 //intialize the questions loop object
+		 $sensei_question_loop['current'] = -1;
+		 $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['questions'] = $questions;
-             $sensei_question_loop['quiz_id'] = get_the_ID();
+			 $sensei_question_loop['total']   =  count( $questions );
+			 $sensei_question_loop['questions'] = $questions;
+			 $sensei_question_loop['quiz_id'] = get_the_ID();
 
-         }
+		 }
 
-     }// static function
+	 }// static function
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function stop_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function stop_quiz_questions_loop(){
 
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
-         $sensei_question_loop['quiz_id'] = '';
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
+		 $sensei_question_loop['quiz_id'] = '';
 
-     }
+	 }
 
-     /**
-      * Output the title for the single quiz page
-      *
-      * @since 1.9.0
-      */
-     public static function the_title(){
-         ?>
+	 /**
+	  * Output the title for the single quiz page
+	  *
+	  * @since 1.9.0
+	  */
+	 public static function the_title(){
+		 ?>
          <header>
 
              <h1>
 
                  <?php
-                 /**
-                  * 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() ) );
-                 ?>
+				 /**
+				  * 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() ) );
+				 ?>
 
              </h1>
 
          </header>
 
          <?php
-     }//the_title
+	 }//the_title
 
-     /**
-      * Output the sensei quiz status message.
-      *
-      * @param $quiz_id
-      */
-    public static function  the_user_status_message( $quiz_id ){
+	 /**
+	  * Output the sensei quiz status message.
+	  *
+	  * @param $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>';
 
-    }
+	}
 
-     /**
-      * This functions runs the old sensei_quiz_action_buttons action
-      * for backwards compatiblity sake.
-      *
-      * @since 1.9.0
-      * @deprecated
-      */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+	 /**
+	  * This functions runs the old sensei_quiz_action_buttons action
+	  * for backwards compatiblity sake.
+	  *
+	  * @since 1.9.0
+	  * @deprecated
+	  */
+	 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');
 
-     }
+	 }
 
-     /**
-      * The quiz action buttons needed to ouput quiz
-      * action such as reset complete and save.
-      *
-      * @since 1.3.0
-      */
-     public static function action_buttons() {
+	 /**
+	  * The quiz action buttons needed to ouput quiz
+	  * action such as reset complete and save.
+	  *
+	  * @since 1.3.0
+	  */
+	 public static function action_buttons() {
 
-         global $post, $current_user;
+		 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 );
-         $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+		 $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 );
 
-         //setup quiz grade
-         $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
+		 //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( 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 );
+			 // 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 );
 
-         }
-         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 ); ?>
+			 // Get Reset Settings
+			 $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"
@@ -1275,55 +1275,55 @@ 
 
          <?php }
 
-     } // End sensei_quiz_action_buttons()
-
-     /**
-      * Fetch the quiz grade
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return double $user_quiz_grade
-      */
-     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_quiz_grade = 0;
-         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;
-
-     }
-
-     /**
-      * Check the quiz reset property for a given lesson's quiz.
-      *
-      * The data is stored on the quiz but going forward the quiz post
-      * type will be retired, hence the lesson_id is a require parameter.
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @return bool
-      */
-     public static function is_reset_allowed( $lesson_id ){
-
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-         //backwards compatibility
-         if( 'on' == $reset_allowed ) {
-             $reset_allowed = 1;
-         }
-
-         return (bool) $reset_allowed;
-
-     }
+	 } // End sensei_quiz_action_buttons()
+
+	 /**
+	  * Fetch the quiz grade
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return double $user_quiz_grade
+	  */
+	 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_quiz_grade = 0;
+		 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;
+
+	 }
+
+	 /**
+	  * Check the quiz reset property for a given lesson's quiz.
+	  *
+	  * The data is stored on the quiz but going forward the quiz post
+	  * type will be retired, hence the lesson_id is a require parameter.
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @return bool
+	  */
+	 public static function is_reset_allowed( $lesson_id ){
+
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+
+		 $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		 //backwards compatibility
+		 if( 'on' == $reset_allowed ) {
+			 $reset_allowed = 1;
+		 }
+
+		 return (bool) $reset_allowed;
+
+	 }
 
  } // End Class WooThemes_Sensei_Quiz
 

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 {}

includes/class-sensei-settings-api.php

Doc Comments +1 added lines, -1 removed lines

@@ -793,7 +793,7 @@
 	 * Return an array of field types expecting an array value returned.
 	 * @access protected
 	 * @since  1.0.0
-	 * @return void
+	 * @return string[]
 	 */
 	protected function get_array_field_types () {
 		return array( 'multicheck' );

Indentation +3 added lines, -3 removed lines

@@ -416,9 +416,9 @@
 		echo '<input id="' . $args['key'] . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" type="checkbox" value="1"' . checked( esc_attr( $options[$args['key']] ), '1', false ) . ' />' . "\n";
 		if ( $has_description ) {
 			echo wp_kses( $args['data']['description'], array( 'a' => array(
-																	        'href' => array(),
-																	        'title' => array()
-																	    )
+																			'href' => array(),
+																			'title' => array()
+																		)
 															)
 						) . '</label>' . "\n";
 		}

Spacing +228 added lines, -228 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 API Class
@@ -34,7 +34,7 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function __construct () {
+	public function __construct() {
 		$this->token = 'woothemes-sensei';
 		$this->page_slug = 'woothemes-sensei-settings-api';
 
@@ -56,10 +56,10 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_settings () {
-		add_action( 'admin_menu', array( $this, 'register_settings_screen' ), 60 );
-		add_action( 'admin_init', array( $this, 'settings_fields' ) );
-		add_action( 'init', array( $this, 'general_init' ) );
+	public function setup_settings() {
+		add_action('admin_menu', array($this, 'register_settings_screen'), 60);
+		add_action('admin_init', array($this, 'settings_fields'));
+		add_action('init', array($this, 'general_init'));
 	} // End setup_settings()
 
 	/**
@@ -72,7 +72,7 @@ 
 		$this->init_sections();
 		$this->init_fields();
 		$this->get_settings();
-		if ( $this->has_tabs == true ) {
+		if ($this->has_tabs == true) {
 			$this->create_tabs();
 		} // End If Statement
 	} // End general_init()
@@ -83,9 +83,9 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function init_sections () {
+	public function init_sections() {
 		// Override this function in your class and assign the array of sections to $this->sections.
-		_e( 'Override init_sections() in your class.', 'woothemes-sensei' );
+		_e('Override init_sections() in your class.', 'woothemes-sensei');
 	} // End init_sections()
 
 	/**
@@ -94,9 +94,9 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function init_fields () {
+	public function init_fields() {
 		// Override this function in your class and assign the array of sections to $this->fields.
-		_e( 'Override init_fields() in your class.', 'woothemes-sensei' );
+		_e('Override init_fields() in your class.', 'woothemes-sensei');
 	} // End init_fields()
 
 	/**
@@ -105,33 +105,33 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	public function settings_tabs () {
-		if ( ! $this->has_tabs ) { return; }
+	public function settings_tabs() {
+		if ( ! $this->has_tabs) { return; }
 
-		if ( count( $this->tabs ) > 0 ) {
+		if (count($this->tabs) > 0) {
 			$html = '';
 
-			$html .= '<ul id="settings-sections" class="subsubsub hide-if-no-js">' . "\n";
+			$html .= '<ul id="settings-sections" class="subsubsub hide-if-no-js">'."\n";
 
 			$sections = array(
-						'all' => array( 'href' => '#all', 'name' => __( 'All', 'woothemes-sensei' ), 'class' => 'current all tab' )
+						'all' => array('href' => '#all', 'name' => __('All', 'woothemes-sensei'), 'class' => 'current all tab')
 					);
 
-			foreach ( $this->tabs as $k => $v ) {
-				$sections[$k] = array( 'href' => '#' . esc_attr( $k ), 'name' => esc_attr( $v['name'] ), 'class' => 'tab' );
+			foreach ($this->tabs as $k => $v) {
+				$sections[$k] = array('href' => '#'.esc_attr($k), 'name' => esc_attr($v['name']), 'class' => 'tab');
 			}
 
 			$count = 1;
-			foreach ( $sections as $k => $v ) {
+			foreach ($sections as $k => $v) {
 				$count++;
-				$html .= '<li><a href="' . $v['href'] . '"';
-				if ( isset( $v['class'] ) && ( $v['class'] != '' ) ) { $html .= ' class="' . esc_attr( $v['class'] ) . '"'; }
-				$html .= '>' . esc_attr( $v['name'] ) . '</a>';
-				if ( $count <= count( $sections ) ) { $html .= ' | '; }
-				$html .= '</li>' . "\n";
+				$html .= '<li><a href="'.$v['href'].'"';
+				if (isset($v['class']) && ($v['class'] != '')) { $html .= ' class="'.esc_attr($v['class']).'"'; }
+				$html .= '>'.esc_attr($v['name']).'</a>';
+				if ($count <= count($sections)) { $html .= ' | '; }
+				$html .= '</li>'."\n";
 			}
 
-			$html .= '</ul><div class="clear"></div>' . "\n";
+			$html .= '</ul><div class="clear"></div>'."\n";
 
 			echo $html;
 		}
@@ -143,10 +143,10 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	private function create_tabs () {
-		if ( count( $this->sections ) > 0 ) {
+	private function create_tabs() {
+		if (count($this->sections) > 0) {
 			$tabs = array();
-			foreach ( $this->sections as $k => $v ) {
+			foreach ($this->sections as $k => $v) {
 				$tabs[$k] = $v;
 			}
 
@@ -160,10 +160,10 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function create_sections () {
-		if ( count( $this->sections ) > 0 ) {
-			foreach ( $this->sections as $k => $v ) {
-				add_settings_section( $k, $v['name'], array( $this, 'section_description' ), $this->token );
+	public function create_sections() {
+		if (count($this->sections) > 0) {
+			foreach ($this->sections as $k => $v) {
+				add_settings_section($k, $v['name'], array($this, 'section_description'), $this->token);
 			}
 		}
 	} // End create_sections()
@@ -174,18 +174,18 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function create_fields () {
-		if ( count( $this->sections ) > 0 ) {
+	public function create_fields() {
+		if (count($this->sections) > 0) {
 			// $this->parse_fields( $this->fields );
 
-			foreach ( $this->fields as $k => $v ) {
-				$method = $this->determine_method( $v, 'form' );
+			foreach ($this->fields as $k => $v) {
+				$method = $this->determine_method($v, 'form');
 				$name = $v['name'];
-				if ( $v['type'] == 'info' ) { $name = ''; }
-				add_settings_field( $k, $name, $method, $this->token, $v['section'], array( 'key' => $k, 'data' => $v ) );
+				if ($v['type'] == 'info') { $name = ''; }
+				add_settings_field($k, $name, $method, $this->token, $v['section'], array('key' => $k, 'data' => $v));
 
 				// Let the API know that we have a colourpicker field.
-				if ( $v['type'] == 'range' && $this->has_range == false ) { $this->has_range = true; }
+				if ($v['type'] == 'range' && $this->has_range == false) { $this->has_range = true; }
 			}
 		}
 	} // End create_fields()
@@ -197,43 +197,43 @@ 
 	 * @param  array $data
 	 * @return callable,  array or string
 	 */
-	protected function determine_method ( $data, $type = 'form' ) {
+	protected function determine_method($data, $type = 'form') {
 		$method = '';
 
-		if ( ! in_array( $type, array( 'form', 'validate', 'check' ) ) ) { return; }
+		if ( ! in_array($type, array('form', 'validate', 'check'))) { return; }
 
 		// Check for custom functions.
-		if ( isset( $data[$type] ) ) {
-			if ( function_exists( $data[$type] ) ) {
+		if (isset($data[$type])) {
+			if (function_exists($data[$type])) {
 				$method = $data[$type];
 			}
 
-			if ( $method == '' && method_exists( $this, $data[$type] ) ) {
-				if ( $type == 'form' ) {
-					$method = array( $this, $data[$type] );
+			if ($method == '' && method_exists($this, $data[$type])) {
+				if ($type == 'form') {
+					$method = array($this, $data[$type]);
 				} else {
 					$method = $data[$type];
 				}
 			}
 		}
 
-		if ( $method == '' && method_exists ( $this, $type . '_field_' . $data['type'] ) ) {
-			if ( $type == 'form' ) {
-				$method = array( $this, $type . '_field_' . $data['type'] );
+		if ($method == '' && method_exists($this, $type.'_field_'.$data['type'])) {
+			if ($type == 'form') {
+				$method = array($this, $type.'_field_'.$data['type']);
 			} else {
-				$method = $type . '_field_' . $data['type'];
+				$method = $type.'_field_'.$data['type'];
 			}
 		}
 
-		if ( $method == '' && function_exists ( $this->token . '_' . $type . '_field_' . $data['type'] ) ) {
-			$method = $this->token . '_' . $type . '_field_' . $data['type'];
+		if ($method == '' && function_exists($this->token.'_'.$type.'_field_'.$data['type'])) {
+			$method = $this->token.'_'.$type.'_field_'.$data['type'];
 		}
 
-		if ( $method == '' ) {
-			if ( $type == 'form' ) {
-				$method = array( $this, $type . '_field_text' );
+		if ($method == '') {
+			if ($type == 'form') {
+				$method = array($this, $type.'_field_text');
 			} else {
-				$method = $type . '_field_text';
+				$method = $type.'_field_text';
 			}
 		}
 
@@ -247,10 +247,10 @@ 
 	 * @param  array $fields
 	 * @return void
 	 */
-	public function parse_fields ( $fields ) {
-		foreach ( $fields as $k => $v ) {
-			if ( isset( $v['section'] ) && ( $v['section'] != '' ) && ( isset( $this->sections[$v['section']] ) ) ) {
-				if ( ! isset( $this->sections[$v['section']]['fields'] ) ) {
+	public function parse_fields($fields) {
+		foreach ($fields as $k => $v) {
+			if (isset($v['section']) && ($v['section'] != '') && (isset($this->sections[$v['section']]))) {
+				if ( ! isset($this->sections[$v['section']]['fields'])) {
 					$this->sections[$v['section']]['fields'] = array();
 				}
 
@@ -267,19 +267,19 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function register_settings_screen () {
+	public function register_settings_screen() {
 
 
-		if ( current_user_can( 'manage_sensei' ) ) {
-			$hook = add_submenu_page( 'sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array( $this, 'settings_screen' ) );
+		if (current_user_can('manage_sensei')) {
+			$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_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_print_scripts', array($this, 'enqueue_scripts'));
+			add_action('admin_print_styles', array($this, 'enqueue_styles'));
 		}
 	} // End register_settings_screen()
 
@@ -289,21 +289,21 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function settings_screen () {
+	public function settings_screen() {
 
 ?>
-<div id="woothemes-sensei" class="wrap <?php echo esc_attr( $this->token ); ?>">
-	<?php screen_icon( 'woothemes-sensei' ); ?>
-	<h2><?php echo esc_html( $this->name ); ?><?php if ( '' != $this->settings_version ) { echo ' <span class="version">' . $this->settings_version . '</span>'; } ?></h2>
-	<p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
-	<?php do_action( 'settings_before_form' ); ?>
+<div id="woothemes-sensei" class="wrap <?php echo esc_attr($this->token); ?>">
+	<?php screen_icon('woothemes-sensei'); ?>
+	<h2><?php echo esc_html($this->name); ?><?php if ('' != $this->settings_version) { echo ' <span class="version">'.$this->settings_version.'</span>'; } ?></h2>
+	<p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
+	<?php do_action('settings_before_form'); ?>
 	<form action="options.php" method="post">
 		<?php $this->settings_tabs(); ?>
-		<?php settings_fields( $this->token ); ?>
-		<?php do_settings_sections( $this->token ); ?>
+		<?php settings_fields($this->token); ?>
+		<?php do_settings_sections($this->token); ?>
 		<?php submit_button(); ?>
 	</form>
-	<?php do_action( 'settings_after_form' ); ?>
+	<?php do_action('settings_after_form'); ?>
 </div><!--/#woothemes-sensei-->
 <?php
 	} // End settings_screen()
@@ -314,16 +314,16 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function get_settings () {
-		if ( ! is_array( $this->settings ) ) {
-			$this->settings = get_option( $this->token, array() );
+	public function get_settings() {
+		if ( ! is_array($this->settings)) {
+			$this->settings = get_option($this->token, array());
 		}
 
-		foreach ( $this->fields as $k => $v ) {
-			if ( ! isset( $this->settings[$k] ) && isset( $v['default'] ) ) {
+		foreach ($this->fields as $k => $v) {
+			if ( ! isset($this->settings[$k]) && isset($v['default'])) {
 				$this->settings[$k] = $v['default'];
 			}
-			if ( $v['type'] == 'checkbox' && $this->settings[$k] != true ) {
+			if ($v['type'] == 'checkbox' && $this->settings[$k] != true) {
 				$this->settings[$k] = 0;
 			}
 		}
@@ -337,8 +337,8 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function settings_fields () {
-		register_setting( $this->token, $this->token, array( $this, 'validate_fields' ) );
+	public function settings_fields() {
+		register_setting($this->token, $this->token, array($this, 'validate_fields'));
 		$this->create_sections();
 		$this->create_fields();
 	} // End settings_fields()
@@ -349,8 +349,8 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function settings_errors () {
-		echo settings_errors( $this->token . '-errors' );
+	public function settings_errors() {
+		echo settings_errors($this->token.'-errors');
 	} // End settings_errors()
 
 	/**
@@ -359,9 +359,9 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function section_description ( $section ) {
-		if ( isset( $this->sections[$section['id']]['description'] ) ) {
-			echo wpautop( $this->sections[$section['id']]['description'] );
+	public function section_description($section) {
+		if (isset($this->sections[$section['id']]['description'])) {
+			echo wpautop($this->sections[$section['id']]['description']);
 		}
 	} // End section_description_main()
 
@@ -372,12 +372,12 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_text ( $args ) {
+	public function form_field_text($args) {
 		$options = $this->get_settings();
 
-		echo '<input id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" size="40" type="text" value="' . esc_attr( $options[$args['key']] ) . '" />' . "\n";
-		if ( isset( $args['data']['description'] ) ) {
-			echo '<span class="description">' . $args['data']['description'] . '</span>' . "\n";
+		echo '<input id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" size="40" type="text" value="'.esc_attr($options[$args['key']]).'" />'."\n";
+		if (isset($args['data']['description'])) {
+			echo '<span class="description">'.$args['data']['description'].'</span>'."\n";
 		}
 	} // End form_field_text()
 
@@ -388,13 +388,13 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_color ( $args ) {
+	public function form_field_color($args) {
 		$options = $this->get_settings();
 
-		echo '<input id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" size="40" type="text" class="color" value="' . esc_attr( $options[$args['key']] ) . '" />' . "\n";
+		echo '<input id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" size="40" type="text" class="color" value="'.esc_attr($options[$args['key']]).'" />'."\n";
 		echo '<div style="position:absolute;background:#FFF;z-index:99;border-radius:100%;" class="colorpicker"></div>';
-		if ( isset( $args['data']['description'] ) ) {
-			echo '<span class="description">' . $args['data']['description'] . '</span>' . "\n";
+		if (isset($args['data']['description'])) {
+			echo '<span class="description">'.$args['data']['description'].'</span>'."\n";
 		}
 	} // End form_field_text()
 
@@ -405,22 +405,22 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_checkbox ( $args ) {
+	public function form_field_checkbox($args) {
 		$options = $this->get_settings();
 
 		$has_description = false;
-		if ( isset( $args['data']['description'] ) ) {
+		if (isset($args['data']['description'])) {
 			$has_description = true;
-			echo '<label for="' . esc_attr( $args['key'] ) . '">' . "\n";
+			echo '<label for="'.esc_attr($args['key']).'">'."\n";
 		}
-		echo '<input id="' . $args['key'] . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" type="checkbox" value="1"' . checked( esc_attr( $options[$args['key']] ), '1', false ) . ' />' . "\n";
-		if ( $has_description ) {
-			echo wp_kses( $args['data']['description'], array( 'a' => array(
+		echo '<input id="'.$args['key'].'" name="'.$this->token.'['.esc_attr($args['key']).']" type="checkbox" value="1"'.checked(esc_attr($options[$args['key']]), '1', false).' />'."\n";
+		if ($has_description) {
+			echo wp_kses($args['data']['description'], array('a' => array(
 																	        'href' => array(),
 																	        'title' => array()
 																	    )
 															)
-						) . '</label>' . "\n";
+						).'</label>'."\n";
 		}
 	} // End form_field_checkbox()
 
@@ -431,12 +431,12 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_textarea ( $args ) {
+	public function form_field_textarea($args) {
 		$options = $this->get_settings();
 
-		echo '<textarea id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" cols="42" rows="5">' . esc_html( $options[$args['key']] ) . '</textarea>' . "\n";
-		if ( isset( $args['data']['description'] ) ) {
-			echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n";
+		echo '<textarea id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" cols="42" rows="5">'.esc_html($options[$args['key']]).'</textarea>'."\n";
+		if (isset($args['data']['description'])) {
+			echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n";
 		}
 	} // End form_field_textarea()
 
@@ -447,20 +447,20 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_select ( $args ) {
+	public function form_field_select($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) {
+		if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) {
 			$html = '';
-			$html .= '<select class="" id="' . esc_attr( $args['key'] ) . '" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']">' . "\n";
-				foreach ( $args['data']['options'] as $k => $v ) {
-					$html .= '<option value="' . esc_attr( $k ) . '"' . selected( esc_attr( $options[$args['key']] ), $k, false ) . '>' . $v . '</option>' . "\n";
+			$html .= '<select class="" id="'.esc_attr($args['key']).'" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']">'."\n";
+				foreach ($args['data']['options'] as $k => $v) {
+					$html .= '<option value="'.esc_attr($k).'"'.selected(esc_attr($options[$args['key']]), $k, false).'>'.$v.'</option>'."\n";
 				}
-			$html .= '</select>' . "\n";
+			$html .= '</select>'."\n";
 			echo $html;
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n";
 			}
 		}
 	} // End form_field_select()
@@ -472,18 +472,18 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_radio ( $args ) {
+	public function form_field_radio($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) {
+		if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) {
 			$html = '';
-			foreach ( $args['data']['options'] as $k => $v ) {
-				$html .= '<input type="radio" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" value="' . esc_attr( $k ) . '"' . checked( esc_attr( $options[$args['key']] ), $k, false ) . ' /> ' . $v . '<br />' . "\n";
+			foreach ($args['data']['options'] as $k => $v) {
+				$html .= '<input type="radio" name="'.$this->token.'['.esc_attr($args['key']).']" value="'.esc_attr($k).'"'.checked(esc_attr($options[$args['key']]), $k, false).' /> '.$v.'<br />'."\n";
 			}
 			echo $html;
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n";
 			}
 		}
 	} // End form_field_radio()
@@ -495,28 +495,28 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_multicheck ( $args ) {
+	public function form_field_multicheck($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) {
-			$html = '<div class="multicheck-container" style="margin-bottom:10px;">' . "\n";
-			foreach ( $args['data']['options'] as $k => $v ) {
+		if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) {
+			$html = '<div class="multicheck-container" style="margin-bottom:10px;">'."\n";
+			foreach ($args['data']['options'] as $k => $v) {
 				$checked = '';
 
-				if( isset( $options[ $args['key'] ] ) ) {
-					if ( in_array( $k, (array)$options[ $args['key'] ] ) ) { $checked = ' checked="checked"'; }
+				if (isset($options[$args['key']])) {
+					if (in_array($k, (array) $options[$args['key']])) { $checked = ' checked="checked"'; }
 				} else {
-					if ( in_array( $k, $args['data']['defaults'] ) ) { $checked = ' checked="checked"'; }
+					if (in_array($k, $args['data']['defaults'])) { $checked = ' checked="checked"'; }
 				}
-				$html .= '<label for="checkbox-' . esc_attr( $k ) . '">' . "\n";
-				$html .= '<input type="checkbox" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . '][]" class="multicheck multicheck-' . esc_attr( $args['key'] ) . '" value="' . esc_attr( $k ) . '" id="checkbox-' . esc_attr( $k ) . '" ' . $checked . ' /> ' . $v . "\n";
-				$html .= '</label><br />' . "\n";
+				$html .= '<label for="checkbox-'.esc_attr($k).'">'."\n";
+				$html .= '<input type="checkbox" name="'.esc_attr($this->token).'['.esc_attr($args['key']).'][]" class="multicheck multicheck-'.esc_attr($args['key']).'" value="'.esc_attr($k).'" id="checkbox-'.esc_attr($k).'" '.$checked.' /> '.$v."\n";
+				$html .= '</label><br />'."\n";
 			}
-			$html .= '</div>' . "\n";
+			$html .= '</div>'."\n";
 			echo $html;
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n";
 			}
 		}
 	} // End form_field_multicheck()
@@ -528,20 +528,20 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_range ( $args ) {
+	public function form_field_range($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) {
+		if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) {
 			$html = '';
-			$html .= '<select id="' . esc_attr( $args['key'] ) . '" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']" class="range-input">' . "\n";
-				foreach ( $args['data']['options'] as $k => $v ) {
-					$html .= '<option value="' . esc_attr( $k ) . '"' . selected( esc_attr( $options[$args['key']] ), $k, false ) . '>' . $v . '</option>' . "\n";
+			$html .= '<select id="'.esc_attr($args['key']).'" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']" class="range-input">'."\n";
+				foreach ($args['data']['options'] as $k => $v) {
+					$html .= '<option value="'.esc_attr($k).'"'.selected(esc_attr($options[$args['key']]), $k, false).'>'.$v.'</option>'."\n";
 				}
-			$html .= '</select>' . "\n";
+			$html .= '</select>'."\n";
 			echo $html;
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n";
 			}
 		}
 	} // End form_field_range()
@@ -553,18 +553,18 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_images ( $args ) {
+	public function form_field_images($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) {
+		if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) {
 			$html = '';
-			foreach ( $args['data']['options'] as $k => $v ) {
-				$html .= '<input type="radio" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']" value="' . esc_attr( $k ) . '"' . checked( esc_attr( $options[$args['key']] ), $k, false ) . ' /> ' . $v . '<br />' . "\n";
+			foreach ($args['data']['options'] as $k => $v) {
+				$html .= '<input type="radio" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']" value="'.esc_attr($k).'"'.checked(esc_attr($options[$args['key']]), $k, false).' /> '.$v.'<br />'."\n";
 			}
 			echo $html;
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n";
 			}
 		}
 	} // End form_field_images()
@@ -576,19 +576,19 @@ 
 	 * @param  array $args
 	 * @return void
 	 */
-	public function form_field_info ( $args ) {
+	public function form_field_info($args) {
 		$class = '';
-		if ( isset( $args['data']['class'] ) ) {
-			$class = ' ' . esc_attr( $args['data']['class'] );
+		if (isset($args['data']['class'])) {
+			$class = ' '.esc_attr($args['data']['class']);
 		}
-		$html = '<div id="' . $args['key'] . '" class="info-box' . $class . '">' . "\n";
-		if ( isset( $args['data']['name'] ) && ( $args['data']['name'] != '' ) ) {
-			$html .= '<h3 class="title">' . esc_html( $args['data']['name'] ) . '</h3>' . "\n";
+		$html = '<div id="'.$args['key'].'" class="info-box'.$class.'">'."\n";
+		if (isset($args['data']['name']) && ($args['data']['name'] != '')) {
+			$html .= '<h3 class="title">'.esc_html($args['data']['name']).'</h3>'."\n";
 		}
-		if ( isset( $args['data']['description'] ) && ( $args['data']['description'] != '' ) ) {
-			$html .= '<p>' . esc_html( $args['data']['description'] ) . '</p>' . "\n";
+		if (isset($args['data']['description']) && ($args['data']['description'] != '')) {
+			$html .= '<p>'.esc_html($args['data']['description']).'</p>'."\n";
 		}
-		$html .= '</div>' . "\n";
+		$html .= '</div>'."\n";
 
 		echo $html;
 	} // End form_field_info()
@@ -600,14 +600,14 @@ 
 	 * @since  1.9.0
 	 * @param  array $args
 	 */
-	public function form_field_button( $args ) {
+	public function form_field_button($args) {
 		$options = $this->get_settings();
 
-		if ( isset( $args['data']['target'] ) && isset( $args['data']['label'] ) ) {
-			printf( '<a href="%s" class="button button-secondary">%s</a> ', esc_url( $args['data']['target'] ), esc_html( $args['data']['label'] ) );
+		if (isset($args['data']['target']) && isset($args['data']['label'])) {
+			printf('<a href="%s" class="button button-secondary">%s</a> ', esc_url($args['data']['target']), esc_html($args['data']['label']));
 
-			if ( isset( $args['data']['description'] ) ) {
-				echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n";
+			if (isset($args['data']['description'])) {
+				echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n";
 			}
 		}
 	} // End form_field_button()
@@ -621,23 +621,23 @@ 
 	 * @uses   $this->parse_errors()
 	 * @return array $options
 	 */
-	public function validate_fields ( $input ) {
+	public function validate_fields($input) {
 		$options = $this->get_settings();
 
-		foreach ( $this->fields as $k => $v ) {
+		foreach ($this->fields as $k => $v) {
 			// Make sure checkboxes are present even when false.
-			if ( $v['type'] == 'checkbox' && ! isset( $input[$k] ) ) { $input[$k] = false; }
-			if ( $v['type'] == 'multicheck' && ! isset( $input[$k] ) ) { $input[$k] = false; }
+			if ($v['type'] == 'checkbox' && ! isset($input[$k])) { $input[$k] = false; }
+			if ($v['type'] == 'multicheck' && ! isset($input[$k])) { $input[$k] = false; }
 
-			if ( isset( $input[$k] ) ) {
+			if (isset($input[$k])) {
 				// Perform checks on required fields.
-				if ( isset( $v['required'] ) && ( $v['required'] == true ) ) {
-					if ( in_array( $v['type'], $this->get_array_field_types() ) && ( count( (array) $input[$k] ) <= 0 ) ) {
-						$this->add_error( $k, $v );
+				if (isset($v['required']) && ($v['required'] == true)) {
+					if (in_array($v['type'], $this->get_array_field_types()) && (count((array) $input[$k]) <= 0)) {
+						$this->add_error($k, $v);
 						continue;
 					} else {
-						if ( $input[$k] == '' ) {
-							$this->add_error( $k, $v );
+						if ($input[$k] == '') {
+							$this->add_error($k, $v);
 							continue;
 						}
 					}
@@ -646,28 +646,28 @@ 
 				$value = $input[$k];
 
 				// Check if the field is valid.
-				$method = $this->determine_method( $v, 'check' );
+				$method = $this->determine_method($v, 'check');
 
-				if ( function_exists ( $method ) ) {
-					$is_valid = $method( $value );
+				if (function_exists($method)) {
+					$is_valid = $method($value);
 				} else {
-					if ( method_exists( $this, $method ) ) {
-						$is_valid = $this->$method( $value );
+					if (method_exists($this, $method)) {
+						$is_valid = $this->$method($value);
 					}
 				}
 
-				if ( ! $is_valid ) {
-					$this->add_error( $k, $v );
+				if ( ! $is_valid) {
+					$this->add_error($k, $v);
 					continue;
 				}
 
-				$method = $this->determine_method( $v, 'validate' );
+				$method = $this->determine_method($v, 'validate');
 
-				if ( function_exists ( $method ) ) {
-					$options[$k] = $method( $value );
+				if (function_exists($method)) {
+					$options[$k] = $method($value);
 				} else {
-					if ( method_exists( $this, $method ) ) {
-						$options[$k] = $this->$method( $value );
+					if (method_exists($this, $method)) {
+						$options[$k] = $this->$method($value);
 					}
 				}
 			}
@@ -685,8 +685,8 @@ 
 	 * @param  string $input
 	 * @return string
 	 */
-	public function validate_field_text ( $input ) {
-		return trim( esc_attr( $input ) );
+	public function validate_field_text($input) {
+		return trim(esc_attr($input));
 	} // End validate_field_text()
 
 	/**
@@ -696,11 +696,11 @@ 
 	 * @param  string $input
 	 * @return string
 	 */
-	public function validate_field_checkbox ( $input ) {
-		if ( ! isset( $input ) ) {
+	public function validate_field_checkbox($input) {
+		if ( ! isset($input)) {
 			return 0;
 		} else {
-			return (bool)$input;
+			return (bool) $input;
 		}
 	} // End validate_field_checkbox()
 
@@ -711,10 +711,10 @@ 
 	 * @param  string $input
 	 * @return string
 	 */
-	public function validate_field_multicheck ( $input ) {
+	public function validate_field_multicheck($input) {
 		$input = (array) $input;
 
-		$input = array_map( 'esc_attr', $input );
+		$input = array_map('esc_attr', $input);
 
 		return $input;
 	} // End validate_field_multicheck()
@@ -726,8 +726,8 @@ 
 	 * @param  string $input
 	 * @return string
 	 */
-	public function validate_field_range ( $input ) {
-		$input = number_format( floatval( $input ), 0 );
+	public function validate_field_range($input) {
+		$input = number_format(floatval($input), 0);
 
 		return $input;
 	} // End validate_field_range()
@@ -739,8 +739,8 @@ 
 	 * @param  string $input
 	 * @return string
 	 */
-	public function validate_field_url ( $input ) {
-		return trim( esc_url( $input ) );
+	public function validate_field_url($input) {
+		return trim(esc_url($input));
 	} // End validate_field_url()
 
 	/**
@@ -749,7 +749,7 @@ 
 	 * @since  1.1.0
 	 * @return boolean Is the value valid?
 	 */
-	public function check_field_text ( $input ) {
+	public function check_field_text($input) {
 		$is_valid = true;
 
 		return $is_valid;
@@ -763,11 +763,11 @@ 
 	 * @param  array $data
 	 * @return void
 	 */
-	protected function add_error ( $key, $data ) {
-		if ( isset( $data['error_message'] ) ) {
+	protected function add_error($key, $data) {
+		if (isset($data['error_message'])) {
 			$message = $data['error_message'];
 		} else {
-			$message = sprintf( __( '%s is a required field', 'woothemes-sensei' ), $data['name'] );
+			$message = sprintf(__('%s is a required field', 'woothemes-sensei'), $data['name']);
 		}
 		$this->errors[$key] = $message;
 	} // End add_error()
@@ -778,14 +778,14 @@ 
 	 * @since   1.0.0
 	 * @return  void
 	 */
-	protected function parse_errors () {
-		if ( count ( $this->errors ) > 0 ) {
-			foreach ( $this->errors as $k => $v ) {
-				add_settings_error( $this->token . '-errors', $k, $v, 'error' );
+	protected function parse_errors() {
+		if (count($this->errors) > 0) {
+			foreach ($this->errors as $k => $v) {
+				add_settings_error($this->token.'-errors', $k, $v, 'error');
 			}
 		} else {
-			$message = sprintf( __( '%s updated', 'woothemes-sensei' ), $this->name );
-			add_settings_error( $this->token . '-errors', $this->token, $message, 'updated' );
+			$message = sprintf(__('%s updated', 'woothemes-sensei'), $this->name);
+			add_settings_error($this->token.'-errors', $this->token, $message, 'updated');
 		}
 	} // End parse_errors()
 
@@ -795,8 +795,8 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	protected function get_array_field_types () {
-		return array( 'multicheck' );
+	protected function get_array_field_types() {
+		return array('multicheck');
 	} // End get_array_field_types()
 
 	/**
@@ -805,22 +805,22 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_script( 'farbtastic' );
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'farbtastic' ), Sensei()->version );
+		wp_enqueue_script('farbtastic');
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'farbtastic'), Sensei()->version);
 
-		if ( $this->has_range ) {
-			wp_enqueue_script( 'woothemes-sensei-settings-ranges', esc_url( Sensei()->plugin_url . 'assets/js/ranges' . $suffix . '.js' ), array( 'jquery-ui-slider' ), Sensei()->version );
+		if ($this->has_range) {
+			wp_enqueue_script('woothemes-sensei-settings-ranges', esc_url(Sensei()->plugin_url.'assets/js/ranges'.$suffix.'.js'), array('jquery-ui-slider'), Sensei()->version);
 		}
 
-		wp_register_script( 'woothemes-sensei-settings-imageselectors', esc_url( Sensei()->plugin_url . 'assets/js/image-selectors' . $suffix . '.js' ), array( 'jquery' ), Sensei()->version );
+		wp_register_script('woothemes-sensei-settings-imageselectors', esc_url(Sensei()->plugin_url.'assets/js/image-selectors'.$suffix.'.js'), array('jquery'), Sensei()->version);
 
-		if ( $this->has_imageselector ) {
-			wp_enqueue_script( 'woothemes-sensei-settings-imageselectors' );
+		if ($this->has_imageselector) {
+			wp_enqueue_script('woothemes-sensei-settings-imageselectors');
 		}
 
 	} // End enqueue_scripts()
@@ -831,12 +831,12 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( Sensei()->token . '-admin' );
+		wp_enqueue_style(Sensei()->token.'-admin');
 
-		wp_enqueue_style( 'farbtastic' );
-		wp_enqueue_style( 'woothemes-sensei-settings-api', esc_url( Sensei()->plugin_url . 'assets/css/settings.css' ), array( 'farbtastic' ), Sensei()->version );
+		wp_enqueue_style('farbtastic');
+		wp_enqueue_style('woothemes-sensei-settings-api', esc_url(Sensei()->plugin_url.'assets/css/settings.css'), array('farbtastic'), Sensei()->version);
 
 		$this->enqueue_field_styles();
 	} // End enqueue_styles()
@@ -847,17 +847,17 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_field_styles () {
+	public function enqueue_field_styles() {
 
 
-		if ( $this->has_range ) {
-			wp_enqueue_style( 'woothemes-sensei-settings-ranges', esc_url( Sensei()->plugin_url . 'assets/css/ranges.css' ), '', Sensei()->version );
+		if ($this->has_range) {
+			wp_enqueue_style('woothemes-sensei-settings-ranges', esc_url(Sensei()->plugin_url.'assets/css/ranges.css'), '', Sensei()->version);
 		}
 
-		wp_register_style( 'woothemes-sensei-settings-imageselectors', esc_url( Sensei()->plugin_url . 'assets/css/image-selectors.css' ), '', Sensei()->version );
+		wp_register_style('woothemes-sensei-settings-imageselectors', esc_url(Sensei()->plugin_url.'assets/css/image-selectors.css'), '', Sensei()->version);
 
-		if ( $this->has_imageselector ) {
-			wp_enqueue_style( 'woothemes-sensei-settings-imageselectors' );
+		if ($this->has_imageselector) {
+			wp_enqueue_style('woothemes-sensei-settings-imageselectors');
 		}
 	} // End enqueue_field_styles()
 } // End Class
@@ -867,4 +867,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Settings_API extends Sensei_Settings_API{}
+class WooThemes_Sensei_Settings_API extends Sensei_Settings_API {}

Braces +4 added lines, -1 removed lines

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

includes/class-sensei-teacher.php

Doc Comments +3 added lines, -4 removed lines

@@ -363,7 +363,7 @@ 
      *
      * @param $course_id
      * @param $new_teacher_id
-     * @return void
+     * @return false|null
      */
     public static function update_course_modules_author( $course_id ,$new_teacher_id ){
 
@@ -454,7 +454,7 @@ 
      * @since 1.8.0
      * @access public
      * @parameters
-     * @return array $users user id array
+     * @return boolean $users user id array
      */
     public function update_course_lessons_author ( $course_id, $new_author  ){
 
@@ -843,8 +843,7 @@ 
      * This function hooks into wp_insert_post
      *
      * @since 1.8.0
-     * @param int $course_id
-     * @return bool
+     * @return false|null
      */
     public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
 

Braces +11 added lines, -8 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Teacher class
@@ -414,7 +417,7 @@ 
                     $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
                     $term_id = $existing_term->term_id;
 
-                }else{
+                } else{
 
                     // for a new term simply get the term from the returned value
                     $term_id = $new_term['term_id'];
@@ -495,7 +498,7 @@ 
                         'post_author' =>  $new_author
                     ) );
                 }
-            }else{
+            } else{
                 wp_update_post( array(
                     'ID'           => $lesson_quizzes,
                     'post_author' =>  $new_author
@@ -789,7 +792,7 @@ 
             // merge the post types instead of overwriting it
             $new_post_types = array_merge( $current_post_types, array( 'course' ) );
 
-        }else{
+        } else{
 
             // in this instance it is probably just one post type in string format
             $new_post_types =  array( $current_post_types , 'course');
@@ -979,7 +982,7 @@ 
                     $course_learner_ids[] = $user->ID;
                 }
 
-            }else{
+            } else{
 
                 $user = get_userdata( $activity_comments->user_id );
                 $course_learner_ids[] = $user->ID;
@@ -996,7 +999,7 @@ 
 
             $args[ 'include'] = array( 0 );
 
-        }else{
+        } else{
 
             $args[ 'include'] = $learner_ids_for_teacher_courses;
 
@@ -1164,7 +1167,7 @@ 
 
                 $teachers_courses[] = $course->ID;
 
-            }else{
+            } else{
 
                 $teachers_courses[] = $course;
 
@@ -1534,7 +1537,7 @@ 
 
             return true;
 
-        }else{
+        } else{
 
             return false;
 

Indentation +1339 added lines, -1339 removed lines

@@ -14,251 +14,251 @@ 
  */
 class Sensei_Teacher {
 
-    /**
-     * $teacher_role
-     *
-     * Keeps a reference to the teacher role object
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    protected $teacher_role;
-
-    /**
-     * $token
-     *
-     * Keeps a reference to the global sensei token
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    public  $token;
-
-    /**
-     * Sensei_Teacher::__constructor
-     *
-     * Constructor Function
-     *
-     * @since 1.8.0
-     * @access public
-     */
-    public function __construct ( ) {
-
-        add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
-        add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
-        add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
-        add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
-        add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
-
-        add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
-
-        //filter the quiz submissions
-        add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
-
-        //grading totals count only those belonging to the teacher
-        add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
-
-        // show the courses owned by a user on his author archive page
-        add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
-
-        // notify admin when a teacher creates a course
-        add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
-
-        // limit the analysis view to only the users taking courses belong to this teacher
-        add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
-
-        // give teacher access to question post type
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
-
-        // Teacher column on the courses list on the admin edit screen
-        add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
-        add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
-
-        //admin edit messages query limit teacher
-        add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
-
-        //add filter by teacher on courses list
-        add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
-        add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
-
-        // Handle media library restrictions
-        add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
-        add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
-
-        // update lesson owner to course teacher when saved
-        add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
-
-        // If a Teacher logs in, redirect to /wp-admin/
-        add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
-
-
-        add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
-        add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
-
-
-    } // end __constructor()
-
-    /**
-     * Sensei_Teacher::create_teacher_role
-     *
-     * This function checks if the role exist, if not it creates it.
-     * for the teacher role
-     *
-     * @since 1.8.0
-     * @access public
-     * @return void
-     */
-    public function create_role ( ) {
-
-        // check if the role exists
-        $this->teacher_role = get_role( 'teacher' );
-
-        // if the the teacher is not a valid WordPress role create it
-       if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
-           // create the role
-           $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
-       }
-
-       // add the capabilities before returning
-        $this->add_capabilities();
-
-    }// end create_teacher_role
-
-    /**
-     * Sensei_Teacher::add_capabilities
-     *
-     * @since 1.8.0
-     * @access protected
-     */
-    protected function add_capabilities ( ) {
-
-        // if this is not a valid WP_Role object exit without adding anything
-        if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
-            return;
-        }
-
-        /**
-         * Sensei teachers capabilities array filter
-         *
-         * These capabilities will be applied to the teacher role
-         * @param array $capabilities
-         * keys: (string) $cap_name => (bool) $grant
-         */
-        $caps = apply_filters( 'sensei_teacher_role_capabilities', array(
-            // General access rules
-            'read' => true,
-            'manage_sensei_grades' => true,
-            'moderate_comments'=> true,
-            'upload_files'	=> true,
-            'edit_files'	=> true,
-
-            //Lessons
-            'publish_lessons'	 => true,
-            'manage_lesson_categories'	 => true,
-            'edit_lessons'	 => true,
-            'edit_published_lessons'  => true,
-            'edit_private_lessons' => true,
-            'read_private_lessons' => true,
-            'delete_published_lessons' => true,
-
-            // Courses
-            'create_courses' => true,
-            'publish_courses'	 => false,
-            'manage_course_categories'	 => true,
-            'edit_courses'	 => true,
-            'edit_published_courses'  => true,
-            'edit_private_courses' => true,
-            'read_private_courses' => true,
-            'delete_published_courses' => true,
-
-            // Quiz
-            'publish_quizzes'	 => true,
-            'edit_quizzes'	 => true,
-            'edit_published_quizzes'  => true,
-            'edit_private_quizzes' => true,
-            'read_private_quizzes' => true,
-
-            // Questions
-            'publish_questions'	 => true,
-            'edit_questions'	 => true,
-            'edit_published_questions'  => true,
-            'edit_private_questions' => true,
-            'read_private_questions' => true,
-
-            //messages
-            'publish_sensei_messages'	 => true,
-            'edit_sensei_messages'	 => true,
-            'edit_published_sensei_messages'  => true,
-            'edit_private_sensei_messages' => true,
-            'read_private_sensei_messages' => true,
-
-            // Comments -
-            // Necessary cap so Teachers can moderate comments
-            // on their own lessons. We restrict access to other
-            // post types in $this->restrict_posts_menu_page()
-
-            'edit_posts' => true,
-
-        ));
-
-        foreach ( $caps as $cap => $grant ) {
-
-            // load the capability on to the teacher role
-            $this->teacher_role->add_cap($cap, $grant);
-
-        } // end for each
-
-    }// end add_cap
-
-    /**
-     * Sensei_Teacher::teacher_meta_box
-     *
-     * Add the teacher metabox to the course post type edit screen
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameter string $post_type
-     * @parameter WP_Post $post
-     * @return void
-     */
-    public function add_teacher_meta_boxes ( $post ) {
-
-        if( !current_user_can('manage_options') ){
-            return;
-        }
-        add_meta_box( 'sensei-teacher',  __( 'Teacher' , $this->token ),  array( $this , 'teacher_meta_box_content' ),
-            'course',
-            'side',
-            'core'
-        );
-
-    } // end teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::teacher_meta_box_content
-     *
-     * Render the teacher meta box markup
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     */
-    public function teacher_meta_box_content ( $post ) {
-
-        // get the current author
-        $current_author = $post->post_author;
-
-        //get the users authorised to author courses
-        $users = $this->get_teachers_and_authors();
-
-    ?>
+	/**
+	 * $teacher_role
+	 *
+	 * Keeps a reference to the teacher role object
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	protected $teacher_role;
+
+	/**
+	 * $token
+	 *
+	 * Keeps a reference to the global sensei token
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	public  $token;
+
+	/**
+	 * Sensei_Teacher::__constructor
+	 *
+	 * Constructor Function
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 */
+	public function __construct ( ) {
+
+		add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
+		add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
+		add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
+		add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
+		add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
+
+		add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
+
+		//filter the quiz submissions
+		add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
+
+		//grading totals count only those belonging to the teacher
+		add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
+
+		// show the courses owned by a user on his author archive page
+		add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
+
+		// notify admin when a teacher creates a course
+		add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
+
+		// limit the analysis view to only the users taking courses belong to this teacher
+		add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
+
+		// give teacher access to question post type
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
+
+		// Teacher column on the courses list on the admin edit screen
+		add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
+		add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
+
+		//admin edit messages query limit teacher
+		add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
+
+		//add filter by teacher on courses list
+		add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
+		add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
+
+		// Handle media library restrictions
+		add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
+		add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
+
+		// update lesson owner to course teacher when saved
+		add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+
+		// If a Teacher logs in, redirect to /wp-admin/
+		add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
+
+
+		add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
+		add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
+
+
+	} // end __constructor()
+
+	/**
+	 * Sensei_Teacher::create_teacher_role
+	 *
+	 * This function checks if the role exist, if not it creates it.
+	 * for the teacher role
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @return void
+	 */
+	public function create_role ( ) {
+
+		// check if the role exists
+		$this->teacher_role = get_role( 'teacher' );
+
+		// if the the teacher is not a valid WordPress role create it
+	   if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
+		   // create the role
+		   $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
+	   }
+
+	   // add the capabilities before returning
+		$this->add_capabilities();
+
+	}// end create_teacher_role
+
+	/**
+	 * Sensei_Teacher::add_capabilities
+	 *
+	 * @since 1.8.0
+	 * @access protected
+	 */
+	protected function add_capabilities ( ) {
+
+		// if this is not a valid WP_Role object exit without adding anything
+		if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
+			return;
+		}
+
+		/**
+		 * Sensei teachers capabilities array filter
+		 *
+		 * These capabilities will be applied to the teacher role
+		 * @param array $capabilities
+		 * keys: (string) $cap_name => (bool) $grant
+		 */
+		$caps = apply_filters( 'sensei_teacher_role_capabilities', array(
+			// General access rules
+			'read' => true,
+			'manage_sensei_grades' => true,
+			'moderate_comments'=> true,
+			'upload_files'	=> true,
+			'edit_files'	=> true,
+
+			//Lessons
+			'publish_lessons'	 => true,
+			'manage_lesson_categories'	 => true,
+			'edit_lessons'	 => true,
+			'edit_published_lessons'  => true,
+			'edit_private_lessons' => true,
+			'read_private_lessons' => true,
+			'delete_published_lessons' => true,
+
+			// Courses
+			'create_courses' => true,
+			'publish_courses'	 => false,
+			'manage_course_categories'	 => true,
+			'edit_courses'	 => true,
+			'edit_published_courses'  => true,
+			'edit_private_courses' => true,
+			'read_private_courses' => true,
+			'delete_published_courses' => true,
+
+			// Quiz
+			'publish_quizzes'	 => true,
+			'edit_quizzes'	 => true,
+			'edit_published_quizzes'  => true,
+			'edit_private_quizzes' => true,
+			'read_private_quizzes' => true,
+
+			// Questions
+			'publish_questions'	 => true,
+			'edit_questions'	 => true,
+			'edit_published_questions'  => true,
+			'edit_private_questions' => true,
+			'read_private_questions' => true,
+
+			//messages
+			'publish_sensei_messages'	 => true,
+			'edit_sensei_messages'	 => true,
+			'edit_published_sensei_messages'  => true,
+			'edit_private_sensei_messages' => true,
+			'read_private_sensei_messages' => true,
+
+			// Comments -
+			// Necessary cap so Teachers can moderate comments
+			// on their own lessons. We restrict access to other
+			// post types in $this->restrict_posts_menu_page()
+
+			'edit_posts' => true,
+
+		));
+
+		foreach ( $caps as $cap => $grant ) {
+
+			// load the capability on to the teacher role
+			$this->teacher_role->add_cap($cap, $grant);
+
+		} // end for each
+
+	}// end add_cap
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box
+	 *
+	 * Add the teacher metabox to the course post type edit screen
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameter string $post_type
+	 * @parameter WP_Post $post
+	 * @return void
+	 */
+	public function add_teacher_meta_boxes ( $post ) {
+
+		if( !current_user_can('manage_options') ){
+			return;
+		}
+		add_meta_box( 'sensei-teacher',  __( 'Teacher' , $this->token ),  array( $this , 'teacher_meta_box_content' ),
+			'course',
+			'side',
+			'core'
+		);
+
+	} // end teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box_content
+	 *
+	 * Render the teacher meta box markup
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 */
+	public function teacher_meta_box_content ( $post ) {
+
+		// get the current author
+		$current_author = $post->post_author;
+
+		//get the users authorised to author courses
+		$users = $this->get_teachers_and_authors();
+
+	?>
         <select name="sensei-course-teacher-author" class="sensei course teacher">
 
             <?php foreach ( $users as $user_id ) { ?>
 
                     <?php
-                        $user = get_user_by('id', $user_id);
-                    ?>
+						$user = get_user_by('id', $user_id);
+					?>
                     <option <?php selected(  $current_author , $user_id , true ); ?> value="<?php echo $user_id; ?>" >
                         <?php echo  $user->display_name; ?>
                     </option>
@@ -269,1289 +269,1289 @@ 
 
         <?php
 
-    } // end render_teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::get_teachers_and_authors
-     *
-     * Get a list of users who can author courses, lessons and quizes.
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function get_teachers_and_authors ( ){
-
-        $author_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'who'          => 'authors'
-        );
-
-        $authors = get_users( $author_query_args );
-
-        $teacher_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'role'         => 'teacher',
-        );
-
-        $teachers = get_users( $teacher_query_args );
-
-        return  array_unique( array_merge( $teachers, $authors ) );
-
-    }// end get_teachers_and_authors
-
-    /**
-     * Sensei_Teacher::save_teacher_meta_box
-     *
-     * Save the new teacher / author to course and all lessons
-     *
-     * Hooked into admin_init
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function save_teacher_meta_box ( $course_id ){
+	} // end render_teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::get_teachers_and_authors
+	 *
+	 * Get a list of users who can author courses, lessons and quizes.
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function get_teachers_and_authors ( ){
+
+		$author_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'who'          => 'authors'
+		);
+
+		$authors = get_users( $author_query_args );
+
+		$teacher_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'role'         => 'teacher',
+		);
+
+		$teachers = get_users( $teacher_query_args );
+
+		return  array_unique( array_merge( $teachers, $authors ) );
+
+	}// end get_teachers_and_authors
+
+	/**
+	 * Sensei_Teacher::save_teacher_meta_box
+	 *
+	 * Save the new teacher / author to course and all lessons
+	 *
+	 * Hooked into admin_init
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function save_teacher_meta_box ( $course_id ){
 
-        // check if this is a post from saving the teacher, if not exit early
-        if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
-            return;
-        }
+		// check if this is a post from saving the teacher, if not exit early
+		if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
+			return;
+		}
 
-        //don't fire this hook again
-        remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
+		//don't fire this hook again
+		remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
 
-        // get the current post object
-        $post = get_post( $course_id );
+		// get the current post object
+		$post = get_post( $course_id );
 
-        // get the current teacher/author
-        $current_author = absint( $post->post_author );
-        $new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
+		// get the current teacher/author
+		$current_author = absint( $post->post_author );
+		$new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
 
-        // loop through all post lessons to update their authors as well
-        $this->update_course_lessons_author( $course_id , $new_author );
+		// loop through all post lessons to update their authors as well
+		$this->update_course_lessons_author( $course_id , $new_author );
 
-        // do not do any processing if the selected author is the same as the current author
-        if( $current_author == $new_author ){
-            return;
-        }
+		// do not do any processing if the selected author is the same as the current author
+		if( $current_author == $new_author ){
+			return;
+		}
 
-        // save the course  author
-        $post_updates = array(
-            'ID' => $post->ID ,
-            'post_author' => $new_author
-        );
-        wp_update_post( $post_updates );
+		// save the course  author
+		$post_updates = array(
+			'ID' => $post->ID ,
+			'post_author' => $new_author
+		);
+		wp_update_post( $post_updates );
 
-        // ensure the the modules are update so that then new teacher has access to them
-        Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
+		// ensure the the modules are update so that then new teacher has access to them
+		Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
 
-        // notify the new teacher
-        $this->teacher_course_assigned_notification( $new_author, $course_id );
+		// notify the new teacher
+		$this->teacher_course_assigned_notification( $new_author, $course_id );
 
-    } // end save_teacher_meta_box
+	} // end save_teacher_meta_box
 
-    /**
-     * Update all the course terms set(selected) on the given course. Moving course term ownership to
-     * the new author. Making sure the course terms are maintained.
-     *
-     * This function also checks if terms are shared, with other courses
-     *
-     * @param $course_id
-     * @param $new_teacher_id
-     * @return void
-     */
-    public static function update_course_modules_author( $course_id ,$new_teacher_id ){
+	/**
+	 * Update all the course terms set(selected) on the given course. Moving course term ownership to
+	 * the new author. Making sure the course terms are maintained.
+	 *
+	 * This function also checks if terms are shared, with other courses
+	 *
+	 * @param $course_id
+	 * @param $new_teacher_id
+	 * @return void
+	 */
+	public static function update_course_modules_author( $course_id ,$new_teacher_id ){
 
-        if( empty( $course_id ) || empty( $new_teacher_id ) ){
-            return false;
-        }
+		if( empty( $course_id ) || empty( $new_teacher_id ) ){
+			return false;
+		}
 
-        $terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
+		$terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
 
-        if( empty( $terms_selected_on_course ) ){
-            return;
-        }
+		if( empty( $terms_selected_on_course ) ){
+			return;
+		}
 
-        foreach( $terms_selected_on_course as $term ){
+		foreach( $terms_selected_on_course as $term ){
 
-            $term_author = Sensei_Core_Modules::get_term_author( $term->slug );
-            if( $new_teacher_id != $term_author->ID  ){
+			$term_author = Sensei_Core_Modules::get_term_author( $term->slug );
+			if( $new_teacher_id != $term_author->ID  ){
 
-                $new_term = '';
+				$new_term = '';
 
-                //if the new teacher is admin first check to see if the term with this name already exists
-                if( user_can( $new_teacher_id, 'manage_options' ) ){
+				//if the new teacher is admin first check to see if the term with this name already exists
+				if( user_can( $new_teacher_id, 'manage_options' ) ){
 
-                    $slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
-                    $term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
-                    $existing_admin_terms = get_terms( 'module', $term_args );
-                    if( !empty( $existing_admin_terms ) ){
-                        // insert it even if it exists
-                        $new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
-                    }
-                }
+					$slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
+					$term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
+					$existing_admin_terms = get_terms( 'module', $term_args );
+					if( !empty( $existing_admin_terms ) ){
+						// insert it even if it exists
+						$new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
+					}
+				}
 
-                if( empty ( $new_term ) ){
+				if( empty ( $new_term ) ){
 
-                   //setup the new slug
-                   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
-
-                   // create new term and set it
-                   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
-
-                }
+				   //setup the new slug
+				   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
+
+				   // create new term and set it
+				   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
+
+				}
 
 
 
-                // if term exists
-                if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
+				// if term exists
+				if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
 
-                    $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
-                    $term_id = $existing_term->term_id;
+					$existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
+					$term_id = $existing_term->term_id;
 
-                }else{
+				}else{
 
-                    // for a new term simply get the term from the returned value
-                    $term_id = $new_term['term_id'];
+					// for a new term simply get the term from the returned value
+					$term_id = $new_term['term_id'];
 
-                } // end if term exist
+				} // end if term exist
 
-                // set the terms selected on the course
-                wp_set_object_terms( $course_id, $term_id , 'module', true );
+				// set the terms selected on the course
+				wp_set_object_terms( $course_id, $term_id , 'module', true );
 
-                // remove old term
-                wp_remove_object_terms( $course_id, $term->term_id, 'module' );
+				// remove old term
+				wp_remove_object_terms( $course_id, $term->term_id, 'module' );
 
-                // update the lessons within the current module term
-                $lessons = Sensei()->course->course_lessons( $course_id );
-                foreach( $lessons as $lesson  ){
+				// update the lessons within the current module term
+				$lessons = Sensei()->course->course_lessons( $course_id );
+				foreach( $lessons as $lesson  ){
 
-                    if( has_term( $term->slug, 'module', $lesson ) ){
+					if( has_term( $term->slug, 'module', $lesson ) ){
 
-                        // add the new term, the false at the end says to replace all terms on this module
-                        // with the new term.
-                        wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
-                        update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
-                    }
+						// add the new term, the false at the end says to replace all terms on this module
+						// with the new term.
+						wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
+						update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
+					}
 
-                }// end for each
+				}// end for each
 
-            }
-        }
+			}
+		}
 
-    }// end update_course_module_terms_author
+	}// end update_course_module_terms_author
 
-    /**
-     * Sensei_Teacher::update_course_lessons_author
-     *
-     * Update all course lessons and their quiz with a new author
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function update_course_lessons_author ( $course_id, $new_author  ){
+	/**
+	 * Sensei_Teacher::update_course_lessons_author
+	 *
+	 * Update all course lessons and their quiz with a new author
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function update_course_lessons_author ( $course_id, $new_author  ){
 
 
-        if( empty( $course_id ) || empty( $new_author ) ){
-            return false;
-        }
+		if( empty( $course_id ) || empty( $new_author ) ){
+			return false;
+		}
 
-        //get a list of course lessons
-        $lessons = Sensei()->course->course_lessons( $course_id );
+		//get a list of course lessons
+		$lessons = Sensei()->course->course_lessons( $course_id );
 
-        if( empty( $lessons )  ||  ! is_array( $lessons )  ){
-            return false;
-        }
+		if( empty( $lessons )  ||  ! is_array( $lessons )  ){
+			return false;
+		}
 
-        // update each lesson and quiz author
-        foreach( $lessons as $lesson ){
+		// update each lesson and quiz author
+		foreach( $lessons as $lesson ){
 
-            // don't update if the author is tha same as the new author
-            if( $new_author == $lesson->post_author ){
-                continue;
-            }
+			// don't update if the author is tha same as the new author
+			if( $new_author == $lesson->post_author ){
+				continue;
+			}
 
-            // update lesson author
-            wp_update_post( array(
-                'ID'=> $lesson->ID,
-                'post_author' => $new_author
-                ) );
+			// update lesson author
+			wp_update_post( array(
+				'ID'=> $lesson->ID,
+				'post_author' => $new_author
+				) );
 
-            // update quiz author
-            //get the lessons quiz
-            $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-            if( is_array( $lesson_quizzes ) ){
-                foreach ( $lesson_quizzes as $quiz_id ) {
-                    // update quiz with new author
-                    wp_update_post( array(
-                        'ID'           => $quiz_id,
-                        'post_author' =>  $new_author
-                    ) );
-                }
-            }else{
-                wp_update_post( array(
-                    'ID'           => $lesson_quizzes,
-                    'post_author' =>  $new_author
-                ) );
-            }
+			// update quiz author
+			//get the lessons quiz
+			$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+			if( is_array( $lesson_quizzes ) ){
+				foreach ( $lesson_quizzes as $quiz_id ) {
+					// update quiz with new author
+					wp_update_post( array(
+						'ID'           => $quiz_id,
+						'post_author' =>  $new_author
+					) );
+				}
+			}else{
+				wp_update_post( array(
+					'ID'           => $lesson_quizzes,
+					'post_author' =>  $new_author
+				) );
+			}
 
-        } // end for each lessons
+		} // end for each lessons
 
-        return true;
+		return true;
 
-    }// end update_course_lessons_author
-
-
-
-    /**
-     * Sensei_Teacher::course_analysis_teacher_access_limit
-     *
-     * Alter the query so that users can only see their courses on the analysis page
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters $query
-     * @return array $users user id array
-     */
-    public function course_analysis_teacher_access_limit ( $query ) {
-
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-            return $query;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $query;
-        }
-
-        $screen = get_current_screen();
-        $sensei_post_types = array('course', 'lesson', 'question' );
-
-        // exit early for the following conditions
-        $limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
-
-        if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
-            || ! in_array( $query->query['post_type'], $sensei_post_types ) ){
-            return $query;
-        }
-
-        global $current_user;
-        // set the query author to the current user to only show those those posts
-        $query->set( 'author', $current_user->ID );
-        return $query;
-
-    }// end course_analysis_teacher_access_limit
-
-
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Determine if we're in admin and the current logged in use is a teacher
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return bool $is_admin_teacher
-     */
-    public function is_admin_teacher ( ){
-
-        if( ! is_user_logged_in()){
-            return false;
-        }
-        $is_admin_teacher = false;
-
-        if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
-
-            $is_admin_teacher = true;
-
-        }
-
-        return $is_admin_teacher;
-
-    } // end is_admin_teacher
-
-    /**
-     * Show correct post counts on list table for Sensei post types
-     *
-     * @since 1.8.0
-     *
-     * @param  object $counts Default status counts
-     * @param  string $type   Current post type
-     * @param  string $perm   User permission level
-     * @return object         Modified status counts
-     */
-    public function list_table_counts( $counts, $type, $perm ) {
-        global $current_user;
-
-        if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
-            return $counts;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $counts;
-        }
-
-        $args = array(
-            'post_type' => $type,
-            'author' => $current_user->ID,
-            'posts_per_page' => -1
-        );
-
-         // Get all available statuses
-        $stati = get_post_stati();
-
-        // Update count object
-        foreach( $stati as $status ) {
-            $args['post_status'] = $status;
-            $posts = get_posts( $args );
-            $counts->$status = count( $posts );
-        }
-
-        return $counts;
-    }
-
-    /**
-     * Filter the post queries to show
-     * only lesson /course and users that belong
-     * to the current logged teacher.
-     *
-     * @since 1.8.0
-     *
-     */
-    public function filter_queries ( $query ) {
-        global $current_user;
-
-        if( ! $this->is_admin_teacher() ) {
-            return;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return;
-        }
-
-        $screen = get_current_screen();
-        if( empty( $screen ) ) {
-            return $query;
-        }
-        switch( $screen->id ) {
-            case 'sensei_page_sensei_grading':
-            case 'sensei_page_sensei_analysis':
-            case 'sensei_page_sensei_learners':
-            case 'lesson':
-            case 'course':
-            case 'question':
-            case 'lesson_page_module-order':
-
-            /**
-             * sensei_filter_queries_set_author
-             * Filter the author Sensei set for queries
-             *
-             * @since 1.8.0
-             *
-             * @param int $user_id
-             * @param string $screen_id
-             *
-             */
-            $query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
-            break;
-        }
-    }
-
-    /**
-     * Limit grading quizzes to only those within courses belonging to the current teacher
-     * . This excludes the admin user.
-     *
-     * @since 1.8.0
-     * @hooked into the_comments
-     * @param array  $comments
-     *
-     * @return array $comments
-     */
-    public function filter_grading_activity_queries( $comments ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
-            return $comments ;
-        }
-
-        //check if we're on the grading screen
-        $screen = get_current_screen();
-
-        if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
-            return $comments;
-        }
-
-        // get the course and determine if the current teacher is the owner
-        // if not remove it from the list of comments to be returned
-        foreach( $comments as $key => $comment){
-            $lesson = get_post( $comment->comment_post_ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson->ID );
-            $course = get_post( $course_id );
-            if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
-                //remove this as the teacher should see this.
-                unset( $comments[ $key ] );
-            }
-        }
-        return $comments ;
-
-    }// end function filter grading
-
-    /**
-     * Limit the grading screen totals to only show lessons in the course
-     * belonging to the currently logged in teacher. This only applies to
-     * the teacher role.
-     *
-     * @since 1.8.0
-     *
-     * @hooked into sensei_count_statuses_args
-     * @param array $args
-     *
-     * @return array  $args
-     */
-    public function limit_grading_totals( $args ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
-            return $args ;
-        }
-
-        //get the teachers courses
-        // the query is already filtered to only the teacher
-        $courses =  Sensei()->course->get_all_courses();
-
-        if( empty(  $courses ) || ! is_array( $courses ) ){
-            return $args;
-        }
-
-        //setup the lessons quizzes  to limit the grading totals to
-        $quiz_scope = array();
-        foreach( $courses as $course ){
-
-            $course_lessons = Sensei()->course->course_lessons( $course->ID );
-
-            if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
-
-                foreach(  $course_lessons as $lesson ){
-
-                    $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-                    if( !empty( $quiz_id ) ) {
-
-                        array_push( $quiz_scope, $quiz_id );
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        $args['post__in'] = $quiz_scope;
-
-        return $args;
-    }
-
-    /**
-     * It ensures that the author archive shows course by the current user.
-     *
-     * This function is hooked into the pre_get_posts filter
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public function add_courses_to_author_archive( $query ) {
-
-        if ( is_admin() || ! $query->is_author() ){
-            return $query;
-        }
-
-        // this should only apply to users with the teacher role
-        $current_page_user = get_user_by('login', $query->get('author_name') );
-        if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
-
-            return $query;
-
-        }
-
-        // Change post types depending on what is set already
-        $current_post_types = $query->get( 'post_type' );
-        if( empty( $current_post_types  ) ){
-
-            // if empty it means post by default, so add post so that it also includes that for now
-            $new_post_types = array( 'post', 'course' );
-
-        } elseif( is_array( $current_post_types  ) ) {
-
-            // merge the post types instead of overwriting it
-            $new_post_types = array_merge( $current_post_types, array( 'course' ) );
-
-        }else{
-
-            // in this instance it is probably just one post type in string format
-            $new_post_types =  array( $current_post_types , 'course');
-
-        }
-
-        // change the query before returning it
-        $query->set('post_type', $new_post_types );
-
-        /**
-         * Change the query on the teacher author archive template
-         *
-         * @since 1.8.4
-         * @param WP_Query $query
-         */
-        return apply_filters( 'sensei_teacher_archive_query', $query );
-
-    }
-
-    /**
-     * Notify teacher when someone assigns a course to their account.
-     *
-     * @since 1.8.0
-     *
-     * @param $teacher_id
-     * @param $course_id
-     * @return bool
-     */
-    public function teacher_course_assigned_notification( $teacher_id, $course_id ){
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
-            return false;
-        }
-
-        // if new user is the same as the current logged user, they don't need an email
-        if( $teacher_id == get_current_user_id() ){
-            return true;
-        }
-
-        // load the email class
-        include('emails/class-woothemes-sensei-teacher-new-course-assignment.php');
-        $email = new Teacher_New_Course_Assignment();
-        $email->trigger( $teacher_id, $course_id );
-
-        return true;
-    } // end  teacher_course_assigned_notification
-
-    /**
-     * Email the admin when a teacher creates a new course
-     *
-     * This function hooks into wp_insert_post
-     *
-     * @since 1.8.0
-     * @param int $course_id
-     * @return bool
-     */
-    public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
-
-        $course_id = $post->ID;
-
-        if( 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
-            || 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
-
-            return false;
-
-        }
-
-        /**
-         * Filter the option to send admin notification emails when teachers creation
-         * course.
-         *
-         * @since 1.8.0
-         *
-         * @param bool $on default true
-         */
-        if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
-            return false;
-        }
-
-        // setting up the data needed by the email template
-        global $sensei_email_data;
-        $template = 'admin-teacher-new-course-created';
-        $course = get_post( $course_id );
-        $teacher = new WP_User( $course->post_author );
-        $recipient = get_option('admin_email', true);
-
-        // don't send if the course is created by admin
-        if( $recipient == $teacher->user_email ){
-            return;
-        }
-
-        /**
-         * Filter the email Header for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $template
-         */
-        $heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
-
-        /**
-         * Filter the email subject for the the
-         * admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $subject default New course assigned to you
-         * @param string $template
-         */
-        $subject = apply_filters('sensei_email_subject',
-                                '['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
-                                $template );
-
-        //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
-
-        // Construct data array
-        $email_data = array(
-            'template'			=> $template,
-            'heading' =>  $heading,
-            'teacher'		=> $teacher,
-            'course_id'			=> $course_id,
-            'course_name'			=> $course->post_title,
-            'course_edit_link' => $course_edit_link,
-        );
-
-        /**
-         * Filter the sensei email data for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param array $email_data
-         * @param string $template
-         */
-        $sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
-
-        // Send mail
-        Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
-
-    }// end notify admin of course creation
-
-    /**
-     * Limit the analysis view to only the users taking courses belong to this teacher
-     *
-     * Hooked into sensei_analysis_get_learners
-     * @param array $args WP_User_Query arguments
-     * @return array $learners_query_results
-     */
-    public function limit_analysis_learners( $args ){
-
-        // show default for none teachers
-        if( ! Sensei()->teacher->is_admin_teacher() ) {
-                return $args;
-        }
-
-        // for teachers all courses only return those which belong to the teacher
-        // as they don't have access to course belonging to other users
-        $teacher_courses = Sensei()->course->get_all_courses();
+	}// end update_course_lessons_author
+
+
+
+	/**
+	 * Sensei_Teacher::course_analysis_teacher_access_limit
+	 *
+	 * Alter the query so that users can only see their courses on the analysis page
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters $query
+	 * @return array $users user id array
+	 */
+	public function course_analysis_teacher_access_limit ( $query ) {
+
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+			return $query;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $query;
+		}
+
+		$screen = get_current_screen();
+		$sensei_post_types = array('course', 'lesson', 'question' );
+
+		// exit early for the following conditions
+		$limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
+
+		if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
+			|| ! in_array( $query->query['post_type'], $sensei_post_types ) ){
+			return $query;
+		}
+
+		global $current_user;
+		// set the query author to the current user to only show those those posts
+		$query->set( 'author', $current_user->ID );
+		return $query;
+
+	}// end course_analysis_teacher_access_limit
+
+
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Determine if we're in admin and the current logged in use is a teacher
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return bool $is_admin_teacher
+	 */
+	public function is_admin_teacher ( ){
+
+		if( ! is_user_logged_in()){
+			return false;
+		}
+		$is_admin_teacher = false;
+
+		if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
+
+			$is_admin_teacher = true;
+
+		}
+
+		return $is_admin_teacher;
+
+	} // end is_admin_teacher
+
+	/**
+	 * Show correct post counts on list table for Sensei post types
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  object $counts Default status counts
+	 * @param  string $type   Current post type
+	 * @param  string $perm   User permission level
+	 * @return object         Modified status counts
+	 */
+	public function list_table_counts( $counts, $type, $perm ) {
+		global $current_user;
+
+		if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
+			return $counts;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $counts;
+		}
+
+		$args = array(
+			'post_type' => $type,
+			'author' => $current_user->ID,
+			'posts_per_page' => -1
+		);
+
+		 // Get all available statuses
+		$stati = get_post_stati();
+
+		// Update count object
+		foreach( $stati as $status ) {
+			$args['post_status'] = $status;
+			$posts = get_posts( $args );
+			$counts->$status = count( $posts );
+		}
+
+		return $counts;
+	}
+
+	/**
+	 * Filter the post queries to show
+	 * only lesson /course and users that belong
+	 * to the current logged teacher.
+	 *
+	 * @since 1.8.0
+	 *
+	 */
+	public function filter_queries ( $query ) {
+		global $current_user;
+
+		if( ! $this->is_admin_teacher() ) {
+			return;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return;
+		}
+
+		$screen = get_current_screen();
+		if( empty( $screen ) ) {
+			return $query;
+		}
+		switch( $screen->id ) {
+			case 'sensei_page_sensei_grading':
+			case 'sensei_page_sensei_analysis':
+			case 'sensei_page_sensei_learners':
+			case 'lesson':
+			case 'course':
+			case 'question':
+			case 'lesson_page_module-order':
+
+			/**
+			 * sensei_filter_queries_set_author
+			 * Filter the author Sensei set for queries
+			 *
+			 * @since 1.8.0
+			 *
+			 * @param int $user_id
+			 * @param string $screen_id
+			 *
+			 */
+			$query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
+			break;
+		}
+	}
+
+	/**
+	 * Limit grading quizzes to only those within courses belonging to the current teacher
+	 * . This excludes the admin user.
+	 *
+	 * @since 1.8.0
+	 * @hooked into the_comments
+	 * @param array  $comments
+	 *
+	 * @return array $comments
+	 */
+	public function filter_grading_activity_queries( $comments ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
+			return $comments ;
+		}
+
+		//check if we're on the grading screen
+		$screen = get_current_screen();
+
+		if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
+			return $comments;
+		}
+
+		// get the course and determine if the current teacher is the owner
+		// if not remove it from the list of comments to be returned
+		foreach( $comments as $key => $comment){
+			$lesson = get_post( $comment->comment_post_ID );
+			$course_id = Sensei()->lesson->get_course_id( $lesson->ID );
+			$course = get_post( $course_id );
+			if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
+				//remove this as the teacher should see this.
+				unset( $comments[ $key ] );
+			}
+		}
+		return $comments ;
+
+	}// end function filter grading
+
+	/**
+	 * Limit the grading screen totals to only show lessons in the course
+	 * belonging to the currently logged in teacher. This only applies to
+	 * the teacher role.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @hooked into sensei_count_statuses_args
+	 * @param array $args
+	 *
+	 * @return array  $args
+	 */
+	public function limit_grading_totals( $args ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
+			return $args ;
+		}
+
+		//get the teachers courses
+		// the query is already filtered to only the teacher
+		$courses =  Sensei()->course->get_all_courses();
+
+		if( empty(  $courses ) || ! is_array( $courses ) ){
+			return $args;
+		}
+
+		//setup the lessons quizzes  to limit the grading totals to
+		$quiz_scope = array();
+		foreach( $courses as $course ){
+
+			$course_lessons = Sensei()->course->course_lessons( $course->ID );
+
+			if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
+
+				foreach(  $course_lessons as $lesson ){
+
+					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+					if( !empty( $quiz_id ) ) {
+
+						array_push( $quiz_scope, $quiz_id );
+
+					}
+
+				}
+
+			}
+
+		}
+
+		$args['post__in'] = $quiz_scope;
+
+		return $args;
+	}
+
+	/**
+	 * It ensures that the author archive shows course by the current user.
+	 *
+	 * This function is hooked into the pre_get_posts filter
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public function add_courses_to_author_archive( $query ) {
+
+		if ( is_admin() || ! $query->is_author() ){
+			return $query;
+		}
+
+		// this should only apply to users with the teacher role
+		$current_page_user = get_user_by('login', $query->get('author_name') );
+		if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
+
+			return $query;
+
+		}
+
+		// Change post types depending on what is set already
+		$current_post_types = $query->get( 'post_type' );
+		if( empty( $current_post_types  ) ){
+
+			// if empty it means post by default, so add post so that it also includes that for now
+			$new_post_types = array( 'post', 'course' );
+
+		} elseif( is_array( $current_post_types  ) ) {
+
+			// merge the post types instead of overwriting it
+			$new_post_types = array_merge( $current_post_types, array( 'course' ) );
+
+		}else{
+
+			// in this instance it is probably just one post type in string format
+			$new_post_types =  array( $current_post_types , 'course');
+
+		}
+
+		// change the query before returning it
+		$query->set('post_type', $new_post_types );
+
+		/**
+		 * Change the query on the teacher author archive template
+		 *
+		 * @since 1.8.4
+		 * @param WP_Query $query
+		 */
+		return apply_filters( 'sensei_teacher_archive_query', $query );
+
+	}
+
+	/**
+	 * Notify teacher when someone assigns a course to their account.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $teacher_id
+	 * @param $course_id
+	 * @return bool
+	 */
+	public function teacher_course_assigned_notification( $teacher_id, $course_id ){
+
+		if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
+			return false;
+		}
+
+		// if new user is the same as the current logged user, they don't need an email
+		if( $teacher_id == get_current_user_id() ){
+			return true;
+		}
+
+		// load the email class
+		include('emails/class-woothemes-sensei-teacher-new-course-assignment.php');
+		$email = new Teacher_New_Course_Assignment();
+		$email->trigger( $teacher_id, $course_id );
+
+		return true;
+	} // end  teacher_course_assigned_notification
+
+	/**
+	 * Email the admin when a teacher creates a new course
+	 *
+	 * This function hooks into wp_insert_post
+	 *
+	 * @since 1.8.0
+	 * @param int $course_id
+	 * @return bool
+	 */
+	public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
+
+		$course_id = $post->ID;
+
+		if( 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
+			|| 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
+
+			return false;
+
+		}
+
+		/**
+		 * Filter the option to send admin notification emails when teachers creation
+		 * course.
+		 *
+		 * @since 1.8.0
+		 *
+		 * @param bool $on default true
+		 */
+		if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
+			return false;
+		}
+
+		// setting up the data needed by the email template
+		global $sensei_email_data;
+		$template = 'admin-teacher-new-course-created';
+		$course = get_post( $course_id );
+		$teacher = new WP_User( $course->post_author );
+		$recipient = get_option('admin_email', true);
+
+		// don't send if the course is created by admin
+		if( $recipient == $teacher->user_email ){
+			return;
+		}
+
+		/**
+		 * Filter the email Header for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $template
+		 */
+		$heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
+
+		/**
+		 * Filter the email subject for the the
+		 * admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $subject default New course assigned to you
+		 * @param string $template
+		 */
+		$subject = apply_filters('sensei_email_subject',
+								'['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
+								$template );
+
+		//course edit link
+		$course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+
+		// Construct data array
+		$email_data = array(
+			'template'			=> $template,
+			'heading' =>  $heading,
+			'teacher'		=> $teacher,
+			'course_id'			=> $course_id,
+			'course_name'			=> $course->post_title,
+			'course_edit_link' => $course_edit_link,
+		);
+
+		/**
+		 * Filter the sensei email data for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param array $email_data
+		 * @param string $template
+		 */
+		$sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
+
+		// Send mail
+		Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
+
+	}// end notify admin of course creation
+
+	/**
+	 * Limit the analysis view to only the users taking courses belong to this teacher
+	 *
+	 * Hooked into sensei_analysis_get_learners
+	 * @param array $args WP_User_Query arguments
+	 * @return array $learners_query_results
+	 */
+	public function limit_analysis_learners( $args ){
+
+		// show default for none teachers
+		if( ! Sensei()->teacher->is_admin_teacher() ) {
+				return $args;
+		}
+
+		// for teachers all courses only return those which belong to the teacher
+		// as they don't have access to course belonging to other users
+		$teacher_courses = Sensei()->course->get_all_courses();
 
-        // if the user has no courses they should see no users
-        if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
-            // tell the query to return 0 students
-            $args[ 'include'] = array( 0 );
-            return $args;
-
-        }
-
-        $learner_ids_for_teacher_courses = array();
-        foreach( $teacher_courses as $course ){
-
-            $course_learner_ids = array();
-            $activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
-
-            if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
-                continue; // skip to the next course as there are no users on this course
-            }
-
-            // it could be an array of comments or a single comment
-            if( is_array( $activity_comments ) ){
+		// if the user has no courses they should see no users
+		if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
+			// tell the query to return 0 students
+			$args[ 'include'] = array( 0 );
+			return $args;
+
+		}
+
+		$learner_ids_for_teacher_courses = array();
+		foreach( $teacher_courses as $course ){
+
+			$course_learner_ids = array();
+			$activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
+
+			if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
+				continue; // skip to the next course as there are no users on this course
+			}
+
+			// it could be an array of comments or a single comment
+			if( is_array( $activity_comments ) ){
 
-                foreach( $activity_comments as $comment ){
+				foreach( $activity_comments as $comment ){
 
-                    $user = get_userdata( $comment->user_id );
+					$user = get_userdata( $comment->user_id );
 
-                    if( empty( $user ) ){
-                        // next comment in this array
-                        continue;
-                    }
+					if( empty( $user ) ){
+						// next comment in this array
+						continue;
+					}
 
-                    $course_learner_ids[] = $user->ID;
-                }
+					$course_learner_ids[] = $user->ID;
+				}
 
-            }else{
+			}else{
 
-                $user = get_userdata( $activity_comments->user_id );
-                $course_learner_ids[] = $user->ID;
+				$user = get_userdata( $activity_comments->user_id );
+				$course_learner_ids[] = $user->ID;
 
-            }
+			}
 
-            // add learners on this course to the all courses learner list
-            $learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
+			// add learners on this course to the all courses learner list
+			$learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
 
-        }
+		}
 
-        // if there are no students taking the courses by this teacher don't show them any of the other users
-        if( empty( $learner_ids_for_teacher_courses ) ){
+		// if there are no students taking the courses by this teacher don't show them any of the other users
+		if( empty( $learner_ids_for_teacher_courses ) ){
 
-            $args[ 'include'] = array( 0 );
+			$args[ 'include'] = array( 0 );
 
-        }else{
+		}else{
 
-            $args[ 'include'] = $learner_ids_for_teacher_courses;
+			$args[ 'include'] = $learner_ids_for_teacher_courses;
 
-        }
+		}
 
-        // return the WP_Use_Query arguments
-        return $args;
+		// return the WP_Use_Query arguments
+		return $args;
 
-    }// end limit_analysis_learners
+	}// end limit_analysis_learners
 
-    /**
-     * Give teacher full admin access to the question post type
-     * in certain cases.
-     *
-     * @since 1.8.0
-     * @param $questions
-     * @return mixed
-     */
-    public function allow_teacher_access_to_questions( $questions, $quiz_id ){
+	/**
+	 * Give teacher full admin access to the question post type
+	 * in certain cases.
+	 *
+	 * @since 1.8.0
+	 * @param $questions
+	 * @return mixed
+	 */
+	public function allow_teacher_access_to_questions( $questions, $quiz_id ){
 
-        if( ! $this->is_admin_teacher() ){
-            return $questions;
-        }
+		if( ! $this->is_admin_teacher() ){
+			return $questions;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        // don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
-        remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
+		// don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
+		remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
 
-        if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
+		if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
-                $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
+				$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
 
-                // set the teacher as the current use again
-                wp_set_current_user( $current_teacher_id );
-            }
+				// set the teacher as the current use again
+				wp_set_current_user( $current_teacher_id );
+			}
 
-        }
-        // attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
+		}
+		// attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
 
-        return $questions;
-    }
+		return $questions;
+	}
 
-    /**
-     * Give the teacher role access to questions from the question bank
-     *
-     * @since 1.8.0
-     * @param $wp_query
-     * @return mixed
-     */
-    public function give_access_to_all_questions( $wp_query ){
+	/**
+	 * Give the teacher role access to questions from the question bank
+	 *
+	 * @since 1.8.0
+	 * @param $wp_query
+	 * @return mixed
+	 */
+	public function give_access_to_all_questions( $wp_query ){
 
-        if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
+		if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
 
-            return $wp_query;
-        }
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
-        if( ( isset($screen->id) && 'lesson' == $screen->id )
-            || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
+		$screen = get_current_screen();
+		if( ( isset($screen->id) && 'lesson' == $screen->id )
+			|| ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
 
-                //run new query as admin
-                $wp_query = new WP_Query( $wp_query->query );
+				//run new query as admin
+				$wp_query = new WP_Query( $wp_query->query );
 
-                //set the teache as current use again
-                wp_set_current_user( $current_teacher_id );
+				//set the teache as current use again
+				wp_set_current_user( $current_teacher_id );
 
-            }
-        }
+			}
+		}
 
-        return $wp_query;
-    }// end give_access_to_all_questions
+		return $wp_query;
+	}// end give_access_to_all_questions
 
-    /**
-     * Add new column heading to the course admin edit list
-     *
-     * @since 1.8.0
-     * @param $columns
-     * @return array
-     */
-    public function course_column_heading($columns) {
+	/**
+	 * Add new column heading to the course admin edit list
+	 *
+	 * @since 1.8.0
+	 * @param $columns
+	 * @return array
+	 */
+	public function course_column_heading($columns) {
 
-        if( $this->is_admin_teacher() ){
-            return $columns;
-        }
-        $new_columns = array(
-            'teacher' => __('Teacher', 'woothemes-sensei'),
-        );
-        return array_merge($columns, $new_columns);
+		if( $this->is_admin_teacher() ){
+			return $columns;
+		}
+		$new_columns = array(
+			'teacher' => __('Teacher', 'woothemes-sensei'),
+		);
+		return array_merge($columns, $new_columns);
 
-    }// end teacher column add
+	}// end teacher column add
 
-    /**
-     * Print out  teacher column data
-     *
-     * @since 1.8.0
-     * @param $column
-     * @param $course_id
-     */
-    public function course_column_data( $column, $course_id  ){
+	/**
+	 * Print out  teacher column data
+	 *
+	 * @since 1.8.0
+	 * @param $column
+	 * @param $course_id
+	 */
+	public function course_column_data( $column, $course_id  ){
 
-        if( $this->is_admin_teacher() || 'teacher' != $column  ){
-            return;
-        }
+		if( $this->is_admin_teacher() || 'teacher' != $column  ){
+			return;
+		}
 
-        $course = get_post( $course_id );
-        $teacher = get_userdata( $course->post_author );
+		$course = get_post( $course_id );
+		$teacher = get_userdata( $course->post_author );
 
-        if( !$teacher ){
-            return;
-        }
+		if( !$teacher ){
+			return;
+		}
 
-        echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
+		echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
 
-    }// end course_column_ data
+	}// end course_column_ data
 
-    /**
-     * Return only courses belonging to the given teacher.
-     *
-     *
-     * @since 1.8.0
-     *
-     * @param int $teacher_id
-     * @param bool $return_ids_only
-     *
-     * @return array $teachers_courses
-     */
-    public function get_teacher_courses( $teacher_id, $return_ids_only= false){
+	/**
+	 * Return only courses belonging to the given teacher.
+	 *
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $teacher_id
+	 * @param bool $return_ids_only
+	 *
+	 * @return array $teachers_courses
+	 */
+	public function get_teacher_courses( $teacher_id, $return_ids_only= false){
 
-        $teachers_courses = array();
+		$teachers_courses = array();
 
-        if( empty( $teacher_id  ) ){
-            $teacher_id = get_current_user_id();
-        }
+		if( empty( $teacher_id  ) ){
+			$teacher_id = get_current_user_id();
+		}
 
-        $all_courses = Sensei()->course->get_all_courses();
+		$all_courses = Sensei()->course->get_all_courses();
 
-        if( empty( $all_courses ) ){
-            return $all_courses;
-        }
+		if( empty( $all_courses ) ){
+			return $all_courses;
+		}
 
-        foreach( $all_courses as $course ){
+		foreach( $all_courses as $course ){
 
-            if( $course->post_author != $teacher_id  ){
-                continue;
-            }
+			if( $course->post_author != $teacher_id  ){
+				continue;
+			}
 
-            if( $return_ids_only ){
+			if( $return_ids_only ){
 
-                $teachers_courses[] = $course->ID;
+				$teachers_courses[] = $course->ID;
 
-            }else{
+			}else{
 
-                $teachers_courses[] = $course;
+				$teachers_courses[] = $course;
 
-            }
+			}
 
-        }
+		}
 
-        return $teachers_courses;
+		return $teachers_courses;
 
-    }
+	}
 
-    /**
-     * Limit the message display to only those sent to the current teacher
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return mixed
-     */
-    public function limit_edit_messages_query( $query ){
-        if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
-            return $query;
-        }
-
-        $teacher = wp_get_current_user();
-
-        $query->set( 'meta_key', '_receiver' );
-        $meta_query_args = array(
-            'key'     => '_receiver',
-            'value'   => $teacher->get('user_login') ,
-            'compare' => '='
-        );
+	/**
+	 * Limit the message display to only those sent to the current teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return mixed
+	 */
+	public function limit_edit_messages_query( $query ){
+		if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
+			return $query;
+		}
+
+		$teacher = wp_get_current_user();
+
+		$query->set( 'meta_key', '_receiver' );
+		$meta_query_args = array(
+			'key'     => '_receiver',
+			'value'   => $teacher->get('user_login') ,
+			'compare' => '='
+		);
 
-        $query->set('meta_query', $meta_query_args  );
+		$query->set('meta_query', $meta_query_args  );
 
-        return $query;
-    }
+		return $query;
+	}
 
 
-    /**
-     * Add options to filter courses by teacher
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function course_teacher_filter_options() {
-        global $typenow;
+	/**
+	 * Add options to filter courses by teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function course_teacher_filter_options() {
+		global $typenow;
 
-        if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
-            return;
-        }
+		if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
+			return;
+		}
 
-        // get all roles
-        $roles = get_editable_roles();
+		// get all roles
+		$roles = get_editable_roles();
 
-        // get roles with the course edit capability
-        // and then get the users with those roles
-        $users_who_can_edit_courses = array();
-        foreach( $roles as $role_item ){
+		// get roles with the course edit capability
+		// and then get the users with those roles
+		$users_who_can_edit_courses = array();
+		foreach( $roles as $role_item ){
 
-            $role = get_role( strtolower( $role_item['name'] ) );
+			$role = get_role( strtolower( $role_item['name'] ) );
 
-            if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
+			if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
 
-                $user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
-                $role_users_who_can_edit_courses = get_users( $user_query_args );
+				$user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
+				$role_users_who_can_edit_courses = get_users( $user_query_args );
 
-                // add user from the current $user_role to all users
-                $users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
+				// add user from the current $user_role to all users
+				$users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
 
-            }
+			}
 
-        }
+		}
 
-        // Create the select element with the given users who can edit course
-        $selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-        $course_options = '';
-        foreach( $users_who_can_edit_courses as $user ) {
-            $course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
-        }
+		// Create the select element with the given users who can edit course
+		$selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+		$course_options = '';
+		foreach( $users_who_can_edit_courses as $user ) {
+			$course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
+		}
 
-        $output = '<select name="course_teacher" id="dropdown_course_teachers">';
-        $output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
-        $output .= $course_options;
-        $output .= '</select>';
+		$output = '<select name="course_teacher" id="dropdown_course_teachers">';
+		$output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
+		$output .= $course_options;
+		$output .= '</select>';
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Modify the main query on the admin course list screen
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return $query
-     */
-    public function teacher_filter_query_modify( $query ){
-        global $typenow;
+	/**
+	 * Modify the main query on the admin course list screen
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return $query
+	 */
+	public function teacher_filter_query_modify( $query ){
+		global $typenow;
 
-        if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
-            return $query;
-        }
-        $course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-
-        if( empty( $course_teacher ) ) {
-            return $query;
-        }
-
-        $query['author'] = $course_teacher;
-        return $query;
-    }
-
-    /**
-     * Only show current teacher's media in the media library
-     * @param  array $request Default request arguments
-     * @return array          Modified request arguments
-     */
-    public function restrict_media_library( $request = array() ) {
-
-        if( ! is_admin() ) {
-            return $request;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $request;
-        }
-
-        $screen = get_current_screen();
-
-        if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
-            $teacher = intval( get_current_user_id() );
-
-            if( $teacher ) {
-                $request['author__in'] = array( $teacher );
-            }
-        }
-
-        return $request;
-    } // End restrict_media_library()
-
-    /**
-     * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
-     * @param  array $query Default query arguments
-     * @return array        Modified query arguments
-     */
-    public function restrict_media_library_modal( $query = array() ) {
-
-        if( ! is_admin() ) {
-            return $query;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $query;
-        }
-
-        $teacher = intval( get_current_user_id() );
-
-        if( $teacher ) {
-            $query['author__in'] = array( $teacher );
-        }
-
-        return $query;
-    } // End restrict_media_library_modal()
-
-    /**
-     * When saving the lesson, update the teacher if the lesson belongs to a course
-     *
-     * @since 1.8.0
-     *
-     * @param int $lesson_id
-     */
-    public function update_lesson_teacher( $lesson_id ){
-
-        if( 'lesson'!= get_post_type() ){
-            return;
-        }
+		if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
+			return $query;
+		}
+		$course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+
+		if( empty( $course_teacher ) ) {
+			return $query;
+		}
+
+		$query['author'] = $course_teacher;
+		return $query;
+	}
+
+	/**
+	 * Only show current teacher's media in the media library
+	 * @param  array $request Default request arguments
+	 * @return array          Modified request arguments
+	 */
+	public function restrict_media_library( $request = array() ) {
+
+		if( ! is_admin() ) {
+			return $request;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $request;
+		}
+
+		$screen = get_current_screen();
+
+		if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
+			$teacher = intval( get_current_user_id() );
+
+			if( $teacher ) {
+				$request['author__in'] = array( $teacher );
+			}
+		}
+
+		return $request;
+	} // End restrict_media_library()
+
+	/**
+	 * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
+	 * @param  array $query Default query arguments
+	 * @return array        Modified query arguments
+	 */
+	public function restrict_media_library_modal( $query = array() ) {
+
+		if( ! is_admin() ) {
+			return $query;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $query;
+		}
+
+		$teacher = intval( get_current_user_id() );
+
+		if( $teacher ) {
+			$query['author__in'] = array( $teacher );
+		}
+
+		return $query;
+	} // End restrict_media_library_modal()
+
+	/**
+	 * When saving the lesson, update the teacher if the lesson belongs to a course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $lesson_id
+	 */
+	public function update_lesson_teacher( $lesson_id ){
+
+		if( 'lesson'!= get_post_type() ){
+			return;
+		}
 
-        // this should only run once per request cycle
-        remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+		// this should only run once per request cycle
+		remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        if(  empty( $course_id ) || ! $course_id ){
-            return;
-        }
+		if(  empty( $course_id ) || ! $course_id ){
+			return;
+		}
 
-        $course = get_post( $course_id );
+		$course = get_post( $course_id );
 
-        $lesson_update_args= array(
-            'ID' => $lesson_id ,
-            'post_author' => $course->post_author
-        );
-        wp_update_post( $lesson_update_args );
+		$lesson_update_args= array(
+			'ID' => $lesson_id ,
+			'post_author' => $course->post_author
+		);
+		wp_update_post( $lesson_update_args );
 
-    } // end update_lesson_teacher
+	} // end update_lesson_teacher
 
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Limit teachers to only see their courses, lessons and questions
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return WP_Query $wp_query
-     */
-    public function limit_teacher_edit_screen_post_types( $wp_query ) {
-        global $current_user;
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Limit teachers to only see their courses, lessons and questions
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return WP_Query $wp_query
+	 */
+	public function limit_teacher_edit_screen_post_types( $wp_query ) {
+		global $current_user;
 
-        //exit early
-        if( ! $this->is_admin_teacher() ){
-            return $wp_query;
-        }
+		//exit early
+		if( ! $this->is_admin_teacher() ){
+			return $wp_query;
+		}
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $wp_query;
-        }
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        if( empty( $screen ) ){
-            return $wp_query;
-        }
+		if( empty( $screen ) ){
+			return $wp_query;
+		}
 
-        // for any of these conditions limit what the teacher will see
-        $limit_screens = array(
-            'edit-lesson',
-            'edit-course',
-            'edit-question',
-            'course_page_course-order',
-            'lesson_page_lesson-order',
-        );
+		// for any of these conditions limit what the teacher will see
+		$limit_screens = array(
+			'edit-lesson',
+			'edit-course',
+			'edit-question',
+			'course_page_course-order',
+			'lesson_page_lesson-order',
+		);
 
-        if(  in_array($screen->id  , $limit_screens ) ) {
+		if(  in_array($screen->id  , $limit_screens ) ) {
 
-            // set the query author to the current user to only show those those posts
-            $wp_query->set( 'author', $current_user->ID );
-        }
+			// set the query author to the current user to only show those those posts
+			$wp_query->set( 'author', $current_user->ID );
+		}
 
-        return $wp_query;
+		return $wp_query;
 
-    } // end limit_teacher_edit_screen_post_types()
+	} // end limit_teacher_edit_screen_post_types()
 
 
-    /**
-     * Sensei_Teacher::teacher_login_redirect
-     *
-     * Redirect teachers to /wp-admin/ after login
-     *
-     * @since 1.8.7
-     * @access public
-     * @param string $user_login
-     * @param object $user
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::teacher_login_redirect
+	 *
+	 * Redirect teachers to /wp-admin/ after login
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @param string $user_login
+	 * @param object $user
+	 * @return void
+	 */
 
-    public function teacher_login_redirect( $user_login, $user  ) {
+	public function teacher_login_redirect( $user_login, $user  ) {
 
-        if (user_can($user, 'edit_courses')) {
+		if (user_can($user, 'edit_courses')) {
 
-            if (isset($_POST['redirect_to'])) {
+			if (isset($_POST['redirect_to'])) {
 
-                wp_redirect($_POST['redirect_to'], 303);
+				wp_redirect($_POST['redirect_to'], 303);
 
-                exit;
+				exit;
 
-            } else {
+			} else {
 
-                wp_redirect(admin_url(), 303);
+				wp_redirect(admin_url(), 303);
 
-                exit;
+				exit;
 
-            }
-        }
+			}
+		}
 
-    } // end teacher_login_redirect()
+	} // end teacher_login_redirect()
 
 
 
-    /**
-     * Sensei_Teacher::restrict_posts_menu_page()
-     *
-     * Remove the Posts menu page for teachers and restrict access to it.
-     * We have to do this because we give teachers the 'edit_posts' cap
-     * so they can 'moderate_comments' as well.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters void
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::restrict_posts_menu_page()
+	 *
+	 * Remove the Posts menu page for teachers and restrict access to it.
+	 * We have to do this because we give teachers the 'edit_posts' cap
+	 * so they can 'moderate_comments' as well.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters void
+	 * @return void
+	 */
 
-    public function restrict_posts_menu_page() {
+	public function restrict_posts_menu_page() {
 
-        global $pagenow, $typenow;
+		global $pagenow, $typenow;
 
-        $user = wp_get_current_user();
+		$user = wp_get_current_user();
 
-        /**
-         * Filter the option to hide the Posts menu page.
-         *
-         * @since 1.8.7
-         *
-         * @param bool $restrict default true
-         */
+		/**
+		 * Filter the option to hide the Posts menu page.
+		 *
+		 * @since 1.8.7
+		 *
+		 * @param bool $restrict default true
+		 */
 
-        $restrict = apply_filters('sensei_restrict_posts_menu_page', true );
+		$restrict = apply_filters('sensei_restrict_posts_menu_page', true );
 
-        if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
+		if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
 
-            remove_menu_page('edit.php');
+			remove_menu_page('edit.php');
 
-            if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
+			if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
 
-                if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
+				if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
 
-                    wp_die('You do not have sufficient permissions to access this page.');
+					wp_die('You do not have sufficient permissions to access this page.');
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    } // end restrict_posts_menu_page()
+	} // end restrict_posts_menu_page()
 
-    /**
-     * Sensei_Teacher::restrict_comment_moderation()
-     *
-     * Restrict commendation moderation for teachers
-     * so they can only moderate comments made to posts they own.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters obj $clauses
-     * @return obj $clauses
-     */
+	/**
+	 * Sensei_Teacher::restrict_comment_moderation()
+	 *
+	 * Restrict commendation moderation for teachers
+	 * so they can only moderate comments made to posts they own.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters obj $clauses
+	 * @return obj $clauses
+	 */
 
-    public function restrict_comment_moderation($clauses) {
+	public function restrict_comment_moderation($clauses) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
+		if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
 
-            $clauses->query_vars['post_author'] = get_current_user_id();
+			$clauses->query_vars['post_author'] = get_current_user_id();
 
-        }
+		}
 
-        return $clauses;
+		return $clauses;
 
-    }   // end restrict_comment_moderation()
+	}   // end restrict_comment_moderation()
 
-    /**
-     * Determine if a user is a teacher by ID
-     *
-     * @param int $user_id
-     *
-     * @return bool
-     */
-    public static function is_a_teacher( $user_id ){
+	/**
+	 * Determine if a user is a teacher by ID
+	 *
+	 * @param int $user_id
+	 *
+	 * @return bool
+	 */
+	public static function is_a_teacher( $user_id ){
 
-        $user = get_user_by('id', $user_id);
+		$user = get_user_by('id', $user_id);
 
-        if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
+		if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
 
-            return true;
+			return true;
 
-        }else{
+		}else{
 
-            return false;
+			return false;
 
-        }
+		}
 
-    }// end is_a_teacher
+	}// end is_a_teacher
 
-    /**
-     * The archive title on the teacher archive filter
-     *
-     * @since 1.9.0
-     */
-    public static function archive_title(){
+	/**
+	 * The archive title on the teacher archive filter
+	 *
+	 * @since 1.9.0
+	 */
+	public static function archive_title(){
 
-        $author = get_user_by( 'id', get_query_var( 'author' ) );
-        $author_name = $author->display_name;
-        ?>
+		$author = get_user_by( 'id', get_query_var( 'author' ) );
+		$author_name = $author->display_name;
+		?>
             <h2 class="teacher-archive-title">
 
                 <?php echo sprintf( __( 'All courses by %s', 'woothemes-sensei') , $author_name ); ?>
@@ -1559,17 +1559,17 @@ 
             </h2>
         <?php
 
-    }// archive title
+	}// archive title
 
-    /**
-     * Removing course meta on the teacher archive page
-     *
-     * @since 1.9.0
-     */
-    public static function remove_course_meta_on_teacher_archive(){
+	/**
+	 * Removing course meta on the teacher archive page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function remove_course_meta_on_teacher_archive(){
 
-        remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
+		remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
 
-    }
+	}
 
 } // End Class

Spacing +282 added lines, -282 removed lines

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

includes/class-sensei-updates.php

Doc Comments +8 added lines, -8 removed lines

@@ -455,7 +455,7 @@ 
 	 *
 	 * @since  1.1.0
 	 * @access public
-	 * @return void
+	 * @return boolean
 	 */
 	public function assign_role_caps() {
 		foreach ( $this->parent->post_types->role_caps as $role_cap_set  ) {
@@ -480,7 +480,7 @@ 
 	 *
 	 * @since 1.3.0
 	 * @access public
-	 * @return void
+	 * @return boolean
 	 */
 	public function set_default_quiz_grade_type() {
 		$args = array(	'post_type' 		=> 'quiz',
@@ -502,7 +502,7 @@ 
 	 *
 	 * @since 1.3.0
 	 * @access public
-	 * @return void
+	 * @return boolean
 	 */
 	public function set_default_question_type() {
 		$args = array(	'post_type' 		=> 'question',
@@ -532,7 +532,7 @@ 
 	 *
 	 * @since 1.3.0
 	 * @access public
-	 * @return void
+	 * @return boolean
 	 */
 	public function update_question_answer_data( $n = 50, $offset = 0 ) {
 
@@ -1429,8 +1429,8 @@ 
 	 *
 	 * @global type $woothemes_sensei
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	function status_changes_repair_course_statuses( $n = 50, $offset = 0 ) {
@@ -1674,8 +1674,8 @@ 
 	 * Update the comment counts for all Courses and Lessons now that sensei comments will no longer be counted.
 	 *
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	public function update_comment_course_lesson_comment_counts( $n = 50, $offset = 0 ) {

Indentation +25 added lines, -25 removed lines

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

Braces +44 added lines, -26 removed lines

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

Spacing +481 added lines, -481 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Updates Class
@@ -27,59 +27,59 @@ 
 	 * @param   string $parent The main Sensei object by Ref.
 	 * @return  void
 	 */
-	public function __construct ( $parent ) {
+	public function __construct($parent) {
 
 		// Setup object data
 		$this->parent = $parent;
-		$this->updates_run = get_option( $this->token . '-upgrades', array() );
+		$this->updates_run = get_option($this->token.'-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( $this->token . '-version' );
+		$this->updates = apply_filters('sensei_upgrade_functions', $this->updates, $this->updates);
+		$this->version = get_option($this->token.'-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( $this->token . '-upgrades', $this->updates_run );
+            $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+			update_option($this->token.'-upgrades', $this->updates_run);
 			return true;
 
 		}
@@ -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( $this->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($this->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/sensei-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
  *
  * @since 1.9.0
  *
- * @param $hook_tag
- * @param $version
+ * @param string $hook_tag
+ * @param string $version
  * @param $alternative
  * @param array $args
  */

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Global Sensei functions
@@ -11,24 +11,24 @@ 
 
 	$is_sensei = false;
 
-	$post_types = array( 'lesson', 'course', 'quiz', 'question' );
-	$taxonomies = array( 'course-category', 'quiz-type', 'question-type', 'lesson-tag' );
+	$post_types = array('lesson', 'course', 'quiz', 'question');
+	$taxonomies = array('course-category', 'quiz-type', 'question-type', 'lesson-tag');
 
-	if( is_post_type_archive( $post_types ) || is_singular( $post_types ) || is_tax( $taxonomies ) ) {
+	if (is_post_type_archive($post_types) || is_singular($post_types) || is_tax($taxonomies)) {
 		$is_sensei = true;
 	}
 
-	if( is_object( $post ) && ! is_wp_error( $post ) ) {
+	if (is_object($post) && ! is_wp_error($post)) {
 
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
+		$my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
-		if( in_array( $post->ID, array( $course_page_id, $my_courses_page_id ) ) ) {
+		if (in_array($post->ID, array($course_page_id, $my_courses_page_id))) {
 			$is_sensei = true;
 		}
 	}
 
-	return apply_filters( 'is_sensei', $is_sensei, $post );
+	return apply_filters('is_sensei', $is_sensei, $post);
 }
 
 /**
@@ -40,7 +40,7 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+    $access = current_user_can('manage_sensei') || current_user_can('manage_sensei_grades');
 
     /**
      * Filter sensei_all_access function result
@@ -50,11 +50,11 @@ 
      * @since 1.4.0
      * @param bool $access
      */
-	return apply_filters( 'sensei_all_access', $access );
+	return apply_filters('sensei_all_access', $access);
 
 } // End sensei_all_access()
 
-if ( ! function_exists( 'sensei_light_or_dark' ) ) {
+if ( ! function_exists('sensei_light_or_dark')) {
 
 	/**
 	 * Detect if we should use a light or dark colour on a background colour
@@ -65,20 +65,20 @@ 
 	 * @param string $light (default: '#FFFFFF')
 	 * @return string
 	 */
-	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
+	function sensei_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
 
-	    $hex = str_replace( '#', '', $color );
+	    $hex = str_replace('#', '', $color);
 
-		$c_r = hexdec( substr( $hex, 0, 2 ) );
-		$c_g = hexdec( substr( $hex, 2, 2 ) );
-		$c_b = hexdec( substr( $hex, 4, 2 ) );
-		$brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+		$c_r = hexdec(substr($hex, 0, 2));
+		$c_g = hexdec(substr($hex, 2, 2));
+		$c_b = hexdec(substr($hex, 4, 2));
+		$brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
 		return $brightness > 155 ? $dark : $light;
 	}
 }
 
-if ( ! function_exists( 'sensei_rgb_from_hex' ) ) {
+if ( ! function_exists('sensei_rgb_from_hex')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -87,19 +87,19 @@ 
 	 * @param mixed $color
 	 * @return string
 	 */
-	function sensei_rgb_from_hex( $color ) {
-		$color = str_replace( '#', '', $color );
+	function sensei_rgb_from_hex($color) {
+		$color = str_replace('#', '', $color);
 		// Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-		$color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+		$color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
-		$rgb['R'] = hexdec( $color{0}.$color{1} );
-		$rgb['G'] = hexdec( $color{2}.$color{3} );
-		$rgb['B'] = hexdec( $color{4}.$color{5} );
+		$rgb['R'] = hexdec($color{0}.$color{1} );
+		$rgb['G'] = hexdec($color{2}.$color{3} );
+		$rgb['B'] = hexdec($color{4}.$color{5} );
 		return $rgb;
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_darker' ) ) {
+if ( ! function_exists('sensei_hex_darker')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -109,8 +109,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_darker( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_darker($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 		foreach ($base as $k => $v) :
@@ -119,7 +119,7 @@ 
 	        $new_decimal = $v - $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -129,7 +129,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_lighter' ) ) {
+if ( ! function_exists('sensei_hex_lighter')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -139,8 +139,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_lighter( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_lighter($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 	    foreach ($base as $k => $v) :
@@ -150,7 +150,7 @@ 
 	        $new_decimal = $v + $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -166,7 +166,7 @@ 
  * @since 1.9.0
  * @deprecated since 1.9.0 * It is better to call the Sensei_WC::is_woocommerce_active() directly
  */
-if ( ! function_exists( 'is_woocommerce_active' ) ) {
+if ( ! function_exists('is_woocommerce_active')) {
     function is_woocommerce_active() {
         return Sensei_WC::is_woocommerce_active();
     }
@@ -183,20 +183,20 @@ 
  * @param $alternative
  * @param array $args
  */
-function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
+function sensei_do_deprecated_action($hook_tag, $version, $alternative = "", $args = array()) {
 
-    if( has_action( $hook_tag ) ){
+    if (has_action($hook_tag)) {
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+        $error_message = sprintf(__("SENSEI: The hook '%s', has been deprecated since '%s'.", 'woothemes-sensei'), $hook_tag, $version);
 
-        if( !empty( $alternative ) ){
+        if ( ! empty($alternative)) {
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+            $error_message .= sprintf(__("Please use '%s' instead.", 'woothemes-sensei'), $alternative);
 
         }
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+        trigger_error($error_message);
+        do_action($hook_tag, $args);
 
     }
 
@@ -211,8 +211,8 @@ 
  * @param $post_id
  * @return bool
  */
-function sensei_is_a_course( $post ){
+function sensei_is_a_course($post) {
 
-	return "course" == get_post_type( $post );
+	return "course" == get_post_type($post);
 
 }

Braces +4 added lines, -1 removed lines

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

Indentation +47 added lines, -47 removed lines

@@ -40,16 +40,16 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
-
-    /**
-     * Filter sensei_all_access function result
-     * which determinse if the current user
-     * can access all of Sensei without restrictions
-     *
-     * @since 1.4.0
-     * @param bool $access
-     */
+	$access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+
+	/**
+	 * Filter sensei_all_access function result
+	 * which determinse if the current user
+	 * can access all of Sensei without restrictions
+	 *
+	 * @since 1.4.0
+	 * @param bool $access
+	 */
 	return apply_filters( 'sensei_all_access', $access );
 
 } // End sensei_all_access()
@@ -67,7 +67,7 @@ 
 	 */
 	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
 
-	    $hex = str_replace( '#', '', $color );
+		$hex = str_replace( '#', '', $color );
 
 		$c_r = hexdec( substr( $hex, 0, 2 ) );
 		$c_g = hexdec( substr( $hex, 2, 2 ) );
@@ -114,15 +114,15 @@ 
 		$color = '#';
 
 		foreach ($base as $k => $v) :
-	        $amount = $v / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v - $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+			$amount = $v / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v - $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 		endforeach;
 
 		return $color;
@@ -143,17 +143,17 @@ 
 		$base = sensei_rgb_from_hex( $color );
 		$color = '#';
 
-	    foreach ($base as $k => $v) :
-	        $amount = 255 - $v;
-	        $amount = $amount / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v + $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+		foreach ($base as $k => $v) :
+			$amount = 255 - $v;
+			$amount = $amount / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v + $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 	   	endforeach;
 
 	   	return $color;
@@ -167,14 +167,14 @@ 
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
 if ( ! function_exists( 'is_woocommerce_active' ) ) {
-    function is_woocommerce_active() {
-        // calling is present instead of is active here
-        // as this function can override other is_woocommerce_active
-        // function in other woo plugins and Sensei_WC::is_woocommerce_active
-        // also check the sensei settings for enable WooCommerce support, which
-        // other plugins should not check against.
-        return Sensei_WC::is_woocommerce_present();
-    }
+	function is_woocommerce_active() {
+		// calling is present instead of is active here
+		// as this function can override other is_woocommerce_active
+		// function in other woo plugins and Sensei_WC::is_woocommerce_active
+		// also check the sensei settings for enable WooCommerce support, which
+		// other plugins should not check against.
+		return Sensei_WC::is_woocommerce_present();
+	}
 }
 
 /**
@@ -190,20 +190,20 @@ 
  */
 function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
 
-    if( has_action( $hook_tag ) ){
+	if( has_action( $hook_tag ) ){
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+		$error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
 
-        if( !empty( $alternative ) ){
+		if( !empty( $alternative ) ){
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+			$error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
 
-        }
+		}
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+		trigger_error( $error_message );
+		do_action( $hook_tag , $args );
 
-    }
+	}
 
 }// end sensei_do_deprecated_action
 

includes/shortcodes/class-sensei-legacy-shortcodes.php

Doc Comments +2 added lines, -2 removed lines

@@ -103,8 +103,8 @@
      *
      * @since 1.9.0
      *
-     * @param $title
-     * @param $shortcode_specific_override
+     * @param string $title
+     * @param string $shortcode_specific_override
      * @return string
      */
     public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){

Braces +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
             Sensei_Templates::get_template( 'user/my-courses.php' );
 
-        }else{
+        } else{
 
             Sensei()->frontend->sensei_login_form();
 

Indentation +249 added lines, -249 removed lines

@@ -10,323 +10,323 @@ 
  */
 class Sensei_Legacy_Shortcodes {
 
-    /**
-     * Add the legacy shortcodes to WordPress
-     *
-     * @since 1.9.0
-     */
-    public static function init(){
-
-        add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
-        add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
-        add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
-        add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
-        add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
-        add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
-
-    }
-    /**
-     * all_courses shortcode output function.
-     *
-     * The function should only be called indirectly through do_shortcode()
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function all_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
-
-    } // all_courses()
-
-    /**
-     * paid_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function paid_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
-
-    } // End paid_courses()
-
-
-    /**
-     * featured_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function featured_courses( $atts, $content = null ) {
-
-        return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
+	/**
+	 * Add the legacy shortcodes to WordPress
+	 *
+	 * @since 1.9.0
+	 */
+	public static function init(){
+
+		add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
+		add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
+		add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
+		add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
+		add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
+		add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
+
+	}
+	/**
+	 * all_courses shortcode output function.
+	 *
+	 * The function should only be called indirectly through do_shortcode()
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function all_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
+
+	} // all_courses()
+
+	/**
+	 * paid_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function paid_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
+
+	} // End paid_courses()
+
+
+	/**
+	 * featured_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function featured_courses( $atts, $content = null ) {
+
+		return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
 
-    } // End featured_courses()
+	} // End featured_courses()
 
-    /**
-     * shortcode_free_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function free_courses( $atts, $content = null ) {
+	/**
+	 * shortcode_free_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function free_courses( $atts, $content = null ) {
 
-        return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
+		return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
 
-    } // End free_courses()
+	} // End free_courses()
 
-    /**
-     * shortcode_new_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function new_courses( $atts, $content = null ) {
+	/**
+	 * shortcode_new_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function new_courses( $atts, $content = null ) {
 
-        return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
+		return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
 
-    } // End new_courses()
+	} // End new_courses()
 
-    /**
-     * Generate courses adding a title.
-     *
-     * @since 1.9.0
-     *
-     * @param $title
-     * @param $shortcode_specific_override
-     * @return string
-     */
-    public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
+	/**
+	 * Generate courses adding a title.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $title
+	 * @param $shortcode_specific_override
+	 * @return string
+	 */
+	public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
 
-        global  $shortcode_override, $posts_array;
+		global  $shortcode_override, $posts_array;
 
-        $shortcode_override = $shortcode_specific_override;
+		$shortcode_override = $shortcode_specific_override;
 
-        // do not show this short code if there is a shortcode int he url and
-        // this specific shortcode is not the one requested in the ur.
-        $specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
-        if( ! empty( $specific_shortcode_requested) &&
-            $specific_shortcode_requested != $shortcode_override ){
+		// do not show this short code if there is a shortcode int he url and
+		// this specific shortcode is not the one requested in the ur.
+		$specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
+		if( ! empty( $specific_shortcode_requested) &&
+			$specific_shortcode_requested != $shortcode_override ){
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // loop and get all courses html
-        ob_start();
-        self::initialise_legacy_course_loop();
-        $courses = ob_get_clean();
+		// loop and get all courses html
+		ob_start();
+		self::initialise_legacy_course_loop();
+		$courses = ob_get_clean();
 
-        $content = '';
-        if( count( $posts_array ) > 0 ){
+		$content = '';
+		if( count( $posts_array ) > 0 ){
 
-            $before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
-            $before .= '<section id="main-course" class="course-container">';
+			$before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
+			$before .= '<section id="main-course" class="course-container">';
 
-            $after = '</section>';
+			$after = '</section>';
 
-            //assemble
-            $content = $before . $courses . $after;
+			//assemble
+			$content = $before . $courses . $after;
 
-        }
+		}
 
-        return $content;
+		return $content;
 
-    }// end generate_shortcode_courses
+	}// end generate_shortcode_courses
 
 
-    /**
-     * user_courses function.
-     *
-     * @access public
-     * @param mixed $atts
-     * @param mixed $content (default: null)
-     * @return string
-     */
-    public static function user_courses( $atts, $content = null ) {
-        global $shortcode_override;
-        extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
+	/**
+	 * user_courses function.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @param mixed $content (default: null)
+	 * @return string
+	 */
+	public static function user_courses( $atts, $content = null ) {
+		global $shortcode_override;
+		extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
 
-        $shortcode_override = 'usercourses';
+		$shortcode_override = 'usercourses';
 
-        ob_start();
+		ob_start();
 
-        if( is_user_logged_in() ){
+		if( is_user_logged_in() ){
 
-            Sensei_Templates::get_template( 'user/my-courses.php' );
+			Sensei_Templates::get_template( 'user/my-courses.php' );
 
-        }else{
+		}else{
 
-            Sensei()->frontend->sensei_login_form();
+			Sensei()->frontend->sensei_login_form();
 
-        }
+		}
 
-        $content = ob_get_clean();
-        return $content;
+		$content = ob_get_clean();
+		return $content;
 
-    } // End user_courses()
+	} // End user_courses()
 
-    /**
-     * This function is simply to honor the legacy
-     * loop-course.php for the old shortcodes.
-     * @since 1.9.0
-     */
-    public static function initialise_legacy_course_loop(){
+	/**
+	 * This function is simply to honor the legacy
+	 * loop-course.php for the old shortcodes.
+	 * @since 1.9.0
+	 */
+	public static function initialise_legacy_course_loop(){
 
-        global  $post, $wp_query, $shortcode_override, $course_excludes;
+		global  $post, $wp_query, $shortcode_override, $course_excludes;
 
-        // Handle Query Type
-        $query_type = '';
+		// Handle Query Type
+		$query_type = '';
 
-        if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
-            $query_type = esc_html( $_GET[ 'action' ] );
-        } // End If Statement
+		if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
+			$query_type = esc_html( $_GET[ 'action' ] );
+		} // End If Statement
 
-        if ( '' != $shortcode_override ) {
-            $query_type = $shortcode_override;
-        } // End If Statement
+		if ( '' != $shortcode_override ) {
+			$query_type = $shortcode_override;
+		} // End If Statement
 
-        if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
+		if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
 
-        // Check that query returns results
-        // Handle Pagination
-        $paged = $wp_query->get( 'paged' );
-        $paged = empty( $paged ) ? 1 : $paged;
+		// Check that query returns results
+		// Handle Pagination
+		$paged = $wp_query->get( 'paged' );
+		$paged = empty( $paged ) ? 1 : $paged;
 
 
-        // Check for pagination settings
-        if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
+		// Check for pagination settings
+		if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
 
-            $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
 
-        } else {
+		} else {
 
-            $amount = $wp_query->get( 'posts_per_page' );
+			$amount = $wp_query->get( 'posts_per_page' );
 
-        } // End If Statement
+		} // End If Statement
 
-        // This is not a paginated page (or it's simply the first page of a paginated page/post)
+		// This is not a paginated page (or it's simply the first page of a paginated page/post)
 
-        global $posts_array;
-        $course_includes   = array();
+		global $posts_array;
+		$course_includes   = array();
 
-        $query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
-        $course_query = new WP_Query( $query_args );
-        $posts_array = $course_query->get_posts();
+		$query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
+		$course_query = new WP_Query( $query_args );
+		$posts_array = $course_query->get_posts();
 
-        // output the courses
-        if( ! empty( $posts_array ) ) {
+		// output the courses
+		if( ! empty( $posts_array ) ) {
 
-            //output all courses for current query
-            self::loop_courses( $course_query, $amount );
+			//output all courses for current query
+			self::loop_courses( $course_query, $amount );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Loop through courses in the query and output the infomration needed
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $course_query
-     */
-    public static function loop_courses( $course_query, $amount ){
+	/**
+	 * Loop through courses in the query and output the infomration needed
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $course_query
+	 */
+	public static function loop_courses( $course_query, $amount ){
 
-        global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
+		global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
 
-        if ( count( $course_query->get_posts() ) > 0 ) {
+		if ( count( $course_query->get_posts() ) > 0 ) {
 
-            do_action( 'sensei_course_archive_header', $shortcode_override );
+			do_action( 'sensei_course_archive_header', $shortcode_override );
 
-            foreach ( $course_query->get_posts() as $course){
+			foreach ( $course_query->get_posts() as $course){
 
-                // Make sure the other loops dont include the same post twice!
-                array_push( $course_excludes, $course->ID );
+				// Make sure the other loops dont include the same post twice!
+				array_push( $course_excludes, $course->ID );
 
-                // output the course markup
-                self::the_course( $course->ID );
+				// output the course markup
+				self::the_course( $course->ID );
 
-            } // End For Loop
+			} // End For Loop
 
-            // More and Prev links
-            $posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
-            $posts_array       = $posts_array_query->get_posts();
-            $max_pages = $course_query->found_posts / $amount;
-            if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
+			// More and Prev links
+			$posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
+			$posts_array       = $posts_array_query->get_posts();
+			$max_pages = $course_query->found_posts / $amount;
+			if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
 
-                switch( $shortcode_override ){
-                    case 'paidcourses':
-                        $filter = 'paid';
-                        break;
-                    case 'featuredcourses':
-                        $filter = 'featured';
-                        break;
-                    case 'freecourses':
-                        $filter = 'free';
-                        break;
-                    default:
-                        $filter = '';
-                        break;
-                }
+				switch( $shortcode_override ){
+					case 'paidcourses':
+						$filter = 'paid';
+						break;
+					case 'featuredcourses':
+						$filter = 'featured';
+						break;
+					case 'freecourses':
+						$filter = 'free';
+						break;
+					default:
+						$filter = '';
+						break;
+				}
 
-                $quer_args = array();
-                $quer_args[ 'paged' ] = '2';
-                if( !empty( $filter ) ){
-                    $quer_args[ 'course_filter' ] = $filter;
-                }
+				$quer_args = array();
+				$quer_args[ 'paged' ] = '2';
+				if( !empty( $filter ) ){
+					$quer_args[ 'course_filter' ] = $filter;
+				}
 
-                $course_pagination_link = get_post_type_archive_link( 'course' );
-                $more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
-                $more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
+				$course_pagination_link = get_post_type_archive_link( 'course' );
+				$more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
+				$more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
 
-                // next/more
-                $html  = '<div class="navigation"><div class="nav-next">';
-                $html .= '<a href="' . $more_link_url . '">';
-                $html .= $more_link_text;
-                $html .= '<span class="meta-nav"></span></a></div>';
+				// next/more
+				$html  = '<div class="navigation"><div class="nav-next">';
+				$html .= '<a href="' . $more_link_url . '">';
+				$html .= $more_link_text;
+				$html .= '<span class="meta-nav"></span></a></div>';
 
-                echo apply_filters( 'course_archive_next_link', $html );
+				echo apply_filters( 'course_archive_next_link', $html );
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
-    }
+		} // End If Statement
+	}
 
-    /**
-     * Print a single course markup
-     *
-     * @param $course_id
-     */
-    public static function the_course( $course_id ){
+	/**
+	 * Print a single course markup
+	 *
+	 * @param $course_id
+	 */
+	public static function the_course( $course_id ){
 
-        // Get meta data
-        $course =  get_post( $course_id );
-        $user_info = get_userdata( absint( $course->post_author ) );
-        $author_link = get_author_posts_url( absint( $course->post_author ) );
-        $author_display_name = $user_info->display_name;
-        $author_id = $course->post_author;
-        $category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
-        ?>
+		// Get meta data
+		$course =  get_post( $course_id );
+		$user_info = get_userdata( absint( $course->post_author ) );
+		$author_link = get_author_posts_url( absint( $course->post_author ) );
+		$author_display_name = $user_info->display_name;
+		$author_id = $course->post_author;
+		$category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
+		$preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+		?>
 
         <article class="<?php echo esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_id ) ) ); ?>">
             <?php
-            // so that legacy shortcodes work with thir party plugins that wants to hook in
-            do_action('sensei_course_content_before',$course );
-            ?>
+			// so that legacy shortcodes work with thir party plugins that wants to hook in
+			do_action('sensei_course_content_before',$course );
+			?>
             <div class="course-content">
 
                 <?php Sensei()->course->course_image($course_id); ?>
@@ -362,7 +362,7 @@ 
                     </p>
 
                     <?php if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-                        $preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
+						$preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
                         <p class="sensei-free-lessons">
                             <a href="<?php echo get_permalink( $course_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
                             </a> - <?php echo $preview_lessons; ?>
@@ -373,15 +373,15 @@ 
 
             </div>
             <?php
-            // so that legacy shortcodes work with thir party plugins that wants to hook in
-            do_action('sensei_course_content_after', $course);
-            ?>
+			// so that legacy shortcodes work with thir party plugins that wants to hook in
+			do_action('sensei_course_content_after', $course);
+			?>
 
         </article>
 
         <?php
 
 
-    } // end the_course
+	} // end the_course
 
 }// end class legacy shortcodes
\ No newline at end of file

Spacing +79 added lines, -79 removed lines

@@ -15,14 +15,14 @@ 
      *
      * @since 1.9.0
      */
-    public static function init(){
+    public static function init() {
 
-        add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
-        add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
-        add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
-        add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
-        add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
-        add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
+        add_shortcode('allcourses', array(__CLASS__, 'all_courses'));
+        add_shortcode('newcourses', array(__CLASS__, 'new_courses'));
+        add_shortcode('featuredcourses', array(__CLASS__, 'featured_courses'));
+        add_shortcode('freecourses', array(__CLASS__, 'free_courses'));
+        add_shortcode('paidcourses', array(__CLASS__, 'paid_courses'));
+        add_shortcode('usercourses', array(__CLASS__, 'user_courses'));
 
     }
     /**
@@ -35,9 +35,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function all_courses( $atts, $content = null ) {
+    public static function all_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
+        return self::generate_shortcode_courses('', 'allcourses'); // all courses but no title
 
     } // all_courses()
 
@@ -49,9 +49,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function paid_courses( $atts, $content = null ) {
+    public static function paid_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
+        return self::generate_shortcode_courses('Paid Courses', 'paidcourses');
 
     } // End paid_courses()
 
@@ -64,9 +64,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function featured_courses( $atts, $content = null ) {
+    public static function featured_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
+        return self::generate_shortcode_courses('Featured Courses', 'featuredcourses');
 
     } // End featured_courses()
 
@@ -78,9 +78,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function free_courses( $atts, $content = null ) {
+    public static function free_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
+        return self::generate_shortcode_courses('Free Courses', 'freecourses');
 
     } // End free_courses()
 
@@ -92,9 +92,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function new_courses( $atts, $content = null ) {
+    public static function new_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
+        return self::generate_shortcode_courses('New Courses', 'newcourses');
 
     } // End new_courses()
 
@@ -107,7 +107,7 @@ 
      * @param $shortcode_specific_override
      * @return string
      */
-    public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
+    public static function generate_shortcode_courses($title, $shortcode_specific_override) {
 
         global  $shortcode_override, $posts_array;
 
@@ -115,9 +115,9 @@ 
 
         // do not show this short code if there is a shortcode int he url and
         // this specific shortcode is not the one requested in the ur.
-        $specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
-        if( ! empty( $specific_shortcode_requested) &&
-            $specific_shortcode_requested != $shortcode_override ){
+        $specific_shortcode_requested = isset($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+        if ( ! empty($specific_shortcode_requested) &&
+            $specific_shortcode_requested != $shortcode_override) {
 
             return '';
 
@@ -129,15 +129,15 @@ 
         $courses = ob_get_clean();
 
         $content = '';
-        if( count( $posts_array ) > 0 ){
+        if (count($posts_array) > 0) {
 
-            $before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
+            $before = empty($title) ? '' : '<header class="archive-header"><h2>'.$title.'</h2></header>';
             $before .= '<section id="main-course" class="course-container">';
 
             $after = '</section>';
 
             //assemble
-            $content = $before . $courses . $after;
+            $content = $before.$courses.$after;
 
         }
 
@@ -154,19 +154,19 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function user_courses( $atts, $content = null ) {
+    public static function user_courses($atts, $content = null) {
         global $shortcode_override;
-        extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
+        extract(shortcode_atts(array('amount' => 0), $atts));
 
         $shortcode_override = 'usercourses';
 
         ob_start();
 
-        if( is_user_logged_in() ){
+        if (is_user_logged_in()) {
 
-            Sensei_Templates::get_template( 'user/my-courses.php' );
+            Sensei_Templates::get_template('user/my-courses.php');
 
-        }else{
+        } else {
 
             Sensei()->frontend->sensei_login_form();
 
@@ -182,54 +182,54 @@ 
      * loop-course.php for the old shortcodes.
      * @since 1.9.0
      */
-    public static function initialise_legacy_course_loop(){
+    public static function initialise_legacy_course_loop() {
 
         global  $post, $wp_query, $shortcode_override, $course_excludes;
 
         // Handle Query Type
         $query_type = '';
 
-        if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
-            $query_type = esc_html( $_GET[ 'action' ] );
+        if (isset($_GET['action']) && ('' != esc_html($_GET['action']))) {
+            $query_type = esc_html($_GET['action']);
         } // End If Statement
 
-        if ( '' != $shortcode_override ) {
+        if ('' != $shortcode_override) {
             $query_type = $shortcode_override;
         } // End If Statement
 
-        if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
+        if ( ! is_array($course_excludes)) { $course_excludes = array(); }
 
         // Check that query returns results
         // Handle Pagination
-        $paged = $wp_query->get( 'paged' );
-        $paged = empty( $paged ) ? 1 : $paged;
+        $paged = $wp_query->get('paged');
+        $paged = empty($paged) ? 1 : $paged;
 
 
         // Check for pagination settings
-        if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
+        if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
 
-            $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+            $amount = absint(Sensei()->settings->settings['course_archive_amount']);
 
         } else {
 
-            $amount = $wp_query->get( 'posts_per_page' );
+            $amount = $wp_query->get('posts_per_page');
 
         } // End If Statement
 
         // This is not a paginated page (or it's simply the first page of a paginated page/post)
 
         global $posts_array;
-        $course_includes   = array();
+        $course_includes = array();
 
-        $query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
-        $course_query = new WP_Query( $query_args );
+        $query_args = Sensei()->course->get_archive_query_args($shortcode_override, $amount, $course_includes, $course_excludes);
+        $course_query = new WP_Query($query_args);
         $posts_array = $course_query->get_posts();
 
         // output the courses
-        if( ! empty( $posts_array ) ) {
+        if ( ! empty($posts_array)) {
 
             //output all courses for current query
-            self::loop_courses( $course_query, $amount );
+            self::loop_courses($course_query, $amount);
 
         }
 
@@ -242,31 +242,31 @@ 
      *
      * @param WP_Query $course_query
      */
-    public static function loop_courses( $course_query, $amount ){
+    public static function loop_courses($course_query, $amount) {
 
         global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
 
-        if ( count( $course_query->get_posts() ) > 0 ) {
+        if (count($course_query->get_posts()) > 0) {
 
-            do_action( 'sensei_course_archive_header', $shortcode_override );
+            do_action('sensei_course_archive_header', $shortcode_override);
 
-            foreach ( $course_query->get_posts() as $course){
+            foreach ($course_query->get_posts() as $course) {
 
                 // Make sure the other loops dont include the same post twice!
-                array_push( $course_excludes, $course->ID );
+                array_push($course_excludes, $course->ID);
 
                 // output the course markup
-                self::the_course( $course->ID );
+                self::the_course($course->ID);
 
             } // End For Loop
 
             // More and Prev links
-            $posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
+            $posts_array_query = new WP_Query(Sensei()->course->course_query($shortcode_override, $amount, $course_includes, $course_excludes));
             $posts_array       = $posts_array_query->get_posts();
             $max_pages = $course_query->found_posts / $amount;
-            if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
+            if ('' != $shortcode_override && ($max_pages > $course_query->get('paged'))) {
 
-                switch( $shortcode_override ){
+                switch ($shortcode_override) {
                     case 'paidcourses':
                         $filter = 'paid';
                         break;
@@ -282,22 +282,22 @@ 
                 }
 
                 $quer_args = array();
-                $quer_args[ 'paged' ] = '2';
-                if( !empty( $filter ) ){
-                    $quer_args[ 'course_filter' ] = $filter;
+                $quer_args['paged'] = '2';
+                if ( ! empty($filter)) {
+                    $quer_args['course_filter'] = $filter;
                 }
 
-                $course_pagination_link = get_post_type_archive_link( 'course' );
-                $more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
-                $more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
+                $course_pagination_link = get_post_type_archive_link('course');
+                $more_link_text = esc_html(Sensei()->settings->settings['course_archive_more_link_text']);
+                $more_link_url = esc_url(add_query_arg($quer_args, $course_pagination_link));
 
                 // next/more
                 $html  = '<div class="navigation"><div class="nav-next">';
-                $html .= '<a href="' . $more_link_url . '">';
+                $html .= '<a href="'.$more_link_url.'">';
                 $html .= $more_link_text;
                 $html .= '<span class="meta-nav"></span></a></div>';
 
-                echo apply_filters( 'course_archive_next_link', $html );
+                echo apply_filters('course_archive_next_link', $html);
 
             } // End If Statement
 
@@ -309,23 +309,23 @@ 
      *
      * @param $course_id
      */
-    public static function the_course( $course_id ){
+    public static function the_course($course_id) {
 
         // Get meta data
-        $course =  get_post( $course_id );
-        $user_info = get_userdata( absint( $course->post_author ) );
-        $author_link = get_author_posts_url( absint( $course->post_author ) );
+        $course = get_post($course_id);
+        $user_info = get_userdata(absint($course->post_author));
+        $author_link = get_author_posts_url(absint($course->post_author));
         $author_display_name = $user_info->display_name;
         $author_id = $course->post_author;
-        $category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+        $category_output = get_the_term_list($course_id, 'course-category', '', ', ', '');
+        $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course_id));
+        $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id());
         ?>
 
-        <article class="<?php echo esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_id ) ) ); ?>">
+        <article class="<?php echo esc_attr(join(' ', get_post_class(array('course', 'post'), $course_id))); ?>">
             <?php
             // so that legacy shortcodes work with thir party plugins that wants to hook in
-            do_action('sensei_course_content_before',$course );
+            do_action('sensei_course_content_before', $course);
             ?>
             <div class="course-content">
 
@@ -341,19 +341,19 @@ 
 
                     <p class="sensei-course-meta">
 
-                        <?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>
-                            <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><a href="<?php echo $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 $author_link; ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span>
                         <?php } // End If Statement ?>
 
                         <span class="course-lesson-count">
-                                    <?php echo Sensei()->course->course_lesson_count( $course_id ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?>
+                                    <?php echo Sensei()->course->course_lesson_count($course_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?>
                                 </span>
 
-                        <?php if ( '' != $category_output ) { ?>
-                            <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+                        <?php if ('' != $category_output) { ?>
+                            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
                         <?php } // End If Statement ?>
 
-                        <?php sensei_simple_course_price( $course_id ); ?>
+                        <?php sensei_simple_course_price($course_id); ?>
 
                     </p>
 
@@ -361,10 +361,10 @@ 
 
                     </p>
 
-                    <?php if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-                        $preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
+                    <?php if (0 < $preview_lesson_count && ! $is_user_taking_course) {
+                        $preview_lessons = sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?>
                         <p class="sensei-free-lessons">
-                            <a href="<?php echo get_permalink( $course_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
+                            <a href="<?php echo get_permalink($course_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?>
                             </a> - <?php echo $preview_lessons; ?>
                         </p>
                     <?php } ?>

includes/shortcodes/class-sensei-shortcode-course-categories.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
      *
      * @since 1.9.0
      *
-     * @param array $category_ids
+     * @param array $categories
      * @return array
      */
     public function generate_term_ids( $categories = array() ){

Indentation +92 added lines, -92 removed lines

@@ -24,135 +24,135 @@
  */
 class Sensei_Shortcode_Course_Categories implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array list of taxonomy terms.
-     */
-    protected $sensei_course_taxonomy_terms;
+	/**
+	 * @var array list of taxonomy terms.
+	 */
+	protected $sensei_course_taxonomy_terms;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
-        $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
-        $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
+		$this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
+		$this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
 
-        $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
-        $this->include = $this->generate_term_ids( $include );
+		$include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
+		$this->include = $this->generate_term_ids( $include );
 
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
-        $this->exclude = $this->generate_term_ids( $exclude );
+		$exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
+		$this->exclude = $this->generate_term_ids( $exclude );
 
-        // make sure we handle string true/false values correctly with respective defaults
-        $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
-        $this->hide_empty = 'true' == $hide_empty ? true: false;
+		// make sure we handle string true/false values correctly with respective defaults
+		$hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
+		$this->hide_empty = 'true' == $hide_empty ? true: false;
 
-        $this->setup_course_categories();
+		$this->setup_course_categories();
 
-    }
+	}
 
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_course_categories(){
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_course_categories(){
 
-        $args = array(
-            'orderby'       => $this->orderby,
-            'order'         => $this->order,
-            'exclude'       => $this->exclude,
-            'include'       => $this->include,
-            'number'        => $this->number,
-            'parent'        => $this->parent,
-            'hide_empty'    => $this->hide_empty,
-            'fields'        => 'all',
-        );
+		$args = array(
+			'orderby'       => $this->orderby,
+			'order'         => $this->order,
+			'exclude'       => $this->exclude,
+			'include'       => $this->include,
+			'number'        => $this->number,
+			'parent'        => $this->parent,
+			'hide_empty'    => $this->hide_empty,
+			'fields'        => 'all',
+		);
 
-        $this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
+		$this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
 
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        if( empty(  $this->sensei_course_taxonomy_terms  ) ){
+		if( empty(  $this->sensei_course_taxonomy_terms  ) ){
 
-            return __( 'No course categories found.', 'woothemes-sensei' );
+			return __( 'No course categories found.', 'woothemes-sensei' );
 
-        }
+		}
 
-        $terms_html = '';
+		$terms_html = '';
 
-        //set the wp_query to the current messages query
-        $terms_html .= '<ul class="sensei course-categories">';
-        foreach( $this->sensei_course_taxonomy_terms as $category ){
+		//set the wp_query to the current messages query
+		$terms_html .= '<ul class="sensei course-categories">';
+		foreach( $this->sensei_course_taxonomy_terms as $category ){
 
-            $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
-            $terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
+			$category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
+			$terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
 
-        }
-        $terms_html .= '<ul>';
+		}
+		$terms_html .= '<ul>';
 
-        return $terms_html;
+		return $terms_html;
 
-    }// end render
+	}// end render
 
-    /**
-     * Convert an array of mixed ids, slugs or names to only the id's of those terms
-     *
-     * @since 1.9.0
-     *
-     * @param array $category_ids
-     * @return array
-     */
-    public function generate_term_ids( $categories = array() ){
+	/**
+	 * Convert an array of mixed ids, slugs or names to only the id's of those terms
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $category_ids
+	 * @return array
+	 */
+	public function generate_term_ids( $categories = array() ){
 
-        $cat_ids = array();
+		$cat_ids = array();
 
-        if ( is_array($categories) ) {
-            foreach ($categories as $cat) {
+		if ( is_array($categories) ) {
+			foreach ($categories as $cat) {
 
-                if (!is_numeric($cat)) {
+				if (!is_numeric($cat)) {
 
-                    // try the slug
-                    $term = get_term_by('slug', $cat, 'course-category');
+					// try the slug
+					$term = get_term_by('slug', $cat, 'course-category');
 
-                    // if the slug didn't work try the name
-                    if (!$term) {
+					// if the slug didn't work try the name
+					if (!$term) {
 
-                        $term = get_term_by('name', $cat, 'course-category');
+						$term = get_term_by('name', $cat, 'course-category');
 
-                    }
+					}
 
-                    if ($term) {
-                        $cat_ids[] = $term->term_id;
-                    }
+					if ($term) {
+						$cat_ids[] = $term->term_id;
+					}
 
-                } else {
+				} else {
 
-                    $cat_ids[] = $cat;
+					$cat_ids[] = $cat;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        return $cat_ids;
+		return $cat_ids;
 
-    }// end generate_term_ids
+	}// end generate_term_ids
 
 }// end class
 

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_course_categories] shortcode. Show the list or course categories as links to their archive
@@ -37,22 +37,22 @@ 
      * @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->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
-        $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
-        $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'name';
+        $this->order = isset($attributes['order']) ? $attributes['order'] : 'ASC';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '100';
+        $this->parent = isset($attributes['parent']) ? $attributes['parent'] : '';
 
-        $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
-        $this->include = $this->generate_term_ids( $include );
+        $include = isset($attributes['include']) ? explode(',', $attributes['include']) : '';
+        $this->include = $this->generate_term_ids($include);
 
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
-        $this->exclude = $this->generate_term_ids( $exclude );
+        $exclude = isset($attributes['exclude']) ? explode(',', $attributes['exclude']) : '';
+        $this->exclude = $this->generate_term_ids($exclude);
 
         // make sure we handle string true/false values correctly with respective defaults
-        $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
-        $this->hide_empty = 'true' == $hide_empty ? true: false;
+        $hide_empty = isset($attributes['hide_empty']) ? $attributes['hide_empty'] : 'false';
+        $this->hide_empty = 'true' == $hide_empty ? true : false;
 
         $this->setup_course_categories();
 
@@ -63,7 +63,7 @@ 
      *
      * @return mixed
      */
-    public function setup_course_categories(){
+    public function setup_course_categories() {
 
         $args = array(
             'orderby'       => $this->orderby,
@@ -85,11 +85,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( empty(  $this->sensei_course_taxonomy_terms  ) ){
+        if (empty($this->sensei_course_taxonomy_terms)) {
 
-            return __( 'No course categories found.', 'woothemes-sensei' );
+            return __('No course categories found.', 'woothemes-sensei');
 
         }
 
@@ -97,10 +97,10 @@ 
 
         //set the wp_query to the current messages query
         $terms_html .= '<ul class="sensei course-categories">';
-        foreach( $this->sensei_course_taxonomy_terms as $category ){
+        foreach ($this->sensei_course_taxonomy_terms as $category) {
 
-            $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
-            $terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
+            $category_link = '<a href="'.get_term_link($category).'">'.$category->name.'</a>';
+            $terms_html .= '<li class="sensei course-category" >'.$category_link.'</li>';
 
         }
         $terms_html .= '<ul>';
@@ -117,20 +117,20 @@ 
      * @param array $category_ids
      * @return array
      */
-    public function generate_term_ids( $categories = array() ){
+    public function generate_term_ids($categories = array()) {
 
         $cat_ids = array();
 
-        if ( is_array($categories) ) {
+        if (is_array($categories)) {
             foreach ($categories as $cat) {
 
-                if (!is_numeric($cat)) {
+                if ( ! is_numeric($cat)) {
 
                     // try the slug
                     $term = get_term_by('slug', $cat, 'course-category');
 
                     // if the slug didn't work try the name
-                    if (!$term) {
+                    if ( ! $term) {
 
                         $term = get_term_by('name', $cat, 'course-category');
 

Braces +4 added lines, -1 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
      *
      * @param array $classes
      * @param WP_Post $course
-     * @return array $classes
+     * @return string[] $classes
      */
     public function course_status_class_tagging($classes, $course){
 

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  * This class is loaded int WP by the shortcode loader class.
  *
@@ -59,26 +59,26 @@ 
      * @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) {
 
-        if(!  is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return;
         }
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-        $this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'title';
+        $this->status = isset($attributes['status']) ? $attributes['status'] : 'all';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'ASC';
 
         }
 
@@ -92,20 +92,20 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
-        $status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
-        $user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
-        if ( !is_array($user_courses_logs) ) {
+        $status_query = array('user_id' => get_current_user_id(), 'type' => 'sensei_course_status');
+        $user_courses_logs = Sensei_Utils::sensei_check_for_activity($status_query, true);
+        if ( ! is_array($user_courses_logs)) {
 
-            $user_courses_logs = array( $user_courses_logs );
+            $user_courses_logs = array($user_courses_logs);
 
         }
 
         $completed_ids = $active_ids = array();
-        foreach( $user_courses_logs as $course_status ) {
+        foreach ($user_courses_logs as $course_status) {
 
-            if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
+            if (Sensei_Utils::user_completed_course($course_status, get_current_user_id())) {
 
                 $completed_ids[] = $course_status->comment_post_ID;
 
@@ -116,34 +116,34 @@ 
             }
         }
 
-        if( 'completed' == $this->status ){
+        if ('completed' == $this->status) {
 
-            $included_courses =  $completed_ids;
+            $included_courses = $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+        }elseif ('active' == $this->status) {
 
-            $included_courses =  $active_ids;
+            $included_courses = $active_ids;
 
-        }else{ // all courses
+        } else { // all courses
 
-            if( empty( $completed_ids ) ){
+            if (empty($completed_ids)) {
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
+                add_action('sensei_loop_course_inside_before', array($this, 'completed_no_course_message_output'));
             }
 
-            if( empty( $active_ids ) ){
+            if (empty($active_ids)) {
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
+                add_action('sensei_loop_course_inside_before', array($this, 'active_no_course_message_output'));
 
             }
 
-            if( empty( $completed_ids ) &&  empty( $active_ids )  ){
+            if (empty($completed_ids) && empty($active_ids)) {
 
                 $included_courses = array('-1000'); // don't show any courses
 
-            }else{
-                $included_courses = Sensei_Utils::array_zip_merge( $active_ids, $completed_ids );
+            } else {
+                $included_courses = Sensei_Utils::array_zip_merge($active_ids, $completed_ids);
             }
 
 
@@ -154,7 +154,7 @@ 
         // if the shortcode is not active or in active and the active and completed
         // tabs show up.
         $number_of_posts = $this->number;
-        if( 'active' != $this->status && 'complete' != $this->status  ){
+        if ('active' != $this->status && 'complete' != $this->status) {
             $number_of_posts = 1000;
         }
 
@@ -165,12 +165,12 @@ 
             'post_status'      => 'publish',
             'orderby'          => $this->orderby,
             'order'            => $this->order,
-            'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
+            'paged' => empty($query_var_paged) ? 1 : $query_var_paged,
             'posts_per_page'   => $number_of_posts,
             'post__in'         => $included_courses,
         );
 
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
@@ -180,12 +180,12 @@ 
      *
      * @since 1.9.0
      */
-    public function completed_no_course_message_output(){
+    public function completed_no_course_message_output() {
         ?>
         <li class="user-completed">
             <div class="sensei-message info">
 
-                <?php _e( 'You have not completed any courses yet.', 'woothemes-sensei' ); ?>
+                <?php _e('You have not completed any courses yet.', 'woothemes-sensei'); ?>
 
             </div>
         </li>
@@ -198,17 +198,17 @@ 
      *
      * @since 1.9.0
      */
-    public function active_no_course_message_output(){
+    public function active_no_course_message_output() {
         ?>
 
         <li class="user-active">
             <div class="sensei-message info">
 
-                <?php _e( 'You have no active courses.', 'woothemes-sensei' ); ?>
+                <?php _e('You have no active courses.', 'woothemes-sensei'); ?>
 
-                <a href="<?php esc_attr_e( Sensei_Course::get_courses_page_url() ); ?>">
+                <a href="<?php esc_attr_e(Sensei_Course::get_courses_page_url()); ?>">
 
-                    <?php  _e( 'Start a Course!', 'woothemes-sensei' ); ?>
+                    <?php  _e('Start a Course!', 'woothemes-sensei'); ?>
 
                 </a>
 
@@ -222,11 +222,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
-        if(!  is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return '';
         }
 
@@ -242,7 +242,7 @@ 
         Sensei_Messages::the_my_messages_link();
         Sensei_Templates::get_template('loop-course.php');
         Sensei_Templates::get_template('globals/pagination.php');
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         $this->detach_shortcode_hooks();
 
@@ -258,23 +258,23 @@ 
      *
      * @since 1.9.0
      */
-    public function attach_shortcode_hooks(){
+    public function attach_shortcode_hooks() {
 
         // attach the toggle functionality
         // don't show the toggle action if the user specified complete or active for this shortcode
-        if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
+        if ( ! in_array($this->status, array('active', 'complete'))) {
 
-            add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-            add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
+            add_action('sensei_loop_course_before', array($this, 'course_toggle_actions'));
+            add_action('wp_footer', array($this, 'print_course_toggle_actions_inline_script'), 90);
 
         }
 
         // add extra classes to distinguish the course based on user completed or active
-        add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+        add_filter('sensei_course_loop_content_class', array($this, 'course_status_class_tagging'), 20, 2);
 
         // attach progress meter below course
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+        add_action('sensei_course_content_inside_after', array($this, 'attach_course_progress'));
+        add_action('sensei_course_content_inside_after', array($this, 'attach_course_buttons'));
 
     }
 
@@ -283,13 +283,13 @@ 
      *
      * @since 1.9.0
      */
-    public function detach_shortcode_hooks(){
+    public function detach_shortcode_hooks() {
 
         //remove all hooks after the output is generated
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
-        remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
-        remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+        remove_action('sensei_course_content_inside_after', array($this, 'attach_course_progress'));
+        remove_action('sensei_course_content_inside_after', array($this, 'attach_course_buttons'));
+        remove_filter('sensei_course_loop_content_class', array($this, 'course_status_class_tagging'), 20, 2);
+        remove_action('sensei_loop_course_before', array($this, 'course_toggle_actions'));
     }
 
     /**
@@ -297,10 +297,10 @@ 
      *
      * @param $course
      */
-    public function attach_course_progress( $course ){
+    public function attach_course_progress($course) {
 
-        $percentage = Sensei()->course->get_completion_percentage( $course->ID, get_current_user_id() );
-        echo Sensei()->course->get_progress_meter( $percentage );
+        $percentage = Sensei()->course->get_completion_percentage($course->ID, get_current_user_id());
+        echo Sensei()->course->get_progress_meter($percentage);
 
     }// attach_course_progress
 
@@ -312,9 +312,9 @@ 
      *
      * @param $course
      */
-    public function attach_course_buttons( $course ){
+    public function attach_course_buttons($course) {
 
-        Sensei()->course->the_course_action_buttons( $course );
+        Sensei()->course->the_course_action_buttons($course);
 
     }// attach_course_buttons
 
@@ -327,9 +327,9 @@ 
      * @param WP_Post $course
      * @return array $classes
      */
-    public function course_status_class_tagging($classes, $course){
+    public function course_status_class_tagging($classes, $course) {
 
-        if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
+        if (Sensei_Utils::user_completed_course($course, get_current_user_id())) {
 
             $classes[] = 'user-completed';
 
@@ -346,7 +346,7 @@ 
     /**
      * Output the course toggle functionality
      */
-    public function course_toggle_actions(){ ?>
+    public function course_toggle_actions() { ?>
 
         <section id="user-course-status-toggle">
             <a id="sensei-user-courses-active-action" href=""><?php _e('Active Courses'); ?></a>

Braces +8 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 /**
  * This class is loaded int WP by the shortcode loader class.
  *
@@ -75,7 +78,7 @@ 
 
             $this->order =  'ASC';
 
-        }else{
+        } else{
 
             // for everything else use the value passed or the default DESC
             $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
@@ -121,11 +124,11 @@ 
             $included_courses =  $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+        } elseif( 'active'==$this->status ){
 
             $included_courses =  $active_ids;
 
-        }else{ // all courses
+        } else{ // all courses
 
             if( empty( $completed_ids ) ){
 
@@ -142,7 +145,7 @@ 
 
                 $included_courses = array('-1000'); // don't show any courses
 
-            }else{
+            } else{
                 $included_courses = Sensei_Utils::array_zip_merge( $active_ids, $completed_ids );
             }
 

Indentation +233 added lines, -233 removed lines

@@ -23,165 +23,165 @@ 
  */
 class Sensei_Shortcode_User_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
 
-    /**
-     * @var string number of items to show on the current page
-     * Default: -1.
-     */
-    protected $number;
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: -1.
+	 */
+	protected $number;
 
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
 
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
 
-    /**
-     * @var status can be completed or active. If none is specified all will be shown
-     */
-    protected $status;
+	/**
+	 * @var status can be completed or active. If none is specified all will be shown
+	 */
+	protected $status;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        if(!  is_user_logged_in() ) {
-            return;
-        }
+		if(!  is_user_logged_in() ) {
+			return;
+		}
 
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-        $this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+		$this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
 
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
 
-            $this->order =  'ASC';
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used in the render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used in the render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
-        $status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
-        $user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
-        if ( !is_array($user_courses_logs) ) {
+		$status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
+		$user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
+		if ( !is_array($user_courses_logs) ) {
 
-            $user_courses_logs = array( $user_courses_logs );
+			$user_courses_logs = array( $user_courses_logs );
 
-        }
+		}
 
-        $completed_ids = $active_ids = array();
-        foreach( $user_courses_logs as $course_status ) {
+		$completed_ids = $active_ids = array();
+		foreach( $user_courses_logs as $course_status ) {
 
-            if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
+			if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
 
-                $completed_ids[] = $course_status->comment_post_ID;
+				$completed_ids[] = $course_status->comment_post_ID;
 
-            } else {
+			} else {
 
-                $active_ids[] = $course_status->comment_post_ID;
+				$active_ids[] = $course_status->comment_post_ID;
 
-            }
-        }
+			}
+		}
 
-        if( 'completed' == $this->status ){
+		if( 'completed' == $this->status ){
 
-            $included_courses =  $completed_ids;
+			$included_courses =  $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+		}elseif( 'active'==$this->status ){
 
-            $included_courses =  $active_ids;
+			$included_courses =  $active_ids;
 
-        }else{ // all courses
+		}else{ // all courses
 
-            if( empty( $completed_ids ) ){
+			if( empty( $completed_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
-            }
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
+			}
 
-            if( empty( $active_ids ) ){
+			if( empty( $active_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
 
-            }
+			}
 
-            if( empty( $completed_ids ) &&  empty( $active_ids )  ){
+			if( empty( $completed_ids ) &&  empty( $active_ids )  ){
 
-                $included_courses = array('-1000'); // don't show any courses
+				$included_courses = array('-1000'); // don't show any courses
 
-            }else{
-                $included_courses = Sensei_Utils::array_zip_merge( $active_ids, $completed_ids );
-            }
+			}else{
+				$included_courses = Sensei_Utils::array_zip_merge( $active_ids, $completed_ids );
+			}
+
+
+		}
+
+		// temporary work around to hide pagination on the courses page
+		// this is in place until we can load the course for each tab via ajax
+		// if the shortcode is not active or in active and the active and completed
+		// tabs show up.
+		$number_of_posts = $this->number;
+		if( 'active' != $this->status && 'complete' != $this->status  ){
+			$number_of_posts = 1000;
+		}
+
+		// course query parameters
+		$query_var_paged = get_query_var('paged');
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			'orderby'          => $this->orderby,
+			'order'            => $this->order,
+			'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
+			'posts_per_page'   => $number_of_posts,
+			'post__in'         => $included_courses,
+		);
+
+		$this->query = new WP_Query( $query_args );
 
+	}// end setup _course_query
 
-        }
-
-        // temporary work around to hide pagination on the courses page
-        // this is in place until we can load the course for each tab via ajax
-        // if the shortcode is not active or in active and the active and completed
-        // tabs show up.
-        $number_of_posts = $this->number;
-        if( 'active' != $this->status && 'complete' != $this->status  ){
-            $number_of_posts = 1000;
-        }
-
-        // course query parameters
-        $query_var_paged = get_query_var('paged');
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            'orderby'          => $this->orderby,
-            'order'            => $this->order,
-            'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
-            'posts_per_page'   => $number_of_posts,
-            'post__in'         => $included_courses,
-        );
-
-        $this->query = new WP_Query( $query_args );
-
-    }// end setup _course_query
-
-    /**
-     * Output the message that tells the user they have
-     * no completed courses.
-     *
-     * @since 1.9.0
-     */
-    public function completed_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no completed courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function completed_no_course_message_output(){
+		?>
         <li class="user-completed">
             <div class="sensei-message info">
 
@@ -190,16 +190,16 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Output the message that tells the user they have
-     * no active courses.
-     *
-     * @since 1.9.0
-     */
-    public function active_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no active courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function active_no_course_message_output(){
+		?>
 
         <li class="user-active">
             <div class="sensei-message info">
@@ -215,141 +215,141 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if(!  is_user_logged_in() ) {
-            return '';
-        }
+		if(!  is_user_logged_in() ) {
+			return '';
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
 
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        $this->attach_shortcode_hooks();
+		$this->attach_shortcode_hooks();
 
-        ob_start();
-        echo '<section id="sensei-user-courses">';
-        Sensei_Messages::the_my_messages_link();
-        Sensei_Templates::get_template('loop-course.php');
-        Sensei_Templates::get_template('globals/pagination.php');
-        echo '</section>';
+		ob_start();
+		echo '<section id="sensei-user-courses">';
+		Sensei_Messages::the_my_messages_link();
+		Sensei_Templates::get_template('loop-course.php');
+		Sensei_Templates::get_template('globals/pagination.php');
+		echo '</section>';
 
-        $shortcode_output =  ob_get_clean();
+		$shortcode_output =  ob_get_clean();
 
-        $this->detach_shortcode_hooks();
+		$this->detach_shortcode_hooks();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
-    /**
-     * Add hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function attach_shortcode_hooks(){
+	/**
+	 * Add hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function attach_shortcode_hooks(){
 
-        // attach the toggle functionality
-        // don't show the toggle action if the user specified complete or active for this shortcode
-        if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
+		// attach the toggle functionality
+		// don't show the toggle action if the user specified complete or active for this shortcode
+		if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
 
-            add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-            add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
+			add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+			add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
 
-        }
+		}
 
-        // add extra classes to distinguish the course based on user completed or active
-        add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		// add extra classes to distinguish the course based on user completed or active
+		add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
 
-        // attach progress meter below course
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		// attach progress meter below course
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
 
-    }
+	}
 
-    /**
-     * Remove hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function detach_shortcode_hooks(){
+	/**
+	 * Remove hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function detach_shortcode_hooks(){
 
-        //remove all hooks after the output is generated
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
-        remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
-        remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-    }
+		//remove all hooks after the output is generated
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+	}
 
-    /**
-     * Hooks into sensei_course_content_inside_after
-     *
-     * @param $course
-     */
-    public function attach_course_progress( $course ){
+	/**
+	 * Hooks into sensei_course_content_inside_after
+	 *
+	 * @param $course
+	 */
+	public function attach_course_progress( $course ){
 
-        $percentage = Sensei()->course->get_completion_percentage( $course->ID, get_current_user_id() );
-        echo Sensei()->course->get_progress_meter( $percentage );
+		$percentage = Sensei()->course->get_completion_percentage( $course->ID, get_current_user_id() );
+		echo Sensei()->course->get_progress_meter( $percentage );
 
-    }// attach_course_progress
+	}// attach_course_progress
 
 
-    /**
-     * Hooked into sensei_course_content_inside_after
-     *
-     * Prints out the course action buttons
-     *
-     * @param $course
-     */
-    public function attach_course_buttons( $course ){
+	/**
+	 * Hooked into sensei_course_content_inside_after
+	 *
+	 * Prints out the course action buttons
+	 *
+	 * @param $course
+	 */
+	public function attach_course_buttons( $course ){
 
-        Sensei()->course->the_course_action_buttons( $course );
+		Sensei()->course->the_course_action_buttons( $course );
 
-    }// attach_course_buttons
+	}// attach_course_buttons
 
-    /**
-     * Add a the user status class for the given course.
-     *
-     * @since 1.9
-     *
-     * @param array $classes
-     * @param WP_Post $course
-     * @return array $classes
-     */
-    public function course_status_class_tagging($classes, $course){
+	/**
+	 * Add a the user status class for the given course.
+	 *
+	 * @since 1.9
+	 *
+	 * @param array $classes
+	 * @param WP_Post $course
+	 * @return array $classes
+	 */
+	public function course_status_class_tagging($classes, $course){
 
-        if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
+		if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
 
-            $classes[] = 'user-completed';
+			$classes[] = 'user-completed';
 
-        } else {
+		} else {
 
-            $classes[] = 'user-active';
+			$classes[] = 'user-active';
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end course_status_class_tagging
+	}// end course_status_class_tagging
 
-    /**
-     * Output the course toggle functionality
-     */
-    public function course_toggle_actions(){ ?>
+	/**
+	 * Output the course toggle functionality
+	 */
+	public function course_toggle_actions(){ ?>
 
         <section id="user-course-status-toggle">
             <a id="sensei-user-courses-active-action" href=""><?php _e('Active Courses'); ?></a>
@@ -359,12 +359,12 @@ 
 
     <?php }
 
-    /**
-     * Load the javascript for the toggle functionality
-     *
-     * @since 1.9.0
-     */
-    function print_course_toggle_actions_inline_script() { ?>
+	/**
+	 * Load the javascript for the toggle functionality
+	 *
+	 * @since 1.9.0
+	 */
+	function print_course_toggle_actions_inline_script() { ?>
 
         <script type="text/javascript">
             var buttonContainer = jQuery('#user-course-status-toggle');

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

Doc Comments -2 removed lines

@@ -167,8 +167,6 @@
 

 	/**

 	 * Load the desired component, if a method is available for it.

-	 * @param  string $component The component to potentially be loaded.

-     *

 	 * @since  1.0.0

 	 * @return void

 	 */

Indentation +26 added lines, -26 removed lines

@@ -64,11 +64,11 @@ 
 		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() ) {

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

+			&& !is_user_logged_in() ) {

 

 			// No Output

-            return;

+			return;

 

 		} else {

 			/* Our variables from the widget settings. */

@@ -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. */

@@ -168,7 +168,7 @@ 
 	/**

 	 * Load the desired component, if a method is available for it.

 	 * @param  string $component The component to potentially be loaded.

-     *

+	 *

 	 * @since  1.0.0

 	 * @return void

 	 */

@@ -207,24 +207,24 @@ 
 

 		}

 

-        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 {

+			} else {

 

-                $course_args = array(

-                    'post_type' => 'course',

-                    'orderby'         	=> 'date',

-                    'order'           	=> 'DESC',

-                    'post_status'      	=> 'publish',

-                    'posts_per_page' => $instance['limit'],

-                );

+				$course_args = array(

+					'post_type' => 'course',

+					'orderby'         	=> 'date',

+					'order'           	=> 'DESC',

+					'post_status'      	=> 'publish',

+					'posts_per_page' => $instance['limit'],

+				);

 

 				$posts_array = get_posts( $course_args );

 			}

@@ -234,13 +234,13 @@ 
 		if ( count( $posts_array ) > 0 ) { ?>

 			<ul>

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

-		    	$author_display_name = $user_info->display_name;

-		    	$author_id = $post_item->post_author;

-		    ?>

+				$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 ) );

+				$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>

@@ -255,9 +255,9 @@ 
 		    	</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>';

-		    } // End If Statement ?>

+				$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.

Braces +4 added lines, -1 removed lines

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

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

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

 

 /**

  * Sensei Course Component Widget

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