woothemes / sensei

templates/single-course/lessons.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * The Template for displaying all single course meta information.
  *
@@ -22,17 +22,17 @@ 
          * @hooked WooThemes_Sensei_Course::load_single_course_lessons_query
          * @since 1.9.0
          */
-        do_action( 'sensei_single_course_lessons_before' );
+        do_action('sensei_single_course_lessons_before');
 
     ?>
 
     <?php
 
     //lessons loaded into loop in the sensei_single_course_lessons_before hook
-    if( have_posts() ):
+    if (have_posts()):
 
         // start course lessons loop
-        while ( have_posts() ): the_post();  ?>
+        while (have_posts()): the_post(); ?>
 
             <article <?php post_class(); ?> >
 
@@ -50,7 +50,7 @@ 
                      * @hooked WooThemes_Sensei_Lesson::the_lesson_thumbnail - 8
                      *
                      */
-                    do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() );
+                    do_action('sensei_single_course_inside_before_lesson', get_the_ID());
 
                 ?>
 
@@ -75,7 +75,7 @@ 
                      *
                      * @since 1.9.0
                      */
-                    do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() );
+                    do_action('sensei_single_course_inside_after_lesson', get_the_ID());
 
                 ?>
 
@@ -94,7 +94,7 @@ 
          *
          * @since 1.9.0
          */
-        do_action( 'sensei_single_course_lessons_after' );
+        do_action('sensei_single_course_lessons_after');
 
     ?>
 

templates/course-results.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
  */
 ?>
 
-<?php  get_sensei_header();  ?>
+<?php  get_sensei_header(); ?>
 
 <?php
 /**
@@ -21,15 +21,15 @@ 
  *
  * @hooked Sensei_Course_Results::deprecate_sensei_course_results_content_hook() - 20
  */
-do_action( 'sensei_course_results_content_before' );
+do_action('sensei_course_results_content_before');
 ?>
 
 <?php
 global $course;
-$course = get_page_by_path( $wp_query->query_vars['course_results'], OBJECT, 'course' );
+$course = get_page_by_path($wp_query->query_vars['course_results'], OBJECT, 'course');
 ?>
 
-<article <?php post_class( array( 'course', 'post','course-results' ) ); ?> >
+<article <?php post_class(array('course', 'post', 'course-results')); ?> >
 
     <section class="entry fix">
 
@@ -42,7 +42,7 @@ 
          * @param integer $course_id
          *
          */
-        do_action( 'sensei_course_results_content_inside_before', $course->ID );
+        do_action('sensei_course_results_content_inside_before', $course->ID);
         ?>
 
         <header>
@@ -53,7 +53,7 @@ 
 
         </header>
 
-        <?php if ( is_user_logged_in() ):?>
+        <?php if (is_user_logged_in()):?>
 
             <?php
             /**
@@ -65,14 +65,14 @@ 
              *
              * @hooked Sensei_Course_Results::course_info() - 20
              */
-            do_action( 'sensei_course_results_content_inside_before_lessons', $course->ID );
+            do_action('sensei_course_results_content_inside_before_lessons', $course->ID);
             ?>
 
 
             <section class="course-results-lessons">
                 <?php
-                $started_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-                if( $started_course ) {
+                $started_course = Sensei_Utils::user_started_course($course->ID, get_current_user_id());
+                if ($started_course) {
 
                     sensei_the_course_results_lessons();
 
@@ -92,7 +92,7 @@ 
          *
          * @hooked Sensei()->course_results->course_info - 20
          */
-        do_action( 'sensei_course_results_content_inside_after', $course->ID );
+        do_action('sensei_course_results_content_inside_after', $course->ID);
         ?>
 
     </section>
@@ -106,7 +106,7 @@ 
  * @since 1.9.0
  *
  */
-do_action( 'sensei_course_results_content_after' );
+do_action('sensei_course_results_content_after');
 ?>
 
 

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

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.
  *
@@ -61,28 +61,28 @@ 
      * @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()) {
             // show the login form
             Sensei_Templates::get_template('user/login-form.php');
             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';
 
         }
 
@@ -96,20 +96,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;
 
@@ -120,34 +120,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( (array)$active_ids, (array)$completed_ids );
+            } else {
+                $included_courses = Sensei_Utils::array_zip_merge((array) $active_ids, (array) $completed_ids);
             }
 
 
@@ -158,7 +158,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;
         }
 
@@ -169,12 +169,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
 
@@ -184,12 +184,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>
@@ -202,17 +202,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>
 
@@ -226,11 +226,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
-        if(!  is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return '';
         }
 
@@ -249,7 +249,7 @@ 
         Sensei_Templates::get_template('globals/pagination.php');
         echo '</section>';
 
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         $this->detach_shortcode_hooks();
 
@@ -265,23 +265,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'));
 
     }
 
@@ -290,13 +290,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'));
     }
 
     /**
@@ -304,10 +304,10 @@ 
      *
      * @param $course
      */
-    public function attach_course_progress( $course_id ){
+    public function attach_course_progress($course_id) {
 
-        $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
 
@@ -319,9 +319,9 @@ 
      *
      * @param integer $course_id
      */
-    public function attach_course_buttons( $course_id ){
+    public function attach_course_buttons($course_id) {
 
-        Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
+        Sensei()->course->the_course_action_buttons(get_post($course_id));
 
     }// attach_course_buttons
 
@@ -334,9 +334,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';
 
@@ -353,7 +353,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>

includes/class-sensei-quiz.php

Spacing +286 added lines, -286 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Quiz Class
@@ -22,25 +22,25 @@ 
 	 *
 	 * @param $file
 	 */
-	public function __construct ( $file = __FILE__ ) {
+	public function __construct($file = __FILE__) {
 		$this->file = $file;
         $this->token = 'quiz';
-		$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_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
+        add_action('sensei_single_quiz_content_inside_before', array($this, 'user_quiz_submit_listener'));
 
 		// fire the save user answers quiz button click responder
-		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_save_quiz_answers_listener' ) );
+		add_action('sensei_single_quiz_content_inside_before', array($this, 'user_save_quiz_answers_listener'));
 
         // fire the load global data function
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
+        add_action('sensei_single_quiz_content_inside_before', 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,25 +51,25 @@ 
 	* @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;
 	    	}
 
@@ -80,10 +80,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;
@@ -97,19 +97,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;
@@ -124,23 +124,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_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
+        remove_action('sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener');
 
     } // end user_save_quiz_answers_listener
 
@@ -159,17 +159,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;
 
@@ -177,23 +177,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;
@@ -215,41 +215,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;
@@ -266,23 +266,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
 
@@ -301,18 +301,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()
 
@@ -326,7 +326,7 @@ 
      * @access public
      *
      */
-    public function load_global_quiz_data(){
+    public function load_global_quiz_data() {
 
         global  $post, $current_user;
         $this->data = new stdClass();
@@ -335,46 +335,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 );
@@ -399,41 +399,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
 
@@ -453,54 +453,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
 
@@ -520,20 +520,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;
 
@@ -543,38 +543,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();
@@ -584,13 +584,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';
 
@@ -611,9 +611,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
@@ -623,7 +623,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);
 
          }
 
@@ -639,7 +639,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;
 
@@ -659,38 +659,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
 
@@ -711,18 +711,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;
 
@@ -731,15 +731,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;
@@ -758,36 +758,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;
          }
 
@@ -810,21 +810,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(
@@ -833,17 +833,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
 
@@ -865,13 +865,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;
 
@@ -879,25 +879,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);
 
         }
 
@@ -922,42 +922,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);
 
          }
 
@@ -980,25 +980,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
 
@@ -1008,23 +1008,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
 
@@ -1042,7 +1042,7 @@ 
 
      public function quiz_has_no_questions() {
 
-         if( ! is_singular( 'quiz' ) )  {
+         if ( ! is_singular('quiz')) {
              return;
          }
 
@@ -1050,11 +1050,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;
@@ -1068,7 +1068,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');
 
@@ -1078,7 +1078,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 ');
 
@@ -1091,29 +1091,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( ));
 
      }
 
@@ -1125,21 +1125,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();
 
@@ -1155,9 +1155,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'] = '';
 
@@ -1168,7 +1168,7 @@ 
       *
       * @since 1.9.0
       */
-     public static function the_title(){
+     public static function the_title() {
          ?>
          <header>
 
@@ -1178,7 +1178,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>
@@ -1193,11 +1193,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>';
 
     }
 
@@ -1208,9 +1208,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');
 
      }
 
@@ -1224,50 +1224,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 } ?>
 
@@ -1285,13 +1285,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;
@@ -1309,13 +1309,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;
          }
 
@@ -1332,4 +1332,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Quiz extends Sensei_Quiz{}
+class WooThemes_Sensei_Quiz extends Sensei_Quiz {}

includes/class-sensei-admin.php

Spacing +416 added lines, -416 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Handles all admin views, assets and navigation.
@@ -14,51 +14,51 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
         //register admin styles
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles_global' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_styles_global'));
 
         //register admin scripts
-        add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
+        add_action('admin_enqueue_scripts', array($this, 'register_scripts'));
 
-		add_action( 'admin_print_styles', array( $this, 'admin_notices_styles' ) );
-		add_action( 'settings_before_form', array( $this, 'install_pages_output' ) );
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ) );
-		add_action( 'admin_head', array( $this, 'admin_menu_highlight' ) );
-		add_action( 'admin_init', array( $this, 'page_redirect' ) );
-		add_action( 'admin_init', array( $this, 'sensei_add_custom_menu_items' ) );
-        add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
+		add_action('admin_print_styles', array($this, 'admin_notices_styles'));
+		add_action('settings_before_form', array($this, 'install_pages_output'));
+		add_action('admin_menu', array($this, 'admin_menu'), 10);
+		add_action('menu_order', array($this, 'admin_menu_order'));
+		add_action('admin_head', array($this, 'admin_menu_highlight'));
+		add_action('admin_init', array($this, 'page_redirect'));
+		add_action('admin_init', array($this, 'sensei_add_custom_menu_items'));
+        add_action('admin_init', array(__CLASS__, 'install_pages'));
 
 		// Duplicate lesson & courses
-		add_filter( 'post_row_actions', array( $this, 'duplicate_action_link' ), 10, 2 );
-		add_action( 'admin_action_duplicate_lesson', array( $this, 'duplicate_lesson_action' ) );
-		add_action( 'admin_action_duplicate_course', array( $this, 'duplicate_course_action' ) );
-		add_action( 'admin_action_duplicate_course_with_lessons', array( $this, 'duplicate_course_with_lessons_action' ) );
+		add_filter('post_row_actions', array($this, 'duplicate_action_link'), 10, 2);
+		add_action('admin_action_duplicate_lesson', array($this, 'duplicate_lesson_action'));
+		add_action('admin_action_duplicate_course', array($this, 'duplicate_course_action'));
+		add_action('admin_action_duplicate_course_with_lessons', array($this, 'duplicate_course_with_lessons_action'));
 
 		// Handle lessons list table filtering
-		add_action( 'restrict_manage_posts', array( $this, 'lesson_filter_options' ) );
-		add_filter( 'request', array( $this, 'lesson_filter_actions' ) );
+		add_action('restrict_manage_posts', array($this, 'lesson_filter_options'));
+		add_filter('request', array($this, 'lesson_filter_actions'));
 
 		// Add Sensei items to 'at a glance' widget
-		add_filter( 'dashboard_glance_items', array( $this, 'glance_items' ), 10, 1 );
+		add_filter('dashboard_glance_items', array($this, 'glance_items'), 10, 1);
 
 		// Handle course and lesson deletions
-		add_action( 'trash_course', array( $this, 'delete_content' ), 10, 2 );
-		add_action( 'trash_lesson', array( $this, 'delete_content' ), 10, 2 );
+		add_action('trash_course', array($this, 'delete_content'), 10, 2);
+		add_action('trash_lesson', array($this, 'delete_content'), 10, 2);
 
 		// Delete user activity when user is deleted
-		add_action( 'deleted_user', array( $this, 'delete_user_activity' ), 10, 1 );
+		add_action('deleted_user', array($this, 'delete_user_activity'), 10, 1);
 
 		// Add notices to WP dashboard
-		add_action( 'admin_notices', array( $this, 'theme_compatibility_notices' ) );
+		add_action('admin_notices', array($this, 'theme_compatibility_notices'));
 
 		// Reset theme notices when switching themes
-		add_action( 'switch_theme', array( $this, 'reset_theme_check_notices' ) );
+		add_action('switch_theme', array($this, 'reset_theme_check_notices'));
 
 		// Allow Teacher access the admin area
-		add_filter( 'woocommerce_prevent_admin_access', array( $this, 'admin_access' ) );
+		add_filter('woocommerce_prevent_admin_access', array($this, 'admin_access'));
 
 	} // End __construct()
 
