woothemes / sensei

includes/class-sensei-utils.php

Doc Comments +18 added lines, -15 removed lines

@@ -463,6 +463,9 @@ 
 
 	} // End sensei_save_quiz_answers()
 
+	/**
+	 * @return string
+	 */
 	public static function upload_file( $file = array() ) {
 
 		require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -635,7 +638,7 @@ 
      * @param integer $lesson_id
      * @param bool $complete
      *
-     * @return mixed boolean or comment_ID
+     * @return boolean|string boolean or comment_ID
      */
     public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) {
 
@@ -654,7 +657,7 @@ 
 	 * @param int| string $user_id default 0
      * @param bool $complete default false
      *
-     * @return mixed boolean or comment_ID
+     * @return boolean|string boolean or comment_ID
 	 */
 	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
 
@@ -836,7 +839,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
 	 */
@@ -864,7 +867,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
 	 */
@@ -977,7 +980,7 @@ 
 	 * sort_array_by_key sorts array by key
 	 * @since  1.3.0
 	 * @param  array $array by ref
-	 * @param  $key string column name in array
+	 * @param  string $key string column name in array
 	 * @return void
 	 */
 	public static function sort_array_by_key( $array, $key ) {
@@ -1024,7 +1027,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 ) {
 
@@ -1065,7 +1068,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 ) {
 
@@ -1434,7 +1437,7 @@ 
 	 * @since  1.7.0
 	 * @param  integer $course_id Course ID
 	 * @param  integer $user_id   User ID
-	 * @return int
+	 * @return boolean
 	 */
 	public static function user_complete_course( $course_id = 0, $user_id = 0 ) {
 		global  $wp_version;
@@ -1592,7 +1595,7 @@ 
 	 * @since  1.7.0
 	 * @param int $lesson_id
 	 * @param int $user_id
-	 * @return mixed false or comment_ID
+	 * @return string|false false or comment_ID
 	 */
 	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) {
 
@@ -1619,7 +1622,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
 	 */
@@ -1717,7 +1720,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 ) {
 
@@ -1776,11 +1779,11 @@ 
 	 * @since  1.7.0
      *
 	 * @param int|string $user_id
-	 * @param int|string $lesson_id
+	 * @param integer $lesson_id
 	 * @param string $status
 	 * @param array $metadata
      *
-	 * @return mixed false or comment_ID
+	 * @return boolean false or comment_ID
 	 */
 	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -1818,7 +1821,7 @@ 
 	 * @param int $course_id
 	 * @param string $status
 	 * @param array $metadata
-	 * @return mixed false or comment_ID
+	 * @return boolean false or comment_ID
 	 */
 	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) {
 		$comment_id = false;
@@ -2008,7 +2011,7 @@ 
      *
      * @since 1.7.4
      *
-     * @param $data_key
+     * @param string $data_key
      * @param $post_id
      * @param int $user_id
      *

Indentation +497 added lines, -497 removed lines

@@ -25,8 +25,8 @@ 
 
 	/**
 	 * Check if WooCommerce is present.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_present()
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -34,14 +34,14 @@ 
 	 */
 	public static function sensei_is_woocommerce_present () {
 
-        return Sensei_WC::is_woocommerce_present();
+		return Sensei_WC::is_woocommerce_present();
 
 	} // End sensei_is_woocommerce_present()
 
 	/**
 	 * Check if WooCommerce is active.
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::is_woocommerce_active
 	 * @access public
 	 * @since  1.0.2
 	 * @static
@@ -186,15 +186,15 @@ 
 			add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
 		}
 
-        //Get the comments
-        /**
-         * This filter runs inside Sensei_Utils::sensei_check_for_activity
-         *
-         * It runs while getting the comments for the given request.
-         *
-         * @param int|array $comments
-         */
-        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
+		//Get the comments
+		/**
+		 * This filter runs inside Sensei_Utils::sensei_check_for_activity
+		 *
+		 * It runs while getting the comments for the given request.
+		 *
+		 * @param int|array $comments
+		 */
+		$comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
 
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
 		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
@@ -279,18 +279,18 @@ 
 		return $dataset_changes;
 	} // End sensei_delete_activities()
 
-    /**
-     * Delete all activity for specified user
-     * @access public
+	/**
+	 * Delete all activity for specified user
+	 * @access public
 	 * @since  1.5.0
-     * @param  integer $user_id User ID
-     * @return boolean
-     */
-    public static function delete_all_user_activity( $user_id = 0 ) {
+	 * @param  integer $user_id User ID
+	 * @return boolean
+	 */
+	public static function delete_all_user_activity( $user_id = 0 ) {
 
-    	$dataset_changes = false;
+		$dataset_changes = false;
 
-    	if( $user_id ) {
+		if( $user_id ) {
 
 			$activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true );
 
@@ -334,35 +334,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
@@ -398,7 +398,7 @@ 
 	/**
 	 * Save quiz answers submitted by users
 	 * @param  array $submitted User's quiz answers
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean            Whether the answers were saved or not
 	 */
 	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) {
@@ -467,72 +467,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 ) );
+		/**
+		 * 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 );
+		$file_return = wp_handle_upload( $file, $file_upload_args );
 
-        if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) {
-            return false;
-        } else {
+		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()
 
@@ -541,7 +541,7 @@ 
 	 * @param  integer $quiz_id ID of quiz
 	 * @param  integer $grade   Grade received
 	 * @param  integer $user_id ID of user being graded
-     * @param  string $quiz_grade_type default 'auto'
+	 * @param  string $quiz_grade_type default 'auto'
 	 * @return boolean
 	 */
 	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) {
@@ -565,21 +565,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
 
@@ -587,7 +587,7 @@ 
 	 * Grade question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $grade       Grade received
-     * @param int $user_id
+	 * @param int $user_id
 	 * @return boolean
 	 */
 	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) {
@@ -626,35 +626,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 ) {
 
@@ -700,21 +700,21 @@ 
 				$metadata['start'] = current_time('mysql');
 				$activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata );
 
-            } else {
+			} else {
 
-                // if users is already taking the lesson  and the status changes to complete update it
-                $current_user_activity = get_comment($activity_logged);
-                if( $status=='complete' &&
-                    $status != $current_user_activity->comment_approved  ){
+				// if users is already taking the lesson  and the status changes to complete update it
+				$current_user_activity = get_comment($activity_logged);
+				if( $status=='complete' &&
+					$status != $current_user_activity->comment_approved  ){
 
-                    $comment = array();
-                    $comment['comment_ID'] = $activity_logged;
-                    $comment['comment_approved'] = $status;
-                    wp_update_comment( $comment );
+					$comment = array();
+					$comment['comment_ID'] = $activity_logged;
+					$comment['comment_approved'] = $status;
+					wp_update_comment( $comment );
 
-                }
+				}
 
-            }
+			}
 
 			if ( $complete ) {
 				// Run this *after* the lesson status has been created/updated
@@ -863,7 +863,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
@@ -923,7 +923,7 @@ 
 	 * Add answer notes to question
 	 * @param  integer $question_id ID of question
 	 * @param  integer $user_id     ID of user
-     * @param string $notes
+	 * @param string $notes
 	 * @return boolean
 	 */
 	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) {
@@ -981,17 +981,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()
 
 	/**
@@ -1004,21 +1004,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()
 
 	/**
@@ -1178,7 +1178,7 @@ 
 	 * Set the status message displayed to the user for a quiz
 	 * @param  integer $lesson_id ID of quiz lesson
 	 * @param  integer $user_id   ID of user
-     * @param  bool $is_lesson
+	 * @param  bool $is_lesson
 	 * @return array              Status code and message
 	 */
 	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) {
@@ -1261,20 +1261,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 ) {
@@ -1332,7 +1332,7 @@ 
 		$message = apply_filters( 'sensei_user_quiz_status_' . $status, $message );
 
 		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) {
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 			$extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' .  __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' .  __( 'View the lesson quiz', 'woothemes-sensei' )  . '</a></p>';
 		}
 
@@ -1393,18 +1393,18 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            if ( ! $user_id > 0 ) {
+			if ( ! $user_id > 0 ) {
 
-	            $user_started_course =  false;
+				$user_started_course =  false;
 
-            } else {
+			} else {
 
-	            $activity_args = array(
-		            'post_id' => $course_id,
-		            'user_id' => $user_id,
-		            'type' => 'sensei_course_status',
-		            'field' => 'comment_ID'
-	            );
+				$activity_args = array(
+					'post_id' => $course_id,
+					'user_id' => $user_id,
+					'type' => 'sensei_course_status',
+					'field' => 'comment_ID'
+				);
 
 				$user_course_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
 
@@ -1413,7 +1413,7 @@ 
 					$user_started_course = $user_course_status_id;
 
 				}
-            }
+			}
 		}
 
 		/**
@@ -1542,7 +1542,7 @@ 
 	 * Check if a user has completed a course or not
 	 *
 	 * @param int | WP_Post | WP_Comment $course course_id or sensei_course_status entry
-     *
+	 *
 	 * @param int $user_id
 	 * @return boolean
 	 */
@@ -1569,14 +1569,14 @@ 
 					}
 				}
 
-                if( is_a( $course, 'WP_Post' ) ){
-                    $course =   $course->ID;
-                }
+				if( is_a( $course, 'WP_Post' ) ){
+					$course =   $course->ID;
+				}
 
 				$user_course_status = Sensei_Utils::user_course_status( $course , $user_id );
 				if( isset( $user_course_status->comment_approved ) ){
-                    $user_course_status = $user_course_status->comment_approved;
-                }
+					$user_course_status = $user_course_status->comment_approved;
+				}
 
 			}
 			if( $user_course_status && 'complete' == $user_course_status ) {
@@ -1601,11 +1601,11 @@ 
 				$user_id = get_current_user_id();
 			}
 
-            $activity_args = array(
-                'post_id' => $lesson_id,
-                'user_id' => $user_id,
-                'type' => 'sensei_lesson_status',
-                'field' => 'comment_ID' );
+			$activity_args = array(
+				'post_id' => $lesson_id,
+				'user_id' => $user_id,
+				'type' => 'sensei_lesson_status',
+				'field' => 'comment_ID' );
 
 			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
 			if( $user_lesson_status_id ) {
@@ -1618,7 +1618,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
@@ -1639,10 +1639,10 @@ 
 					$user_id = get_current_user_id();
 				}
 
-                // the user is not logged in
-                if( ! $user_id > 0 ){
-                    return false;
-                }
+				// the user is not logged in
+				if( ! $user_id > 0 ){
+					return false;
+				}
 				$_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id );
 
 				if ( $_user_lesson_status ) {
@@ -1721,9 +1721,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 ) {
 
@@ -1774,12 +1774,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() ) {
@@ -1895,7 +1895,7 @@ 
 	/**
 	 * Adjust the comment query to be faster on the database, used by Analysis admin
 	 * @since  1.7.0
-     * @param array $pieces
+	 * @param array $pieces
 	 * @return array $pieces
 	 */
 	public static function comment_total_sum_meta_value_filter( $pieces ) {
@@ -1930,360 +1930,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 )  ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+			return false;
+		}
 
-        $supported_post_types = array( 'course', 'lesson' );
-        $post_type = get_post_type( $post_id );
-        if( empty( $post_id ) || empty( $data_key )
-            || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
-            || ! get_userdata( $user_id )
-            || !in_array( $post_type, $supported_post_types )  ){
+		// check if there and existing Sensei status on this post type if not create it
+		// and get the  activity ID
+		$status_function = 'user_'.$post_type.'_status';
+		$sensei_user_status = self::$status_function( $post_id ,$user_id  );
+		if( ! isset( $sensei_user_status->comment_ID ) ){
 
-            return false;
-        }
+			$start_function = 'user_start_'.$post_type;
+			$sensei_user_activity_id = self::$start_function( $user_id, $post_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;
-        }
+		}else{
 
-        $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;
 
-        return $deleted;
+		}
 
-    }// end delete_user_data
+		// store the data
+		$success = update_comment_meta( $sensei_user_activity_id, $data_key, $value );
 
+	   return $success;
 
-    /**
-     * 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 ) {
+	}//update_user_data
 
-        $drop_down_element = '';
+	/**
+	 * 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  ){
 
-        // setup the basic attributes
-        if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
+		$user_data_value = true;
 
-            $attributes['name'] = 'sensei-options';
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        }
+		$supported_post_types = array( 'course', 'lesson' );
+		$post_type = get_post_type( $post_id );
+		if( empty( $post_id ) || empty( $data_key )
+			|| ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 )
+			|| ! get_userdata( $user_id )
+			|| !in_array( $post_type, $supported_post_types )  ){
 
-        if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
+			return false;
+		}
 
-            $attributes['id'] = 'sensei-options';
+		// 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 );
 
-        if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+		return $user_data_value;
 
-            $attributes['class'] ='chosen_select widefat';
+	}// 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;
 
-        // create element attributes
-        $combined_attributes = '';
-        foreach( $attributes as $attribute => $value ){
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-            $combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+		$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 )  ){
 
-        }// end for each
+			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;
+		}
 
-        // create the select element
-        $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n";
+		$sensei_user_activity_id = $sensei_user_status->comment_ID;
+		$deleted = delete_comment_meta( $sensei_user_activity_id , $data_key );
 
-        // show the none option if the client requested
-        if( $enable_none_option ) {
-            $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
-        }
+		return $deleted;
 
-        if ( count( $options ) > 0 ) {
+	}// end delete_user_data
 
-            foreach ($options as $value => $option ){
 
-                $element = '';
-                $element.= '<option value="' . esc_attr( $value ) . '"';
-                $element .= selected( $value, $selected_value, false ) . '>';
-                $element .= esc_html(  $option ) . '</option>' . "\n";
+	/**
+	 * 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 ) {
 
-                // add the element to the select html
-                $drop_down_element.= $element;
-            } // End For Loop
+		$drop_down_element = '';
 
-        } // End If Statement
+		// setup the basic attributes
+		if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) {
 
-        $drop_down_element .= '</select>' . "\n";
+			$attributes['name'] = 'sensei-options';
 
-        return $drop_down_element;
+		}
 
-    }// generate_drop_down
+		if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) {
 
-    /**
-     * 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 = ''  ){
+			$attributes['id'] = 'sensei-options';
 
-        /**å
+		}
+
+		if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) {
+
+			$attributes['class'] ='chosen_select widefat';
+
+		}
+
+		// create element attributes
+		$combined_attributes = '';
+		foreach( $attributes as $attribute => $value ){
+
+			$combined_attributes .= $attribute . '="'.$value.'"' . ' ';
+
+		}// end for each
+
+
+		// 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>';
+		}
+
+		if ( count( $options ) > 0 ) {
+
+			foreach ($options as $value => $option ){
+
+				$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
+
+		} // End If Statement
+
+		$drop_down_element .= '</select>' . "\n";
+
+		return $drop_down_element;
+
+	}// 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 = ''  ){
+
+		/**å
          * Change the precision for the Sensei_Utils::round function.
          * the precision given will be passed into the php round function
          * @since 1.8.5
          */
-        $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
-
-        /**
-         * Change the mode for the Sensei_Utils::round function.
-         * the mode given will be passed into the php round function
-         *
-         * This applies only to PHP version 5.3.0 and greater
-         *
-         * @since 1.8.5
-         */
-        $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
+		$precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode );
+
+		/**
+		 * Change the mode for the Sensei_Utils::round function.
+		 * the mode given will be passed into the php round function
+		 *
+		 * This applies only to PHP version 5.3.0 and greater
+		 *
+		 * @since 1.8.5
+		 */
+		$mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision   );
 
-        if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
+		if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) {
 
-            return round( $val, $precision, $mode );
+			return round( $val, $precision, $mode );
 
-        }else{
+		}else{
 
-            return round( $val, $precision );
+			return round( $val, $precision );
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Returns the current url with all the query vars
-     *
-     * @since 1.9.0
-     * @return string $url
-     */
-    public static function get_current_url(){
+	/**
+	 * Returns the current url with all the query vars
+	 *
+	 * @since 1.9.0
+	 * @return string $url
+	 */
+	public static function get_current_url(){
 
-        global $wp;
-        $current_url = trailingslashit( home_url( $wp->request ) );
-        if ( isset( $_GET ) ) {
+		global $wp;
+		$current_url = trailingslashit( home_url( $wp->request ) );
+		if ( isset( $_GET ) ) {
 
-            foreach ($_GET as $param => $val ) {
+			foreach ($_GET as $param => $val ) {
 
-                $current_url = add_query_arg( $param, $val , $current_url );
+				$current_url = add_query_arg( $param, $val , $current_url );
 
-            }
-        }
+			}
+		}
 
-        return $current_url;
-    }
+		return $current_url;
+	}
 
-    /**
-     * Restore the global WP_Query
-     *
-     * @since 1.9.0
-     */
-    public static function restore_wp_query() {
+	/**
+	 * Restore the global WP_Query
+	 *
+	 * @since 1.9.0
+	 */
+	public static function restore_wp_query() {
 
-        wp_reset_query();
+		wp_reset_query();
 
-    }
+	}
 
-    /**
-     * Merge two arrays in a zip like fashion.
-     * If one array is longer than the other the elements will be apended
-     * to the end of the resulting array.
-     *
-     * @since 1.9.0
-     *
-     * @param array $array_a
-     * @param array $array_b
-     * @return array $merged_array
-     */
-    public static function array_zip_merge( $array_a, $array_b ){
+	/**
+	 * Merge two arrays in a zip like fashion.
+	 * If one array is longer than the other the elements will be apended
+	 * to the end of the resulting array.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $array_a
+	 * @param array $array_b
+	 * @return array $merged_array
+	 */
+	public static function array_zip_merge( $array_a, $array_b ){
 
-        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
-            trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
-        }
+		if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
+			trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
+		}
 
-        $merged_array = array();
-        $total_elements = count( $array_a )  + count( $array_b );
+		$merged_array = array();
+		$total_elements = count( $array_a )  + count( $array_b );
 
-        // Zip arrays
-        for ( $i = 0; $i < $total_elements; $i++) {
+		// Zip arrays
+		for ( $i = 0; $i < $total_elements; $i++) {
 
-            // if has an element at current index push a on top
-            if( isset( $array_a[ $i ] ) ){
-                $merged_array[] = $array_a[ $i ]  ;
-            }
+			// if has an element at current index push a on top
+			if( isset( $array_a[ $i ] ) ){
+				$merged_array[] = $array_a[ $i ]  ;
+			}
 
-            // next if $array_b has an element at current index push a on top of the element
-            // from a if there was one, if not the element before that.
-            if( isset( $array_b[ $i ] ) ){
-                $merged_array[] = $array_b[ $i ]  ;
-            }
+			// next if $array_b has an element at current index push a on top of the element
+			// from a if there was one, if not the element before that.
+			if( isset( $array_b[ $i ] ) ){
+				$merged_array[] = $array_b[ $i ]  ;
+			}
 
-        }
+		}
 
-        return $merged_array;
-    }
+		return $merged_array;
+	}
 
 } // End Class
 

