woothemes / sensei

includes/class-sensei-utils.php

Doc Comments +32 added lines, -29 removed lines

@@ -29,7 +29,7 @@ 
 	 * @access public
 	 * @since  1.0.2
 	 * @static
-	 * @return void
+	 * @return boolean
 	 */
 	public static function sensei_is_woocommerce_present () {
 		if ( class_exists( 'Woocommerce' ) ) {
@@ -349,7 +349,7 @@ 
      * @param  string $customer_email
      * @param  int $user_id
      * @param  int $product_id
-     * @return bool
+     * @return boolean|null
      */
     public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) {
 
@@ -404,7 +404,7 @@ 
 	/**
 	 * Save quiz answers submitted by users
 	 * @param  boolean $submitted User's quiz answers
-	 * @return boolean            Whether the answers were saved or not
+	 * @return null|false            Whether the answers were saved or not
 	 */
 	public static function sensei_save_quiz_answers( $submitted = false, $user_id = 0 ) {
 		if( intval( $user_id ) == 0 ) {
@@ -467,6 +467,9 @@ 
 
 	} // End sensei_save_quiz_answers()
 
+	/**
+	 * @return string
+	 */
 	public static function upload_file( $file = array() ) {
 
 		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -731,8 +734,8 @@ 
 	/**
 	 * Remove user from lesson, deleting all data from the corresponding quiz
 	 *
-	 * @param type $lesson_id
-	 * @param type $user_id
+	 * @param integer $lesson_id
+	 * @param integer $user_id
 	 * @return boolean
 	 */
 	public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) {
@@ -769,8 +772,8 @@ 
 	/**
 	 * Remove a user from a course, deleting all activities across all lessons
 	 *
-	 * @param type $course_id
-	 * @param type $user_id
+	 * @param integer $course_id
+	 * @param integer $user_id
 	 * @return boolean
 	 */
 	public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) {
@@ -835,7 +838,7 @@ 
 	/**
 	 * Returns the user_grade for a specific question and user, or sensei_user_answer entry
 	 *
-	 * @param mixed $question
+	 * @param integer $question
 	 * @param int $user_id
 	 * @return string
 	 */
@@ -863,7 +866,7 @@ 
 	 * Returns the answer_notes for a specific question and user, or sensei_user_answer entry
 	 *
      * @deprecated since 1.7.5 use Sensei()->quiz->get_user_question_feedback instead
-	 * @param mixed $question
+	 * @param integer $question
 	 * @param int $user_id
 	 * @return string
 	 */
@@ -975,7 +978,7 @@ 
 	 * sort_array_by_key sorts array by key
 	 * @since  1.3.0
 	 * @param  $array by ref
-	 * @param  $key string column name in array
+	 * @param  string $key string column name in array
 	 * @return void
 	 */
 	public static function sort_array_by_key( $array, $key ) {
@@ -1022,7 +1025,7 @@ 
 	/**
 	 * Get pass mark for course
 	 * @param  integer $course_id ID of course
-	 * @return integer            Pass mark for course
+	 * @return double            Pass mark for course
 	 */
 	public static function sensei_course_pass_grade( $course_id = 0 ) {
 
@@ -1063,7 +1066,7 @@ 
 	 * Get user total grade for course
 	 * @param  integer $course_id ID of course
 	 * @param  integer $user_id   ID of user
-	 * @return integer            User's total grade
+	 * @return double            User's total grade
 	 */
 	public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) {
 
@@ -1355,9 +1358,9 @@ 
 	 * Check if a user has started a course or not
 	 *
 	 * @since  1.7.0
-	 * @param type $course_id
-	 * @param type $user_id
-	 * @return mixed false or comment_ID
+	 * @param integer $course_id
+	 * @param integer $user_id
+	 * @return false|string false or comment_ID
 	 */
 	public static function user_started_course( $course_id = 0, $user_id = 0 ) {
 
@@ -1384,7 +1387,7 @@ 
 	 * @since  1.7.0
 	 * @param  integer $course_id Course ID
 	 * @param  integer $user_id   User ID
-	 * @return int
+	 * @return null|false
 	 */
 	public static function user_complete_course( $course_id = 0, $user_id = 0 ) {
 		global  $wp_version;
@@ -1491,7 +1494,7 @@ 
 	/**
 	 * Check if a user has completed a course or not
 	 *
-	 * @param mixed $course course_id or sensei_course_status entry
+	 * @param integer $course course_id or sensei_course_status entry
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1530,9 +1533,9 @@ 
 	 * Check if a user has started a lesson or not
 	 *
 	 * @since  1.7.0
-	 * @param type $lesson_id
-	 * @param type $user_id
-	 * @return mixed false or comment_ID
+	 * @param integer $lesson_id
+	 * @param integer $user_id
+	 * @return string|false false or comment_ID
 	 */
 	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) {
 
@@ -1553,7 +1556,7 @@ 
 	 * Check if a user has completed a lesson or not
 	 *
      * @uses  Sensei()
-	 * @param mixed $lesson lesson_id or sensei_lesson_status entry
+	 * @param integer $lesson lesson_id or sensei_lesson_status entry
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1626,9 +1629,9 @@ 
 	 * Returns the requested course status
 	 *
 	 * @since 1.7.0
-	 * @param type $course_id
-	 * @param type $user_id
-	 * @return object
+	 * @param integer $course_id
+	 * @param integer $user_id
+	 * @return integer
 	 */
 	public static function user_course_status( $course_id = 0, $user_id = 0 ) {
 
@@ -1651,7 +1654,7 @@ 
 	 * @since 1.7.0
 	 * @param int $lesson_id
 	 * @param int $user_id
-	 * @return object | bool
+	 * @return integer | bool
 	 */
 	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
 
@@ -1710,11 +1713,11 @@ 
 	 * @since  1.7.0
      *
 	 * @param int|string $user_id
-	 * @param int|string $lesson_id
+	 * @param integer $lesson_id
 	 * @param string $status
 	 * @param array $metadata
      *
-	 * @return mixed false or comment_ID
+	 * @return null|false false or comment_ID
 	 */
 	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -1752,7 +1755,7 @@ 
 	 * @param type $course_id
 	 * @param type $status
 	 * @param type $metadata
-	 * @return mixed false or comment_ID
+	 * @return null|false false or comment_ID
 	 */
 	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -1941,7 +1944,7 @@ 
      *
      * @since 1.7.4
      *
-     * @param $data_key
+     * @param string $data_key
      * @param $post_id
      * @param int $user_id
      *

Indentation +475 added lines, -475 removed lines

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

Spacing +534 added lines, -534 removed lines

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

Braces +41 added lines, -35 removed lines

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

includes/class-sensei-wc.php

Doc Comments +1 added lines, -1 removed lines

@@ -817,7 +817,7 @@
      * @param  int $user_id
      * @param  int $product_id
      *
-     * @return bool
+     * @return boolean|null
      */
     public static function has_customer_bought_product ( $user_id, $product_id ){
 

Indentation +730 added lines, -730 removed lines

@@ -12,716 +12,716 @@ 
  */
 
 Class Sensei_WC{
-    /**
-     * Load the files needed for the woocommerce integration.
-     *
-     * @since 1.9.0
-     */
-    public static function load_woocommerce_integration_hooks(){
+	/**
+	 * Load the files needed for the woocommerce integration.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function load_woocommerce_integration_hooks(){
 
-        require_once( __DIR__ . '/hooks/woocommerce.php' );
+		require_once( __DIR__ . '/hooks/woocommerce.php' );
 
-    }
-    /**
-     * check if WooCommerce plugin is loaded
-     *
-     * @since 1.9.0
-     * @return bool
-     */
-    public static function is_woocommerce_active(){
+	}
+	/**
+	 * check if WooCommerce plugin is loaded
+	 *
+	 * @since 1.9.0
+	 * @return bool
+	 */
+	public static function is_woocommerce_active(){
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+		$active_plugins = (array) get_option( 'active_plugins', array() );
 
-        if ( is_multisite() ){
+		if ( is_multisite() ){
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
 
-        }
+		}
 
-        return in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+		return in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
 
-    } // end is_woocommerce_active
+	} // end is_woocommerce_active
 
-    /**
-     * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
-     *
-     * If multiple exist we will return the latest order.
-     *
-     * @param $user_id
-     * @param $course_id
-     * @return array $user_course_orders
-     */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+	/**
+	 * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
+	 *
+	 * If multiple exist we will return the latest order.
+	 *
+	 * @param $user_id
+	 * @param $course_id
+	 * @return array $user_course_orders
+	 */
+	public static function get_learner_course_active_order_id( $user_id, $course_id ){
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-        $orders_query = new WP_Query( array(
-            'post_type'   => 'shop_order',
-            'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
-            'meta_key'=> '_customer_user',
-            'meta_value'=> $user_id,
-        ) );
+		$orders_query = new WP_Query( array(
+			'post_type'   => 'shop_order',
+			'posts_per_page' => -1,
+			'post_status' => array( 'wc-processing', 'wc-completed' ),
+			'meta_key'=> '_customer_user',
+			'meta_value'=> $user_id,
+		) );
 
-        if( $orders_query->post_count == 0 ){
+		if( $orders_query->post_count == 0 ){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        foreach( $orders_query->get_posts() as $order ){
+		foreach( $orders_query->get_posts() as $order ){
 
-            $order = new WC_Order( $order->ID );
-            $items = $order->get_items();
+			$order = new WC_Order( $order->ID );
+			$items = $order->get_items();
 
-            $user_orders =  array();
+			$user_orders =  array();
 
-            foreach( $items as $item ){
+			foreach( $items as $item ){
 
-                // if the product id on the order and the one given to this function
-                // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+				// if the product id on the order and the one given to this function
+				// this order has been placed by the given user on the given course.
+				$product = wc_get_product( $item['product_id'] );
 
-                if ( $product->is_type( 'variable' )) {
+				if ( $product->is_type( 'variable' )) {
 
-                    $item_product_id = $item['variation_id'];
+					$item_product_id = $item['variation_id'];
 
-                } else {
+				} else {
 
-                    $item_product_id =  $item['product_id'];
+					$item_product_id =  $item['product_id'];
 
-                }
+				}
 
-                if( $course_product_id == $item_product_id ){
+				if( $course_product_id == $item_product_id ){
 
-                    return $order->id;
+					return $order->id;
 
-                }
+				}
 
 
-            }//end for each order item
+			}//end for each order item
 
-        } // end for each order
+		} // end for each order
 
-        // if we reach this place we found no order
-        return false;
+		// if we reach this place we found no order
+		return false;
 
-    } // end get_learner_course_active_order_ids
+	} // end get_learner_course_active_order_ids
 
-    /**
-     * Output WooCommerce specific course filters
-     * Removing the paged argument
-     *
-     * @since 1.9.0
-     * @param $filter_links
-     * @return mixed
-     */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+	/**
+	 * Output WooCommerce specific course filters
+	 * Removing the paged argument
+	 *
+	 * @since 1.9.0
+	 * @param $filter_links
+	 * @return mixed
+	 */
+	public static function add_course_archive_wc_filter_links( $filter_links ){
 
-        $course_url = remove_query_arg('paged', WooThemes_Sensei_Utils::get_current_url() );
+		$course_url = remove_query_arg('paged', WooThemes_Sensei_Utils::get_current_url() );
 
-        $free_courses = self::get_free_courses();
-        $paid_courses = self::get_paid_courses();
+		$free_courses = self::get_free_courses();
+		$paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
-            // do not show any WooCommerce filters if all courses are
-            // free or if all courses are paid
-            return $filter_links;
+		if ( empty( $free_courses ) || empty( $paid_courses )  ){
+			// do not show any WooCommerce filters if all courses are
+			// free or if all courses are paid
+			return $filter_links;
 
-        }
+		}
 
-        $filter_links[] = array(    'id'=>'paid' ,
-                                    'url'=> add_query_arg('course_filter', 'paid', $course_url),
-                                    'title'=>__( 'Paid', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(    'id'=>'paid' ,
+									'url'=> add_query_arg('course_filter', 'paid', $course_url),
+									'title'=>__( 'Paid', 'woothemes-sensei' )
+		);
 
-        $filter_links[] = array(    'id'=>'free',
-                                    'url'=>add_query_arg('course_filter', 'free', $course_url),
-                                    'title'=>__( 'Free', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(    'id'=>'free',
+									'url'=>add_query_arg('course_filter', 'free', $course_url),
+									'title'=>__( 'Free', 'woothemes-sensei' )
+		);
 
-        return $filter_links;
+		return $filter_links;
 
-    }// end add_course_archive_wc_filter_links
+	}// end add_course_archive_wc_filter_links
 
-    /**
-     * Apply the free filter the the course query
-     * getting all course with no products or products with zero price
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_free( $query ){
+	/**
+	 * Apply the free filter the the course query
+	 * getting all course with no products or products with zero price
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_free( $query ){
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+		if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
 
-            // setup the course meta query
-            $meta_query = self::get_free_courses_meta_query_args();
+			// setup the course meta query
+			$meta_query = self::get_free_courses_meta_query_args();
 
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
 
-            // don't show any paid courses
-            $courses = self::get_paid_courses();
-            $ids = array();
-            foreach( $courses as $course ){
-                $ids[] = $course->ID;
-            }
-            $query->set( 'post__not_in', $ids );
+			// don't show any paid courses
+			$courses = self::get_paid_courses();
+			$ids = array();
+			foreach( $courses as $course ){
+				$ids[] = $course->ID;
+			}
+			$query->set( 'post__not_in', $ids );
 
-        }// end if course_filter
+		}// end if course_filter
 
-        return $query;
+		return $query;
 
-    }// course_archive_wc_filter_free
+	}// course_archive_wc_filter_free
 
-    /**
-     * Apply the paid filter to the course query on the courses page
-     * will include all course with a product attached with a price
-     * more than 0
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_paid( $query ){
+	/**
+	 * Apply the paid filter to the course query on the courses page
+	 * will include all course with a product attached with a price
+	 * more than 0
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_paid( $query ){
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+		if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query() ){
 
-            // setup the course meta query
-            $meta_query = self::get_paid_courses_meta_query_args();
+			// setup the course meta query
+			$meta_query = self::get_paid_courses_meta_query_args();
 
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
-
-        }
-
-        return $query;
-
-    }
-
-    /**
-     * Load the WooCommerce single product actions above
-     * single courses if woocommerce is active allowing purchase
-     * information and actions to be hooked from WooCommerce.
-     */
-    public static function do_single_course_wc_single_product_action(){
-
-        /**
-         * this hooks is documented within the WooCommerce plugin.
-         */
-        if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-
-            do_action( 'woocommerce_before_single_product' );
-
-        } // End If Statement
-
-    }// end do_single_course_wc_single_product_action
-
-    /**
-     * Hooking into the single lesson page to alter the
-     * user access permissions based on if they have purchased the
-     * course the lesson belongs to.
-     *
-     * This function will only return false or the passed in user_access value.
-     * It doesn't return true in order to avoid altering other options.
-     *
-     * @since 1.9.0
-     *
-     * @param $can_user_view_lesson
-     * @param $lesson_id
-     * @param $user_id
-     * @return bool
-     */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
-
-        // check if the course has a valid product attached to it
-        // which the user should have purchased if they want to access
-        // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
-
-            // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
-
-            // product has a successful order so this user may access the content
-            // this function may only return false or the default
-            // returning true may override other negatives which we don't want
-            if( ! $order_id ){
-
-                return false;
-
-            }
-
-        }
-
-        // return the passed in value
-        return $can_user_view_lesson;
-
-    }
-
-    /**
-     * Add course link to order thank you and details pages.
-     *
-     * @since  1.4.5
-     * @access public
-     *
-     * @return void
-     */
-    public static function course_link_from_order( ) {
-
-        if( ! is_order_received_page() ){
-            return;
-        }
-
-        $order_id = get_query_var( 'order-received' );
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
+
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * Load the WooCommerce single product actions above
+	 * single courses if woocommerce is active allowing purchase
+	 * information and actions to be hooked from WooCommerce.
+	 */
+	public static function do_single_course_wc_single_product_action(){
+
+		/**
+		 * this hooks is documented within the WooCommerce plugin.
+		 */
+		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+
+			do_action( 'woocommerce_before_single_product' );
+
+		} // End If Statement
+
+	}// end do_single_course_wc_single_product_action
+
+	/**
+	 * Hooking into the single lesson page to alter the
+	 * user access permissions based on if they have purchased the
+	 * course the lesson belongs to.
+	 *
+	 * This function will only return false or the passed in user_access value.
+	 * It doesn't return true in order to avoid altering other options.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $can_user_view_lesson
+	 * @param $lesson_id
+	 * @param $user_id
+	 * @return bool
+	 */
+	public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+
+		// check if the course has a valid product attached to it
+		// which the user should have purchased if they want to access
+		// the current lesson
+		$course_id = get_post_meta( $lesson_id , '_lesson_course', true);
+		$wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
+		if( isset ($product) && is_object($product) ){
+
+			// valid product found
+			$order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+
+			// product has a successful order so this user may access the content
+			// this function may only return false or the default
+			// returning true may override other negatives which we don't want
+			if( ! $order_id ){
+
+				return false;
+
+			}
+
+		}
+
+		// return the passed in value
+		return $can_user_view_lesson;
+
+	}
+
+	/**
+	 * Add course link to order thank you and details pages.
+	 *
+	 * @since  1.4.5
+	 * @access public
+	 *
+	 * @return void
+	 */
+	public static function course_link_from_order( ) {
+
+		if( ! is_order_received_page() ){
+			return;
+		}
+
+		$order_id = get_query_var( 'order-received' );
 		$order = new WC_Order( $order_id );
 
 		// exit early if not wc-completed or wc-processing
 		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
 
-        $course_links = array(); // store the for links for courses purchased
+		$course_links = array(); // store the for links for courses purchased
 		foreach ( $order->get_items() as $item ) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                // If item has variation_id then its a variation of the product
-                $item_id = $item['variation_id'];
+				// If item has variation_id then its a variation of the product
+				$item_id = $item['variation_id'];
 
-            } else {
+			} else {
 
-                //If not its real product set its id to item_id
-                $item_id = $item['product_id'];
+				//If not its real product set its id to item_id
+				$item_id = $item['product_id'];
 
-            } // End If Statement
+			} // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+			$user_id = get_post_meta( $order->id, '_customer_user', true );
 
-            if( $user_id ) {
+			if( $user_id ) {
 
-                // Get all courses for product
-                $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
-                            'key' => '_course_woocommerce_product',
-                            'value' => $item_id
-                        ) );
-                $args['orderby'] = 'menu_order date';
-                $args['order'] = 'ASC';
+				// Get all courses for product
+				$args = Sensei_Course::get_default_query_args();
+				$args['meta_query'] = array( array(
+							'key' => '_course_woocommerce_product',
+							'value' => $item_id
+						) );
+				$args['orderby'] = 'menu_order date';
+				$args['order'] = 'ASC';
 
-                // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+				// loop through courses
+				$courses = get_posts( $args );
+				if( $courses && count( $courses ) > 0 ) {
 
-                    foreach( $courses as $course ) {
+					foreach( $courses as $course ) {
 
-                        $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+						$title = $course->post_title;
+						$permalink = get_permalink( $course->ID );
+						$course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
 
-                    } // end for each
+					} // end for each
 
-                    // close the message div
+					// close the message div
 
-                }// end if $courses check
-            }
-        }// end loop through orders
+				}// end if $courses check
+			}
+		}// end loop through orders
 
-        // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+		// add the courses to the WooCommerce notice
+		if( ! empty( $course_links) ){
 
-            $courses_html = _nx(
-                'You have purchased the following course:',
-                'You have purchased the following courses:',
-                count( $course_links ),
-                'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
-            );
+			$courses_html = _nx(
+				'You have purchased the following course:',
+				'You have purchased the following courses:',
+				count( $course_links ),
+				'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
+			);
 
-            foreach( $course_links as $link ){
+			foreach( $course_links as $link ){
 
-                $courses_html .= '<li>' . $link . '</li>';
+				$courses_html .= '<li>' . $link . '</li>';
 
-            }
+			}
 
-            $courses_html .= ' </ul>';
+			$courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
-        }
+			wc_add_notice( $courses_html, 'success' );
+		}
 
 	} // end course_link_order_form
 
-    /**
-     * Show the message that a user should complete
-     * their purchase if the course is in the cart
-     *
-     * This should be used within the course loop or single course page
-     *
-     * @since 1.9.0
-     */
-    public static function course_in_cart_message(){
+	/**
+	 * Show the message that a user should complete
+	 * their purchase if the course is in the cart
+	 *
+	 * This should be used within the course loop or single course page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_in_cart_message(){
 
-        global $post;
+		global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+		if( self::is_course_in_cart( $post->ID ) ){ ?>
 
             <div class="sensei-message info">'
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+				$cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
+							  . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
+							  . __('complete the purchase', 'woothemes-sensei') . '</a>';
 
-                sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+				sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
 
-                ?>
+				?>
             </div>
         <?php }
 
-    } // End sensei_woocommerce_in_cart_message()
+	} // End sensei_woocommerce_in_cart_message()
 
-    /**
-     * Checks the cart to see if a course is in the cart.
-     *
-     * @param $course_id
-     * @return bool
-     */
-    public static function is_course_in_cart( $course_id ){
-
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = WooThemes_Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
-
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
-
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
-
-                return true;
-
-            }
-
-        }
-
-        return false;
-
-    }// is_course_in_cart
-
-    /**
-     * Check the cart to see if the product is in the cart
-     *
-     * @param $product_id
-     * @return bool
-     */
-    public static function is_product_in_cart( $product_id ){
-
-        if ( 0 < $product_id ) {
-
-            $product = wc_get_product( $product_id );
-
-            $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
-                $wc_product_id = $product->parent->id;
-            }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
-
-                $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
-
-                    return true;
-
-                }
-
-            }
-        } // End If Statement
-
-        return false;
-
-    } // end is_product_in_car
-
-    /**
-     * Get all free WooCommerce products
-     *
-     * @since 1.9.0
-     *
-     * @return array $free_products{
-     *  @type int $wp_post_id
-     * }
-     */
-    public static function get_free_product_ids(){
-
-        return  get_posts( array(
-            'post_type' => 'product',
-            'posts_per_page' => '1000',
-            'fields' => 'ids',
-            'meta_query'=> array(
-                'relation' => 'OR',
-                array(
-                    'key'=> '_regular_price',
-                    'value' => 0,
-                ),
-                array(
-                    'key'=> '_sale_price',
-                    'value' => 0,
-                ),
-            ),
-        ));
-
-    }// end get free product query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_meta_query_param
-     */
-    public static function get_free_courses_meta_query_args(){
-
-        return array(
-            'relation' => 'OR',
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => '-',
-                'compare' => '=',
-            ),
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => self::get_free_product_ids(),
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_query_meta_query_args_param
-     */
-    public static function get_paid_courses_meta_query_args(){
-
-        $paid_product_ids = self::get_paid_product_ids();
-
-        return array(
-            array(
-                'key'     => '_course_woocommerce_product',
-                // when empty we give a false post_id to ensure the caller doesn't get any courses for their
-                // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The WordPress Query args
-     * for paid products on sale
-     *
-     * @since 1.9.0
-     * @return array $product_query_args
-     */
-    public static function get_paid_products_on_sale_query_args(){
-
-        $args = array(
-                   'post_type' 		=> 'product',
-                   'posts_per_page' 		=> 1000,
-                   'orderby'         	=> 'date',
-                   'order'           	=> 'DESC',
-                   'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-        );
-
-        return $args;
-
-    } // get_paid_products_on_sale_query_args
-
-
-    /**
-     * Return the WordPress query args for
-     * products not on sale but that is not a free
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_paid_products_not_on_sale_query_args(){
-
-        $args = array(
-            'post_type' 		=> 'product',
-            'posts_per_page' 		=> 1000,
-            'orderby'         	=> 'date',
-            'order'           	=> 'DESC',
-            'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '=',
-                'value' => '',
-            ),
-        );
-
-        return $args;
-
-
-    } // get_paid_courses_meta_query
-
-    /**
-     * Get all WooCommerce non-free product id's
-     *
-     * @since 1.9.0
-     *
-     * @return array $woocommerce_paid_product_ids
-     */
-    public static function get_paid_product_ids(){
-
-        // get all the paid WooCommerce products that has regular
-        // and sale price greater than 0
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
-
-        // get all the paid WooCommerce products that has regular price
-        // greater than 0 without a sale price
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
-
-        // combine products ID's with regular and sale price grater than zero and those without
-        // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
-
-        // if
-        if( empty($woocommerce_paid_product_ids) ){
-            return array( );
-        }
-        return $woocommerce_paid_product_ids;
-
-    }
-
-    /**
-     * Get all free courses.
-     *
-     * This course that have a WC product attached
-     * that has a price or sale price of zero and
-     * other courses with no WooCommerce products
-     * attached.
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_free_courses(){
-
-        $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
-
-        // don't show any paid courses
-        $courses = self::get_paid_courses();
-        $ids = array();
-        foreach( $courses as $course ){
-            $ids[] = $course->ID;
-        }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
-
-        return get_posts( $free_course_query_args );
-
-    }
-
-    /**
-     * Return all products that are not free
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_paid_courses(){
-
-        $paid_course_query_args = Sensei_Course::get_default_query_args();
-
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
-
-        return get_posts(  $paid_course_query_args );
-    }
-
-    /**
-     * Show the WooCommerce add to cart button for the  current course
-     *
-     * The function will only show the button if
-     * 1- the user can buy the course
-     * 2- if they have completed their pre-requisite
-     * 3- if the course has a valid product attached
-     *
-     * @since 1.9.0
-     * @param int $course_id
-     * @return string $html markup for the button or nothing if user not allowed to buy
-     */
-    public static function the_add_to_cart_button_html( $course_id ){
-
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
-            return '';
-        }
-
-        $wc_post_id = self::get_course_product_id( $course_id );
-
-        // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        // based on simple.php in WC templates/single-product/add-to-cart/
-        // Get the product
-        $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
-
-        // do not show the button for invalid products, non purchasable products, out
-        // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
-            || ! $product->is_purchasable()
-            || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        //
-        // button  output:
-        //
-        ?>
+	/**
+	 * Checks the cart to see if a course is in the cart.
+	 *
+	 * @param $course_id
+	 * @return bool
+	 */
+	public static function is_course_in_cart( $course_id ){
+
+		$wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
+		$user_course_status_id = WooThemes_Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+
+		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+
+			if ( self::is_product_in_cart( $wc_post_id ) ) {
+
+				return true;
+
+			}
+
+		}
+
+		return false;
+
+	}// is_course_in_cart
+
+	/**
+	 * Check the cart to see if the product is in the cart
+	 *
+	 * @param $product_id
+	 * @return bool
+	 */
+	public static function is_product_in_cart( $product_id ){
+
+		if ( 0 < $product_id ) {
+
+			$product = wc_get_product( $product_id );
+
+			$parent_id = '';
+			if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+				$wc_product_id = $product->parent->id;
+			}
+			foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+
+				$cart_product = $values['data'];
+				if( $product_id == $cart_product->id ) {
+
+					return true;
+
+				}
+
+			}
+		} // End If Statement
+
+		return false;
+
+	} // end is_product_in_car
+
+	/**
+	 * Get all free WooCommerce products
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $free_products{
+	 *  @type int $wp_post_id
+	 * }
+	 */
+	public static function get_free_product_ids(){
+
+		return  get_posts( array(
+			'post_type' => 'product',
+			'posts_per_page' => '1000',
+			'fields' => 'ids',
+			'meta_query'=> array(
+				'relation' => 'OR',
+				array(
+					'key'=> '_regular_price',
+					'value' => 0,
+				),
+				array(
+					'key'=> '_sale_price',
+					'value' => 0,
+				),
+			),
+		));
+
+	}// end get free product query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_meta_query_param
+	 */
+	public static function get_free_courses_meta_query_args(){
+
+		return array(
+			'relation' => 'OR',
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => '-',
+				'compare' => '=',
+			),
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => self::get_free_product_ids(),
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_query_meta_query_args_param
+	 */
+	public static function get_paid_courses_meta_query_args(){
+
+		$paid_product_ids = self::get_paid_product_ids();
+
+		return array(
+			array(
+				'key'     => '_course_woocommerce_product',
+				// when empty we give a false post_id to ensure the caller doesn't get any courses for their
+				// query
+				'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The WordPress Query args
+	 * for paid products on sale
+	 *
+	 * @since 1.9.0
+	 * @return array $product_query_args
+	 */
+	public static function get_paid_products_on_sale_query_args(){
+
+		$args = array(
+				   'post_type' 		=> 'product',
+				   'posts_per_page' 		=> 1000,
+				   'orderby'         	=> 'date',
+				   'order'           	=> 'DESC',
+				   'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+		);
+
+		return $args;
+
+	} // get_paid_products_on_sale_query_args
+
+
+	/**
+	 * Return the WordPress query args for
+	 * products not on sale but that is not a free
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_paid_products_not_on_sale_query_args(){
+
+		$args = array(
+			'post_type' 		=> 'product',
+			'posts_per_page' 		=> 1000,
+			'orderby'         	=> 'date',
+			'order'           	=> 'DESC',
+			'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '=',
+				'value' => '',
+			),
+		);
+
+		return $args;
+
+
+	} // get_paid_courses_meta_query
+
+	/**
+	 * Get all WooCommerce non-free product id's
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $woocommerce_paid_product_ids
+	 */
+	public static function get_paid_product_ids(){
+
+		// get all the paid WooCommerce products that has regular
+		// and sale price greater than 0
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+
+		// get all the paid WooCommerce products that has regular price
+		// greater than 0 without a sale price
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+
+		// combine products ID's with regular and sale price grater than zero and those without
+		// sale but regular price greater than zero
+		$woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+
+		// if
+		if( empty($woocommerce_paid_product_ids) ){
+			return array( );
+		}
+		return $woocommerce_paid_product_ids;
+
+	}
+
+	/**
+	 * Get all free courses.
+	 *
+	 * This course that have a WC product attached
+	 * that has a price or sale price of zero and
+	 * other courses with no WooCommerce products
+	 * attached.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_free_courses(){
+
+		$free_course_query_args = Sensei_Course::get_default_query_args();
+		$free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+
+		// don't show any paid courses
+		$courses = self::get_paid_courses();
+		$ids = array();
+		foreach( $courses as $course ){
+			$ids[] = $course->ID;
+		}
+		$free_course_query_args[ 'post__not_in' ] =  $ids;
+
+		return get_posts( $free_course_query_args );
+
+	}
+
+	/**
+	 * Return all products that are not free
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_paid_courses(){
+
+		$paid_course_query_args = Sensei_Course::get_default_query_args();
+
+		$paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+
+		return get_posts(  $paid_course_query_args );
+	}
+
+	/**
+	 * Show the WooCommerce add to cart button for the  current course
+	 *
+	 * The function will only show the button if
+	 * 1- the user can buy the course
+	 * 2- if they have completed their pre-requisite
+	 * 3- if the course has a valid product attached
+	 *
+	 * @since 1.9.0
+	 * @param int $course_id
+	 * @return string $html markup for the button or nothing if user not allowed to buy
+	 */
+	public static function the_add_to_cart_button_html( $course_id ){
+
+		if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+			return '';
+		}
+
+		$wc_post_id = self::get_course_product_id( $course_id );
+
+		// Check if customer purchased the product
+		if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
+			|| empty( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		// based on simple.php in WC templates/single-product/add-to-cart/
+		// Get the product
+		$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+
+		// do not show the button for invalid products, non purchasable products, out
+		// of stock product or if course is already in cart
+		if ( ! isset ( $product )
+			|| ! is_object( $product )
+			|| ! $product->is_purchasable()
+			|| ! $product->is_in_stock()
+			|| self::is_course_in_cart( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		//
+		// button  output:
+		//
+		?>
 
         <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
               class="cart"
@@ -754,54 +754,54 @@ 
         </form>
 
         <?php
-    } // end the_add_to_cart_button_html
+	} // end the_add_to_cart_button_html
 
-    /**
-     * Alter the no permissions message on the single course page
-     * Changes the message to a WooCommerce specific message.
-     *
-     * @since 1.9.0
-     *
-     * @param $message
-     * @param $post_id
-     *
-     * @return string $message
-     */
-    public static function alter_no_permissions_message( $message, $post_id ){
+	/**
+	 * Alter the no permissions message on the single course page
+	 * Changes the message to a WooCommerce specific message.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $message
+	 * @param $post_id
+	 *
+	 * @return string $message
+	 */
+	public static function alter_no_permissions_message( $message, $post_id ){
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
-            return  $message;
-        }
+		if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+			return  $message;
+		}
 
-        $product_id = self::get_course_product_id( $post_id );
+		$product_id = self::get_course_product_id( $post_id );
 
-        if( ! $product_id
-            || self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+		if( ! $product_id
+			|| self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
 
-            return $message;
+			return $message;
 
-        }
+		}
 
-        ob_start();
-        self::the_course_no_permissions_message( $post_id );
-        $woocommerce_course_no_permissions_message = ob_get_clean();
+		ob_start();
+		self::the_course_no_permissions_message( $post_id );
+		$woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+		return $woocommerce_course_no_permissions_message ;
 
-    }
-    /**
-     * Show the no permissions message when a user is logged in
-     * and have not yet purchased the current course
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_no_permissions_message( $course_id ){
+	}
+	/**
+	 * Show the no permissions message when a user is logged in
+	 * and have not yet purchased the current course
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_no_permissions_message( $course_id ){
 
-        // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-        $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+		// login link
+		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
 
-        ?>
+		?>
 
         <span class="add-to-cart-login">
             <?php echo sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); ?>
@@ -809,110 +809,110 @@ 
 
     <?php }
 
-    /**
-     * Checks if a user has bought a product item.
-     *
-     * @since  1.9.0
-     *
-     * @param  int $user_id
-     * @param  int $product_id
-     *
-     * @return bool
-     */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+	/**
+	 * Checks if a user has bought a product item.
+	 *
+	 * @since  1.9.0
+	 *
+	 * @param  int $user_id
+	 * @param  int $product_id
+	 *
+	 * @return bool
+	 */
+	public static function has_customer_bought_product ( $user_id, $product_id ){
 
-        $orders = get_posts( array(
-            'posts_per_page' => -1,
-            'meta_key'    => '_customer_user',
-            'meta_value'  => intval( $user_id ),
-            'post_type'   => 'shop_order',
-            'post_status' =>  array( 'wc-processing', 'wc-completed' ),
-        ) );
+		$orders = get_posts( array(
+			'posts_per_page' => -1,
+			'meta_key'    => '_customer_user',
+			'meta_value'  => intval( $user_id ),
+			'post_type'   => 'shop_order',
+			'post_status' =>  array( 'wc-processing', 'wc-completed' ),
+		) );
 
-        foreach ( $orders as $order_id ) {
+		foreach ( $orders as $order_id ) {
 
-            $order = new WC_Order( $order_id->ID );
+			$order = new WC_Order( $order_id->ID );
 
-            if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
+			if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
 
-                continue;
-            }
+				continue;
+			}
 
-            if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
+			if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
 
-                continue;
+				continue;
 
-            }
+			}
 
-            foreach( $order->get_items() as $item ) {
+			foreach( $order->get_items() as $item ) {
 
-                // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+				// Check if user has bought product
+				if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
 
-                    // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
-                        if( $sub_key ) {
-                            $sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
-                                    return true;
-                                } else {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
+					// Check if user has an active subscription for product
+					if( class_exists( 'WC_Subscriptions_Manager' ) ) {
+						$sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
+						if( $sub_key ) {
+							$sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
+							if( $sub && isset( $sub['status'] ) ) {
+								if( 'active' == $sub['status'] ) {
+									return true;
+								} else {
+									return false;
+								}
+							}
+						}
+					}
 
-                    // Customer has bought product
-                    return true;
-                } // End If Statement
+					// Customer has bought product
+					return true;
+				} // End If Statement
 
-            } // End For each item
+			} // End For each item
 
-        } // End For each order
+		} // End For each order
 
-    } // end has customer bought product
+	} // end has customer bought product
 
-    /**
-     * Return the product id for the given course
-     *
-     * @since 1.9.0
-     *
-     * @param int $course_id
-     *
-     * @return string $woocommerce_product_id or false if none exist
-     *
-     */
-    public static function get_course_product_id( $course_id ){
+	/**
+	 * Return the product id for the given course
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int $course_id
+	 *
+	 * @return string $woocommerce_product_id or false if none exist
+	 *
+	 */
+	public static function get_course_product_id( $course_id ){
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
-            return false;
-        }
+		if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+			return false;
+		}
 
-        return $product_id;
+		return $product_id;
 
-    }
+	}
 