@@ -70,21 +70,21 @@ 
 	public function admin_menu() {
 		global $menu;
 		$menu_cap = '';
-		if( current_user_can( 'manage_sensei' ) ) {
+		if (current_user_can('manage_sensei')) {
 			$menu_cap = 'manage_sensei';
 		} else {
-			if( current_user_can( 'manage_sensei_grades' ) ) {
+			if (current_user_can('manage_sensei_grades')) {
 				$menu_cap = 'manage_sensei_grades';
 			}
 		}
 
-		if( $menu_cap ) {
-			$menu[] = array( '', 'read', 'separator-sensei', '', 'wp-menu-separator sensei' );
-            add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
+		if ($menu_cap) {
+			$menu[] = array('', 'read', 'separator-sensei', '', 'wp-menu-separator sensei');
+            add_menu_page('Sensei', 'Sensei', $menu_cap, 'sensei', array(Sensei()->analysis, 'analysis_page'), '', '50');
 		}
 
-		add_submenu_page( 'edit.php?post_type=course', __( 'Order Courses', 'woothemes-sensei' ), __( 'Order Courses', 'woothemes-sensei' ), 'manage_sensei', 'course-order', array( $this, 'course_order_screen' ) );
-		add_submenu_page( 'edit.php?post_type=lesson', __( 'Order Lessons', 'woothemes-sensei' ), __( 'Order Lessons', 'woothemes-sensei' ), 'edit_lessons', 'lesson-order', array( $this, 'lesson_order_screen' ) );
+		add_submenu_page('edit.php?post_type=course', __('Order Courses', 'woothemes-sensei'), __('Order Courses', 'woothemes-sensei'), 'manage_sensei', 'course-order', array($this, 'course_order_screen'));
+		add_submenu_page('edit.php?post_type=lesson', __('Order Lessons', 'woothemes-sensei'), __('Order Lessons', 'woothemes-sensei'), 'edit_lessons', 'lesson-order', array($this, 'lesson_order_screen'));
 	}
 
 	/**
@@ -93,22 +93,22 @@ 
 	 * @param  array $menu_order Existing menu order
 	 * @return array 			 Modified menu order for Sensei
 	 */
-	public function admin_menu_order( $menu_order ) {
+	public function admin_menu_order($menu_order) {
 
 		// Initialize our custom order array
 		$sensei_menu_order = array();
 
 		// Get the index of our custom separator
-		$sensei_separator = array_search( 'separator-sensei', $menu_order );
+		$sensei_separator = array_search('separator-sensei', $menu_order);
 
 		// Loop through menu order and do some rearranging
-		foreach ( $menu_order as $index => $item ) :
+		foreach ($menu_order as $index => $item) :
 
-			if ( ( ( 'sensei' ) == $item ) ) :
+			if ((('sensei') == $item)) :
 				$sensei_menu_order[] = 'separator-sensei';
 				$sensei_menu_order[] = $item;
-				unset( $menu_order[$sensei_separator] );
-			elseif ( !in_array( $item, array( 'separator-sensei' ) ) ) :
+				unset($menu_order[$sensei_separator]);
+			elseif ( ! in_array($item, array('separator-sensei'))) :
 				$sensei_menu_order[] = $item;
 			endif;
 
@@ -128,28 +128,28 @@ 
 
 		$screen = get_current_screen();
 
-        if( empty( $screen ) ){
+        if (empty($screen)) {
             return;
         }
 
-		if ( $screen->base == 'post' && $post_type == 'course' ) {
+		if ($screen->base == 'post' && $post_type == 'course') {
 
-			$parent_file  = 'edit.php?post_type=course';
+			$parent_file = 'edit.php?post_type=course';
 
-		} elseif ( $screen->base == 'edit-tags' && $taxonomy == 'course-category' ) {
+		} elseif ($screen->base == 'edit-tags' && $taxonomy == 'course-category') {
 
 			$submenu_file = 'edit-tags.php?taxonomy=course-category&amp;post_type=course';
 			$parent_file  = 'edit.php?post_type=course';
 
-        } elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
+        } elseif ($screen->base == 'edit-tags' && $taxonomy == 'module') {
 
             $submenu_file = 'edit-tags.php?taxonomy=module';
             $parent_file  = 'edit.php?post_type=course';
 
-		} elseif ( in_array( $screen->id, array( 'sensei_message', 'edit-sensei_message' ) ) ) {
+		} elseif (in_array($screen->id, array('sensei_message', 'edit-sensei_message'))) {
 
             $submenu_file = 'edit.php?post_type=sensei_message';
-			$parent_file  = 'sensei';
+			$parent_file = 'sensei';
 
 		}
 	}
@@ -160,8 +160,8 @@ 
 	 * @return void
 	 */
 	public function page_redirect() {
-		if( isset( $_GET['page'] ) && $_GET['page'] == 'sensei' ) {
-			wp_safe_redirect( 'admin.php?page=sensei_analysis' );
+		if (isset($_GET['page']) && $_GET['page'] == 'sensei') {
+			wp_safe_redirect('admin.php?page=sensei_analysis');
 			exit;
 		}
 	}
@@ -176,11 +176,11 @@ 
 	 */
 	function install_pages_output() {
 
-        if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
+        if (isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
 
             ?>
             <div id="message" class="updated sensei-message sensei-connect">
-                <p><?php _e( '<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei' ); ?></p>
+                <p><?php _e('<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei'); ?></p>
                 <p><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/sensei/" data-text="A premium Learning Management plugin for #WordPress that helps you create courses. Beautifully." data-via="WooThemes" data-size="large" data-hashtags="Sensei">Tweet</a>
                 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
             </div>
@@ -202,11 +202,11 @@ 
 	 * @param int $post_parent (default: 0)
 	 * @return integer $page_id
 	 */
-	function create_page( $slug, $page_title = '', $page_content = '', $post_parent = 0 ) {
+	function create_page($slug, $page_title = '', $page_content = '', $post_parent = 0) {
 		global $wpdb;
 
-        $page_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", $slug ) );
-		if ( $page_id ) :
+        $page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", $slug));
+		if ($page_id) :
 			return $page_id;
 		endif;
 
@@ -221,7 +221,7 @@ 
 	        'comment_status' 	=> 'closed'
 	    );
 
-	    $page_id = wp_insert_post( $page_data );
+	    $page_id = wp_insert_post($page_data);
 
 	    return $page_id;
 
@@ -237,12 +237,12 @@ 
 	function create_pages() {
 
 		// Courses page
-	    $new_course_page_id = $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ),  __('Courses', 'woothemes-sensei'), '' );
-        Sensei()->settings->set( 'course_page', $new_course_page_id );
+	    $new_course_page_id = $this->create_page(esc_sql(_x('courses-overview', 'page_slug', 'woothemes-sensei')), __('Courses', 'woothemes-sensei'), '');
+        Sensei()->settings->set('course_page', $new_course_page_id);
 
         // User Dashboard page
-	    $new_my_course_page_id = $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]' );
-        Sensei()->settings->set( 'my_course_page',$new_my_course_page_id  );
+	    $new_my_course_page_id = $this->create_page(esc_sql(_x('my-courses', 'page_slug', 'woothemes-sensei')), __('My Courses', 'woothemes-sensei'), '[sensei_user_courses]');
+        Sensei()->settings->set('my_course_page', $new_my_course_page_id);
 
 	} // End create_pages()
 
@@ -252,25 +252,25 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function admin_styles_global ( $hook ) {
+	public function admin_styles_global($hook) {
 		global $post_type;
 
-		$allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question' ) );
-		$allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) );
-		$allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order' ) );
+		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question'));
+		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php'));
+		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order'));
 
 		// Global Styles for icons and menu items
-		wp_register_style( 'woothemes-sensei-global', Sensei()->plugin_url . 'assets/css/global.css', '', Sensei()->version, 'screen' );
-		wp_enqueue_style( 'woothemes-sensei-global' );
+		wp_register_style('woothemes-sensei-global', Sensei()->plugin_url.'assets/css/global.css', '', Sensei()->version, 'screen');
+		wp_enqueue_style('woothemes-sensei-global');
 
         // Select 2 styles
-        wp_enqueue_style( 'sensei-core-select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
+        wp_enqueue_style('sensei-core-select2', Sensei()->plugin_url.'assets/css/select2/select2.css', '', Sensei()->version, 'screen');
 
 		// Test for Write Panel Pages
-		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
+		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) {
 
-			wp_register_style( 'woothemes-sensei-admin-custom', Sensei()->plugin_url . 'assets/css/admin-custom.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( 'woothemes-sensei-admin-custom' );
+			wp_register_style('woothemes-sensei-admin-custom', Sensei()->plugin_url.'assets/css/admin-custom.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style('woothemes-sensei-admin-custom');
 
 		}
 
@@ -285,20 +285,20 @@ 
      * @since 1.8.2
      * @access public
      */
-    public function register_scripts( $hook ){
+    public function register_scripts($hook) {
 
         $screen = get_current_screen();
 
         // Allow developers to load non-minified versions of scripts
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
         // Select2 script used to enhance all select boxes
-        wp_register_script( 'sensei-core-select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+        wp_register_script('sensei-core-select2', Sensei()->plugin_url.'/assets/js/select2/select2'.$suffix.'.js', array('jquery'), Sensei()->version);
 
         // load edit module scripts
-        if( 'edit-module' ==  $screen->id ){
+        if ('edit-module' == $screen->id) {
 
-            wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
+            wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery.min.js', array('jquery', 'sensei-chosen'), Sensei()->version, true);
 
         }
 
@@ -316,19 +316,19 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
             <p>
-                <?php _e( '<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei'); ?>
             </p>
 
             <p class="submit">
 
-                <a href="<?php echo esc_url( add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings') ) ); ?>"
+                <a href="<?php echo esc_url(add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>"
                    class="button-primary">
 
-                    <?php _e( 'Install Sensei Pages', 'woothemes-sensei' ); ?>
+                    <?php _e('Install Sensei Pages', 'woothemes-sensei'); ?>
 
                 </a>
 
-                <a class="skip button" href="<?php echo esc_url( add_query_arg( 'skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings' ) ) ); ?>">
+                <a class="skip button" href="<?php echo esc_url(add_query_arg('skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>">
 
                     <?php _e('Skip setup', 'woothemes-sensei'); ?>
 
@@ -351,11 +351,11 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
 	    	<p>
-                <?php _e( '<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei'); ?>
             </p>
 
 			<p class="submit">
-                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e( 'Settings', 'woothemes-sensei' ); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
+                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e('Settings', 'woothemes-sensei'); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
                     <?php _e('Documentation', 'woothemes-sensei'); ?>
                 </a>
             </p>
@@ -388,11 +388,11 @@ 
 	public function language_pack_install_notice() {
 		?>
 		<div id="message" class="updated sensei-message sensei-connect">
-				<p><?php _e( '<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei' ); ?><p>
+				<p><?php _e('<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei'); ?><p>
 
 				<p class="submit">
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_install_uri() ); ?>" class="button-primary"><?php _e( 'Install', 'woothemes-sensei' ); ?></a>
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_dismiss_uri() ) ?>" class="docs button"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_install_uri()); ?>" class="button-primary"><?php _e('Install', 'woothemes-sensei'); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_dismiss_uri()) ?>" class="docs button"><?php _e('Hide this notice', 'woothemes-sensei'); ?></a>
 				</p>
 		</div>
 		<?php
@@ -408,20 +408,20 @@ 
 	function admin_notices_styles() {
 
 		// Installed notices
-	    if ( 1 == get_option( 'sensei_installed' ) ) {
+	    if (1 == get_option('sensei_installed')) {
 
-	    	wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
+	    	wp_enqueue_style('sensei-activation', plugins_url('/assets/css/activation.css', dirname(__FILE__)), '', Sensei()->version);
 
-	    	if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
-	    		add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
-	    	} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
-	    		add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
+	    	if (get_option('skip_install_sensei_pages') != 1 && Sensei()->get_page_id('course') < 1 && ! isset($_GET['install_sensei_pages']) && ! isset($_GET['skip_install_sensei_pages'])) {
+	    		add_action('admin_notices', array($this, 'admin_install_notice'));
+	    	} elseif ( ! isset($_GET['page']) || $_GET['page'] != 'woothemes-sensei-settings') {
+	    		add_action('admin_notices', array($this, 'admin_installed_notice'));
 	    	} // End If Statement
 
 	    } // End If Statement
 
-	    if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
-	    	add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
+	    if (Sensei_Language_Pack_Manager::has_language_pack_available()) {
+	    	add_action('admin_notices', array($this, 'language_pack_install_notice'));
 	    }
 
 	} // End admin_notices_styles()
@@ -432,17 +432,17 @@ 
 	 * @param  object $post    Current post
 	 * @return array           Modified actions
 	 */
-	public function duplicate_action_link( $actions, $post ) {
-		switch( $post->post_type ) {
+	public function duplicate_action_link($actions, $post) {
+		switch ($post->post_type) {
 			case 'lesson':
-				$confirm = __( 'This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = "<a onclick='return confirm(\"" . $confirm . "\");' href='" . $this->get_duplicate_link( $post->ID ) . "' title='" . esc_attr(__( 'Duplicate this lesson', 'woothemes-sensei' ) ) . "'>" .  __('Duplicate', 'woothemes-sensei' ) . "</a>";
+				$confirm = __('This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = "<a onclick='return confirm(\"".$confirm."\");' href='".$this->get_duplicate_link($post->ID)."' title='".esc_attr(__('Duplicate this lesson', 'woothemes-sensei'))."'>".__('Duplicate', 'woothemes-sensei')."</a>";
 			break;
 
 			case 'course':
-				$confirm = __( 'This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = '<a href="' . $this->get_duplicate_link( $post->ID ) . '" title="' . esc_attr(__( 'Duplicate this course', 'woothemes-sensei' ) ) . '">' .  __('Duplicate', 'woothemes-sensei' ) . '</a>';
-				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\'' . $confirm . '\');" href="' . $this->get_duplicate_link( $post->ID, true ) . '" title="' . esc_attr(__( 'Duplicate this course with its lessons', 'woothemes-sensei' ) ) . '">' .  __('Duplicate (with lessons)', 'woothemes-sensei' ) . '</a>';
+				$confirm = __('This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = '<a href="'.$this->get_duplicate_link($post->ID).'" title="'.esc_attr(__('Duplicate this course', 'woothemes-sensei')).'">'.__('Duplicate', 'woothemes-sensei').'</a>';
+				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\''.$confirm.'\');" href="'.$this->get_duplicate_link($post->ID, true).'" title="'.esc_attr(__('Duplicate this course with its lessons', 'woothemes-sensei')).'">'.__('Duplicate (with lessons)', 'woothemes-sensei').'</a>';
 			break;
 		}
 
@@ -455,17 +455,17 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return string                Duplication link
 	 */
-	private function get_duplicate_link( $post_id = 0, $with_lessons = false ) {
+	private function get_duplicate_link($post_id = 0, $with_lessons = false) {
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		$action = 'duplicate_' . $post->post_type;
+		$action = 'duplicate_'.$post->post_type;
 
-		if( 'course' == $post->post_type && $with_lessons ) {
+		if ('course' == $post->post_type && $with_lessons) {
 			$action .= '_with_lessons';
 		}
 
-		return apply_filters( $action . '_link', admin_url( 'admin.php?action=' . $action . '&post=' . $post_id ), $post_id );
+		return apply_filters($action.'_link', admin_url('admin.php?action='.$action.'&post='.$post_id), $post_id);
 	}
 
 	/**
@@ -473,7 +473,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_lesson_action() {
-		$this->duplicate_content( 'lesson' );
+		$this->duplicate_content('lesson');
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_action() {
-		$this->duplicate_content( 'course' );
+		$this->duplicate_content('course');
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_with_lessons_action() {
-		$this->duplicate_content( 'course', true );
+		$this->duplicate_content('course', true);
 	}
 
 	/**
@@ -498,34 +498,34 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return void
 	 */
-	private function duplicate_content( $post_type = 'lesson', $with_lessons = false ) {
-		if ( ! isset( $_GET['post'] ) ) {
-			wp_die( sprintf( __( 'Please supply a %1$s ID.', 'woothemes-sensei' ) ), $post_type );
+	private function duplicate_content($post_type = 'lesson', $with_lessons = false) {
+		if ( ! isset($_GET['post'])) {
+			wp_die(sprintf(__('Please supply a %1$s ID.', 'woothemes-sensei')), $post_type);
 		}
 
 		$post_id = $_GET['post'];
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		if( ! is_wp_error( $post ) ) {
+		if ( ! is_wp_error($post)) {
 
-			$new_post = $this->duplicate_post( $post );
+			$new_post = $this->duplicate_post($post);
 
-			if( $new_post && ! is_wp_error( $new_post ) ) {
+			if ($new_post && ! is_wp_error($new_post)) {
 
-				if( 'lesson' == $new_post->post_type ) {
-					$this->duplicate_lesson_quizzes( $post_id, $new_post->ID );
+				if ('lesson' == $new_post->post_type) {
+					$this->duplicate_lesson_quizzes($post_id, $new_post->ID);
 				}
 
-				if( 'course' == $new_post->post_type && $with_lessons ) {
-					$this->duplicate_course_lessons( $post_id, $new_post->ID );
+				if ('course' == $new_post->post_type && $with_lessons) {
+					$this->duplicate_course_lessons($post_id, $new_post->ID);
 				}
 
-				$redirect_url = admin_url( 'post.php?post=' . $new_post->ID . '&action=edit' );
+				$redirect_url = admin_url('post.php?post='.$new_post->ID.'&action=edit');
 			} else {
-				$redirect_url = admin_url( 'edit.php?post_type=' . $post->post_type . '&message=duplicate_failed' );
+				$redirect_url = admin_url('edit.php?post_type='.$post->post_type.'&message=duplicate_failed');
 			}
 
-			wp_safe_redirect( esc_url_raw( $redirect_url ) );
+			wp_safe_redirect(esc_url_raw($redirect_url));
 			exit;
 		}
 	}
@@ -536,19 +536,19 @@ 
 	 * @param  integer $new_lesson_id ID of duplicate lesson
 	 * @return void
 	 */
-	private function duplicate_lesson_quizzes( $old_lesson_id, $new_lesson_id ) {
+	private function duplicate_lesson_quizzes($old_lesson_id, $new_lesson_id) {
 
-        $old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
-        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
+        $old_quiz_id = Sensei()->lesson->lesson_quizzes($old_lesson_id);
+        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions($old_quiz_id);
 
         // duplicate the generic wp post information
-		$new_quiz = $this->duplicate_post( get_post( $old_quiz_id ), '' );
+		$new_quiz = $this->duplicate_post(get_post($old_quiz_id), '');
 
 		//update the new lesson data
-        add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
+        add_post_meta($new_lesson_id, '_lesson_quiz', $new_quiz->ID);
 
 		//update the new quiz data
-        add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
+        add_post_meta($new_quiz->ID, '_quiz_lesson', $new_lesson_id);
         wp_update_post(
             array(
                 'ID' => $new_quiz->ID,
@@ -556,15 +556,15 @@ 
             )
         );
 
-		foreach( $old_quiz_questions as $question ) {
+		foreach ($old_quiz_questions as $question) {
 
 			// copy the question order over to the new quiz
-			$old_question_order = get_post_meta( $question->ID, '_quiz_question_order'. $old_quiz_id, true );
-            $new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
-            add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
+			$old_question_order = get_post_meta($question->ID, '_quiz_question_order'.$old_quiz_id, true);
+            $new_question_order = str_ireplace($old_quiz_id, $new_quiz->ID, $old_question_order);
+            add_post_meta($question->ID, '_quiz_question_order'.$new_quiz->ID, $new_question_order);
 
 			// Add question to quiz
-			add_post_meta( $question->ID, '_quiz_id', $new_quiz->ID, false );
+			add_post_meta($question->ID, '_quiz_id', $new_quiz->ID, false);
 
 		}
 	}
@@ -575,7 +575,7 @@ 
 	 * @param  integer $new_course_id ID of duplicated course
 	 * @return void
 	 */
-	private function duplicate_course_lessons( $old_course_id, $new_course_id ) {
+	private function duplicate_course_lessons($old_course_id, $new_course_id) {
 		$lesson_args = array(
 			'post_type' => 'lesson',
 			'posts_per_page' => -1,
@@ -583,13 +583,13 @@ 
 			'meta_value' => $old_course_id,
 			'suppress_filters' 	=> 0
 		);
-		$lessons = get_posts( $lesson_args );
+		$lessons = get_posts($lesson_args);
 
-		foreach( $lessons as $lesson ) {
-			$new_lesson = $this->duplicate_post( $lesson, '', true );
-			add_post_meta( $new_lesson->ID, '_lesson_course', $new_course_id );
+		foreach ($lessons as $lesson) {
+			$new_lesson = $this->duplicate_post($lesson, '', true);
+			add_post_meta($new_lesson->ID, '_lesson_course', $new_course_id);
 
-			$this->duplicate_lesson_quizzes( $lesson->ID, $new_lesson->ID );
+			$this->duplicate_lesson_quizzes($lesson->ID, $new_lesson->ID);
 		}
 	}
 
@@ -600,24 +600,24 @@ 
 	 * @param  boolean $ignore_course Ignore lesson course when dulicating
 	 * @return object                 Duplicate post object
 	 */
-	private function duplicate_post( $post, $suffix = ' (Duplicate)', $ignore_course = false ) {
+	private function duplicate_post($post, $suffix = ' (Duplicate)', $ignore_course = false) {
 
 		$new_post = array();
 
-		foreach( $post as $k => $v ) {
-			if( ! in_array( $k, array( 'ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count' ) ) ) {
-				$new_post[ $k ] = $v;
+		foreach ($post as $k => $v) {
+			if ( ! in_array($k, array('ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count'))) {
+				$new_post[$k] = $v;
 			}
 		}
 
-		$new_post['post_title'] .= __( $suffix, 'woothemes-sensei' );
+		$new_post['post_title'] .= __($suffix, 'woothemes-sensei');
 
-		$new_post['post_date'] = current_time( 'mysql' );
-		$new_post['post_date_gmt'] = get_gmt_from_date( $new_post['post_date'] );
+		$new_post['post_date'] = current_time('mysql');
+		$new_post['post_date_gmt'] = get_gmt_from_date($new_post['post_date']);
 		$new_post['post_modified'] = $new_post['post_date'];
 		$new_post['post_modified_gmt'] = $new_post['post_date_gmt'];
 
-		switch( $post->post_type ) {
+		switch ($post->post_type) {
 			case 'course': $new_post['post_status'] = 'draft'; break;
 			case 'lesson': $new_post['post_status'] = 'draft'; break;
 			case 'quiz': $new_post['post_status'] = 'publish'; break;
@@ -625,45 +625,45 @@ 
 		}
 
 		// As per wp_update_post() we need to escape the data from the db.
-		$new_post = wp_slash( $new_post );
+		$new_post = wp_slash($new_post);
 
-		$new_post_id = wp_insert_post( $new_post );
+		$new_post_id = wp_insert_post($new_post);
 
-		if( ! is_wp_error( $new_post_id ) ) {
+		if ( ! is_wp_error($new_post_id)) {
 
-			$post_meta = get_post_custom( $post->ID );
-			if( $post_meta && count( $post_meta ) > 0 ) {
+			$post_meta = get_post_custom($post->ID);
+			if ($post_meta && count($post_meta) > 0) {
 
-				$ignore_meta = array( '_quiz_lesson', '_quiz_id', '_lesson_quiz' );
+				$ignore_meta = array('_quiz_lesson', '_quiz_id', '_lesson_quiz');
 
-				if( $ignore_course ) {
+				if ($ignore_course) {
 					$ignore_meta[] = '_lesson_course';
 				}
 
-				foreach( $post_meta as $key => $meta ) {
-					foreach( $meta as $value ) {
-						$value = maybe_unserialize( $value );
-						if( ! in_array( $key, $ignore_meta ) ) {
-							add_post_meta( $new_post_id, $key, $value );
+				foreach ($post_meta as $key => $meta) {
+					foreach ($meta as $value) {
+						$value = maybe_unserialize($value);
+						if ( ! in_array($key, $ignore_meta)) {
+							add_post_meta($new_post_id, $key, $value);
 						}
 					}
 				}
 			}
 
-			add_post_meta( $new_post_id, '_duplicate', $post->ID );
+			add_post_meta($new_post_id, '_duplicate', $post->ID);
 
-			$taxonomies = get_object_taxonomies( $post->post_type, 'objects' );
+			$taxonomies = get_object_taxonomies($post->post_type, 'objects');
 
-			foreach ( $taxonomies as $slug => $tax ) {
-				$terms = get_the_terms( $post->ID, $slug );
-				if( isset( $terms ) && is_array( $terms ) && 0 < count( $terms ) ) {
-					foreach( $terms as $term ) {
-						wp_set_object_terms( $new_post_id, $term->term_id, $slug, true );
+			foreach ($taxonomies as $slug => $tax) {
+				$terms = get_the_terms($post->ID, $slug);
+				if (isset($terms) && is_array($terms) && 0 < count($terms)) {
+					foreach ($terms as $term) {
+						wp_set_object_terms($new_post_id, $term->term_id, $slug, true);
 					}
 				}
 			}
 
-			$new_post = get_post( $new_post_id );
+			$new_post = get_post($new_post_id);
 
 			return $new_post;
 		}
@@ -678,7 +678,7 @@ 
 	public function lesson_filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
+		if (is_admin() && 'lesson' == $typenow) {
 
 			$args = array(
 				'post_type' => 'course',
@@ -688,16 +688,16 @@ 
 				'orderby' => 'menu_order date',
 				'order' => 'ASC',
 			);
-			$courses = get_posts( $args );
+			$courses = get_posts($args);
 
-			$selected = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+			$selected = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 			$course_options = '';
-			foreach( $courses as $course ) {
-				$course_options .= '<option value="' . esc_attr( $course->ID ) . '" ' . selected( $selected, $course->ID, false ) . '>' . get_the_title( $course->ID ) . '</option>';
+			foreach ($courses as $course) {
+				$course_options .= '<option value="'.esc_attr($course->ID).'" '.selected($selected, $course->ID, false).'>'.get_the_title($course->ID).'</option>';
 			}
 
 			$output = '<select name="lesson_course" id="dropdown_lesson_course">';
-			$output .= '<option value="">'.__( 'Show all courses', 'woothemes-sensei' ).'</option>';
+			$output .= '<option value="">'.__('Show all courses', 'woothemes-sensei').'</option>';
 			$output .= $course_options;
 			$output .= '</select>';
 
@@ -710,13 +710,13 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function lesson_filter_actions( $request ) {
+	public function lesson_filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
-			$lesson_course = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+		if (is_admin() && 'lesson' == $typenow) {
+			$lesson_course = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 
-			if( $lesson_course ) {
+			if ($lesson_course) {
 				$request['meta_key'] = '_lesson_course';
 				$request['meta_value'] = $lesson_course;
 				$request['meta_compare'] = '=';
@@ -731,27 +731,27 @@ 
 	 * @param  array $items Existing items
 	 * @return array        Updated items
 	 */
-	public function glance_items( $items = array() ) {
+	public function glance_items($items = array()) {
 
-		$types = array( 'course', 'lesson', 'question' );
+		$types = array('course', 'lesson', 'question');
 
-		foreach( $types as $type ) {
-			if( ! post_type_exists( $type ) ) continue;
+		foreach ($types as $type) {
+			if ( ! post_type_exists($type)) continue;
 
-			$num_posts = wp_count_posts( $type );
+			$num_posts = wp_count_posts($type);
 
-			if( $num_posts ) {
+			if ($num_posts) {
 
-				$published = intval( $num_posts->publish );
-				$post_type = get_post_type_object( $type );
+				$published = intval($num_posts->publish);
+				$post_type = get_post_type_object($type);
 
-				$text = _n( '%s ' . $post_type->labels->singular_name, '%s ' . $post_type->labels->name, $published, 'woothemes-sensei' );
-				$text = sprintf( $text, number_format_i18n( $published ) );
+				$text = _n('%s '.$post_type->labels->singular_name, '%s '.$post_type->labels->name, $published, 'woothemes-sensei');
+				$text = sprintf($text, number_format_i18n($published));
 
-				if ( current_user_can( $post_type->cap->edit_posts ) ) {
-					$items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text ) . "\n";
+				if (current_user_can($post_type->cap->edit_posts)) {
+					$items[] = sprintf('<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text)."\n";
 				} else {
-					$items[] = sprintf( '<span class="%1$s-count">%2$s</span>', $type, $text ) . "\n";
+					$items[] = sprintf('<span class="%1$s-count">%2$s</span>', $type, $text)."\n";
 				}
 			}
 		}
@@ -765,13 +765,13 @@ 
 	 * @param  object  $post    Post object
 	 * @return void
 	 */
-	public function delete_content( $post_id, $post ) {
+	public function delete_content($post_id, $post) {
 
 		$type = $post->post_type;
 
-		if( in_array( $type, array( 'lesson', 'course' ) ) ) {
+		if (in_array($type, array('lesson', 'course'))) {
 
-			$meta_key = '_' . $type . '_prerequisite';
+			$meta_key = '_'.$type.'_prerequisite';
 
 			$args = array(
 				'post_type' => $type,
@@ -781,10 +781,10 @@ 
 				'meta_value' => $post_id
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			foreach( $posts as $post ) {
-				delete_post_meta( $post->ID, $meta_key );
+			foreach ($posts as $post) {
+				delete_post_meta($post->ID, $meta_key);
 			}
 		}
 	}
@@ -794,181 +794,181 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function delete_user_activity( $user_id = 0 ) {
-		if( $user_id ) {
-			Sensei_Utils::delete_all_user_activity( $user_id );
+	public function delete_user_activity($user_id = 0) {
+		if ($user_id) {
+			Sensei_Utils::delete_all_user_activity($user_id);
 		}
 	}
 
-	public function render_settings( $settings = array(), $post_id = 0, $group_id = '' ) {
+	public function render_settings($settings = array(), $post_id = 0, $group_id = '') {
 
 		$html = '';
 
-		if( 0 == count( $settings ) ) return $html;
+		if (0 == count($settings)) return $html;
 
-		$html .= '<div class="sensei-options-panel">' . "\n";
+		$html .= '<div class="sensei-options-panel">'."\n";
 
-			$html .= '<div class="options_group" id="' . esc_attr( $group_id ) . '">' . "\n";
+			$html .= '<div class="options_group" id="'.esc_attr($group_id).'">'."\n";
 
-				foreach( $settings as $field ) {
+				foreach ($settings as $field) {
 
 					$data = '';
 
-					if( $post_id ) {
-						$data = get_post_meta( $post_id, '_' . $field['id'], true );
-						if( ! $data && isset( $field['default'] ) ) {
+					if ($post_id) {
+						$data = get_post_meta($post_id, '_'.$field['id'], true);
+						if ( ! $data && isset($field['default'])) {
 							$data = $field['default'];
 						}
 					} else {
-						$option = get_option( $field['id'] );
-						if( isset( $field['default'] ) ) {
+						$option = get_option($field['id']);
+						if (isset($field['default'])) {
 							$data = $field['default'];
-							if( $option ) {
+							if ($option) {
 								$data = $option;
 							}
 						}
 					}
 
 					$disabled = '';
-					if( isset( $field['disabled'] ) && $field['disabled'] ) {
-						$disabled = disabled( $field['disabled'], true, false );
+					if (isset($field['disabled']) && $field['disabled']) {
+						$disabled = disabled($field['disabled'], true, false);
 					}
 
-					if( 'hidden' != $field['type'] ) {
+					if ('hidden' != $field['type']) {
 
 						$class_tail = '';
 
-						if( isset( $field['class'] ) ) {
+						if (isset($field['class'])) {
 							$class_tail .= $field['class'];
 						}
 
-						if( isset( $field['disabled'] ) && $field['disabled'] ) {
+						if (isset($field['disabled']) && $field['disabled']) {
 							$class_tail .= ' disabled';
 						}
 
-						$html .= '<p class="form-field ' . esc_attr( $field['id'] ) . ' ' . esc_attr( $class_tail ) . '">' . "\n";
+						$html .= '<p class="form-field '.esc_attr($field['id']).' '.esc_attr($class_tail).'">'."\n";
 					}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '<label for="' . esc_attr( $field['id'] ) . '">' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '<label for="'.esc_attr($field['id']).'">'."\n";
 						}
 
-							if( $field['label'] ) {
-								$html .= '<span class="label">' . esc_html( $field['label'] ) . '</span>';
+							if ($field['label']) {
+								$html .= '<span class="label">'.esc_html($field['label']).'</span>';
 							}
 
-							switch( $field['type'] ) {
+							switch ($field['type']) {
 								case 'text':
 								case 'password':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$disabled.' />'."\n";
 								break;
 
 								case 'number':
 
 									$min = '';
-									if( isset( $field['min'] ) ) {
-										$min = 'min="' . esc_attr( $field['min'] ) . '"';
+									if (isset($field['min'])) {
+										$min = 'min="'.esc_attr($field['min']).'"';
 									}
 
 									$max = '';
-									if( isset( $field['max'] ) ) {
-										$max = 'max="' . esc_attr( $field['max'] ) . '"';
+									if (isset($field['max'])) {
+										$max = 'max="'.esc_attr($field['max']).'"';
 									}
 
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $min . '  ' . $max . ' class="small-text" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$min.'  '.$max.' class="small-text" '.$disabled.' />'."\n";
 								break;
 
 								case 'textarea':
-									$html .= '<textarea id="' . esc_attr( $field['id'] ) . '" rows="5" cols="50" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" ' . $disabled . '>' . $data . '</textarea><br/>'. "\n";
+									$html .= '<textarea id="'.esc_attr($field['id']).'" rows="5" cols="50" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" '.$disabled.'>'.$data.'</textarea><br/>'."\n";
 								break;
 
 								case 'checkbox':
                                     //backwards compatibility
-                                    if( empty( $data ) || 'on' == $data ){
+                                    if (empty($data) || 'on' == $data) {
                                         $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+                                    }elseif ('yes' == $data) {
 
                                         $checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+                                    }elseif ('auto' == $data) {
 
                                         $checked_value = 'auto';
 
                                     } else {
                                         $checked_value = 1;
-                                        $data = intval( $data );
+                                        $data = intval($data);
                                     }
-									$checked = checked( $checked_value, $data, false );
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" ' . $checked . ' ' . $disabled . '/>' . "\n";
+									$checked = checked($checked_value, $data, false);
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" '.$checked.' '.$disabled.'/>'."\n";
 								break;
 
 								case 'checkbox_multi':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="checkbox" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '[]" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="checkbox" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'[]" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'radio':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="radio" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="radio" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'select':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'" id="'.esc_attr($field['id']).'" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '">' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'">'.$v.'</option>'."\n";
 									}
-									$html .= '</select><br/>' . "\n";
+									$html .= '</select><br/>'."\n";
 								break;
 
 								case 'select_multi':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '[]" id="' . esc_attr( $field['id'] ) . '" multiple="multiple" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'[]" id="'.esc_attr($field['id']).'" multiple="multiple" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '" />' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'" />'.$v.'</option>'."\n";
 									}
 									$html .= '</select> . "\n"';
 								break;
 
 								case 'hidden':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" value="' . $data . '" ' . $disabled . '/>' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" value="'.$data.'" '.$disabled.'/>'."\n";
 								break;
 
 							}
 
-							if( $field['description'] ) {
-								$html .= ' <span class="description">' . esc_html( $field['description'] ) . '</span>' . "\n";
+							if ($field['description']) {
+								$html .= ' <span class="description">'.esc_html($field['description']).'</span>'."\n";
 							}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '</label>' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '</label>'."\n";
 						}
 
-					if( 'hidden' != $field['type'] ) {
-						$html .= '</p>' . "\n";
+					if ('hidden' != $field['type']) {
+						$html .= '</p>'."\n";
 					}
 
 				}
 
-			$html .= '</div>' . "\n";
+			$html .= '</div>'."\n";
 
-		$html .= '</div>' . "\n";
+		$html .= '</div>'."\n";
 
 		return $html;
 	}
@@ -979,61 +979,61 @@ 
 	 */
 	public function course_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="course-order" class="wrap course-order">
-		<h2><?php _e( 'Order Courses', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Courses', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['course-order'] ) && 0 < strlen( $_POST['course-order'] ) ) {
-			$ordered = $this->save_course_order( esc_attr( $_POST['course-order'] ) );
+		if (isset($_POST['course-order']) && 0 < strlen($_POST['course-order'])) {
+			$ordered = $this->save_course_order(esc_attr($_POST['course-order']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The course order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The course order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
 		$courses = Sensei()->course->get_all_courses();
 
-		if( 0 < count( $courses ) ) {
+		if (0 < count($courses)) {
 
             // order the courses as set by the users
             $all_course_ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
 
-                $all_course_ids[] = (string)$course->ID;
+                $all_course_ids[] = (string) $course->ID;
 
             }
             $order_string = $this->get_course_order();
 
-            if( !empty( $order_string ) ){
-                $ordered_course_ids = explode(',' , $order_string );
-                $all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
+            if ( ! empty($order_string)) {
+                $ordered_course_ids = explode(',', $order_string);
+                $all_course_ids = array_unique(array_merge($ordered_course_ids, $all_course_ids));
             }
 
 
-			$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-			$html .= '<ul class="sortable-course-list">' . "\n";
+			$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+			$html .= '<ul class="sortable-course-list">'."\n";
 			$count = 0;
-			foreach ( $all_course_ids as $course_id ) {
-                $course = get_post( $course_id );
+			foreach ($all_course_ids as $course_id) {
+                $course = get_post($course_id);
 				$count++;
 				$class = 'course';
-				if ( $count == 1 ) { $class .= ' first'; }
-				if ( $count == count( $course ) ) { $class .= ' last'; }
-				if ( $count % 2 != 0 ) {
+				if ($count == 1) { $class .= ' first'; }
+				if ($count == count($course)) { $class .= ' last'; }
+				if ($count % 2 != 0) {
 					$class .= ' alternate';
 				}
-				$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $course->ID ) . '" style="width: 100%;"> ' . $course->post_title . '</span></li>' . "\n";
+				$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($course->ID).'" style="width: 100%;"> '.$course->post_title.'</span></li>'."\n";
 			}
-			$html .= '</ul>' . "\n";
+			$html .= '</ul>'."\n";
 
-			$html .= '<input type="hidden" name="course-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-			$html .= '<input type="submit" class="button-primary" value="' . __( 'Save course order', 'woothemes-sensei' ) . '" />' . "\n";
+			$html .= '<input type="hidden" name="course-order" value="'.esc_attr($order_string).'" />'."\n";
+			$html .= '<input type="submit" class="button-primary" value="'.__('Save course order', 'woothemes-sensei').'" />'."\n";
 		}
 
 		echo $html;
@@ -1042,25 +1042,25 @@ 
 	}
 
 	public function get_course_order() {
-		return get_option( 'sensei_course_order', '' );
+		return get_option('sensei_course_order', '');
 	}
 
-	public function save_course_order( $order_string = '' ) {
-		$order = explode( ',', $order_string );
+	public function save_course_order($order_string = '') {
+		$order = explode(',', $order_string);
 
-		update_option( 'sensei_course_order', $order_string );
+		update_option('sensei_course_order', $order_string);
 
 		$i = 1;
-		foreach( $order as $course_id ) {
+		foreach ($order as $course_id) {
 
-			if( $course_id ) {
+			if ($course_id) {
 
 				$update_args = array(
 					'ID' => $course_id,
 					'menu_order' => $i,
 				);
 
-				wp_update_post( $update_args );
+				wp_update_post($update_args);
 
 				++$i;
 			}
@@ -1075,22 +1075,22 @@ 
 	 */
 	public function lesson_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="lesson-order" class="wrap lesson-order">
-		<h2><?php _e( 'Order Lessons', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Lessons', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['lesson-order'] ) ) {
+		if (isset($_POST['lesson-order'])) {
 
-			$ordered = $this->save_lesson_order( esc_attr( $_POST['lesson-order'] ), esc_attr( $_POST['course_id'] ) );
+			$ordered = $this->save_lesson_order(esc_attr($_POST['lesson-order']), esc_attr($_POST['course_id']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The lesson order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The lesson order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
@@ -1101,43 +1101,43 @@ 
 			'orderby' => 'name',
 			'order' => 'ASC',
 		);
-		$courses = get_posts( $args );
+		$courses = get_posts($args);
 
-		$html .= '<form action="' . admin_url( 'edit.php' ) . '" method="get">' . "\n";
-		$html .= '<input type="hidden" name="post_type" value="lesson" />' . "\n";
-		$html .= '<input type="hidden" name="page" value="lesson-order" />' . "\n";
-		$html .= '<select id="lesson-order-course" name="course_id">' . "\n";
-		$html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>' . "\n";
+		$html .= '<form action="'.admin_url('edit.php').'" method="get">'."\n";
+		$html .= '<input type="hidden" name="post_type" value="lesson" />'."\n";
+		$html .= '<input type="hidden" name="page" value="lesson-order" />'."\n";
+		$html .= '<select id="lesson-order-course" name="course_id">'."\n";
+		$html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'."\n";
 
-		foreach( $courses as $course ) {
+		foreach ($courses as $course) {
 			$course_id = '';
-			if( isset( $_GET['course_id'] ) ) {
-				$course_id = intval( $_GET['course_id'] );
+			if (isset($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
 			}
-			$html .= '<option value="' . esc_attr( intval( $course->ID ) ) . '" ' . selected( $course->ID, $course_id, false ) .'>' . get_the_title( $course->ID ) . '</option>' . "\n";
+			$html .= '<option value="'.esc_attr(intval($course->ID)).'" '.selected($course->ID, $course_id, false).'>'.get_the_title($course->ID).'</option>'."\n";
 		}
 
-		$html .= '</select>' . "\n";
-		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="' . __( 'Select', 'woothemes-sensei' ) . '" />' . "\n";
-		$html .= '</form>' . "\n";
+		$html .= '</select>'."\n";
+		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="'.__('Select', 'woothemes-sensei').'" />'."\n";
+		$html .= '</form>'."\n";
 
-		$html .= '<script type="text/javascript">' . "\n";
-		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});' . "\n";
-		$html .= '</script>' . "\n";
+		$html .= '<script type="text/javascript">'."\n";
+		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});'."\n";
+		$html .= '</script>'."\n";
 
-		if( isset( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
-			if( $course_id > 0 ) {
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
+			if ($course_id > 0) {
 
-				$order_string = $this->get_lesson_order( $course_id );
+				$order_string = $this->get_lesson_order($course_id);
 
-				$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
+				$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
 
 				$displayed_lessons = array();
 
-                $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+                $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-                foreach( $modules as $module ) {
+                foreach ($modules as $module) {
 
                     $args = array(
                         'post_type' => 'lesson',
@@ -1146,7 +1146,7 @@ 
                         'meta_query' => array(
                             array(
                                 'key' => '_lesson_course',
-                                'value' => intval( $course_id ),
+                                'value' => intval($course_id),
                                 'compare' => '='
                             )
                         ),
@@ -1154,66 +1154,66 @@ 
                             array(
                                 'taxonomy' => Sensei()->modules->taxonomy,
                                 'field' => 'id',
-                                'terms' => intval( $module->term_id )
+                                'terms' => intval($module->term_id)
                             )
                         ),
-                        'meta_key' => '_order_module_' . $module->term_id,
+                        'meta_key' => '_order_module_'.$module->term_id,
                         'orderby' => 'meta_value_num date',
                         'order' => 'ASC',
                         'suppress_filters' => 0
                     );
 
-                    $lessons = get_posts( $args );
+                    $lessons = get_posts($args);
 
-                    if( count( $lessons ) > 0 ) {
-                        $html .= '<h3>' . $module->name . '</h3>' . "\n";
-                        $html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
+                    if (count($lessons) > 0) {
+                        $html .= '<h3>'.$module->name.'</h3>'."\n";
+                        $html .= '<ul class="sortable-lesson-list" data-module_id="'.$module->term_id.'">'."\n";
 
                         $count = 0;
-                        foreach( $lessons as $lesson ) {
+                        foreach ($lessons as $lesson) {
                             $count++;
                             $class = 'lesson';
-                            if ( $count == 1 ) { $class .= ' first'; }
-                            if ( $count == count( $lesson ) ) { $class .= ' last'; }
-                            if ( $count % 2 != 0 ) {
+                            if ($count == 1) { $class .= ' first'; }
+                            if ($count == count($lesson)) { $class .= ' last'; }
+                            if ($count % 2 != 0) {
                                 $class .= ' alternate';
                             }
 
-                            $html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+                            $html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
                             $displayed_lessons[] = $lesson->ID;
                         }
 
-                        $html .= '</ul>' . "\n";
+                        $html .= '</ul>'."\n";
 
-                        $html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
+                        $html .= '<input type="hidden" name="lesson-order-module-'.$module->term_id.'" value="" />'."\n";
                     }
                 }
 
 
-                $lessons = Sensei()->course->course_lessons( $course_id );
+                $lessons = Sensei()->course->course_lessons($course_id);
 
-				if( 0 < count( $lessons ) ) {
+				if (0 < count($lessons)) {
 
                     //get module term ids, will be used to exclude lessons
                     $module_items_ids = array();
-                    if( ! empty( $modules ) ) {
+                    if ( ! empty($modules)) {
                         foreach ($modules as $module) {
                             $module_items_ids[] = $module->term_id;
                         }
                     }
 
-					if( 0 < count( $displayed_lessons ) ) {
-						$html .= '<h3>' . __( 'Other Lessons', 'woothemes-sensei' ) . '</h3>' . "\n";
+					if (0 < count($displayed_lessons)) {
+						$html .= '<h3>'.__('Other Lessons', 'woothemes-sensei').'</h3>'."\n";
 					}
 
-					$html .= '<ul class="sortable-lesson-list" data-module_id="0">' . "\n";
+					$html .= '<ul class="sortable-lesson-list" data-module_id="0">'."\n";
 					$count = 0;
-					foreach ( $lessons as $lesson ) {
+					foreach ($lessons as $lesson) {
 
                         // if lesson belongs to one fo the course modules then exclude it here
                         // as it is listed above
-                        if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
+                        if (has_term($module_items_ids, 'module', $lesson->ID)) {
 
                             continue;
 
@@ -1221,28 +1221,28 @@ 
 
 						$count++;
 						$class = 'lesson';
-						if ( $count == 1 ) { $class .= ' first'; }
-						if ( $count == count( $lesson ) ) { $class .= ' last'; }
-						if ( $count % 2 != 0 ) {
+						if ($count == 1) { $class .= ' first'; }
+						if ($count == count($lesson)) { $class .= ' last'; }
+						if ($count % 2 != 0) {
 
 							$class .= ' alternate';
 
 						}
-						$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+						$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
 						$displayed_lessons[] = $lesson->ID;
 					}
-					$html .= '</ul>' . "\n";
+					$html .= '</ul>'."\n";
 				} else {
-					if( 0 == count( $displayed_lessons ) ) {
-						$html .= '<p><em>' . __( 'There are no lessons in this course.', 'woothemes-sensei' ) . '</em></p>';
+					if (0 == count($displayed_lessons)) {
+						$html .= '<p><em>'.__('There are no lessons in this course.', 'woothemes-sensei').'</em></p>';
 					}
 				}
 
-				if( 0 < count( $displayed_lessons ) ) {
-					$html .= '<input type="hidden" name="lesson-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-					$html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-					$html .= '<input type="submit" class="button-primary" value="' . __( 'Save lesson order', 'woothemes-sensei' ) . '" />' . "\n";
+				if (0 < count($displayed_lessons)) {
+					$html .= '<input type="hidden" name="lesson-order" value="'.esc_attr($order_string).'" />'."\n";
+					$html .= '<input type="hidden" name="course_id" value="'.$course_id.'" />'."\n";
+					$html .= '<input type="submit" class="button-primary" value="'.__('Save lesson order', 'woothemes-sensei').'" />'."\n";
 				}
 			}
 		}
@@ -1252,29 +1252,29 @@ 
 		?></div><?php
 	}
 
-	public function get_lesson_order( $course_id = 0 ) {
-		$order_string = get_post_meta( $course_id, '_lesson_order', true );
+	public function get_lesson_order($course_id = 0) {
+		$order_string = get_post_meta($course_id, '_lesson_order', true);
 		return $order_string;
 	}
 
-	public function save_lesson_order( $order_string = '', $course_id = 0 ) {
+	public function save_lesson_order($order_string = '', $course_id = 0) {
 
-		if( $course_id ) {
+		if ($course_id) {
 
-            $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-            foreach( $modules as $module ) {
+            foreach ($modules as $module) {
 
 
-                if( isset( $_POST[ 'lesson-order-module-' . $module->term_id ] )
-                    && $_POST[ 'lesson-order-module-' . $module->term_id ] ) {
+                if (isset($_POST['lesson-order-module-'.$module->term_id])
+                    && $_POST['lesson-order-module-'.$module->term_id]) {
 
-                    $order = explode( ',', $_POST[ 'lesson-order-module-' . $module->term_id ] );
+                    $order = explode(',', $_POST['lesson-order-module-'.$module->term_id]);
                     $i = 1;
-                    foreach( $order as $lesson_id ) {
+                    foreach ($order as $lesson_id) {
 
-                        if( $lesson_id ) {
-                            update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
+                        if ($lesson_id) {
+                            update_post_meta($lesson_id, '_order_module_'.$module->term_id, $i);
                             ++$i;
                         }
 
@@ -1285,15 +1285,15 @@ 
             } // end for each modules
 
 
-			if( $order_string ) {
-				update_post_meta( $course_id, '_lesson_order', $order_string );
+			if ($order_string) {
+				update_post_meta($course_id, '_lesson_order', $order_string);
 
-				$order = explode( ',', $order_string );
+				$order = explode(',', $order_string);
 
 				$i = 1;
-				foreach( $order as $lesson_id ) {
-					if( $lesson_id ) {
-						update_post_meta( $lesson_id, '_order_' . $course_id, $i );
+				foreach ($order as $lesson_id) {
+					if ($lesson_id) {
+						update_post_meta($lesson_id, '_order_'.$course_id, $i);
 						++$i;
 					}
 				}
@@ -1308,54 +1308,54 @@ 
 	function sensei_add_custom_menu_items() {
 		global $pagenow;
 
-		if( 'nav-menus.php' == $pagenow ) {
-			add_meta_box( 'add-sensei-links', 'Sensei', array( $this, 'wp_nav_menu_item_sensei_links_meta_box' ), 'nav-menus', 'side', 'low' );
+		if ('nav-menus.php' == $pagenow) {
+			add_meta_box('add-sensei-links', 'Sensei', array($this, 'wp_nav_menu_item_sensei_links_meta_box'), 'nav-menus', 'side', 'low');
 		}
 	}
 
-	function wp_nav_menu_item_sensei_links_meta_box( $object ) {
+	function wp_nav_menu_item_sensei_links_meta_box($object) {
 		global $nav_menu_selected_id;
 
 		$menu_items = array(
-			'#senseicourses' => __( 'Courses', 'woothemes-sensei' ),
-			'#senseilessons' => __( 'Lessons', 'woothemes-sensei' ),
-			'#senseimycourses' => __( 'My Courses', 'woothemes-sensei' ),
-			'#senseilearnerprofile' => __( 'My Profile', 'woothemes-sensei' ),
-			'#senseimymessages' => __( 'My Messages', 'woothemes-sensei' ),
-			'#senseiloginlogout' => __( 'Login', 'woothemes-sensei' ) . '|' . __( 'Logout', 'woothemes-sensei' )
+			'#senseicourses' => __('Courses', 'woothemes-sensei'),
+			'#senseilessons' => __('Lessons', 'woothemes-sensei'),
+			'#senseimycourses' => __('My Courses', 'woothemes-sensei'),
+			'#senseilearnerprofile' => __('My Profile', 'woothemes-sensei'),
+			'#senseimymessages' => __('My Messages', 'woothemes-sensei'),
+			'#senseiloginlogout' => __('Login', 'woothemes-sensei').'|'.__('Logout', 'woothemes-sensei')
 		);
 
 		$menu_items_obj = array();
-		foreach ( $menu_items as $value => $title ) {
+		foreach ($menu_items as $value => $title) {
 			$menu_items_obj[$title] = new stdClass;
-			$menu_items_obj[$title]->object_id			= esc_attr( $value );
-			$menu_items_obj[$title]->title				= esc_attr( $title );
-			$menu_items_obj[$title]->url				= esc_attr( $value );
-			$menu_items_obj[$title]->description 		= 'description';
+			$menu_items_obj[$title]->object_id = esc_attr($value);
+			$menu_items_obj[$title]->title = esc_attr($title);
+			$menu_items_obj[$title]->url = esc_attr($value);
+			$menu_items_obj[$title]->description = 'description';
 			$menu_items_obj[$title]->db_id 				= 0;
 			$menu_items_obj[$title]->object 			= 'sensei';
-			$menu_items_obj[$title]->menu_item_parent 	= 0;
-			$menu_items_obj[$title]->type 				= 'custom';
+			$menu_items_obj[$title]->menu_item_parent = 0;
+			$menu_items_obj[$title]->type = 'custom';
 			$menu_items_obj[$title]->target 			= '';
-			$menu_items_obj[$title]->attr_title 		= '';
-			$menu_items_obj[$title]->classes 			= array();
-			$menu_items_obj[$title]->xfn 				= '';
+			$menu_items_obj[$title]->attr_title = '';
+			$menu_items_obj[$title]->classes = array();
+			$menu_items_obj[$title]->xfn = '';
 		}
 
-		$walker = new Walker_Nav_Menu_Checklist( array() );
+		$walker = new Walker_Nav_Menu_Checklist(array());
 		?>
 
 		<div id="sensei-links" class="senseidiv taxonomydiv">
 			<div id="tabs-panel-sensei-links-all" class="tabs-panel tabs-panel-view-all tabs-panel-active">
 
 				<ul id="sensei-linkschecklist" class="list:sensei-links categorychecklist form-no-clear">
-					<?php echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items_obj ), 0, (object)array( 'walker' => $walker ) ); ?>
+					<?php echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items_obj), 0, (object) array('walker' => $walker)); ?>
 				</ul>
 
 			</div>
 			<p class="button-controls">
 				<span class="add-to-menu">
-					<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu', 'woothemes-sensei' ); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
+					<input type="submit"<?php disabled($nav_menu_selected_id, 0); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu', 'woothemes-sensei'); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -1371,17 +1371,17 @@ 
 	 */
 	public function theme_compatibility_notices() {
 
-        if( isset( $_GET['sensei_hide_notice'] ) ) {
-        	switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
-				case 'menu_settings': add_user_meta( get_current_user_id(), 'sensei_hide_menu_settings_notice', true ); break;
-				case 'theme_check': add_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true ); break;
+        if (isset($_GET['sensei_hide_notice'])) {
+        	switch (esc_attr($_GET['sensei_hide_notice'])) {
+				case 'menu_settings': add_user_meta(get_current_user_id(), 'sensei_hide_menu_settings_notice', true); break;
+				case 'theme_check': add_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true); break;
 			}
         }
 
         // white list templates that are already support by default and do not show notice for them
-        $template = get_option( 'template' );
+        $template = get_option('template');
 
-        $white_list = array(    'twentyeleven',
+        $white_list = array('twentyeleven',
                                 'twentytwelve',
                                 'twentyfourteen',
                                 'twentyfifteen',
@@ -1389,43 +1389,43 @@ 
                                 'storefront',
                                                 );
 
-        if ( in_array( $template, $white_list ) ) {
+        if (in_array($template, $white_list)) {
 
             return;
 
         }
 
         // don't show the notice if the user chose to hide it
-        $hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
-        if(  $hide_theme_check_notice ) {
+        $hide_theme_check_notice = get_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true);
+        if ($hide_theme_check_notice) {
 
             return;
 
         }
 
         // show the notice for themes not supporting sensei
-	    if ( ! current_theme_supports( 'sensei' ) ) {
+	    if ( ! current_theme_supports('sensei')) {
             ?>
 
             <div id="message" class="error sensei-message sensei-connect">
                     <p>
                         <strong>
 
-                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei' ); ?>
+                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei'); ?>
 
                         </strong> &#8211;
 
-                        <?php _e( 'if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei' ); ?>
+                        <?php _e('if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei'); ?>
 
-                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e( 'Sensei theme', 'woothemes-sensei' ) ?> </a>
+                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e('Sensei theme', 'woothemes-sensei') ?> </a>
 
                         :)
 
                     </p>
                     <p class="submit">
-                        <a href="<?php echo esc_url( apply_filters( 'sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility' ) ); ?>" class="button-primary">
+                        <a href="<?php echo esc_url(apply_filters('sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility')); ?>" class="button-primary">
 
-                            <?php _e( 'Theme Integration Guide', 'woothemes-sensei' ); ?></a> <a class="skip button" href="<?php echo esc_url( add_query_arg( 'sensei_hide_notice', 'theme_check' ) ); ?>"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?>
+                            <?php _e('Theme Integration Guide', 'woothemes-sensei'); ?></a> <a class="skip button" href="<?php echo esc_url(add_query_arg('sensei_hide_notice', 'theme_check')); ?>"><?php _e('Hide this notice', 'woothemes-sensei'); ?>
 
                         </a>
                     </p>
@@ -1443,7 +1443,7 @@ 
 		wp_get_current_user();
         $user_id = $current_user->ID;
 
-		delete_user_meta( $user_id, 'sensei_hide_theme_check_notice' );
+		delete_user_meta($user_id, 'sensei_hide_theme_check_notice');
 	}
 
 	/**
@@ -1453,8 +1453,8 @@ 
 	 * @param  bool $prevent_access
 	 * @return bool
 	 */
-	public function admin_access( $prevent_access ) {
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
+	public function admin_access($prevent_access) {
+		if (current_user_can('manage_sensei_grades')) {
 			return false;
 		}
 
@@ -1469,12 +1469,12 @@ 
      *
      * @since 1.8.7
      */
-    public  static function install_pages(){
+    public  static function install_pages() {
 
         // only fire on the settings page
-        if( ! isset( $_GET['page'] )
+        if ( ! isset($_GET['page'])
             || 'woothemes-sensei-settings' != $_GET['page']
-            || 1 == get_option('skip_install_sensei_pages') ){
+            || 1 == get_option('skip_install_sensei_pages')) {
 
             return;
 
@@ -1511,8 +1511,8 @@ 
             // Set installed option
             update_option('sensei_installed', 0);
 
-            $complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
-            wp_redirect( $complete_url );
+            $complete_url = add_query_arg('sensei_install_complete', 'true', $settings_url);
+            wp_redirect($complete_url);
 
         }
 
@@ -1526,4 +1526,4 @@ 
  * @since 1.9.0
  * @ignore
  */
-class WooThemes_Sensei_Admin extends Sensei_Admin{ }
+class WooThemes_Sensei_Admin extends Sensei_Admin { }

includes/class-sensei-settings-api.php

Spacing +222 added lines, -222 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * A settings API (wrapping the WordPress Settings API).
@@ -31,7 +31,7 @@ 
 	 * @access public
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		$this->token = 'woothemes-sensei-settings';
 		$this->page_slug = 'woothemes-sensei-settings-api';
@@ -57,9 +57,9 @@ 
 	 */
 	public function register_hook_listener() {
 
-        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' ), 5 );
+        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'), 5);
 
 	} // End setup_settings()
 
@@ -73,7 +73,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()
@@ -84,9 +84,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()
 
 	/**
@@ -95,9 +95,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()
 
 	/**
@@ -106,34 +106,34 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	public function settings_tabs () {
+	public function settings_tabs() {
 
-		if ( ! $this->has_tabs ) { return; }
+		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;
 		}
@@ -145,10 +145,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;
 			}
 
@@ -162,10 +162,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()
@@ -176,18 +176,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()
@@ -199,43 +199,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';
 			}
 		}
 
@@ -249,10 +249,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();
 				}
 
@@ -269,19 +269,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 ) ) {
+		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' ) );
+			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()
@@ -292,14 +292,14 @@ 
 	 * @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>';
+                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
@@ -313,13 +313,13 @@ 
         $page = 'woothemes-sensei-settings';
         foreach ($this->sections as $section_id => $section) {
 
-            echo '<section id="' . $section_id . '">';
+            echo '<section id="'.$section_id.'">';
 
             if ($section['name'])
                 echo "<h2>{$section['name']}</h2>\n";
 
             echo '<table class="form-table">';
-            do_settings_fields($page, $section_id );
+            do_settings_fields($page, $section_id);
             echo '</table>';
 
             echo '</section>';
@@ -329,7 +329,7 @@ 
         submit_button();
         ?>
 	</form>
-	<?php do_action( 'settings_after_form' ); ?>
+	<?php do_action('settings_after_form'); ?>
 </div><!--/#woothemes-sensei-->
 <?php
 	} // End settings_screen()
@@ -340,15 +340,15 @@ 
 	 * @since  1.0.0
 	 * @return array
 	 */
-	public function get_settings () {
+	public function get_settings() {
 
-        $this->settings = get_option( $this->token, array() );
+        $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;
 			}
 		}
@@ -362,8 +362,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()
@@ -374,8 +374,8 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function settings_errors () {
-        settings_errors( $this->token . '-errors' );
+	public function settings_errors() {
+        settings_errors($this->token.'-errors');
 	} // End settings_errors()
 
 	/**
@@ -384,9 +384,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()
 
@@ -397,12 +397,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()
 
@@ -413,13 +413,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()
 
@@ -430,22 +430,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()
 
@@ -456,12 +456,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()
 
@@ -472,20 +472,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()
@@ -497,18 +497,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()
@@ -520,28 +520,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()
@@ -553,20 +553,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()
@@ -578,18 +578,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()
@@ -601,19 +601,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()
@@ -625,14 +625,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()
@@ -646,23 +646,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;
 						}
 					}
@@ -671,28 +671,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);
 					}
 				}
 			}
@@ -710,8 +710,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()
 
 	/**
@@ -721,11 +721,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()
 
@@ -736,10 +736,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()
@@ -751,8 +751,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()
@@ -764,8 +764,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()
 
 	/**
@@ -774,7 +774,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;
@@ -788,11 +788,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()
@@ -803,14 +803,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()
 
@@ -820,8 +820,8 @@ 
 	 * @since  1.0.0
 	 * @return array
 	 */
-	protected function get_array_field_types () {
-		return array( 'multicheck' );
+	protected function get_array_field_types() {
+		return array('multicheck');
 	} // End get_array_field_types()
 
 	/**
@@ -830,21 +830,21 @@ 
 	 * @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()
@@ -855,12 +855,12 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( $this->token . '-admin' );
+		wp_enqueue_style($this->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()
@@ -871,16 +871,16 @@ 
 	 * @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
@@ -890,4 +890,4 @@ 
  * @ignore only 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 {}

includes/class-sensei-analysis-overview-list-table.php

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Analysis Overview Data Table.
@@ -18,17 +18,17 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $type = 'users' ) {
-		$this->type = in_array( $type, array( 'courses', 'lessons', 'users' ) ) ? $type : 'users';
+	public function __construct($type = 'users') {
+		$this->type = in_array($type, array('courses', 'lessons', 'users')) ? $type : 'users';
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_overview' );
+		parent::__construct('analysis_overview');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -38,41 +38,41 @@ 
 	 */
 	function get_columns() {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$columns = array(
-					'title' => __( 'Course', 'woothemes-sensei' ),
-					'students' => __( 'Learners', 'woothemes-sensei' ),
-					'lessons' => __( 'Lessons', 'woothemes-sensei' ),
-					'completions' => __( 'Completed', 'woothemes-sensei' ),
-					'average_percent' => __( 'Average Percentage', 'woothemes-sensei' ),
+					'title' => __('Course', 'woothemes-sensei'),
+					'students' => __('Learners', 'woothemes-sensei'),
+					'lessons' => __('Lessons', 'woothemes-sensei'),
+					'completions' => __('Completed', 'woothemes-sensei'),
+					'average_percent' => __('Average Percentage', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => __( 'Lesson', 'woothemes-sensei' ),
-					'course' => __( 'Course', 'woothemes-sensei' ),
-					'students' => __( 'Learners', 'woothemes-sensei' ),
-					'completions' => __( 'Completed', 'woothemes-sensei' ),
-					'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+					'title' => __('Lesson', 'woothemes-sensei'),
+					'course' => __('Course', 'woothemes-sensei'),
+					'students' => __('Learners', 'woothemes-sensei'),
+					'completions' => __('Completed', 'woothemes-sensei'),
+					'average_grade' => __('Average Grade', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'users':
 			default:
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'registered' => __( 'Date Registered', 'woothemes-sensei' ),
-					'active_courses' => __( 'Active Courses', 'woothemes-sensei' ),
-					'completed_courses' => __( 'Completed Courses', 'woothemes-sensei' ),
-					'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'registered' => __('Date Registered', 'woothemes-sensei'),
+					'active_courses' => __('Active Courses', 'woothemes-sensei'),
+					'completed_courses' => __('Completed Courses', 'woothemes-sensei'),
+					'average_grade' => __('Average Grade', 'woothemes-sensei'),
 				);
 				break;
 		}
 		// Backwards compatible filter name, moving forward should have single filter name
-		$columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns', $columns, $this );
-		$columns = apply_filters( 'sensei_analysis_overview_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns', $columns, $this);
+		$columns = apply_filters('sensei_analysis_overview_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -83,41 +83,41 @@ 
 	 */
 	function get_sortable_columns() {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'students' => array( 'students', false ),
-					'lessons' => array( 'lessons', false ),
-					'completions' => array( 'completions', false ),
-					'average_percent' => array( 'average_percent', false ),
+					'title' => array('title', false),
+					'students' => array('students', false),
+					'lessons' => array('lessons', false),
+					'completions' => array('completions', false),
+					'average_percent' => array('average_percent', false),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'course' => array( 'course', false ),
-					'students' => array( 'students', false ),
-					'completions' => array( 'completions', false ),
-					'average_grade' => array( 'average_grade', false ),
+					'title' => array('title', false),
+					'course' => array('course', false),
+					'students' => array('students', false),
+					'completions' => array('completions', false),
+					'average_grade' => array('average_grade', false),
 				);
 				break;
 
 			case 'users':
 			default:
 				$columns = array(
-					'title' => array( 'user_login', false ),
-					'registered' => array( 'registered', false ),
-					'active_courses' => array( 'active_courses', false ),
-					'completed_courses' => array( 'completed_courses', false ),
-					'average_grade' => array( 'average_grade', false )
+					'title' => array('user_login', false),
+					'registered' => array('registered', false),
+					'active_courses' => array('active_courses', false),
+					'completed_courses' => array('completed_courses', false),
+					'average_grade' => array('average_grade', false)
 				);
 				break;
 		}
 		// Backwards compatible filter name, moving forward should have single filter name
-		$columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns_sortable', $columns, $this );
-		$columns = apply_filters( 'sensei_analysis_overview_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns_sortable', $columns, $this);
+		$columns = apply_filters('sensei_analysis_overview_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -131,25 +131,25 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -160,32 +160,32 @@ 
 		);
 
         // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
+        if (isset($_GET['s']) && ! empty($_GET['s'])) {
+            $args['search'] = esc_html($_GET['s']);
         }
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
-				$this->items = $this->get_courses( $args );
+				$this->items = $this->get_courses($args);
 				break;
 
 			case 'lessons':
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 
 			case 'users':
 			default :
-				$this->items = $this->get_learners( $args );
+				$this->items = $this->get_learners($args);
 				break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -201,16 +201,16 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		$args = array(
@@ -220,37 +220,37 @@ 
 
 
         // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
+        if (isset($_GET['s']) && ! empty($_GET['s'])) {
+            $args['search'] = esc_html($_GET['s']);
         }
 
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
-				$this->items = $this->get_courses( $args );
+				$this->items = $this->get_courses($args);
 				break;
 
 			case 'lessons':
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 
 			case 'users':
 			default :
-				$this->items = $this->get_learners( $args );
+				$this->items = $this->get_learners($args);
 				break;
 		}
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -262,9 +262,9 @@ 
 	 * @param object $item The current item
      * @return array $column_data;
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses' :
 				// Get Learners (i.e. those who have started)
 				$course_args = array( 
@@ -272,7 +272,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'any',
 					);
-				$course_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_learners', $course_args, $item ) );
+				$course_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_learners', $course_args, $item));
 
 				// Get Course Completions
 				$course_args = array( 
@@ -280,10 +280,10 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'complete',
 					);
-				$course_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_completions', $course_args, $item ) );
+				$course_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_completions', $course_args, $item));
 
 				// Course Lessons
-				$course_lessons = Sensei()->lesson->lesson_count( array('publish', 'private'), $item->ID );
+				$course_lessons = Sensei()->lesson->lesson_count(array('publish', 'private'), $item->ID);
 
 				// Get Percent Complete
 				$grade_args = array( 
@@ -293,31 +293,31 @@ 
 						'meta_key' => 'percent',
 					);
 
-				$percent_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_percentage', $grade_args, $item ), true ) );
-				$percent_total = Sensei_Grading::get_course_users_grades_sum( $item->ID );
+				$percent_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_percentage', $grade_args, $item), true));
+				$percent_total = Sensei_Grading::get_course_users_grades_sum($item->ID);
 
                 $course_average_percent = 0;
-                if( $percent_count > 0 && $percent_total > 0 ){
-                    $course_average_percent = abs( round( doubleval( $percent_total / $percent_count ), 2 ) );
+                if ($percent_count > 0 && $percent_total > 0) {
+                    $course_average_percent = abs(round(doubleval($percent_total / $percent_count), 2));
                 }
 
 
 				// Output course data
-				if ( $this->csv_output ) {
-					$course_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+				if ($this->csv_output) {
+					$course_title = apply_filters('the_title', $item->post_title, $item->ID);
 				}
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID ), admin_url( 'admin.php' ) );
+					$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID), admin_url('admin.php'));
 
-					$course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+					$course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 					$course_average_percent .= '%';
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $course_title,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $course_title,
 												'students' => $course_students,
 												'lessons' => $course_lessons,
 												'completions' => $course_completions,
 												'average_percent' => $course_average_percent,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'lessons' :
@@ -327,65 +327,65 @@ 
 						'type' => 'sensei_lesson_status',
 						'status' => 'any',
 					);
-				$lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) );
+				$lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item));
 
 				// Get Course Completions
 				$lesson_args = array( 
 						'post_id' => $item->ID,
 						'type' => 'sensei_lesson_status',
-						'status' => array( 'complete', 'graded', 'passed', 'failed' ),
+						'status' => array('complete', 'graded', 'passed', 'failed'),
 						'count' => true,
 					);
-				$lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) );
+				$lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item));
 
 				// Course 
-				$course_id = get_post_meta( $item->ID, '_lesson_course', true );
-				$course_title = $course_id ? get_the_title( $course_id ) : '';
+				$course_id = get_post_meta($item->ID, '_lesson_course', true);
+				$course_title = $course_id ? get_the_title($course_id) : '';
 
 				$lesson_average_grade = __('n/a', 'woothemes-sensei');
-				if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) {
+				if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) {
 					// Get Percent Complete
 					$grade_args = array( 
 							'post_id' => $item->ID,
 							'type' => 'sensei_lesson_status',
-							'status' => array( 'graded', 'passed', 'failed' ),
+							'status' => array('graded', 'passed', 'failed'),
 							'meta_key' => 'grade',
 						);
 
-					$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true ));
-					$grade_total = Sensei_Grading::get_lessons_users_grades_sum( $item->ID );
+					$grade_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true));
+					$grade_total = Sensei_Grading::get_lessons_users_grades_sum($item->ID);
 
                     $lesson_average_grade = 0;
-                    if( $grade_total > 0 && $grade_count > 0 ){
-                        $lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+                    if ($grade_total > 0 && $grade_count > 0) {
+                        $lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
                     }
 
                 }
 				// Output lesson data
-				if ( $this->csv_output ) {
-					$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+				if ($this->csv_output) {
+					$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 				}
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-					$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+					$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+					$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-					if ( $course_id ) {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-						$course_title = '<a href="' . esc_url( $url ) . '">' . $course_title . '</a>';
+					if ($course_id) {
+						$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+						$course_title = '<a href="'.esc_url($url).'">'.$course_title.'</a>';
 					}
 					else {
 						$course_title = __('n/a', 'woothemes-sensei');
 					}
-					if ( is_numeric( $lesson_average_grade ) ) {
+					if (is_numeric($lesson_average_grade)) {
 						$lesson_average_grade .= '%';
 					}
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $lesson_title,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $lesson_title,
 												'course' => $course_title,
 												'students' => $lesson_students,
 												'completions' => $lesson_completions,
 												'average_grade' => $lesson_average_grade,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'users' :
@@ -396,7 +396,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'any',
 					);
-				$user_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_started', $course_args, $item ) );
+				$user_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_started', $course_args, $item));
 
 				// Get Completed Courses
 				$course_args = array( 
@@ -404,7 +404,7 @@ 
 						'type' => 'sensei_course_status',
 						'status' => 'complete',
 					);
-				$user_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_ended', $course_args, $item ) );
+				$user_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_ended', $course_args, $item));
 
 				// Get Quiz Grades
 				$grade_args = array( 
@@ -414,29 +414,29 @@ 
 						'meta_key' => 'grade',
 					);
 
-				$grade_count = count( Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_lesson_grades', $grade_args, $item ), true ));
-				$grade_total = Sensei_Grading::get_user_graded_lessons_sum( $item->ID );
+				$grade_count = count(Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_lesson_grades', $grade_args, $item), true));
+				$grade_total = Sensei_Grading::get_user_graded_lessons_sum($item->ID);
 
                 $user_average_grade = 0;
-                if( $grade_total > 0 && $grade_count > 0 ){
-                    $user_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+                if ($grade_total > 0 && $grade_count > 0) {
+                    $user_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
                 }
 
 				// Output the users data
-				if ( $this->csv_output ) {
-                    $user_name = Sensei_Learner::get_full_name( $item->ID );
+				if ($this->csv_output) {
+                    $user_name = Sensei_Learner::get_full_name($item->ID);
                 }
 				else {
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
-					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
+					$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->ID), admin_url('admin.php'));
+					$user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$item->display_name.'</a></strong>';
 					$user_average_grade .= '%';
 				} // End If Statement
-				$column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $user_name,
+				$column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $user_name,
 												'registered' => $item->user_registered,
-												'active_courses' => ( $user_courses_started - $user_courses_ended ),
+												'active_courses' => ($user_courses_started - $user_courses_ended),
 												'completed_courses' => $user_courses_ended,
 												'average_grade' => $user_average_grade,
-											), $item, $this );
+											), $item, $this);
 				break;
 		} // end switch
 		return $column_data;
@@ -447,7 +447,7 @@ 
 	 * @since  1.7.0
 	 * @return array courses
 	 */
-	private function get_courses( $args ) {
+	private function get_courses($args) {
 		$course_args = array(
 			'post_type' => 'course',
 			'post_status' => array('publish', 'private'),
@@ -458,16 +458,16 @@ 
 			'suppress_filters' => 0,
 		);
 
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$course_args['posts_per_page'] = '-1';
 		}
 
-		if( isset( $args['search'] ) ) {
+		if (isset($args['search'])) {
 			$course_args['s'] = $args['search'];
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$courses_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_courses', $course_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_courses', $course_args));
 		$this->total_items = $courses_query->found_posts;
 		return $courses_query->posts;
 
@@ -478,7 +478,7 @@ 
 	 * @since  1.7.0
 	 * @return array lessons
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 		$lessons_args = array(
 			'post_type' => 'lesson',
 			'post_status' => array('publish', 'private'),
@@ -489,16 +489,16 @@ 
 			'suppress_filters' => 0,
 		);
 
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$lessons_args['posts_per_page'] = '-1';
 		}
 
-		if( isset( $args['search'] ) ) {
+		if (isset($args['search'])) {
 			$lessons_args['s'] = $args['search'];
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$lessons_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_lessons', $lessons_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_lessons', $lessons_args));
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
 	} // End get_lessons()
@@ -508,24 +508,24 @@ 
 	 * @since  1.7.0
 	 * @return array learners
 	 */
-	private function get_learners( $args ) {
+	private function get_learners($args) {
 
-		if ( !empty($args['search']) ) {
+		if ( ! empty($args['search'])) {
 			$args = array(
-				'search' => '*' . trim( $args['search'], '*' ) . '*',
+				'search' => '*'.trim($args['search'], '*').'*',
 			);
 		}
 
 		// This stops the full meta data of each user being loaded
-		$args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' );
+		$args['fields'] = array('ID', 'user_login', 'user_email', 'user_registered', 'display_name');
 
         /**
          * Filter the WP_User_Query arguments
          * @since 1.6.0
          * @param $args
          */
-        $args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
-		$wp_user_search = new WP_User_Query( $args );
+        $args = apply_filters('sensei_analysis_overview_filter_users', $args);
+		$wp_user_search = new WP_User_Query($args);
         $learners = $wp_user_search->get_results();
 		$this->total_items = $wp_user_search->get_total();
 
@@ -538,18 +538,18 @@ 
 	 * @since  1.2.0
 	 * @return array $stats_to_render of stats boxes and values
 	 */
-	public function stats_boxes () {
+	public function stats_boxes() {
 
 		// Get the data required
 		$user_count = count_users();
-		$user_count = apply_filters( 'sensei_analysis_total_users', $user_count['total_users'], $user_count );
-		$total_courses = Sensei()->course->course_count( array('publish', 'private') );
-		$total_lessons = Sensei()->lesson->lesson_count( array('publish', 'private') );
+		$user_count = apply_filters('sensei_analysis_total_users', $user_count['total_users'], $user_count);
+		$total_courses = Sensei()->course->course_count(array('publish', 'private'));
+		$total_lessons = Sensei()->lesson->lesson_count(array('publish', 'private'));
 
         /**
          * filter the analysis tot grades query args
          */
-		$grade_args = apply_filters( 'sensei_analysis_total_quiz_grades', array(
+		$grade_args = apply_filters('sensei_analysis_total_quiz_grades', array(
 				'type' => 'sensei_lesson_status',
 				'status' => 'any',
 
@@ -559,8 +559,8 @@ 
 		$total_grade_count = Sensei_Grading::get_graded_lessons_count();
 		$total_grade_total = Sensei_Grading::get_graded_lessons_sum();
 		$total_average_grade = 0;
-		if( $total_grade_total > 0 &&  $total_grade_count >0   ){
-			$total_average_grade = abs( round( doubleval( $total_grade_total / $total_grade_count ), 2 ) );
+		if ($total_grade_total > 0 && $total_grade_count > 0) {
+			$total_average_grade = abs(round(doubleval($total_grade_total / $total_grade_count), 2));
 		}
 
 
@@ -568,24 +568,24 @@ 
 				'type' => 'sensei_course_status',
 				'status' => 'any',
 			);
-		$total_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_started', $course_args ) );
+		$total_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_started', $course_args));
 		$course_args = array( 
 				'type' => 'sensei_course_status',
 				'status' => 'complete',
 			);
-		$total_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_ended', $course_args ) );
-		$average_courses_per_learner = abs( round( doubleval( $total_courses_started / $user_count ), 2 ) );
+		$total_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_ended', $course_args));
+		$average_courses_per_learner = abs(round(doubleval($total_courses_started / $user_count), 2));
 
 		// Setup the boxes to render
 		$stats_to_render = array( 
-								__( 'Total Courses', 'woothemes-sensei' ) => $total_courses,
-								__( 'Total Lessons', 'woothemes-sensei' ) => $total_lessons,
-								__( 'Total Learners', 'woothemes-sensei' ) => $user_count,
-								__( 'Average Courses per Learner', 'woothemes-sensei' ) => $average_courses_per_learner,
-								__( 'Average Grade', 'woothemes-sensei' ) => $total_average_grade . '%',
-								__( 'Total Completed Courses', 'woothemes-sensei' ) => $total_courses_ended,
+								__('Total Courses', 'woothemes-sensei') => $total_courses,
+								__('Total Lessons', 'woothemes-sensei') => $total_lessons,
+								__('Total Learners', 'woothemes-sensei') => $user_count,
+								__('Average Courses per Learner', 'woothemes-sensei') => $average_courses_per_learner,
+								__('Average Grade', 'woothemes-sensei') => $total_average_grade.'%',
+								__('Total Completed Courses', 'woothemes-sensei') => $total_courses_ended,
 							);
-		return apply_filters( 'sensei_analysis_stats_boxes', $stats_to_render );
+		return apply_filters('sensei_analysis_stats_boxes', $stats_to_render);
 	} // End stats_boxes()
 
 	/**
@@ -595,12 +595,12 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		if( ! $this->view || 'users' == $this->view ) {
+		if ( ! $this->view || 'users' == $this->view) {
 			$type = 'learners';
 		} else {
 			$type = $this->view;
 		}
-		echo  sprintf( __( '%1$sNo %2$s found%3$s', 'woothemes-sensei' ), '<em>', $type, '</em>' );
+		echo  sprintf(__('%1$sNo %2$s found%3$s', 'woothemes-sensei'), '<em>', $type, '</em>');
 	} // End no_items()
 
 	/**
@@ -615,7 +615,7 @@ 
 			'page' => $this->page_slug,
 		);
 		$learners_class = $courses_class = $lessons_class = '';
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$courses_class = 'current';
 				break;
@@ -633,18 +633,18 @@ 
 		$lesson_args['view'] = 'lessons';
 		$courses_args['view'] = 'courses';
 
-		$menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ). '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>';
-		$menu['courses'] = '<a class="' . $courses_class . '" href="' . esc_url ( add_query_arg( $courses_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Courses', 'woothemes-sensei' ) . '</a>';
-		$menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>';
+		$menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>';
+		$menu['courses'] = '<a class="'.$courses_class.'" href="'.esc_url(add_query_arg($courses_args, admin_url('admin.php'))).'">'.__('Courses', 'woothemes-sensei').'</a>';
+		$menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>';
 
-		$menu = apply_filters( 'sensei_analysis_overview_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu = apply_filters('sensei_analysis_overview_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 	} // End data_table_header()
 
@@ -654,7 +654,7 @@ 
 	 * @return void
 	 */
 	public function data_table_footer() {
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'courses':
 				$report = 'courses-overview';
 				break;
@@ -668,8 +668,8 @@ 
 				$report = 'user-overview';
 			break;
 		} // End Switch Statement
-		$url = add_query_arg( array( 'page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$url = add_query_arg(array('page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report), admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	} // End data_table_footer()
 
 	/**
@@ -677,19 +677,19 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	public function search_button( $text = '' ) {
-		switch( $this->type ) {
+	public function search_button($text = '') {
+		switch ($this->type) {
 			case 'courses':
-				$text = __( 'Search Courses', 'woothemes-sensei' );
+				$text = __('Search Courses', 'woothemes-sensei');
 			break;
 
 			case 'lessons':
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 
 			case 'users':
 			default:
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 		} // End Switch Statement
 

includes/class-sensei-posttypes.php

Spacing +238 added lines, -238 removed lines

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

includes/class-sensei-grading.php

Spacing +280 added lines, -280 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Grading Class
@@ -23,30 +23,30 @@ 
      *
      * @param $file
 	 */
-	public function __construct ( $file ) {
-		$this->name = __( 'Grading', 'woothemes-sensei' );
+	public function __construct($file) {
+		$this->name = __('Grading', 'woothemes-sensei');
 		$this->file = $file;
 		$this->page_slug = 'sensei_grading';
 
 		// Admin functions
-		if ( is_admin() ) {
-			add_action( 'admin_menu', array( $this, 'grading_admin_menu' ), 20);
-			add_action( 'grading_wrapper_container', array( $this, 'wrapper_container'  ) );
-			if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-				add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-				add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (is_admin()) {
+			add_action('admin_menu', array($this, 'grading_admin_menu'), 20);
+			add_action('grading_wrapper_container', array($this, 'wrapper_container'));
+			if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+				add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+				add_action('admin_print_styles', array($this, 'enqueue_styles'));
 			}
 
-			add_action( 'admin_init', array( $this, 'admin_process_grading_submission' ) );
+			add_action('admin_init', array($this, 'admin_process_grading_submission'));
 
-			add_action( 'admin_notices', array( $this, 'add_grading_notices' ) );
+			add_action('admin_notices', array($this, 'add_grading_notices'));
 //			add_action( 'sensei_grading_notices', array( $this, 'sensei_grading_notices' ) );
 		} // End If Statement
 
 		// Ajax functions
-		if ( is_admin() ) {
-			add_action( 'wp_ajax_get_lessons_dropdown', array( $this, 'get_lessons_dropdown' ) );
-			add_action( 'wp_ajax_get_redirect_url', array( $this, 'get_redirect_url' ) );
+		if (is_admin()) {
+			add_action('wp_ajax_get_lessons_dropdown', array($this, 'get_lessons_dropdown'));
+			add_action('wp_ajax_get_redirect_url', array($this, 'get_redirect_url'));
 		} // End If Statement
 	} // End __construct()
 
@@ -59,8 +59,8 @@ 
 	public function grading_admin_menu() {
 		global $menu;
 
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
-			$grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'),  __('Grading', 'woothemes-sensei') , 'manage_sensei_grades', $this->page_slug, array( $this, 'grading_page' ) );
+		if (current_user_can('manage_sensei_grades')) {
+			$grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'), __('Grading', 'woothemes-sensei'), 'manage_sensei_grades', $this->page_slug, array($this, 'grading_page'));
 		}
 
 	} // End grading_admin_menu()
@@ -73,12 +73,12 @@ 
 	 * @since 1.3.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// Load Grading JS
-		wp_enqueue_script( 'sensei-grading-general', Sensei()->plugin_url . 'assets/js/grading-general' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+		wp_enqueue_script('sensei-grading-general', Sensei()->plugin_url.'assets/js/grading-general'.$suffix.'.js', array('jquery'), Sensei()->version);
 
 	} // End enqueue_scripts()
 
@@ -90,11 +90,11 @@ 
 	 * @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( 'woothemes-sensei-settings-api', Sensei()->plugin_url . 'assets/css/settings.css', '', Sensei()->version );
+		wp_enqueue_style('woothemes-sensei-settings-api', Sensei()->plugin_url.'assets/css/settings.css', '', Sensei()->version);
 
 	} // End enqueue_styles()
 
@@ -106,12 +106,12 @@ 
 	public function load_data_table_files() {
 
 		// Load Grading Classes
-		$classes_to_load = array(	'list-table',
+		$classes_to_load = array('list-table',
 									'grading-main',
 									'grading-user-quiz'
 									);
-		foreach ( $classes_to_load as $class_file ) {
-			Sensei()->load_class( $class_file );
+		foreach ($classes_to_load as $class_file) {
+			Sensei()->load_class($class_file);
 		} // End For Loop
 	} // End load_data_table_files()
 
@@ -123,16 +123,16 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_data_object( $name = '', $data = 0, $optional_data = null ) {
+	public function load_data_object($name = '', $data = 0, $optional_data = null) {
 		// Load Analysis data
-		$object_name = 'WooThemes_Sensei_Grading_' . $name;
-		if ( is_null($optional_data) ) {
-			$sensei_grading_object = new $object_name( $data );
+		$object_name = 'WooThemes_Sensei_Grading_'.$name;
+		if (is_null($optional_data)) {
+			$sensei_grading_object = new $object_name($data);
 		}
 		else {
-			$sensei_grading_object = new $object_name( $data, $optional_data );
+			$sensei_grading_object = new $object_name($data, $optional_data);
 		} // End If Statement
-		if ( 'Main' == $name ) {
+		if ('Main' == $name) {
 			$sensei_grading_object->prepare_items();
 		} // End If Statement
 		return $sensei_grading_object;
@@ -146,7 +146,7 @@ 
 	 */
 	public function grading_page() {
 
-		if ( isset( $_GET['quiz_id'] ) && 0 < intval( $_GET['quiz_id'] ) && isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
+		if (isset($_GET['quiz_id']) && 0 < intval($_GET['quiz_id']) && isset($_GET['user']) && 0 < intval($_GET['user'])) {
 			$this->grading_user_quiz_view();
 		}
 		else {
@@ -162,23 +162,23 @@ 
 	public function grading_default_view() {
 
 		// Load Grading data
-		if( !empty( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
+		if ( ! empty($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
 		}
-		if( !empty( $_GET['lesson_id'] ) ) {
-			$lesson_id = intval( $_GET['lesson_id'] );
+		if ( ! empty($_GET['lesson_id'])) {
+			$lesson_id = intval($_GET['lesson_id']);
 		}
-		if( !empty( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
+		if ( ! empty($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
 		}
-		if( !empty( $_GET['view'] ) ) {
-			$view = esc_html( $_GET['view'] );
+		if ( ! empty($_GET['view'])) {
+			$view = esc_html($_GET['view']);
 		}
-		$sensei_grading_overview = $this->load_data_object( 'Main', compact( 'course_id', 'lesson_id', 'user_id', 'view' ) );
+		$sensei_grading_overview = $this->load_data_object('Main', compact('course_id', 'lesson_id', 'user_id', 'view'));
 
 		// Wrappers
-		do_action( 'grading_before_container' );
-		do_action( 'grading_wrapper_container', 'top' );
+		do_action('grading_before_container');
+		do_action('grading_wrapper_container', 'top');
 		$this->grading_headers();
 		?>
 		<div id="poststuff" class="sensei-grading-wrap">
@@ -186,12 +186,12 @@ 
 				<?php $sensei_grading_overview->display(); ?>
 			</div>
 			<div class="sensei-grading-extra">
-				<?php do_action( 'sensei_grading_extra' ); ?>
+				<?php do_action('sensei_grading_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'grading_wrapper_container', 'bottom' );
-		do_action( 'grading_after_container' );
+		do_action('grading_wrapper_container', 'bottom');
+		do_action('grading_after_container');
 	} // End grading_default_view()
 
 	/**
@@ -204,17 +204,17 @@ 
 		// Load Grading data
 		$user_id = 0;
 		$quiz_id = 0;
-		if( isset( $_GET['user'] ) ) {
-			$user_id = intval( $_GET['user'] );
+		if (isset($_GET['user'])) {
+			$user_id = intval($_GET['user']);
 		}
-		if( isset( $_GET['quiz_id'] ) ) {
-			$quiz_id = intval( $_GET['quiz_id'] );
+		if (isset($_GET['quiz_id'])) {
+			$quiz_id = intval($_GET['quiz_id']);
 		}
-		$sensei_grading_user_profile = $this->load_data_object( 'User_Quiz', $user_id, $quiz_id );
+		$sensei_grading_user_profile = $this->load_data_object('User_Quiz', $user_id, $quiz_id);
 		// Wrappers
-		do_action( 'grading_before_container' );
-		do_action( 'grading_wrapper_container', 'top' );
-		$this->grading_headers( array( 'nav' => 'user_quiz' ) );
+		do_action('grading_before_container');
+		do_action('grading_wrapper_container', 'top');
+		$this->grading_headers(array('nav' => 'user_quiz'));
 		?>
 		<div id="poststuff" class="sensei-grading-wrap user-profile">
 			<div class="sensei-grading-main">
@@ -223,8 +223,8 @@ 
 			</div>
 		</div>
 		<?php
-		do_action( 'grading_wrapper_container', 'bottom' );
-		do_action( 'grading_after_container' );
+		do_action('grading_wrapper_container', 'bottom');
+		do_action('grading_after_container');
 	} // End grading_user_quiz_view()
 
 	/**
@@ -233,14 +233,14 @@ 
      * @param array $args
 	 * @return void
 	 */
-	public function grading_headers( $args = array( 'nav' => 'default' ) ) {
+	public function grading_headers($args = array('nav' => 'default')) {
 
-		$function = 'grading_' . $args['nav'] . '_nav';
+		$function = 'grading_'.$args['nav'].'_nav';
 		$this->$function();
 		?>
-			<p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
+			<p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p>
 		<?php
-		do_action( 'sensei_grading_after_headers' );
+		do_action('sensei_grading_after_headers');
 	} // End grading_headers()
 
 	/**
@@ -249,10 +249,10 @@ 
 	 * @param $which string
 	 * @return void
 	 */
-	public function wrapper_container( $which ) {
-		if ( 'top' == $which ) {
+	public function wrapper_container($which) {
+		if ('top' == $which) {
 			?><div id="woothemes-sensei" class="wrap woothemes-sensei"><?php
-		} elseif ( 'bottom' == $which ) {
+		} elseif ('bottom' == $which) {
 			?></div><!--/#woothemes-sensei--><?php
 		} // End If Statement
 	} // End wrapper_container()
@@ -265,29 +265,29 @@ 
 	public function grading_default_nav() {
 		global  $wp_version;
 
-		$title = sprintf( '<a href="%s">%s</a>', esc_url(add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 			}
 			else {
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title( $course_id ) ); 
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title($course_id)); 
 			}
 		}
-		if ( isset( $_GET['lesson_id'] ) ) { 
-			$lesson_id = intval( $_GET['lesson_id'] );
-			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;' . get_the_title( intval( $lesson_id ) ) . '</span>'; 
+		if (isset($_GET['lesson_id'])) { 
+			$lesson_id = intval($_GET['lesson_id']);
+			$title .= '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;'.get_the_title(intval($lesson_id)).'</span>'; 
 		}
-		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
+		if (isset($_GET['user_id']) && 0 < intval($_GET['user_id'])) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
-			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
+            $user_name = Sensei_Learner::get_full_name($_GET['user_id']);
+			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;'.$user_name.'</span>';
 
 		} // End If Statement
 		?>
-			<h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2>
+			<h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2>
 		<?php
 	} // End grading_default_nav()
 
@@ -299,29 +299,29 @@ 
 	public function grading_user_quiz_nav() {
 		global  $wp_version;
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['quiz_id'] ) ) { 
-			$quiz_id = intval( $_GET['quiz_id'] );
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['quiz_id'])) { 
+			$quiz_id = intval($_GET['quiz_id']);
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 			}
 			else {
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title( $course_id ) ); 
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', get_the_title($course_id)); 
 			}
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $lesson_id ) );
+			$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($lesson_id));
 		}
-		if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
+		if (isset($_GET['user']) && 0 < intval($_GET['user'])) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user'] );
-			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
+            $user_name = Sensei_Learner::get_full_name($_GET['user']);
+			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;'.$user_name.'</span>';
 
 		} // End If Statement
 		?>
-			<h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2>
+			<h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2>
 		<?php
 	} // End grading_user_quiz_nav()
 
@@ -330,9 +330,9 @@ 
 	 * @since  1.7.0
 	 * @return array
 	 */
-	public function get_stati( $type ) {
+	public function get_stati($type) {
 		$statuses = array();
-		switch( $type ) {
+		switch ($type) {
 			case 'course' :
 				$statuses = array(
 					'in-progress',
@@ -362,7 +362,7 @@ 
 	 * @param  array $args (default: array())
 	 * @return object
 	 */
-	public function count_statuses( $args = array() ) {
+	public function count_statuses($args = array()) {
 		global  $wpdb;
 
         /**
@@ -373,71 +373,71 @@ 
          * @since 1.8.0
          * @param array $args
          */
-        $args = apply_filters( 'sensei_count_statuses_args', $args );
+        $args = apply_filters('sensei_count_statuses_args', $args);
 
-		if ( 'course' == $args['type'] ) {
+		if ('course' == $args['type']) {
 			$type = 'sensei_course_status';
 		}
 		else {
 			$type = 'sensei_lesson_status';
 		}
-		$cache_key = 'sensei-' . $args['type'] . '-statuses';
+		$cache_key = 'sensei-'.$args['type'].'-statuses';
 
 		$query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s ";
 
         // Restrict to specific posts
-		if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) {
-			$query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')';
+		if (isset($args['post__in']) && ! empty($args['post__in']) && is_array($args['post__in'])) {
+			$query .= ' AND comment_post_ID IN ('.implode(',', array_map('absint', $args['post__in'])).')';
 		}
-		elseif ( !empty( $args['post_id'] ) ) {
-			$query .= $wpdb->prepare( ' AND comment_post_ID = %d', $args['post_id'] );
+		elseif ( ! empty($args['post_id'])) {
+			$query .= $wpdb->prepare(' AND comment_post_ID = %d', $args['post_id']);
 		}
 		// Restrict to specific users
-		if ( isset( $args['user_id'] ) && is_array( $args['user_id'] ) ) {
-			$query .= ' AND user_id IN (' . implode( ',', array_map( 'absint', $args['user_id'] ) ) . ')';
+		if (isset($args['user_id']) && is_array($args['user_id'])) {
+			$query .= ' AND user_id IN ('.implode(',', array_map('absint', $args['user_id'])).')';
 		}
-		elseif ( !empty( $args['user_id'] ) ) {
-			$query .= $wpdb->prepare( ' AND user_id = %d', $args['user_id'] );
+		elseif ( ! empty($args['user_id'])) {
+			$query .= $wpdb->prepare(' AND user_id = %d', $args['user_id']);
 		}
 		$query .= ' GROUP BY comment_approved';
 
-		$counts = wp_cache_get( $cache_key, 'counts' );
-		if ( false === $counts ) {
-			$sql = $wpdb->prepare( $query, $type );
-			$results = (array) $wpdb->get_results( $sql, ARRAY_A );
-			$counts = array_fill_keys( $this->get_stati( $type ), 0 );
+		$counts = wp_cache_get($cache_key, 'counts');
+		if (false === $counts) {
+			$sql = $wpdb->prepare($query, $type);
+			$results = (array) $wpdb->get_results($sql, ARRAY_A);
+			$counts = array_fill_keys($this->get_stati($type), 0);
 
-			foreach ( $results as $row ) {
-				$counts[ $row['comment_approved'] ] = $row['total'];
+			foreach ($results as $row) {
+				$counts[$row['comment_approved']] = $row['total'];
 			}
-			wp_cache_set( $cache_key, $counts, 'counts' );
+			wp_cache_set($cache_key, $counts, 'counts');
 		}
 
-		if( ! isset( $counts['graded'] ) ) {
+		if ( ! isset($counts['graded'])) {
 			$counts['graded'] = 0;
 		}
 
-		if( ! isset( $counts['ungraded'] ) ) {
+		if ( ! isset($counts['ungraded'])) {
 			$counts['ungraded'] = 0;
 		}
 
-		if( ! isset( $counts['passed'] ) ) {
+		if ( ! isset($counts['passed'])) {
 			$counts['passed'] = 0;
 		}
 
-		if( ! isset( $counts['failed'] ) ) {
+		if ( ! isset($counts['failed'])) {
 			$counts['failed'] = 0;
 		}
 
-		if( ! isset( $counts['in-progress'] ) ) {
+		if ( ! isset($counts['in-progress'])) {
 			$counts['in-progress'] = 0;
 		}
 
-		if( ! isset( $counts['complete'] ) ) {
+		if ( ! isset($counts['complete'])) {
 			$counts['complete'] = 0;
 		}
 
-		return apply_filters( 'sensei_count_statuses', $counts, $type );
+		return apply_filters('sensei_count_statuses', $counts, $type);
 	} // End sensei_count_statuses()
 
 	/**
@@ -445,11 +445,11 @@ 
 	 * @since  1.7.0
 	 * @return string
 	 */
-	public function courses_drop_down_html( $selected_course_id = 0 ) {
+	public function courses_drop_down_html($selected_course_id = 0) {
 
 		$html = '';
 
-		$course_args = array(   'post_type'         => 'course',
+		$course_args = array('post_type'         => 'course',
 								'posts_per_page'       => -1,
 								'orderby'           => 'title',
 								'order'             => 'ASC',
@@ -457,12 +457,12 @@ 
 								'suppress_filters'  => 0,
 								'fields'            => 'ids',
 							);
-		$courses = get_posts( apply_filters( 'sensei_grading_filter_courses', $course_args ) );
+		$courses = get_posts(apply_filters('sensei_grading_filter_courses', $course_args));
 
-		$html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>';
-		if ( count( $courses ) > 0 ) {
-			foreach ($courses as $course_id){
-				$html .= '<option value="' . esc_attr( absint( $course_id ) ) . '" ' . selected( $course_id, $selected_course_id, false ) . '>' . esc_html( get_the_title( $course_id ) ) . '</option>' . "\n";
+		$html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>';
+		if (count($courses) > 0) {
+			foreach ($courses as $course_id) {
+				$html .= '<option value="'.esc_attr(absint($course_id)).'" '.selected($course_id, $selected_course_id, false).'>'.esc_html(get_the_title($course_id)).'</option>'."\n";
 			} // End For Loop
 		} // End If Statement
 
@@ -483,20 +483,20 @@ 
 		$course_data = array();
 		parse_str($data, $course_data);
 
-		$course_id = intval( $course_data['course_id'] );
+		$course_id = intval($course_data['course_id']);
 
-		$html = $this->lessons_drop_down_html( $course_id );
+		$html = $this->lessons_drop_down_html($course_id);
 
 		echo $html;
 		die(); // WordPress may print out a spurious zero without this can be particularly bad if using JSON
 	}
 
-	public function lessons_drop_down_html( $course_id = 0, $selected_lesson_id = 0 ) {
+	public function lessons_drop_down_html($course_id = 0, $selected_lesson_id = 0) {
 
 		$html = '';
-		if ( 0 < intval( $course_id ) ) {
+		if (0 < intval($course_id)) {
 
-			$lesson_args = array( 'post_type'       => 'lesson',
+			$lesson_args = array('post_type'       => 'lesson',
 								'posts_per_page'       => -1,
 								'orderby'           => 'title',
 								'order'             => 'ASC',
@@ -506,12 +506,12 @@ 
 								'suppress_filters'  => 0,
 								'fields'            => 'ids',
 								);
-			$lessons = get_posts( apply_filters( 'sensei_grading_filter_lessons', $lesson_args ) );
+			$lessons = get_posts(apply_filters('sensei_grading_filter_lessons', $lesson_args));
 
-			$html .= '<option value="">' . __( 'Select a lesson', 'woothemes-sensei' ) . '</option>';
-			if ( count( $lessons ) > 0 ) {
-				foreach ( $lessons as $lesson_id ){
-					$html .= '<option value="' . esc_attr( absint( $lesson_id ) ) . '" ' . selected( $lesson_id, $selected_lesson_id, false ) . '>' . esc_html( get_the_title( $lesson_id ) ) . '</option>' . "\n";
+			$html .= '<option value="">'.__('Select a lesson', 'woothemes-sensei').'</option>';
+			if (count($lessons) > 0) {
+				foreach ($lessons as $lesson_id) {
+					$html .= '<option value="'.esc_attr(absint($lesson_id)).'" '.selected($lesson_id, $selected_lesson_id, false).'>'.esc_html(get_the_title($lesson_id)).'</option>'."\n";
 				} // End For Loop
 			} // End If Statement
 
@@ -532,10 +532,10 @@ 
     public function admin_process_grading_submission() {
 
         // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
-        if( ! isset( $_POST['sensei_manual_grade'] )
-            || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
-            || ! isset( $_GET['quiz_id'] )
-            || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
+        if ( ! isset($_POST['sensei_manual_grade'])
+            || ! wp_verify_nonce($_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading')
+            || ! isset($_GET['quiz_id'])
+            || $_GET['quiz_id'] != $_POST['sensei_manual_grade']) {
 
             return false; //exit and do not grade
 
@@ -545,30 +545,30 @@ 
         $user_id = $_GET['user'];
 
 
-        $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-        $quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+        $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+        $quiz_lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $quiz_grade = 0;
         $count = 0;
         $quiz_grade_total = $_POST['quiz_grade_total'];
         $all_question_grades = array();
         $all_answers_feedback = array();
 
-        foreach( $questions as $question ) {
+        foreach ($questions as $question) {
 
             ++$count;
             $question_id = $question->ID;
 
-            if( isset( $_POST[ 'question_' . $question_id ] ) ) {
+            if (isset($_POST['question_'.$question_id])) {
 
                 $question_grade = 0;
-                if( $_POST[ 'question_' . $question_id ] == 'right' ) {
+                if ($_POST['question_'.$question_id] == 'right') {
 
-                    $question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
+                    $question_grade = $_POST['question_'.$question_id.'_grade'];
 
                 }
 
                 // add data to the array that will, after the loop, be stored on the lesson status
-                $all_question_grades[ $question_id ] = $question_grade;
+                $all_question_grades[$question_id] = $question_grade;
 
                 // tally up the total quiz grade
                 $quiz_grade += $question_grade;
@@ -577,41 +577,41 @@ 
 
             // Question answer feedback / notes
             $question_feedback = '';
-            if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
+            if (isset($_POST['questions_feedback'][$question_id])) {
 
-                $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
+                $question_feedback = wp_unslash($_POST['questions_feedback'][$question_id]);
 
             }
-            $all_answers_feedback[ $question_id ] = $question_feedback;
+            $all_answers_feedback[$question_id] = $question_feedback;
 
         } // end for each $questions
 
         //store all question grades on the lesson status
-        Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
+        Sensei()->quiz->set_user_grades($all_question_grades, $quiz_lesson_id, $user_id);
 
         //store the feedback from grading
-        Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
+        Sensei()->quiz->save_user_answers_feedback($all_answers_feedback, $quiz_lesson_id, $user_id);
 
         // $_POST['all_questions_graded'] is set when all questions have been graded
         // in the class sensei grading user quiz -> display()
-        if( $_POST['all_questions_graded'] == 'yes' ) {
+        if ($_POST['all_questions_graded'] == 'yes') {
 
             // set the users total quiz grade
-			if ( 0 < intval( $quiz_grade_total ) ) {
-            $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
+			if (0 < intval($quiz_grade_total)) {
+            $grade = abs(round((doubleval($quiz_grade) * 100) / ($quiz_grade_total), 2));
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
+            Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id);
 
             // Duplicating what Frontend->sensei_complete_quiz() does
-            $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-            $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+            $pass_required = get_post_meta($quiz_id, '_pass_required', true);
+            $quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
             $lesson_metadata = array();
-            if ( $pass_required ) {
+            if ($pass_required) {
                 // Student has reached the pass mark and lesson is complete
-                if ( $quiz_passmark <= $grade ) {
+                if ($quiz_passmark <= $grade) {
                     $lesson_status = 'passed';
                 }
                 else {
@@ -624,9 +624,9 @@ 
             }
             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
 
-            Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
+            Sensei_Utils::update_lesson_status($user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata);
 
-            if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
+            if (in_array($lesson_status, array('passed', 'graded'))) {
 
                 /**
                  * Summary.
@@ -638,27 +638,27 @@ 
                  * @param int  $user_id
                  * @param int $quiz_lesson_id
                  */
-                do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
+                do_action('sensei_user_lesson_end', $user_id, $quiz_lesson_id);
 
             } // end if in_array
 
         }// end if $_POST['all_que...
 
-        if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
+        if (isset($_POST['sensei_grade_next_learner']) && strlen($_POST['sensei_grade_next_learner']) > 0) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+            $load_url = add_query_arg(array('message' => 'graded'));
 
-        } elseif ( isset( $_POST['_wp_http_referer'] ) ) {
+        } elseif (isset($_POST['_wp_http_referer'])) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
+            $load_url = add_query_arg(array('message' => 'graded'), $_POST['_wp_http_referer']);
 
         } else {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+            $load_url = add_query_arg(array('message' => 'graded'));
 
         }
 
-        wp_safe_redirect( esc_url_raw( $load_url ) );
+        wp_safe_redirect(esc_url_raw($load_url));
         exit;
 
     } // end admin_process_grading_submission
@@ -669,13 +669,13 @@ 
 		$lesson_data = array();
 		parse_str($data, $lesson_data);
 
-		$lesson_id = intval( $lesson_data['lesson_id'] );
-		$course_id = intval( $lesson_data['course_id'] );
-		$grading_view = sanitize_text_field( $lesson_data['view'] );
+		$lesson_id = intval($lesson_data['lesson_id']);
+		$course_id = intval($lesson_data['course_id']);
+		$grading_view = sanitize_text_field($lesson_data['view']);
 
 		$redirect_url = '';
-		if ( 0 < $lesson_id && 0 < $course_id ) {
-			$redirect_url = esc_url_raw( apply_filters( 'sensei_ajax_redirect_url', add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view ), admin_url( 'admin.php' ) ) ) );
+		if (0 < $lesson_id && 0 < $course_id) {
+			$redirect_url = esc_url_raw(apply_filters('sensei_ajax_redirect_url', add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view), admin_url('admin.php'))));
 		} // End If Statement
 
 		echo $redirect_url;
@@ -683,11 +683,11 @@ 
 	}
 
 	public function add_grading_notices() {
-		if( isset( $_GET['page'] ) && $this->page_slug == $_GET['page'] && isset( $_GET['message'] ) && $_GET['message'] ) {
-			if( 'graded' == $_GET['message'] ) {
+		if (isset($_GET['page']) && $this->page_slug == $_GET['page'] && isset($_GET['message']) && $_GET['message']) {
+			if ('graded' == $_GET['message']) {
 				$msg = array(
 					'updated',
-					__( 'Quiz Graded Successfully!', 'woothemes-sensei' ),
+					__('Quiz Graded Successfully!', 'woothemes-sensei'),
 				);
 			}
 			?>
@@ -699,9 +699,9 @@ 
 	}
 
 	public function sensei_grading_notices() {
-		if ( isset( $_GET['action'] ) && 'graded' == $_GET['action'] ) {
+		if (isset($_GET['action']) && 'graded' == $_GET['action']) {
 			echo '<div class="grading-notice updated">';
-				echo '<p>' . __( 'Quiz Graded Successfully!', 'woothemes-sensei' ) . '</p>';
+				echo '<p>'.__('Quiz Graded Successfully!', 'woothemes-sensei').'</p>';
 			echo '</div>';
 		} // End If Statement
 	} // End sensei_grading_notices()
@@ -724,16 +724,16 @@ 
      *
      * @return int $quiz_grade total sum of all question grades
      */
-    public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+    public static function grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') {
 
-        if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
-            || $quiz_grade_type != 'auto' ) {
+        if ( ! (intval($quiz_id) > 0) || ! $submitted
+            || $quiz_grade_type != 'auto') {
             return false; // exit early
         }
 
 
         $user_id = get_current_user_id();
-        $lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $quiz_autogradable = true;
 
         /**
@@ -747,23 +747,23 @@ 
          *      'gap-fill'.
          * }
          */
-        $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
+        $autogradable_question_types = apply_filters('sensei_autogradable_question_types', array('multiple-choice', 'boolean', 'gap-fill'));
 
         $grade_total = 0;
         $all_question_grades = array();
-        foreach( $submitted as $question_id => $answer ) {
+        foreach ($submitted as $question_id => $answer) {
 
             // check if the question is autogradable, either by type, or because the grade is 0
-            $question_type = Sensei()->question->get_question_type( $question_id );
-			$achievable_grade = Sensei()->question->get_question_grade( $question_id );
+            $question_type = Sensei()->question->get_question_type($question_id);
+			$achievable_grade = Sensei()->question->get_question_grade($question_id);
 			// Question has a zero grade, so skip grading
-			if ( 0 == $achievable_grade ) {
-				$all_question_grades[ $question_id ] = $achievable_grade;
+			if (0 == $achievable_grade) {
+				$all_question_grades[$question_id] = $achievable_grade;
 			}
-            elseif ( in_array( $question_type, $autogradable_question_types ) ) {
+            elseif (in_array($question_type, $autogradable_question_types)) {
                 // Get user question grade
-                $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
-                $all_question_grades[ $question_id ] = $question_grade;
+                $question_grade = Sensei_Utils::sensei_grade_question_auto($question_id, $question_type, $answer, $user_id);
+                $all_question_grades[$question_id] = $question_grade;
                 $grade_total += $question_grade;
 
             } else {
@@ -776,27 +776,27 @@ 
         }// end for each question
 
         // Only if the whole quiz was autogradable do we set a grade
-        if ( $quiz_autogradable ) {
+        if ($quiz_autogradable) {
 
-            $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
+            $quiz_total = Sensei_Utils::sensei_get_quiz_total($quiz_id);
 			// Check for zero total from grades
-			if ( 0 < $quiz_total ) {
-            $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
+			if (0 < $quiz_total) {
+            $grade = abs(round((doubleval($grade_total) * 100) / ($quiz_total), 2));
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
+            Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id, $quiz_grade_type);
 
         } else {
 
-            $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
+            $grade = new WP_Error('autograde', __('This quiz is not able to be automatically graded.', 'woothemes-sensei'));
 
         }
 
         // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
         // when doing manual grading.
-        Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
+        Sensei()->quiz-> set_user_grades($all_question_grades, $lesson_id, $user_id);
 
         return $grade;
 
@@ -816,22 +816,22 @@ 
      *
      * @return int $question_grade
      */
-    public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
+    public static function grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) {
 
-        if( intval( $user_id ) == 0 ) {
+        if (intval($user_id) == 0) {
 
             $user_id = get_current_user_id();
 
         }
 
-        if( ! ( intval( $question_id ) > 0 ) ) {
+        if ( ! (intval($question_id) > 0)) {
 
             return false;
 
         }
 
 
-        Sensei()->question->get_question_type( $question_id );
+        Sensei()->question->get_question_type($question_id);
 
         /**
          * Applying a grade before the auto grading takes place.
@@ -845,42 +845,42 @@ 
          * @param string $question_type one of the Sensei question type.
          * @param string $answer user supplied question answer
          */
-        $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
+        $question_grade = apply_filters('sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer);
 
-        if ( false !== $question_grade ) {
+        if (false !== $question_grade) {
 
             return $question_grade;
 
         }
 
         // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+        if (in_array($question_type, array('multiple-choice', 'boolean'))) {
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+            $right_answer = (array) get_post_meta($question_id, '_question_right_answer', true);
 
-            if( 0 == get_magic_quotes_gpc() ) {
-                $answer = wp_unslash( $answer );
+            if (0 == get_magic_quotes_gpc()) {
+                $answer = wp_unslash($answer);
             }
             $answer = (array) $answer;
-            if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
+            if (is_array($right_answer) && count($right_answer) == count($answer)) {
                 // Loop through all answers ensure none are 'missing'
                 $all_correct = true;
-                foreach ( $answer as $check_answer ) {
-                    if ( !in_array( $check_answer, $right_answer ) ) {
+                foreach ($answer as $check_answer) {
+                    if ( ! in_array($check_answer, $right_answer)) {
                         $all_correct = false;
                     }
                 }
                 // If all correct then grade
-                if ( $all_correct ) {
-                    $question_grade = Sensei()->question->get_question_grade( $question_id );
+                if ($all_correct) {
+                    $question_grade = Sensei()->question->get_question_grade($question_id);
                 }
             }
 
-        } elseif( 'gap-fill' == $question_type ){
+        } elseif ('gap-fill' == $question_type) {
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
+            $question_grade = self::grade_gap_fill_question($question_id, $answer);
 
-        } else{
+        } else {
 
             /**
              * Grading questions that are not auto gradable.
@@ -893,7 +893,7 @@ 
              * @param string $question_type one of the Sensei question type.
              * @param string $answer user supplied question answer
              */
-            $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
+            $question_grade = (int) apply_filters('sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer);
 
         } // end if $question_type
 
@@ -909,13 +909,13 @@ 
      *
      * @return bool | int false or the grade given to the user answer
      */
-    public static function grade_gap_fill_question( $question_id, $user_answer ){
+    public static function grade_gap_fill_question($question_id, $user_answer) {
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+        $right_answer = get_post_meta($question_id, '_question_right_answer', true);
+        $gapfill_array = explode('||', $right_answer);
 
-        if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
-            $user_answer = wp_unslash( $user_answer );
+        if (0 == get_magic_quotes_gpc()) { // deprecated from PHP 5.4 but we still support PHP 5.2
+            $user_answer = wp_unslash($user_answer);
         }
 
         /**
@@ -928,53 +928,53 @@ 
          *
          * @since 1.9.0
          */
-        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
+        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false);
 
-        if( $do_case_sensitive_comparison ){
+        if ($do_case_sensitive_comparison) {
 
             // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
+            if (trim(($gapfill_array[1])) == trim($user_answer)) {
 
-                return Sensei()->question->get_question_grade( $question_id );
+                return Sensei()->question->get_question_grade($question_id);
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+            } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+                if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) {
 
                     return Sensei()->question->get_question_grade($question_id);
 
-                }else{
+                } else {
 
                     return false;
 
                 }
 
-            }else{
+            } else {
 
                 return false;
 
             }
 
-        }else{
+        } else {
 
             // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+            if (trim(strtolower($gapfill_array[1])) == trim(strtolower($user_answer))) {
 
-               return Sensei()->question->get_question_grade( $question_id );
+               return Sensei()->question->get_question_grade($question_id);
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+            } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+                if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) {
 
-                    return  Sensei()->question->get_question_grade( $question_id );
+                    return  Sensei()->question->get_question_grade($question_id);
 
-                }else{
+                } else {
 
                     return false;
 
                 }
 
-            }else{
+            } else {
 
                 return false;
 
@@ -990,17 +990,17 @@ 
      * @since 1.9.0
      * @return int $number_of_graded_lessons
      */
-    public static function get_graded_lessons_count(){
+    public static function get_graded_lessons_count() {
 
         global $wpdb;
 
-        $comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $comment_query_piece['select']  = "SELECT   COUNT(*) AS total";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $number_of_graded_lessons = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $number_of_graded_lessons;
     }
@@ -1011,17 +1011,17 @@ 
      * @since 1.9.0
      * @return double $sum_of_all_grades
      */
-    public static function get_graded_lessons_sum(){
+    public static function get_graded_lessons_sum() {
 
         global $wpdb;
 
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1034,17 +1034,17 @@ 
      * @param $user_id
      * @return double
      */
-    public static function get_user_graded_lessons_sum( $user_id ){
+    public static function get_user_graded_lessons_sum($user_id) {
         global $wpdb;
 
-        $clean_user_id = esc_sql( $user_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_user_id = esc_sql($user_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
     }
@@ -1057,18 +1057,18 @@ 
      * @param int lesson_id
      * @return double
      */
-    public static function get_lessons_users_grades_sum( $lesson_id ){
+    public static function get_lessons_users_grades_sum($lesson_id) {
 
         global $wpdb;
 
-        $clean_lesson_id = esc_sql( $lesson_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_lesson_id = esc_sql($lesson_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1082,18 +1082,18 @@ 
      * @param int $course_id
      * @return double
      */
-    public static function get_course_users_grades_sum( $course_id ){
+    public static function get_course_users_grades_sum($course_id) {
 
         global $wpdb;
 
-        $clean_course_id = esc_sql( $course_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+        $clean_course_id = esc_sql($course_id);
+        $comment_query_piece['select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+        $comment_query_piece['from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+        $comment_query_piece['where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
+        $comment_query_piece['orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+        $comment_query = $comment_query_piece['select'].$comment_query_piece['from'].$comment_query_piece['where'].$comment_query_piece['orderby'];
+        $sum_of_all_grades = intval($wpdb->get_var($comment_query, 0, 0));
 
         return $sum_of_all_grades;
 
@@ -1106,4 +1106,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Grading extends Sensei_Grading{}
+class WooThemes_Sensei_Grading extends Sensei_Grading {}