Spacing +543 added lines, -543 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Utilities Class
@@ -18,9 +18,9 @@ 
 	 * @since   1.0.0
 	 * @return  string The URL to the placeholder thumbnail image.
 	 */
-	public static function get_placeholder_image () {
+	public static function get_placeholder_image() {
 
-		return esc_url( apply_filters( 'sensei_placeholder_thumbnail', Sensei()->plugin_url . 'assets/images/placeholder.png' ) );
+		return esc_url(apply_filters('sensei_placeholder_thumbnail', Sensei()->plugin_url.'assets/images/placeholder.png'));
 	} // End get_placeholder_image()
 
 	/**
@@ -32,7 +32,7 @@ 
 	 * @static
 	 * @return bool
 	 */
-	public static function sensei_is_woocommerce_present () {
+	public static function sensei_is_woocommerce_present() {
 
         return Sensei_WC::is_woocommerce_present();
 
@@ -47,7 +47,7 @@ 
 	 * @static
 	 * @return boolean
 	 */
-	public static function sensei_is_woocommerce_activated () {
+	public static function sensei_is_woocommerce_activated() {
 
 		return  Sensei_WC::is_woocommerce_active();
 
@@ -60,70 +60,70 @@ 
 	 * @param  array $args (default: array())
 	 * @return bool | int
 	 */
-	public static function sensei_log_activity ( $args = array() ) {
+	public static function sensei_log_activity($args = array()) {
 		global $wpdb;
 
 		// Args, minimum data required for WP
 		$data = array(
-					'comment_post_ID' => intval( $args['post_id'] ),
+					'comment_post_ID' => intval($args['post_id']),
 					'comment_author' => '', // Not needed
 					'comment_author_email' => '', // Not needed
 					'comment_author_url' => '', // Not needed
-					'comment_content' => !empty($args['data']) ? esc_html( $args['data'] ) : '',
-					'comment_type' => esc_attr( $args['type'] ),
-					'user_id' => intval( $args['user_id'] ),
-					'comment_approved' => !empty($args['status']) ? esc_html( $args['status'] ) : 'log', // 'log' == 'sensei_user_answer'
+					'comment_content' => ! empty($args['data']) ? esc_html($args['data']) : '',
+					'comment_type' => esc_attr($args['type']),
+					'user_id' => intval($args['user_id']),
+					'comment_approved' => ! empty($args['status']) ? esc_html($args['status']) : 'log', // 'log' == 'sensei_user_answer'
 				);
 		// Allow extra data
-		if ( !empty($args['username']) ) {
-			$data['comment_author'] = sanitize_user( $args['username'] );
+		if ( ! empty($args['username'])) {
+			$data['comment_author'] = sanitize_user($args['username']);
 		}
-		if ( !empty($args['user_email']) ) {
-			$data['comment_author_email'] = sanitize_email( $args['user_email'] );
+		if ( ! empty($args['user_email'])) {
+			$data['comment_author_email'] = sanitize_email($args['user_email']);
 		}
-		if ( !empty($args['user_url']) ) {
-			$data['comment_author_url'] = esc_url( $args['user_url'] );
+		if ( ! empty($args['user_url'])) {
+			$data['comment_author_url'] = esc_url($args['user_url']);
 		}
-		if ( !empty($args['parent']) ) {
+		if ( ! empty($args['parent'])) {
 			$data['comment_parent'] = $args['parent'];
 		}
 		// Sanity check
-		if ( empty($args['user_id']) ) {
-			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') );
+		if (empty($args['user_id'])) {
+			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei'));
 			return false;
 		}
 
-		do_action( 'sensei_log_activity_before', $args, $data );
+		do_action('sensei_log_activity_before', $args, $data);
 
 		$flush_cache = false;
 
 		// Custom Logic
 		// Check if comment exists first
-		$comment_id = $wpdb->get_var( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'] ) );
-		if ( ! $comment_id ) {
+		$comment_id = $wpdb->get_var($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type']));
+		if ( ! $comment_id) {
 			// Add the comment
-			$comment_id = wp_insert_comment( $data );
+			$comment_id = wp_insert_comment($data);
 
 			$flush_cache = true;
-		} elseif ( isset( $args['action'] ) && 'update' == $args['action'] ) {
+		} elseif (isset($args['action']) && 'update' == $args['action']) {
 			// Update the comment if an update was requested
 			$data['comment_ID'] = $comment_id;
 			// By default update the timestamp of the comment
-			if ( empty($args['keep_time']) ) {
+			if (empty($args['keep_time'])) {
 				$data['comment_date'] = current_time('mysql');
 			}
-			wp_update_comment( $data );
+			wp_update_comment($data);
 			$flush_cache = true;
 		} // End If Statement
 
 		// Manually Flush the Cache
-		if ( $flush_cache ) {
+		if ($flush_cache) {
 			wp_cache_flush();
 		}
 
-		do_action( 'sensei_log_activity_after', $args, $data,  $comment_id );
+		do_action('sensei_log_activity_after', $args, $data, $comment_id);
 
-		if ( 0 < $comment_id ) {
+		if (0 < $comment_id) {
 			// Return the ID so that it can be used for meta data storage
 			return $comment_id;
 		} else {
@@ -140,41 +140,41 @@ 
 	 * @param  bool $return_comments (default: false)
 	 * @return mixed | int
 	 */
-	public static function sensei_check_for_activity ( $args = array(), $return_comments = false ) {
+	public static function sensei_check_for_activity($args = array(), $return_comments = false) {
 
 		global  $wp_version;
-		if ( !$return_comments ) {
+		if ( ! $return_comments) {
 			$args['count'] = true;
 		}
 
 		// Are we only retrieving a single entry, or not care about the order...
-		if ( isset( $args['count'] ) || isset( $args['post_id'] ) ){
+		if (isset($args['count']) || isset($args['post_id'])) {
 
 			// ...then we don't need to ask the db to order the results, this overrides WP default behaviour
-			if ( version_compare( $wp_version, '4.1', '>=' ) ) {
+			if (version_compare($wp_version, '4.1', '>=')) {
 				$args['order'] = false;
 				$args['orderby'] = false;
 			}
 		}
 
 		// A user ID of 0 is in valid, so shortcut this
-		if ( isset( $args['user_id'] ) && 0 == intval ( $args['user_id'] ) ) {
-			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') );
+		if (isset($args['user_id']) && 0 == intval($args['user_id'])) {
+			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei'));
 			return false;
 		}
 		// Check for legacy code
-		if ( isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes') ) ) {
-			_deprecated_argument( __FUNCTION__, '1.7', sprintf( __('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'] ) );
+		if (isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes'))) {
+			_deprecated_argument(__FUNCTION__, '1.7', sprintf(__('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type']));
 			return false;
 		}
 		// Are we checking for specific comment_approved statuses?
-		if ( isset($args['status']) ) {
+		if (isset($args['status'])) {
 			// Temporarily store as a custom status if requesting an array...
-			if ( is_array( $args['status'] ) && version_compare($wp_version, '4.1', '<') ) {
+			if (is_array($args['status']) && version_compare($wp_version, '4.1', '<')) {
 				// Encode now, decode later
-				$args['status'] = implode( ",", $args['status'] );
+				$args['status'] = implode(",", $args['status']);
 				// ...use a filter to switch the encoding back
-				add_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
+				add_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter'));
 			}
 		}
 		else {
@@ -182,8 +182,8 @@ 
 		}
 
 		// Take into account WP < 4.1 will automatically add ' comment_approved = 1 OR comment_approved = 0 '
-		if ( ( is_array( $args['status'] ) || 'any' == $args['status'] ) && version_compare($wp_version, '4.1', '<') ) {
-			add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
+		if ((is_array($args['status']) || 'any' == $args['status']) && version_compare($wp_version, '4.1', '<')) {
+			add_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter'));
 		}
 
         //Get the comments
@@ -194,14 +194,14 @@ 
          *
          * @param int|array $comments
          */
-        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) );
+        $comments = apply_filters('sensei_check_for_activity', get_comments($args));
 
-		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) );
-		remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) );
+		remove_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter'));
+		remove_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter'));
 		// Return comments
-		if ( $return_comments ) {
+		if ($return_comments) {
 			// Could check for array of 1 and just return the 1 item?
-			if ( is_array($comments) && 1 == count($comments) ) {
+			if (is_array($comments) && 1 == count($comments)) {
 				$comments = array_shift($comments);
 			}
 
@@ -219,31 +219,31 @@ 
 	 * @param  array $args (default: array())
 	 * @return array
 	 */
-	public static function sensei_activity_ids ( $args = array() ) {
+	public static function sensei_activity_ids($args = array()) {
 
 
-		$comments = Sensei_Utils::sensei_check_for_activity( $args, true );
+		$comments = Sensei_Utils::sensei_check_for_activity($args, true);
 		// Need to always use an array, even with only 1 item
-		if ( !is_array($comments) ) {
-			$comments = array( $comments );
+		if ( ! is_array($comments)) {
+			$comments = array($comments);
 		}
 
 		$post_ids = array();
 		// Count comments
-		if ( is_array( $comments ) && ( 0 < intval( count( $comments ) ) ) ) {
-			foreach ( $comments as $key => $value  ) {
+		if (is_array($comments) && (0 < intval(count($comments)))) {
+			foreach ($comments as $key => $value) {
 				// Add matches to id array
-				if ( isset( $args['field'] ) && 'comment' == $args['field'] ) {
-					array_push( $post_ids, $value->comment_ID );
-				} elseif( isset( $args['field'] ) && 'user_id' == $args['field'] ) {
-					array_push( $post_ids, $value->user_id );
+				if (isset($args['field']) && 'comment' == $args['field']) {
+					array_push($post_ids, $value->comment_ID);
+				} elseif (isset($args['field']) && 'user_id' == $args['field']) {
+					array_push($post_ids, $value->user_id);
 				} else {
-					array_push( $post_ids, $value->comment_post_ID );
+					array_push($post_ids, $value->comment_post_ID);
 				} // End If Statement
 			} // End For Loop
 			// Reset array indexes
-			$post_ids = array_unique( $post_ids );
-			$post_ids = array_values( $post_ids );
+			$post_ids = array_unique($post_ids);
+			$post_ids = array_values($post_ids);
 		} // End If Statement
 
 		return $post_ids;
@@ -257,20 +257,20 @@ 
 	 * @param  array $args (default: array())
 	 * @return boolean
 	 */
-	public static function sensei_delete_activities ( $args = array() ) {
+	public static function sensei_delete_activities($args = array()) {
 
 		$dataset_changes = false;
 
 		// If activity exists remove activity from log
-		$comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => intval( $args['post_id'] ), 'user_id' => intval( $args['user_id'] ), 'type' => esc_attr( $args['type'] ) ), true );
-		if( $comments ) {
+		$comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => intval($args['post_id']), 'user_id' => intval($args['user_id']), 'type' => esc_attr($args['type'])), true);
+		if ($comments) {
 			// Need to always return an array, even with only 1 item
-			if ( !is_array( $comments ) ) {
-				$comments = array( $comments );
+			if ( ! is_array($comments)) {
+				$comments = array($comments);
 			}
-			foreach ( $comments as $key => $value  ) {
-				if ( isset( $value->comment_ID ) && 0 < $value->comment_ID ) {
-					$dataset_changes = wp_delete_comment( intval( $value->comment_ID ), true );
+			foreach ($comments as $key => $value) {
+				if (isset($value->comment_ID) && 0 < $value->comment_ID) {
+					$dataset_changes = wp_delete_comment(intval($value->comment_ID), true);
 				} // End If Statement
 			} // End For Loop
 			// Manually flush the cache
@@ -286,25 +286,25 @@ 
      * @param  integer $user_id User ID
      * @return boolean
      */
-    public static function delete_all_user_activity( $user_id = 0 ) {
+    public static function delete_all_user_activity($user_id = 0) {
 
     	$dataset_changes = false;
 
-    	if( $user_id ) {
+    	if ($user_id) {
 
-			$activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true );
+			$activities = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user_id), true);
 
-			if( $activities ) {
+			if ($activities) {
 
 				// Need to always return an array, even with only 1 item
-				if ( ! is_array( $activities ) ) {
-					$activities = array( $activities );
+				if ( ! is_array($activities)) {
+					$activities = array($activities);
 				}
 
-				foreach( $activities as $activity ) {
-					if( '' == $activity->comment_type ) continue;
-					if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-					$dataset_changes = wp_delete_comment( intval( $activity->comment_ID ), true );
+				foreach ($activities as $activity) {
+					if ('' == $activity->comment_type) continue;
+					if (strpos('sensei_', $activity->comment_type) != 0) continue;
+					$dataset_changes = wp_delete_comment(intval($activity->comment_ID), true);
 					wp_cache_flush();
 				}
 			}
@@ -321,13 +321,13 @@ 
 	 * @param  array $args (default: array())
 	 * @return string
 	 */
-	public static function sensei_get_activity_value ( $args = array() ) {
+	public static function sensei_get_activity_value($args = array()) {
 
 		$activity_value = false;
-		if ( !empty($args['field']) ) {
-			$comment = Sensei_Utils::sensei_check_for_activity( $args, true );
+		if ( ! empty($args['field'])) {
+			$comment = Sensei_Utils::sensei_check_for_activity($args, true);
 
-			if ( isset( $comment->{$args['field']} ) && '' != $comment->{$args['field']} ) {
+			if (isset($comment->{$args['field']} ) && '' != $comment->{$args['field']} ) {
 				$activity_value = $comment->{$args['field']};
 			} // End If Statement
 		}
@@ -345,22 +345,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()
 
@@ -371,9 +371,9 @@ 
 	 * @param  string $input_name Name for text area form element
 	 * @return void
 	 */
-	public static function sensei_text_editor( $content = '', $editor_id = 'senseitexteditor', $input_name = '' ) {
+	public static function sensei_text_editor($content = '', $editor_id = 'senseitexteditor', $input_name = '') {
 
-		if( ! $input_name ) $input_name = $editor_id;
+		if ( ! $input_name) $input_name = $editor_id;
 
 		$buttons = 'bold,italic,underline,strikethrough,blockquote,bullist,numlist,justifyleft,justifycenter,justifyright,undo,redo,pastetext';
 
@@ -391,7 +391,7 @@ 
 			'quicktags' => false
 		);
 
-		wp_editor( $content, $editor_id, $settings );
+		wp_editor($content, $editor_id, $settings);
 
 	} // End sensei_text_editor()
 
@@ -401,57 +401,57 @@ 
      * @param int $user_id
 	 * @return boolean            Whether the answers were saved or not
 	 */
-	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) {
+	public static function sensei_save_quiz_answers($submitted = array(), $user_id = 0) {
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$answers_saved = false;
 
-		if( $submitted && intval( $user_id ) > 0 ) {
+		if ($submitted && intval($user_id) > 0) {
 
-			foreach( $submitted as $question_id => $answer ) {
+			foreach ($submitted as $question_id => $answer) {
 
 				// Get question type
-				$question_type = Sensei()->question->get_question_type( $question_id );
+				$question_type = Sensei()->question->get_question_type($question_id);
 
 				// Sanitise answer
-				if( 0 == get_magic_quotes_gpc() ) {
-					$answer = wp_unslash( $answer );
+				if (0 == get_magic_quotes_gpc()) {
+					$answer = wp_unslash($answer);
 				}
-				switch( $question_type ) {
-					case 'multi-line': $answer = nl2br( $answer ); break;
+				switch ($question_type) {
+					case 'multi-line': $answer = nl2br($answer); break;
 					case 'single-line': break;
 					case 'gap-fill': break;
-					default: $answer = maybe_serialize( $answer ); break;
+					default: $answer = maybe_serialize($answer); break;
 				}
 				$args = array(
 							'post_id' => $question_id,
-							'data' => base64_encode( $answer ),
+							'data' => base64_encode($answer),
 							'type' => 'sensei_user_answer', /* FIELD SIZE 20 */
 							'user_id' => $user_id,
 							'action' => 'update'
 						);
-				$answers_saved = Sensei_Utils::sensei_log_activity( $args );
+				$answers_saved = Sensei_Utils::sensei_log_activity($args);
 			}
 
 			// Handle file upload questions
-			if( isset( $_FILES ) ) {
-				foreach( $_FILES as $field => $file ) {
-					if( strpos( $field, 'file_upload_' ) !== false ) {
-						$question_id = str_replace( 'file_upload_', '', $field );
-						if( $file && $question_id ) {
-							$attachment_id = self::upload_file( $file );
-							if( $attachment_id ) {
+			if (isset($_FILES)) {
+				foreach ($_FILES as $field => $file) {
+					if (strpos($field, 'file_upload_') !== false) {
+						$question_id = str_replace('file_upload_', '', $field);
+						if ($file && $question_id) {
+							$attachment_id = self::upload_file($file);
+							if ($attachment_id) {
 								$args = array(
 									'post_id' => $question_id,
-									'data' => base64_encode( $attachment_id ),
+									'data' => base64_encode($attachment_id),
 									'type' => 'sensei_user_answer', /* FIELD SIZE 20 */
 									'user_id' => $user_id,
 									'action' => 'update'
 								);
-								$answers_saved = Sensei_Utils::sensei_log_activity( $args );
+								$answers_saved = Sensei_Utils::sensei_log_activity($args);
 							}
 						}
 					}
@@ -463,9 +463,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
@@ -480,11 +480,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 {
 
@@ -492,19 +492,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;
             }
         }
@@ -530,9 +530,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()
 
@@ -544,20 +544,20 @@ 
      * @param  string $quiz_grade_type default 'auto'
 	 * @return boolean
 	 */
-	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_grade_quiz($quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto') {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $quiz_id ) > 0 && intval( $user_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$activity_logged = update_comment_meta( $user_lesson_status->comment_ID, 'grade', $grade );
+		if (intval($quiz_id) > 0 && intval($user_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$activity_logged = update_comment_meta($user_lesson_status->comment_ID, 'grade', $grade);
 
-			$quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) );
+			$quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true));
 
-			do_action( 'sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type );
+			do_action('sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type);
 		}
 
 		return $activity_logged;
@@ -577,9 +577,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
 
@@ -590,20 +590,20 @@ 
      * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_grade_question($question_id = 0, $grade = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $question_id ) > 0 && intval( $user_id ) > 0 ) {
+		if (intval($question_id) > 0 && intval($user_id) > 0) {
 
-			$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-			$activity_logged = update_comment_meta( $user_answer_id, 'user_grade', $grade );
+			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+			$activity_logged = update_comment_meta($user_answer_id, 'user_grade', $grade);
 
-			$answer_notes = get_post_meta( $question_id, '_answer_feedback', true );
-			if ( !empty($answer_notes) ) {
-				update_comment_meta( $user_answer_id, 'answer_note', base64_encode( $answer_notes ) );
+			$answer_notes = get_post_meta($question_id, '_answer_feedback', true);
+			if ( ! empty($answer_notes)) {
+				update_comment_meta($user_answer_id, 'answer_note', base64_encode($answer_notes));
 			}
 
 		}
@@ -611,15 +611,15 @@ 
 		return $activity_logged;
 	}
 
-	public static function sensei_delete_question_grade( $question_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_question_grade($question_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
-		if( intval( $question_id ) > 0 ) {
-			$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-			$activity_logged = delete_comment_meta( $user_answer_id, 'user_grade' );
+		if (intval($question_id) > 0) {
+			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+			$activity_logged = delete_comment_meta($user_answer_id, 'user_grade');
 		}
 
 		return $activity_logged;
@@ -637,9 +637,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()
 
@@ -656,22 +656,22 @@ 
      *
      * @return mixed boolean or comment_ID
 	 */
-	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) {
+	public static function sensei_start_lesson($lesson_id = 0, $user_id = 0, $complete = false) {
 
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
 
-		if( intval( $lesson_id ) > 0 ) {
+		if (intval($lesson_id) > 0) {
 
-			$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-			if( $course_id ) {
-				$is_user_taking_course = Sensei_Utils::user_started_course( $course_id, $user_id );
-				if( ! $is_user_taking_course ) {
-					Sensei_Utils::user_start_course( $user_id, $course_id );
+			$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+			if ($course_id) {
+				$is_user_taking_course = Sensei_Utils::user_started_course($course_id, $user_id);
+				if ( ! $is_user_taking_course) {
+					Sensei_Utils::user_start_course($user_id, $course_id);
 				}
 			}
 
@@ -679,12 +679,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;
 				}
@@ -694,31 +694,31 @@ 
 			}
 
 			// Check if user is already taking the lesson
-			$activity_logged = Sensei_Utils::user_started_lesson( $lesson_id, $user_id );
-			if( ! $activity_logged ) {
+			$activity_logged = Sensei_Utils::user_started_lesson($lesson_id, $user_id);
+			if ( ! $activity_logged) {
 
 				$metadata['start'] = current_time('mysql');
-				$activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata );
+				$activity_logged = Sensei_Utils::update_lesson_status($user_id, $lesson_id, $status, $metadata);
 
             } else {
 
                 // if users is already taking the lesson  and the status changes to complete update it
                 $current_user_activity = get_comment($activity_logged);
-                if( $status=='complete' &&
-                    $status != $current_user_activity->comment_approved  ){
+                if ($status == 'complete' &&
+                    $status != $current_user_activity->comment_approved) {
 
                     $comment = array();
                     $comment['comment_ID'] = $activity_logged;
                     $comment['comment_approved'] = $status;
-                    wp_update_comment( $comment );
+                    wp_update_comment($comment);
 
                 }
 
             }
 
-			if ( $complete ) {
+			if ($complete) {
 				// Run this *after* the lesson status has been created/updated
-				do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+				do_action('sensei_user_lesson_end', $user_id, $lesson_id);
 			}
 
 		}
@@ -733,23 +733,23 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) {
+	public static function sensei_remove_user_from_lesson($lesson_id = 0, $user_id = 0, $from_course = false) {
 
-		if( ! $lesson_id ) return false;
+		if ( ! $lesson_id) return false;
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		// Process quiz
-		$lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
 		// Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-		Sensei_Utils::sensei_delete_quiz_answers( $lesson_quiz_id, $user_id );
+		Sensei_Utils::sensei_delete_quiz_answers($lesson_quiz_id, $user_id);
 
 
 		// Delete quiz saved answers
-		Sensei()->quiz->reset_user_lesson_data( $lesson_id, $user_id );
+		Sensei()->quiz->reset_user_lesson_data($lesson_id, $user_id);
 
 		// Delete lesson status
 		$args = array(
@@ -758,10 +758,10 @@ 
 			'user_id' => $user_id,
 		);
 		// This auto deletes the corresponding meta data, such as the quiz grade, and questions asked
-		Sensei_Utils::sensei_delete_activities( $args );
+		Sensei_Utils::sensei_delete_activities($args);
 
-		if( ! $from_course ) {
-			do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
+		if ( ! $from_course) {
+			do_action('sensei_user_lesson_reset', $user_id, $lesson_id);
 		}
 
 		return true;
@@ -774,19 +774,19 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) {
+	public static function sensei_remove_user_from_course($course_id = 0, $user_id = 0) {
 
 
-		if( ! $course_id ) return false;
+		if ( ! $course_id) return false;
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
-		$lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' );
+		$lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids');
 
-		foreach( $lesson_ids as $lesson_id ) {
-			Sensei_Utils::sensei_remove_user_from_lesson( $lesson_id, $user_id, true );
+		foreach ($lesson_ids as $lesson_id) {
+			Sensei_Utils::sensei_remove_user_from_lesson($lesson_id, $user_id, true);
 		}
 
 		// Delete course status
@@ -796,36 +796,36 @@ 
 			'user_id' => $user_id,
 		);
 
-		Sensei_Utils::sensei_delete_activities( $args );
+		Sensei_Utils::sensei_delete_activities($args);
 
-		do_action( 'sensei_user_course_reset', $user_id, $course_id );
+		do_action('sensei_user_course_reset', $user_id, $course_id);
 
 		return true;
 	}
 
-	public static function sensei_get_quiz_questions( $quiz_id = 0 ) {
+	public static function sensei_get_quiz_questions($quiz_id = 0) {
 
 
 		$questions = array();
 
-		if( intval( $quiz_id ) > 0 ) {
-			$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id );
-			$questions = Sensei_Utils::array_sort_reorder( $questions );
+		if (intval($quiz_id) > 0) {
+			$questions = Sensei()->lesson->lesson_quiz_questions($quiz_id);
+			$questions = Sensei_Utils::array_sort_reorder($questions);
 		}
 
 		return $questions;
 	}
 
-	public static function sensei_get_quiz_total( $quiz_id = 0 ) {
+	public static function sensei_get_quiz_total($quiz_id = 0) {
 
 
 		$quiz_total = 0;
 
-		if( $quiz_id > 0 ) {
-			$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
+		if ($quiz_id > 0) {
+			$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
 			$question_grade = 0;
-			foreach( $questions as $question ) {
-				$question_grade = Sensei()->question->get_question_grade( $question->ID );
+			foreach ($questions as $question) {
+				$question_grade = Sensei()->question->get_question_grade($question->ID);
 				$quiz_total += $question_grade;
 			}
 		}
@@ -840,20 +840,20 @@ 
 	 * @param int $user_id
 	 * @return string
 	 */
-	public static function sensei_get_user_question_grade( $question = 0, $user_id = 0 ) {
+	public static function sensei_get_user_question_grade($question = 0, $user_id = 0) {
 		$question_grade = false;
-		if( $question ) {
-			if ( is_object( $question ) ) {
+		if ($question) {
+			if (is_object($question)) {
 				$user_answer_id = $question->comment_ID;
 			}
 			else {
-				if( intval( $user_id ) == 0 ) {
+				if (intval($user_id) == 0) {
 					$user_id = get_current_user_id();
 				}
-				$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
+				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
 			}
-			if ( $user_answer_id ) {
-				$question_grade = get_comment_meta( $user_answer_id, 'user_grade', true );
+			if ($user_answer_id) {
+				$question_grade = get_comment_meta($user_answer_id, 'user_grade', true);
 			}
 		}
 
@@ -868,52 +868,52 @@ 
 	 * @param int $user_id
 	 * @return string
 	 */
-	public static function sensei_get_user_question_answer_notes( $question = 0, $user_id = 0 ) {
+	public static function sensei_get_user_question_answer_notes($question = 0, $user_id = 0) {
 		$answer_notes = false;
-		if( $question ) {
-			if ( is_object( $question ) ) {
+		if ($question) {
+			if (is_object($question)) {
 				$user_answer_id = $question->comment_ID;
 			}
 			else {
-				if( intval( $user_id ) == 0 ) {
+				if (intval($user_id) == 0) {
 					$user_id = get_current_user_id();
 				}
-				$user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
+				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
 			}
-			if ( $user_answer_id ) {
-				$answer_notes = base64_decode( get_comment_meta( $user_answer_id, 'answer_note', true ) );
+			if ($user_answer_id) {
+				$answer_notes = base64_decode(get_comment_meta($user_answer_id, 'answer_note', true));
 			}
 		}
 
 		return $answer_notes;
 	}
 
-	public static function sensei_delete_quiz_answers( $quiz_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_quiz_answers($quiz_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$delete_answers = false;
-		if( intval( $quiz_id ) > 0 ) {
-			$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-			foreach( $questions as $question ) {
-				$delete_answers = Sensei_Utils::sensei_delete_activities( array( 'post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ) );
+		if (intval($quiz_id) > 0) {
+			$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+			foreach ($questions as $question) {
+				$delete_answers = Sensei_Utils::sensei_delete_activities(array('post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer'));
 			}
 		}
 
 		return $delete_answers;
 	}
 
-	public static function sensei_delete_quiz_grade( $quiz_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_delete_quiz_grade($quiz_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$delete_grade = false;
-		if( intval( $quiz_id ) > 0 ) {
-			$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$delete_grade = delete_comment_meta( $user_lesson_status->comment_ID, 'grade' );
+		if (intval($quiz_id) > 0) {
+			$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$delete_grade = delete_comment_meta($user_lesson_status->comment_ID, 'grade');
 		}
 
 		return $delete_grade;
@@ -926,20 +926,20 @@ 
      * @param string $notes
 	 * @return boolean
 	 */
-	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_add_answer_notes($question_id = 0, $user_id = 0, $notes = '') {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$activity_logged = false;
 
-		if( intval( $question_id ) > 0 ) {
-			$notes = base64_encode( $notes );
+		if (intval($question_id) > 0) {
+			$notes = base64_encode($notes);
 
 			// Don't store empty values, no point
-			if ( !empty($notes) ) {
-				$user_lesson_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) );
-				$activity_logged = update_comment_meta( $user_lesson_id, 'answer_note', $notes );
+			if ( ! empty($notes)) {
+				$user_lesson_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID'));
+				$activity_logged = update_comment_meta($user_lesson_id, 'answer_note', $notes);
 			}
 			else {
 				$activity_logged = true;
@@ -955,16 +955,16 @@ 
 	 * @param  array $return_array data to be ordered
 	 * @return array $return_array ordered data
 	 */
-	public static function array_sort_reorder( $return_array ) {
-		if ( isset( $_GET['orderby'] ) && '' != esc_html( $_GET['orderby'] ) ) {
+	public static function array_sort_reorder($return_array) {
+		if (isset($_GET['orderby']) && '' != esc_html($_GET['orderby'])) {
 			$sort_key = '';
 			// if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->sortable_columns ) ) {
 			// 	$sort_key = esc_html( $_GET['orderby'] );
 			// } // End If Statement
-			if ( '' != $sort_key ) {
-					Sensei_Utils::sort_array_by_key($return_array,$sort_key);
-				if ( isset( $_GET['order'] ) && 'desc' == esc_html( $_GET['order'] ) ) {
-					$return_array = array_reverse( $return_array, true );
+			if ('' != $sort_key) {
+					Sensei_Utils::sort_array_by_key($return_array, $sort_key);
+				if (isset($_GET['order']) && 'desc' == esc_html($_GET['order'])) {
+					$return_array = array_reverse($return_array, true);
 				} // End If Statement
 			} // End If Statement
 			return $return_array;
@@ -980,15 +980,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;
@@ -1000,10 +1000,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',
@@ -1016,7 +1016,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()
@@ -1026,25 +1026,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;
@@ -1053,12 +1053,12 @@ 
 				}
 			}
 			// Might be a case of no required lessons
-			if ( $lesson_count ) {
-				$course_passmark = ( $total_passmark / $lesson_count );
+			if ($lesson_count) {
+				$course_passmark = ($total_passmark / $lesson_count);
 			}
 		}
 
-		return Sensei_Utils::round( $course_passmark );
+		return Sensei_Utils::round($course_passmark);
 	}
 
 	/**
@@ -1067,31 +1067,31 @@ 
 	 * @param  integer $user_id   ID of user
 	 * @return integer            User's total grade
 	 */
-	public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) {
+	public static function sensei_course_user_grade($course_id = 0, $user_id = 0) {
 
 
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$total_grade = 0;
 
-		if( $course_id > 0 && $user_id > 0 ) {
-			$lessons = Sensei()->course->course_lessons( $course_id );
+		if ($course_id > 0 && $user_id > 0) {
+			$lessons = Sensei()->course->course_lessons($course_id);
 			$lesson_count = 0;
 			$total_grade = 0;
-			foreach( $lessons as $lesson ) {
+			foreach ($lessons as $lesson) {
 
 				// Check for lesson having questions, thus a quiz, thus having a grade
-				$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-				if ( $has_questions ) {
-					$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, $user_id );
+				$has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true);
+				if ($has_questions) {
+					$user_lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, $user_id);
 
-					if(  empty( $user_lesson_status ) ){
+					if (empty($user_lesson_status)) {
 						continue;
 					}
 					// 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;
@@ -1101,13 +1101,13 @@ 
 			}
 
 			// Might be a case of no lessons with quizzes
-			if ( $lesson_count ) {
-				$total_grade = ( $total_grade / $lesson_count );
+			if ($lesson_count) {
+				$total_grade = ($total_grade / $lesson_count);
 			}
 
 		}
 
-		return Sensei_Utils::round( $total_grade );
+		return Sensei_Utils::round($total_grade);
 	}
 
 	/**
@@ -1116,18 +1116,18 @@ 
 	 * @param  integer $user_id   ID of user
 	 * @return boolean
 	 */
-	public static function sensei_user_passed_course( $course_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_user_passed_course($course_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$pass = false;
 
-		if( $course_id > 0 && $user_id > 0 ) {
-			$passmark = Sensei_Utils::sensei_course_pass_grade( $course_id );
-			$user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id );
+		if ($course_id > 0 && $user_id > 0) {
+			$passmark = Sensei_Utils::sensei_course_pass_grade($course_id);
+			$user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id);
 
-			if( $user_grade >= $passmark ) {
+			if ($user_grade >= $passmark) {
 				$pass = true;
 			}
 		}
@@ -1141,37 +1141,37 @@ 
 	 * @param  integer $course_id ID of course
 	 * @param  integer $user_id   ID of user
 	 */
-	public static function sensei_user_course_status_message( $course_id = 0, $user_id = 0 ) {
-		if( intval( $user_id ) == 0 ) {
+	public static function sensei_user_course_status_message($course_id = 0, $user_id = 0) {
+		if (intval($user_id) == 0) {
 			$user_id = get_current_user_id();
 		}
 
 		$status = 'not_started';
 		$box_class = 'info';
-		$message = __( 'You have not started this course yet.', 'woothemes-sensei' );
+		$message = __('You have not started this course yet.', 'woothemes-sensei');
 
-		if( $course_id > 0 && $user_id > 0 ) {
+		if ($course_id > 0 && $user_id > 0) {
 
-			$started_course = Sensei_Utils::user_started_course( $course_id, $user_id );
+			$started_course = Sensei_Utils::user_started_course($course_id, $user_id);
 
-			if( $started_course ) {
-				$passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); // This happens inside sensei_user_passed_course()!
-				$user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); // This happens inside sensei_user_passed_course()!
-				if( $user_grade >= $passmark ) {
+			if ($started_course) {
+				$passmark = Sensei_Utils::sensei_course_pass_grade($course_id); // This happens inside sensei_user_passed_course()!
+				$user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); // This happens inside sensei_user_passed_course()!
+				if ($user_grade >= $passmark) {
 					$status = 'passed';
 					$box_class = 'tick';
-					$message = sprintf( __( 'You have passed this course with a grade of %1$d%%.', 'woothemes-sensei' ), $user_grade );
+					$message = sprintf(__('You have passed this course with a grade of %1$d%%.', 'woothemes-sensei'), $user_grade);
 				} else {
 					$status = 'failed';
 					$box_class = 'alert';
-					$message = sprintf( __( 'You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei' ), $passmark, $user_grade );
+					$message = sprintf(__('You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei'), $passmark, $user_grade);
 				}
 			}
 
 		}
 
-		$message = apply_filters( 'sensei_user_course_status_' . $status, $message );
-		Sensei()->notices->add_notice( $message, $box_class   );
+		$message = apply_filters('sensei_user_course_status_'.$status, $message);
+		Sensei()->notices->add_notice($message, $box_class);
 	}
 
 	/**
@@ -1181,94 +1181,94 @@ 
      * @param  bool $is_lesson
 	 * @return array              Status code and message
 	 */
-	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) {
+	public static function sensei_user_quiz_status_message($lesson_id = 0, $user_id = 0, $is_lesson = false) {
 		global  $current_user;
-		if( intval( $user_id ) == 0 ) {
+		if (intval($user_id) == 0) {
 			$user_id = $current_user->ID;
 		}
 
 		$status = 'not_started';
 		$box_class = 'info';
-		$message = __( "You have not taken this lesson's quiz yet", 'woothemes-sensei' );
+		$message = __("You have not taken this lesson's quiz yet", 'woothemes-sensei');
 		$extra = '';
 
-		if( $lesson_id > 0 && $user_id > 0 ) {
+		if ($lesson_id > 0 && $user_id > 0) {
 
 			// Prerequisite lesson
-			$prerequisite = get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+			$prerequisite = get_post_meta($lesson_id, '_lesson_prerequisite', true);
 
 			// Course ID
-			$course_id = absint( get_post_meta( $lesson_id, '_lesson_course', true ) );
+			$course_id = absint(get_post_meta($lesson_id, '_lesson_course', true));
 
 			// Has user started course
-			$started_course = Sensei_Utils::user_started_course( $course_id, $user_id );
+			$started_course = Sensei_Utils::user_started_course($course_id, $user_id);
 
 			// Has user completed lesson
-			$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-			$lesson_complete = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+			$user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+			$lesson_complete = Sensei_Utils::user_completed_lesson($user_lesson_status);
 
 			// Quiz ID
-			$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+			$quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
 			// Quiz grade
 			$quiz_grade = 0;
-			if ( $user_lesson_status ) {
-				$quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+			if ($user_lesson_status) {
+				$quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
 			}
 
 			// Quiz passmark
-			$quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) );
+			$quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true));
 			$quiz_passmark_float = (float) $quiz_passmark;
 
 			// Pass required
-			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+			$pass_required = get_post_meta($quiz_id, '_pass_required', true);
 
 			// Quiz questions
-			$has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+			$has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
 
-			if ( ! $started_course ) {
+			if ( ! $started_course) {
 
 				$status = 'not_started_course';
 				$box_class = 'info';
-				$message = sprintf( __( 'Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . esc_attr( __( 'Sign Up', 'woothemes-sensei' ) ) . '">', '</a>' );
+				$message = sprintf(__('Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($course_id)).'" title="'.esc_attr(__('Sign Up', 'woothemes-sensei')).'">', '</a>');
 
-			} elseif ( ! is_user_logged_in() ) {
+			} elseif ( ! is_user_logged_in()) {
 
 				$status = 'login_required';
 				$box_class = 'info';
-				$message = __( 'You must be logged in to take this quiz', 'woothemes-sensei' );
+				$message = __('You must be logged in to take this quiz', 'woothemes-sensei');
 
 			}
 			// Lesson/Quiz is marked as complete thus passing any quiz restrictions
-			elseif ( $lesson_complete ) {
+			elseif ($lesson_complete) {
 
 				$status = 'passed';
 				$box_class = 'tick';
 				// Lesson status will be "complete" (has no Quiz)
-				if ( ! $has_quiz_questions ) {
-					$message = sprintf( __( 'Congratulations! You have passed this lesson.', 'woothemes-sensei' ) );
+				if ( ! $has_quiz_questions) {
+					$message = sprintf(__('Congratulations! You have passed this lesson.', 'woothemes-sensei'));
 				}
 				// Lesson status will be "graded" (no passmark required so might have failed all the questions)
-				elseif ( empty( $quiz_grade ) ) {
-					$message = sprintf( __( 'Congratulations! You have completed this lesson.', 'woothemes-sensei' ) );
+				elseif (empty($quiz_grade)) {
+					$message = sprintf(__('Congratulations! You have completed this lesson.', 'woothemes-sensei'));
 				}
 				// Lesson status will be "passed" (passmark reached)
-				elseif ( ! empty( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) {
-					if( $is_lesson ) {
-						$message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) );
+				elseif ( ! empty($quiz_grade) && abs($quiz_grade) >= 0) {
+					if ($is_lesson) {
+						$message = sprintf(__('Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade));
 					} else {
-						$message = sprintf( __( 'Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_grade ) );
+						$message = sprintf(__('Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade));
 					}
 				}
 
                 // add next lesson button
-                $nav_id_array = sensei_get_prev_next_lessons( $lesson_id );
-                $next_lesson_id = absint( $nav_id_array['next_lesson'] );
+                $nav_id_array = sensei_get_prev_next_lessons($lesson_id);
+                $next_lesson_id = absint($nav_id_array['next_lesson']);
 
                 // Output HTML
-                if ( ( 0 < $next_lesson_id ) ) {
-                    $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) )
-                                . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei')
+                if ((0 < $next_lesson_id)) {
+                    $message .= ' '.'<a class="next-lesson" href="'.esc_url(get_permalink($next_lesson_id))
+                                . '" rel="next"><span class="meta-nav"></span>'.__('Next Lesson', 'woothemes-sensei')
                                 .'</a>';
 
                 }
@@ -1277,51 +1277,51 @@ 
             // Lesson/Quiz not complete
 			else {
 				// Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete)
-				if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) {
+				if (isset($user_lesson_status->comment_approved) && 'ungraded' == $user_lesson_status->comment_approved) {
 					$status = 'complete';
 					$box_class = 'info';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . esc_attr( get_the_title( $quiz_id ) ) . '">', '</a>' );
+					if ($is_lesson) {
+						$message = sprintf(__('You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($quiz_id)).'" title="'.esc_attr(get_the_title($quiz_id)).'">', '</a>');
 					} else {
-						$message = sprintf( __( 'You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+						$message = sprintf(__('You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					}
 				}
 				// Lesson status must be "failed"
-				elseif ( isset( $user_lesson_status->comment_approved ) && 'failed' == $user_lesson_status->comment_approved ) {
+				elseif (isset($user_lesson_status->comment_approved) && 'failed' == $user_lesson_status->comment_approved) {
 					$status = 'failed';
 					$box_class = 'alert';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ),  Sensei_Utils::round( $quiz_grade ) );
+					if ($is_lesson) {
+						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade));
 					} else {
-						$message = sprintf( __( 'You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ),  Sensei_Utils::round( $quiz_grade ) );
+						$message = sprintf(__('You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade));
 					}
 				}
 				// Lesson/Quiz requires a pass
-				elseif( $pass_required ) {
+				elseif ($pass_required) {
 					$status = 'not_started';
 					$box_class = 'info';
-					if( $is_lesson ) {
-						$message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+					if ($is_lesson) {
+						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					} else {
-						$message = sprintf( __( 'You require %1$d%% to pass this quiz.', 'woothemes-sensei' ),  Sensei_Utils::round( $quiz_passmark ) );
+						$message = sprintf(__('You require %1$d%% to pass this quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark));
 					}
 				}
 			}
 
-		}else{
+		} else {
 
-			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
-			$a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' )  . '">';
-			$a_element .= __( 'course', 'woothemes-sensei' );
+			$course_id = Sensei()->lesson->get_course_id($lesson_id);
+			$a_element = '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Sign Up', 'woothemes-sensei').'">';
+			$a_element .= __('course', 'woothemes-sensei');
 			$a_element .= '</a>';
 
-			if ( Sensei_WC::is_course_purchasable( $course_id ) ){
+			if (Sensei_WC::is_course_purchasable($course_id)) {
 
-				$message = sprintf( __( 'Please purchase the %1$s before taking this quiz.', 'woothemes-sensei' ), $a_element );
+				$message = sprintf(__('Please purchase the %1$s before taking this quiz.', 'woothemes-sensei'), $a_element);
 
 			} else {
 
-				$message = sprintf( __( 'Please sign up for the %1$s before taking this quiz.', 'woothemes-sensei' ), $a_element );
+				$message = sprintf(__('Please sign up for the %1$s before taking this quiz.', 'woothemes-sensei'), $a_element);
 
 			}
 
@@ -1329,15 +1329,15 @@ 
 		}
 
 		// Legacy filter
-		$message = apply_filters( 'sensei_user_quiz_status_' . $status, $message );
+		$message = apply_filters('sensei_user_quiz_status_'.$status, $message);
 
-		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) {
-            $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-			$extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' .  __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' .  __( 'View the lesson quiz', 'woothemes-sensei' )  . '</a></p>';
+		if ($is_lesson && ! in_array($status, array('login_required', 'not_started_course'))) {
+            $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
+			$extra = '<p><a class="button" href="'.esc_url(get_permalink($quiz_id)).'" title="'.__('View the lesson quiz', 'woothemes-sensei').'">'.__('View the lesson quiz', 'woothemes-sensei').'</a></p>';
 		}
 
 		// Filter of all messages
-		return apply_filters( 'sensei_user_quiz_status', array( 'status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra ), $lesson_id, $user_id, $is_lesson );
+		return apply_filters('sensei_user_quiz_status', array('status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra), $lesson_id, $user_id, $is_lesson);
 	}
 
 	/**
@@ -1347,14 +1347,14 @@ 
 	 * @param  integer $course_id Course ID
 	 * @return mixed boolean or comment_ID
 	 */
-	public static function user_start_course( $user_id = 0, $course_id = 0 ) {
+	public static function user_start_course($user_id = 0, $course_id = 0) {
 
 		$activity_logged = false;
 
-		if( $user_id && $course_id ) {
+		if ($user_id && $course_id) {
 			// Check if user is already on the Course
-			$activity_logged = Sensei_Utils::user_started_course( $course_id, $user_id );
-			if ( ! $activity_logged ) {
+			$activity_logged = Sensei_Utils::user_started_course($course_id, $user_id);
+			if ( ! $activity_logged) {
 
 				// Add user to course
 				$course_metadata = array(
@@ -1363,11 +1363,11 @@ 
 					'complete' => 0,
 				);
 
-				$activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status = 'in-progress', $course_metadata );
+				$activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status = 'in-progress', $course_metadata);
 
 				// Allow further actions
-				if ( $activity_logged ) {
-					do_action( 'sensei_user_course_start', $user_id, $course_id );
+				if ($activity_logged) {
+					do_action('sensei_user_course_start', $user_id, $course_id);
 				}
 			}
 		}
@@ -1383,19 +1383,19 @@ 
 	 * @param int $user_id
 	 * @return mixed false or comment_ID
 	 */
-	public static function user_started_course( $course_id = 0, $user_id = 0 ) {
+	public static function user_started_course($course_id = 0, $user_id = 0) {
 
 		$user_started_course = false;
 
-		if( $course_id ) {
+		if ($course_id) {
 
-			if( ! $user_id ) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
-            if ( ! $user_id > 0 ) {
+            if ( ! $user_id > 0) {
 
-	            $user_started_course =  false;
+	            $user_started_course = false;
 
             } else {
 
@@ -1406,9 +1406,9 @@ 
 		            'field' => 'comment_ID'
 	            );
 
-				$user_course_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
+				$user_course_status_id = Sensei_Utils::sensei_get_activity_value($activity_args);
 
-				if ( $user_course_status_id ) {
+				if ($user_course_status_id) {
 
 					$user_started_course = $user_course_status_id;
 
@@ -1424,7 +1424,7 @@ 
 		 * @param bool $user_started_course
 		 * @param integer $course_id
 		 */
-		return apply_filters( 'sensei_user_started_course', $user_started_course, $course_id, $user_id );
+		return apply_filters('sensei_user_started_course', $user_started_course, $course_id, $user_id);
 
 	}
 
@@ -1436,17 +1436,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,
@@ -1455,8 +1455,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...
@@ -1469,29 +1469,29 @@ 
 			// The below checks if a lesson is fully completed, though maybe should be Utils::user_completed_lesson()
 			$all_lesson_statuses = array();
 			// In WordPress 4.1 get_comments() allows a single query to cover multiple comment_post_IDs
-			if ( version_compare($wp_version, '4.1', '>=') ) {
+			if (version_compare($wp_version, '4.1', '>=')) {
 				$lesson_status_args['post__in'] = $lesson_ids;
-				$all_lesson_statuses = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true );
+				$all_lesson_statuses = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true);
 				// Need to always return an array, even with only 1 item
-				if ( !is_array($all_lesson_statuses) ) {
-					$all_lesson_statuses = array( $all_lesson_statuses );
+				if ( ! is_array($all_lesson_statuses)) {
+					$all_lesson_statuses = array($all_lesson_statuses);
 				}
 			}
 			// ...otherwise check each one
 			else {
-				foreach( $lesson_ids as $lesson_id ) {
+				foreach ($lesson_ids as $lesson_id) {
 					$lesson_status_args['post_id'] = $lesson_id;
-					$each_lesson_status = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true );
+					$each_lesson_status = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true);
 					// Check for valid return before using
-					if ( !empty($each_lesson_status->comment_approved) ) {
+					if ( ! empty($each_lesson_status->comment_approved)) {
 						$all_lesson_statuses[] = $each_lesson_status;
 					}
 				}
 			}
-			foreach( $all_lesson_statuses as $lesson_status ) {
+			foreach ($all_lesson_statuses as $lesson_status) {
 				// If lessons are complete without needing quizzes to be passed
-				if ( 'passed' != $course_completion ) {
-					switch ( $lesson_status->comment_approved ) {
+				if ('passed' != $course_completion) {
+					switch ($lesson_status->comment_approved) {
 						// A user cannot 'complete' a course if a lesson...
 						case 'in-progress': // ...is still in progress
 						case 'ungraded': // ...hasn't yet been graded
@@ -1503,7 +1503,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
@@ -1517,20 +1517,20 @@ 
 					}
 				}
 			} // Each lesson
-			if ( $lessons_completed == $total_lessons ) {
+			if ($lessons_completed == $total_lessons) {
 				$course_status = 'complete';
 			}
 
 			// Update meta data on how many lessons have been completed
 			$course_metadata['complete'] = $lessons_completed;
 			// update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above
-			$course_metadata['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
+			$course_metadata['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0));
 
-			$activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status, $course_metadata );
+			$activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status, $course_metadata);
 
 			// Allow further actions
-			if ( 'complete' == $course_status ) {
-				do_action( 'sensei_user_course_end', $user_id, $course_id );
+			if ('complete' == $course_status) {
+				do_action('sensei_user_course_end', $user_id, $course_id);
 			}
 			return $activity_logged;
 		}
@@ -1546,40 +1546,40 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function user_completed_course( $course , $user_id = 0 ) {
+	public static function user_completed_course($course, $user_id = 0) {
 
-		if( $course ) {
-			if ( is_object( $course ) && is_a( $course,'WP_Comment') ) {
+		if ($course) {
+			if (is_object($course) && is_a($course, 'WP_Comment')) {
 				$user_course_status = $course->comment_approved;
 			}
-			elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) {
+			elseif ( ! is_numeric($course) && ! is_a($course, 'WP_Post')) {
 				$user_course_status = $course;
 			}
 			else {
 
 				// check the user_id
-				if( ! $user_id ) {
+				if ( ! $user_id) {
 
 					$user_id = get_current_user_id();
 
-					if( empty( $user_id ) ){
+					if (empty($user_id)) {
 
 						return false;
 
 					}
 				}
 
-                if( is_a( $course, 'WP_Post' ) ){
-                    $course =   $course->ID;
+                if (is_a($course, 'WP_Post')) {
+                    $course = $course->ID;
                 }
 
-				$user_course_status = Sensei_Utils::user_course_status( $course , $user_id );
-				if( isset( $user_course_status->comment_approved ) ){
+				$user_course_status = Sensei_Utils::user_course_status($course, $user_id);
+				if (isset($user_course_status->comment_approved)) {
                     $user_course_status = $user_course_status->comment_approved;
                 }
 
 			}
-			if( $user_course_status && 'complete' == $user_course_status ) {
+			if ($user_course_status && 'complete' == $user_course_status) {
 				return true;
 			}
 		}
@@ -1594,10 +1594,10 @@ 
 	 * @param int $user_id
 	 * @return mixed false or comment_ID
 	 */
-	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) {
+	public static function user_started_lesson($lesson_id = 0, $user_id = 0) {
 
-		if( $lesson_id ) {
-			if( ! $user_id ) {
+		if ($lesson_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
@@ -1607,8 +1607,8 @@ 
                 'type' => 'sensei_lesson_status',
                 'field' => 'comment_ID' );
 
-			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args );
-			if( $user_lesson_status_id ) {
+			$user_lesson_status_id = Sensei_Utils::sensei_get_activity_value($activity_args);
+			if ($user_lesson_status_id) {
 				return $user_lesson_status_id;
 			}
 		}
@@ -1623,29 +1623,29 @@ 
 	 * @param int $user_id
 	 * @return boolean
 	 */
-	public static function user_completed_lesson( $lesson = 0, $user_id = 0 ) {
+	public static function user_completed_lesson($lesson = 0, $user_id = 0) {
 
-		if( $lesson ) {
+		if ($lesson) {
 			$lesson_id = 0;
-			if ( is_object( $lesson ) ) {
+			if (is_object($lesson)) {
 				$user_lesson_status = $lesson->comment_approved;
 				$lesson_id = $lesson->comment_post_ID;
 			}
-			elseif ( ! is_numeric( $lesson ) ) {
+			elseif ( ! is_numeric($lesson)) {
 				$user_lesson_status = $lesson;
 			}
 			else {
-				if( ! $user_id ) {
+				if ( ! $user_id) {
 					$user_id = get_current_user_id();
 				}
 
                 // the user is not logged in
-                if( ! $user_id > 0 ){
+                if ( ! $user_id > 0) {
                     return false;
                 }
-				$_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id );
+				$_user_lesson_status = Sensei_Utils::user_lesson_status($lesson, $user_id);
 
-				if ( $_user_lesson_status ) {
+				if ($_user_lesson_status) {
 					$user_lesson_status = $_user_lesson_status->comment_approved;
 				}
 				else {
@@ -1653,12 +1653,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':
@@ -1667,13 +1667,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;
 									}
@@ -1696,15 +1696,15 @@ 
 	 * @param int $user_id
 	 * @return object
 	 */
-	public static function user_course_status( $course_id = 0, $user_id = 0 ) {
+	public static function user_course_status($course_id = 0, $user_id = 0) {
 
 
-		if( $course_id ) {
-			if( ! $user_id ) {
+		if ($course_id) {
+			if ( ! $user_id) {
 				$user_id = get_current_user_id();
 			}
 
-			$user_course_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status' ), true );
+			$user_course_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status'), true);
 			return $user_course_status;
 		}
 
@@ -1719,27 +1719,27 @@ 
 	 * @param int $user_id
 	 * @return object | bool
 	 */
-	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) {
+	public static function user_lesson_status($lesson_id = 0, $user_id = 0) {
 
-        if( ! $user_id ) {
+        if ( ! $user_id) {
             $user_id = get_current_user_id();
         }
 
-		if( $lesson_id > 0 && $user_id > 0 ) {
+		if ($lesson_id > 0 && $user_id > 0) {
 
-			$user_lesson_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status' ), true );
+			$user_lesson_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status'), true);
 			return $user_lesson_status;
 		}
 
 		return false;
 	}
 
-	public static function is_preview_lesson( $lesson_id ) {
+	public static function is_preview_lesson($lesson_id) {
 		$is_preview = false;
 
-		if( 'lesson' == get_post_type( $lesson_id ) ) {
-			$lesson_preview = get_post_meta( $lesson_id, '_lesson_preview', true );
-			if ( isset( $lesson_preview ) && '' != $lesson_preview ) {
+		if ('lesson' == get_post_type($lesson_id)) {
+			$lesson_preview = get_post_meta($lesson_id, '_lesson_preview', true);
+			if (isset($lesson_preview) && '' != $lesson_preview) {
 				$is_preview = true;
 			}
 		}
@@ -1747,22 +1747,22 @@ 
 		return $is_preview;
 	}
 
-	public static function user_passed_quiz( $quiz_id = 0, $user_id = 0 ) {
+	public static function user_passed_quiz($quiz_id = 0, $user_id = 0) {
 
-		if( ! $quiz_id  ) return false;
+		if ( ! $quiz_id) return false;
 
-		if( ! $user_id ) {
+		if ( ! $user_id) {
 			$user_id = get_current_user_id();
 		}
-		$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
+		$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
 
 		// Quiz Grade
-		$lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-		$quiz_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+		$lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+		$quiz_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 
 		// Check if Grade is greater than or equal to pass percentage
-		$quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
-		if ( $quiz_passmark <= intval( $quiz_grade ) ) {
+		$quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
+		if ($quiz_passmark <= intval($quiz_grade)) {
 			return true;
 		}
 
@@ -1782,9 +1782,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,
@@ -1793,18 +1793,18 @@ 
 					'action'    => 'update', // Update the existing status...
 					'keep_time' => true, // ...but don't change the existing timestamp
 				);
-			if( 'in-progress' == $status ) {
-				unset( $args['keep_time'] ); // Keep updating what's happened
+			if ('in-progress' == $status) {
+				unset($args['keep_time']); // Keep updating what's happened
 			}
 
-			$comment_id = Sensei_Utils::sensei_log_activity( $args );
-			if ( $comment_id && !empty($metadata) ) {
-				foreach( $metadata as $key => $value ) {
-					update_comment_meta( $comment_id, $key, $value );
+			$comment_id = Sensei_Utils::sensei_log_activity($args);
+			if ($comment_id && ! empty($metadata)) {
+				foreach ($metadata as $key => $value) {
+					update_comment_meta($comment_id, $key, $value);
 				}
 			}
 
-			do_action( 'sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id );
+			do_action('sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id);
 		}
 		return $comment_id;
 	}
@@ -1820,9 +1820,9 @@ 
 	 * @param array $metadata
 	 * @return mixed false or comment_ID
 	 */
-	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) {
+	public static function update_course_status($user_id, $course_id, $status = 'in-progress', $metadata = array()) {
 		$comment_id = false;
-		if ( !empty($status) ) {
+		if ( ! empty($status)) {
 			$args = array(
 					'user_id'   => $user_id,
 					'post_id'   => $course_id,
@@ -1831,17 +1831,17 @@ 
 					'action'    => 'update', // Update the existing status...
 					'keep_time' => true, // ...but don't change the existing timestamp
 				);
-			if( 'in-progress' == $status ) {
-				unset( $args['keep_time'] ); // Keep updating what's happened
+			if ('in-progress' == $status) {
+				unset($args['keep_time']); // Keep updating what's happened
 			}
 
-			$comment_id = Sensei_Utils::sensei_log_activity( $args );
-			if ( $comment_id && !empty($metadata) ) {
-				foreach( $metadata as $key => $value ) {
-					update_comment_meta( $comment_id, $key, $value );
+			$comment_id = Sensei_Utils::sensei_log_activity($args);
+			if ($comment_id && ! empty($metadata)) {
+				foreach ($metadata as $key => $value) {
+					update_comment_meta($comment_id, $key, $value);
 				}
 			}
-			do_action( 'sensei_course_status_updated', $status, $user_id, $course_id, $comment_id );
+			do_action('sensei_course_status_updated', $status, $user_id, $course_id, $comment_id);
 		}
 		return $comment_id;
 	}
@@ -1853,9 +1853,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;
 	}
@@ -1867,9 +1867,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;
 	}
@@ -1881,12 +1881,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;
@@ -1898,12 +1898,12 @@ 
      * @param array $pieces
 	 * @return array $pieces
 	 */
-	public static function comment_total_sum_meta_value_filter( $pieces ) {
+	public static function comment_total_sum_meta_value_filter($pieces) {
 		global $wpdb, $wp_version;
 
 		$pieces['fields'] = " COUNT(*) AS total, SUM($wpdb->commentmeta.meta_value) AS meta_sum ";
-		unset( $pieces['groupby'] );
-		if ( version_compare($wp_version, '4.1', '>=') ) {
+		unset($pieces['groupby']);
+		if (version_compare($wp_version, '4.1', '>=')) {
 			$args['order'] = false;
 			$args['orderby'] = false;
 		}
@@ -1918,12 +1918,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;
 		}
@@ -1942,9 +1942,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
 
@@ -1963,18 +1963,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;
         }
@@ -1982,20 +1982,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;
 
@@ -2014,20 +2014,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;
         }
@@ -2035,13 +2035,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;
 
@@ -2056,19 +2056,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;
         }
@@ -2076,13 +2076,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;
 
@@ -2107,62 +2107,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;
 
@@ -2182,14 +2182,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.
@@ -2199,15 +2199,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);
 
         }
 
@@ -2219,15 +2219,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);
 
             }
         }
@@ -2257,27 +2257,27 @@ 
      * @param array $array_b
      * @return array $merged_array
      */
-    public static function array_zip_merge( $array_a, $array_b ){
+    public static function array_zip_merge($array_a, $array_b) {
 
-        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){
+        if ( ! is_array($array_a) || ! is_array($array_b)) {
             trigger_error('array_zip_merge requires both arrays to be indexed arrays ');
         }
 
         $merged_array = array();
-        $total_elements = count( $array_a )  + count( $array_b );
+        $total_elements = count($array_a) + count($array_b);
 
         // Zip arrays
-        for ( $i = 0; $i < $total_elements; $i++) {
+        for ($i = 0; $i < $total_elements; $i++) {
 
             // if has an element at current index push a on top
-            if( isset( $array_a[ $i ] ) ){
-                $merged_array[] = $array_a[ $i ]  ;
+            if (isset($array_a[$i])) {
+                $merged_array[] = $array_a[$i];
             }
 
             // next if $array_b has an element at current index push a on top of the element
             // from a if there was one, if not the element before that.
-            if( isset( $array_b[ $i ] ) ){
-                $merged_array[] = $array_b[ $i ]  ;
+            if (isset($array_b[$i])) {
+                $merged_array[] = $array_b[$i];
             }
 
         }
@@ -2292,4 +2292,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Utils extends Sensei_Utils{}
\ No newline at end of file
+class WooThemes_Sensei_Utils extends Sensei_Utils {}
\ No newline at end of file

includes/class-sensei-wc.php

Doc Comments +6 added lines, -5 removed lines

@@ -994,7 +994,7 @@ 
      * @since   1.2.0
      * @since  1.9.0 move to class Sensei_WC
      *
-     * @param   WC_Order $order
+     * @param   integer $order
      *
      * @return  void
      */
@@ -1212,6 +1212,7 @@ 
      * @since   1.2.0
      * @since   1.9.0 Move function to the Sensei_WC class
      * @param   integer| WC_Order $order_id order ID
+     * @param integer $order_id
      * @return  void
      */
     public static function cancel_order ( $order_id ) {
@@ -1402,7 +1403,7 @@ 
      *
      * @param  boolean $guest_checkout Current guest checkout setting
      *
-     * @return boolean                 Modified guest checkout setting
+     * @return string|boolean                 Modified guest checkout setting
      */
     public static function disable_guest_checkout( $guest_checkout ) {
 
@@ -1639,7 +1640,7 @@ 
      * Get all the valid subscription types.
      *
      * @since 1.9.0
-     * @return array
+     * @return string[]
      */
     public static function get_subscription_types(){
 
@@ -1658,7 +1659,7 @@ 
      * @since 1.9.0
      *
      * @param $user_id
-     * @param $product_id
+     * @param string $product_id
      * @param $course_id
      *
      * @return bool
@@ -1725,7 +1726,7 @@ 
 	 * Get all the orders for a specific user and product combination
 	 *
 	 * @param int $user_id
-	 * @param $product_id
+	 * @param integer $product_id
 	 *
 	 * @return array $orders
 	 */

Indentation +1228 added lines, -1228 removed lines

@@ -13,756 +13,756 @@ 
 
 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(){
 
-	    $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
-        require_once( $woocommerce_hooks_file_path );
+		$woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
+		require_once( $woocommerce_hooks_file_path );
 
-    }
-    /**
-     * check if WooCommerce plugin is loaded and allowed by Sensei
-     *
-     * @since 1.9.0
-     * @return bool
-     */
-    public static function is_woocommerce_active(){
+	}
+	/**
+	 * check if WooCommerce plugin is loaded and allowed by Sensei
+	 *
+	 * @since 1.9.0
+	 * @return bool
+	 */
+	public static function is_woocommerce_active(){
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
-        return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
+		$is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+		return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
-    } // end is_woocommerce_active
+	} // end is_woocommerce_active
 
-    /**
-     * Checks if the WooCommerce plugin is installed and activation.
-     *
-     * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
-     * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
-     *
-     * @since 1.9.0
-     *
-     * @return bool
-     */
-    public static function is_woocommerce_present(){
+	/**
+	 * Checks if the WooCommerce plugin is installed and activation.
+	 *
+	 * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
+	 * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return bool
+	 */
+	public static function is_woocommerce_present(){
 
-        $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() ) );
 
-        }
+		}
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+		$is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+		return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
 
-    }// end is_woocommerce_present
+	}// end is_woocommerce_present
 
-    /**
-     * 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 );
+
+		$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 ){
+
+			return false;
+
+		}
+
+		foreach( $orders_query->get_posts() as $order ){
+
+			$order = new WC_Order( $order->ID );
+			$items = $order->get_items();
+
+			$user_orders =  array();
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+			foreach( $items as $item ){
 
-        $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 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( $orders_query->post_count == 0 ){
+				if ( is_object( $product ) && $product->is_type( 'variable' )) {
 
-            return false;
+					$item_product_id = $item['variation_id'];
 
-        }
+				} else {
 
-        foreach( $orders_query->get_posts() as $order ){
+					$item_product_id =  $item['product_id'];
 
-            $order = new WC_Order( $order->ID );
-            $items = $order->get_items();
+				}
 
-            $user_orders =  array();
+				if( $course_product_id == $item_product_id ){
 
-            foreach( $items as $item ){
+					return $order->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 ( is_object( $product ) && $product->is_type( 'variable' )) {
 
-                    $item_product_id = $item['variation_id'];
+			}//end for each order item
 
-                } else {
+		} // end for each order
 
-                    $item_product_id =  $item['product_id'];
+		// if we reach this place we found no order
+		return false;
 
-                }
+	} // end get_learner_course_active_order_ids
 
-                if( $course_product_id == $item_product_id ){
+	/**
+	 * 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 ){
+
+		$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;
 
-                    return $order->id;
+		}
+
+		$filter_links[] = array(
+			'id'=>'paid' ,
+			'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Paid', 'woothemes-sensei' )
+		);
+
+		$filter_links[] = array(
+			'id'=>'free',
+			'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Free', 'woothemes-sensei' )
+		);
 
-                }
+		return $filter_links;
 
+	}// end add_course_archive_wc_filter_links
 
-            }//end for each order item
+	/**
+	 * 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 ){
 
-        } // end for each order
+		if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
 
-        // if we reach this place we found no order
-        return false;
+			// setup the course meta query
+			$meta_query = self::get_free_courses_meta_query_args();
 
-    } // end get_learner_course_active_order_ids
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
 
-    /**
-     * 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 ){
+			// 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 );
 
-        $free_courses = self::get_free_courses();
-        $paid_courses = self::get_paid_courses();
+		}// end if course_filter
 
-        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;
+		return $query;
 
-        }
+	}// course_archive_wc_filter_free
 
-        $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
-        );
+	/**
+	 * 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 ){
 
-        $filter_links[] = array(
-            'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
-        );
+		if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query() ){
 
-        return $filter_links;
+			// setup the course meta query
+			$meta_query = self::get_paid_courses_meta_query_args();
 
-    }// end add_course_archive_wc_filter_links
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_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()  ){
+		return $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 );
+	/**
+	 * 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(){
 
-            // 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 );
+		/**
+		 * this hooks is documented within the WooCommerce plugin.
+		 */
+		if ( Sensei_WC::is_woocommerce_active() ) {
 
-        }// end if course_filter
+			do_action( 'woocommerce_before_single_product' );
 
-        return $query;
+		} // End If Statement
 
-    }// course_archive_wc_filter_free
+	}// end do_single_course_wc_single_product_action
 
-    /**
-     * 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 ){
+	/**
+	 * 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  ){
 
-        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 );
-
-        }
-
-        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 ( Sensei_WC::is_woocommerce_active() ) {
-
-            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  ){
-
-	    // do not override access to admins
-	    $course_id = Sensei()->lesson->get_course_id( $lesson_id );
-	    if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id )
-	         || Sensei_Utils::user_started_course( $course_id, $user_id )  ){
+		// do not override access to admins
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id )
+			 || Sensei_Utils::user_started_course( $course_id, $user_id )  ){
 
 			return true;
 
-	    }
+		}
 
-        // 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) ){
+		// 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 );
+			// 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 ){
+			// 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 false;
 
-            }
+			}
 
-        }
+		}
 
-        // return the passed in value
-        return $can_user_view_lesson;
+		// 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( ) {
+	/**
+	 * 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;
-        }
+		if( ! is_order_received_page() ){
+			return;
+		}
 
-        $order_id = get_query_var( 'order-received' );
+		$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>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+				echo 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 = 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',
+			),
+		);
 
-    /**
-     * 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 = 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
-     *
-     * @param array $args
-     * @return array
-     */
-    public static function get_free_courses( $args = array() ){
-
-        $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
-
-	    if( !empty( $args ) ){
-		    wp_parse_args( $args, $free_course_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
-     * @param array $args override default arg values
-     *
-     * @return array
-     */
-    public static function get_paid_courses( $args = array() ){
-
-        $paid_course_query_args = Sensei_Course::get_default_query_args();
-
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
-
-	    if( !empty( $args ) ){
-		    wp_parse_args( $args, $paid_course_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 ) || self::is_course_in_cart( $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 = self::get_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:
-        //
-        ?>
+	}// 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
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	public static function get_free_courses( $args = array() ){
+
+		$free_course_query_args = Sensei_Course::get_default_query_args();
+		$free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+
+		if( !empty( $args ) ){
+			wp_parse_args( $args, $free_course_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
+	 * @param array $args override default arg values
+	 *
+	 * @return array
+	 */
+	public static function get_paid_courses( $args = array() ){
+
+		$paid_course_query_args = Sensei_Course::get_default_query_args();
+
+		$paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+
+		if( !empty( $args ) ){
+			wp_parse_args( $args, $paid_course_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 ) || self::is_course_in_cart( $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 = self::get_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"
@@ -791,83 +791,83 @@ 
             <button type="submit" class="single_add_to_cart_button button alt">
                 <?php $button_text = $product->get_price_html() . ' - ' . __( 'Purchase this Course', 'woothemes-sensei' ); ?>
                 <?php
-                /**
-                 * Filter Add to Cart button text
-                 *
-                 * @since 1.9.1
-                 *
-                 * @param string $button_text
-                 */
-                echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
-                ?>
+				/**
+				 * Filter Add to Cart button text
+				 *
+				 * @since 1.9.1
+				 *
+				 * @param string $button_text
+				 */
+				echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
+				?>
             </button>
 
         </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>';
-	    $wc_product_id =  self::get_course_product_id( $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>';
+		$wc_product_id =  self::get_course_product_id( $course_id );
 
-	    if ( self::is_product_in_cart( $wc_product_id ) ) {
+		if ( self::is_product_in_cart( $wc_product_id ) ) {
 
-		    $cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
+			$cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
 
-		    $message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
-		    ?>
+			$message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
+			?>
 		    <span class="add-to-cart-login">
 		            <?php echo $message; ?>
 		        </span>
 
 		    <?php
 
-	    } elseif ( is_user_logged_in() ) {
+		} elseif ( is_user_logged_in() ) {
 
-		    ?>
+			?>
 		    <style>
 			    .sensei-message.alert {
 				    display: none;
@@ -876,345 +876,345 @@ 
 
 		    <?php
 
-	    } else {
-		    $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
-	        ?>
+		} else {
+			$message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
+			?>
 		        <span class="add-to-cart-login">
 		            <?php echo $message; ?>
 		        </span>
 
 	        <?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 ){
-
-        $orders = self::get_user_product_orders( $user_id, $product_id );
-
-        foreach ( $orders as $order_id ) {
-
-            $order = new WC_Order( $order_id->ID );
-
-            // wc-active is the subscriptions complete status
-            if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) )
-                || ! ( 0 < sizeof( $order->get_items() ) )  ){
-
-                continue;
+	/**
+	 * 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 = self::get_user_product_orders( $user_id, $product_id );
 
-            foreach( $order->get_items() as $item ) {
+		foreach ( $orders as $order_id ) {
 
-                // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+			$order = new WC_Order( $order_id->ID );
 
-                    // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = wcs_get_subscription( $order );
-                        if( $sub_key ) {
-                            $sub = wcs_get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
-                                    return true;
-                                } else {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
+			// wc-active is the subscriptions complete status
+			if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) )
+				|| ! ( 0 < sizeof( $order->get_items() ) )  ){
 
-                    // Customer has bought product
-                    return true;
-                } // End If Statement
+				continue;
 
-            } // End For each item
+			}
 
-        } // End For each order
+			foreach( $order->get_items() as $item ) {
 
-	    // default is no order
-	    return false;
+				// Check if user has bought product
+				if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
 
-    } // end has customer bought product
+					// Check if user has an active subscription for product
+					if( class_exists( 'WC_Subscriptions_Manager' ) ) {
+						$sub_key = wcs_get_subscription( $order );
+						if( $sub_key ) {
+							$sub = wcs_get_subscription( $sub_key );
+							if( $sub && isset( $sub['status'] ) ) {
+								if( 'active' == $sub['status'] ) {
+									return true;
+								} else {
+									return false;
+								}
+							}
+						}
+					}
 
-    /**
-     * 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 ){
+					// Customer has bought product
+					return true;
+				} // End If Statement
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+			} // End For each item
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
-            return false;
-        }
+		} // End For each order
 
-        return $product_id;
+		// default is no order
+		return false;
 
-    }
+	} // end has customer bought product
 
-    /**
-     * Alter the body classes adding WooCommerce to the body
-     *
-     * Speciall cases where this is needed is template no-permissions.php
-     *
-     * @param array $classes
-     * @return array
-     */
-    public static function add_woocommerce_body_class( $classes ){
+	/**
+	 * 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 ){
 
-        if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
+		$product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-            $classes[] ='woocommerce';
+		if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+			return false;
+		}
 
-        }
+		return $product_id;
 
-        return $classes;
+	}
 
-    }
+	/**
+	 * Alter the body classes adding WooCommerce to the body
+	 *
+	 * Speciall cases where this is needed is template no-permissions.php
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public static function add_woocommerce_body_class( $classes ){
 
-    /**
-     * Responds to when a subscription product is purchased
-     *
-     * @since   1.2.0
-     * @since  1.9.0 move to class Sensei_WC
-     *
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public static function activate_subscription(  $order ) {
+		if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
 
-        $order_user = get_user_by('id', $order->user_id);
-        $user['ID'] = $order_user->ID;
-        $user['user_login'] = $order_user->user_login;
-        $user['user_email'] = $order_user->user_email;
-        $user['user_url'] = $order_user->user_url;
+			$classes[] ='woocommerce';
 
-        // Run through each product ordered
-        if ( ! sizeof($order->get_items() )>0 ) {
+		}
 
-            return;
+		return $classes;
 
-        }
+	}
 
-        foreach($order->get_items() as $item) {
+	/**
+	 * Responds to when a subscription product is purchased
+	 *
+	 * @since   1.2.0
+	 * @since  1.9.0 move to class Sensei_WC
+	 *
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public static function activate_subscription(  $order ) {
 
-            $product_type = '';
+		$order_user = get_user_by('id', $order->user_id);
+		$user['ID'] = $order_user->ID;
+		$user['user_login'] = $order_user->user_login;
+		$user['user_email'] = $order_user->user_email;
+		$user['user_url'] = $order_user->user_url;
 
-            if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+		// Run through each product ordered
+		if ( ! sizeof($order->get_items() )>0 ) {
 
-                $item_id = $item['variation_id'];
-                $product_type = 'subscription_variation';
+			return;
 
-            } else {
+		}
 
-                $item_id = $item['product_id'];
+		foreach($order->get_items() as $item) {
 
-            } // End If Statement
+			$product_type = '';
 
-            $_product = self::get_product_object( $item_id, $product_type );
+			if (isset($item['variation_id']) && $item['variation_id'] > 0) {
 
-            // Get courses that use the WC product
-            $courses = array();
+				$item_id = $item['variation_id'];
+				$product_type = 'subscription_variation';
 
-            if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
+			} else {
 
-                $courses = Sensei()->course->get_product_courses( $item_id );
+				$item_id = $item['product_id'];
 
-            } // End If Statement
+			} // End If Statement
 
-            // Loop and add the user to the course.
-            foreach ( $courses as $course_item ){
+			$_product = self::get_product_object( $item_id, $product_type );
 
-                Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
+			// Get courses that use the WC product
+			$courses = array();
 
-            } // End For Loop
+			if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
 
-        } // End For Loop
+				$courses = Sensei()->course->get_product_courses( $item_id );
 
-    } // End activate_subscription()
+			} // End If Statement
 
-    /**
-     * Adds detail to to the WooCommerce order
-     *
-     * @since   1.4.5
-     * @since 1.9.0 function moved to class Sensei_WC and renamed from sensei_woocommerce_email_course_details to email_course_details
-     *
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public static function email_course_details(  $order ){
+			// Loop and add the user to the course.
+			foreach ( $courses as $course_item ){
 
-        global $woocommerce;
+				Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
 
-        // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
+			} // End For Loop
 
-        $order_items = $order->get_items();
-        $order_id = $order->id;
+		} // End For Loop
 
-        //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+	} // End activate_subscription()
 
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
-            $order_contains_courses = false;
+	/**
+	 * Adds detail to to the WooCommerce order
+	 *
+	 * @since   1.4.5
+	 * @since 1.9.0 function moved to class Sensei_WC and renamed from sensei_woocommerce_email_course_details to email_course_details
+	 *
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public static function email_course_details(  $order ){
 
+		global $woocommerce;
 
-            foreach ( $order_items as $item ) {
+		// exit early if not wc-completed or wc-processing
+		if( 'wc-completed' != $order->post_status
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
 
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    // If item has variation_id then its from variation
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    // If not its real product set its id to item_id
-                    $item_id = $item['product_id'];
-                } // End If Statement
+		$order_items = $order->get_items();
+		$order_id = $order->id;
 
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
+		//If object have items go through them all to find course
+		if ( 0 < sizeof( $order_items ) ) {
 
-                if( $user_id ) {
+			$course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+			$order_contains_courses = false;
 
-                    // Get all courses for product
-                    $args = array(
-                        'posts_per_page' => -1,
-                        'post_type' => 'course',
-                        'meta_query' => array(
-                            array(
-                                'key' => '_course_woocommerce_product',
-                                'value' => $item_id
-                            )
-                        ),
-                        'orderby' => 'menu_order date',
-                        'order' => 'ASC',
-                    );
-                    $courses = get_posts( $args );
 
-                    if( $courses && count( $courses ) > 0 ) {
+			foreach ( $order_items as $item ) {
 
-                        foreach( $courses as $course ) {
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					// If item has variation_id then its from variation
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					// If not its real product set its id to item_id
+					$item_id = $item['product_id'];
+				} // End If Statement
 
-                            $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
-                            $order_contains_courses = true;
-                            $course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
-                        }
+				$user_id = get_post_meta( $order_id, '_customer_user', true );
 
+				if( $user_id ) {
 
-                    } // end if has courses
+					// Get all courses for product
+					$args = array(
+						'posts_per_page' => -1,
+						'post_type' => 'course',
+						'meta_query' => array(
+							array(
+								'key' => '_course_woocommerce_product',
+								'value' => $item_id
+							)
+						),
+						'orderby' => 'menu_order date',
+						'order' => 'ASC',
+					);
+					$courses = get_posts( $args );
 
-                } // end if $userPid
+					if( $courses && count( $courses ) > 0 ) {
 
-            } // end for each order item
+						foreach( $courses as $course ) {
 
-            // Output Course details
-            if( $order_contains_courses ){
+							$title = $course->post_title;
+							$permalink = get_permalink( $course->ID );
+							$order_contains_courses = true;
+							$course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+						}
 
-                echo $course_details_html;
 
-            }
+					} // end if has courses
 
+				} // end if $userPid
 
-        } // end if  order items not empty
+			} // end for each order item
 
-    }// end email_course_details
+			// Output Course details
+			if( $order_contains_courses ){
 
-    /**
-     * sensei_woocommerce_complete_order description
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     * @return  void
-     */
-    public static function complete_order ( $order_id = 0 ) {
+				echo $course_details_html;
 
-        $order_user = array();
+			}
 
-        // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
-            // Get order object
-            $order = new WC_Order( $order_id );
 
-	        if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) {
+		} // end if  order items not empty
 
-		        return;
+	}// end email_course_details
 
-	        }
+	/**
+	 * sensei_woocommerce_complete_order description
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 * @return  void
+	 */
+	public static function complete_order ( $order_id = 0 ) {
+
+		$order_user = array();
 
-            $user = get_user_by( 'id', $order->get_user_id() );
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
+		// Check for WooCommerce
+		if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+			// Get order object
+			$order = new WC_Order( $order_id );
 
-                foreach( $order->get_items() as $item ) {
+			if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) {
 
-                    $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+				return;
+
+			}
 
-                        $item_id = $item['variation_id'];
-                        $product_type = 'variation';
+			$user = get_user_by( 'id', $order->get_user_id() );
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if ( 0 < sizeof( $order->get_items() ) ) {
 
-                    } else {
+				foreach( $order->get_items() as $item ) {
 
-                        $item_id = $item['product_id'];
+					$product_type = '';
+					if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                    } // End If Statement
+						$item_id = $item['variation_id'];
+						$product_type = 'variation';
 
-                    $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+					} else {
 
-                    // Get courses that use the WC product
-                    $courses = Sensei()->course->get_product_courses( $_product->id );
+						$item_id = $item['product_id'];
 
-                    // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
+					} // End If Statement
 
-                        $update_course = self::course_update( $course_item->ID, $order_user );
+					$_product = Sensei_WC::get_product_object( $item_id, $product_type );
 
-                    } // End For Loop
+					// Get courses that use the WC product
+					$courses = Sensei()->course->get_product_courses( $_product->id );
 
-                } // End For Loop
+					// Loop and update those courses
+					foreach ( $courses as $course_item ) {
 
-            } // End If Statement
-            // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+						$update_course = self::course_update( $course_item->ID, $order_user );
 
-        } // End If Statement
+					} // End For Loop
 
-    } // End sensei_woocommerce_complete_order()
+				} // End For Loop
 
-    /**
-     * Responds to when an order is cancelled.
-     *
-     * @since   1.2.0
-     * @since   1.9.0 Move function to the Sensei_WC class
-     * @param   integer| WC_Order $order_id order ID
-     * @return  void
-     */
-    public static function cancel_order ( $order_id ) {
+			} // End If Statement
+			// Add meta to indicate that payment has been completed successfully
+			update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+
+		} // End If Statement
+
+	} // End sensei_woocommerce_complete_order()
+
+	/**
+	 * Responds to when an order is cancelled.
+	 *
+	 * @since   1.2.0
+	 * @since   1.9.0 Move function to the Sensei_WC class
+	 * @param   integer| WC_Order $order_id order ID
+	 * @return  void
+	 */
+	public static function cancel_order ( $order_id ) {
 
 		// Get order object
 		if( is_object( $order_id ) ){
@@ -1232,345 +1232,345 @@ 
 
 		}
 
-        // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+		// Run through each product ordered
+		if ( 0 < sizeof( $order->get_items() ) ) {
 
-            // Get order user
-            $user_id = $order->__get( 'user_id' );
+			// Get order user
+			$user_id = $order->__get( 'user_id' );
 
-            foreach( $order->get_items() as $item ) {
+			foreach( $order->get_items() as $item ) {
 
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
 
-                } else {
+				} else {
 
-                    $item_id = $item['product_id'];
+					$item_id = $item['product_id'];
 
-                } // End If Statement
+				} // End If Statement
 
-                $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+				$_product = Sensei_WC::get_product_object( $item_id, $product_type );
 
-                // Get courses that use the WC product
-                $courses = array();
-                $courses = Sensei()->course->get_product_courses( $item_id );
+				// Get courses that use the WC product
+				$courses = array();
+				$courses = Sensei()->course->get_product_courses( $item_id );
 
-                // Loop and update those courses
-                foreach ($courses as $course_item){
+				// Loop and update those courses
+				foreach ($courses as $course_item){
 
-	                if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){
-		                continue;
-	                }
-                    // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+					if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){
+						continue;
+					}
+					// Check and Remove course from courses user meta
+					$dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
 
-                } // End For Loop
+				} // End For Loop
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-    } // End sensei_woocommerce_cancel_order()
+	} // End sensei_woocommerce_cancel_order()
 
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @since   1.1.1
-     * @access  public
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     * @return   WC_Product $wc_product_object
-     */
-    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @since   1.1.1
+	 * @access  public
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 * @return   WC_Product $wc_product_object
+	 */
+	public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
 
-        $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+		$wc_product_object = false;
+		if ( 0 < intval( $wc_product_id ) ) {
 
-            // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
+			// Get the product
+			if ( function_exists( 'wc_get_product' ) ) {
 
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+				$wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
 
-            } elseif ( function_exists( 'get_product' ) ) {
+			} elseif ( function_exists( 'get_product' ) ) {
 
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+				$wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
 
-            } else {
+			} else {
 
-                // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+				// Pre WC 2.0
+				if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
 
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
+					$wc_product_object = new WC_Product_Variation( $wc_product_id );
 
-                } else {
+				} else {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+					$wc_product_object = new WC_Product( $wc_product_id );
 
-                } // End If Statement
+				} // End If Statement
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
+		} // End If Statement
 
-        return $wc_product_object;
+		return $wc_product_object;
 
-    } // End sensei_get_woocommerce_product_object()
+	} // End sensei_get_woocommerce_product_object()
 
-    /**
-     * If customer has purchased the course, update Sensei to indicate that they are taking the course.
-     *
-     * @since  1.0.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param  int 			$course_id  (default: 0)
-     * @param  array/Object $order_user (default: array()) Specific user's data.
-     *
-     * @return bool|int
-     */
-    public static function course_update ( $course_id = 0, $order_user = array()  ) {
+	/**
+	 * If customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 *
+	 * @since  1.0.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param  int 			$course_id  (default: 0)
+	 * @param  array/Object $order_user (default: array()) Specific user's data.
+	 *
+	 * @return bool|int
+	 */
+	public static function course_update ( $course_id = 0, $order_user = array()  ) {
 
-        global $current_user;
+		global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+		if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
 
-        $data_update = false;
+		$data_update = false;
 
-        // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+		// Get the product ID
+		$wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
 
-        // Check if in the admin
-        if ( is_admin() ) {
+		// Check if in the admin
+		if ( is_admin() ) {
 
-            $user_login = $order_user['user_login'];
-            $user_email = $order_user['user_email'];
-            $user_url = $order_user['user_url'];
-            $user_id = $order_user['ID'];
+			$user_login = $order_user['user_login'];
+			$user_email = $order_user['user_email'];
+			$user_url = $order_user['user_url'];
+			$user_id = $order_user['ID'];
 
-        } else {
+		} else {
 
-            $user_login = $current_user->user_login;
-            $user_email = $current_user->user_email;
-            $user_url = $current_user->user_url;
-            $user_id = $current_user->ID;
+			$user_login = $current_user->user_login;
+			$user_email = $current_user->user_email;
+			$user_url = $current_user->user_url;
+			$user_id = $current_user->ID;
 
-        } // End If Statement
+		} // End If Statement
 
-        // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
+		// This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
+		$course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
+		if( 0 < absint( $course_prerequisite_id ) ) {
 
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
+			$prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
+			if ( ! $prereq_course_complete ) {
 
-                // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+				// Remove all course user meta
+				return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
 
-            }
-        }
+			}
+		}
 
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+		$is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
 
-        if ( ! $is_user_taking_course
-            && Sensei_WC::is_woocommerce_active()
-            && 0 < $wc_post_id
-            && Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) {
+		if ( ! $is_user_taking_course
+			&& Sensei_WC::is_woocommerce_active()
+			&& 0 < $wc_post_id
+			&& Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) {
 
-	            $activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) );
+				$activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) );
 
-	            if ( true == $activity_logged ) {
+				if ( true == $activity_logged ) {
 
-		            $is_user_taking_course = true;
+					$is_user_taking_course = true;
 
-	            } // End If Statement
+				} // End If Statement
 
-        }// end if is user taking course
+		}// end if is user taking course
 
-        return $is_user_taking_course;
+		return $is_user_taking_course;
 
-    } // End course_update()
+	} // End course_update()
 
-    /**
-     * Disable guest checkout if a course product is in the cart
-     *
-     * @since 1.1.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param  boolean $guest_checkout Current guest checkout setting
-     *
-     * @return boolean                 Modified guest checkout setting
-     */
-    public static function disable_guest_checkout( $guest_checkout ) {
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 *
+	 * @since 1.1.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 *
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public static function disable_guest_checkout( $guest_checkout ) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
 
-            if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
+			if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
 
-                foreach( WC()->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
+				foreach( WC()->cart->cart_contents as $cart_key => $product ) {
+					if( isset( $product['product_id'] ) ) {
 
-                        $args = array(
-                            'posts_per_page' => -1,
-                            'post_type' => 'course',
-                            'meta_query' => array(
-                                array(
-                                    'key' => '_course_woocommerce_product',
-                                    'value' => $product['product_id']
-                                )
-                            )
-                        );
+						$args = array(
+							'posts_per_page' => -1,
+							'post_type' => 'course',
+							'meta_query' => array(
+								array(
+									'key' => '_course_woocommerce_product',
+									'value' => $product['product_id']
+								)
+							)
+						);
 
-                        $posts = get_posts( $args );
+						$posts = get_posts( $args );
 
-                        if( $posts && count( $posts ) > 0 ) {
+						if( $posts && count( $posts ) > 0 ) {
 
-                            foreach( $posts as $course ) {
-                                $guest_checkout = '';
-                                break;
+							foreach( $posts as $course ) {
+								$guest_checkout = '';
+								break;
 
-                            }
-                        }
+							}
+						}
 
-                    }
+					}
 
-                }
+				}
 
-            }
-        }
+			}
+		}
 
-        return $guest_checkout;
+		return $guest_checkout;
 
-    }// end disable_guest_checkout
+	}// end disable_guest_checkout
 
-    /**
-     * Change order status with virtual products to completed
-     *
-     * @since  1.1.0
-     * @since 1.9.0 move to class Sensei_WC
-     *
-     * @param string $order_status
-     * @param int $order_id
-     *
-     * @return string
-     **/
-    public static function virtual_order_payment_complete( $order_status, $order_id ) {
+	/**
+	 * Change order status with virtual products to completed
+	 *
+	 * @since  1.1.0
+	 * @since 1.9.0 move to class Sensei_WC
+	 *
+	 * @param string $order_status
+	 * @param int $order_id
+	 *
+	 * @return string
+	 **/
+	public static function virtual_order_payment_complete( $order_status, $order_id ) {
 
-        $order = new WC_Order( $order_id );
+		$order = new WC_Order( $order_id );
 
-        if ( ! isset ( $order ) ) return '';
+		if ( ! isset ( $order ) ) return '';
 
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+		if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
 
-            $virtual_order = true;
+			$virtual_order = true;
 
-            if ( count( $order->get_items() ) > 0 ) {
+			if ( count( $order->get_items() ) > 0 ) {
 
-                foreach( $order->get_items() as $item ) {
+				foreach( $order->get_items() as $item ) {
 
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
+					if ( $item['product_id'] > 0 ) {
+						$_product = $order->get_product_from_item( $item );
+						if ( ! $_product->is_virtual() ) {
 
-                            $virtual_order = false;
-                            break;
+							$virtual_order = false;
+							break;
 
-                        } // End If Statement
+						} // End If Statement
 
-                    } // End If Statement
+					} // End If Statement
 
-                } // End For Loop
+				} // End For Loop
 
-            } // End If Statement
+			} // End If Statement
 
-            // virtual order, mark as completed
-            if ( $virtual_order ) {
+			// virtual order, mark as completed
+			if ( $virtual_order ) {
 
-                return 'completed';
+				return 'completed';
 
-            } // End If Statement
+			} // End If Statement
 
-        } // End If Statement
+		} // End If Statement
 
-        return $order_status;
+		return $order_status;
 
-    }// end virtual_order_payment_complete
+	}// end virtual_order_payment_complete
 
 
-    /**
-     * Determine if the user has and active subscription to give them access
-     * to the requested resource.
-     *
-     * @since 1.9.0
-     *
-     * @param  boolean$user_access_permission
-     * @param  integer $user_id
-     * @return boolean $user_access_permission
-     */
-    public static function get_subscription_permission( $user_access_permission , $user_id ){
+	/**
+	 * Determine if the user has and active subscription to give them access
+	 * to the requested resource.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param  boolean$user_access_permission
+	 * @param  integer $user_id
+	 * @return boolean $user_access_permission
+	 */
+	public static function get_subscription_permission( $user_access_permission , $user_id ){
 
-        global $post;
+		global $post;
 
-        // ignore the current case if the following conditions are met
-        if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
-            || ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
-            || ! wcs_user_has_subscription( $user_id) ){
+		// ignore the current case if the following conditions are met
+		if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
+			|| ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
+			|| ! wcs_user_has_subscription( $user_id) ){
 
-            return $user_access_permission;
+			return $user_access_permission;
 
-        }
+		}
 
-        // at this user has a subscription
-        // is the subscription on the the current course?
+		// at this user has a subscription
+		// is the subscription on the the current course?
 
-        $course_id = 0;
-        if ( 'course' == $post->post_type ){
+		$course_id = 0;
+		if ( 'course' == $post->post_type ){
 
-            $course_id = $post->ID;
+			$course_id = $post->ID;
 
-        } elseif ( 'lesson' == $post->post_type ) {
+		} elseif ( 'lesson' == $post->post_type ) {
 
-            $course_id = Sensei()->lesson->get_course_id( $post->ID );
+			$course_id = Sensei()->lesson->get_course_id( $post->ID );
 
-        } else {
+		} else {
 
-            $lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+			$lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
+			$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        }
+		}
 
-        // if the course has no subscription WooCommerce product attached to return the permissions as is
-        $product_id = Sensei_WC::get_course_product_id( $course_id );
-        $product = wc_get_product( $product_id );
-        if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
+		// if the course has no subscription WooCommerce product attached to return the permissions as is
+		$product_id = Sensei_WC::get_course_product_id( $course_id );
+		$product = wc_get_product( $product_id );
+		if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
 
-            return $user_access_permission;
+			return $user_access_permission;
 
-        }
+		}
 
-        // give access if user has active subscription on the product otherwise restrict it.
-        // also check if the user was added to the course directly after the subscription started.
-        if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-            || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-            || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
+		// give access if user has active subscription on the product otherwise restrict it.
+		// also check if the user was added to the course directly after the subscription started.
+		if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
+			|| wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
+			|| self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
 
-            $user_access_permission = true;
+			$user_access_permission = true;
 
-        }else{
+		}else{
 
-            $user_access_permission = false;
-            // do not show the WC permissions message
-            remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
-            Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
-            Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
-        }
+			$user_access_permission = false;
+			// do not show the WC permissions message
+			remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
+			Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
+			Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
+		}
 
-        return $user_access_permission;
+		return $user_access_permission;
 
-    } // end get_subscription_permission
+	} // end get_subscription_permission
 
 	/**
 	 * @since 1.9.0
@@ -1619,8 +1619,8 @@ 
 			// give access if user has active subscription on the product otherwise restrict it.
 			// also check if the user was added to the course directly after the subscription started.
 			if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-			    || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-			    || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  )  ){
+				|| wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
+				|| self::was_user_added_without_subscription( $user_id, $product_id, $course_id  )  ){
 
 				$has_user_started_course = true;
 
@@ -1635,91 +1635,91 @@ 
 
 	}
 
-    /**
-     * Get all the valid subscription types.
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_subscription_types(){
+	/**
+	 * Get all the valid subscription types.
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_subscription_types(){
 
-        return array( 'subscription','subscription_variation','variable-subscription' );
+		return array( 'subscription','subscription_variation','variable-subscription' );
 
-    }
+	}
 
-    /**
-     * Compare the user's subscriptions end date with the date
-     * the user was added to the course. If the user was added after
-     * the subscription ended they were manually added and this will return
-     * true.
-     *
-     * Important to note that all subscriptions for the user is compared.
-     *
-     * @since 1.9.0
-     *
-     * @param $user_id
-     * @param $product_id
-     * @param $course_id
-     *
-     * @return bool
-     */
-    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
+	/**
+	 * Compare the user's subscriptions end date with the date
+	 * the user was added to the course. If the user was added after
+	 * the subscription ended they were manually added and this will return
+	 * true.
+	 *
+	 * Important to note that all subscriptions for the user is compared.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $user_id
+	 * @param $product_id
+	 * @param $course_id
+	 *
+	 * @return bool
+	 */
+	public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
 
-        $course_start_date = '';
-        $subscription_start_date = '';
-        $is_a_subscription ='';
-        $was_user_added_without_subscription = false;
+		$course_start_date = '';
+		$subscription_start_date = '';
+		$is_a_subscription ='';
+		$was_user_added_without_subscription = false;
 
-        // if user is not on the course they were not added
-	    remove_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
-        if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+		// if user is not on the course they were not added
+		remove_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
+		if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        // if user doesn't have a subscription and is taking the course
-        // they were added manually
-        if ( ! wcs_user_has_subscription($user_id, $product_id)
-            && Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
+		// if user doesn't have a subscription and is taking the course
+		// they were added manually
+		if ( ! wcs_user_has_subscription($user_id, $product_id)
+			&& Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
 
-            return true;
+			return true;
 
-        }
+		}
 
-	    add_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
+		add_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
 
-        $course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
+		$course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
 
-        // comparing dates setup data
-        $course_start_date = date_create( $course_status->comment_date );
-        $subscriptions = wcs_get_users_subscriptions( $user_id );
+		// comparing dates setup data
+		$course_start_date = date_create( $course_status->comment_date );
+		$subscriptions = wcs_get_users_subscriptions( $user_id );
 
-        // comparing every subscription
-        foreach( $subscriptions as $subscription ){
+		// comparing every subscription
+		foreach( $subscriptions as $subscription ){
 
-            // for the following statuses we know the user was not added
-            // manually
-            $status = $subscription->get_status();
-            if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
+			// for the following statuses we know the user was not added
+			// manually
+			$status = $subscription->get_status();
+			if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
 
-                continue;
+				continue;
 
-            }
+			}
 
-            $current_subscription_start_date = date_create( $subscription->modified_date );
+			$current_subscription_start_date = date_create( $subscription->modified_date );
 
-            // is the last updated subscription date newer than course start date
-            if (  $current_subscription_start_date > $course_start_date   ) {
+			// is the last updated subscription date newer than course start date
+			if (  $current_subscription_start_date > $course_start_date   ) {
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
-        return $was_user_added_without_subscription;
-    }
+		return $was_user_added_without_subscription;
+	}
 
 	/**
 	 * Get all the orders for a specific user and product combination

Spacing +321 added lines, -321 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,17 +11,17 @@ 
  * @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() {
 
-	    $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php';
-        require_once( $woocommerce_hooks_file_path );
+	    $woocommerce_hooks_file_path = Sensei()->plugin_path().'includes/hooks/woocommerce.php';
+        require_once($woocommerce_hooks_file_path);
 
     }
     /**
@@ -30,9 +30,9 @@ 
      * @since 1.9.0
      * @return bool
      */
-    public static function is_woocommerce_active(){
+    public static function is_woocommerce_active() {
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+        $is_woocommerce_enabled_in_settings = isset(Sensei()->settings->settings['woocommerce_enabled']) && Sensei()->settings->settings['woocommerce_enabled'];
         return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
     } // end is_woocommerce_active
@@ -47,19 +47,19 @@ 
      *
      * @return bool
      */
-    public static function is_woocommerce_present(){
+    public static function is_woocommerce_present() {
 
-        $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()));
 
         }
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+        $is_woocommerce_plugin_present_and_activated = in_array('woocommerce/woocommerce.php', $active_plugins) || array_key_exists('woocommerce/woocommerce.php', $active_plugins);
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+        return class_exists('Woocommerce') || $is_woocommerce_plugin_present_and_activated;
 
     }// end is_woocommerce_present
 
@@ -72,48 +72,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 ( is_object( $product ) && $product->is_type( 'variable' )) {
+                if (is_object($product) && $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;
 
@@ -137,12 +137,12 @@ 
      * @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) {
 
         $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;
@@ -150,15 +150,15 @@ 
         }
 
         $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
+            'id'=>'paid',
+            'url'=> add_query_arg(array('course_filter'=>'paid'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Paid', 'woothemes-sensei')
         );
 
         $filter_links[] = array(
             'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
+            'url'=> add_query_arg(array('course_filter'=>'free'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Free', 'woothemes-sensei')
         );
 
         return $filter_links;
@@ -175,24 +175,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
 
@@ -211,16 +211,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);
 
         }
 
@@ -233,14 +233,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 ( Sensei_WC::is_woocommerce_active() ) {
+        if (Sensei_WC::is_woocommerce_active()) {
 
-            do_action( 'woocommerce_before_single_product' );
+            do_action('woocommerce_before_single_product');
 
         } // End If Statement
 
@@ -261,12 +261,12 @@ 
      * @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) {
 
 	    // do not override access to admins
-	    $course_id = Sensei()->lesson->get_course_id( $lesson_id );
-	    if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id )
-	         || Sensei_Utils::user_started_course( $course_id, $user_id )  ){
+	    $course_id = Sensei()->lesson->get_course_id($lesson_id);
+	    if (sensei_all_access() || Sensei_Utils::is_preview_lesson($lesson_id)
+	         || Sensei_Utils::user_started_course($course_id, $user_id)) {
 
 			return true;
 
@@ -275,18 +275,18 @@ 
         // 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;
 
@@ -309,23 +309,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'];
@@ -337,28 +337,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
 
@@ -369,24 +369,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
@@ -399,20 +399,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>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+                echo sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link);
 
                 ?>
             </div>
@@ -426,14 +426,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 = 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 = 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;
 
@@ -451,20 +451,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;
 
@@ -486,9 +486,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',
@@ -513,7 +513,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',
@@ -537,7 +537,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();
 
@@ -546,7 +546,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',
             ),
         );
@@ -560,7 +560,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',
@@ -570,9 +570,9 @@ 
                    'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
+        $args['fields']     = 'ids';
 
-        $args[ 'meta_query' ] = array(
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -599,7 +599,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',
@@ -609,8 +609,8 @@ 
             'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
+        $args['fields']     = 'ids';
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -636,24 +636,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;
@@ -673,24 +673,24 @@ 
      * @param array $args
      * @return array
      */
-    public static function get_free_courses( $args = array() ){
+    public static function get_free_courses($args = array()) {
 
         $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();
 
-	    if( !empty( $args ) ){
-		    wp_parse_args( $args, $free_course_query_args  );
+	    if ( ! empty($args)) {
+		    wp_parse_args($args, $free_course_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);
 
     }
 
@@ -702,17 +702,17 @@ 
      *
      * @return array
      */
-    public static function get_paid_courses( $args = array() ){
+    public static function get_paid_courses($args = array()) {
 
         $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();
 
-	    if( !empty( $args ) ){
-		    wp_parse_args( $args, $paid_course_query_args  );
+	    if ( ! empty($args)) {
+		    wp_parse_args($args, $paid_course_query_args);
 	    }
 
-        return get_posts(  $paid_course_query_args );
+        return get_posts($paid_course_query_args);
     }
 
     /**
@@ -727,17 +727,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 ) || self::is_course_in_cart( $course_id ) ) {
+        if ( ! Sensei_Course::is_prerequisite_complete($course_id) || self::is_course_in_cart($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 '';
 
@@ -745,15 +745,15 @@ 
 
         // based on simple.php in WC templates/single-product/add-to-cart/
         // Get the product
-        $product = self::get_product_object( $wc_post_id );
+        $product = self::get_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 '';
 
@@ -764,23 +764,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 } ?>
 
@@ -789,7 +789,7 @@ 
             <?php } ?>
 
             <button type="submit" class="single_add_to_cart_button button alt">
-                <?php $button_text = $product->get_price_html() . ' - ' . __( 'Purchase this Course', 'woothemes-sensei' ); ?>
+                <?php $button_text = $product->get_price_html().' - '.__('Purchase this Course', 'woothemes-sensei'); ?>
                 <?php
                 /**
                  * Filter Add to Cart button text
@@ -798,7 +798,7 @@ 
                  *
                  * @param string $button_text
                  */
-                echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text );
+                echo apply_filters('sensei_wc_single_add_to_cart_button_text', $button_text);
                 ?>
             </button>
 
@@ -818,26 +818,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;
 
     }
     /**
@@ -846,18 +846,18 @@ 
      *
      * @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>';
-	    $wc_product_id =  self::get_course_product_id( $course_id );
+        $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>';
+	    $wc_product_id = self::get_course_product_id($course_id);
 
-	    if ( self::is_product_in_cart( $wc_product_id ) ) {
+	    if (self::is_product_in_cart($wc_product_id)) {
 
-		    $cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
+		    $cart_link = '<a href="'.wc_get_checkout_url().'" title="'.__('Checkout', 'woocommerce').'">'.__('checkout', 'woocommerce').'</a>';
 
-		    $message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
+		    $message = sprintf(__('This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei'), $cart_link);
 		    ?>
 		    <span class="add-to-cart-login">
 		            <?php echo $message; ?>
@@ -865,7 +865,7 @@ 
 
 		    <?php
 
-	    } elseif ( is_user_logged_in() ) {
+	    } elseif (is_user_logged_in()) {
 
 		    ?>
 		    <style>
@@ -877,7 +877,7 @@ 
 		    <?php
 
 	    } else {
-		    $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link );
+		    $message = sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link);
 	        ?>
 		        <span class="add-to-cart-login">
 		            <?php echo $message; ?>
@@ -897,34 +897,34 @@ 
      *
      * @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 = self::get_user_product_orders( $user_id, $product_id );
+        $orders = self::get_user_product_orders($user_id, $product_id);
 
-        foreach ( $orders as $order_id ) {
+        foreach ($orders as $order_id) {
 
-            $order = new WC_Order( $order_id->ID );
+            $order = new WC_Order($order_id->ID);
 
             // wc-active is the subscriptions complete status
-            if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) )
-                || ! ( 0 < sizeof( $order->get_items() ) )  ){
+            if ( ! in_array($order->post_status, array('wc-processing', 'wc-completed'))
+                || ! (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 = wcs_get_subscription( $order );
-                        if( $sub_key ) {
-                            $sub = wcs_get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
+                    if (class_exists('WC_Subscriptions_Manager')) {
+                        $sub_key = wcs_get_subscription($order);
+                        if ($sub_key) {
+                            $sub = wcs_get_subscription($sub_key);
+                            if ($sub && isset($sub['status'])) {
+                                if ('active' == $sub['status']) {
                                     return true;
                                 } else {
                                     return false;
@@ -956,11 +956,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;
         }
 
@@ -976,11 +976,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 ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){
+        if ( ! in_array('woocommerce', $classes) && defined('SENSEI_NO_PERMISSION') && SENSEI_NO_PERMISSION) {
 
-            $classes[] ='woocommerce';
+            $classes[] = 'woocommerce';
 
         }
 
@@ -998,7 +998,7 @@ 
      *
      * @return  void
      */
-    public static function activate_subscription(  $order ) {
+    public static function activate_subscription($order) {
 
         $order_user = get_user_by('id', $order->user_id);
         $user['ID'] = $order_user->ID;
@@ -1007,13 +1007,13 @@ 
         $user['user_url'] = $order_user->user_url;
 
         // Run through each product ordered
-        if ( ! sizeof($order->get_items() )>0 ) {
+        if ( ! sizeof($order->get_items()) > 0) {
 
             return;
 
         }
 
-        foreach($order->get_items() as $item) {
+        foreach ($order->get_items() as $item) {
 
             $product_type = '';
 
@@ -1028,21 +1028,21 @@ 
 
             } // End If Statement
 
-            $_product = self::get_product_object( $item_id, $product_type );
+            $_product = self::get_product_object($item_id, $product_type);
 
             // Get courses that use the WC product
             $courses = array();
 
-            if ( ! in_array( $product_type, self::get_subscription_types() ) ) {
+            if ( ! in_array($product_type, self::get_subscription_types())) {
 
-                $courses = Sensei()->course->get_product_courses( $item_id );
+                $courses = Sensei()->course->get_product_courses($item_id);
 
             } // End If Statement
 
             // Loop and add the user to the course.
-            foreach ( $courses as $course_item ){
+            foreach ($courses as $course_item) {
 
-                Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID  );
+                Sensei_Utils::user_start_course(intval($user['ID']), $course_item->ID);
 
             } // End For Loop
 
@@ -1060,13 +1060,13 @@ 
      *
      * @return  void
      */
-    public static function email_course_details(  $order ){
+    public static function email_course_details($order) {
 
         global $woocommerce;
 
         // 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;
         }
 
@@ -1074,16 +1074,16 @@ 
         $order_id = $order->id;
 
         //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+        if (0 < sizeof($order_items)) {
 
-            $course_details_html =  '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+            $course_details_html = '<h2>'.__('Course details', 'woothemes-sensei').'</h2>';
             $order_contains_courses = false;
 
 
-            foreach ( $order_items as $item ) {
+            foreach ($order_items as $item) {
 
                 $product_type = '';
-                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 from variation
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1092,9 +1092,9 @@ 
                     $item_id = $item['product_id'];
                 } // 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 = array(
@@ -1109,16 +1109,16 @@ 
                         'orderby' => 'menu_order date',
                         'order' => 'ASC',
                     );
-                    $courses = get_posts( $args );
+                    $courses = get_posts($args);
 
-                    if( $courses && count( $courses ) > 0 ) {
+                    if ($courses && count($courses) > 0) {
 
-                        foreach( $courses as $course ) {
+                        foreach ($courses as $course) {
 
                             $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
+                            $permalink = get_permalink($course->ID);
                             $order_contains_courses = true;
-                            $course_details_html .=  '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+                            $course_details_html .= '<p><strong>'.sprintf(__('View course: %1$s', 'woothemes-sensei'), '</strong><a href="'.esc_url($permalink).'">'.$title.'</a>').'</p>';
                         }
 
 
@@ -1129,7 +1129,7 @@ 
             } // end for each order item
 
             // Output Course details
-            if( $order_contains_courses ){
+            if ($order_contains_courses) {
 
                 echo $course_details_html;
 
@@ -1147,33 +1147,33 @@ 
      * @param   int $order_id WC order ID
      * @return  void
      */
-    public static function complete_order ( $order_id = 0 ) {
+    public static function complete_order($order_id = 0) {
 
         $order_user = array();
 
         // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+        if (Sensei_WC::is_woocommerce_active() && (0 < $order_id)) {
             // Get order object
-            $order = new WC_Order( $order_id );
+            $order = new WC_Order($order_id);
 
-	        if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) {
+	        if ( ! in_array($order->get_status(), array('complete', 'processing'))) {
 
 		        return;
 
 	        }
 
-            $user = get_user_by( 'id', $order->get_user_id() );
+            $user = get_user_by('id', $order->get_user_id());
             $order_user['ID'] = $user->ID;
             $order_user['user_login'] = $user->user_login;
             $order_user['user_email'] = $user->user_email;
             $order_user['user_url'] = $user->user_url;
             // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
+            if (0 < sizeof($order->get_items())) {
 
-                foreach( $order->get_items() as $item ) {
+                foreach ($order->get_items() as $item) {
 
                     $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                    if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                         $item_id = $item['variation_id'];
                         $product_type = 'variation';
@@ -1184,15 +1184,15 @@ 
 
                     } // End If Statement
 
-                    $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+                    $_product = Sensei_WC::get_product_object($item_id, $product_type);
 
                     // Get courses that use the WC product
-                    $courses = Sensei()->course->get_product_courses( $_product->id );
+                    $courses = Sensei()->course->get_product_courses($_product->id);
 
                     // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
+                    foreach ($courses as $course_item) {
 
-                        $update_course = self::course_update( $course_item->ID, $order_user );
+                        $update_course = self::course_update($course_item->ID, $order_user);
 
                     } // End For Loop
 
@@ -1200,7 +1200,7 @@ 
 
             } // End If Statement
             // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+            update_post_meta($order_id, 'sensei_payment_complete', '1');
 
         } // End If Statement
 
@@ -1214,34 +1214,34 @@ 
      * @param   integer| WC_Order $order_id order ID
      * @return  void
      */
-    public static function cancel_order ( $order_id ) {
+    public static function cancel_order($order_id) {
 
 		// Get order object
-		if( is_object( $order_id ) ){
+		if (is_object($order_id)) {
 
 			$order = $order_id;
 
-		}else{
+		} else {
 
-			$order = new WC_Order( $order_id );
+			$order = new WC_Order($order_id);
 		}
 
-		if ( ! in_array( $order->get_status(), array( 'cancelled', 'refunded' ) ) ) {
+		if ( ! in_array($order->get_status(), array('cancelled', 'refunded'))) {
 
 			return;
 
 		}
 
         // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+        if (0 < sizeof($order->get_items())) {
 
             // Get order user
-            $user_id = $order->__get( 'user_id' );
+            $user_id = $order->__get('user_id');
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1252,20 +1252,20 @@ 
 
                 } // End If Statement
 
-                $_product = Sensei_WC::get_product_object( $item_id, $product_type );
+                $_product = Sensei_WC::get_product_object($item_id, $product_type);
 
                 // Get courses that use the WC product
                 $courses = array();
-                $courses = Sensei()->course->get_product_courses( $item_id );
+                $courses = Sensei()->course->get_product_courses($item_id);
 
                 // Loop and update those courses
-                foreach ($courses as $course_item){
+                foreach ($courses as $course_item) {
 
-	                if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){
+	                if (self::has_customer_bought_product($user_id, $course_item->ID)) {
 		                continue;
 	                }
                     // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course($course_item->ID, $user_id);
 
                 } // End For Loop
 
@@ -1286,30 +1286,30 @@ 
      * @param   string  $product_type  '' or 'variation'
      * @return   WC_Product $wc_product_object
      */
-    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) {
+    public static function get_product_object($wc_product_id = 0, $product_type = '') {
 
         $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+        if (0 < intval($wc_product_id)) {
 
             // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
+            if (function_exists('wc_get_product')) {
 
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+                $wc_product_object = wc_get_product($wc_product_id); // Post WC 2.3
 
-            } elseif ( function_exists( 'get_product' ) ) {
+            } elseif (function_exists('get_product')) {
 
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+                $wc_product_object = get_product($wc_product_id); // Post WC 2.0
 
             } else {
 
                 // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+                if ('variation' == $product_type || 'subscription_variation' == $product_type) {
 
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
+                    $wc_product_object = new WC_Product_Variation($wc_product_id);
 
                 } else {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+                    $wc_product_object = new WC_Product($wc_product_id);
 
                 } // End If Statement
 
@@ -1332,19 +1332,19 @@ 
      *
      * @return bool|int
      */
-    public static function course_update ( $course_id = 0, $order_user = array()  ) {
+    public static function course_update($course_id = 0, $order_user = array()) {
 
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+        if ( ! isset($current_user) || ! $current_user->ID > 0) return false;
 
         $data_update = false;
 
         // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+        $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true);
 
         // Check if in the admin
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $user_login = $order_user['user_login'];
             $user_email = $order_user['user_email'];
@@ -1361,28 +1361,28 @@ 
         } // End If Statement
 
         // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
+        $course_prerequisite_id = (int) get_post_meta($course_id, '_course_prerequisite', true);
+        if (0 < absint($course_prerequisite_id)) {
 
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
+            $prereq_course_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, intval($user_id));
+            if ( ! $prereq_course_complete) {
 
                 // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+                return Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
 
             }
         }
 
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+        $is_user_taking_course = Sensei_Utils::user_started_course(intval($course_id), intval($user_id));
 
         if ( ! $is_user_taking_course
             && Sensei_WC::is_woocommerce_active()
             && 0 < $wc_post_id
-            && Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) {
+            && Sensei_WC::has_customer_bought_product($user_id, $wc_post_id)) {
 
-	            $activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) );
+	            $activity_logged = Sensei_Utils::user_start_course(intval($user_id), intval($course_id));
 
-	            if ( true == $activity_logged ) {
+	            if (true == $activity_logged) {
 
 		            $is_user_taking_course = true;
 
@@ -1404,14 +1404,14 @@ 
      *
      * @return boolean                 Modified guest checkout setting
      */
-    public static function disable_guest_checkout( $guest_checkout ) {
+    public static function disable_guest_checkout($guest_checkout) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
 
-            if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) {
+            if (isset(WC()->cart->cart_contents) && count(WC()->cart->cart_contents) > 0) {
 
-                foreach( WC()->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
+                foreach (WC()->cart->cart_contents as $cart_key => $product) {
+                    if (isset($product['product_id'])) {
 
                         $args = array(
                             'posts_per_page' => -1,
@@ -1424,11 +1424,11 @@ 
                             )
                         );
 
-                        $posts = get_posts( $args );
+                        $posts = get_posts($args);
 
-                        if( $posts && count( $posts ) > 0 ) {
+                        if ($posts && count($posts) > 0) {
 
-                            foreach( $posts as $course ) {
+                            foreach ($posts as $course) {
                                 $guest_checkout = '';
                                 break;
 
@@ -1457,23 +1457,23 @@ 
      *
      * @return string
      **/
-    public static function virtual_order_payment_complete( $order_status, $order_id ) {
+    public static function virtual_order_payment_complete($order_status, $order_id) {
 
-        $order = new WC_Order( $order_id );
+        $order = new WC_Order($order_id);
 
-        if ( ! isset ( $order ) ) return '';
+        if ( ! isset ($order)) return '';
 
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+        if ($order_status == 'wc-processing' && ($order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed')) {
 
             $virtual_order = true;
 
-            if ( count( $order->get_items() ) > 0 ) {
+            if (count($order->get_items()) > 0) {
 
-                foreach( $order->get_items() as $item ) {
+                foreach ($order->get_items() as $item) {
 
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
+                    if ($item['product_id'] > 0) {
+                        $_product = $order->get_product_from_item($item);
+                        if ( ! $_product->is_virtual()) {
 
                             $virtual_order = false;
                             break;
@@ -1487,7 +1487,7 @@ 
             } // End If Statement
 
             // virtual order, mark as completed
-            if ( $virtual_order ) {
+            if ($virtual_order) {
 
                 return 'completed';
 
@@ -1510,14 +1510,14 @@ 
      * @param  integer $user_id
      * @return boolean $user_access_permission
      */
-    public static function get_subscription_permission( $user_access_permission , $user_id ){
+    public static function get_subscription_permission($user_access_permission, $user_id) {
 
         global $post;
 
         // ignore the current case if the following conditions are met
-        if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id )
-            || ! in_array( $post->post_type, array( 'course','lesson','quiz' ) )
-            || ! wcs_user_has_subscription( $user_id) ){
+        if ( ! class_exists('WC_Subscriptions') || empty($user_id)
+            || ! in_array($post->post_type, array('course', 'lesson', 'quiz'))
+            || ! wcs_user_has_subscription($user_id)) {
 
             return $user_access_permission;
 
@@ -1527,25 +1527,25 @@ 
         // is the subscription on the the current course?
 
         $course_id = 0;
-        if ( 'course' == $post->post_type ){
+        if ('course' == $post->post_type) {
 
             $course_id = $post->ID;
 
-        } elseif ( 'lesson' == $post->post_type ) {
+        } elseif ('lesson' == $post->post_type) {
 
-            $course_id = Sensei()->lesson->get_course_id( $post->ID );
+            $course_id = Sensei()->lesson->get_course_id($post->ID);
 
         } else {
 
-            $lesson_id =  Sensei()->quiz->get_lesson_id( $post->ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+            $lesson_id = Sensei()->quiz->get_lesson_id($post->ID);
+            $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         }
 
         // if the course has no subscription WooCommerce product attached to return the permissions as is
-        $product_id = Sensei_WC::get_course_product_id( $course_id );
-        $product = wc_get_product( $product_id );
-        if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
+        $product_id = Sensei_WC::get_course_product_id($course_id);
+        $product = wc_get_product($product_id);
+        if ( ! in_array($product->get_type(), self::get_subscription_types())) {
 
             return $user_access_permission;
 
@@ -1553,19 +1553,19 @@ 
 
         // give access if user has active subscription on the product otherwise restrict it.
         // also check if the user was added to the course directly after the subscription started.
-        if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-            || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-            || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){
+        if (wcs_user_has_subscription($user_id, $product_id, 'active')
+            || wcs_user_has_subscription($user_id, $product_id, 'pending-cancel')
+            || self::was_user_added_without_subscription($user_id, $product_id, $course_id)) {
 
             $user_access_permission = true;
 
-        }else{
+        } else {
 
             $user_access_permission = false;
             // do not show the WC permissions message
-            remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 );
-            Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' );
-            Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' );
+            remove_filter('sensei_the_no_permissions_message', array('Sensei_WC', 'alter_no_permissions_message'), 20, 2);
+            Sensei()->permissions_message['title'] = __('No active subscription', 'woothemes-sensei');
+            Sensei()->permissions_message['message'] = __('Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei');
         }
 
         return $user_access_permission;
@@ -1581,9 +1581,9 @@ 
 	 *
 	 * @return bool $has_user_started_course
 	 */
-	public static function get_subscription_user_started_course( $has_user_started_course, $course_id, $user_id ){
+	public static function get_subscription_user_started_course($has_user_started_course, $course_id, $user_id) {
 
-		if ( ! is_user_logged_in( ) ) {
+		if ( ! is_user_logged_in( )) {
 
 			return $has_user_started_course;
 
@@ -1591,26 +1591,26 @@ 
 
 		// cached user course access for this process instance
 		global $sensei_wc_subscription_access_store;
-		if ( ! is_array( $sensei_wc_subscription_access_store ) ) {
+		if ( ! is_array($sensei_wc_subscription_access_store)) {
 			$sensei_wc_subscription_access_store = array();
 		}
 
 		// user temp cached data so we don't output the mesage again
-		$user_data_index_key = $course_id .'_' . $user_id;
-		if ( isset( $sensei_wc_subscription_access_store[ $user_data_index_key  ] ) ) {
+		$user_data_index_key = $course_id.'_'.$user_id;
+		if (isset($sensei_wc_subscription_access_store[$user_data_index_key])) {
 
-			return $sensei_wc_subscription_access_store[ $user_data_index_key ];
+			return $sensei_wc_subscription_access_store[$user_data_index_key];
 
 		} else {
 
-			if( empty( $course_id ) || empty( $user_id ) ){
+			if (empty($course_id) || empty($user_id)) {
 				return $has_user_started_course;
 			}
 
 			// if the course has no subscription WooCommerce product attached to return the permissions as is
-			$product_id = Sensei_WC::get_course_product_id( $course_id );
-			$product = wc_get_product( $product_id );
-			if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){
+			$product_id = Sensei_WC::get_course_product_id($course_id);
+			$product = wc_get_product($product_id);
+			if ( ! in_array($product->get_type(), self::get_subscription_types())) {
 
 				return $has_user_started_course;
 
@@ -1618,9 +1618,9 @@ 
 
 			// give access if user has active subscription on the product otherwise restrict it.
 			// also check if the user was added to the course directly after the subscription started.
-			if( wcs_user_has_subscription( $user_id, $product_id, 'active'  )
-			    || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel'  )
-			    || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  )  ){
+			if (wcs_user_has_subscription($user_id, $product_id, 'active')
+			    || wcs_user_has_subscription($user_id, $product_id, 'pending-cancel')
+			    || self::was_user_added_without_subscription($user_id, $product_id, $course_id)) {
 
 				$has_user_started_course = true;
 
@@ -1629,7 +1629,7 @@ 
 				$has_user_started_course = false;
 
 			}
-			$sensei_wc_subscription_access_store[ $user_data_index_key ] = $has_user_started_course;
+			$sensei_wc_subscription_access_store[$user_data_index_key] = $has_user_started_course;
 			return $has_user_started_course;
 		}
 
@@ -1641,9 +1641,9 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_subscription_types(){
+    public static function get_subscription_types() {
 
-        return array( 'subscription','subscription_variation','variable-subscription' );
+        return array('subscription', 'subscription_variation', 'variable-subscription');
 
     }
 
@@ -1663,16 +1663,16 @@ 
      *
      * @return bool
      */
-    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){
+    public static function was_user_added_without_subscription($user_id, $product_id, $course_id) {
 
         $course_start_date = '';
         $subscription_start_date = '';
-        $is_a_subscription ='';
+        $is_a_subscription = '';
         $was_user_added_without_subscription = false;
 
         // if user is not on the course they were not added
-	    remove_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
-        if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){
+	    remove_filter('sensei_user_started_course', array('Sensei_WC', 'get_subscription_user_started_course'), 10, 3);
+        if ( ! Sensei_Utils::user_started_course($course_id, $user_id)) {
 
             return false;
 
@@ -1681,36 +1681,36 @@ 
         // if user doesn't have a subscription and is taking the course
         // they were added manually
         if ( ! wcs_user_has_subscription($user_id, $product_id)
-            && Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){
+            && Sensei_Utils::user_started_course($course_id, get_current_user_id())) {
 
             return true;
 
         }
 
-	    add_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
+	    add_filter('sensei_user_started_course', array('Sensei_WC', 'get_subscription_user_started_course'), 10, 3);
 
-        $course_status =  Sensei_Utils::user_course_status( $course_id, $user_id );
+        $course_status = Sensei_Utils::user_course_status($course_id, $user_id);
 
         // comparing dates setup data
-        $course_start_date = date_create( $course_status->comment_date );
-        $subscriptions = wcs_get_users_subscriptions( $user_id );
+        $course_start_date = date_create($course_status->comment_date);
+        $subscriptions = wcs_get_users_subscriptions($user_id);
 
         // comparing every subscription
-        foreach( $subscriptions as $subscription ){
+        foreach ($subscriptions as $subscription) {
 
             // for the following statuses we know the user was not added
             // manually
             $status = $subscription->get_status();
-            if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) {
+            if (in_array($status, array('pending-canceled', 'active', 'on-hold', 'pending'))) {
 
                 continue;
 
             }
 
-            $current_subscription_start_date = date_create( $subscription->modified_date );
+            $current_subscription_start_date = date_create($subscription->modified_date);
 
             // is the last updated subscription date newer than course start date
-            if (  $current_subscription_start_date > $course_start_date   ) {
+            if ($current_subscription_start_date > $course_start_date) {
 
                 return false;
 
@@ -1729,20 +1729,20 @@ 
 	 *
 	 * @return array $orders
 	 */
-	public static function get_user_product_orders( $user_id =  0, $product_id ) {
+	public static function get_user_product_orders($user_id = 0, $product_id) {
 
 		$args = array(
 			'numberposts' => -1,
 			'post_type' => 'shop_order',
 			'meta_key'    => '_customer_user',
-			'meta_value'  => intval( $user_id ),
+			'meta_value'  => intval($user_id),
 		);
 
-		if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-			$args['post_type'] = array( 'shop_order', 'shop_subscription' );
+		if (class_exists('WC_Subscriptions_Manager')) {
+			$args['post_type'] = array('shop_order', 'shop_subscription');
 		}
 
-		return get_posts( $args );
+		return get_posts($args);
 
 	}
 
@@ -1758,12 +1758,12 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function is_course_purchasable( $course_id = 0 ){
+	public static function is_course_purchasable($course_id = 0) {
 
-		if( ! self::is_woocommerce_active() ){
+		if ( ! self::is_woocommerce_active()) {
 			return false;
 		}
-		$course_product = wc_get_product( self::get_course_product_id( $course_id ) );
+		$course_product = wc_get_product(self::get_course_product_id($course_id));
 
 		return $course_product->is_purchasable();
 

includes/hooks/woocommerce.php

Spacing +17 added lines, -17 removed lines

@@ -7,20 +7,20 @@ 
  * 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);
 
 
 /******************************
@@ -28,7 +28,7 @@ 
  * 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);
 
 /******************************
  *
@@ -36,7 +36,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'));
 
 /******************************
  *
@@ -45,7 +45,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);
 
 /******************************
  *
@@ -54,11 +54,11 @@ 
  ******************************/
 //@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  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);
 
 
 /************************************
@@ -67,28 +67,28 @@ 
  *
  ************************************/
 // Add Email link to course orders
-add_action( 'woocommerce_email_after_order_table', array( 'Sensei_WC', 'email_course_details' ), 10, 1 );
+add_action('woocommerce_email_after_order_table', array('Sensei_WC', 'email_course_details'), 10, 1);
 
 /************************************
  *
  * Checkout
  *
  ************************************/
-add_action( 'woocommerce_delete_shop_order_transients',           array( 'Sensei_WC', 'complete_order' ) );
-add_action( 'woocommerce_delete_shop_order_transients',            array( 'Sensei_WC', 'cancel_order' ) );
+add_action('woocommerce_delete_shop_order_transients', array('Sensei_WC', 'complete_order'));
+add_action('woocommerce_delete_shop_order_transients', array('Sensei_WC', 'cancel_order'));
 // Disable guest checkout if a course is in the cart as we need a valid user to store data for
-add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( 'Sensei_WC', 'disable_guest_checkout' ) );
+add_filter('pre_option_woocommerce_enable_guest_checkout', array('Sensei_WC', 'disable_guest_checkout'));
 // Mark orders with virtual products as complete rather then stay processing
-add_filter( 'woocommerce_payment_complete_order_status',    array( 'Sensei_WC', 'virtual_order_payment_complete' ), 10, 2 );
+add_filter('woocommerce_payment_complete_order_status', array('Sensei_WC', 'virtual_order_payment_complete'), 10, 2);
 
 /************************************
  *
  * WooCommerce Subscriptions
  *
  ************************************/
-add_action( 'woocommerce_subscription_status_pending_to_active', array( 'Sensei_WC', 'activate_subscription' ), 50, 3 );
+add_action('woocommerce_subscription_status_pending_to_active', array('Sensei_WC', 'activate_subscription'), 50, 3);
 // filter the user permission of the subscription is not valid
-add_filter( 'sensei_access_permissions',               array( 'Sensei_WC', 'get_subscription_permission' ), 10, 2 );
+add_filter('sensei_access_permissions', array('Sensei_WC', 'get_subscription_permission'), 10, 2);
 
 //block user from accessing course when subscription
-add_filter( 'sensei_user_started_course',     array( 'Sensei_WC', 'get_subscription_user_started_course' ), 10, 3 );
+add_filter('sensei_user_started_course', array('Sensei_WC', 'get_subscription_user_started_course'), 10, 3);