-    /**
-     * Alter the body classes adding WooCommerce to the body
-     *
-     * @param array $classes
-     * @return array
-     */
-    public static function add_woocommerce_body_class( $classes ){
+	/**
+	 * Alter the body classes adding WooCommerce to the body
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public static function add_woocommerce_body_class( $classes ){
 
-        if( ! in_array( 'woocommerce', $classes ) ){
+		if( ! in_array( 'woocommerce', $classes ) ){
 
-            $classes[] ='woocommerce';
+			$classes[] ='woocommerce';
 
-        }
+		}
 
 
-        return $classes;
+		return $classes;
 
-    }
+	}
 
 }// end Sensei_WC

Spacing +160 added lines, -160 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 
 /**
  * Sensei WooCommerce class
@@ -11,15 +11,15 @@ 
  * @since 1.9.0
  */
 
-Class Sensei_WC{
+Class Sensei_WC {
     /**
      * Load the files needed for the woocommerce integration.
      *
      * @since 1.9.0
      */
-    public static function load_woocommerce_integration_hooks(){
+    public static function load_woocommerce_integration_hooks() {
 
-        require_once( __DIR__ . '/hooks/woocommerce.php' );
+        require_once(__DIR__.'/hooks/woocommerce.php');
 
     }
     /**
@@ -28,17 +28,17 @@ 
      * @since 1.9.0
      * @return bool
      */
-    public static function is_woocommerce_active(){
+    public static function is_woocommerce_active() {
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+        $active_plugins = (array) get_option('active_plugins', array());
 
-        if ( is_multisite() ){
+        if (is_multisite()) {
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
 
         }
 
-        return in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+        return in_array('woocommerce/woocommerce.php', $active_plugins) || array_key_exists('woocommerce/woocommerce.php', $active_plugins);
 
     } // end is_woocommerce_active
 
@@ -51,48 +51,48 @@ 
      * @param $course_id
      * @return array $user_course_orders
      */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+    public static function get_learner_course_active_order_id($user_id, $course_id) {
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        $orders_query = new WP_Query( array(
+        $orders_query = new WP_Query(array(
             'post_type'   => 'shop_order',
             'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
+            'post_status' => array('wc-processing', 'wc-completed'),
             'meta_key'=> '_customer_user',
             'meta_value'=> $user_id,
-        ) );
+        ));
 
-        if( $orders_query->post_count == 0 ){
+        if ($orders_query->post_count == 0) {
 
             return false;
 
         }
 
-        foreach( $orders_query->get_posts() as $order ){
+        foreach ($orders_query->get_posts() as $order) {
 
-            $order = new WC_Order( $order->ID );
+            $order = new WC_Order($order->ID);
             $items = $order->get_items();
 
-            $user_orders =  array();
+            $user_orders = array();
 
-            foreach( $items as $item ){
+            foreach ($items as $item) {
 
                 // if the product id on the order and the one given to this function
                 // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+                $product = wc_get_product($item['product_id']);
 
-                if ( $product->is_type( 'variable' )) {
+                if ($product->is_type('variable')) {
 
                     $item_product_id = $item['variation_id'];
 
                 } else {
 
-                    $item_product_id =  $item['product_id'];
+                    $item_product_id = $item['product_id'];
 
                 }
 
-                if( $course_product_id == $item_product_id ){
+                if ($course_product_id == $item_product_id) {
 
                     return $order->id;
 
@@ -116,28 +116,28 @@ 
      * @param $filter_links
      * @return mixed
      */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+    public static function add_course_archive_wc_filter_links($filter_links) {
 
-        $course_url = remove_query_arg('paged', WooThemes_Sensei_Utils::get_current_url() );
+        $course_url = remove_query_arg('paged', WooThemes_Sensei_Utils::get_current_url());
 
         $free_courses = self::get_free_courses();
         $paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
+        if (empty($free_courses) || empty($paid_courses)) {
             // do not show any WooCommerce filters if all courses are
             // free or if all courses are paid
             return $filter_links;
 
         }
 
-        $filter_links[] = array(    'id'=>'paid' ,
+        $filter_links[] = array('id'=>'paid',
                                     'url'=> add_query_arg('course_filter', 'paid', $course_url),
-                                    'title'=>__( 'Paid', 'woothemes-sensei' )
+                                    'title'=>__('Paid', 'woothemes-sensei')
         );
 
-        $filter_links[] = array(    'id'=>'free',
+        $filter_links[] = array('id'=>'free',
                                     'url'=>add_query_arg('course_filter', 'free', $course_url),
-                                    'title'=>__( 'Free', 'woothemes-sensei' )
+                                    'title'=>__('Free', 'woothemes-sensei')
         );
 
         return $filter_links;
@@ -154,24 +154,24 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_free( $query ){
+    public static function course_archive_wc_filter_free($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+        if (isset($_GET['course_filter']) && 'free' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_free_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
             // don't show any paid courses
             $courses = self::get_paid_courses();
             $ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
                 $ids[] = $course->ID;
             }
-            $query->set( 'post__not_in', $ids );
+            $query->set('post__not_in', $ids);
 
         }// end if course_filter
 
@@ -190,16 +190,16 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_paid( $query ){
+    public static function course_archive_wc_filter_paid($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+        if (isset($_GET['course_filter']) && 'paid' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_paid_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
         }
 
@@ -212,14 +212,14 @@ 
      * single courses if woocommerce is active allowing purchase
      * information and actions to be hooked from WooCommerce.
      */
-    public static function do_single_course_wc_single_product_action(){
+    public static function do_single_course_wc_single_product_action() {
 
         /**
          * this hooks is documented within the WooCommerce plugin.
          */
-        if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+        if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
 
-            do_action( 'woocommerce_before_single_product' );
+            do_action('woocommerce_before_single_product');
 
         } // End If Statement
 
@@ -240,23 +240,23 @@ 
      * @param $user_id
      * @return bool
      */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+    public static function alter_can_user_view_lesson($can_user_view_lesson, $lesson_id, $user_id) {
 
         // check if the course has a valid product attached to it
         // which the user should have purchased if they want to access
         // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
+        $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
         $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
+        if (isset ($product) && is_object($product)) {
 
             // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+            $order_id = self::get_learner_course_active_order_id($user_id, $course_id);
 
             // product has a successful order so this user may access the content
             // this function may only return false or the default
             // returning true may override other negatives which we don't want
-            if( ! $order_id ){
+            if ( ! $order_id) {
 
                 return false;
 
@@ -279,23 +279,23 @@ 
      */
     public static function course_link_from_order( ) {
 
-        if( ! is_order_received_page() ){
+        if ( ! is_order_received_page()) {
             return;
         }
 
-        $order_id = get_query_var( 'order-received' );
-		$order = new WC_Order( $order_id );
+        $order_id = get_query_var('order-received');
+		$order = new WC_Order($order_id);
 
 		// exit early if not wc-completed or wc-processing
-		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+		if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
         $course_links = array(); // store the for links for courses purchased
-		foreach ( $order->get_items() as $item ) {
+		foreach ($order->get_items() as $item) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+            if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                 // If item has variation_id then its a variation of the product
                 $item_id = $item['variation_id'];
@@ -307,28 +307,28 @@ 
 
             } // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+            $user_id = get_post_meta($order->id, '_customer_user', true);
 
-            if( $user_id ) {
+            if ($user_id) {
 
                 // Get all courses for product
                 $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
+                $args['meta_query'] = array(array(
                             'key' => '_course_woocommerce_product',
                             'value' => $item_id
-                        ) );
+                        ));
                 $args['orderby'] = 'menu_order date';
                 $args['order'] = 'ASC';
 
                 // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+                $courses = get_posts($args);
+                if ($courses && count($courses) > 0) {
 
-                    foreach( $courses as $course ) {
+                    foreach ($courses as $course) {
 
                         $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+                        $permalink = get_permalink($course->ID);
+                        $course_links[] .= '<a href="'.esc_url($permalink).'" >'.$title.'</a> ';
 
                     } // end for each
 
@@ -339,24 +339,24 @@ 
         }// end loop through orders
 
         // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+        if ( ! empty($course_links)) {
 
             $courses_html = _nx(
                 'You have purchased the following course:',
                 'You have purchased the following courses:',
-                count( $course_links ),
+                count($course_links),
                 'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
             );
 
-            foreach( $course_links as $link ){
+            foreach ($course_links as $link) {
 
-                $courses_html .= '<li>' . $link . '</li>';
+                $courses_html .= '<li>'.$link.'</li>';
 
             }
 
             $courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
+            wc_add_notice($courses_html, 'success');
         }
 
 	} // end course_link_order_form
@@ -369,20 +369,20 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_in_cart_message(){
+    public static function course_in_cart_message() {
 
         global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+        if (self::is_course_in_cart($post->ID)) { ?>
 
             <div class="sensei-message info">'
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+                $cart_link = '<a class="cart-complete" href="'.WC()->cart->get_checkout_url()
+                              . '" title="'.__('complete purchase', 'woothemes-sensei').'">'
+                              . __('complete the purchase', 'woothemes-sensei').'</a>';
 
-                sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+                sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link);
 
                 ?>
             </div>
@@ -396,14 +396,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_course_in_cart( $course_id ){
+    public static function is_course_in_cart($course_id) {
 
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = WooThemes_Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+        $wc_post_id = absint(get_post_meta($course_id, '_course_woocommerce_product', true));
+        $user_course_status_id = WooThemes_Sensei_Utils::user_started_course($course_id, get_current_user_id());
 
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+        if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
+            if (self::is_product_in_cart($wc_post_id)) {
 
                 return true;
 
@@ -421,20 +421,20 @@ 
      * @param $product_id
      * @return bool
      */
-    public static function is_product_in_cart( $product_id ){
+    public static function is_product_in_cart($product_id) {
 
-        if ( 0 < $product_id ) {
+        if (0 < $product_id) {
 
-            $product = wc_get_product( $product_id );
+            $product = wc_get_product($product_id);
 
             $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+            if (isset($product->variation_id) && 0 < intval($product->variation_id)) {
                 $wc_product_id = $product->parent->id;
             }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+            foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
 
                 $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
+                if ($product_id == $cart_product->id) {
 
                     return true;
 
@@ -456,9 +456,9 @@ 
      *  @type int $wp_post_id
      * }
      */
-    public static function get_free_product_ids(){
+    public static function get_free_product_ids() {
 
-        return  get_posts( array(
+        return  get_posts(array(
             'post_type' => 'product',
             'posts_per_page' => '1000',
             'fields' => 'ids',
@@ -483,7 +483,7 @@ 
      * @since 1.9.0
      * @return array $wp_meta_query_param
      */
-    public static function get_free_courses_meta_query_args(){
+    public static function get_free_courses_meta_query_args() {
 
         return array(
             'relation' => 'OR',
@@ -507,7 +507,7 @@ 
      * @since 1.9.0
      * @return array $wp_query_meta_query_args_param
      */
-    public static function get_paid_courses_meta_query_args(){
+    public static function get_paid_courses_meta_query_args() {
 
         $paid_product_ids = self::get_paid_product_ids();
 
@@ -516,7 +516,7 @@ 
                 'key'     => '_course_woocommerce_product',
                 // when empty we give a false post_id to ensure the caller doesn't get any courses for their
                 // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+                'value' => empty($paid_product_ids) ? '-1000' : $paid_product_ids,
                 'compare' => 'IN',
             ),
         );
@@ -530,7 +530,7 @@ 
      * @since 1.9.0
      * @return array $product_query_args
      */
-    public static function get_paid_products_on_sale_query_args(){
+    public static function get_paid_products_on_sale_query_args() {
 
         $args = array(
                    'post_type' 		=> 'product',
@@ -540,9 +540,9 @@ 
                    'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
+        $args['fields']     = 'ids';
 
-        $args[ 'meta_query' ] = array(
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -569,7 +569,7 @@ 
      *
      * @return array
      */
-    public static function get_paid_products_not_on_sale_query_args(){
+    public static function get_paid_products_not_on_sale_query_args() {
 
         $args = array(
             'post_type' 		=> 'product',
@@ -579,8 +579,8 @@ 
             'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
+        $args['fields']     = 'ids';
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -606,24 +606,24 @@ 
      *
      * @return array $woocommerce_paid_product_ids
      */
-    public static function get_paid_product_ids(){
+    public static function get_paid_product_ids() {
 
         // get all the paid WooCommerce products that has regular
         // and sale price greater than 0
         // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+        $paid_product_ids_with_sale = get_posts(self::get_paid_products_on_sale_query_args());
 
         // get all the paid WooCommerce products that has regular price
         // greater than 0 without a sale price
         // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+        $paid_product_ids_without_sale = get_posts(self::get_paid_products_not_on_sale_query_args());
 
         // combine products ID's with regular and sale price grater than zero and those without
         // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+        $woocommerce_paid_product_ids = array_merge($paid_product_ids_with_sale, $paid_product_ids_without_sale);
 
         // if
-        if( empty($woocommerce_paid_product_ids) ){
+        if (empty($woocommerce_paid_product_ids)) {
             return array( );
         }
         return $woocommerce_paid_product_ids;
@@ -642,20 +642,20 @@ 
      *
      * @return array
      */
-    public static function get_free_courses(){
+    public static function get_free_courses() {
 
         $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+        $free_course_query_args['meta_query'] = self::get_free_courses_meta_query_args();
 
         // don't show any paid courses
         $courses = self::get_paid_courses();
         $ids = array();
-        foreach( $courses as $course ){
+        foreach ($courses as $course) {
             $ids[] = $course->ID;
         }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
+        $free_course_query_args['post__not_in'] = $ids;
 
-        return get_posts( $free_course_query_args );
+        return get_posts($free_course_query_args);
 
     }
 
@@ -665,13 +665,13 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_paid_courses(){
+    public static function get_paid_courses() {
 
         $paid_course_query_args = Sensei_Course::get_default_query_args();
 
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+        $paid_course_query_args['meta_query'] = self::get_paid_courses_meta_query_args();
 
-        return get_posts(  $paid_course_query_args );
+        return get_posts($paid_course_query_args);
     }
 
     /**
@@ -686,17 +686,17 @@ 
      * @param int $course_id
      * @return string $html markup for the button or nothing if user not allowed to buy
      */
-    public static function the_add_to_cart_button_html( $course_id ){
+    public static function the_add_to_cart_button_html($course_id) {
 
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+        if ( ! Sensei_Course::is_prerequisite_complete($course_id)) {
             return '';
         }
 
-        $wc_post_id = self::get_course_product_id( $course_id );
+        $wc_post_id = self::get_course_product_id($course_id);
 
         // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
+        if (self::has_customer_bought_product(get_current_user_id(), $wc_post_id)
+            || empty($wc_post_id)) {
 
             return '';
 
@@ -704,15 +704,15 @@ 
 
         // based on simple.php in WC templates/single-product/add-to-cart/
         // Get the product
-        $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
         // do not show the button for invalid products, non purchasable products, out
         // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
+        if ( ! isset ($product)
+            || ! is_object($product)
             || ! $product->is_purchasable()
             || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
+            || self::is_course_in_cart($wc_post_id)) {
 
             return '';
 
@@ -723,23 +723,23 @@ 
         //
         ?>
 
-        <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
+        <form action="<?php echo esc_url($product->add_to_cart_url()); ?>"
               class="cart"
               method="post"
               enctype="multipart/form-data">
 
-            <input type="hidden" name="product_id" value="<?php echo esc_attr( $product->id ); ?>" />
+            <input type="hidden" name="product_id" value="<?php echo esc_attr($product->id); ?>" />
 
             <input type="hidden" name="quantity" value="1" />
 
-            <?php if ( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { ?>
+            <?php if (isset($product->variation_id) && 0 < intval($product->variation_id)) { ?>
 
                 <input type="hidden" name="variation_id" value="<?php echo $product->variation_id; ?>" />
-                <?php if( isset( $product->variation_data ) && is_array( $product->variation_data ) && count( $product->variation_data ) > 0 ) { ?>
+                <?php if (isset($product->variation_data) && is_array($product->variation_data) && count($product->variation_data) > 0) { ?>
 
-                    <?php foreach( $product->variation_data as $att => $val ) { ?>
+                    <?php foreach ($product->variation_data as $att => $val) { ?>
 
-                        <input type="hidden" name="<?php echo esc_attr( $att ); ?>" id="<?php echo esc_attr( str_replace( 'attribute_', '', $att ) ); ?>" value="<?php echo esc_attr( $val ); ?>" />
+                        <input type="hidden" name="<?php echo esc_attr($att); ?>" id="<?php echo esc_attr(str_replace('attribute_', '', $att)); ?>" value="<?php echo esc_attr($val); ?>" />
 
                     <?php } ?>
 
@@ -767,26 +767,26 @@ 
      *
      * @return string $message
      */
-    public static function alter_no_permissions_message( $message, $post_id ){
+    public static function alter_no_permissions_message($message, $post_id) {
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+        if (empty($post_id) || 'course' != get_post_type($post_id)) {
             return  $message;
         }
 
-        $product_id = self::get_course_product_id( $post_id );
+        $product_id = self::get_course_product_id($post_id);
 
-        if( ! $product_id
-            || self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+        if ( ! $product_id
+            || self::has_customer_bought_product(get_current_user_id(), $product_id)) {
 
             return $message;
 
         }
 
         ob_start();
-        self::the_course_no_permissions_message( $post_id );
+        self::the_course_no_permissions_message($post_id);
         $woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+        return $woocommerce_course_no_permissions_message;
 
     }
     /**
@@ -795,16 +795,16 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_no_permissions_message( $course_id ){
+    public static function the_course_no_permissions_message($course_id) {
 
         // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-        $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+        $my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
+        $login_link = '<a href="'.esc_url(get_permalink($my_courses_page_id)).'">'.__('log in', 'woothemes-sensei').'</a>';
 
         ?>
 
         <span class="add-to-cart-login">
-            <?php echo sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); ?>
+            <?php echo sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link); ?>
         </span>
 
     <?php }
@@ -819,43 +819,43 @@ 
      *
      * @return bool
      */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+    public static function has_customer_bought_product($user_id, $product_id) {
 
-        $orders = get_posts( array(
+        $orders = get_posts(array(
             'posts_per_page' => -1,
             'meta_key'    => '_customer_user',
-            'meta_value'  => intval( $user_id ),
+            'meta_value'  => intval($user_id),
             'post_type'   => 'shop_order',
-            'post_status' =>  array( 'wc-processing', 'wc-completed' ),
-        ) );
+            'post_status' =>  array('wc-processing', 'wc-completed'),
+        ));
 
-        foreach ( $orders as $order_id ) {
+        foreach ($orders as $order_id) {
 
-            $order = new WC_Order( $order_id->ID );
+            $order = new WC_Order($order_id->ID);
 
-            if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
+            if ($order->post_status != 'wc-completed' && $order->post_status != 'wc-processing') {
 
                 continue;
             }
 
-            if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
+            if ( ! (0 < sizeof($order->get_items()))) {
 
                 continue;
 
             }
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+                if ($item['product_id'] == $product_id || $item['variation_id'] == $product_id) {
 
                     // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
-                        if( $sub_key ) {
-                            $sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
+                    if (class_exists('WC_Subscriptions_Manager')) {
+                        $sub_key = WC_Subscriptions_Manager::get_subscription_key($order_id->ID, $product_id);
+                        if ($sub_key) {
+                            $sub = WC_Subscriptions_Manager::get_subscription($sub_key);
+                            if ($sub && isset($sub['status'])) {
+                                if ('active' == $sub['status']) {
                                     return true;
                                 } else {
                                     return false;
@@ -884,11 +884,11 @@ 
      * @return string $woocommerce_product_id or false if none exist
      *
      */
-    public static function get_course_product_id( $course_id ){
+    public static function get_course_product_id($course_id) {
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+        if (empty($product_id) || 'product' != get_post_type($product_id)) {
             return false;
         }
 
@@ -902,11 +902,11 @@ 
      * @param array $classes
      * @return array
      */
-    public static function add_woocommerce_body_class( $classes ){
+    public static function add_woocommerce_body_class($classes) {
 
-        if( ! in_array( 'woocommerce', $classes ) ){
+        if ( ! in_array('woocommerce', $classes)) {
 
-            $classes[] ='woocommerce';
+            $classes[] = 'woocommerce';
 
         }
 

includes/template-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -143,8 +143,8 @@
 	 * sensei_check_if_product_is_in_cart function.
 	 *
 	 * @deprecated since 1.9.0
-	 * @param int $wc_post_id (default: 0)
-	 * @return void
+	 * @param int $wc_product_id (default: 0)
+	 * @return boolean
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
         return Sensei_WC::is_product_in_cart( $wc_product_id );

Indentation +280 added lines, -281 removed lines

@@ -5,18 +5,18 @@ 
 	 * 	Output tags.
 	 ***************************************************************************************************/
 
-    /**
-     * sensei_course_archive_next_link function.
-     *
-     * @access public
-     * @param string $type (default: 'newcourses')
-     * @return void
-     */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+	/**
+	 * sensei_course_archive_next_link function.
+	 *
+	 * @access public
+	 * @param string $type (default: 'newcourses')
+	 * @return void
+	 */
+	function sensei_course_archive_next_link( $type = 'newcourses' ) {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+		_deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
 
-    } // End sensei_course_archive_next_link()
+	} // End sensei_course_archive_next_link()
 
 	 /**
 	  * course_single_lessons function.
@@ -26,14 +26,14 @@ 
 	  */
 	 function course_single_lessons() {
 
-         // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+		 // load backwards compatible template name if it exists in the users theme
+		 $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
+		 if( $located_template ){
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
-             return;
+			 Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+			 return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'single-course/lessons.php' );
 
@@ -48,8 +48,8 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
-         sensei_the_single_lesson_meta();
+		 _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+		 sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
 
@@ -60,7 +60,7 @@ 
 	  * @access public
 	  * @param bool $return (default: false)
 	  * @return void
-      * @deprecated since 1.9.0
+	  * @deprecated since 1.9.0
 	  */
 	 function quiz_questions( $return = false ) {
 
@@ -74,11 +74,11 @@ 
 	  * @access public
 	  * @since  1.3.0
 	  * @return void
-      * @deprecated
+	  * @deprecated
 	  */
 	 function quiz_question_type( $question_type = 'multiple-choice' ) {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+		 Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
 
 	 } // End lesson_single_meta()
 
@@ -89,14 +89,14 @@ 
 	/**
 	 * sensei_check_prerequisite_course function.
 	 *
-     * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
+	 * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return bool
 	 */
 	function sensei_check_prerequisite_course( $course_id ) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+		return Sensei_Course::is_prerequisite_complete( $course_id );
 
 	} // End sensei_check_prerequisite_course()
 
@@ -120,14 +120,14 @@ 
     			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
 
     		</form><?php
-    	} // End If Statement
+		} // End If Statement
 	} // End sensei_start_course_form()
 
 
 	/**
 	 * sensei_wc_add_to_cart function.
 	 *
-     * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
+	 * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return void
@@ -147,7 +147,7 @@ 
 	 * @return void
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+		return Sensei_WC::is_product_in_cart( $wc_product_id );
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -160,17 +160,17 @@ 
 	function sensei_simple_course_price( $post_id ) {
 
 		//WooCommerce Pricing
-    	if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+			$wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
+			if ( 0 < $wc_post_id ) {
+				// Get the product
+				$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+				if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
-    	    } // End If Statement
-    	} // End If Statement
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_simple_course_price()
 
 	/**
@@ -197,7 +197,7 @@ 
 
 
 		if ( ! $query->is_main_query() )
-        	return;
+			return;
 
 		// Apply Filter only if on frontend and when course archive is running
 		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
@@ -205,11 +205,11 @@ 
 		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
 			// Check for pagination settings
    			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
-    		} else {
-    			$amount = $query->get( 'posts_per_page' );
-    		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			} else {
+				$amount = $query->get( 'posts_per_page' );
+			} // End If Statement
+			$query->set( 'posts_per_page', $amount );
 		} // End If Statement
 	} // End sensei_course_archive_filter()
 	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
@@ -248,66 +248,66 @@ 
 			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
-
-            foreach( (array) $modules as $module ) {
-
-                $args = array(
-                    'post_type' => 'lesson',
-                    'post_status' => 'publish',
-                    'posts_per_page' => -1,
-                    'meta_query' => array(
-                        array(
-                            'key' => '_lesson_course',
-                            'value' => intval( $lesson_course_id ),
-                            'compare' => '='
-                        )
-                    ),
-                    'tax_query' => array(
-                        array(
-                            'taxonomy' => Sensei()->modules->taxonomy,
-                            'field' => 'id',
-                            'terms' => intval( $module->term_id )
-                        )
-                    ),
-                    'meta_key' => '_order_module_' . $module->term_id,
-                    'orderby' => 'meta_value_num date',
-                    'order' => 'ASC',
-                    'suppress_filters' => 0
-                );
-
-                $lessons = get_posts( $args );
-                if ( 0 < count( $lessons ) ) {
-                    foreach ($lessons as $lesson_item){
-                        $all_lessons[] = $lesson_item->ID;
-                    } // End For Loop
-                } // End If Statement
-            }
-
-            $args = array(
-                'post_type' => 'lesson',
-                'posts_per_page' => -1,
-                'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
-                'orderby' => 'meta_value_num date',
-                'order' => 'ASC',
-                'meta_query' => array(
-                    array(
-                        'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
-                    ),
-                ),
-                'post__not_in' => $all_lessons,
-            );
-
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
+			$modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+
+			foreach( (array) $modules as $module ) {
+
+				$args = array(
+					'post_type' => 'lesson',
+					'post_status' => 'publish',
+					'posts_per_page' => -1,
+					'meta_query' => array(
+						array(
+							'key' => '_lesson_course',
+							'value' => intval( $lesson_course_id ),
+							'compare' => '='
+						)
+					),
+					'tax_query' => array(
+						array(
+							'taxonomy' => Sensei()->modules->taxonomy,
+							'field' => 'id',
+							'terms' => intval( $module->term_id )
+						)
+					),
+					'meta_key' => '_order_module_' . $module->term_id,
+					'orderby' => 'meta_value_num date',
+					'order' => 'ASC',
+					'suppress_filters' => 0
+				);
+
+				$lessons = get_posts( $args );
+				if ( 0 < count( $lessons ) ) {
+					foreach ($lessons as $lesson_item){
+						$all_lessons[] = $lesson_item->ID;
+					} // End For Loop
+				} // End If Statement
+			}
+
+			$args = array(
+				'post_type' => 'lesson',
+				'posts_per_page' => -1,
+				'suppress_filters' => 0,
+				'meta_key' => '_order_' . $lesson_course_id,
+				'orderby' => 'meta_value_num date',
+				'order' => 'ASC',
+				'meta_query' => array(
+					array(
+						'key' => '_lesson_course',
+						'value' => intval( $lesson_course_id ),
+					),
+				),
+				'post__not_in' => $all_lessons,
+			);
+
+			$other_lessons = get_posts( $args );
+			if ( 0 < count( $other_lessons ) ) {
 				foreach ($other_lessons as $lesson_item){
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+			if ( 0 < count( $all_lessons ) ) {
 				$found_index = false;
 				foreach ( $all_lessons as $lesson ){
 					if ( $found_index && $return_values['next_lesson'] == 0 ) {
@@ -338,9 +338,9 @@ 
    */
   function sensei_get_excerpt( $post_id = '' ) {
 
-      global $post;
-      _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
-      return get_the_excerpt();
+	  global $post;
+	  _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
+	  return get_the_excerpt();
 
   }
 
@@ -365,7 +365,7 @@ 
 */
 function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+	return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -480,27 +480,27 @@ 
 
 	}else{
 
-        // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+		// if the loop has not been initiated check the first module has lessons
+		if( -1 == $sensei_modules_loop[ 'current' ]  ){
 
-            $index = 0;
+			$index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
-                // setup the query for the module lessons
-                $course_id = $sensei_modules_loop['course_id'];
+			if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+				// setup the query for the module lessons
+				$course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+				$module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
+				$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
 
-                // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+				// setup the global wp-query only if the lessons
+				if( $modules_query->have_posts() ){
 
-                    return true;
+					return true;
 
-                }
-            }
-        }
-        // default to false if the first module doesn't have posts
+				}
+			}
+		}
+		// default to false if the first module doesn't have posts
 		return false;
 
 	}
@@ -612,21 +612,21 @@ 
  */
 function sensei_quiz_has_questions(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
-        return false;
-    }
+	if( !isset( $sensei_question_loop['total'] ) ){
+		return false;
+	}
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+	if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
 
-        return true;
+		return true;
 
-    }else{
+	}else{
 
-        return false;
+		return false;
 
-    }
+	}
 
 }// end sensei_quiz_has_questions
 
@@ -637,15 +637,14 @@ 
  * execution.
  *
  * @since 1.9.0
-
  */
 function sensei_setup_the_question(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $sensei_question_loop['current']++;
-    $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+	$sensei_question_loop['current']++;
+	$index = $sensei_question_loop['current'];
+	$sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
 
 
 }// end sensei_setup_the_question
@@ -658,12 +657,12 @@ 
  */
 function sensei_the_question_content(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+	// load the template that displays the question information.
+	WooThemes_Sensei_Question::load_question_template( $question_type );
 
 }// end sensei_the_question_content
 
@@ -674,26 +673,26 @@ 
  */
 function sensei_the_question_class(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    /**
-     * filter the sensei question class within
-     * the quiz question loop.
-     *
-     * @since 1.9.0
-     */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+	/**
+	 * filter the sensei question class within
+	 * the quiz question loop.
+	 *
+	 * @since 1.9.0
+	 */
+	 $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
 
-    $html_classes = '';
-    foreach( $classes as $class ){
+	$html_classes = '';
+	foreach( $classes as $class ){
 
-        $html_classes .= $class . ' ';
+		$html_classes .= $class . ' ';
 
-    }// end foreach
+	}// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+	esc_attr_e( trim( $html_classes ) );
 
 }
 
@@ -704,12 +703,12 @@ 
  */
 function sensei_get_the_question_id( ){
 
-    global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+	global $sensei_question_loop;
+	if( isset( $sensei_question_loop['current_question']->ID ) ){
 
-        return $sensei_question_loop['current_question']->ID;
+		return $sensei_question_loop['current_question']->ID;
 
-    }
+	}
 
 }// end sensei_the_question_id
 
@@ -736,63 +735,63 @@ 
  */
 function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
 
-    if( empty( $lesson_id ) ){
+	if( empty( $lesson_id ) ){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( empty( $user_id ) ){
+	if( empty( $user_id ) ){
 
-        $user_id = get_current_user_id();
+		$user_id = get_current_user_id();
 
-    }
+	}
 
-    // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+	// Check for prerequisite lesson completions
+	$pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
+	$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+	$user_taking_course = WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
 
-    $is_preview = false;
-    if( WooThemes_Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+	$is_preview = false;
+	if( WooThemes_Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
 
-        $is_preview = true;
-        $pre_requisite_complete = true;
+		$is_preview = true;
+		$pre_requisite_complete = true;
 
-    };
+	};
 
 
-    $user_can_access_lesson =  false;
+	$user_can_access_lesson =  false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+	if( is_user_logged_in() && $user_taking_course ){
 
-        $user_can_access_lesson =  true;
+		$user_can_access_lesson =  true;
 
-    }
+	}
 
 
-    $access_permission = false;
+	$access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+	if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-        $access_permission = true;
+		$access_permission = true;
 
-    }
+	}
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+	$can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
 
-    /**
-     * Filter the can user view lesson function
-     *
-     * @since 1.9.0
-     *
-     * @hooked Sensei_WC::alter_can_user_view_lesson
-     *
-     * @param bool $can_user_view_lesson
-     * @param string $lesson_id
-     * @param string $user_id
-     */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+	/**
+	 * Filter the can user view lesson function
+	 *
+	 * @since 1.9.0
+	 *
+	 * @hooked Sensei_WC::alter_can_user_view_lesson
+	 *
+	 * @param bool $can_user_view_lesson
+	 * @param string $lesson_id
+	 * @param string $user_id
+	 */
+	return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
 
 } // end sensei_can_current_user_view_lesson
 
@@ -804,52 +803,52 @@ 
  */
 function sensei_the_single_lesson_meta(){
 
-    // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+	// if the lesson meta is included within theme load that instead of the function content
+	$template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
+	if( ! empty( $template ) ){
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
-        return;
+		Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+		return;
 
-    }
+	}
 
-    // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = WooThemes_Sensei_Utils::is_preview_lesson( get_the_ID() );
+	// Get the meta info
+	$lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
+	$is_preview = WooThemes_Sensei_Utils::is_preview_lesson( get_the_ID() );
 
-    // Get User Meta
-    get_currentuserinfo();
+	// Get User Meta
+	get_currentuserinfo();
 
-    // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
-    // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
-        ?>
+	// Complete Lesson Logic
+	do_action( 'sensei_complete_lesson' );
+	// Check that the course has been started
+	if ( Sensei()->access_settings()
+		|| WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
+		|| $is_preview ) {
+		?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+			if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+				do_action( 'sensei_lesson_video', get_the_ID() );
 
-            }
-            ?>
+			}
+			?>
             <?php do_action( 'sensei_frontend_messages' ); ?>
 
             <?php if ( ! $is_preview
-                || WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+				|| WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+				sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
 
-            } ?>
+			} ?>
         </section>
 
         <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+	do_action( 'sensei_lesson_meta_extra', get_the_ID() );
 
 } // end the_single_lesson_meta
 
@@ -865,16 +864,16 @@ 
  */
 function get_sensei_header(){
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+	if ( ! defined( 'ABSPATH' ) ) exit;
 
-    get_header();
+	get_header();
 
-    /**
-     * sensei_before_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
-     */
-    do_action( 'sensei_before_main_content' );
+	/**
+	 * sensei_before_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
+	 */
+	do_action( 'sensei_before_main_content' );
 
 }// end get_sensei_header
 
@@ -890,28 +889,28 @@ 
  */
 function get_sensei_footer(){
 
-    /**
-     * sensei_pagination hook
-     *
-     * @hooked sensei_pagination - 10 (outputs pagination)
-     */
-    do_action( 'sensei_pagination' );
-
-    /**
-     * sensei_after_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
-     */
-    do_action( 'sensei_after_main_content' );
-
-    /**
-     * sensei_sidebar hook
-     *
-     * @hooked sensei_get_sidebar - 10
-     */
-    do_action( 'sensei_sidebar' );
-
-    get_footer();
+	/**
+	 * sensei_pagination hook
+	 *
+	 * @hooked sensei_pagination - 10 (outputs pagination)
+	 */
+	do_action( 'sensei_pagination' );
+
+	/**
+	 * sensei_after_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
+	 */
+	do_action( 'sensei_after_main_content' );
+
+	/**
+	 * sensei_sidebar hook
+	 *
+	 * @hooked sensei_get_sidebar - 10
+	 */
+	do_action( 'sensei_sidebar' );
+
+	get_footer();
 
 }// end get_sensei_header
 
@@ -923,14 +922,14 @@ 
  */
 function the_no_permissions_title(){
 
-    /**
-     * Filter the no permissions title just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_title
-     */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+	/**
+	 * Filter the no permissions title just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_title
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
 
 }
 
@@ -941,14 +940,14 @@ 
  */
 function the_no_permissions_message( $post_id ){
 
-    /**
-     * Filter the no permissions message just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_message
-     */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+	/**
+	 * Filter the no permissions message just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_message
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
 
 }
 
@@ -959,8 +958,8 @@ 
  */
 function sensei_the_excerpt( $post_id ){
 
-    global $post;
-    the_excerpt( $post );
+	global $post;
+	the_excerpt( $post );
 
 }
 
@@ -974,9 +973,9 @@ 
  */
  function sensei_get_current_page_url(){
 
-     global $wp;
-     $current_page_url =  home_url( $wp->request );
-     return $current_page_url;
+	 global $wp;
+	 $current_page_url =  home_url( $wp->request );
+	 return $current_page_url;
 
  }
 
@@ -988,7 +987,7 @@ 
  */
 function sensei_the_my_courses_content(){
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+	echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
 
 } // sensei_the_my_courses_content
 
@@ -1003,7 +1002,7 @@ 
  */
 function sensei_load_template( $template_name ){
 
-    Sensei_Templates::get_template( $template_name );
+	Sensei_Templates::get_template( $template_name );
 
 }
 
@@ -1017,7 +1016,7 @@ 
  */
 function sensei_load_template_part( $slug, $name ){
 
-    Sensei_Templates::get_part( $slug, $name );
+	Sensei_Templates::get_part( $slug, $name );
 
 }
 
@@ -1036,17 +1035,17 @@ 
  */
 function sensei_the_lesson_excerpt( $lesson_id = '' ) {
 
-    if( empty( $lesson_id )){
+	if( empty( $lesson_id )){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
-        return;
-    }
+	if( 'lesson' != get_post_type( $lesson_id ) ){
+		return;
+	}
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+	echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
 
 }// End lesson_excerpt()
 
@@ -1056,16 +1055,16 @@ 
  * @since 1.9.0
  */
 function sensei_the_course_results_lessons(){
-    // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+	// load backwards compatible template name if it exists in the users theme
+	$located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
+	if( $located_template ){
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
-        return;
+		Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+		return;
 
-    }
+	}
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+	Sensei_Templates::get_template( 'course-results/lessons.php' );
 }
 
 /**
@@ -1077,6 +1076,6 @@ 
  */
 function sensei_courses_per_row(){
 
-    echo Sensei_Course::get_loop_number_of_columns();
+	echo Sensei_Course::get_loop_number_of_columns();
 
 }

Spacing +180 added lines, -180 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ){ exit; } // Exit if accessed directly
+if ( ! defined('ABSPATH')) { exit; } // Exit if accessed directly
 
 	/***************************************************************************************************
 	 * 	Output tags.
@@ -12,9 +12,9 @@ 
      * @param string $type (default: 'newcourses')
      * @return void
      */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+    function sensei_course_archive_next_link($type = 'newcourses') {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+        _deprecated_function('sensei_course_archive_next_link', '1.9.0', 'This is no longer used or required in Sensei.');
 
     } // End sensei_course_archive_next_link()
 
@@ -27,15 +27,15 @@ 
 	 function course_single_lessons() {
 
          // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+         $located_template = locate_template(Sensei()->template_url.'single-course/course-lessons.php');
+         if ($located_template) {
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+             Sensei_Templates::get_template('single-course/course-lessons.php');
              return;
 
         }
 
-		Sensei_Templates::get_template( 'single-course/lessons.php' );
+		Sensei_Templates::get_template('single-course/lessons.php');
 
 	 } // End course_single_lessons()
 
@@ -48,7 +48,7 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+         _deprecated_function('lesson_single_meta', '1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta');
          sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
@@ -62,9 +62,9 @@ 
 	  * @return void
       * @deprecated since 1.9.0
 	  */
-	 function quiz_questions( $return = false ) {
+	 function quiz_questions($return = false) {
 
-	 	Sensei_Templates::get_template( 'single-quiz/quiz-questions.php' );
+	 	Sensei_Templates::get_template('single-quiz/quiz-questions.php');
 
 	 } // End quiz_questions()
 
@@ -76,9 +76,9 @@ 
 	  * @return void
       * @deprecated
 	  */
-	 function quiz_question_type( $question_type = 'multiple-choice' ) {
+	 function quiz_question_type($question_type = 'multiple-choice') {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+         Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php');
 
 	 } // End lesson_single_meta()
 
@@ -94,9 +94,9 @@ 
 	 * @param mixed $course_id
 	 * @return bool
 	 */
-	function sensei_check_prerequisite_course( $course_id ) {
+	function sensei_check_prerequisite_course($course_id) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+        return Sensei_Course::is_prerequisite_complete($course_id);
 
 	} // End sensei_check_prerequisite_course()
 
@@ -108,16 +108,16 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_start_course_form( $course_id ) {
+	function sensei_start_course_form($course_id) {
 
-		$prerequisite_complete = sensei_check_prerequisite_course( $course_id );
+		$prerequisite_complete = sensei_check_prerequisite_course($course_id);
 
-		if ( $prerequisite_complete ) {
-		?><form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		if ($prerequisite_complete) {
+		?><form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
-    			<input type="hidden" name="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" id="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_start_course_noonce' ) ); ?>" />
+    			<input type="hidden" name="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" id="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_start_course_noonce')); ?>" />
 
-    			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
+    			<span><input name="course_start" type="submit" class="course-start" value="<?php _e('Start taking this Course', 'woothemes-sensei'); ?>"/></span>
 
     		</form><?php
     	} // End If Statement
@@ -132,9 +132,9 @@ 
 	 * @param mixed $course_id
 	 * @return void
 	 */
-	function sensei_wc_add_to_cart( $course_id ) {
+	function sensei_wc_add_to_cart($course_id) {
 
-		Sensei_WC::the_add_to_cart_button_html( $course_id );
+		Sensei_WC::the_add_to_cart_button_html($course_id);
 
 	} // End sensei_wc_add_to_cart()
 
@@ -146,8 +146,8 @@ 
 	 * @param int $wc_post_id (default: 0)
 	 * @return void
 	 */
-	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+	function sensei_check_if_product_is_in_cart($wc_product_id = 0) {
+        return Sensei_WC::is_product_in_cart($wc_product_id);
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -157,16 +157,16 @@ 
 	 * @param mixed $post_id
 	 * @return void
 	 */
-	function sensei_simple_course_price( $post_id ) {
+	function sensei_simple_course_price($post_id) {
 
 		//WooCommerce Pricing
-    	if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
+    	if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
+    	    $wc_post_id = get_post_meta($post_id, '_course_woocommerce_product', true);
+    	    if (0 < $wc_post_id) {
     	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+    	    	$product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+    	    	if (isset($product) && ! empty($product) && $product->is_purchasable() && $product->is_in_stock() && ! sensei_check_if_product_is_in_cart($wc_post_id)) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
     	    } // End If Statement
@@ -180,11 +180,11 @@ 
 	 * @param array $widget_args (default: array())
 	 * @return void
 	 */
-	function sensei_recent_comments_widget_filter( $widget_args = array() ) {
-		if ( ! isset( $widget_args['post_type'] ) ) $widget_args['post_type'] = array( 'post', 'page' );
+	function sensei_recent_comments_widget_filter($widget_args = array()) {
+		if ( ! isset($widget_args['post_type'])) $widget_args['post_type'] = array('post', 'page');
 		return $widget_args;
 	} // End sensei_recent_comments_widget_filter()
-	add_filter( 'widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1 );
+	add_filter('widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1);
 
 	/**
 	 * sensei_course_archive_filter function.
@@ -193,26 +193,26 @@ 
 	 * @param array $query ( default: array ( ) )
 	 * @return void
 	 */
-	function sensei_course_archive_filter( $query ) {
+	function sensei_course_archive_filter($query) {
 
 
-		if ( ! $query->is_main_query() )
+		if ( ! $query->is_main_query())
         	return;
 
 		// Apply Filter only if on frontend and when course archive is running
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
 
-		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
+		if ( ! is_admin() && 0 < $course_page_id && 0 < intval($query->get('page_id')) && $query->get('page_id') == $course_page_id) {
 			// Check for pagination settings
-   			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+   			if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
+    			$amount = absint(Sensei()->settings->settings['course_archive_amount']);
     		} else {
-    			$amount = $query->get( 'posts_per_page' );
+    			$amount = $query->get('posts_per_page');
     		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+    		$query->set('posts_per_page', $amount);
 		} // End If Statement
 	} // End sensei_course_archive_filter()
-	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
+	add_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1);
 
 	/**
 	 * sensei_complete_lesson_button description
@@ -220,7 +220,7 @@ 
 	 * @return html
 	 */
 	function sensei_complete_lesson_button() {
-		do_action( 'sensei_complete_lesson_button' );
+		do_action('sensei_complete_lesson_button');
 	} // End sensei_complete_lesson_button()
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @return html
 	 */
 	function sensei_reset_lesson_button() {
-		do_action( 'sensei_reset_lesson_button' );
+		do_action('sensei_reset_lesson_button');
 	} // End sensei_reset_lesson_button()
 
 	/**
@@ -238,19 +238,19 @@ 
 	 * @param  integer $lesson_id
 	 * @return array $return_values
 	 */
-	function sensei_get_prev_next_lessons( $lesson_id = 0 ) {
+	function sensei_get_prev_next_lessons($lesson_id = 0) {
 
 		$return_values = array();
 		$return_values['prev_lesson'] = 0;
 		$return_values['next_lesson'] = 0;
-		if ( 0 < $lesson_id ) {
+		if (0 < $lesson_id) {
 			// Get the List of Lessons in the Course
-			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+			$lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($lesson_course_id));
 
-            foreach( (array) $modules as $module ) {
+            foreach ((array) $modules as $module) {
 
                 $args = array(
                     'post_type' => 'lesson',
@@ -259,7 +259,7 @@ 
                     'meta_query' => array(
                         array(
                             'key' => '_lesson_course',
-                            'value' => intval( $lesson_course_id ),
+                            'value' => intval($lesson_course_id),
                             'compare' => '='
                         )
                     ),
@@ -267,18 +267,18 @@ 
                         array(
                             'taxonomy' => Sensei()->modules->taxonomy,
                             'field' => 'id',
-                            'terms' => intval( $module->term_id )
+                            'terms' => intval($module->term_id)
                         )
                     ),
-                    'meta_key' => '_order_module_' . $module->term_id,
+                    'meta_key' => '_order_module_'.$module->term_id,
                     'orderby' => 'meta_value_num date',
                     'order' => 'ASC',
                     'suppress_filters' => 0
                 );
 
-                $lessons = get_posts( $args );
-                if ( 0 < count( $lessons ) ) {
-                    foreach ($lessons as $lesson_item){
+                $lessons = get_posts($args);
+                if (0 < count($lessons)) {
+                    foreach ($lessons as $lesson_item) {
                         $all_lessons[] = $lesson_item->ID;
                     } // End For Loop
                 } // End If Statement
@@ -288,36 +288,36 @@ 
                 'post_type' => 'lesson',
                 'posts_per_page' => -1,
                 'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
+                'meta_key' => '_order_'.$lesson_course_id,
                 'orderby' => 'meta_value_num date',
                 'order' => 'ASC',
                 'meta_query' => array(
                     array(
                         'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
+                        'value' => intval($lesson_course_id),
                     ),
                 ),
                 'post__not_in' => $all_lessons,
             );
 
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
-				foreach ($other_lessons as $lesson_item){
+            $other_lessons = get_posts($args);
+            if (0 < count($other_lessons)) {
+				foreach ($other_lessons as $lesson_item) {
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+            if (0 < count($all_lessons)) {
 				$found_index = false;
-				foreach ( $all_lessons as $lesson ){
-					if ( $found_index && $return_values['next_lesson'] == 0 ) {
+				foreach ($all_lessons as $lesson) {
+					if ($found_index && $return_values['next_lesson'] == 0) {
 						$return_values['next_lesson'] = $lesson;
 					} // End If Statement
-					if ( $lesson == $lesson_id ) {
+					if ($lesson == $lesson_id) {
 						// Is the current post
 						$found_index = true;
 					} // End If Statement
-					if ( !$found_index ) {
+					if ( ! $found_index) {
 						$return_values['prev_lesson'] = $lesson;
 					} // End If Statement
 				} // End For Loop
@@ -336,7 +336,7 @@ 
    * @param  int|WP_Post $post_id Optional. Defaults to current post
    * @return string $excerpt
    */
-  function sensei_get_excerpt( $post_id = '' ) {
+  function sensei_get_excerpt($post_id = '') {
 
       global $post;
       _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
@@ -344,14 +344,14 @@ 
 
   }
 
-	function sensei_has_user_started_course( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()" );
-		return WooThemes_Sensei_Utils::user_started_course( $post_id, $user_id );
+	function sensei_has_user_started_course($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()");
+		return WooThemes_Sensei_Utils::user_started_course($post_id, $user_id);
 	} // End sensei_has_user_started_course()
 
-	function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return WooThemes_Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return WooThemes_Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -363,9 +363,9 @@ 
  * @param int $user_id
  * @return bool
 */
-function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
+function sensei_has_user_completed_prerequisite_lesson($current_lesson_id, $user_id) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+    return WooThemes_Sensei_Lesson::is_pre_requisite_complete($current_lesson_id, $user_id);
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -388,7 +388,7 @@ 
  * @return bool
  *
  */
-function sensei_have_modules( $course_post_id = '' ){
+function sensei_have_modules($course_post_id = '') {
 
 	global $post, $wp_query, $sensei_modules_loop;
 
@@ -396,23 +396,23 @@ 
 	wp_reset_query();
 	$post = $wp_query->post;
 
-	if( empty( $course_post_id ) ){
+	if (empty($course_post_id)) {
 
 		$course_id = $post->ID;
 
 	}
 
 	// doesn't apply to none course post types
-	if( ! sensei_is_a_course( $course_id )  ){
+	if ( ! sensei_is_a_course($course_id)) {
 		return false;
 	}
 
 	// check the current item compared to the total number of modules
-	if( $sensei_modules_loop[ 'current' ] + 1 > $sensei_modules_loop[ 'total' ]  ){
+	if ($sensei_modules_loop['current'] + 1 > $sensei_modules_loop['total']) {
 
 		return false;
 
-	}else{
+	} else {
 
 		return true;
 
@@ -426,27 +426,27 @@ 
  *
  * @since 1.9.0
  */
-function sensei_setup_module(){
+function sensei_setup_module() {
 
 	global  $sensei_modules_loop, $wp_query;
 
 	// increment the index
-	$sensei_modules_loop[ 'current' ]++;
-	$index = $sensei_modules_loop[ 'current' ];
-	if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+	$sensei_modules_loop['current']++;
+	$index = $sensei_modules_loop['current'];
+	if (isset($sensei_modules_loop['modules'][$index])) {
 
 		$sensei_modules_loop['current_module'] = $sensei_modules_loop['modules'][$index];
 		// setup the query for the module lessons
 		$course_id = $sensei_modules_loop['course_id'];
 		$module_term_id = $sensei_modules_loop['current_module']->term_id;
-		$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+		$modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id);
 
 		// setup the global wp-query only if the lessons
-		if( $modules_query->have_posts() ){
+		if ($modules_query->have_posts()) {
 
 			$wp_query = $modules_query;
 
-		}else{
+		} else {
 
 			wp_reset_query();
 
@@ -470,30 +470,30 @@ 
  *
  * @return bool
  */
-function sensei_module_has_lessons(){
+function sensei_module_has_lessons() {
 
 	global $wp_query, $sensei_modules_loop;
 
-	if( 'lesson' == $wp_query->get('post_type') ){
+	if ('lesson' == $wp_query->get('post_type')) {
 
 		return have_posts();
 
-	}else{
+	} else {
 
         // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+        if ( -1 == $sensei_modules_loop['current']  ) {
 
             $index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+            if (isset($sensei_modules_loop['modules'][$index])) {
                 // setup the query for the module lessons
                 $course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+                $module_term_id = $sensei_modules_loop['modules'][$index] ->term_id;
+                $modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id);
 
                 // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+                if ($modules_query->have_posts()) {
 
                     return true;
 
@@ -517,9 +517,9 @@ 
  * @uses sensei_the_module_title
  * @return string
  */
-function sensei_the_module_title_attribute(){
+function sensei_the_module_title_attribute() {
 
-	esc_attr_e( sensei_get_the_module_title() );
+	esc_attr_e(sensei_get_the_module_title());
 
 }
 
@@ -530,11 +530,11 @@ 
  *
  * @return string
  */
-function sensei_the_module_permalink(){
+function sensei_the_module_permalink() {
 
 	global $sensei_modules_loop;
 	$course_id = $sensei_modules_loop['course_id'];
-	$module_url = add_query_arg('course_id', $course_id, get_term_link( $sensei_modules_loop['current_module'], 'module' ) );
+	$module_url = add_query_arg('course_id', $course_id, get_term_link($sensei_modules_loop['current_module'], 'module'));
 	$module_term_id = $sensei_modules_loop['current_module']->term_id;
 
 	/**
@@ -546,7 +546,7 @@ 
 	 * @param int $module_term_id
 	 * @param string $course_id
 	 */
-	 echo esc_url_raw( apply_filters( 'sensei_the_module_permalink', $module_url, $module_term_id  ,$course_id ) );
+	 echo esc_url_raw(apply_filters('sensei_the_module_permalink', $module_url, $module_term_id, $course_id));
 
 }// end sensei_the_module_permalink
 
@@ -558,7 +558,7 @@ 
  *
  * @return string
  */
-function sensei_get_the_module_title(){
+function sensei_get_the_module_title() {
 
 	global $sensei_modules_loop;
 
@@ -577,7 +577,7 @@ 
 	 * @param $module_term_id
 	 * @param $course_id
 	 */
-	return apply_filters( 'sensei_the_module_title',  $module_title , $module_term_id, $course_id );
+	return apply_filters('sensei_the_module_title', $module_title, $module_term_id, $course_id);
 
 }
 
@@ -589,7 +589,7 @@ 
  * @uses sensei_get_the_module_title
  * @return string
  */
-function sensei_the_module_title(){
+function sensei_the_module_title() {
 
 	echo sensei_get_the_module_title();
 
@@ -610,19 +610,19 @@ 
  *
  * @return bool
  */
-function sensei_quiz_has_questions(){
+function sensei_quiz_has_questions() {
 
     global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
+    if ( ! isset($sensei_question_loop['total'])) {
         return false;
     }
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+    if ($sensei_question_loop['current'] + 1 < $sensei_question_loop['total']) {
 
         return true;
 
-    }else{
+    } else {
 
         return false;
 
@@ -639,13 +639,13 @@ 
  * @since 1.9.0
 
  */
-function sensei_setup_the_question(){
+function sensei_setup_the_question() {
 
     global $sensei_question_loop;
 
     $sensei_question_loop['current']++;
     $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+    $sensei_question_loop['current_question'] = $sensei_question_loop['questions'][$index];
 
 
 }// end sensei_setup_the_question
@@ -656,14 +656,14 @@ 
  * This function gets the type and loads the template that will handle it.
  *
  */
-function sensei_the_question_content(){
+function sensei_the_question_content() {
 
     global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+    $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
 
     // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+    WooThemes_Sensei_Question::load_question_template($question_type);
 
 }// end sensei_the_question_content
 
@@ -672,11 +672,11 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_question_class(){
+function sensei_the_question_class() {
 
     global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+    $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
 
     /**
      * filter the sensei question class within
@@ -684,16 +684,16 @@ 
      *
      * @since 1.9.0
      */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+     $classes = apply_filters('sensei_question_classes', array($question_type));
 
     $html_classes = '';
-    foreach( $classes as $class ){
+    foreach ($classes as $class) {
 
-        $html_classes .= $class . ' ';
+        $html_classes .= $class.' ';
 
     }// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+    esc_attr_e(trim($html_classes));
 
 }
 
@@ -702,10 +702,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_get_the_question_id( ){
+function sensei_get_the_question_id( ) {
 
     global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+    if (isset($sensei_question_loop['current_question']->ID)) {
 
         return $sensei_question_loop['current_question']->ID;
 
@@ -734,27 +734,27 @@ 
  * @param string $lesson_id
  * @return bool
  */
-function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
+function sensei_can_user_view_lesson($lesson_id = '', $user_id = '') {
 
-    if( empty( $lesson_id ) ){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( empty( $user_id ) ){
+    if (empty($user_id)) {
 
         $user_id = get_current_user_id();
 
     }
 
     // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete($lesson_id, $user_id);
+    $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
+    $user_taking_course = WooThemes_Sensei_Utils::user_started_course($lesson_course_id, $user_id);
 
     $is_preview = false;
-    if( WooThemes_Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+    if (WooThemes_Sensei_Utils::is_preview_lesson($lesson_id)) {
 
         $is_preview = true;
         $pre_requisite_complete = true;
@@ -762,24 +762,24 @@ 
     };
 
 
-    $user_can_access_lesson =  false;
+    $user_can_access_lesson = false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+    if (is_user_logged_in() && $user_taking_course) {
 
-        $user_can_access_lesson =  true;
+        $user_can_access_lesson = true;
 
     }
 
 
     $access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+    if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) {
 
         $access_permission = true;
 
     }
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+    $can_user_view_lesson = $access_permission || ($user_can_access_lesson && $pre_requisite_complete) || $is_preview;
 
     /**
      * Filter the can user view lesson function
@@ -792,7 +792,7 @@ 
      * @param string $lesson_id
      * @param string $user_id
      */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+    return apply_filters('sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id);
 
 } // end sensei_can_current_user_view_lesson
 
@@ -802,54 +802,54 @@ 
  * The function should only be called on the single lesson
  *
  */
-function sensei_the_single_lesson_meta(){
+function sensei_the_single_lesson_meta() {
 
     // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+    $template = Sensei_Templates::locate_template('single-lesson/lesson-meta.php');
+    if ( ! empty($template)) {
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+        Sensei_Templates::get_template('single-lesson/lesson-meta.php');
         return;
 
     }
 
     // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = WooThemes_Sensei_Utils::is_preview_lesson( get_the_ID() );
+    $lesson_course_id = absint(get_post_meta(get_the_ID(), '_lesson_course', true));
+    $is_preview = WooThemes_Sensei_Utils::is_preview_lesson(get_the_ID());
 
     // Get User Meta
     get_currentuserinfo();
 
     // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
+    do_action('sensei_complete_lesson');
     // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
+    if (Sensei()->access_settings()
+        || WooThemes_Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id())
+        || $is_preview) {
         ?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+            if (apply_filters('sensei_video_position', 'top', get_the_ID()) == 'bottom') {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+                do_action('sensei_lesson_video', get_the_ID());
 
             }
             ?>
-            <?php do_action( 'sensei_frontend_messages' ); ?>
+            <?php do_action('sensei_frontend_messages'); ?>
 
             <?php if ( ! $is_preview
-                || WooThemes_Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+                || WooThemes_Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id())) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+                sensei_do_deprecated_action('sensei_lesson_quiz_meta', '1.9.0', 'sensei_single_lesson_content_inside_before', array(get_the_ID(), get_current_user_id()));
 
             } ?>
         </section>
 
-        <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
+        <?php do_action('sensei_lesson_back_link', $lesson_course_id); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+    do_action('sensei_lesson_meta_extra', get_the_ID());
 
 } // end the_single_lesson_meta
 
@@ -863,9 +863,9 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_header(){
+function get_sensei_header() {
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+    if ( ! defined('ABSPATH')) exit;
 
     get_header();
 
@@ -874,7 +874,7 @@ 
      *
      * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
      */
-    do_action( 'sensei_before_main_content' );
+    do_action('sensei_before_main_content');
 
 }// end get_sensei_header
 
@@ -888,28 +888,28 @@ 
  *
  * @since 1.9.0
  */
-function get_sensei_footer(){
+function get_sensei_footer() {
 
     /**
      * sensei_pagination hook
      *
      * @hooked sensei_pagination - 10 (outputs pagination)
      */
-    do_action( 'sensei_pagination' );
+    do_action('sensei_pagination');
 
     /**
      * sensei_after_main_content hook
      *
      * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
      */
-    do_action( 'sensei_after_main_content' );
+    do_action('sensei_after_main_content');
 
     /**
      * sensei_sidebar hook
      *
      * @hooked sensei_get_sidebar - 10
      */
-    do_action( 'sensei_sidebar' );
+    do_action('sensei_sidebar');
 
     get_footer();
 
@@ -921,7 +921,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_title(){
+function the_no_permissions_title() {
 
     /**
      * Filter the no permissions title just before it is echo'd on the
@@ -930,7 +930,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_title
      */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+    echo apply_filters('sensei_the_no_permissions_title', Sensei()->permissions_message['title']);
 
 }
 
@@ -939,7 +939,7 @@ 
  *
  * @since 1.9.0
  */
-function the_no_permissions_message( $post_id ){
+function the_no_permissions_message($post_id) {
 
     /**
      * Filter the no permissions message just before it is echo'd on the
@@ -948,7 +948,7 @@ 
      * @since 1.9.0
      * @param $no_permissions_message
      */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+    echo apply_filters('sensei_the_no_permissions_message', Sensei()->permissions_message['message'], $post_id);
 
 }
 
@@ -957,10 +957,10 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_excerpt( $post_id ){
+function sensei_the_excerpt($post_id) {
 
     global $post;
-    the_excerpt( $post );
+    the_excerpt($post);
 
 }
 
@@ -972,10 +972,10 @@ 
  * @global WP $wp
  * @return string $current_page_url
  */
- function sensei_get_current_page_url(){
+ function sensei_get_current_page_url() {
 
      global $wp;
-     $current_page_url =  home_url( $wp->request );
+     $current_page_url = home_url($wp->request);
      return $current_page_url;
 
  }
@@ -986,9 +986,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_my_courses_content(){
+function sensei_the_my_courses_content() {
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+    echo Sensei()->course->load_user_courses_content(wp_get_current_user());
 
 } // sensei_the_my_courses_content
 
@@ -1001,9 +1001,9 @@ 
  *
  * @since 1.9.0
  */
-function sensei_load_template( $template_name ){
+function sensei_load_template($template_name) {
 
-    Sensei_Templates::get_template( $template_name );
+    Sensei_Templates::get_template($template_name);
 
 }
 
@@ -1015,9 +1015,9 @@ 
  * @param string $name the name of the template.
  * @since 1.9.0
  */
-function sensei_load_template_part( $slug, $name ){
+function sensei_load_template_part($slug, $name) {
 
-    Sensei_Templates::get_part( $slug, $name );
+    Sensei_Templates::get_part($slug, $name);
 
 }
 
@@ -1034,19 +1034,19 @@ 
  * @access public
  * @param string $lesson_id
  */
-function sensei_the_lesson_excerpt( $lesson_id = '' ) {
+function sensei_the_lesson_excerpt($lesson_id = '') {
 
-    if( empty( $lesson_id )){
+    if (empty($lesson_id)) {
 
         $lesson_id = get_the_ID();
 
     }
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
+    if ('lesson' != get_post_type($lesson_id)) {
         return;
     }
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+    echo Sensei_Lesson::lesson_excerpt(get_post($lesson_id), false);
 
 }// End lesson_excerpt()
 
@@ -1055,17 +1055,17 @@ 
  *
  * @since 1.9.0
  */
-function sensei_the_course_results_lessons(){
+function sensei_the_course_results_lessons() {
     // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+    $located_template = locate_template(Sensei()->template_url.'course-results/course-lessons.php');
+    if ($located_template) {
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+        Sensei_Templates::get_template('course-results/course-lessons.php');
         return;
 
     }
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+    Sensei_Templates::get_template('course-results/lessons.php');
 }
 
 /**
@@ -1075,7 +1075,7 @@ 
  * @uses Sensei_Course::get_loop_number_of_columns
  * @since 1.9.0
  */
-function sensei_courses_per_row(){
+function sensei_courses_per_row() {
 
     echo Sensei_Course::get_loop_number_of_columns();
 

Braces +13 added lines, -8 removed lines

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

includes/class-sensei-course.php

Indentation +1385 added lines, -1385 removed lines

@@ -13,21 +13,21 @@ 
  * @since 1.0.0
  */
 class Sensei_Course {
-    /**
-     * @var $token
-     */
+	/**
+	 * @var $token
+	 */
 	public $token;
 
-    /**
-     * @var array $meta_fields
-     */
+	/**
+	 * @var array $meta_fields
+	 */
 	public $meta_fields;
 
-    /**
-     * @var string|bool $my_courses_page reference to the sites
-     * my courses page, false if none was set
-     */
-    public  $my_courses_page;
+	/**
+	 * @var string|bool $my_courses_page reference to the sites
+	 * my courses page, false if none was set
+	 */
+	public  $my_courses_page;
 
 	/**
 	 * Constructor.
@@ -39,7 +39,7 @@ 
 		// Admin actions
 		if ( is_admin() ) {
 			// Metabox functions
-            add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
+			add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
 			add_action( 'save_post', array( $this, 'meta_box_save' ) );
 			// Custom Write Panel Columns
 			add_filter( 'manage_edit-course_columns', array( $this, 'add_column_headings' ), 10, 1 );
@@ -55,47 +55,47 @@ 
 		// Update course completion upon grading of a quiz
 		add_action( 'sensei_user_quiz_grade', array( $this, 'update_status_after_quiz_submission' ), 10, 2 );
 
-        // show the progress bar ont he single course page
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
+		// show the progress bar ont he single course page
+		add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
+		add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
 
-        // provide an option to block all emails related to a selected course
-        add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
-        add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
+		// provide an option to block all emails related to a selected course
+		add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
+		add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
 
-        // preview lessons on the course content
-        add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
+		// preview lessons on the course content
+		add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
 
-        // the course meta
-        add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
+		// the course meta
+		add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
 
-        // backwards compatible template hooks
-        add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
-        add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
+		// backwards compatible template hooks
+		add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
+		add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
 
-        // add the user status on the course to the markup as a class
-        add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
+		// add the user status on the course to the markup as a class
+		add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
 
-        //filter the course query in Sensei specific instances
-        add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
+		//filter the course query in Sensei specific instances
+		add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
 
-        //attache the sorting to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
+		//attache the sorting to the course archive
+		add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
 
-        //attach the filter links to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
+		//attach the filter links to the course archive
+		add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
 
-        //filter the course query when featured filter is applied
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
+		//filter the course query when featured filter is applied
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
 
-        // handle the order by title post submission
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
+		// handle the order by title post submission
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
 
-        // ensure the course category page respects the manual order set for courses
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
+		// ensure the course category page respects the manual order set for courses
+		add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
 
-        // flush rewrite rules when saving a course
-        add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
+		// flush rewrite rules when saving a course
+		add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
 
 	} // End __construct()
 
@@ -148,13 +148,13 @@ 
 		add_meta_box( 'course-video', __( 'Course Video', 'woothemes-sensei' ), array( $this, 'course_video_meta_box_content' ), $this->token, 'normal', 'default' );
 		// Add Meta Box for Course Lessons
 		add_meta_box( 'course-lessons', __( 'Course Lessons', 'woothemes-sensei' ), array( $this, 'course_lessons_meta_box_content' ), $this->token, 'normal', 'default' );
-        // Add Meta Box to link to Manage Learners
-        add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
-        // Remove "Custom Settings" meta box.
+		// Add Meta Box to link to Manage Learners
+		add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
+		// Remove "Custom Settings" meta box.
 		remove_meta_box( 'woothemes-settings', $this->token, 'normal' );
 
-        // add Disable email notification box
-        add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
+		// add Disable email notification box
+		add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
 
 	} // End meta_box_setup()
 
@@ -172,10 +172,10 @@ 
 		$post_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'DESC',
-    						'exclude' 			=> $post->ID,
-    						'post_status'		=> array( 'publish', 'private', 'draft' ),
-    						'tax_query'			=> array(
+							'order'           	=> 'DESC',
+							'exclude' 			=> $post->ID,
+							'post_status'		=> array( 'publish', 'private', 'draft' ),
+							'tax_query'			=> array(
 								array(
 									'taxonomy'	=> 'product_type',
 									'field'		=> 'slug',
@@ -203,21 +203,21 @@ 
 						$product_object = get_product( $post_item->ID );
 						$parent_id = wp_get_post_parent_id( $post_item->ID );
 
-                        if( sensei_check_woocommerce_version( '2.1' ) ) {
+						if( sensei_check_woocommerce_version( '2.1' ) ) {
 							$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
 
 						} else {
-                            // fall back to pre wc 2.1
+							// fall back to pre wc 2.1
 							$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
 
 						}
 
-                        $product_name = ucwords( $formatted_variation );
-                        if( empty( $product_name ) ){
+						$product_name = ucwords( $formatted_variation );
+						if( empty( $product_name ) ){
 
-                            $product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
+							$product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
 
-                        }
+						}
 
 					} else {
 
@@ -267,7 +267,7 @@ 
 
 			} else {
 
-                $html .= '<p>' . "\n";
+				$html .= '<p>' . "\n";
 					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . "\n";
 				$html .= '</p>'."\n";
 
@@ -293,8 +293,8 @@ 
 		$post_args = array(	'post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
-    						'order'           	=> 'DESC',
-    						'exclude' 			=> $post->ID,
+							'order'           	=> 'DESC',
+							'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
 		$posts_array = get_posts( $post_args );
@@ -335,7 +335,7 @@ 
 
 		$checked = '';
 		if ( isset( $course_featured ) && ( '' != $course_featured ) ) {
-	 	    $checked = checked( 'featured', $course_featured, false );
+	 		$checked = checked( 'featured', $course_featured, false );
 	 	} // End If Statement
 
 	 	$html .= '<input type="checkbox" name="course_featured" value="featured" ' . $checked . '>&nbsp;' . __( 'Feature this course', 'woothemes-sensei' ) . '<br>';
@@ -430,8 +430,8 @@ 
 			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
 		} // End If Statement
 
-        // update field with the new value
-        return update_post_meta( $post_id, $meta_key, $new_meta_value );
+		// update field with the new value
+		return update_post_meta( $post_id, $meta_key, $new_meta_value );
 
 	} // End save_post_meta()
 
@@ -455,8 +455,8 @@ 
 
 		$html = '';
 		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="'
-                 . esc_attr( 'woo_' . $this->token . '_noonce' )
-                 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+				 . esc_attr( 'woo_' . $this->token . '_noonce' )
+				 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
 
 		if ( count( $posts_array ) > 0 ) {
 
@@ -477,8 +477,8 @@ 
 			$html .= '<p>' . esc_html( __( 'No lessons exist yet for this course.', 'woothemes-sensei' ) ) . "\n";
 
 				$html .= '<a href="' . admin_url( 'post-new.php?post_type=lesson' . $course_id )
-                         . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
-                         . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
+						 . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
+						 . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
 
 			$html .= '</p>'."\n";
 		} // End If Statement
@@ -487,29 +487,29 @@ 
 
 	} // End course_lessons_meta_box_content()
 
-    /**
-     * course_manage_meta_box_content function.
-     *
-     * @since 1.9.0
-     * @access public
-     * @return void
-     */
+	/**
+	 * course_manage_meta_box_content function.
+	 *
+	 * @since 1.9.0
+	 * @access public
+	 * @return void
+	 */
 
-    public function course_manage_meta_box_content () {
-        global $post;
+	public function course_manage_meta_box_content () {
+		global $post;
         
-        $manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+		$manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
 
-        $grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+		$grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
 
 
-        echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
+		echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
 
-        echo "<li><a href='$grading_url'>".__("Manage Grading", 'woothemes-sensei')."</a></li></ul>";
+		echo "<li><a href='$grading_url'>".__("Manage Grading", 'woothemes-sensei')."</a></li></ul>";
 
 
 
-    } // End course_manage_meta_box_content()
+	} // End course_manage_meta_box_content()
 
 	/**
 	 * Add column headings to the "lesson" post list screen.
@@ -650,92 +650,92 @@ 
 			} // End If Statement
 		} // End If Statement
 
-        $stored_order = get_option( 'sensei_course_order', '' );
-        $order = 'ASC';
-        $orderby = 'menu_order';
-        if( empty( $stored_order ) ){
+		$stored_order = get_option( 'sensei_course_order', '' );
+		$order = 'ASC';
+		$orderby = 'menu_order';
+		if( empty( $stored_order ) ){
 
-            $order = 'DESC';
-            $orderby = 'date';
+			$order = 'DESC';
+			$orderby = 'date';
 
-        }
+		}
 
 		switch ($type) {
 
 			case 'usercourses':
 				$post_args = array(	'post_type' 		=> 'course',
 									'orderby'         	=> $orderby,
-    								'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'include'			=> $includes,
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'include'			=> $includes,
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 			case 'freecourses':
 
-                $post_args = array(
-                    'post_type' 		=> 'course',
-                    'orderby'         	=> $orderby,
-                    'order'           	=> $order,
-                    'post_status'      	=> 'publish',
-                    'exclude'			=> $excludes,
-                    'suppress_filters' 	=> 0
-                );
-                // Sub Query to get all WooCommerce Products that have Zero price
-                $post_args['meta_query'] = Sensei_WC::get_free_courses_meta_query_args();
+				$post_args = array(
+					'post_type' 		=> 'course',
+					'orderby'         	=> $orderby,
+					'order'           	=> $order,
+					'post_status'      	=> 'publish',
+					'exclude'			=> $excludes,
+					'suppress_filters' 	=> 0
+				);
+				// Sub Query to get all WooCommerce Products that have Zero price
+				$post_args['meta_query'] = Sensei_WC::get_free_courses_meta_query_args();
 
-                break;
+				break;
 
 			case 'paidcourses':
 
-                $post_args = array(
-                    'post_type' 		=> 'course',
-                    'orderby'         	=> $orderby,
-                    'order'           	=> $order,
-                    'post_status'      	=> 'publish',
-                    'exclude'			=> $excludes,
-                    'suppress_filters' 	=> 0
-                );
+				$post_args = array(
+					'post_type' 		=> 'course',
+					'orderby'         	=> $orderby,
+					'order'           	=> $order,
+					'post_status'      	=> 'publish',
+					'exclude'			=> $excludes,
+					'suppress_filters' 	=> 0
+				);
 
-                // Sub Query to get all WooCommerce Products that have price greater than zero
-                $post_args['meta_query'] = Sensei_WC::get_paid_courses_meta_query_args();
+				// Sub Query to get all WooCommerce Products that have price greater than zero
+				$post_args['meta_query'] = Sensei_WC::get_paid_courses_meta_query_args();
 
 				break;
 
 			case 'featuredcourses':
-                $post_args = array(	'post_type' 		=> 'course',
-                                    'orderby'         	=> $orderby,
-                                    'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'meta_value' 		=> 'featured',
-    								'meta_key' 			=> '_course_featured',
-    								'meta_compare' 		=> '=',
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+				$post_args = array(	'post_type' 		=> 'course',
+									'orderby'         	=> $orderby,
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'meta_value' 		=> 'featured',
+									'meta_key' 			=> '_course_featured',
+									'meta_compare' 		=> '=',
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 			default:
 				$post_args = array(	'post_type' 		=> 'course',
-                                    'orderby'         	=> $orderby,
-                                    'order'           	=> $order,
-    								'post_status'      	=> 'publish',
-    								'exclude'			=> $excludes,
-    								'suppress_filters' 	=> 0
+									'orderby'         	=> $orderby,
+									'order'           	=> $order,
+									'post_status'      	=> 'publish',
+									'exclude'			=> $excludes,
+									'suppress_filters' 	=> 0
 									);
 				break;
 
 		}
 
-        $post_args['posts_per_page'] = $amount;
-        $paged = $wp_query->get( 'paged' );
-        $post_args['paged'] = empty( $paged) ? 1 : $paged;
+		$post_args['posts_per_page'] = $amount;
+		$paged = $wp_query->get( 'paged' );
+		$post_args['paged'] = empty( $paged) ? 1 : $paged;
 
-        if( 'newcourses' == $type ){
+		if( 'newcourses' == $type ){
 
-            $post_args[ 'orderby' ] = 'date';
-            $post_args[ 'order' ] = 'DESC';
-        }
+			$post_args[ 'orderby' ] = 'date';
+			$post_args[ 'order' ] = 'DESC';
+		}
 
 		return $post_args;
 	}
@@ -745,22 +745,22 @@ 
 	 * course_image function.
 	 *
 	 * Outputs the courses image, or first image from a lesson within a course
-     *
-     * Will echo the image unless return true is specified.
+	 *
+	 * Will echo the image unless return true is specified.
 	 *
 	 * @access public
 	 * @param int | WP_Post $course_id (default: 0)
 	 * @param string $width (default: '100')
 	 * @param string $height (default: '100')
-     * @param bool $return default false
-     *
+	 * @param bool $return default false
+	 *
 	 * @return string | void
 	 */
 	public function course_image( $course_id = 0, $width = '100', $height = '100', $return = false ) {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
-            $course_id = $course_id->ID;
-        }
+		if( is_a( $course_id, 'WP_Post' ) ){
+			$course_id = $course_id->ID;
+		}
 
 		$html = '';
 
@@ -817,7 +817,7 @@ 
  				// Display Image Placeholder if none
 				if ( Sensei()->settings->get( 'placeholder_images_enable' ) ) {
 
-                    $img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+					$img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
 
 				} // End If Statement
 
@@ -831,15 +831,15 @@ 
 
 		} // End If Statement
 
-        if( $return ){
+		if( $return ){
 
-            return $html;
+			return $html;
 
-        }else{
+		}else{
 
-            echo $html;
+			echo $html;
 
-        }
+		}
 
 	} // End course_image()
 
@@ -883,9 +883,9 @@ 
 	 */
 	public function course_lessons( $course_id = 0, $post_status = 'publish', $fields = 'all' ) {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
-            $course_id = $course_id->ID;
-        }
+		if( is_a( $course_id, 'WP_Post' ) ){
+			$course_id = $course_id->ID;
+		}
 
 		$post_args = array(	'post_type'         => 'lesson',
 							'posts_per_page'       => -1,
@@ -901,67 +901,67 @@ 
 							'suppress_filters'  => 0,
 							);
 		$query_results = new WP_Query( $post_args );
-        $lessons = $query_results->posts;
-
-        // re order the lessons. This could not be done via the OR meta query as there may be lessons
-        // with the course order for a different course and this should not be included. It could also not
-        // be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
-        // that have been added to the course.
-        if( count( $lessons) > 1  ){
-
-            foreach( $lessons as $lesson ){
-
-                $order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
-                // for lessons with no order set it to be 10000 so that it show up at the end
-                $lesson->course_order = $order ? $order : 100000;
-            }
-
-            uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
-        }
-
-        /**
-         * Filter runs inside Sensei_Course::course_lessons function
-         *
-         * Returns all lessons for a given course
-         *
-         * @param array $lessons
-         * @param int $course_id
-         */
-        $lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
-
-        //return the requested fields
-        // runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
-        // objects
-        if( 'ids' == $fields ) {
-            $lesson_objects = $lessons;
-            $lessons = array();
-
-            foreach ($lesson_objects as $lesson) {
-                $lessons[] = $lesson->ID;
-            }
-        }
-
-        return $lessons;
+		$lessons = $query_results->posts;
+
+		// re order the lessons. This could not be done via the OR meta query as there may be lessons
+		// with the course order for a different course and this should not be included. It could also not
+		// be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
+		// that have been added to the course.
+		if( count( $lessons) > 1  ){
+
+			foreach( $lessons as $lesson ){
+
+				$order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
+				// for lessons with no order set it to be 10000 so that it show up at the end
+				$lesson->course_order = $order ? $order : 100000;
+			}
+
+			uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
+		}
+
+		/**
+		 * Filter runs inside Sensei_Course::course_lessons function
+		 *
+		 * Returns all lessons for a given course
+		 *
+		 * @param array $lessons
+		 * @param int $course_id
+		 */
+		$lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
+
+		//return the requested fields
+		// runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
+		// objects
+		if( 'ids' == $fields ) {
+			$lesson_objects = $lessons;
+			$lessons = array();
+
+			foreach ($lesson_objects as $lesson) {
+				$lessons[] = $lesson->ID;
+			}
+		}
+
+		return $lessons;
 
 	} // End course_lessons()
 
-    /**
-     * Used for the uasort in $this->course_lessons()
-     * @since 1.8.0
-     * @access protected
-     *
-     * @param array $lesson_1
-     * @param array $lesson_2
-     * @return int
-     */
-    protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
+	/**
+	 * Used for the uasort in $this->course_lessons()
+	 * @since 1.8.0
+	 * @access protected
+	 *
+	 * @param array $lesson_1
+	 * @param array $lesson_2
+	 * @return int
+	 */
+	protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
 
-        if ( $lesson_1->course_order == $lesson_2->course_order ) {
-            return 0;
-        }
+		if ( $lesson_1->course_order == $lesson_2->course_order ) {
+			return 0;
+		}
 
-        return ($lesson_1->course_order < $lesson_2->course_order) ? -1 : 1;
-    }
+		return ($lesson_1->course_order < $lesson_2->course_order) ? -1 : 1;
+	}
 
 	/**
 	 * Fetch all quiz ids in a course
@@ -1024,15 +1024,15 @@ 
 	 */
 	public function course_author_lesson_count( $author_id = 0, $course_id = 0 ) {
 
-        $lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-		    					'author'         	=> $author_id,
-		    					'meta_key'        	=> '_lesson_course',
-    							'meta_value'      	=> $course_id,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
+								'author'         	=> $author_id,
+								'meta_key'        	=> '_lesson_course',
+								'meta_value'      	=> $course_id,
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 		$count = count( $lessons_array );
 		return $count;
@@ -1050,17 +1050,17 @@ 
 
 		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-		    					'meta_key'        	=> '_lesson_course',
-    							'meta_value'      	=> $course_id,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
+								'meta_key'        	=> '_lesson_course',
+								'meta_value'      	=> $course_id,
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 
-        $count = count( $lessons_array );
+		$count = count( $lessons_array );
 
-        return $count;
+		return $count;
 
 	} // End course_lesson_count()
 
@@ -1075,9 +1075,9 @@ 
 
 		$lesson_args = array(	'post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
-    	    					'post_status'      	=> 'publish',
-    	    					'suppress_filters' 	=> 0,
-    	    					'meta_query' => array(
+								'post_status'      	=> 'publish',
+								'suppress_filters' 	=> 0,
+								'meta_query' => array(
 									array(
 										'key' => '_lesson_course',
 										'value' => $course_id
@@ -1088,12 +1088,12 @@ 
 									)
 								),
 								'fields'            => 'ids', // less data to retrieve
-		    				);
+							);
 		$lessons_array = get_posts( $lesson_args );
 
 		$count = count( $lessons_array );
 
-        return $count;
+		return $count;
 
 	} // End course_lesson_count()
 
@@ -1112,8 +1112,8 @@ 
 			$post_args = array(	'post_type' 		=> 'course',
 								'posts_per_page' 		=> -1,
 								'meta_key'        	=> '_course_woocommerce_product',
-	    						'meta_value'      	=> $product_id,
-	    						'post_status'       => 'publish',
+								'meta_value'      	=> $product_id,
+								'post_status'       => 'publish',
 								'suppress_filters' 	=> 0,
 								'orderby' 			=> 'menu_order date',
 								'order' 			=> 'ASC',
@@ -1154,9 +1154,9 @@ 
 
 	/**
 	 * load_user_courses_content generates HTML for user's active & completed courses
-     *
-     * This function also ouputs the html so no need to echo the content.
-     *
+	 *
+	 * This function also ouputs the html so no need to echo the content.
+	 *
 	 * @since  1.4.0
 	 * @param  object  $user   Queried user object
 	 * @param  boolean $manage Whether the user has permission to manage the courses
@@ -1165,17 +1165,17 @@ 
 	public function load_user_courses_content( $user = false ) {
 		global $course, $my_courses_page, $my_courses_section;
 
-        if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
-            || ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
+		if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
+			|| ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
 
-            // do not show the content if the settings doesn't allow for it
-            return;
+			// do not show the content if the settings doesn't allow for it
+			return;
 
-        }
+		}
 
-        $manage = ( $user->ID == get_current_user_id() ) ? true : false;
+		$manage = ( $user->ID == get_current_user_id() ) ? true : false;
 
-        do_action( 'sensei_before_learner_course_content', $user );
+		do_action( 'sensei_before_learner_course_content', $user );
 
 		// Build Output HTML
 		$complete_html = $active_html = '';
@@ -1190,7 +1190,7 @@ 
 			// Logic for Active and Completed Courses
 			$per_page = 20;
 			if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] )
-                && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
+				&& ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
 
 				$per_page = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
 
@@ -1236,111 +1236,111 @@ 
 					}
 				}
 
-			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+				// Get Course Categories
+				$category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
 
-                $active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
+				$active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
 
-                // Image
-                $active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
+				// Image
+				$active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
 
-                // Title
-                $active_html .= '<header>';
+				// Title
+				$active_html .= '<header>';
 
-                $active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+				$active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
 
-                $active_html .= '</header>';
+				$active_html .= '</header>';
 
-                $active_html .= '<section class="entry">';
+				$active_html .= '<section class="entry">';
 
-                $active_html .= '<p class="sensei-course-meta">';
+				$active_html .= '<p class="sensei-course-meta">';
 
-                // Author
-                $user_info = get_userdata( absint( $course_item->post_author ) );
-                if ( isset( Sensei()->settings->settings[ 'course_author' ] )
-                    && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+				// Author
+				$user_info = get_userdata( absint( $course_item->post_author ) );
+				if ( isset( Sensei()->settings->settings[ 'course_author' ] )
+					&& ( Sensei()->settings->settings[ 'course_author' ] ) ) {
 
-                    $active_html .= '<span class="course-author">'
-                        . __( 'by ', 'woothemes-sensei' )
-                        . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
-                        . '" title="' . esc_attr( $user_info->display_name ) . '">'
-                        . esc_html( $user_info->display_name )
-                        . '</a></span>';
+					$active_html .= '<span class="course-author">'
+						. __( 'by ', 'woothemes-sensei' )
+						. '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
+						. '" title="' . esc_attr( $user_info->display_name ) . '">'
+						. esc_html( $user_info->display_name )
+						. '</a></span>';
 
-                } // End If Statement
+				} // End If Statement
 
-                // Lesson count for this author
-                $lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
-                // Handle Division by Zero
-                if ( 0 == $lesson_count ) {
+				// Lesson count for this author
+				$lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
+				// Handle Division by Zero
+				if ( 0 == $lesson_count ) {
 
-                    $lesson_count = 1;
+					$lesson_count = 1;
 
-                } // End If Statement
-                $active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
-                // Course Categories
-                if ( '' != $category_output ) {
+				} // End If Statement
+				$active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
+				// Course Categories
+				if ( '' != $category_output ) {
 
-                    $active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+					$active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
 
-                } // End If Statement
-                $active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
+				} // End If Statement
+				$active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
 
-                $active_html .= '</p>';
+				$active_html .= '</p>';
 
-                $active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+				$active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
 
 
 
-                $progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
+				$progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
 
-                $active_html .= $this->get_progress_meter( $progress_percentage );
+				$active_html .= $this->get_progress_meter( $progress_percentage );
 
-                $active_html .= '</section>';
+				$active_html .= '</section>';
 
-                if( is_user_logged_in() ) {
+				if( is_user_logged_in() ) {
 
-                    $active_html .= '<section class="entry-actions">';
+					$active_html .= '<section class="entry-actions">';
 
-                    $active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
+					$active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
 
-                    $active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
+					$active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
 
-                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
+					$active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
 
-                    if ( 0 < absint( count( $course_lessons ) ) && Sensei()->settings->settings['course_completion'] == 'complete' ) {
+					if ( 0 < absint( count( $course_lessons ) ) && Sensei()->settings->settings['course_completion'] == 'complete' ) {
 
-                        $active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
-                            .  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
+						$active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
+							.  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
 
-                    } // End If Statement
+					} // End If Statement
 
-                    $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
+					$course_purchased = false;
+					if ( Sensei_WC::is_woocommerce_active() ) {
 
-                        // Get the product ID
-                        $wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+						// Get the product ID
+						$wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
+						if ( 0 < $wc_post_id ) {
 
-                            $course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
+							$course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
 
-                        } // End If Statement
+						} // End If Statement
 
-                    } // End If Statement
+					} // End If Statement
 
-                    if ( false == $course_purchased ) {
+					if ( false == $course_purchased ) {
 
-                        $active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
-                            .  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
+						$active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
+							.  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
 
-                    } // End If Statement
+					} // End If Statement
 
-                    $active_html .= '</form>';
+					$active_html .= '</form>';
 
-                    $active_html .= '</section>';
-                }
+					$active_html .= '</section>';
+				}
 
-                $active_html .= '</article>';
+				$active_html .= '</article>';
 			}
 
 			// Active pagination
@@ -1380,49 +1380,49 @@ 
 			foreach ( $completed_courses as $course_item ) {
 				$course = $course_item;
 
-			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+				// Get Course Categories
+				$category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
 
-		    	$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
+				$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
 
-		    	    // Image
-		    		$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
+					// Image
+					$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
 
-		    		// Title
-		    		$complete_html .= '<header>';
+					// Title
+					$complete_html .= '<header>';
 
-		    		    $complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+						$complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
 
-		    		$complete_html .= '</header>';
+					$complete_html .= '</header>';
 
-		    		$complete_html .= '<section class="entry">';
+					$complete_html .= '<section class="entry">';
 
-		    			$complete_html .= '<p class="sensei-course-meta">';
+						$complete_html .= '<p class="sensei-course-meta">';
 
-		    		    	// Author
-		    		    	$user_info = get_userdata( absint( $course_item->post_author ) );
-		    		    	if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
-		    		    		$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
-		    		    	} // End If Statement
+							// Author
+							$user_info = get_userdata( absint( $course_item->post_author ) );
+							if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+								$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+							} // End If Statement
 
-		    		    	// Lesson count for this author
-		    		    	$complete_html .= '<span class="course-lesson-count">'
-                                . Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
-                                . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
-                                . '</span>';
+							// Lesson count for this author
+							$complete_html .= '<span class="course-lesson-count">'
+								. Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
+								. '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
+								. '</span>';
 
-		    		    	// Course Categories
-		    		    	if ( '' != $category_output ) {
+							// Course Categories
+							if ( '' != $category_output ) {
 
-		    		    		$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+								$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
 
-		    		    	} // End If Statement
+							} // End If Statement
 
 						$complete_html .= '</p>';
 
 						$complete_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
 
-                        $complete_html .= $this->get_progress_meter( 100 );
+						$complete_html .= $this->get_progress_meter( 100 );
 
 						if( $manage ) {
 							$has_quizzes = Sensei()->course->course_quizzes( $course_item->ID, true );
@@ -1435,9 +1435,9 @@ 
 								if( $has_quizzes ) {
 
 									$results_link = '<a class="button view-results" href="'
-                                        . Sensei()->course_results->get_permalink( $course_item->ID )
-                                        . '">' . __( 'View results', 'woothemes-sensei' )
-                                        . '</a>';
+										. Sensei()->course_results->get_permalink( $course_item->ID )
+										. '">' . __( 'View results', 'woothemes-sensei' )
+										. '</a>';
 								}
 								$complete_html .= apply_filters( 'sensei_results_links', $results_link );
 								$complete_html .= '</p>';
@@ -1445,9 +1445,9 @@ 
 							}
 						}
 
-		    		$complete_html .= '</section>';
+					$complete_html .= '</section>';
 
-		    	$complete_html .= '</article>';
+				$complete_html .= '</article>';
 			}
 
 			// Active pagination
@@ -1522,16 +1522,16 @@ 
 		    <?php do_action( 'sensei_before_active_user_courses' ); ?>
 
 		    <?php
-            $course_page_url = Sensei_Course::get_courses_page_url();
-            ?>
+			$course_page_url = Sensei_Course::get_courses_page_url();
+			?>
 
 		    <div id="active-courses">
 
 		    	<?php if ( '' != $active_html ) {
 
-		    		echo $active_html;
+					echo $active_html;
 
-		    	} else { ?>
+				} else { ?>
 
 		    		<div class="sensei-message info">
 
@@ -1557,9 +1557,9 @@ 
 
 		    	<?php if ( '' != $complete_html ) {
 
-		    		echo $complete_html;
+					echo $complete_html;
 
-		    	} else { ?>
+				} else { ?>
 
 		    		<div class="sensei-message info">
 
@@ -1578,366 +1578,366 @@ 
 		<?php do_action( 'sensei_after_user_courses' ); ?>
 
 		<?php
-        echo ob_get_clean();
+		echo ob_get_clean();
 
-        do_action( 'sensei_after_learner_course_content', $user );
+		do_action( 'sensei_after_learner_course_content', $user );
 
 	} // end load_user_courses_content
 
-    /**
-     * Returns a list of all courses
-     *
-     * @since 1.8.0
-     * @return array $courses{
-     *  @type $course WP_Post
-     * }
-     */
-    public static function get_all_courses(){
-
-        $args = array(
-               'post_type' => 'course',
-                'posts_per_page' 		=> -1,
-                'orderby'         	=> 'title',
-                'order'           	=> 'ASC',
-                'post_status'      	=> 'any',
-                'suppress_filters' 	=> 0,
-        );
-
-        $wp_query_obj =  new WP_Query( $args );
-
-        /**
-         * sensei_get_all_courses filter
-         *
-         * This filter runs inside Sensei_Course::get_all_courses.
-         *
-         * @param array $courses{
-         *  @type WP_Post
-         * }
-         * @param array $attributes
-         */
-        return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
-
-    }// end get_all_courses
-
-    /**
-     * Generate the course meter component
-     *
-     * @since 1.8.0
-     * @param int $progress_percentage 0 - 100
-     * @return string $progress_bar_html
-     */
-    public function get_progress_meter( $progress_percentage ){
-
-        if ( 50 < $progress_percentage ) {
-            $class = ' green';
-        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
-            $class = ' orange';
-        } else {
-            $class = ' red';
-        }
-        $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
-
-        return $progress_bar_html;
-
-    }// end get_progress_meter
-
-    /**
-     * Generate a statement that tells users
-     * how far they are in the course.
-     *
-     * @param int $course_id
-     * @param int $user_id
-     *
-     * @return string $statement_html
-     */
-    public function get_progress_statement( $course_id, $user_id ){
-
-        if( empty( $course_id ) || empty( $user_id )
-        || ! WooThemes_Sensei_Utils::user_started_course( $course_id, $user_id ) ){
-            return '';
-        }
-
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-        $total_lessons = count( $this->course_lessons( $course_id ) );
-
-        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
-
-        /**
-         * Filter the course completion statement.
-         * Default Currently completed $var lesson($plural) of $var in total
-         *
-         * @param string $statement
-         */
-        return apply_filters( 'sensei_course_completion_statement', $statement );
-
-    }// end generate_progress_statement
-
-    /**
-     * Output the course progress statement
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_statement( $course_id = 0, $user_id = 0 ){
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
-    }
-
-    /**
-     * Output the course progress bar
-     *
-     * @param $course_id
-     * @return void
-     */
-    public function the_progress_meter( $course_id = 0, $user_id = 0 ){
-
-        if( empty( $course_id ) ){
-            global $post;
-            $course_id = $post->ID;
-        }
-
-        if( empty( $user_id ) ){
-            $user_id = get_current_user_id();
-        }
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
-            || ! WooThemes_Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
-            return;
-        }
-        $percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
-
-        echo $this->get_progress_meter( $percentage_completed );
-
-    }// end the_progress_meter
-
-    /**
-     * Checks how many lessons are completed
-     *
-     * @since 1.8.0
-     *
-     * @param int $course_id
-     * @param int $user_id
-     * @return array $completed_lesson_ids
-     */
-    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
-
-        if( !( intval( $user_id ) ) > 0 ){
-            $user_id = get_current_user_id();
-        }
+	/**
+	 * Returns a list of all courses
+	 *
+	 * @since 1.8.0
+	 * @return array $courses{
+	 *  @type $course WP_Post
+	 * }
+	 */
+	public static function get_all_courses(){
+
+		$args = array(
+			   'post_type' => 'course',
+				'posts_per_page' 		=> -1,
+				'orderby'         	=> 'title',
+				'order'           	=> 'ASC',
+				'post_status'      	=> 'any',
+				'suppress_filters' 	=> 0,
+		);
+
+		$wp_query_obj =  new WP_Query( $args );
+
+		/**
+		 * sensei_get_all_courses filter
+		 *
+		 * This filter runs inside Sensei_Course::get_all_courses.
+		 *
+		 * @param array $courses{
+		 *  @type WP_Post
+		 * }
+		 * @param array $attributes
+		 */
+		return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
+
+	}// end get_all_courses
+
+	/**
+	 * Generate the course meter component
+	 *
+	 * @since 1.8.0
+	 * @param int $progress_percentage 0 - 100
+	 * @return string $progress_bar_html
+	 */
+	public function get_progress_meter( $progress_percentage ){
+
+		if ( 50 < $progress_percentage ) {
+			$class = ' green';
+		} elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
+			$class = ' orange';
+		} else {
+			$class = ' red';
+		}
+		$progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
+
+		return $progress_bar_html;
+
+	}// end get_progress_meter
+
+	/**
+	 * Generate a statement that tells users
+	 * how far they are in the course.
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 *
+	 * @return string $statement_html
+	 */
+	public function get_progress_statement( $course_id, $user_id ){
+
+		if( empty( $course_id ) || empty( $user_id )
+		|| ! WooThemes_Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+			return '';
+		}
+
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+		$total_lessons = count( $this->course_lessons( $course_id ) );
+
+		$statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
+
+		/**
+		 * Filter the course completion statement.
+		 * Default Currently completed $var lesson($plural) of $var in total
+		 *
+		 * @param string $statement
+		 */
+		return apply_filters( 'sensei_course_completion_statement', $statement );
+
+	}// end generate_progress_statement
+
+	/**
+	 * Output the course progress statement
+	 *
+	 * @param $course_id
+	 * @return void
+	 */
+	public function the_progress_statement( $course_id = 0, $user_id = 0 ){
+		if( empty( $course_id ) ){
+			global $post;
+			$course_id = $post->ID;
+		}
+
+		if( empty( $user_id ) ){
+			$user_id = get_current_user_id();
+		}
+
+		echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
+	}
+
+	/**
+	 * Output the course progress bar
+	 *
+	 * @param $course_id
+	 * @return void
+	 */
+	public function the_progress_meter( $course_id = 0, $user_id = 0 ){
+
+		if( empty( $course_id ) ){
+			global $post;
+			$course_id = $post->ID;
+		}
+
+		if( empty( $user_id ) ){
+			$user_id = get_current_user_id();
+		}
+
+		if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
+			|| ! WooThemes_Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
+			return;
+		}
+		$percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
+
+		echo $this->get_progress_meter( $percentage_completed );
+
+	}// end the_progress_meter
+
+	/**
+	 * Checks how many lessons are completed
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return array $completed_lesson_ids
+	 */
+	public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
+
+		$completed_lesson_ids = array();
+
+		$course_lessons = $this->course_lessons( $course_id );
+
+		foreach( $course_lessons as $lesson ){
+
+			$is_lesson_completed = WooThemes_Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
+			if( $is_lesson_completed ){
+				$completed_lesson_ids[] = $lesson->ID;
+			}
+
+		}
+
+		return $completed_lesson_ids;
+
+	}// end get_completed_lesson_ids
+
+	/**
+	 * Calculate the perceantage completed in the course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $course_id
+	 * @param int $user_id
+	 * @return int $percentage
+	 */
+	public function get_completion_percentage( $course_id, $user_id = 0 ){
+
+		if( !( intval( $user_id ) ) > 0 ){
+			$user_id = get_current_user_id();
+		}
 
-        $completed_lesson_ids = array();
+		$completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
 
-        $course_lessons = $this->course_lessons( $course_id );
+		if( ! (  $completed  > 0 ) ){
+			return 0;
+		}
 
-        foreach( $course_lessons as $lesson ){
+		$total_lessons = count( $this->course_lessons( $course_id ) );
+		$percentage = $completed / $total_lessons * 100;
 
-            $is_lesson_completed = WooThemes_Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
-            if( $is_lesson_completed ){
-                $completed_lesson_ids[] = $lesson->ID;
-            }
-
-        }
-
-        return $completed_lesson_ids;
+		/**
+		 *
+		 * Filter the percentage returned for a users course.
+		 *
+		 * @param $percentage
+		 * @param $course_id
+		 * @param $user_id
+		 * @since 1.8.0
+		 */
+		return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
 
-    }// end get_completed_lesson_ids
+	}// end get_completed_lesson_ids
 
-    /**
-     * Calculate the perceantage completed in the course
-     *
-     * @since 1.8.0
-     *
-     * @param int $course_id
-     * @param int $user_id
-     * @return int $percentage
-     */
-    public function get_completion_percentage( $course_id, $user_id = 0 ){
-
-        if( !( intval( $user_id ) ) > 0 ){
-            $user_id = get_current_user_id();
-        }
-
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-
-        if( ! (  $completed  > 0 ) ){
-            return 0;
-        }
-
-        $total_lessons = count( $this->course_lessons( $course_id ) );
-        $percentage = $completed / $total_lessons * 100;
-
-        /**
-         *
-         * Filter the percentage returned for a users course.
-         *
-         * @param $percentage
-         * @param $course_id
-         * @param $user_id
-         * @since 1.8.0
-         */
-        return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+	/**
+	 * Block email notifications for the specific courses
+	 * that the user disabled the notifications.
+	 *
+	 * @since 1.8.0
+	 * @param $should_send
+	 * @return bool
+	 */
+	public function block_notification_emails( $should_send ){
+		global $sensei_email_data;
+		$email = $sensei_email_data;
 
-    }// end get_completed_lesson_ids
+		$course_id = '';
 
-    /**
-     * Block email notifications for the specific courses
-     * that the user disabled the notifications.
-     *
-     * @since 1.8.0
-     * @param $should_send
-     * @return bool
-     */
-    public function block_notification_emails( $should_send ){
-        global $sensei_email_data;
-        $email = $sensei_email_data;
+		if( isset( $email['course_id'] ) ){
 
-        $course_id = '';
+			$course_id = $email['course_id'];
 
-        if( isset( $email['course_id'] ) ){
+		}elseif( isset( $email['lesson_id'] ) ){
 
-            $course_id = $email['course_id'];
+			$course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
 
-        }elseif( isset( $email['lesson_id'] ) ){
+		}elseif( isset( $email['quiz_id'] ) ){
 
-            $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+			$lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
+			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        }elseif( isset( $email['quiz_id'] ) ){
+		}
 
-            $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
 
-        }
+			$course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
 
-        if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
+			if ($course_emails_disabled) {
 
-            $course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
+				return false;
 
-            if ($course_emails_disabled) {
+			}
 
-                return false;
+		}// end if
 
-            }
+		return $should_send;
+	}// end block_notification_emails
 
-        }// end if
+	/**
+	 * Render the course notification setting meta box
+	 *
+	 * @since 1.8.0
+	 * @param $course
+	 */
+	public function course_notification_meta_box_content( $course ){
 
-        return $should_send;
-    }// end block_notification_emails
+		$checked = get_post_meta( $course->ID , 'disable_notification', true );
 
-    /**
-     * Render the course notification setting meta box
-     *
-     * @since 1.8.0
-     * @param $course
-     */
-    public function course_notification_meta_box_content( $course ){
+		// generate checked html
+		$checked_html = '';
+		if( $checked ){
+			$checked_html = 'checked="checked"';
+		}
+		wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
 
-        $checked = get_post_meta( $course->ID , 'disable_notification', true );
+		echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
+		echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
 
-        // generate checked html
-        $checked_html = '';
-        if( $checked ){
-            $checked_html = 'checked="checked"';
-        }
-        wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
+	}// end course_notification_meta_box_content
 
-        echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
-        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
-
-    }// end course_notification_meta_box_content
-
-    /**
-     * Store the setting for the course notification setting.
-     *
-     * @hooked int save_post
-     * @since 1.8.0
-     *
-     * @param $course_id
-     */
-    public function save_course_notification_meta_box( $course_id ){
+	/**
+	 * Store the setting for the course notification setting.
+	 *
+	 * @hooked int save_post
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 */
+	public function save_course_notification_meta_box( $course_id ){
 
-        if( !isset( $_POST['_sensei_course_notification']  )
-            || ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
-            return;
-        }
+		if( !isset( $_POST['_sensei_course_notification']  )
+			|| ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
+			return;
+		}
 
-        if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
-            $new_val = true;
-        }else{
-            $new_val = false;
-        }
+		if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
+			$new_val = true;
+		}else{
+			$new_val = false;
+		}
 
-       update_post_meta( $course_id , 'disable_notification', $new_val );
+	   update_post_meta( $course_id , 'disable_notification', $new_val );
 
-    }// end save notification meta box
+	}// end save notification meta box
 
-    /**
-     * Backwards compatibility hooks added to ensure that
-     * plugins and other parts of sensei still works.
-     *
-     * This function hooks into `sensei_course_content_inside_before`
-     *
-     * @since 1.9
-     *
-     * @param WP_Post $post
-     */
-    public function content_before_backwards_compatibility_hooks( $post ){
+	/**
+	 * Backwards compatibility hooks added to ensure that
+	 * plugins and other parts of sensei still works.
+	 *
+	 * This function hooks into `sensei_course_content_inside_before`
+	 *
+	 * @since 1.9
+	 *
+	 * @param WP_Post $post
+	 */
+	public function content_before_backwards_compatibility_hooks( $post ){
 
-        if( has_action( 'sensei_course_image' ) ){
+		if( has_action( 'sensei_course_image' ) ){
 
-            _doing_it_wrong('sensei_course_image','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
-            do_action('sensei_course_image', $post->ID );
+			_doing_it_wrong('sensei_course_image','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
+			do_action('sensei_course_image', $post->ID );
 
-        }
+		}
 
-        if( has_action( 'sensei_course_archive_course_title' ) ){
+		if( has_action( 'sensei_course_archive_course_title' ) ){
 
-            _doing_it_wrong('sensei_course_archive_course_title','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
-            do_action('sensei_course_archive_course_title', $post );
+			_doing_it_wrong('sensei_course_archive_course_title','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
+			do_action('sensei_course_archive_course_title', $post );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Backwards compatibility hooks that should be hooked into sensei_loop_course_before
-     *
-     * hooked into 'sensei_loop_course_before'
-     *
-     * @since 1.9
-     *
-     * @global WP_Post $post
-     */
-    public  function loop_before_backwards_compatibility_hooks( ){
-
-        global $post;
-        sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
-
-    }
-
-    /**
-     * Output a link to view course. The button text is different depending on the amount of preview lesson available.
-     *
-     * hooked into 'sensei_course_content_inside_after'
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Post $course
-     */
-    public function the_course_free_lesson_preview( $course ){
-        // Meta data
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-            ?>
+	/**
+	 * Backwards compatibility hooks that should be hooked into sensei_loop_course_before
+	 *
+	 * hooked into 'sensei_loop_course_before'
+	 *
+	 * @since 1.9
+	 *
+	 * @global WP_Post $post
+	 */
+	public  function loop_before_backwards_compatibility_hooks( ){
+
+		global $post;
+		sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
+
+	}
+
+	/**
+	 * Output a link to view course. The button text is different depending on the amount of preview lesson available.
+	 *
+	 * hooked into 'sensei_course_content_inside_after'
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Post $course
+	 */
+	public function the_course_free_lesson_preview( $course ){
+		// Meta data
+		$preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
+		$is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+
+		if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
+			?>
             <p class="sensei-free-lessons">
                 <a href="<?php echo get_permalink(); ?>">
                     <?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
@@ -1946,22 +1946,22 @@ 
             </p>
 
         <?php
-        }
-    }
+		}
+	}
 
-    /**
-     * Add course mata to the course meta hook
-     *
-     * @since 1.9.0
-     * @param WP_Post $course
-     */
-    public function the_course_meta( $course ){
-        echo '<p class="sensei-course-meta">';
+	/**
+	 * Add course mata to the course meta hook
+	 *
+	 * @since 1.9.0
+	 * @param WP_Post $course
+	 */
+	public function the_course_meta( $course ){
+		echo '<p class="sensei-course-meta">';
 
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+		$category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
+		$author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+		if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
 
             <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
 
@@ -1979,59 +1979,59 @@ 
 
         <?php } // End If Statement
 
-        // number of completed lessons
-        if( is_user_logged_in() ){
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
-        }
+		// number of completed lessons
+		if( is_user_logged_in() ){
+			$completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
+			$lesson_count = count( $this->course_lessons( $course->ID ) );
+			echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+		}
 
-        sensei_simple_course_price( $course->ID );
+		sensei_simple_course_price( $course->ID );
 
-        echo '</p>';
-    } // end the course meta
+		echo '</p>';
+	} // end the course meta
 
-    /**
-     * Filter the classes attached to a post types for courses
-     * and add a status class for when the user is logged in.
-     *
-     * @param $classes
-     * @param $class
-     * @param $post_id
-     *
-     * @return array $classes
-     */
-    public static function add_course_user_status_class( $classes, $class, $course_id ){
+	/**
+	 * Filter the classes attached to a post types for courses
+	 * and add a status class for when the user is logged in.
+	 *
+	 * @param $classes
+	 * @param $class
+	 * @param $post_id
+	 *
+	 * @return array $classes
+	 */
+	public static function add_course_user_status_class( $classes, $class, $course_id ){
 
-        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
+		if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
 
-            if( WooThemes_Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
+			if( WooThemes_Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
 
-                $classes[] = 'user-status-completed';
+				$classes[] = 'user-status-completed';
 
-            }else{
+			}else{
 
-                $classes[] = 'user-status-active';
+				$classes[] = 'user-status-active';
 
-            }
+			}
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end add_course_user_status_class
+	}// end add_course_user_status_class
 
-    /**
-     * Prints out the course action buttons links
-     *
-     * - complete course
-     * - delete course
-     *
-     * @param WP_Post $course
-     */
-    public static function the_course_action_buttons( $course ){
+	/**
+	 * Prints out the course action buttons links
+	 *
+	 * - complete course
+	 * - delete course
+	 *
+	 * @param WP_Post $course
+	 */
+	public static function the_course_action_buttons( $course ){
 
-        if( is_user_logged_in() ) { ?>
+		if( is_user_logged_in() ) { ?>
 
             <section class="entry-actions">
                 <form method="POST" action="<?php  echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>">
@@ -2050,32 +2050,32 @@ 
 
                    <?php  } // End If Statement
 
-                    $course_purchased = false;
-                    if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-                        // Get the product ID
-                        $wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+					$course_purchased = false;
+					if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+						// Get the product ID
+						$wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
+						if ( 0 < $wc_post_id ) {
 
-                            $user = wp_get_current_user();
-                            $course_purchased = WooThemes_Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
+							$user = wp_get_current_user();
+							$course_purchased = WooThemes_Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
 
-                        } // End If Statement
-                    } // End If Statement
+						} // End If Statement
+					} // End If Statement
 
-                    if ( ! $course_purchased && ! WooThemes_Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
+					if ( ! $course_purchased && ! WooThemes_Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
 
                         <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __( 'Delete Course', 'woothemes-sensei' ); ?>"/></span>
 
                     <?php } // End If Statement
 
-                    $has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
-                    $results_link = '';
-                    if( $has_quizzes ){
-                        $results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
-                    }
+					$has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
+					$results_link = '';
+					if( $has_quizzes ){
+						$results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
+					}
 
-                    // Output only if there is content to display
-                    if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+					// Output only if there is content to display
+					if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
 
                         <p class="sensei-results-links">
                             <?php echo apply_filters( 'sensei_results_links', $results_link ); ?>
@@ -2087,440 +2087,440 @@ 
 
         <?php  }// end if is user logged in
 
-    }// end the_course_action_buttons
-
-    /**
-     * This function alter the main query on the course archive page.
-     * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
-     *
-     * This function targets only the course archives and the my courses page. Shortcodes can set their own
-     * query parameters via the arguments.
-     *
-     * This function is hooked into pre_get_posts filter
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_query_filter( $query ){
-
-        // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
-            return $query;
-        }
-
-        global $post; // used to get the current page id for my courses
-
-        // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
-        {
-
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', get_option( 'posts_per_page' ) ) );
-
-        }
-        // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
-        {
-
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', get_option( 'posts_per_page' ) ) );
-
-        }
-
-        return $query;
-
-    }// end course_query_filter
-
-    /**
-     * Determine the class of the course loop
-     *
-     * This will output .first or .last and .course-item-number-x
-     *
-     * @return array $extra_classes
-     * @since 1.9.0
-     */
-    public static function get_course_loop_content_class ()
-    {
-
-        global $sensei_course_loop;
-
-
-        if( !isset( $sensei_course_loop ) ){
-            $sensei_course_loop = array();
-        }
-
-        if (!isset($sensei_course_loop['counter'])) {
-            $sensei_course_loop['counter'] = 0;
-        }
-
-        if (!isset($sensei_course_loop['columns'])) {
-            $sensei_course_loop['columns'] = self::get_loop_number_of_columns();
-        }
-
-        // increment the counter
-        $sensei_course_loop['counter']++;
-
-        $extra_classes = array();
-        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'first';
-        }
-
-        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
-            $extra_classes[] = 'last';
-        }
-
-        // add the item number to the classes as well.
-        $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
-
-        /**
-         * Filter the course loop class the fires in the  in get_course_loop_content_class function
-         * which is called from the course loop content-course.php
-         *
-         * @since 1.9.0
-         *
-         * @param array $extra_classes
-         * @param WP_Post $loop_current_course
-         */
-        return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
-
-    }// end get_course_loop_class
-
-    /**
-     * Get the number of columns set for Sensei courses
-     *
-     * @since 1.9.0
-     * @return mixed|void
-     */
-    public static function get_loop_number_of_columns(){
-
-        /**
-         * Filter the number of columns on the course archive page.
-         *
-         * @since 1.9.0
-         * @param int $number_of_columns default 1
-         */
-        return apply_filters('sensei_course_loop_number_of_columns', 1);
-
-    }
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_sorting( $query ){
-
-        // don't show on category pages and other pages
-        if( ! is_archive(  'course ') || is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * Filter the sensei archive course order by values
-         *
-         * @since 1.9.0
-         * @param array $options {
-         *  @type string $option_value
-         *  @type string $option_string
-         * }
-         */
-        $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
-            "newness"     => __( "Sort by newest first", "woothemes-sensei"),
-            "title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
-        ));
-
-        // setup the currently selected item
-        $selected = 'newness';
-        if( isset( $_GET['orderby'] ) ){
-
-            $selected =  $_GET[ 'orderby' ];
-
-        }
-
-        ?>
+	}// end the_course_action_buttons
+
+	/**
+	 * This function alter the main query on the course archive page.
+	 * This also gives Sensei specific filters that allows variables to be altered specifically on the course archive.
+	 *
+	 * This function targets only the course archives and the my courses page. Shortcodes can set their own
+	 * query parameters via the arguments.
+	 *
+	 * This function is hooked into pre_get_posts filter
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_query_filter( $query ){
+
+		// exit early for no course queries and admin queries
+		if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+			return $query;
+		}
+
+		global $post; // used to get the current page id for my courses
+
+		// for the course archive page
+		if( $query->is_main_query() && is_post_type_archive('course') )
+		{
+
+			$query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', get_option( 'posts_per_page' ) ) );
+
+		}
+		// for the my courses page
+		elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+		{
+
+			$query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', get_option( 'posts_per_page' ) ) );
+
+		}
+
+		return $query;
+
+	}// end course_query_filter
+
+	/**
+	 * Determine the class of the course loop
+	 *
+	 * This will output .first or .last and .course-item-number-x
+	 *
+	 * @return array $extra_classes
+	 * @since 1.9.0
+	 */
+	public static function get_course_loop_content_class ()
+	{
+
+		global $sensei_course_loop;
+
+
+		if( !isset( $sensei_course_loop ) ){
+			$sensei_course_loop = array();
+		}
+
+		if (!isset($sensei_course_loop['counter'])) {
+			$sensei_course_loop['counter'] = 0;
+		}
+
+		if (!isset($sensei_course_loop['columns'])) {
+			$sensei_course_loop['columns'] = self::get_loop_number_of_columns();
+		}
+
+		// increment the counter
+		$sensei_course_loop['counter']++;
+
+		$extra_classes = array();
+		if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'first';
+		}
+
+		if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
+			$extra_classes[] = 'last';
+		}
+
+		// add the item number to the classes as well.
+		$extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
+
+		/**
+		 * Filter the course loop class the fires in the  in get_course_loop_content_class function
+		 * which is called from the course loop content-course.php
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param array $extra_classes
+		 * @param WP_Post $loop_current_course
+		 */
+		return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
+
+	}// end get_course_loop_class
+
+	/**
+	 * Get the number of columns set for Sensei courses
+	 *
+	 * @since 1.9.0
+	 * @return mixed|void
+	 */
+	public static function get_loop_number_of_columns(){
+
+		/**
+		 * Filter the number of columns on the course archive page.
+		 *
+		 * @since 1.9.0
+		 * @param int $number_of_columns default 1
+		 */
+		return apply_filters('sensei_course_loop_number_of_columns', 1);
+
+	}
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_sorting( $query ){
+
+		// don't show on category pages and other pages
+		if( ! is_archive(  'course ') || is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * Filter the sensei archive course order by values
+		 *
+		 * @since 1.9.0
+		 * @param array $options {
+		 *  @type string $option_value
+		 *  @type string $option_string
+		 * }
+		 */
+		$course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
+			"newness"     => __( "Sort by newest first", "woothemes-sensei"),
+			"title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
+		));
+
+		// setup the currently selected item
+		$selected = 'newness';
+		if( isset( $_GET['orderby'] ) ){
+
+			$selected =  $_GET[ 'orderby' ];
+
+		}
+
+		?>
 
         <form class="sensei-ordering" name="sensei-course-order" action="<?php echo WooThemes_Sensei_Utils::get_current_url(); ?>" method="POST">
             <select name="course-orderby" class="orderby">
                 <?php
-                foreach( $course_order_by_options as $value => $text ){
+				foreach( $course_order_by_options as $value => $text ){
 
-                    echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
+					echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
 
-                }
-                ?>
+				}
+				?>
             </select>
         </form>
 
     <?php
-    }// end course archive filters
-
-    /**
-     * Output the course archive filter markup
-     *
-     * hooked into sensei_loop_course_before
-     *
-     * @since 1.9.0
-     * @param
-     */
-    public static function course_archive_filters( $query ){
-
-        // don't show on category pages
-        if( is_tax('course-category') ){
-            return;
-        }
-
-        /**
-         * filter the course archive filter buttons
-         *
-         * @since 1.9.0
-         * @param array $filters{
-         *   @type array ( $id, $url , $title )
-         * }
-         *
-         */
-        $filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
-            array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
-            array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
-        ));
-
-
-        ?>
+	}// end course archive filters
+
+	/**
+	 * Output the course archive filter markup
+	 *
+	 * hooked into sensei_loop_course_before
+	 *
+	 * @since 1.9.0
+	 * @param
+	 */
+	public static function course_archive_filters( $query ){
+
+		// don't show on category pages
+		if( is_tax('course-category') ){
+			return;
+		}
+
+		/**
+		 * filter the course archive filter buttons
+		 *
+		 * @since 1.9.0
+		 * @param array $filters{
+		 *   @type array ( $id, $url , $title )
+		 * }
+		 *
+		 */
+		$filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
+			array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
+			array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
+		));
+
+
+		?>
         <ul class="sensei-course-filters clearfix" >
             <?php
 
-            //determine the current active url
-            $current_url = WooThemes_Sensei_Utils::get_current_url();
+			//determine the current active url
+			$current_url = WooThemes_Sensei_Utils::get_current_url();
 
-            foreach( $filters as $filter ) {
+			foreach( $filters as $filter ) {
 
-                $active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
+				$active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
 
-                echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
+				echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
 
-            }
-            ?>
+			}
+			?>
 
         </ul>
 
         <?php
 
-    }
+	}
 
-    /**
-     * if the featured link is clicked on the course archive page
-     * filter the courses returned to only show those featured
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_featured_filter( $query ){
-
-        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
-            //setup meta query for featured courses
-            $query->set( 'meta_value', 'featured'  );
-            $query->set( 'meta_key', '_course_featured'  );
-            $query->set( 'meta_compare', '='  );
-        }
-
-        return $query;
-    }
-
-    /**
-     * if the course order drop down is changed
-     *
-     * Hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_order_by_title( $query ){
-
-        if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
-            && 'course'== $query->get('post_type') && $query->is_main_query()  ){
-            // setup the order by title for this query
-            $query->set( 'orderby', 'title'  );
-            $query->set( 'order', 'ASC'  );
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Get the link to the courses page. This will be the course post type archive
-     * page link or the page the user set in their settings
-     *
-     * @since 1.9.0
-     * @return string $course_page_url
-     */
-    public static function get_courses_page_url(){
-
-        $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
+	/**
+	 * if the featured link is clicked on the course archive page
+	 * filter the courses returned to only show those featured
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_featured_filter( $query ){
 
-        return $course_page_url;
-
-    }// get_course_url
+		if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
+			//setup meta query for featured courses
+			$query->set( 'meta_value', 'featured'  );
+			$query->set( 'meta_key', '_course_featured'  );
+			$query->set( 'meta_compare', '='  );
+		}
 
-    /**
-     * Output the headers on the course archive page
-     *
-     * Hooked into the sensei_archive_title
-     *
-     * @since 1.9.0
-     * @param string $query_type
-     * @param string $before_html
-     * @param string $after_html
-     * @return void
-     */
-    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+		return $query;
+	}
 
-        if( ! is_post_type_archive('course') ){
-            return;
-        }
+	/**
+	 * if the course order drop down is changed
+	 *
+	 * Hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_order_by_title( $query ){
 
-        // deprecated since 1.9.0
-        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
+		if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
+			&& 'course'== $query->get('post_type') && $query->is_main_query()  ){
+			// setup the order by title for this query
+			$query->set( 'orderby', 'title'  );
+			$query->set( 'order', 'ASC'  );
+		}
 
-        $html = '';
+		return $query;
+	}
 
-        if( empty( $before_html ) ){
 
-            $before_html = '<header class="archive-header"><h1>';
+	/**
+	 * Get the link to the courses page. This will be the course post type archive
+	 * page link or the page the user set in their settings
+	 *
+	 * @since 1.9.0
+	 * @return string $course_page_url
+	 */
+	public static function get_courses_page_url(){
 
-        }
+		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
+		$course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
 
-        if( empty( $after_html ) ){
+		return $course_page_url;
 
-            $after_html = '</h1></header>';
+	}// get_course_url
 
-        }
+	/**
+	 * Output the headers on the course archive page
+	 *
+	 * Hooked into the sensei_archive_title
+	 *
+	 * @since 1.9.0
+	 * @param string $query_type
+	 * @param string $before_html
+	 * @param string $after_html
+	 * @return void
+	 */
+	public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
 
-        if ( is_tax( 'course-category' ) ) {
+		if( ! is_post_type_archive('course') ){
+			return;
+		}
 
-            global $wp_query;
+		// deprecated since 1.9.0
+		sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
 
-            $taxonomy_obj = $wp_query->get_queried_object();
-            $taxonomy_short_name = $taxonomy_obj->taxonomy;
-            $taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
-            $title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
-            echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
-            return;
+		$html = '';
 
-        } // End If Statement
+		if( empty( $before_html ) ){
 
-        switch ( $query_type ) {
-            case 'newcourses':
-                $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'featuredcourses':
-                $html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'freecourses':
-                $html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            case 'paidcourses':
-                $html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-            default:
-                $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
-                break;
-        } // End Switch Statement
+			$before_html = '<header class="archive-header"><h1>';
 
-        echo apply_filters( 'course_archive_title', $html );
+		}
 
-    }//course_archive_header
+		if( empty( $after_html ) ){
 
+			$after_html = '</h1></header>';
 
-    /**
-     * Filter the single course content
-     * taking into account if the user has access.
-     *
-     * @1.9.0
-     *
-     * @param string $content
-     * @return string $content or $excerpt
-     */
-    public static function single_course_content( $content ){
+		}
 
-        if( ! is_singular('course') ){
+		if ( is_tax( 'course-category' ) ) {
 
-            return $content;
+			global $wp_query;
 
-        }
+			$taxonomy_obj = $wp_query->get_queried_object();
+			$taxonomy_short_name = $taxonomy_obj->taxonomy;
+			$taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
+			$title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
+			echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
+			return;
 
-        // Content Access Permissions
-        $access_permission = false;
+		} // End If Statement
 
-        if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+		switch ( $query_type ) {
+			case 'newcourses':
+				$html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'featuredcourses':
+				$html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'freecourses':
+				$html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			case 'paidcourses':
+				$html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+			default:
+				$html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
+				break;
+		} // End Switch Statement
 
-            $access_permission = true;
+		echo apply_filters( 'course_archive_title', $html );
 
-        } // End If Statement
+	}//course_archive_header
+
+
+	/**
+	 * Filter the single course content
+	 * taking into account if the user has access.
+	 *
+	 * @1.9.0
+	 *
+	 * @param string $content
+	 * @return string $content or $excerpt
+	 */
+	public static function single_course_content( $content ){
 
-        // Check if the user is taking the course
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
+		if( ! is_singular('course') ){
 
-        if(WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
+			return $content;
 
-            $wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
-            $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		}
 
-            $has_product_attached = isset ( $product ) && is_object ( $product );
+		// Content Access Permissions
+		$access_permission = false;
 
-        } else {
+		if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-            $has_product_attached = false;
+			$access_permission = true;
 
-        }
+		} // End If Statement
 
-        if ( ( is_user_logged_in() && $is_user_taking_course )
-            || ( $access_permission && !$has_product_attached)
-            || 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
+		// Check if the user is taking the course
+		$is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
 
-            return $content;
+		if(WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
 
-        } else {
+			$wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
+			$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-            return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
+			$has_product_attached = isset ( $product ) && is_object ( $product );
 
-        }
+		} else {
 
-    }// end single_course_content
+			$has_product_attached = false;
 
-    /**
-     * Output the the single course lessons title with markup.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_lessons_title(){
-        global $post;
-        $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
-        $course_lessons = Sensei()->course->course_lessons( $post->ID );
+		}
 
-        // title should be Other Lessons if there are lessons belonging to models.
-        $title = __('Other Lessons', 'woothemes-sensei');
-        if( count( $course_lessons ) == count( $none_module_lessons )  ){
+		if ( ( is_user_logged_in() && $is_user_taking_course )
+			|| ( $access_permission && !$has_product_attached)
+			|| 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
 
-            $title = __('Lessons', 'woothemes-sensei');
+			return $content;
 
-        }
+		} else {
 
-        /**
-         * hook document in class-woothemes-sensei-message.php
-         */
-        $title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+			return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
 
-        ob_start(); // start capturing the following output.
+		}
 
-        ?>
+	}// end single_course_content
+
+	/**
+	 * Output the the single course lessons title with markup.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_lessons_title(){
+		global $post;
+		$none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
+		$course_lessons = Sensei()->course->course_lessons( $post->ID );
+
+		// title should be Other Lessons if there are lessons belonging to models.
+		$title = __('Other Lessons', 'woothemes-sensei');
+		if( count( $course_lessons ) == count( $none_module_lessons )  ){
+
+			$title = __('Lessons', 'woothemes-sensei');
+
+		}
+
+		/**
+		 * hook document in class-woothemes-sensei-message.php
+		 */
+		$title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+
+		ob_start(); // start capturing the following output.
+
+		?>
 
             <header>
                 <h2> <?php echo $title; ?> </h2>
@@ -2528,277 +2528,277 @@ 
 
         <?php
 
-        /**
-         * Filter the title and markup that appears above the lessons on a single course
-         * page.
-         *
-         * @since 1.9.0
-         * @param string $lessons_title_html
-         */
-        echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
-
-    }// end the_course_lessons_title
-
-    /**
-     * This function loads the global wp_query object with with lessons
-     * of the current course. It is designed to be used on the single-course template
-     * and expects the global post to be a singular course.
-     *
-     * This function excludes lessons belonging to modules as they are
-     * queried separately.
-     *
-     * @since 1.9.0
-     * @global $wp_query
-     */
-    public static function load_single_course_lessons_query(){
+		/**
+		 * Filter the title and markup that appears above the lessons on a single course
+		 * page.
+		 *
+		 * @since 1.9.0
+		 * @param string $lessons_title_html
+		 */
+		echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
 
-        global $post, $wp_query;
+	}// end the_course_lessons_title
 
-        $course_id = $post->ID;
-
-        if( 'course' != get_post_type( $course_id ) ){
-            return;
-        }
+	/**
+	 * This function loads the global wp_query object with with lessons
+	 * of the current course. It is designed to be used on the single-course template
+	 * and expects the global post to be a singular course.
+	 *
+	 * This function excludes lessons belonging to modules as they are
+	 * queried separately.
+	 *
+	 * @since 1.9.0
+	 * @global $wp_query
+	 */
+	public static function load_single_course_lessons_query(){
 
-        $course_lesson_query_args = array(
-            'post_type'         => 'lesson',
-            'posts_per_page'    => 500,
-            'orderby'           => 'date',
-            'order'             => 'ASC',
-            'meta_query'        => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
-                ),
-            ),
-            'post_status'       => 'public',
-            'suppress_filters'  => 0,
-        );
+		global $post, $wp_query;
 
-        // Exclude lessons belonging to modules as they are queried along with the modules.
-        $modules = Sensei()->modules->get_course_modules( $course_id );
-        if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+		$course_id = $post->ID;
 
-            $terms_ids = array();
-            foreach( $modules as $term ){
+		if( 'course' != get_post_type( $course_id ) ){
+			return;
+		}
 
-                $terms_ids[] = $term->term_id;
+		$course_lesson_query_args = array(
+			'post_type'         => 'lesson',
+			'posts_per_page'    => 500,
+			'orderby'           => 'date',
+			'order'             => 'ASC',
+			'meta_query'        => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => intval( $course_id ),
+				),
+			),
+			'post_status'       => 'public',
+			'suppress_filters'  => 0,
+		);
+
+		// Exclude lessons belonging to modules as they are queried along with the modules.
+		$modules = Sensei()->modules->get_course_modules( $course_id );
+		if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+
+			$terms_ids = array();
+			foreach( $modules as $term ){
+
+				$terms_ids[] = $term->term_id;
 
-            }
+			}
 
-            $course_lesson_query_args[ 'tax_query'] = array(
-                array(
-                    'taxonomy' => 'module',
-                    'field'    => 'id',
-                    'terms'    => $terms_ids,
-                    'operator' => 'NOT IN',
-                ),
-            );
-        }
+			$course_lesson_query_args[ 'tax_query'] = array(
+				array(
+					'taxonomy' => 'module',
+					'field'    => 'id',
+					'terms'    => $terms_ids,
+					'operator' => 'NOT IN',
+				),
+			);
+		}
 
-        $wp_query = new WP_Query( $course_lesson_query_args );
+		$wp_query = new WP_Query( $course_lesson_query_args );
 
-    }// load_single_course_lessons
+	}// load_single_course_lessons
 
-    /**
-     * Flush the rewrite rules for a course post type
-     *
-     * @since 1.9.0
-     *
-     * @param $post_id
-     */
-    public static function flush_rewrite_rules( $post_id ){
+	/**
+	 * Flush the rewrite rules for a course post type
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $post_id
+	 */
+	public static function flush_rewrite_rules( $post_id ){
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
 
-            return;
+			return;
 
-        }
+		}
 
 
-        if( 'course' == get_post_type( $post_id )  ){
+		if( 'course' == get_post_type( $post_id )  ){
 
-            Sensei()->initiate_rewrite_rules_flush();
+			Sensei()->initiate_rewrite_rules_flush();
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Optionally return the full content on the single course pages
-     * depending on the users course_single_content_display setting
-     *
-     * @since 1.9.0
-     * @param $excerpt
-     * @return string
-     */
-    public static function full_content_excerpt_override( $excerpt ){
+	/**
+	 * Optionally return the full content on the single course pages
+	 * depending on the users course_single_content_display setting
+	 *
+	 * @since 1.9.0
+	 * @param $excerpt
+	 * @return string
+	 */
+	public static function full_content_excerpt_override( $excerpt ){
 
-        if (   is_singular('course')  &&
-                'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
+		if (   is_singular('course')  &&
+				'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
 
-            return get_the_content();
+			return get_the_content();
 
-        } else {
+		} else {
 
-            return $excerpt;
+			return $excerpt;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Output the course actions like start taking course, register, add to cart etc.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_enrolment_actions(){
-        ?>
+	/**
+	 * Output the course actions like start taking course, register, add to cart etc.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_enrolment_actions(){
+		?>
         <section class="course-meta course-enrolment">
         <?php
-        global  $post, $current_user;
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
-        if ( is_user_logged_in() && ! $is_user_taking_course ) {
-
-            // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-
-            // Check for woocommerce
-            if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
-                sensei_wc_add_to_cart($post->ID);
-            } else {
-                sensei_start_course_form($post->ID);
-            } // End If Statement
-
-        } elseif ( is_user_logged_in() ) {
-
-            // Check if course is completed
-            $user_course_status = WooThemes_Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
-            $completed_course = WooThemes_Sensei_Utils::user_completed_course( $user_course_status );
-            // Success message
-            if ( $completed_course ) { ?>
+		global  $post, $current_user;
+		$is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		if ( is_user_logged_in() && ! $is_user_taking_course ) {
+
+			// Get the product ID
+			$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+
+			// Check for woocommerce
+			if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
+				sensei_wc_add_to_cart($post->ID);
+			} else {
+				sensei_start_course_form($post->ID);
+			} // End If Statement
+
+		} elseif ( is_user_logged_in() ) {
+
+			// Check if course is completed
+			$user_course_status = WooThemes_Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
+			$completed_course = WooThemes_Sensei_Utils::user_completed_course( $user_course_status );
+			// Success message
+			if ( $completed_course ) { ?>
                 <div class="status completed"><?php  _e( 'Completed', 'woothemes-sensei' ); ?></div>
                 <?php
-                $has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
-                if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+				$has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
+				if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
                     <p class="sensei-results-links">
                         <?php
-                        $results_link = '';
-                        if( $has_quizzes ) {
-                            $results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
-                        }
-                        $results_link = apply_filters( 'sensei_results_links', $results_link );
-                        echo $results_link;
-                        ?></p>
+						$results_link = '';
+						if( $has_quizzes ) {
+							$results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
+						}
+						$results_link = apply_filters( 'sensei_results_links', $results_link );
+						echo $results_link;
+						?></p>
                 <?php } ?>
             <?php } else { ?>
                 <div class="status in-progress"><?php echo __( 'In Progress', 'woothemes-sensei' ); ?></div>
             <?php }
 
-        } else {
-            // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-            // Check for woocommerce
-            if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
+		} else {
+			// Get the product ID
+			$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+			// Check for woocommerce
+			if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
 
-                sensei_wc_add_to_cart($post->ID);
+				sensei_wc_add_to_cart($post->ID);
 
-            } else {
+			} else {
 
-                if( get_option( 'users_can_register') ) {
+				if( get_option( 'users_can_register') ) {
 
 
-                    $my_courses_page_id = '';
+					$my_courses_page_id = '';
 
-                    /**
-                     * Filter to force Sensei to output the default WordPress user
-                     * registration link.
-                     *
-                     * @since 1.9.0
-                     * @param bool $wp_register_link default false
-                     */
+					/**
+					 * Filter to force Sensei to output the default WordPress user
+					 * registration link.
+					 *
+					 * @since 1.9.0
+					 * @param bool $wp_register_link default false
+					 */
 
-                    $wp_register_link = apply_filters('sensei_use_wp_register_link', false);
+					$wp_register_link = apply_filters('sensei_use_wp_register_link', false);
 
-                    $settings = Sensei()->settings->get_settings();
-                    if( isset( $settings[ 'my_course_page' ] )
-                        && 0 < intval( $settings[ 'my_course_page' ] ) ){
+					$settings = Sensei()->settings->get_settings();
+					if( isset( $settings[ 'my_course_page' ] )
+						&& 0 < intval( $settings[ 'my_course_page' ] ) ){
 
-                        $my_courses_page_id = $settings[ 'my_course_page' ];
+						$my_courses_page_id = $settings[ 'my_course_page' ];
 
-                    }
+					}
 
-                    // If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
-                    // is false, link to My Courses. If not, link to default WordPress registration page.
-                    if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
+					// If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
+					// is false, link to My Courses. If not, link to default WordPress registration page.
+					if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
 
-                        $my_courses_url = get_permalink( $my_courses_page_id  );
-                        $register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
-                        echo '<div class="status register">' . $register_link . '</div>' ;
+						$my_courses_url = get_permalink( $my_courses_page_id  );
+						$register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
+						echo '<div class="status register">' . $register_link . '</div>' ;
 
-                    } else{
+					} else{
 
-                        wp_register( '<div class="status register">', '</div>' );
+						wp_register( '<div class="status register">', '</div>' );
 
-                    }
+					}
 
-                } // end if user can register
+				} // end if user can register
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement ?>
+		} // End If Statement ?>
 
         </section><?php
 
-    }// end the_course_enrolment_actions
+	}// end the_course_enrolment_actions
 
-    /**
-     * Output the course video inside the loop.
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_video(){
+	/**
+	 * Output the course video inside the loop.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_video(){
 
-        global $post;
-        // Get the meta info
-        $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+		global $post;
+		// Get the meta info
+		$course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
 
-        if ( 'http' == substr( $course_video_embed, 0, 4) ) {
+		if ( 'http' == substr( $course_video_embed, 0, 4) ) {
 
-            $course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
+			$course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
 
-        } // End If Statement
+		} // End If Statement
 
-        if ( '' != $course_video_embed ) { ?>
+		if ( '' != $course_video_embed ) { ?>
 
             <div class="course-video">
                 <?php echo html_entity_decode($course_video_embed); ?>
             </div>
 
         <?php } // End If Statement
-    }
+	}
 
-    /**
-     * Output the title for the single lesson page
-     *
-     * @global $post
-     * @since 1.9.0
-     */
-    public static function the_title(){
+	/**
+	 * Output the title for the single lesson page
+	 *
+	 * @global $post
+	 * @since 1.9.0
+	 */
+	public static function the_title(){
 
-        global $post;
+		global $post;
 
-        ?>
+		?>
         <header>
 
             <h1>
 
                 <?php
-                /**
-                 * Filter documented in class-sensei-messages.php the_title
-                 */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
-                ?>
+				/**
+				 * Filter documented in class-sensei-messages.php the_title
+				 */
+				echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+				?>
 
             </h1>
 
@@ -2806,111 +2806,111 @@ 
 
         <?php
 
-    }//the_title
-
-    /**
-     * Show the title on the course category pages
-     *
-     * @since 1.9.0
-     */
-    public static function course_category_title(){
-
-        if( ! is_tax( 'course-category' ) ){
-            return;
-        }
-
-        $category_slug = get_query_var('course-category');
-        $term  = get_term_by('slug',$category_slug,'course-category');
-
-        if( ! empty($term) ){
-
-            $title = $term->name;
-
-        }else{
-
-            $title = 'Course Category';
-
-        }
-
-        $html = '<h2 class="sensei-category-title">';
-        $html .= __('Category') . ' ' . $title;
-        $html .= '</h2>';
-
-        echo apply_filters( 'course_category_title', $html , $term->term_id );
-
-    }// course_category_title
-
-    /**
-     * Alter the course query to respect the order set for courses and apply
-     * this on the course-category pages.
-     *
-     * @since 1.9.0
-     *
-     * @param WP_Query $query
-     * @return WP_Query
-     */
-    public static function alter_course_category_order( $query ){
-
-        if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
-            return $query;
-        }
-
-        $order = get_option( 'sensei_course_order', '' );
-        if( !empty( $order )  ){
-            $query->set('orderby', 'menu_order' );
-            $query->set('order', 'ASC' );
-        }
-
-        return $query;
-
-    }
-
-    /**
-     * The very basic course query arguments
-     * so we don't have to repeat this througout
-     * the code base.
-     *
-     * Usage:
-     * $args = Sensei_Course::get_default_query_args();
-     * $args['custom_arg'] ='custom value';
-     * $courses = get_posts( $args )
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_default_query_args(){
-        return array(
-            'post_type' 		=> 'course',
-            'posts_per_page' 		=> 1000,
-            'orderby'         	=> 'date',
-            'order'           	=> 'DESC',
-            'suppress_filters' 	=> 0
-        );
-    }
-
-    /**
-     * Check if the prerequisite course is completed
-     * Courses with no pre-requisite should always return true
-     *
-     * @since 1.9.0
-     * @param $course_id
-     * @return bool
-     */
-    public static function is_prerequisite_complete( $course_id ){
-
-        $course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
-
-        // if it has a pre requisite course check it
-        if( ! empty(  $course_prerequisite_id ) ){
-
-            return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
-
-        }
-
-        return true;
-
-    }// end is_prerequisite_complete
+	}//the_title
+
+	/**
+	 * Show the title on the course category pages
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_category_title(){
+
+		if( ! is_tax( 'course-category' ) ){
+			return;
+		}
+
+		$category_slug = get_query_var('course-category');
+		$term  = get_term_by('slug',$category_slug,'course-category');
+
+		if( ! empty($term) ){
+
+			$title = $term->name;
+
+		}else{
+
+			$title = 'Course Category';
+
+		}
+
+		$html = '<h2 class="sensei-category-title">';
+		$html .= __('Category') . ' ' . $title;
+		$html .= '</h2>';
+
+		echo apply_filters( 'course_category_title', $html , $term->term_id );
+
+	}// course_category_title
+
+	/**
+	 * Alter the course query to respect the order set for courses and apply
+	 * this on the course-category pages.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query
+	 */
+	public static function alter_course_category_order( $query ){
+
+		if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
+			return $query;
+		}
+
+		$order = get_option( 'sensei_course_order', '' );
+		if( !empty( $order )  ){
+			$query->set('orderby', 'menu_order' );
+			$query->set('order', 'ASC' );
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * The very basic course query arguments
+	 * so we don't have to repeat this througout
+	 * the code base.
+	 *
+	 * Usage:
+	 * $args = Sensei_Course::get_default_query_args();
+	 * $args['custom_arg'] ='custom value';
+	 * $courses = get_posts( $args )
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_default_query_args(){
+		return array(
+			'post_type' 		=> 'course',
+			'posts_per_page' 		=> 1000,
+			'orderby'         	=> 'date',
+			'order'           	=> 'DESC',
+			'suppress_filters' 	=> 0
+		);
+	}
+
+	/**
+	 * Check if the prerequisite course is completed
+	 * Courses with no pre-requisite should always return true
+	 *
+	 * @since 1.9.0
+	 * @param $course_id
+	 * @return bool
+	 */
+	public static function is_prerequisite_complete( $course_id ){
+
+		$course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
+
+		// if it has a pre requisite course check it
+		if( ! empty(  $course_prerequisite_id ) ){
+
+			return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
+
+		}
+
+		return true;
+
+	}// end is_prerequisite_complete
 
 
 }// End Class

Spacing +641 added lines, -641 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Course Class
@@ -33,69 +33,69 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 		// Setup meta fields for this post type
-		$this->meta_fields = array( 'course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product' );
+		$this->meta_fields = array('course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product');
 		// Admin actions
-		if ( is_admin() ) {
+		if (is_admin()) {
 			// Metabox functions
-            add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 );
-			add_action( 'save_post', array( $this, 'meta_box_save' ) );
+            add_action('add_meta_boxes', array($this, 'meta_box_setup'), 20);
+			add_action('save_post', array($this, 'meta_box_save'));
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-course_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
+			add_filter('manage_edit-course_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
 		} else {
 			$this->my_courses_page = false;
 		} // End If Statement
 
 		// Update course completion upon completion of a lesson
-		add_action( 'sensei_user_lesson_end', array( $this, 'update_status_after_lesson_change' ), 10, 2 );
+		add_action('sensei_user_lesson_end', array($this, 'update_status_after_lesson_change'), 10, 2);
 		// Update course completion upon reset of a lesson
-		add_action( 'sensei_user_lesson_reset', array( $this, 'update_status_after_lesson_change' ), 10, 2 );
+		add_action('sensei_user_lesson_reset', array($this, 'update_status_after_lesson_change'), 10, 2);
 		// Update course completion upon grading of a quiz
-		add_action( 'sensei_user_quiz_grade', array( $this, 'update_status_after_quiz_submission' ), 10, 2 );
+		add_action('sensei_user_quiz_grade', array($this, 'update_status_after_quiz_submission'), 10, 2);
 
         // show the progress bar ont he single course page
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 );
-        add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 );
+        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_statement'), 15);
+        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_meter'), 16);
 
         // provide an option to block all emails related to a selected course
-        add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) );
-        add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) );
+        add_filter('sensei_send_emails', array($this, 'block_notification_emails'));
+        add_action('save_post', array($this, 'save_course_notification_meta_box'));
 
         // preview lessons on the course content
-        add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) );
+        add_action('sensei_course_content_inside_after', array($this, 'the_course_free_lesson_preview'));
 
         // the course meta
-        add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) );
+        add_action('sensei_course_content_inside_before', array($this, 'the_course_meta'));
 
         // backwards compatible template hooks
-        add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' ));
-        add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) );
+        add_action('sensei_course_content_inside_before', array($this, 'content_before_backwards_compatibility_hooks'));
+        add_action('sensei_loop_course_before', array($this, 'loop_before_backwards_compatibility_hooks'));
 
         // add the user status on the course to the markup as a class
-        add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 );
+        add_filter('post_class', array(__CLASS__, 'add_course_user_status_class'), 20, 3);
 
         //filter the course query in Sensei specific instances
-        add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) );
+        add_filter('pre_get_posts', array(__CLASS__, 'course_query_filter'));
 
         //attache the sorting to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) );
+        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_sorting'));
 
         //attach the filter links to the course archive
-        add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) );
+        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_filters'));
 
         //filter the course query when featured filter is applied
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_featured_filter'));
+        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_featured_filter'));
 
         // handle the order by title post submission
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'course_archive_order_by_title'));
+        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_order_by_title'));
 
         // ensure the course category page respects the manual order set for courses
-        add_filter( 'pre_get_posts',  array( __CLASS__, 'alter_course_category_order'));
+        add_filter('pre_get_posts', array(__CLASS__, 'alter_course_category_order'));
 
         // flush rewrite rules when saving a course
-        add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) );
+        add_action('save_post', array('Sensei_Course', 'flush_rewrite_rules'));
 
 	} // End __construct()
 
@@ -105,10 +105,10 @@ 
 	 * @param type $user_id
 	 * @param type $quiz_id
 	 */
-	public function update_status_after_quiz_submission( $user_id, $quiz_id ) {
-		if ( intval( $user_id ) > 0 && intval( $quiz_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$this->update_status_after_lesson_change( $user_id, $lesson_id );
+	public function update_status_after_quiz_submission($user_id, $quiz_id) {
+		if (intval($user_id) > 0 && intval($quiz_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$this->update_status_after_lesson_change($user_id, $lesson_id);
 		}
 	}
 
@@ -118,12 +118,12 @@ 
 	 * @param int $user_id
 	 * @param int $lesson_id
 	 */
-	public function update_status_after_lesson_change( $user_id, $lesson_id ) {
-		if ( intval( $user_id ) > 0 && intval( $lesson_id ) > 0 ) {
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if ( intval( $course_id ) > 0 ) {
+	public function update_status_after_lesson_change($user_id, $lesson_id) {
+		if (intval($user_id) > 0 && intval($lesson_id) > 0) {
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if (intval($course_id) > 0) {
 				// Updates the Course status and it's meta data
-				WooThemes_Sensei_Utils::user_complete_course( $course_id, $user_id );
+				WooThemes_Sensei_Utils::user_complete_course($course_id, $user_id);
 			}
 		}
 	}
@@ -134,27 +134,27 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function meta_box_setup () {
+	public function meta_box_setup() {
 
-		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+		if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
 			// Add Meta Box for WooCommerce Course
-			add_meta_box( 'course-wc-product', __( 'WooCommerce Product', 'woothemes-sensei' ), array( $this, 'course_woocommerce_product_meta_box_content' ), $this->token, 'side', 'default' );
+			add_meta_box('course-wc-product', __('WooCommerce Product', 'woothemes-sensei'), array($this, 'course_woocommerce_product_meta_box_content'), $this->token, 'side', 'default');
 		} // End If Statement
 		// Add Meta Box for Prerequisite Course
-		add_meta_box( 'course-prerequisite', __( 'Course Prerequisite', 'woothemes-sensei' ), array( $this, 'course_prerequisite_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('course-prerequisite', __('Course Prerequisite', 'woothemes-sensei'), array($this, 'course_prerequisite_meta_box_content'), $this->token, 'side', 'default');
 		// Add Meta Box for Featured Course
-		add_meta_box( 'course-featured', __( 'Featured Course', 'woothemes-sensei' ), array( $this, 'course_featured_meta_box_content' ), $this->token, 'side', 'default' );
+		add_meta_box('course-featured', __('Featured Course', 'woothemes-sensei'), array($this, 'course_featured_meta_box_content'), $this->token, 'side', 'default');
 		// Add Meta Box for Course Meta
-		add_meta_box( 'course-video', __( 'Course Video', 'woothemes-sensei' ), array( $this, 'course_video_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('course-video', __('Course Video', 'woothemes-sensei'), array($this, 'course_video_meta_box_content'), $this->token, 'normal', 'default');
 		// Add Meta Box for Course Lessons
-		add_meta_box( 'course-lessons', __( 'Course Lessons', 'woothemes-sensei' ), array( $this, 'course_lessons_meta_box_content' ), $this->token, 'normal', 'default' );
+		add_meta_box('course-lessons', __('Course Lessons', 'woothemes-sensei'), array($this, 'course_lessons_meta_box_content'), $this->token, 'normal', 'default');
         // Add Meta Box to link to Manage Learners
-        add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' );
+        add_meta_box('course-manage', __('Course Management', 'woothemes-sensei'), array($this, 'course_manage_meta_box_content'), $this->token, 'side', 'default');
         // Remove "Custom Settings" meta box.
-		remove_meta_box( 'woothemes-settings', $this->token, 'normal' );
+		remove_meta_box('woothemes-settings', $this->token, 'normal');
 
         // add Disable email notification box
-        add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' );
+        add_meta_box('course-notifications', __('Course Notifications', 'woothemes-sensei'), array($this, 'course_notification_meta_box_content'), 'course', 'normal', 'default');
 
 	} // End meta_box_setup()
 
@@ -164,58 +164,58 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_woocommerce_product_meta_box_content () {
+	public function course_woocommerce_product_meta_box_content() {
 		global $post;
 
-		$select_course_woocommerce_product = get_post_meta( $post->ID, '_course_woocommerce_product', true );
+		$select_course_woocommerce_product = get_post_meta($post->ID, '_course_woocommerce_product', true);
 
-		$post_args = array(	'post_type' 		=> array( 'product', 'product_variation' ),
+		$post_args = array('post_type' 		=> array('product', 'product_variation'),
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'DESC',
     						'exclude' 			=> $post->ID,
-    						'post_status'		=> array( 'publish', 'private', 'draft' ),
+    						'post_status'		=> array('publish', 'private', 'draft'),
     						'tax_query'			=> array(
 								array(
 									'taxonomy'	=> 'product_type',
 									'field'		=> 'slug',
-									'terms'		=> array( 'variable', 'grouped' ),
+									'terms'		=> array('variable', 'grouped'),
 									'operator'	=> 'NOT IN'
 								)
 							),
 							'suppress_filters' 	=> 0
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
+		if (count($posts_array) > 0) {
 
-			$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">' . "\n";
-			$html .= '<option value="-">' . __( 'None', 'woothemes-sensei' ) . '</option>';
+			$html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">'."\n";
+			$html .= '<option value="-">'.__('None', 'woothemes-sensei').'</option>';
 				$prev_parent_id = 0;
-				foreach ( $posts_array as $post_item ) {
+				foreach ($posts_array as $post_item) {
 
-					if ( 'product_variation' == $post_item->post_type ) {
+					if ('product_variation' == $post_item->post_type) {
 
-						$product_object = get_product( $post_item->ID );
-						$parent_id = wp_get_post_parent_id( $post_item->ID );
+						$product_object = get_product($post_item->ID);
+						$parent_id = wp_get_post_parent_id($post_item->ID);
 
-                        if( sensei_check_woocommerce_version( '2.1' ) ) {
-							$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
+                        if (sensei_check_woocommerce_version('2.1')) {
+							$formatted_variation = wc_get_formatted_variation($product_object->variation_data, true);
 
 						} else {
                             // fall back to pre wc 2.1
-							$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
+							$formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true);
 
 						}
 
-                        $product_name = ucwords( $formatted_variation );
-                        if( empty( $product_name ) ){
+                        $product_name = ucwords($formatted_variation);
+                        if (empty($product_name)) {
 
-                            $product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id;
+                            $product_name = __('Variation #', 'woothemes-sensei').$product_object->variation_id;
 
                         }
 
@@ -228,47 +228,47 @@ 
 					}
 
 					// Show variations in groups
-					if( $parent_id && $parent_id != $prev_parent_id ) {
+					if ($parent_id && $parent_id != $prev_parent_id) {
 
-						if( 0 != $prev_parent_id ) {
+						if (0 != $prev_parent_id) {
 
 							$html .= '</optgroup>';
 
 						}
-						$html .= '<optgroup label="' . get_the_title( $parent_id ) . '">';
+						$html .= '<optgroup label="'.get_the_title($parent_id).'">';
 						$prev_parent_id = $parent_id;
 
-					} elseif( ! $parent_id && 0 == $prev_parent_id ) {
+					} elseif ( ! $parent_id && 0 == $prev_parent_id) {
 
 						$html .= '</optgroup>';
 
 					}
 
-					$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_woocommerce_product, false ) . '>' . esc_html( $product_name ) . '</option>' . "\n";
+					$html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_woocommerce_product, false).'>'.esc_html($product_name).'</option>'."\n";
 
 				} // End For Loop
 
-			$html .= '</select>' . "\n";
-			if ( current_user_can( 'publish_product' )) {
+			$html .= '</select>'."\n";
+			if (current_user_can('publish_product')) {
 
-				$html .= '<p>' . "\n";
-					$html .= '<a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Add a Product', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<p>'."\n";
+					$html .= '<a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Add a Product', 'woothemes-sensei').'</a>'."\n";
 				$html .= '</p>'."\n";
 
 			} // End If Statement
 
 		} else {
 
-			if ( current_user_can( 'publish_product' )) {
+			if (current_user_can('publish_product')) {
 
-				$html .= '<p>' . "\n";
-					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . '&nbsp;<a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Please add some first', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<p>'."\n";
+					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei')).'&nbsp;<a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Please add some first', 'woothemes-sensei').'</a>'."\n";
 				$html .= '</p>'."\n";
 
 			} else {
 
-                $html .= '<p>' . "\n";
-					$html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . "\n";
+                $html .= '<p>'."\n";
+					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei'))."\n";
 				$html .= '</p>'."\n";
 
 			} // End If Statement
@@ -285,33 +285,33 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_prerequisite_meta_box_content () {
+	public function course_prerequisite_meta_box_content() {
 		global $post;
 
-		$select_course_prerequisite = get_post_meta( $post->ID, '_course_prerequisite', true );
+		$select_course_prerequisite = get_post_meta($post->ID, '_course_prerequisite', true);
 
-		$post_args = array(	'post_type' 		=> 'course',
+		$post_args = array('post_type' 		=> 'course',
 							'posts_per_page' 		=> -1,
 							'orderby'         	=> 'title',
     						'order'           	=> 'DESC',
     						'exclude' 			=> $post->ID,
 							'suppress_filters' 	=> 0
 							);
-		$posts_array = get_posts( $post_args );
+		$posts_array = get_posts($post_args);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
-			$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">' . "\n";
-			$html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>';
-				foreach ($posts_array as $post_item){
-					$html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_prerequisite, false ) . '>' . esc_html( $post_item->post_title ) . '</option>' . "\n";
+		if (count($posts_array) > 0) {
+			$html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">'."\n";
+			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
+				foreach ($posts_array as $post_item) {
+					$html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_prerequisite, false).'>'.esc_html($post_item->post_title).'</option>'."\n";
 				} // End For Loop
-			$html .= '</select>' . "\n";
+			$html .= '</select>'."\n";
 		} else {
-			$html .= '<p>' . esc_html( __( 'No courses exist yet. Please add some first.', 'woothemes-sensei' ) ) . '</p>';
+			$html .= '<p>'.esc_html(__('No courses exist yet. Please add some first.', 'woothemes-sensei')).'</p>';
 		} // End If Statement
 
 		echo $html;
@@ -324,21 +324,21 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_featured_meta_box_content () {
+	public function course_featured_meta_box_content() {
 		global $post;
 
-		$course_featured = get_post_meta( $post->ID, '_course_featured', true );
+		$course_featured = get_post_meta($post->ID, '_course_featured', true);
 
 		$html = '';
 
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
 		$checked = '';
-		if ( isset( $course_featured ) && ( '' != $course_featured ) ) {
-	 	    $checked = checked( 'featured', $course_featured, false );
+		if (isset($course_featured) && ('' != $course_featured)) {
+	 	    $checked = checked('featured', $course_featured, false);
 	 	} // End If Statement
 
-	 	$html .= '<input type="checkbox" name="course_featured" value="featured" ' . $checked . '>&nbsp;' . __( 'Feature this course', 'woothemes-sensei' ) . '<br>';
+	 	$html .= '<input type="checkbox" name="course_featured" value="featured" '.$checked.'>&nbsp;'.__('Feature this course', 'woothemes-sensei').'<br>';
 
 		echo $html;
 
@@ -350,16 +350,16 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_video_meta_box_content () {
+	public function course_video_meta_box_content() {
 		global $post;
 
-		$course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+		$course_video_embed = get_post_meta($post->ID, '_course_video_embed', true);
 
 		$html = '';
 
-		$html .= '<label class="screen-reader-text" for="course_video_embed">' . __( 'Video Embed Code', 'woothemes-sensei' ) . '</label>';
-		$html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">' . $course_video_embed . '</textarea>';
-		$html .= '<p>' .  __( 'Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei' ) . '</p>';
+		$html .= '<label class="screen-reader-text" for="course_video_embed">'.__('Video Embed Code', 'woothemes-sensei').'</label>';
+		$html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">'.$course_video_embed.'</textarea>';
+		$html .= '<p>'.__('Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei').'</p>';
 
 		echo $html;
 
@@ -374,36 +374,36 @@ 
 	 * @param int $post_id
 	 * @return void
 	 */
-	public function meta_box_save ( $post_id ) {
+	public function meta_box_save($post_id) {
 		global $post, $messages;
 
 		/* Verify the nonce before proceeding. */
-		if ( ( get_post_type() != $this->token ) || ! wp_verify_nonce( $_POST['woo_' . $this->token . '_noonce'], plugin_basename(__FILE__) ) ) {
+		if ((get_post_type() != $this->token) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_noonce'], plugin_basename(__FILE__))) {
 			return $post_id;
 		}
 
 		/* Get the post type object. */
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type = get_post_type_object($post->post_type);
 
 		/* Check if the current user has permission to edit the post. */
-		if ( !current_user_can( $post_type->cap->edit_post, $post_id ) ) {
+		if ( ! current_user_can($post_type->cap->edit_post, $post_id)) {
 			return $post_id;
 		} // End If Statement
 
-		if ( 'page' == $_POST['post_type'] ) {
-			if ( ! current_user_can( 'edit_page', $post_id ) ) {
+		if ('page' == $_POST['post_type']) {
+			if ( ! current_user_can('edit_page', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} else {
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				return $post_id;
 			} // End If Statement
 		} // End If Statement
 
 		// Save the post meta data fields
-		if ( isset($this->meta_fields) && is_array($this->meta_fields) ) {
-			foreach ( $this->meta_fields as $meta_key ) {
-				$this->save_post_meta( $meta_key, $post_id );
+		if (isset($this->meta_fields) && is_array($this->meta_fields)) {
+			foreach ($this->meta_fields as $meta_key) {
+				$this->save_post_meta($meta_key, $post_id);
 			} // End For Loop
 		} // End If Statement
 
@@ -420,18 +420,18 @@ 
 	 * @param int $post_id (default: 0)
 	 * @return int new meta id | bool meta value saved status
 	 */
-	private function save_post_meta( $post_key = '', $post_id = 0 ) {
+	private function save_post_meta($post_key = '', $post_id = 0) {
 		// Get the meta key.
-		$meta_key = '_' . $post_key;
+		$meta_key = '_'.$post_key;
 		// Get the posted data and sanitize it for use as an HTML class.
-		if ( 'course_video_embed' == $post_key) {
-			$new_meta_value = esc_html( $_POST[$post_key] );
+		if ('course_video_embed' == $post_key) {
+			$new_meta_value = esc_html($_POST[$post_key]);
 		} else {
-			$new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' );
+			$new_meta_value = (isset($_POST[$post_key]) ? sanitize_html_class($_POST[$post_key]) : '');
 		} // End If Statement
 
         // update field with the new value
-        return update_post_meta( $post_id, $meta_key, $new_meta_value );
+        return update_post_meta($post_id, $meta_key, $new_meta_value);
 
 	} // End save_post_meta()
 
@@ -441,31 +441,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function course_lessons_meta_box_content () {
+	public function course_lessons_meta_box_content() {
 
 		global $post;
 
 		// Setup Lesson Query
 		$posts_array = array();
-		if ( 0 < $post->ID ) {
+		if (0 < $post->ID) {
 
-			$posts_array = $this->course_lessons( $post->ID, 'any' );
+			$posts_array = $this->course_lessons($post->ID, 'any');
 
 		} // End If Statement
 
 		$html = '';
-		$html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="'
-                 . esc_attr( 'woo_' . $this->token . '_noonce' )
-                 . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />';
+		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'
+                 . esc_attr('woo_'.$this->token.'_noonce')
+                 . '" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />';
 
-		if ( count( $posts_array ) > 0 ) {
+		if (count($posts_array) > 0) {
 
-			foreach ($posts_array as $post_item){
+			foreach ($posts_array as $post_item) {
 
 				$html .= '<p>'."\n";
 
 					$html .= $post_item->post_title."\n";
-					$html .= '<a href="' . esc_url( get_edit_post_link( $post_item->ID ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $post_item->post_title ) ) . '" class="edit-lesson-action">' . __( 'Edit this lesson', 'woothemes-sensei' ) . '</a>';
+					$html .= '<a href="'.esc_url(get_edit_post_link($post_item->ID)).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $post_item->post_title)).'" class="edit-lesson-action">'.__('Edit this lesson', 'woothemes-sensei').'</a>';
 
 				$html .= '</p>'."\n";
 
@@ -473,12 +473,12 @@ 
 
 		} else {
 			$course_id = '';
-			if ( 0 < $post->ID ) { $course_id = '&course_id=' . $post->ID; }
-			$html .= '<p>' . esc_html( __( 'No lessons exist yet for this course.', 'woothemes-sensei' ) ) . "\n";
+			if (0 < $post->ID) { $course_id = '&course_id='.$post->ID; }
+			$html .= '<p>'.esc_html(__('No lessons exist yet for this course.', 'woothemes-sensei'))."\n";
 
-				$html .= '<a href="' . admin_url( 'post-new.php?post_type=lesson' . $course_id )
-                         . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">'
-                         . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n";
+				$html .= '<a href="'.admin_url('post-new.php?post_type=lesson'.$course_id)
+                         . '" title="'.esc_attr(__('Add a Lesson', 'woothemes-sensei')).'">'
+                         . __('Please add some.', 'woothemes-sensei').'</a>'."\n";
 
 			$html .= '</p>'."\n";
 		} // End If Statement
@@ -495,12 +495,12 @@ 
      * @return void
      */
 
-    public function course_manage_meta_box_content () {
+    public function course_manage_meta_box_content() {
         global $post;
         
-        $manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+        $manage_url = esc_url(add_query_arg(array('page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php')));
 
-        $grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) );
+        $grading_url = esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php')));
 
 
         echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>";
@@ -518,16 +518,16 @@ 
 	 * @param  array $defaults
 	 * @return array $new_columns
 	 */
-	public function add_column_headings ( $defaults ) {
+	public function add_column_headings($defaults) {
 		$new_columns['cb'] = '<input type="checkbox" />';
 		// $new_columns['id'] = __( 'ID' );
-		$new_columns['title'] = _x( 'Course Title', 'column name', 'woothemes-sensei' );
-		$new_columns['course-prerequisite'] = _x( 'Pre-requisite Course', 'column name', 'woothemes-sensei' );
-		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-			$new_columns['course-woocommerce-product'] = _x( 'WooCommerce Product', 'column name', 'woothemes-sensei' );
+		$new_columns['title'] = _x('Course Title', 'column name', 'woothemes-sensei');
+		$new_columns['course-prerequisite'] = _x('Pre-requisite Course', 'column name', 'woothemes-sensei');
+		if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
+			$new_columns['course-woocommerce-product'] = _x('WooCommerce Product', 'column name', 'woothemes-sensei');
 		} // End If Statement
-		$new_columns['course-category'] = _x( 'Category', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['course-category'] = _x('Category', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 
@@ -542,45 +542,45 @@ 
 	 * @param  int $id
 	 * @return void
 	 */
-	public function add_column_data ( $column_name, $id ) {
+	public function add_column_data($column_name, $id) {
 		global $wpdb, $post;
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'id':
 				echo $id;
 			break;
 
 			case 'course-prerequisite':
-				$course_prerequisite_id = get_post_meta( $id, '_course_prerequisite', true);
-				if ( 0 < absint( $course_prerequisite_id ) ) { echo '<a href="' . esc_url( get_edit_post_link( absint( $course_prerequisite_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $course_prerequisite_id ) ) ) ) . '">' . get_the_title( absint( $course_prerequisite_id ) ) . '</a>'; }
+				$course_prerequisite_id = get_post_meta($id, '_course_prerequisite', true);
+				if (0 < absint($course_prerequisite_id)) { echo '<a href="'.esc_url(get_edit_post_link(absint($course_prerequisite_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($course_prerequisite_id)))).'">'.get_the_title(absint($course_prerequisite_id)).'</a>'; }
 
 			break;
 
 			case 'course-woocommerce-product':
-				if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
-					$course_woocommerce_product_id = get_post_meta( $id, '_course_woocommerce_product', true);
-					if ( 0 < absint( $course_woocommerce_product_id ) ) {
-						if ( 'product_variation' == get_post_type( $course_woocommerce_product_id ) ) {
-							$product_object = get_product( $course_woocommerce_product_id );
-							if( sensei_check_woocommerce_version( '2.1' ) ) {
-								$formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true );
+				if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
+					$course_woocommerce_product_id = get_post_meta($id, '_course_woocommerce_product', true);
+					if (0 < absint($course_woocommerce_product_id)) {
+						if ('product_variation' == get_post_type($course_woocommerce_product_id)) {
+							$product_object = get_product($course_woocommerce_product_id);
+							if (sensei_check_woocommerce_version('2.1')) {
+								$formatted_variation = wc_get_formatted_variation($product_object->variation_data, true);
 							} else {
-								$formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true );
+								$formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true);
 							}
 							$course_woocommerce_product_id = $product_object->parent->post->ID;
-							$product_name = $product_object->parent->post->post_title . '<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . ucwords( $formatted_variation );
+							$product_name = $product_object->parent->post->post_title.'<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.ucwords($formatted_variation);
 						} else {
-							$product_name = get_the_title( absint( $course_woocommerce_product_id ) );
+							$product_name = get_the_title(absint($course_woocommerce_product_id));
 						} // End If Statement
-						echo '<a href="' . esc_url( get_edit_post_link( absint( $course_woocommerce_product_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $product_name ) ) . '">' . $product_name . '</a>';
+						echo '<a href="'.esc_url(get_edit_post_link(absint($course_woocommerce_product_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $product_name)).'">'.$product_name.'</a>';
 					} // End If Statement
 				} // End If Statement
 			break;
 
 			case 'course-category':
-				$output = get_the_term_list( $id, 'course-category', '', ', ', '' );
-				if ( '' == $output ) {
-					$output = __( 'None', 'woothemes-sensei' );
+				$output = get_the_term_list($id, 'course-category', '', ', ', '');
+				if ('' == $output) {
+					$output = __('None', 'woothemes-sensei');
 				} // End If Statement
 				echo $output;
 			break;
@@ -600,29 +600,29 @@ 
 	 * @param array $includes (default: array())
 	 * @return array
 	 */
-	public function course_query( $amount = 0, $type = 'default', $includes = array(), $excludes = array() ) {
-		global $my_courses_page ;
+	public function course_query($amount = 0, $type = 'default', $includes = array(), $excludes = array()) {
+		global $my_courses_page;
 
 		$results_array = array();
 
-		if( $my_courses_page ) { add_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); }
+		if ($my_courses_page) { add_action('pre_get_posts', array($this, 'filter_my_courses')); }
 
-		$post_args = $this->get_archive_query_args( $type, $amount, $includes, $excludes );
+		$post_args = $this->get_archive_query_args($type, $amount, $includes, $excludes);
 
 		// get the posts
-		if( empty( $post_args ) ) {
+		if (empty($post_args)) {
 
 			return $results_array;
 
-		}else{
+		} else {
 
 			//reset the pagination as this widgets do not need it
 			$post_args['paged'] = 1;
-			$results_array = get_posts( $post_args );
+			$results_array = get_posts($post_args);
 
 		}
 
-		if( $my_courses_page ) { remove_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); }
+		if ($my_courses_page) { remove_action('pre_get_posts', array($this, 'filter_my_courses')); }
 
 		return $results_array;
 
@@ -638,22 +638,22 @@ 
 	 * @param array $includes (default: array())
 	 * @return array
 	 */
-	public function get_archive_query_args( $type = '', $amount = 0 , $includes = array(), $excludes = array() ) {
+	public function get_archive_query_args($type = '', $amount = 0, $includes = array(), $excludes = array()) {
 
 		global $wp_query;
 
-		if ( 0 == $amount && ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && 'usercourses' != $type && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) ) {
-			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+		if (0 == $amount && (isset(Sensei()->settings->settings['course_archive_amount']) && 'usercourses' != $type && (0 < absint(Sensei()->settings->settings['course_archive_amount'])))) {
+			$amount = absint(Sensei()->settings->settings['course_archive_amount']);
 		} else {
-			if ( 0 == $amount) {
-				$amount = $wp_query->get( 'posts_per_page' );
+			if (0 == $amount) {
+				$amount = $wp_query->get('posts_per_page');
 			} // End If Statement
 		} // End If Statement
 
-        $stored_order = get_option( 'sensei_course_order', '' );
+        $stored_order = get_option('sensei_course_order', '');
         $order = 'ASC';
         $orderby = 'menu_order';
-        if( empty( $stored_order ) ){
+        if (empty($stored_order)) {
 
             $order = 'DESC';
             $orderby = 'date';
@@ -663,7 +663,7 @@ 
 		switch ($type) {
 
 			case 'usercourses':
-				$post_args = array(	'post_type' 		=> 'course',
+				$post_args = array('post_type' 		=> 'course',
 									'orderby'         	=> $orderby,
     								'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -704,7 +704,7 @@ 
 				break;
 
 			case 'featuredcourses':
-                $post_args = array(	'post_type' 		=> 'course',
+                $post_args = array('post_type' 		=> 'course',
                                     'orderby'         	=> $orderby,
                                     'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -716,7 +716,7 @@ 
 									);
 				break;
 			default:
-				$post_args = array(	'post_type' 		=> 'course',
+				$post_args = array('post_type' 		=> 'course',
                                     'orderby'         	=> $orderby,
                                     'order'           	=> $order,
     								'post_status'      	=> 'publish',
@@ -728,13 +728,13 @@ 
 		}
 
         $post_args['posts_per_page'] = $amount;
-        $paged = $wp_query->get( 'paged' );
-        $post_args['paged'] = empty( $paged) ? 1 : $paged;
+        $paged = $wp_query->get('paged');
+        $post_args['paged'] = empty($paged) ? 1 : $paged;
 
-        if( 'newcourses' == $type ){
+        if ('newcourses' == $type) {
 
-            $post_args[ 'orderby' ] = 'date';
-            $post_args[ 'order' ] = 'DESC';
+            $post_args['orderby'] = 'date';
+            $post_args['order'] = 'DESC';
         }
 
 		return $post_args;
@@ -756,35 +756,35 @@ 
      *
 	 * @return string | void
 	 */
-	public function course_image( $course_id = 0, $width = '100', $height = '100', $return = false ) {
+	public function course_image($course_id = 0, $width = '100', $height = '100', $return = false) {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
+        if (is_a($course_id, 'WP_Post')) {
             $course_id = $course_id->ID;
         }
 
 		$html = '';
 
 		// Get Width and Height settings
-		if ( ( $width == '100' ) && ( $height == '100' ) ) {
+		if (($width == '100') && ($height == '100')) {
 
-			if ( is_singular( 'course' ) ) {
+			if (is_singular('course')) {
 
-				if ( !Sensei()->settings->settings[ 'course_single_image_enable' ] ) {
+				if ( ! Sensei()->settings->settings['course_single_image_enable']) {
 					return '';
 				} // End If Statement
 				$image_thumb_size = 'course_single_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 
 			} else {
 
-				if ( !Sensei()->settings->settings[ 'course_archive_image_enable' ] ) {
+				if ( ! Sensei()->settings->settings['course_archive_image_enable']) {
 					return '';
 				} // End If Statement
 
 				$image_thumb_size = 'course_archive_image';
-				$dimensions = Sensei()->get_image_size( $image_thumb_size );
+				$dimensions = Sensei()->get_image_size($image_thumb_size);
 				$width = $dimensions['width'];
 				$height = $dimensions['height'];
 
@@ -793,31 +793,31 @@ 
 		} // End If Statement
 
 		$img_url = '';
-		if ( has_post_thumbnail( $course_id ) ) {
+		if (has_post_thumbnail($course_id)) {
    			// Get Featured Image
-   			$img_url = get_the_post_thumbnail( $course_id, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') );
+   			$img_url = get_the_post_thumbnail($course_id, array($width, $height), array('class' => 'woo-image thumbnail alignleft'));
  		} else {
 
 			// Check for a Lesson Image
-			$course_lessons = $this->course_lessons( $course_id );
+			$course_lessons = $this->course_lessons($course_id);
 
-			foreach ($course_lessons as $lesson_item){
-				if ( has_post_thumbnail( $lesson_item->ID ) ) {
+			foreach ($course_lessons as $lesson_item) {
+				if (has_post_thumbnail($lesson_item->ID)) {
 					// Get Featured Image
-					$img_url = get_the_post_thumbnail( $lesson_item->ID, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') );
-					if ( '' != $img_url ) {
+					$img_url = get_the_post_thumbnail($lesson_item->ID, array($width, $height), array('class' => 'woo-image thumbnail alignleft'));
+					if ('' != $img_url) {
 						break;
 					} // End If Statement
 
 				} // End If Statement
 			} // End For Loop
 
- 			if ( '' == $img_url ) {
+ 			if ('' == $img_url) {
 
  				// Display Image Placeholder if none
-				if ( Sensei()->settings->get( 'placeholder_images_enable' ) ) {
+				if (Sensei()->settings->get('placeholder_images_enable')) {
 
-                    $img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' );
+                    $img_url = apply_filters('sensei_course_placeholder_image_url', '<img src="http://placehold.it/'.$width.'x'.$height.'" class="woo-image thumbnail alignleft" />');
 
 				} // End If Statement
 
@@ -825,17 +825,17 @@ 
 
 		} // End If Statement
 
-		if ( '' != $img_url ) {
+		if ('' != $img_url) {
 
-			$html .= '<a href="' . get_permalink( $course_id ) . '" title="' . esc_attr( get_post_field( 'post_title', $course_id ) ) . '">' . $img_url  .'</a>';
+			$html .= '<a href="'.get_permalink($course_id).'" title="'.esc_attr(get_post_field('post_title', $course_id)).'">'.$img_url.'</a>';
 
 		} // End If Statement
 
-        if( $return ){
+        if ($return) {
 
             return $html;
 
-        }else{
+        } else {
 
             echo $html;
 
@@ -852,9 +852,9 @@ 
 	 * @param string $post_status (default: 'publish')
 	 * @return int
 	 */
-	public function course_count( $post_status = 'publish' ) {
+	public function course_count($post_status = 'publish') {
 
-		$post_args = array(	'post_type'         => 'course',
+		$post_args = array('post_type'         => 'course',
 							'posts_per_page'    => -1,
 //							'orderby'           => 'menu_order date',
 //							'order'             => 'ASC',
@@ -865,10 +865,10 @@ 
 
 		// Allow WP to generate the complex final query, just shortcut to only do an overall count
 //		add_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
-		$courses_query = new WP_Query( apply_filters( 'sensei_course_count', $post_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_course_count', $post_args));
 //		remove_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) );
 
-		return count( $courses_query->posts );
+		return count($courses_query->posts);
 	} // End course_count()
 
 
@@ -881,42 +881,42 @@ 
 	 * @param string $fields (default: 'all'). WP only allows 3 types, but we will limit it to only 'ids' or 'all'
 	 * @return array{ type WP_Post }  $posts_array
 	 */
-	public function course_lessons( $course_id = 0, $post_status = 'publish', $fields = 'all' ) {
+	public function course_lessons($course_id = 0, $post_status = 'publish', $fields = 'all') {
 
-        if( is_a( $course_id, 'WP_Post' ) ){
+        if (is_a($course_id, 'WP_Post')) {
             $course_id = $course_id->ID;
         }
 
-		$post_args = array(	'post_type'         => 'lesson',
+		$post_args = array('post_type'         => 'lesson',
 							'posts_per_page'       => -1,
 							'orderby'           => 'date',
 							'order'             => 'ASC',
 							'meta_query'        => array(
 								array(
 									'key' => '_lesson_course',
-									'value' => intval( $course_id ),
+									'value' => intval($course_id),
 								),
 							),
 							'post_status'       => $post_status,
 							'suppress_filters'  => 0,
 							);
-		$query_results = new WP_Query( $post_args );
+		$query_results = new WP_Query($post_args);
         $lessons = $query_results->posts;
 
         // re order the lessons. This could not be done via the OR meta query as there may be lessons
         // with the course order for a different course and this should not be included. It could also not
         // be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but
         // that have been added to the course.
-        if( count( $lessons) > 1  ){
+        if (count($lessons) > 1) {
 
-            foreach( $lessons as $lesson ){
+            foreach ($lessons as $lesson) {
 
-                $order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) );
+                $order = intval(get_post_meta($lesson->ID, '_order_'.$course_id, true));
                 // for lessons with no order set it to be 10000 so that it show up at the end
                 $lesson->course_order = $order ? $order : 100000;
             }
 
-            uasort( $lessons, array( $this, '_short_course_lessons_callback' )   );
+            uasort($lessons, array($this, '_short_course_lessons_callback'));
         }
 
         /**
@@ -927,12 +927,12 @@ 
          * @param array $lessons
          * @param int $course_id
          */
-        $lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id  );
+        $lessons = apply_filters('sensei_course_get_lessons', $lessons, $course_id);
 
         //return the requested fields
         // runs after the sensei_course_get_lessons filter so the filter always give an array of lesson
         // objects
-        if( 'ids' == $fields ) {
+        if ('ids' == $fields) {
             $lesson_objects = $lessons;
             $lessons = array();
 
@@ -954,9 +954,9 @@ 
      * @param array $lesson_2
      * @return int
      */
-    protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){
+    protected function _short_course_lessons_callback($lesson_1, $lesson_2) {
 
-        if ( $lesson_1->course_order == $lesson_2->course_order ) {
+        if ($lesson_1->course_order == $lesson_2->course_order) {
             return 0;
         }
 
@@ -970,21 +970,21 @@ 
 	 * @param  boolean $boolean_check True if a simple yes/no is required
 	 * @return array              Array of quiz post objects
 	 */
-	public function course_quizzes( $course_id = 0, $boolean_check = false ) {
+	public function course_quizzes($course_id = 0, $boolean_check = false) {
 
 
 		$course_quizzes = array();
 
-		if( $course_id ) {
-			$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
+		if ($course_id) {
+			$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
 
-			foreach( $lesson_ids as $lesson_id ) {
-				$has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
-				if ( $has_questions && $boolean_check ) {
+			foreach ($lesson_ids as $lesson_id) {
+				$has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
+				if ($has_questions && $boolean_check) {
 					return true;
 				}
-				elseif ( $has_questions ) {
-					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+				elseif ($has_questions) {
+					$quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 //					$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
 //					if( count( $questions ) > 0 ) {
 						$course_quizzes[] = $quiz_id;
@@ -992,7 +992,7 @@ 
 				}
 			}
 		}
-		if ( $boolean_check && empty($course_quizzes) ) {
+		if ($boolean_check && empty($course_quizzes)) {
 			$course_quizzes = false;
 		}
 		return $course_quizzes;
@@ -1007,9 +1007,9 @@ 
 	 * @param  string $post_status (default: 'publish')
 	 * @return array
 	 */
-	public function course_lessons_completed( $course_id = 0, $post_status = 'publish' ) {
+	public function course_lessons_completed($course_id = 0, $post_status = 'publish') {
 
-		return $this->course_lessons( $course_id, $post_status );
+		return $this->course_lessons($course_id, $post_status);
 
 	} // End course_lessons_completed()
 
@@ -1022,9 +1022,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_author_lesson_count( $author_id = 0, $course_id = 0 ) {
+	public function course_author_lesson_count($author_id = 0, $course_id = 0) {
 
-        $lesson_args = array(	'post_type' 		=> 'lesson',
+        $lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
 		    					'author'         	=> $author_id,
 		    					'meta_key'        	=> '_lesson_course',
@@ -1033,8 +1033,8 @@ 
     	    					'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
-		$count = count( $lessons_array );
+		$lessons_array = get_posts($lesson_args);
+		$count = count($lessons_array);
 		return $count;
 
 	} // End course_author_lesson_count()
@@ -1046,9 +1046,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_lesson_count( $course_id = 0 ) {
+	public function course_lesson_count($course_id = 0) {
 
-		$lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
 		    					'meta_key'        	=> '_lesson_course',
     							'meta_value'      	=> $course_id,
@@ -1056,9 +1056,9 @@ 
     	    					'suppress_filters' 	=> 0,
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
+		$lessons_array = get_posts($lesson_args);
 
-        $count = count( $lessons_array );
+        $count = count($lessons_array);
 
         return $count;
 
@@ -1071,9 +1071,9 @@ 
 	 * @param  int $course_id (default: 0)
 	 * @return int
 	 */
-	public function course_lesson_preview_count( $course_id = 0 ) {
+	public function course_lesson_preview_count($course_id = 0) {
 
-		$lesson_args = array(	'post_type' 		=> 'lesson',
+		$lesson_args = array('post_type' 		=> 'lesson',
 								'posts_per_page' 		=> -1,
     	    					'post_status'      	=> 'publish',
     	    					'suppress_filters' 	=> 0,
@@ -1089,9 +1089,9 @@ 
 								),
 								'fields'            => 'ids', // less data to retrieve
 		    				);
-		$lessons_array = get_posts( $lesson_args );
+		$lessons_array = get_posts($lesson_args);
 
-		$count = count( $lessons_array );
+		$count = count($lessons_array);
 
         return $count;
 
@@ -1104,12 +1104,12 @@ 
 	 * @param  int $product_id (default: 0)
 	 * @return array
 	 */
-	public function get_product_courses( $product_id = 0 ) {
+	public function get_product_courses($product_id = 0) {
 
 		$posts_array = array();
 		// Check for WooCommerce
-		if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && 0 < $product_id ) {
-			$post_args = array(	'post_type' 		=> 'course',
+		if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && 0 < $product_id) {
+			$post_args = array('post_type' 		=> 'course',
 								'posts_per_page' 		=> -1,
 								'meta_key'        	=> '_course_woocommerce_product',
 	    						'meta_value'      	=> $product_id,
@@ -1118,7 +1118,7 @@ 
 								'orderby' 			=> 'menu_order date',
 								'order' 			=> 'ASC',
 								);
-			$posts_array = get_posts( $post_args );
+			$posts_array = get_posts($post_args);
 		} // End If Statement
 		return $posts_array;
 
@@ -1138,17 +1138,17 @@ 
 	 * @param  WP_Query $query
 	 * @return void
 	 */
-	public function filter_my_courses( $query ) {
+	public function filter_my_courses($query) {
 		global  $my_courses_section;
 
-		if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
-			$amount = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
-			$query->set( 'posts_per_page', $amount );
+		if (isset(Sensei()->settings->settings['my_course_amount']) && (0 < absint(Sensei()->settings->settings['my_course_amount']))) {
+			$amount = absint(Sensei()->settings->settings['my_course_amount']);
+			$query->set('posts_per_page', $amount);
 		}
 
-		if( isset( $_GET[ $my_courses_section . '_page' ] ) && 0 < intval( $_GET[ $my_courses_section . '_page' ] ) ) {
-			$page = intval( $_GET[ $my_courses_section . '_page' ] );
-			$query->set( 'paged', $page );
+		if (isset($_GET[$my_courses_section.'_page']) && 0 < intval($_GET[$my_courses_section.'_page'])) {
+			$page = intval($_GET[$my_courses_section.'_page']);
+			$query->set('paged', $page);
 		}
 	}
 
@@ -1162,48 +1162,48 @@ 
 	 * @param  boolean $manage Whether the user has permission to manage the courses
 	 * @return string          HTML displayng course data
 	 */
-	public function load_user_courses_content( $user = false ) {
+	public function load_user_courses_content($user = false) {
 		global $course, $my_courses_page, $my_courses_section;
 
-        if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] )
-            || ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) {
+        if ( ! isset(Sensei()->settings->settings['learner_profile_show_courses'])
+            || ! Sensei()->settings->settings['learner_profile_show_courses']) {
 
             // do not show the content if the settings doesn't allow for it
             return;
 
         }
 
-        $manage = ( $user->ID == get_current_user_id() ) ? true : false;
+        $manage = ($user->ID == get_current_user_id()) ? true : false;
 
-        do_action( 'sensei_before_learner_course_content', $user );
+        do_action('sensei_before_learner_course_content', $user);
 
 		// Build Output HTML
 		$complete_html = $active_html = '';
 
-		if( is_a( $user, 'WP_User' ) ) {
+		if (is_a($user, 'WP_User')) {
 
 			$my_courses_page = true;
 
 			// Allow action to be run before My Courses content has loaded
-			do_action( 'sensei_before_my_courses', $user->ID );
+			do_action('sensei_before_my_courses', $user->ID);
 
 			// Logic for Active and Completed Courses
 			$per_page = 20;
-			if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] )
-                && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) {
+			if (isset(Sensei()->settings->settings['my_course_amount'])
+                && (0 < absint(Sensei()->settings->settings['my_course_amount']))) {
 
-				$per_page = absint( Sensei()->settings->settings[ 'my_course_amount' ] );
+				$per_page = absint(Sensei()->settings->settings['my_course_amount']);
 
 			}
 
-			$course_statuses = WooThemes_Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user->ID, 'type' => 'sensei_course_status' ), true );
+			$course_statuses = WooThemes_Sensei_Utils::sensei_check_for_activity(array('user_id' => $user->ID, 'type' => 'sensei_course_status'), true);
 			// User may only be on 1 Course
-			if ( !is_array($course_statuses) ) {
-				$course_statuses = array( $course_statuses );
+			if ( ! is_array($course_statuses)) {
+				$course_statuses = array($course_statuses);
 			}
 			$completed_ids = $active_ids = array();
-			foreach( $course_statuses as $course_status ) {
-				if ( WooThemes_Sensei_Utils::user_completed_course( $course_status, $user->ID ) ) {
+			foreach ($course_statuses as $course_status) {
+				if (WooThemes_Sensei_Utils::user_completed_course($course_status, $user->ID)) {
 					$completed_ids[] = $course_status->comment_post_ID;
 				} else {
 					$active_ids[] = $course_status->comment_post_ID;
@@ -1213,41 +1213,41 @@ 
 			$active_count = $completed_count = 0;
 
 			$active_courses = array();
-			if ( 0 < intval( count( $active_ids ) ) ) {
+			if (0 < intval(count($active_ids))) {
 				$my_courses_section = 'active';
-				$active_courses = Sensei()->course->course_query( $per_page, 'usercourses', $active_ids );
-				$active_count = count( $active_ids );
+				$active_courses = Sensei()->course->course_query($per_page, 'usercourses', $active_ids);
+				$active_count = count($active_ids);
 			} // End If Statement
 
 			$completed_courses = array();
-			if ( 0 < intval( count( $completed_ids ) ) ) {
+			if (0 < intval(count($completed_ids))) {
 				$my_courses_section = 'completed';
-				$completed_courses = Sensei()->course->course_query( $per_page, 'usercourses', $completed_ids );
-				$completed_count = count( $completed_ids );
+				$completed_courses = Sensei()->course->course_query($per_page, 'usercourses', $completed_ids);
+				$completed_count = count($completed_ids);
 			} // End If Statement
 
-			foreach ( $active_courses as $course_item ) {
+			foreach ($active_courses as $course_item) {
 
-				$course_lessons =  Sensei()->course->course_lessons( $course_item->ID );
+				$course_lessons = Sensei()->course->course_lessons($course_item->ID);
 				$lessons_completed = 0;
-				foreach ( $course_lessons as $lesson ) {
-					if ( WooThemes_Sensei_Utils::user_completed_lesson( $lesson->ID, $user->ID ) ) {
+				foreach ($course_lessons as $lesson) {
+					if (WooThemes_Sensei_Utils::user_completed_lesson($lesson->ID, $user->ID)) {
 						++$lessons_completed;
 					}
 				}
 
 			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+			    $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', '');
 
-                $active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">';
+                $active_html .= '<article class="'.esc_attr(join(' ', get_post_class(array('course', 'post'), $course_item->ID))).'">';
 
                 // Image
-                $active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true );
+                $active_html .= Sensei()->course->course_image(absint($course_item->ID), '100', '100', true);
 
                 // Title
                 $active_html .= '<header>';
 
-                $active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+                $active_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>';
 
                 $active_html .= '</header>';
 
@@ -1256,82 +1256,82 @@ 
                 $active_html .= '<p class="sensei-course-meta">';
 
                 // Author
-                $user_info = get_userdata( absint( $course_item->post_author ) );
-                if ( isset( Sensei()->settings->settings[ 'course_author' ] )
-                    && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
+                $user_info = get_userdata(absint($course_item->post_author));
+                if (isset(Sensei()->settings->settings['course_author'])
+                    && (Sensei()->settings->settings['course_author'])) {
 
                     $active_html .= '<span class="course-author">'
-                        . __( 'by ', 'woothemes-sensei' )
-                        . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) )
-                        . '" title="' . esc_attr( $user_info->display_name ) . '">'
-                        . esc_html( $user_info->display_name )
+                        . __('by ', 'woothemes-sensei')
+                        . '<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author)))
+                        . '" title="'.esc_attr($user_info->display_name).'">'
+                        . esc_html($user_info->display_name)
                         . '</a></span>';
 
                 } // End If Statement
 
                 // Lesson count for this author
-                $lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) );
+                $lesson_count = Sensei()->course->course_lesson_count(absint($course_item->ID));
                 // Handle Division by Zero
-                if ( 0 == $lesson_count ) {
+                if (0 == $lesson_count) {
 
                     $lesson_count = 1;
 
                 } // End If Statement
-                $active_html .= '<span class="course-lesson-count">' . $lesson_count . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ) . '</span>';
+                $active_html .= '<span class="course-lesson-count">'.$lesson_count.'&nbsp;'.__('Lessons', 'woothemes-sensei').'</span>';
                 // Course Categories
-                if ( '' != $category_output ) {
+                if ('' != $category_output) {
 
-                    $active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+                    $active_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>';
 
                 } // End If Statement
-                $active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count  ) . '</span>';
+                $active_html .= '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $lessons_completed, $lesson_count).'</span>';
 
                 $active_html .= '</p>';
 
-                $active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+                $active_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>';
 
 
 
-                $progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) );
+                $progress_percentage = abs(round((doubleval($lessons_completed) * 100) / ($lesson_count), 0));
 
-                $active_html .= $this->get_progress_meter( $progress_percentage );
+                $active_html .= $this->get_progress_meter($progress_percentage);
 
                 $active_html .= '</section>';
 
-                if( is_user_logged_in() ) {
+                if (is_user_logged_in()) {
 
                     $active_html .= '<section class="entry-actions">';
 
-                    $active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">';
+                    $active_html .= '<form method="POST" action="'.esc_url(remove_query_arg(array('active_page', 'completed_page'))).'">';
 
-                    $active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />';
+                    $active_html .= '<input type="hidden" name="'.esc_attr('woothemes_sensei_complete_course_noonce').'" id="'.esc_attr('woothemes_sensei_complete_course_noonce').'" value="'.esc_attr(wp_create_nonce('woothemes_sensei_complete_course_noonce')).'" />';
 
-                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />';
+                    $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="'.esc_attr(absint($course_item->ID)).'" />';
 
-                    if ( 0 < absint( count( $course_lessons ) ) && Sensei()->settings->settings['course_completion'] == 'complete' ) {
+                    if (0 < absint(count($course_lessons)) && Sensei()->settings->settings['course_completion'] == 'complete') {
 
                         $active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="'
-                            .  __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>';
+                            .  __('Mark as Complete', 'woothemes-sensei').'"/> </span>';
 
                     } // End If Statement
 
                     $course_purchased = false;
-                    if ( Sensei_WC::is_woocommerce_active() ) {
+                    if (Sensei_WC::is_woocommerce_active()) {
 
                         // Get the product ID
-                        $wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+                        $wc_post_id = get_post_meta(absint($course_item->ID), '_course_woocommerce_product', true);
+                        if (0 < $wc_post_id) {
 
-                            $course_purchased = Sensei_WC::has_customer_bought_product(  $user->ID, $wc_post_id );
+                            $course_purchased = Sensei_WC::has_customer_bought_product($user->ID, $wc_post_id);
 
                         } // End If Statement
 
                     } // End If Statement
 
-                    if ( false == $course_purchased ) {
+                    if (false == $course_purchased) {
 
                         $active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="'
-                            .  __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>';
+                            .  __('Delete Course', 'woothemes-sensei').'"/></span>';
 
                     } // End If Statement
 
@@ -1344,54 +1344,54 @@ 
 			}
 
 			// Active pagination
-			if( $active_count > $per_page ) {
+			if ($active_count > $per_page) {
 
 				$current_page = 1;
-				if( isset( $_GET['active_page'] ) && 0 < intval( $_GET['active_page'] ) ) {
+				if (isset($_GET['active_page']) && 0 < intval($_GET['active_page'])) {
 					$current_page = $_GET['active_page'];
 				}
 
 				$active_html .= '<nav class="pagination woo-pagination">';
-				$total_pages = ceil( $active_count / $per_page );
+				$total_pages = ceil($active_count / $per_page);
 
-				if( $current_page > 1 ) {
-					$prev_link = add_query_arg( 'active_page', $current_page - 1 );
-					$active_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page > 1) {
+					$prev_link = add_query_arg('active_page', $current_page - 1);
+					$active_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> ';
 				}
 
-				for ( $i = 1; $i <= $total_pages; $i++ ) {
-					$link = add_query_arg( 'active_page', $i );
+				for ($i = 1; $i <= $total_pages; $i++) {
+					$link = add_query_arg('active_page', $i);
 
-					if( $i == $current_page ) {
-						$active_html .= '<span class="page-numbers current">' . $i . '</span> ';
+					if ($i == $current_page) {
+						$active_html .= '<span class="page-numbers current">'.$i.'</span> ';
 					} else {
-						$active_html .= '<a class="page-numbers" href="' . esc_url( $link ). '">' . $i . '</a> ';
+						$active_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> ';
 					}
 				}
 
-				if( $current_page < $total_pages ) {
-					$next_link = add_query_arg( 'active_page', $current_page + 1 );
-					$active_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page < $total_pages) {
+					$next_link = add_query_arg('active_page', $current_page + 1);
+					$active_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> ';
 				}
 
 				$active_html .= '</nav>';
 			}
 
-			foreach ( $completed_courses as $course_item ) {
+			foreach ($completed_courses as $course_item) {
 				$course = $course_item;
 
 			    // Get Course Categories
-			    $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' );
+			    $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', '');
 
-		    	$complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">';
+		    	$complete_html .= '<article class="'.join(' ', get_post_class(array('course', 'post'), $course_item->ID)).'">';
 
 		    	    // Image
-		    		$complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true );
+		    		$complete_html .= Sensei()->course->course_image(absint($course_item->ID), 100, 100, true);
 
 		    		// Title
 		    		$complete_html .= '<header>';
 
-		    		    $complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>';
+		    		    $complete_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>';
 
 		    		$complete_html .= '</header>';
 
@@ -1400,46 +1400,46 @@ 
 		    			$complete_html .= '<p class="sensei-course-meta">';
 
 		    		    	// Author
-		    		    	$user_info = get_userdata( absint( $course_item->post_author ) );
-		    		    	if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {
-		    		    		$complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>';
+		    		    	$user_info = get_userdata(absint($course_item->post_author));
+		    		    	if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {
+		    		    		$complete_html .= '<span class="course-author">'.__('by ', 'woothemes-sensei').'<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author))).'" title="'.esc_attr($user_info->display_name).'">'.esc_html($user_info->display_name).'</a></span>';
 		    		    	} // End If Statement
 
 		    		    	// Lesson count for this author
 		    		    	$complete_html .= '<span class="course-lesson-count">'
-                                . Sensei()->course->course_lesson_count( absint( $course_item->ID ) )
-                                . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' )
+                                . Sensei()->course->course_lesson_count(absint($course_item->ID))
+                                . '&nbsp;'.__('Lessons', 'woothemes-sensei')
                                 . '</span>';
 
 		    		    	// Course Categories
-		    		    	if ( '' != $category_output ) {
+		    		    	if ('' != $category_output) {
 
-		    		    		$complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>';
+		    		    		$complete_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>';
 
 		    		    	} // End If Statement
 
 						$complete_html .= '</p>';
 
-						$complete_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>';
+						$complete_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>';
 
-                        $complete_html .= $this->get_progress_meter( 100 );
+                        $complete_html .= $this->get_progress_meter(100);
 
-						if( $manage ) {
-							$has_quizzes = Sensei()->course->course_quizzes( $course_item->ID, true );
+						if ($manage) {
+							$has_quizzes = Sensei()->course->course_quizzes($course_item->ID, true);
 							// Output only if there is content to display
-							if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) {
+							if (has_filter('sensei_results_links') || $has_quizzes) {
 
 
 								$complete_html .= '<p class="sensei-results-links">';
 								$results_link = '';
-								if( $has_quizzes ) {
+								if ($has_quizzes) {
 
 									$results_link = '<a class="button view-results" href="'
-                                        . Sensei()->course_results->get_permalink( $course_item->ID )
-                                        . '">' . __( 'View results', 'woothemes-sensei' )
+                                        . Sensei()->course_results->get_permalink($course_item->ID)
+                                        . '">'.__('View results', 'woothemes-sensei')
                                         . '</a>';
 								}
-								$complete_html .= apply_filters( 'sensei_results_links', $results_link );
+								$complete_html .= apply_filters('sensei_results_links', $results_link);
 								$complete_html .= '</p>';
 
 							}
@@ -1451,35 +1451,35 @@ 
 			}
 
 			// Active pagination
-			if( $completed_count > $per_page ) {
+			if ($completed_count > $per_page) {
 
 				$current_page = 1;
-				if( isset( $_GET['completed_page'] ) && 0 < intval( $_GET['completed_page'] ) ) {
+				if (isset($_GET['completed_page']) && 0 < intval($_GET['completed_page'])) {
 					$current_page = $_GET['completed_page'];
 				}
 
 				$complete_html .= '<nav class="pagination woo-pagination">';
-				$total_pages = ceil( $completed_count / $per_page );
+				$total_pages = ceil($completed_count / $per_page);
 
 
-				if( $current_page > 1 ) {
-					$prev_link = add_query_arg( 'completed_page', $current_page - 1 );
-					$complete_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page > 1) {
+					$prev_link = add_query_arg('completed_page', $current_page - 1);
+					$complete_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> ';
 				}
 
-				for ( $i = 1; $i <= $total_pages; $i++ ) {
-					$link = add_query_arg( 'completed_page', $i );
+				for ($i = 1; $i <= $total_pages; $i++) {
+					$link = add_query_arg('completed_page', $i);
 
-					if( $i == $current_page ) {
-						$complete_html .= '<span class="page-numbers current">' . $i . '</span> ';
+					if ($i == $current_page) {
+						$complete_html .= '<span class="page-numbers current">'.$i.'</span> ';
 					} else {
-						$complete_html .= '<a class="page-numbers" href="' . esc_url( $link ) . '">' . $i . '</a> ';
+						$complete_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> ';
 					}
 				}
 
-				if( $current_page < $total_pages ) {
-					$next_link = add_query_arg( 'completed_page', $current_page + 1 );
-					$complete_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> ';
+				if ($current_page < $total_pages) {
+					$next_link = add_query_arg('completed_page', $current_page + 1);
+					$complete_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> ';
 				}
 
 				$complete_html .= '</nav>';
@@ -1487,26 +1487,26 @@ 
 
 		} // End If Statement
 
-		if( $manage ) {
-			$no_active_message = __( 'You have no active courses.', 'woothemes-sensei' );
-			$no_complete_message = __( 'You have not completed any courses yet.', 'woothemes-sensei' );
+		if ($manage) {
+			$no_active_message = __('You have no active courses.', 'woothemes-sensei');
+			$no_complete_message = __('You have not completed any courses yet.', 'woothemes-sensei');
 		} else {
-			$no_active_message =  __( 'This learner has no active courses.', 'woothemes-sensei' );
-			$no_complete_message =  __( 'This learner has not completed any courses yet.', 'woothemes-sensei' );
+			$no_active_message = __('This learner has no active courses.', 'woothemes-sensei');
+			$no_complete_message = __('This learner has not completed any courses yet.', 'woothemes-sensei');
 		}
 
 		ob_start();
 		?>
 
-		<?php do_action( 'sensei_before_user_courses' ); ?>
+		<?php do_action('sensei_before_user_courses'); ?>
 
 		<?php
-		if( $manage && ( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) ) {
+		if ($manage && ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable'])) {
 			?>
 			<p class="my-messages-link-container">
-                <a class="my-messages-link" href="<?php echo get_post_type_archive_link( 'sensei_message' ); ?>"
-                   title="<?php _e( 'View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei' ); ?>">
-                    <?php _e( 'My Messages', 'woothemes-sensei' ); ?>
+                <a class="my-messages-link" href="<?php echo get_post_type_archive_link('sensei_message'); ?>"
+                   title="<?php _e('View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei'); ?>">
+                    <?php _e('My Messages', 'woothemes-sensei'); ?>
                 </a>
             </p>
 			<?php
@@ -1515,11 +1515,11 @@ 
 		<div id="my-courses">
 
 		    <ul>
-		    	<li><a href="#active-courses"><?php  _e( 'Active Courses', 'woothemes-sensei' ); ?></a></li>
-		    	<li><a href="#completed-courses"><?php  _e( 'Completed Courses', 'woothemes-sensei' ); ?></a></li>
+		    	<li><a href="#active-courses"><?php  _e('Active Courses', 'woothemes-sensei'); ?></a></li>
+		    	<li><a href="#completed-courses"><?php  _e('Completed Courses', 'woothemes-sensei'); ?></a></li>
 		    </ul>
 
-		    <?php do_action( 'sensei_before_active_user_courses' ); ?>
+		    <?php do_action('sensei_before_active_user_courses'); ?>
 
 		    <?php
             $course_page_url = Sensei_Course::get_courses_page_url();
@@ -1527,7 +1527,7 @@ 
 
 		    <div id="active-courses">
 
-		    	<?php if ( '' != $active_html ) {
+		    	<?php if ('' != $active_html) {
 
 		    		echo $active_html;
 
@@ -1539,7 +1539,7 @@ 
 
                         <a href="<?php echo $course_page_url; ?>">
 
-                            <?php  _e( 'Start a Course!', 'woothemes-sensei' ); ?>
+                            <?php  _e('Start a Course!', 'woothemes-sensei'); ?>
 
                         </a>
 
@@ -1549,13 +1549,13 @@ 
 
 		    </div>
 
-		    <?php do_action( 'sensei_after_active_user_courses' ); ?>
+		    <?php do_action('sensei_after_active_user_courses'); ?>
 
-		    <?php do_action( 'sensei_before_completed_user_courses' ); ?>
+		    <?php do_action('sensei_before_completed_user_courses'); ?>
 
 		    <div id="completed-courses">
 
-		    	<?php if ( '' != $complete_html ) {
+		    	<?php if ('' != $complete_html) {
 
 		    		echo $complete_html;
 
@@ -1571,16 +1571,16 @@ 
 
 		    </div>
 
-		    <?php do_action( 'sensei_after_completed_user_courses' ); ?>
+		    <?php do_action('sensei_after_completed_user_courses'); ?>
 
 		</div>
 
-		<?php do_action( 'sensei_after_user_courses' ); ?>
+		<?php do_action('sensei_after_user_courses'); ?>
 
 		<?php
         echo ob_get_clean();
 
-        do_action( 'sensei_after_learner_course_content', $user );
+        do_action('sensei_after_learner_course_content', $user);
 
 	} // end load_user_courses_content
 
@@ -1592,7 +1592,7 @@ 
      *  @type $course WP_Post
      * }
      */
-    public static function get_all_courses(){
+    public static function get_all_courses() {
 
         $args = array(
                'post_type' => 'course',
@@ -1603,7 +1603,7 @@ 
                 'suppress_filters' 	=> 0,
         );
 
-        $wp_query_obj =  new WP_Query( $args );
+        $wp_query_obj = new WP_Query($args);
 
         /**
          * sensei_get_all_courses filter
@@ -1615,7 +1615,7 @@ 
          * }
          * @param array $attributes
          */
-        return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts );
+        return apply_filters('sensei_get_all_courses', $wp_query_obj->posts);
 
     }// end get_all_courses
 
@@ -1626,16 +1626,16 @@ 
      * @param int $progress_percentage 0 - 100
      * @return string $progress_bar_html
      */
-    public function get_progress_meter( $progress_percentage ){
+    public function get_progress_meter($progress_percentage) {
 
-        if ( 50 < $progress_percentage ) {
+        if (50 < $progress_percentage) {
             $class = ' green';
-        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) {
+        } elseif (25 <= $progress_percentage && 50 >= $progress_percentage) {
             $class = ' orange';
         } else {
             $class = ' red';
         }
-        $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>';
+        $progress_bar_html = '<div class="meter'.esc_attr($class).'"><span style="width: '.$progress_percentage.'%">'.round($progress_percentage).'%</span></div>';
 
         return $progress_bar_html;
 
@@ -1650,17 +1650,17 @@ 
      *
      * @return string $statement_html
      */
-    public function get_progress_statement( $course_id, $user_id ){
+    public function get_progress_statement($course_id, $user_id) {
 
-        if( empty( $course_id ) || empty( $user_id )
-        || ! WooThemes_Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+        if (empty($course_id) || empty($user_id)
+        || ! WooThemes_Sensei_Utils::user_started_course($course_id, $user_id)) {
             return '';
         }
 
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
-        $total_lessons = count( $this->course_lessons( $course_id ) );
+        $completed = count($this->get_completed_lesson_ids($course_id, $user_id));
+        $total_lessons = count($this->course_lessons($course_id));
 
-        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons );
+        $statement = sprintf(_n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons);
 
         /**
          * Filter the course completion statement.
@@ -1668,7 +1668,7 @@ 
          *
          * @param string $statement
          */
-        return apply_filters( 'sensei_course_completion_statement', $statement );
+        return apply_filters('sensei_course_completion_statement', $statement);
 
     }// end generate_progress_statement
 
@@ -1678,17 +1678,17 @@ 
      * @param $course_id
      * @return void
      */
-    public function the_progress_statement( $course_id = 0, $user_id = 0 ){
-        if( empty( $course_id ) ){
+    public function the_progress_statement($course_id = 0, $user_id = 0) {
+        if (empty($course_id)) {
             global $post;
             $course_id = $post->ID;
         }
 
-        if( empty( $user_id ) ){
+        if (empty($user_id)) {
             $user_id = get_current_user_id();
         }
 
-        echo '<span class="progress statement  course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id  ) . '</span>';
+        echo '<span class="progress statement  course-completion-rate">'.$this->get_progress_statement($course_id, $user_id).'</span>';
     }
 
     /**
@@ -1697,24 +1697,24 @@ 
      * @param $course_id
      * @return void
      */
-    public function the_progress_meter( $course_id = 0, $user_id = 0 ){
+    public function the_progress_meter($course_id = 0, $user_id = 0) {
 
-        if( empty( $course_id ) ){
+        if (empty($course_id)) {
             global $post;
             $course_id = $post->ID;
         }
 
-        if( empty( $user_id ) ){
+        if (empty($user_id)) {
             $user_id = get_current_user_id();
         }
 
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id )
-            || ! WooThemes_Sensei_Utils::user_started_course( $course_id ,$user_id ) ){
+        if ('course' != get_post_type($course_id) || ! get_userdata($user_id)
+            || ! WooThemes_Sensei_Utils::user_started_course($course_id, $user_id)) {
             return;
         }
-        $percentage_completed = $this->get_completion_percentage( $course_id, $user_id );
+        $percentage_completed = $this->get_completion_percentage($course_id, $user_id);
 
-        echo $this->get_progress_meter( $percentage_completed );
+        echo $this->get_progress_meter($percentage_completed);
 
     }// end the_progress_meter
 
@@ -1727,20 +1727,20 @@ 
      * @param int $user_id
      * @return array $completed_lesson_ids
      */
-    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){
+    public function get_completed_lesson_ids($course_id, $user_id = 0) {
 
-        if( !( intval( $user_id ) ) > 0 ){
+        if ( ! (intval($user_id)) > 0) {
             $user_id = get_current_user_id();
         }
 
         $completed_lesson_ids = array();
 
-        $course_lessons = $this->course_lessons( $course_id );
+        $course_lessons = $this->course_lessons($course_id);
 
-        foreach( $course_lessons as $lesson ){
+        foreach ($course_lessons as $lesson) {
 
-            $is_lesson_completed = WooThemes_Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id );
-            if( $is_lesson_completed ){
+            $is_lesson_completed = WooThemes_Sensei_Utils::user_completed_lesson($lesson->ID, $user_id);
+            if ($is_lesson_completed) {
                 $completed_lesson_ids[] = $lesson->ID;
             }
 
@@ -1759,19 +1759,19 @@ 
      * @param int $user_id
      * @return int $percentage
      */
-    public function get_completion_percentage( $course_id, $user_id = 0 ){
+    public function get_completion_percentage($course_id, $user_id = 0) {
 
-        if( !( intval( $user_id ) ) > 0 ){
+        if ( ! (intval($user_id)) > 0) {
             $user_id = get_current_user_id();
         }
 
-        $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) );
+        $completed = count($this->get_completed_lesson_ids($course_id, $user_id));
 
-        if( ! (  $completed  > 0 ) ){
+        if ( ! ($completed > 0)) {
             return 0;
         }
 
-        $total_lessons = count( $this->course_lessons( $course_id ) );
+        $total_lessons = count($this->course_lessons($course_id));
         $percentage = $completed / $total_lessons * 100;
 
         /**
@@ -1783,7 +1783,7 @@ 
          * @param $user_id
          * @since 1.8.0
          */
-        return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id );
+        return apply_filters('sensei_course_completion_percentage', $percentage, $course_id, $user_id);
 
     }// end get_completed_lesson_ids
 
@@ -1795,28 +1795,28 @@ 
      * @param $should_send
      * @return bool
      */
-    public function block_notification_emails( $should_send ){
+    public function block_notification_emails($should_send) {
         global $sensei_email_data;
         $email = $sensei_email_data;
 
         $course_id = '';
 
-        if( isset( $email['course_id'] ) ){
+        if (isset($email['course_id'])) {
 
             $course_id = $email['course_id'];
 
-        }elseif( isset( $email['lesson_id'] ) ){
+        }elseif (isset($email['lesson_id'])) {
 
-            $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] );
+            $course_id = Sensei()->lesson->get_course_id($email['lesson_id']);
 
-        }elseif( isset( $email['quiz_id'] ) ){
+        }elseif (isset($email['quiz_id'])) {
 
-            $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+            $lesson_id = Sensei()->quiz->get_lesson_id($email['quiz_id']);
+            $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         }
 
-        if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) {
+        if ( ! empty($course_id) && 'course' == get_post_type($course_id)) {
 
             $course_emails_disabled = get_post_meta($course_id, 'disable_notification', true);
 
@@ -1837,19 +1837,19 @@ 
      * @since 1.8.0
      * @param $course
      */
-    public function course_notification_meta_box_content( $course ){
+    public function course_notification_meta_box_content($course) {
 
-        $checked = get_post_meta( $course->ID , 'disable_notification', true );
+        $checked = get_post_meta($course->ID, 'disable_notification', true);
 
         // generate checked html
         $checked_html = '';
-        if( $checked ){
+        if ($checked) {
             $checked_html = 'checked="checked"';
         }
-        wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' );
+        wp_nonce_field('update-course-notification-setting', '_sensei_course_notification');
 
-        echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >';
-        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>';
+        echo '<input id="disable_sensei_course_notification" '.$checked_html.' type="checkbox" name="disable_sensei_course_notification" >';
+        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei').'</label>';
 
     }// end course_notification_meta_box_content
 
@@ -1861,20 +1861,20 @@ 
      *
      * @param $course_id
      */
-    public function save_course_notification_meta_box( $course_id ){
+    public function save_course_notification_meta_box($course_id) {
 
-        if( !isset( $_POST['_sensei_course_notification']  )
-            || ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){
+        if ( ! isset($_POST['_sensei_course_notification'])
+            || ! wp_verify_nonce($_POST['_sensei_course_notification'], 'update-course-notification-setting')) {
             return;
         }
 
-        if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) {
+        if (isset($_POST['disable_sensei_course_notification']) && 'on' == $_POST['disable_sensei_course_notification']) {
             $new_val = true;
-        }else{
+        } else {
             $new_val = false;
         }
 
-       update_post_meta( $course_id , 'disable_notification', $new_val );
+       update_post_meta($course_id, 'disable_notification', $new_val);
 
     }// end save notification meta box
 
@@ -1888,19 +1888,19 @@ 
      *
      * @param WP_Post $post
      */
-    public function content_before_backwards_compatibility_hooks( $post ){
+    public function content_before_backwards_compatibility_hooks($post) {
 
-        if( has_action( 'sensei_course_image' ) ){
+        if (has_action('sensei_course_image')) {
 
-            _doing_it_wrong('sensei_course_image','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
-            do_action('sensei_course_image', $post->ID );
+            _doing_it_wrong('sensei_course_image', 'This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9');
+            do_action('sensei_course_image', $post->ID);
 
         }
 
-        if( has_action( 'sensei_course_archive_course_title' ) ){
+        if (has_action('sensei_course_archive_course_title')) {
 
-            _doing_it_wrong('sensei_course_archive_course_title','This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9' );
-            do_action('sensei_course_archive_course_title', $post );
+            _doing_it_wrong('sensei_course_archive_course_title', 'This action has been retired: . Please use sensei_course_content_inside_before instead.', '1.9');
+            do_action('sensei_course_archive_course_title', $post);
 
         }
 
@@ -1915,10 +1915,10 @@ 
      *
      * @global WP_Post $post
      */
-    public  function loop_before_backwards_compatibility_hooks( ){
+    public  function loop_before_backwards_compatibility_hooks( ) {
 
         global $post;
-        sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type  );
+        sensei_do_deprecated_action('sensei_course_archive_header', '1.9.0', 'sensei_course_content_inside_before', $post->post_type);
 
     }
 
@@ -1931,18 +1931,18 @@ 
      *
      * @param WP_Post $course
      */
-    public function the_course_free_lesson_preview( $course ){
+    public function the_course_free_lesson_preview($course) {
         // Meta data
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) );
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
+        $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course->ID));
+        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course($course->ID, get_current_user_id());
 
-        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
+        if (0 < $preview_lesson_count && ! $is_user_taking_course) {
             ?>
             <p class="sensei-free-lessons">
                 <a href="<?php echo get_permalink(); ?>">
-                    <?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
+                    <?php _e('Preview this course', 'woothemes-sensei') ?>
                 </a>
-                - <?php echo sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ) ; ?>
+                - <?php echo sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?>
             </p>
 
         <?php
@@ -1955,38 +1955,38 @@ 
      * @since 1.9.0
      * @param WP_Post $course
      */
-    public function the_course_meta( $course ){
+    public function the_course_meta($course) {
         echo '<p class="sensei-course-meta">';
 
-        $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' );
-        $author_display_name = get_the_author_meta( 'display_name', $course->post_author  );
+        $category_output = get_the_term_list($course->ID, 'course-category', '', ', ', '');
+        $author_display_name = get_the_author_meta('display_name', $course->post_author);
 
-        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?>
+        if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {?>
 
-            <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?>
+            <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?>
 
-                <a href="<?php esc_attr_e( get_author_posts_url( $course->post_author ) ); ?>" title="<?php esc_attr_e( $author_display_name ); ?>"><?php esc_attr_e( $author_display_name   ); ?></a>
+                <a href="<?php esc_attr_e(get_author_posts_url($course->post_author)); ?>" title="<?php esc_attr_e($author_display_name); ?>"><?php esc_attr_e($author_display_name); ?></a>
 
             </span>
 
         <?php } // End If Statement ?>
 
-        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $course->ID ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?></span>
+        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($course->ID).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
 
-       <?php if ( '' != $category_output ) { ?>
+       <?php if ('' != $category_output) { ?>
 
-            <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 
         <?php } // End If Statement
 
         // number of completed lessons
-        if( is_user_logged_in() ){
-            $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) );
-            $lesson_count = count( $this->course_lessons( $course->ID ) );
-            echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count  ) . '</span>';
+        if (is_user_logged_in()) {
+            $completed = count($this->get_completed_lesson_ids($course->ID, get_current_user_id()));
+            $lesson_count = count($this->course_lessons($course->ID));
+            echo '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $completed, $lesson_count).'</span>';
         }
 
-        sensei_simple_course_price( $course->ID );
+        sensei_simple_course_price($course->ID);
 
         echo '</p>';
     } // end the course meta
@@ -2001,15 +2001,15 @@ 
      *
      * @return array $classes
      */
-    public static function add_course_user_status_class( $classes, $class, $course_id ){
+    public static function add_course_user_status_class($classes, $class, $course_id) {
 
-        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){
+        if ('course' == get_post_type($course_id) && is_user_logged_in()) {
 
-            if( WooThemes_Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){
+            if (WooThemes_Sensei_Utils::user_completed_course($course_id, get_current_user_id())) {
 
                 $classes[] = 'user-status-completed';
 
-            }else{
+            } else {
 
                 $classes[] = 'user-status-active';
 
@@ -2029,56 +2029,56 @@ 
      *
      * @param WP_Post $course
      */
-    public static function the_course_action_buttons( $course ){
+    public static function the_course_action_buttons($course) {
 
-        if( is_user_logged_in() ) { ?>
+        if (is_user_logged_in()) { ?>
 
             <section class="entry-actions">
-                <form method="POST" action="<?php  echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>">
+                <form method="POST" action="<?php  echo esc_url(remove_query_arg(array('active_page', 'completed_page'))); ?>">
 
                     <input type="hidden"
-                           name="<?php esc_attr_e( 'woothemes_sensei_complete_course_noonce' ) ?>"
-                           id="<?php  esc_attr_e( 'woothemes_sensei_complete_course_noonce' ); ?>"
-                           value="<?php esc_attr_e( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ); ?>"
+                           name="<?php esc_attr_e('woothemes_sensei_complete_course_noonce') ?>"
+                           id="<?php  esc_attr_e('woothemes_sensei_complete_course_noonce'); ?>"
+                           value="<?php esc_attr_e(wp_create_nonce('woothemes_sensei_complete_course_noonce')); ?>"
                         />
 
-                    <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e( intval( $course->ID ) ); ?>" />
+                    <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e(intval($course->ID)); ?>" />
 
-                    <?php if ( 0 < absint( count( Sensei()->course->course_lessons( $course->ID ) ) ) && Sensei()->settings->settings['course_completion'] == 'complete' ) { ?>
+                    <?php if (0 < absint(count(Sensei()->course->course_lessons($course->ID))) && Sensei()->settings->settings['course_completion'] == 'complete') { ?>
 
-                        <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e( 'Mark as Complete', 'woothemes-sensei' ); ?>" /></span>
+                        <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e('Mark as Complete', 'woothemes-sensei'); ?>" /></span>
 
                    <?php  } // End If Statement
 
                     $course_purchased = false;
-                    if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) {
+                    if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
                         // Get the product ID
-                        $wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true );
-                        if ( 0 < $wc_post_id ) {
+                        $wc_post_id = get_post_meta(intval($course->ID), '_course_woocommerce_product', true);
+                        if (0 < $wc_post_id) {
 
                             $user = wp_get_current_user();
-                            $course_purchased = WooThemes_Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id );
+                            $course_purchased = WooThemes_Sensei_Utils::sensei_customer_bought_product($user->user_email, $user->ID, $wc_post_id);
 
                         } // End If Statement
                     } // End If Statement
 
-                    if ( ! $course_purchased && ! WooThemes_Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) ) {?>
+                    if ( ! $course_purchased && ! WooThemes_Sensei_Utils::user_completed_course($course->ID, get_current_user_id())) {?>
 
-                        <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __( 'Delete Course', 'woothemes-sensei' ); ?>"/></span>
+                        <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __('Delete Course', 'woothemes-sensei'); ?>"/></span>
 
                     <?php } // End If Statement
 
-                    $has_quizzes = Sensei()->course->course_quizzes( $course->ID, true );
+                    $has_quizzes = Sensei()->course->course_quizzes($course->ID, true);
                     $results_link = '';
-                    if( $has_quizzes ){
-                        $results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>';
+                    if ($has_quizzes) {
+                        $results_link = '<a class="button view-results" href="'.Sensei()->course_results->get_permalink($course->ID).'">'.__('View results', 'woothemes-sensei').'</a>';
                     }
 
                     // Output only if there is content to display
-                    if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+                    if (has_filter('sensei_results_links') || $has_quizzes) { ?>
 
                         <p class="sensei-results-links">
-                            <?php echo apply_filters( 'sensei_results_links', $results_link ); ?>
+                            <?php echo apply_filters('sensei_results_links', $results_link); ?>
                         </p>
 
                     <?php } // end if has filter  ?>
@@ -2103,27 +2103,27 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_query_filter( $query ){
+    public static function course_query_filter($query) {
 
         // exit early for no course queries and admin queries
-        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){
+        if (is_admin( ) || 'course' != $query->get('post_type')) {
             return $query;
         }
 
         global $post; // used to get the current page id for my courses
 
         // for the course archive page
-        if( $query->is_main_query() && is_post_type_archive('course') )
+        if ($query->is_main_query() && is_post_type_archive('course'))
         {
 
-            $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', get_option( 'posts_per_page' ) ) );
+            $query->set('posts_per_page', apply_filters('sensei_archive_courses_per_page', get_option('posts_per_page')));
 
         }
         // for the my courses page
-        elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID  )
+        elseif (is_page() && Sensei()->settings->get('my_course_page') == $post->ID)
         {
 
-            $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', get_option( 'posts_per_page' ) ) );
+            $query->set('posts_per_page', apply_filters('sensei_my_courses_per_page', get_option('posts_per_page')));
 
         }
 
@@ -2139,21 +2139,21 @@ 
      * @return array $extra_classes
      * @since 1.9.0
      */
-    public static function get_course_loop_content_class ()
+    public static function get_course_loop_content_class()
     {
 
         global $sensei_course_loop;
 
 
-        if( !isset( $sensei_course_loop ) ){
+        if ( ! isset($sensei_course_loop)) {
             $sensei_course_loop = array();
         }
 
-        if (!isset($sensei_course_loop['counter'])) {
+        if ( ! isset($sensei_course_loop['counter'])) {
             $sensei_course_loop['counter'] = 0;
         }
 
-        if (!isset($sensei_course_loop['columns'])) {
+        if ( ! isset($sensei_course_loop['columns'])) {
             $sensei_course_loop['columns'] = self::get_loop_number_of_columns();
         }
 
@@ -2161,16 +2161,16 @@ 
         $sensei_course_loop['counter']++;
 
         $extra_classes = array();
-        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){
+        if (0 == ($sensei_course_loop['counter'] - 1) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']) {
             $extra_classes[] = 'first';
         }
 
-        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){
+        if (0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']) {
             $extra_classes[] = 'last';
         }
 
         // add the item number to the classes as well.
-        $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter'];
+        $extra_classes[] = 'loop-item-number-'.$sensei_course_loop['counter'];
 
         /**
          * Filter the course loop class the fires in the  in get_course_loop_content_class function
@@ -2181,7 +2181,7 @@ 
          * @param array $extra_classes
          * @param WP_Post $loop_current_course
          */
-        return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() );
+        return apply_filters('sensei_course_loop_content_class', $extra_classes, get_post());
 
     }// end get_course_loop_class
 
@@ -2191,7 +2191,7 @@ 
      * @since 1.9.0
      * @return mixed|void
      */
-    public static function get_loop_number_of_columns(){
+    public static function get_loop_number_of_columns() {
 
         /**
          * Filter the number of columns on the course archive page.
@@ -2211,10 +2211,10 @@ 
      * @since 1.9.0
      * @param
      */
-    public static function course_archive_sorting( $query ){
+    public static function course_archive_sorting($query) {
 
         // don't show on category pages and other pages
-        if( ! is_archive(  'course ') || is_tax('course-category') ){
+        if ( ! is_archive('course ') || is_tax('course-category')) {
             return;
         }
 
@@ -2227,16 +2227,16 @@ 
          *  @type string $option_string
          * }
          */
-        $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array(
-            "newness"     => __( "Sort by newest first", "woothemes-sensei"),
-            "title"       => __( "Sort by title A-Z", "woothemes-sensei" ),
+        $course_order_by_options = apply_filters('sensei_archive_course_order_by_options', array(
+            "newness"     => __("Sort by newest first", "woothemes-sensei"),
+            "title"       => __("Sort by title A-Z", "woothemes-sensei"),
         ));
 
         // setup the currently selected item
         $selected = 'newness';
-        if( isset( $_GET['orderby'] ) ){
+        if (isset($_GET['orderby'])) {
 
-            $selected =  $_GET[ 'orderby' ];
+            $selected = $_GET['orderby'];
 
         }
 
@@ -2245,9 +2245,9 @@ 
         <form class="sensei-ordering" name="sensei-course-order" action="<?php echo WooThemes_Sensei_Utils::get_current_url(); ?>" method="POST">
             <select name="course-orderby" class="orderby">
                 <?php
-                foreach( $course_order_by_options as $value => $text ){
+                foreach ($course_order_by_options as $value => $text) {
 
-                    echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>';
+                    echo '<option value="'.$value.' "'.selected($selected, $value, false).'>'.$text.'</option>';
 
                 }
                 ?>
@@ -2265,10 +2265,10 @@ 
      * @since 1.9.0
      * @param
      */
-    public static function course_archive_filters( $query ){
+    public static function course_archive_filters($query) {
 
         // don't show on category pages
-        if( is_tax('course-category') ){
+        if (is_tax('course-category')) {
             return;
         }
 
@@ -2281,9 +2281,9 @@ 
          * }
          *
          */
-        $filters = apply_filters( 'sensei_archive_course_filter_by_options', array(
-            array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ),
-            array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url()  ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ),
+        $filters = apply_filters('sensei_archive_course_filter_by_options', array(
+            array('id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __('All', 'woothemes-sensei')),
+            array('id' => 'featured', 'url' => add_query_arg(array('course_filter'=>'featured'), self::get_courses_page_url()), 'title'=> __('Featured', 'woothemes-sensei')),
         ));
 
 
@@ -2294,11 +2294,11 @@ 
             //determine the current active url
             $current_url = WooThemes_Sensei_Utils::get_current_url();
 
-            foreach( $filters as $filter ) {
+            foreach ($filters as $filter) {
 
-                $active_class =  $current_url == $filter['url'] ? ' class="active" ' : '';
+                $active_class = $current_url == $filter['url'] ? ' class="active" ' : '';
 
-                echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title']  .'</a></li>';
+                echo '<li><a '.$active_class.' id="'.$filter['id'].'" href="'.esc_url($filter['url']).'" >'.$filter['title'].'</a></li>';
 
             }
             ?>
@@ -2319,13 +2319,13 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_featured_filter( $query ){
+    public static function course_archive_featured_filter($query) {
 
-        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){
+        if (isset ($_GET['course_filter']) && 'featured' == $_GET['course_filter'] && $query->is_main_query()) {
             //setup meta query for featured courses
-            $query->set( 'meta_value', 'featured'  );
-            $query->set( 'meta_key', '_course_featured'  );
-            $query->set( 'meta_compare', '='  );
+            $query->set('meta_value', 'featured');
+            $query->set('meta_key', '_course_featured');
+            $query->set('meta_compare', '=');
         }
 
         return $query;
@@ -2340,13 +2340,13 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_order_by_title( $query ){
+    public static function course_archive_order_by_title($query) {
 
-        if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby']
-            && 'course'== $query->get('post_type') && $query->is_main_query()  ){
+        if (isset ($_POST['course-orderby']) && 'title ' == $_POST['course-orderby']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
             // setup the order by title for this query
-            $query->set( 'orderby', 'title'  );
-            $query->set( 'order', 'ASC'  );
+            $query->set('orderby', 'title');
+            $query->set('order', 'ASC');
         }
 
         return $query;
@@ -2360,10 +2360,10 @@ 
      * @since 1.9.0
      * @return string $course_page_url
      */
-    public static function get_courses_page_url(){
+    public static function get_courses_page_url() {
 
-        $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id );
+        $course_page_id = intval(Sensei()->settings->settings['course_page']);
+        $course_page_url = empty($course_page_id) ? get_post_type_archive_link('course') : get_permalink($course_page_id);
 
         return $course_page_url;
 
@@ -2380,61 +2380,61 @@ 
      * @param string $after_html
      * @return void
      */
-    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){
+    public static function archive_header($query_type = '', $before_html = '', $after_html = '') {
 
-        if( ! is_post_type_archive('course') ){
+        if ( ! is_post_type_archive('course')) {
             return;
         }
 
         // deprecated since 1.9.0
-        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop');
+        sensei_do_deprecated_action('sensei_archive_title', '1.9.0', 'sensei_archive_before_course_loop');
 
         $html = '';
 
-        if( empty( $before_html ) ){
+        if (empty($before_html)) {
 
             $before_html = '<header class="archive-header"><h1>';
 
         }
 
-        if( empty( $after_html ) ){
+        if (empty($after_html)) {
 
             $after_html = '</h1></header>';
 
         }
 
-        if ( is_tax( 'course-category' ) ) {
+        if (is_tax('course-category')) {
 
             global $wp_query;
 
             $taxonomy_obj = $wp_query->get_queried_object();
             $taxonomy_short_name = $taxonomy_obj->taxonomy;
-            $taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name );
-            $title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name );
-            echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html );
+            $taxonomy_raw_obj = get_taxonomy($taxonomy_short_name);
+            $title = sprintf(__('%1$s Archives: %2$s', 'woothemes-sensei'), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name);
+            echo apply_filters('course_category_archive_title', $before_html.$title.$after_html);
             return;
 
         } // End If Statement
 
-        switch ( $query_type ) {
+        switch ($query_type) {
             case 'newcourses':
-                $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('New Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'featuredcourses':
-                $html .= $before_html .  __( 'Featured Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Featured Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'freecourses':
-                $html .= $before_html .  __( 'Free Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Free Courses', 'woothemes-sensei').$after_html;
                 break;
             case 'paidcourses':
-                $html .= $before_html .  __( 'Paid Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Paid Courses', 'woothemes-sensei').$after_html;
                 break;
             default:
-                $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html;
+                $html .= $before_html.__('Courses', 'woothemes-sensei').$after_html;
                 break;
         } // End Switch Statement
 
-        echo apply_filters( 'course_archive_title', $html );
+        echo apply_filters('course_archive_title', $html);
 
     }//course_archive_header
 
@@ -2448,9 +2448,9 @@ 
      * @param string $content
      * @return string $content or $excerpt
      */
-    public static function single_course_content( $content ){
+    public static function single_course_content($content) {
 
-        if( ! is_singular('course') ){
+        if ( ! is_singular('course')) {
 
             return $content;
 
@@ -2459,21 +2459,21 @@ 
         // Content Access Permissions
         $access_permission = false;
 
-        if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+        if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) {
 
             $access_permission = true;
 
         } // End If Statement
 
         // Check if the user is taking the course
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() );
+        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course(get_the_ID(), get_current_user_id());
 
-        if(WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
+        if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated()) {
 
-            $wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true );
-            $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+            $wc_post_id = get_post_meta(get_the_ID(), '_course_woocommerce_product', true);
+            $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
-            $has_product_attached = isset ( $product ) && is_object ( $product );
+            $has_product_attached = isset ($product) && is_object($product);
 
         } else {
 
@@ -2481,15 +2481,15 @@ 
 
         }
 
-        if ( ( is_user_logged_in() && $is_user_taking_course )
-            || ( $access_permission && !$has_product_attached)
-            || 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) {
+        if ((is_user_logged_in() && $is_user_taking_course)
+            || ($access_permission && ! $has_product_attached)
+            || 'full' == Sensei()->settings->get('course_single_content_display')) {
 
             return $content;
 
         } else {
 
-            return '<p class="course-excerpt">' . get_post(  get_the_ID() )->post_excerpt . '</p>';
+            return '<p class="course-excerpt">'.get_post(get_the_ID())->post_excerpt.'</p>';
 
         }
 
@@ -2500,14 +2500,14 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_lessons_title(){
+    public static function the_course_lessons_title() {
         global $post;
-        $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID  );
-        $course_lessons = Sensei()->course->course_lessons( $post->ID );
+        $none_module_lessons = Sensei()->modules->get_none_module_lessons($post->ID);
+        $course_lessons = Sensei()->course->course_lessons($post->ID);
 
         // title should be Other Lessons if there are lessons belonging to models.
         $title = __('Other Lessons', 'woothemes-sensei');
-        if( count( $course_lessons ) == count( $none_module_lessons )  ){
+        if (count($course_lessons) == count($none_module_lessons)) {
 
             $title = __('Lessons', 'woothemes-sensei');
 
@@ -2516,7 +2516,7 @@ 
         /**
          * hook document in class-woothemes-sensei-message.php
          */
-        $title = apply_filters( 'sensei_single_title', $title, $post->post_type );
+        $title = apply_filters('sensei_single_title', $title, $post->post_type);
 
         ob_start(); // start capturing the following output.
 
@@ -2535,7 +2535,7 @@ 
          * @since 1.9.0
          * @param string $lessons_title_html
          */
-        echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing.
+        echo apply_filters('the_course_lessons_title', ob_get_clean()); // output and filter the captured output and stop capturing.
 
     }// end the_course_lessons_title
 
@@ -2550,13 +2550,13 @@ 
      * @since 1.9.0
      * @global $wp_query
      */
-    public static function load_single_course_lessons_query(){
+    public static function load_single_course_lessons_query() {
 
         global $post, $wp_query;
 
         $course_id = $post->ID;
 
-        if( 'course' != get_post_type( $course_id ) ){
+        if ('course' != get_post_type($course_id)) {
             return;
         }
 
@@ -2568,7 +2568,7 @@ 
             'meta_query'        => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                 ),
             ),
             'post_status'       => 'public',
@@ -2576,17 +2576,17 @@ 
         );
 
         // Exclude lessons belonging to modules as they are queried along with the modules.
-        $modules = Sensei()->modules->get_course_modules( $course_id );
-        if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){
+        $modules = Sensei()->modules->get_course_modules($course_id);
+        if ( ! is_wp_error($modules) && ! empty($modules) && is_array($modules)) {
 
             $terms_ids = array();
-            foreach( $modules as $term ){
+            foreach ($modules as $term) {
 
                 $terms_ids[] = $term->term_id;
 
             }
 
-            $course_lesson_query_args[ 'tax_query'] = array(
+            $course_lesson_query_args['tax_query'] = array(
                 array(
                     'taxonomy' => 'module',
                     'field'    => 'id',
@@ -2596,7 +2596,7 @@ 
             );
         }
 
-        $wp_query = new WP_Query( $course_lesson_query_args );
+        $wp_query = new WP_Query($course_lesson_query_args);
 
     }// load_single_course_lessons
 
@@ -2607,16 +2607,16 @@ 
      *
      * @param $post_id
      */
-    public static function flush_rewrite_rules( $post_id ){
+    public static function flush_rewrite_rules($post_id) {
 
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){
+        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 
             return;
 
         }
 
 
-        if( 'course' == get_post_type( $post_id )  ){
+        if ('course' == get_post_type($post_id)) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -2632,10 +2632,10 @@ 
      * @param $excerpt
      * @return string
      */
-    public static function full_content_excerpt_override( $excerpt ){
+    public static function full_content_excerpt_override($excerpt) {
 
-        if (   is_singular('course')  &&
-                'full' == Sensei()->settings->get( 'course_single_content_display' ) ){
+        if (is_singular('course') &&
+                'full' == Sensei()->settings->get('course_single_content_display')) {
 
             return get_the_content();
 
@@ -2652,60 +2652,60 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_enrolment_actions(){
+    public static function the_course_enrolment_actions() {
         ?>
         <section class="course-meta course-enrolment">
         <?php
         global  $post, $current_user;
-        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
-        if ( is_user_logged_in() && ! $is_user_taking_course ) {
+        $is_user_taking_course = WooThemes_Sensei_Utils::user_started_course($post->ID, $current_user->ID);
+        if (is_user_logged_in() && ! $is_user_taking_course) {
 
             // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+            $wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
 
             // Check for woocommerce
-            if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
+            if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && (0 < intval($wc_post_id))) {
                 sensei_wc_add_to_cart($post->ID);
             } else {
                 sensei_start_course_form($post->ID);
             } // End If Statement
 
-        } elseif ( is_user_logged_in() ) {
+        } elseif (is_user_logged_in()) {
 
             // Check if course is completed
-            $user_course_status = WooThemes_Sensei_Utils::user_course_status( $post->ID, $current_user->ID );
-            $completed_course = WooThemes_Sensei_Utils::user_completed_course( $user_course_status );
+            $user_course_status = WooThemes_Sensei_Utils::user_course_status($post->ID, $current_user->ID);
+            $completed_course = WooThemes_Sensei_Utils::user_completed_course($user_course_status);
             // Success message
-            if ( $completed_course ) { ?>
-                <div class="status completed"><?php  _e( 'Completed', 'woothemes-sensei' ); ?></div>
+            if ($completed_course) { ?>
+                <div class="status completed"><?php  _e('Completed', 'woothemes-sensei'); ?></div>
                 <?php
-                $has_quizzes = Sensei()->course->course_quizzes( $post->ID, true );
-                if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?>
+                $has_quizzes = Sensei()->course->course_quizzes($post->ID, true);
+                if (has_filter('sensei_results_links') || $has_quizzes) { ?>
                     <p class="sensei-results-links">
                         <?php
                         $results_link = '';
-                        if( $has_quizzes ) {
-                            $results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' .  __( 'View results', 'woothemes-sensei' ) . '</a>';
+                        if ($has_quizzes) {
+                            $results_link = '<a class="view-results" href="'.Sensei()->course_results->get_permalink($post->ID).'">'.__('View results', 'woothemes-sensei').'</a>';
                         }
-                        $results_link = apply_filters( 'sensei_results_links', $results_link );
+                        $results_link = apply_filters('sensei_results_links', $results_link);
                         echo $results_link;
                         ?></p>
                 <?php } ?>
             <?php } else { ?>
-                <div class="status in-progress"><?php echo __( 'In Progress', 'woothemes-sensei' ); ?></div>
+                <div class="status in-progress"><?php echo __('In Progress', 'woothemes-sensei'); ?></div>
             <?php }
 
         } else {
             // Get the product ID
-            $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+            $wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
             // Check for woocommerce
-            if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && ( 0 < intval( $wc_post_id ) ) ) {
+            if (WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() && (0 < intval($wc_post_id))) {
 
                 sensei_wc_add_to_cart($post->ID);
 
             } else {
 
-                if( get_option( 'users_can_register') ) {
+                if (get_option('users_can_register')) {
 
 
                     $my_courses_page_id = '';
@@ -2721,24 +2721,24 @@ 
                     $wp_register_link = apply_filters('sensei_use_wp_register_link', false);
 
                     $settings = Sensei()->settings->get_settings();
-                    if( isset( $settings[ 'my_course_page' ] )
-                        && 0 < intval( $settings[ 'my_course_page' ] ) ){
+                    if (isset($settings['my_course_page'])
+                        && 0 < intval($settings['my_course_page'])) {
 
-                        $my_courses_page_id = $settings[ 'my_course_page' ];
+                        $my_courses_page_id = $settings['my_course_page'];
 
                     }
 
                     // If a My Courses page was set in Settings, and 'sensei_use_wp_register_link'
                     // is false, link to My Courses. If not, link to default WordPress registration page.
-                    if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){
+                    if ( ! empty($my_courses_page_id) && $my_courses_page_id && ! $wp_register_link) {
 
-                        $my_courses_url = get_permalink( $my_courses_page_id  );
-                        $register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>';
-                        echo '<div class="status register">' . $register_link . '</div>' ;
+                        $my_courses_url = get_permalink($my_courses_page_id);
+                        $register_link = '<a href="'.$my_courses_url.'">'.__('Register', 'woothemes-sensei').'</a>';
+                        echo '<div class="status register">'.$register_link.'</div>';
 
-                    } else{
+                    } else {
 
-                        wp_register( '<div class="status register">', '</div>' );
+                        wp_register('<div class="status register">', '</div>');
 
                     }
 
@@ -2757,19 +2757,19 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_video(){
+    public static function the_course_video() {
 
         global $post;
         // Get the meta info
-        $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true );
+        $course_video_embed = get_post_meta($post->ID, '_course_video_embed', true);
 
-        if ( 'http' == substr( $course_video_embed, 0, 4) ) {
+        if ('http' == substr($course_video_embed, 0, 4)) {
 
-            $course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) );
+            $course_video_embed = wp_oembed_get(esc_url($course_video_embed));
 
         } // End If Statement
 
-        if ( '' != $course_video_embed ) { ?>
+        if ('' != $course_video_embed) { ?>
 
             <div class="course-video">
                 <?php echo html_entity_decode($course_video_embed); ?>
@@ -2784,7 +2784,7 @@ 
      * @global $post
      * @since 1.9.0
      */
-    public static function the_title(){
+    public static function the_title() {
 
         global $post;
 
@@ -2797,7 +2797,7 @@ 
                 /**
                  * Filter documented in class-sensei-messages.php the_title
                  */
-                echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type );
+                echo apply_filters('sensei_single_title', get_the_title($post), $post->post_type);
                 ?>
 
             </h1>
@@ -2813,30 +2813,30 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_category_title(){
+    public static function course_category_title() {
 
-        if( ! is_tax( 'course-category' ) ){
+        if ( ! is_tax('course-category')) {
             return;
         }
 
         $category_slug = get_query_var('course-category');
-        $term  = get_term_by('slug',$category_slug,'course-category');
+        $term = get_term_by('slug', $category_slug, 'course-category');
 
-        if( ! empty($term) ){
+        if ( ! empty($term)) {
 
             $title = $term->name;
 
-        }else{
+        } else {
 
             $title = 'Course Category';
 
         }
 
         $html = '<h2 class="sensei-category-title">';
-        $html .= __('Category') . ' ' . $title;
+        $html .= __('Category').' '.$title;
         $html .= '</h2>';
 
-        echo apply_filters( 'course_category_title', $html , $term->term_id );
+        echo apply_filters('course_category_title', $html, $term->term_id);
 
     }// course_category_title
 
@@ -2849,16 +2849,16 @@ 
      * @param WP_Query $query
      * @return WP_Query
      */
-    public static function alter_course_category_order( $query ){
+    public static function alter_course_category_order($query) {
 
-        if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){
+        if ( ! is_tax('course-category') || ! $query->is_main_query()) {
             return $query;
         }
 
-        $order = get_option( 'sensei_course_order', '' );
-        if( !empty( $order )  ){
-            $query->set('orderby', 'menu_order' );
-            $query->set('order', 'ASC' );
+        $order = get_option('sensei_course_order', '');
+        if ( ! empty($order)) {
+            $query->set('orderby', 'menu_order');
+            $query->set('order', 'ASC');
         }
 
         return $query;
@@ -2879,7 +2879,7 @@ 
      *
      * @return array
      */
-    public static function get_default_query_args(){
+    public static function get_default_query_args() {
         return array(
             'post_type' 		=> 'course',
             'posts_per_page' 		=> 1000,
@@ -2897,14 +2897,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_prerequisite_complete( $course_id ){
+    public static function is_prerequisite_complete($course_id) {
 
-        $course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true );
+        $course_prerequisite_id = get_post_meta($course_id, '_course_prerequisite', true);
 
         // if it has a pre requisite course check it
-        if( ! empty(  $course_prerequisite_id ) ){
+        if ( ! empty($course_prerequisite_id)) {
 
-            return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() );
+            return Sensei_Utils::user_completed_course($course_prerequisite_id, get_current_user_id());
 
         }
 
@@ -2920,4 +2920,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Course extends Sensei_Course{}
+class WooThemes_Sensei_Course extends Sensei_Course {}

includes/hooks/woocommerce.php

Spacing +10 added lines, -10 removed lines

@@ -7,27 +7,27 @@ 
  * show the WooCommerce course filter links above the courses
  * @since 1.9.0
  */
-add_filter( 'sensei_archive_course_filter_by_options', array( 'Sensei_WC', 'add_course_archive_wc_filter_links' ) );
+add_filter('sensei_archive_course_filter_by_options', array('Sensei_WC', 'add_course_archive_wc_filter_links'));
 
 /**
  * filter the queries for paid and free course based on the users selection.
  * @since 1.9.0
  */
-add_filter('pre_get_posts', array( 'Sensei_WC', 'course_archive_wc_filter_free'));
-add_filter('pre_get_posts', array( 'Sensei_WC', 'course_archive_wc_filter_paid'));
+add_filter('pre_get_posts', array('Sensei_WC', 'course_archive_wc_filter_free'));
+add_filter('pre_get_posts', array('Sensei_WC', 'course_archive_wc_filter_paid'));
 
 /**
  * Add woocommerce action above single course the action
  * @since 1.9.0
  */
-add_action('sensei_before_main_content', array('Sensei_WC', 'do_single_course_wc_single_product_action') ,50) ;
+add_action('sensei_before_main_content', array('Sensei_WC', 'do_single_course_wc_single_product_action'), 50);
 
 /******************************
  *
  * Single Lesson Hooks
  *
  ******************************/
-add_filter( 'sensei_can_user_view_lesson', array( 'Sensei_WC','alter_can_user_view_lesson' ), 20, 3 );
+add_filter('sensei_can_user_view_lesson', array('Sensei_WC', 'alter_can_user_view_lesson'), 20, 3);
 
 /******************************
  *
@@ -35,7 +35,7 @@ 
  *
  ******************************/
 // add a notice on the checkout page to tell users about the course they've purchase
-add_action( 'template_redirect', array( 'Sensei_WC','course_link_from_order' ) );
+add_action('template_redirect', array('Sensei_WC', 'course_link_from_order'));
 
 /******************************
  *
@@ -44,7 +44,7 @@ 
  ******************************/
 //@since 1.9.0
 //show a notice if the user has already added the current course to their cart
-add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_WC', 'course_in_cart_message' ), 20 );
+add_action('sensei_single_course_content_inside_before', array('Sensei_WC', 'course_in_cart_message'), 20);
 
 /******************************
  *
@@ -53,12 +53,12 @@ 
  ******************************/
 //@since 1.9.0
 // alter the no permissions message to show the woocommerce message instead
-add_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
+add_filter('sensei_the_no_permissions_message', array('Sensei_WC', 'alter_no_permissions_message'), 20, 2);
 
 //@since 1.9.0
 // add the add to cart button for a valid purchasable course
-add_action( 'sensei_no_permissions_inside_before_content', array( 'Sensei_WC', 'the_add_to_cart_button_html' ), 20, 1);
+add_action('sensei_no_permissions_inside_before_content', array('Sensei_WC', 'the_add_to_cart_button_html'), 20, 1);
 
 // @since 1.9.0
 // add  woocommerce class to the the no permission body class to ensure WooCommerce elements are styled
-add_filter( 'body_class', array( 'Sensei_WC', 'add_woocommerce_body_class' ), 20, 1);
+add_filter('body_class', array('Sensei_WC', 'add_woocommerce_body_class'), 20, 1);

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

Indentation +233 added lines, -233 removed lines

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

templates/no-permissions.php

Indentation +39 added lines, -39 removed lines

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

Spacing +8 added lines, -8 removed lines

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