woothemes / sensei

includes/template-functions.php

Indentation +320 added lines, -321 removed lines

@@ -5,18 +5,18 @@ 
 	 * 	Output tags.
 	 ***************************************************************************************************/
 
-    /**
-     * sensei_course_archive_next_link function.
-     *
-     * @access public
-     * @param string $type (default: 'newcourses')
-     * @return void
-     */
-    function sensei_course_archive_next_link( $type = 'newcourses' ) {
+	/**
+	 * sensei_course_archive_next_link function.
+	 *
+	 * @access public
+	 * @param string $type (default: 'newcourses')
+	 * @return void
+	 */
+	function sensei_course_archive_next_link( $type = 'newcourses' ) {
 
-        _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
+		_deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.');
 
-    } // End sensei_course_archive_next_link()
+	} // End sensei_course_archive_next_link()
 
 	 /**
 	  * course_single_lessons function.
@@ -26,14 +26,14 @@ 
 	  */
 	 function course_single_lessons() {
 
-         // load backwards compatible template name if it exists in the users theme
-         $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
-         if( $located_template ){
+		 // load backwards compatible template name if it exists in the users theme
+		 $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' );
+		 if( $located_template ){
 
-             Sensei_Templates::get_template( 'single-course/course-lessons.php' );
-             return;
+			 Sensei_Templates::get_template( 'single-course/course-lessons.php' );
+			 return;
 
-        }
+		}
 
 		Sensei_Templates::get_template( 'single-course/lessons.php' );
 
@@ -48,8 +48,8 @@ 
 	  */
 	 function lesson_single_meta() {
 
-         _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
-         sensei_the_single_lesson_meta();
+		 _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' );
+		 sensei_the_single_lesson_meta();
 
 	 } // End lesson_single_meta()
 
@@ -60,7 +60,7 @@ 
 	  * @access public
 	  * @param bool $return (default: false)
 	  * @return void
-      * @deprecated since 1.9.0
+	  * @deprecated since 1.9.0
 	  */
 	 function quiz_questions( $return = false ) {
 
@@ -74,11 +74,11 @@ 
 	  * @access public
 	  * @since  1.3.0
 	  * @return void
-      * @deprecated
+	  * @deprecated
 	  */
 	 function quiz_question_type( $question_type = 'multiple-choice' ) {
 
-         Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
+		 Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' );
 
 	 } // End lesson_single_meta()
 
@@ -89,14 +89,14 @@ 
 	/**
 	 * sensei_check_prerequisite_course function.
 	 *
-     * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
+	 * @deprecated since 1.9.0 use Sensei_Course::is_prerequisite_complete( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return bool
 	 */
 	function sensei_check_prerequisite_course( $course_id ) {
 
-        return Sensei_Course::is_prerequisite_complete( $course_id );
+		return Sensei_Course::is_prerequisite_complete( $course_id );
 
 	} // End sensei_check_prerequisite_course()
 
@@ -120,14 +120,14 @@ 
     			<span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span>
 
     		</form><?php
-    	} // End If Statement
+		} // End If Statement
 	} // End sensei_start_course_form()
 
 
 	/**
 	 * sensei_wc_add_to_cart function.
 	 *
-     * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
+	 * @deprecated since Sensei_WC::the_add_to_cart_button_html( $course_id );
 	 * @access public
 	 * @param mixed $course_id
 	 * @return void
@@ -147,7 +147,7 @@ 
 	 * @return bool
 	 */
 	function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) {
-        return Sensei_WC::is_product_in_cart( $wc_product_id );
+		return Sensei_WC::is_product_in_cart( $wc_product_id );
 	} // End sensei_check_if_product_is_in_cart()
 
 	/**
@@ -160,17 +160,17 @@ 
 	function sensei_simple_course_price( $post_id ) {
 
 		//WooCommerce Pricing
-        if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	// Get the product
-    	    	$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+		if ( Sensei_WC::is_woocommerce_active() ) {
+			$wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true );
+			if ( 0 < $wc_post_id ) {
+				// Get the product
+				$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
 
-    	    	if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
+				if ( isset( $product ) && !empty( $product )  &&  $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?>
     	    		<span class="course-price"><?php echo $product->get_price_html(); ?></span>
     	    	<?php } // End If Statement
-    	    } // End If Statement
-    	} // End If Statement
+			} // End If Statement
+		} // End If Statement
 	} // End sensei_simple_course_price()
 
 	/**
@@ -197,7 +197,7 @@ 
 
 
 		if ( ! $query->is_main_query() )
-        	return;
+			return;
 
 		// Apply Filter only if on frontend and when course archive is running
 		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
@@ -205,11 +205,11 @@ 
 		if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) {
 			// Check for pagination settings
    			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-    			$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
-    		} else {
-    			$amount = $query->get( 'posts_per_page' );
-    		} // End If Statement
-    		$query->set( 'posts_per_page', $amount );
+				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			} else {
+				$amount = $query->get( 'posts_per_page' );
+			} // End If Statement
+			$query->set( 'posts_per_page', $amount );
 		} // End If Statement
 	} // End sensei_course_archive_filter()
 	add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 );
@@ -248,70 +248,70 @@ 
 			$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 			$all_lessons = array();
 
-            $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
-
-            if( !empty( $modules )  ){
-                foreach( (array) $modules as $module ) {
-
-                    $args = array(
-                        'post_type' => 'lesson',
-                        'post_status' => 'publish',
-                        'posts_per_page' => -1,
-                        'meta_query' => array(
-                            array(
-                                'key' => '_lesson_course',
-                                'value' => intval( $lesson_course_id ),
-                                'compare' => '='
-                            )
-                        ),
-                        'tax_query' => array(
-                            array(
-                                'taxonomy' => Sensei()->modules->taxonomy,
-                                'field' => 'id',
-                                'terms' => intval( $module->term_id )
-                            )
-                        ),
-                        'meta_key' => '_order_module_' . $module->term_id,
-                        'orderby' => 'meta_value_num date',
-                        'order' => 'ASC',
-                        'suppress_filters' => 0
-                    );
-
-                    $lessons = get_posts( $args );
-                    if ( 0 < count( $lessons ) ) {
-                        foreach ($lessons as $lesson_item){
-                            $all_lessons[] = $lesson_item->ID;
-                        } // End For Loop
-                    } // End If Statement
-
-                }//end for each
-
-            }// end if empty modules
-
-            $args = array(
-                'post_type' => 'lesson',
-                'posts_per_page' => -1,
-                'suppress_filters' => 0,
-                'meta_key' => '_order_' . $lesson_course_id,
-                'orderby' => 'meta_value_num date',
-                'order' => 'ASC',
-                'meta_query' => array(
-                    array(
-                        'key' => '_lesson_course',
-                        'value' => intval( $lesson_course_id ),
-                    ),
-                ),
-                'post__not_in' => $all_lessons,
-            );
-
-            $other_lessons = get_posts( $args );
-            if ( 0 < count( $other_lessons ) ) {
+			$modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) );
+
+			if( !empty( $modules )  ){
+				foreach( (array) $modules as $module ) {
+
+					$args = array(
+						'post_type' => 'lesson',
+						'post_status' => 'publish',
+						'posts_per_page' => -1,
+						'meta_query' => array(
+							array(
+								'key' => '_lesson_course',
+								'value' => intval( $lesson_course_id ),
+								'compare' => '='
+							)
+						),
+						'tax_query' => array(
+							array(
+								'taxonomy' => Sensei()->modules->taxonomy,
+								'field' => 'id',
+								'terms' => intval( $module->term_id )
+							)
+						),
+						'meta_key' => '_order_module_' . $module->term_id,
+						'orderby' => 'meta_value_num date',
+						'order' => 'ASC',
+						'suppress_filters' => 0
+					);
+
+					$lessons = get_posts( $args );
+					if ( 0 < count( $lessons ) ) {
+						foreach ($lessons as $lesson_item){
+							$all_lessons[] = $lesson_item->ID;
+						} // End For Loop
+					} // End If Statement
+
+				}//end for each
+
+			}// end if empty modules
+
+			$args = array(
+				'post_type' => 'lesson',
+				'posts_per_page' => -1,
+				'suppress_filters' => 0,
+				'meta_key' => '_order_' . $lesson_course_id,
+				'orderby' => 'meta_value_num date',
+				'order' => 'ASC',
+				'meta_query' => array(
+					array(
+						'key' => '_lesson_course',
+						'value' => intval( $lesson_course_id ),
+					),
+				),
+				'post__not_in' => $all_lessons,
+			);
+
+			$other_lessons = get_posts( $args );
+			if ( 0 < count( $other_lessons ) ) {
 				foreach ($other_lessons as $lesson_item){
 					$all_lessons[] = $lesson_item->ID;
 				} // End For Loop
 			} // End If Statement
 
-            if ( 0 < count( $all_lessons ) ) {
+			if ( 0 < count( $all_lessons ) ) {
 				$found_index = false;
 				foreach ( $all_lessons as $lesson ){
 					if ( $found_index && $return_values['next_lesson'] == 0 ) {
@@ -342,9 +342,9 @@ 
    */
   function sensei_get_excerpt( $post_id = '' ) {
 
-      global $post;
-      _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
-      return get_the_excerpt();
+	  global $post;
+	  _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.');
+	  return get_the_excerpt();
 
   }
 
@@ -369,7 +369,7 @@ 
 */
 function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) {
 
-    return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
+	return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id );
 
 } // End sensei_has_user_completed_prerequisite_lesson()
 
@@ -484,27 +484,27 @@ 
 
 	}else{
 
-        // if the loop has not been initiated check the first module has lessons
-        if( -1 == $sensei_modules_loop[ 'current' ]  ){
+		// if the loop has not been initiated check the first module has lessons
+		if( -1 == $sensei_modules_loop[ 'current' ]  ){
 
-            $index = 0;
+			$index = 0;
 
-            if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
-                // setup the query for the module lessons
-                $course_id = $sensei_modules_loop['course_id'];
+			if( isset( $sensei_modules_loop['modules'][ $index ] ) ) {
+				// setup the query for the module lessons
+				$course_id = $sensei_modules_loop['course_id'];
 
-                $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
-                $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
+				$module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id;
+				$modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id );
 
-                // setup the global wp-query only if the lessons
-                if( $modules_query->have_posts() ){
+				// setup the global wp-query only if the lessons
+				if( $modules_query->have_posts() ){
 
-                    return true;
+					return true;
 
-                }
-            }
-        }
-        // default to false if the first module doesn't have posts
+				}
+			}
+		}
+		// default to false if the first module doesn't have posts
 		return false;
 
 	}
@@ -612,46 +612,46 @@ 
 		return '';
 	}
 
-    global $sensei_modules_loop;
-    $module_title = $sensei_modules_loop['current_module']->name;
-    $module_term_id = $sensei_modules_loop['current_module']->term_id;
-    $course_id = $sensei_modules_loop['course_id'];
-    $module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
+	global $sensei_modules_loop;
+	$module_title = $sensei_modules_loop['current_module']->name;
+	$module_term_id = $sensei_modules_loop['current_module']->term_id;
+	$course_id = $sensei_modules_loop['course_id'];
+	$module_progress = Sensei()->modules->get_user_module_progress( $module_term_id, $course_id, get_current_user_id() );
 
-    $module_status =  '';
-    if ( $module_progress && $module_progress > 0) {
+	$module_status =  '';
+	if ( $module_progress && $module_progress > 0) {
 
-        $module_status = __('Completed', 'woothemes-sensei');
+		$module_status = __('Completed', 'woothemes-sensei');
 
-        if ($module_progress < 100) {
+		if ($module_progress < 100) {
 
-            $module_status = __('In progress', 'woothemes-sensei');
+			$module_status = __('In progress', 'woothemes-sensei');
 
-        }
+		}
 
-    }
+	}
 
 	if ( empty( $module_status ) ){
 		return '';
 	}
 
 	$status_class = strtolower( str_replace( ' ', '-', $module_status  ) );
-    $module_status_html = '<p class="status module-status ' . $status_class . '">'
-                            . $module_status
-                            . '</p>';
-
-    /**
-     * Filter the module status.
-     *
-     * This fires within the sensei_get_the_module_status function.
-     *
-     * @since 1.9.0
-     *
-     * @param $module_status_html
-     * @param $module_term_id
-     * @param $course_id
-     */
-    return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
+	$module_status_html = '<p class="status module-status ' . $status_class . '">'
+							. $module_status
+							. '</p>';
+
+	/**
+	 * Filter the module status.
+	 *
+	 * This fires within the sensei_get_the_module_status function.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $module_status_html
+	 * @param $module_term_id
+	 * @param $course_id
+	 */
+	return apply_filters( 'sensei_the_module_status_html',  $module_status_html , $module_term_id, $course_id );
 
 }
 
@@ -661,7 +661,7 @@ 
  */
 function sensei_the_module_status(){
 
-    echo sensei_get_the_module_status();
+	echo sensei_get_the_module_status();
 
 }
 
@@ -682,21 +682,21 @@ 
  */
 function sensei_quiz_has_questions(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    if( !isset( $sensei_question_loop['total'] ) ){
-        return false;
-    }
+	if( !isset( $sensei_question_loop['total'] ) ){
+		return false;
+	}
 
-    if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
+	if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total']  ){
 
-        return true;
+		return true;
 
-    }else{
+	}else{
 
-        return false;
+		return false;
 
-    }
+	}
 
 }// end sensei_quiz_has_questions
 
@@ -707,15 +707,14 @@ 
  * execution.
  *
  * @since 1.9.0
-
  */
 function sensei_setup_the_question(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $sensei_question_loop['current']++;
-    $index = $sensei_question_loop['current'];
-    $sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
+	$sensei_question_loop['current']++;
+	$index = $sensei_question_loop['current'];
+	$sensei_question_loop['current_question'] =  $sensei_question_loop['questions'][ $index ] ;
 
 
 }// end sensei_setup_the_question
@@ -728,12 +727,12 @@ 
  */
 function sensei_the_question_content(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    // load the template that displays the question information.
-    WooThemes_Sensei_Question::load_question_template( $question_type );
+	// load the template that displays the question information.
+	WooThemes_Sensei_Question::load_question_template( $question_type );
 
 }// end sensei_the_question_content
 
@@ -744,26 +743,26 @@ 
  */
 function sensei_the_question_class(){
 
-    global $sensei_question_loop;
+	global $sensei_question_loop;
 
-    $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
+	$question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID );
 
-    /**
-     * filter the sensei question class within
-     * the quiz question loop.
-     *
-     * @since 1.9.0
-     */
-     $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
+	/**
+	 * filter the sensei question class within
+	 * the quiz question loop.
+	 *
+	 * @since 1.9.0
+	 */
+	 $classes = apply_filters( 'sensei_question_classes', array( $question_type ) );
 
-    $html_classes = '';
-    foreach( $classes as $class ){
+	$html_classes = '';
+	foreach( $classes as $class ){
 
-        $html_classes .= $class . ' ';
+		$html_classes .= $class . ' ';
 
-    }// end foreach
+	}// end foreach
 
-    esc_attr_e( trim( $html_classes ) );
+	esc_attr_e( trim( $html_classes ) );
 
 }
 
@@ -774,12 +773,12 @@ 
  */
 function sensei_get_the_question_id( ){
 
-    global $sensei_question_loop;
-    if( isset( $sensei_question_loop['current_question']->ID ) ){
+	global $sensei_question_loop;
+	if( isset( $sensei_question_loop['current_question']->ID ) ){
 
-        return $sensei_question_loop['current_question']->ID;
+		return $sensei_question_loop['current_question']->ID;
 
-    }
+	}
 
 }// end sensei_the_question_id
 
@@ -806,63 +805,63 @@ 
  */
 function sensei_can_user_view_lesson( $lesson_id = '', $user_id = ''  ){
 
-    if( empty( $lesson_id ) ){
+	if( empty( $lesson_id ) ){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( empty( $user_id ) ){
+	if( empty( $user_id ) ){
 
-        $user_id = get_current_user_id();
+		$user_id = get_current_user_id();
 
-    }
+	}
 
-    // Check for prerequisite lesson completions
-    $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
-    $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-    $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
+	// Check for prerequisite lesson completions
+	$pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id );
+	$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+	$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id );
 
-    $is_preview = false;
-    if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
+	$is_preview = false;
+	if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) {
 
-        $is_preview = true;
-        $pre_requisite_complete = true;
+		$is_preview = true;
+		$pre_requisite_complete = true;
 
-    };
+	};
 
 
-    $user_can_access_lesson =  false;
+	$user_can_access_lesson =  false;
 
-    if( is_user_logged_in() && $user_taking_course ){
+	if( is_user_logged_in() && $user_taking_course ){
 
-        $user_can_access_lesson =  true;
+		$user_can_access_lesson =  true;
 
-    }
+	}
 
 
-    $access_permission = false;
+	$access_permission = false;
 
-    if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
+	if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) {
 
-        $access_permission = true;
+		$access_permission = true;
 
-    }
+	}
 
-    $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
+	$can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview;
 
-    /**
-     * Filter the can user view lesson function
-     *
-     * @since 1.9.0
-     *
-     * @hooked Sensei_WC::alter_can_user_view_lesson
-     *
-     * @param bool $can_user_view_lesson
-     * @param string $lesson_id
-     * @param string $user_id
-     */
-    return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
+	/**
+	 * Filter the can user view lesson function
+	 *
+	 * @since 1.9.0
+	 *
+	 * @hooked Sensei_WC::alter_can_user_view_lesson
+	 *
+	 * @param bool $can_user_view_lesson
+	 * @param string $lesson_id
+	 * @param string $user_id
+	 */
+	return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id );
 
 } // end sensei_can_current_user_view_lesson
 
@@ -874,49 +873,49 @@ 
  */
 function sensei_the_single_lesson_meta(){
 
-    // if the lesson meta is included within theme load that instead of the function content
-    $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
-    if( ! empty( $template ) ){
+	// if the lesson meta is included within theme load that instead of the function content
+	$template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' );
+	if( ! empty( $template ) ){
 
-        Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
-        return;
+		Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' );
+		return;
 
-    }
-
-    // Get the meta info
-    $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
-    $is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+	}
 
-    // Complete Lesson Logic
-    do_action( 'sensei_complete_lesson' );
-    // Check that the course has been started
-    if ( Sensei()->access_settings()
-        || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
-        || $is_preview ) {
-        ?>
+	// Get the meta info
+	$lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) );
+	$is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() );
+
+	// Complete Lesson Logic
+	do_action( 'sensei_complete_lesson' );
+	// Check that the course has been started
+	if ( Sensei()->access_settings()
+		|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id())
+		|| $is_preview ) {
+		?>
         <section class="lesson-meta">
             <?php
-            if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
+			if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) {
 
-                do_action( 'sensei_lesson_video', get_the_ID() );
+				do_action( 'sensei_lesson_video', get_the_ID() );
 
-            }
-            ?>
+			}
+			?>
             <?php do_action( 'sensei_frontend_messages' ); ?>
 
             <?php if ( ! $is_preview
-                || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
+				|| Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) {
 
-                sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
+				sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() )  );
 
-            } ?>
+			} ?>
         </section>
 
         <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?>
 
     <?php }
 
-    do_action( 'sensei_lesson_meta_extra', get_the_ID() );
+	do_action( 'sensei_lesson_meta_extra', get_the_ID() );
 
 } // end the_single_lesson_meta
 
@@ -932,16 +931,16 @@ 
  */
 function get_sensei_header(){
 
-    if ( ! defined( 'ABSPATH' ) ) exit;
+	if ( ! defined( 'ABSPATH' ) ) exit;
 
-    get_header();
+	get_header();
 
-    /**
-     * sensei_before_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
-     */
-    do_action( 'sensei_before_main_content' );
+	/**
+	 * sensei_before_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content)
+	 */
+	do_action( 'sensei_before_main_content' );
 
 }// end get_sensei_header
 
@@ -957,28 +956,28 @@ 
  */
 function get_sensei_footer(){
 
-    /**
-     * sensei_pagination hook
-     *
-     * @hooked sensei_pagination - 10 (outputs pagination)
-     */
-    do_action( 'sensei_pagination' );
-
-    /**
-     * sensei_after_main_content hook
-     *
-     * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
-     */
-    do_action( 'sensei_after_main_content' );
-
-    /**
-     * sensei_sidebar hook
-     *
-     * @hooked sensei_get_sidebar - 10
-     */
-    do_action( 'sensei_sidebar' );
-
-    get_footer();
+	/**
+	 * sensei_pagination hook
+	 *
+	 * @hooked sensei_pagination - 10 (outputs pagination)
+	 */
+	do_action( 'sensei_pagination' );
+
+	/**
+	 * sensei_after_main_content hook
+	 *
+	 * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content)
+	 */
+	do_action( 'sensei_after_main_content' );
+
+	/**
+	 * sensei_sidebar hook
+	 *
+	 * @hooked sensei_get_sidebar - 10
+	 */
+	do_action( 'sensei_sidebar' );
+
+	get_footer();
 
 }// end get_sensei_header
 
@@ -990,14 +989,14 @@ 
  */
 function the_no_permissions_title(){
 
-    /**
-     * Filter the no permissions title just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_title
-     */
-    echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
+	/**
+	 * Filter the no permissions title just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_title
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] );
 
 }
 
@@ -1008,14 +1007,14 @@ 
  */
 function the_no_permissions_message( $post_id ){
 
-    /**
-     * Filter the no permissions message just before it is echo'd on the
-     * no-permissions.php file.
-     *
-     * @since 1.9.0
-     * @param $no_permissions_message
-     */
-    echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
+	/**
+	 * Filter the no permissions message just before it is echo'd on the
+	 * no-permissions.php file.
+	 *
+	 * @since 1.9.0
+	 * @param $no_permissions_message
+	 */
+	echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id );
 
 }
 
@@ -1026,8 +1025,8 @@ 
  */
 function sensei_the_excerpt( $post_id ){
 
-    global $post;
-    the_excerpt( $post );
+	global $post;
+	the_excerpt( $post );
 
 }
 
@@ -1041,9 +1040,9 @@ 
  */
  function sensei_get_current_page_url(){
 
-     global $wp;
-     $current_page_url =  home_url( $wp->request );
-     return $current_page_url;
+	 global $wp;
+	 $current_page_url =  home_url( $wp->request );
+	 return $current_page_url;
 
  }
 
@@ -1055,7 +1054,7 @@ 
  */
 function sensei_the_my_courses_content(){
 
-    echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
+	echo Sensei()->course->load_user_courses_content( wp_get_current_user() );
 
 } // sensei_the_my_courses_content
 
@@ -1070,7 +1069,7 @@ 
  */
 function sensei_load_template( $template_name ){
 
-    Sensei_Templates::get_template( $template_name );
+	Sensei_Templates::get_template( $template_name );
 
 }
 
@@ -1084,7 +1083,7 @@ 
  */
 function sensei_load_template_part( $slug, $name ){
 
-    Sensei_Templates::get_part( $slug, $name );
+	Sensei_Templates::get_part( $slug, $name );
 
 }
 
@@ -1103,17 +1102,17 @@ 
  */
 function sensei_the_lesson_excerpt( $lesson_id = '' ) {
 
-    if( empty( $lesson_id )){
+	if( empty( $lesson_id )){
 
-        $lesson_id = get_the_ID();
+		$lesson_id = get_the_ID();
 
-    }
+	}
 
-    if( 'lesson' != get_post_type( $lesson_id ) ){
-        return;
-    }
+	if( 'lesson' != get_post_type( $lesson_id ) ){
+		return;
+	}
 
-    echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
+	echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false );
 
 }// End lesson_excerpt()
 
@@ -1123,16 +1122,16 @@ 
  * @since 1.9.0
  */
 function sensei_the_course_results_lessons(){
-    // load backwards compatible template name if it exists in the users theme
-    $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
-    if( $located_template ){
+	// load backwards compatible template name if it exists in the users theme
+	$located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' );
+	if( $located_template ){
 
-        Sensei_Templates::get_template( 'course-results/course-lessons.php' );
-        return;
+		Sensei_Templates::get_template( 'course-results/course-lessons.php' );
+		return;
 
-    }
+	}
 
-    Sensei_Templates::get_template( 'course-results/lessons.php' );
+	Sensei_Templates::get_template( 'course-results/lessons.php' );
 }
 
 /**
@@ -1144,7 +1143,7 @@ 
  */
 function sensei_courses_per_row(){
 
-    echo Sensei_Course::get_loop_number_of_columns();
+	echo Sensei_Course::get_loop_number_of_columns();
 
 }
 
@@ -1158,7 +1157,7 @@ 
  */
 function sensei_get_template( $template_name, $args, $path ){
 
-    Sensei_Templates::get_template( $template_name, $args, $path );
+	Sensei_Templates::get_template( $template_name, $args, $path );
 
 }
 
@@ -1172,14 +1171,14 @@ 
  */
 function get_the_lesson_status_class(){
 
-    $status_class = '';
-    $lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
+	$status_class = '';
+	$lesson_completed = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() );
 
-    if ( $lesson_completed ) {
-        $status_class = 'completed';
-    }
+	if ( $lesson_completed ) {
+		$status_class = 'completed';
+	}
 
-    return  $status_class;
+	return  $status_class;
 
 }// end get_the_lesson_status_class
 /**
@@ -1191,5 +1190,5 @@ 
  */
 function sensei_the_lesson_status_class(){
 
-    echo get_the_lesson_status_class();
+	echo get_the_lesson_status_class();
 }

includes/class-sensei-grading.php

Indentation +419 added lines, -419 removed lines

@@ -20,8 +20,8 @@ 
 	/**
 	 * Constructor
 	 * @since  1.3.0
-     *
-     * @param $file
+	 *
+	 * @param $file
 	 */
 	public function __construct ( $file ) {
 		$this->name = __( 'Grading', 'woothemes-sensei' );
@@ -230,7 +230,7 @@ 
 	/**
 	 * Outputs Grading general headers
 	 * @since  1.3.0
-     * @param array $args
+	 * @param array $args
 	 * @return void
 	 */
 	public function grading_headers( $args = array( 'nav' => 'default' ) ) {
@@ -282,7 +282,7 @@ 
 		}
 		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -316,7 +316,7 @@ 
 		}
 		if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -365,15 +365,15 @@ 
 	public function count_statuses( $args = array() ) {
 		global  $wpdb;
 
-        /**
-         * Filter fires inside Sensei_Grading::count_statuses
-         *
-         * Alter the the post_in array to determine which posts the
-         * comment query should be limited to.
-         * @since 1.8.0
-         * @param array $args
-         */
-        $args = apply_filters( 'sensei_count_statuses_args', $args );
+		/**
+		 * Filter fires inside Sensei_Grading::count_statuses
+		 *
+		 * Alter the the post_in array to determine which posts the
+		 * comment query should be limited to.
+		 * @since 1.8.0
+		 * @param array $args
+		 */
+		$args = apply_filters( 'sensei_count_statuses_args', $args );
 
 		if ( 'course' == $args['type'] ) {
 			$type = 'sensei_course_status';
@@ -385,7 +385,7 @@ 
 
 		$query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s ";
 
-        // Restrict to specific posts
+		// Restrict to specific posts
 		if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) {
 			$query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')';
 		}
@@ -520,148 +520,148 @@ 
 		return $html;
 	} // End lessons_drop_down_html()
 
-    /**
-     * The process grading function handles admin grading submissions.
-     *
-     * This function is hooked on to admin_init. It simply accepts
-     * the grades as the Grader selected theme and saves the total grade and
-     * individual question grades.
-     *
-     * @return bool
-     */
-    public function admin_process_grading_submission() {
+	/**
+	 * The process grading function handles admin grading submissions.
+	 *
+	 * This function is hooked on to admin_init. It simply accepts
+	 * the grades as the Grader selected theme and saves the total grade and
+	 * individual question grades.
+	 *
+	 * @return bool
+	 */
+	public function admin_process_grading_submission() {
 
-        // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
-        if( ! isset( $_POST['sensei_manual_grade'] )
-            || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
-            || ! isset( $_GET['quiz_id'] )
-            || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
+		// NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
+		if( ! isset( $_POST['sensei_manual_grade'] )
+			|| ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
+			|| ! isset( $_GET['quiz_id'] )
+			|| $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
 
-            return false; //exit and do not grade
+			return false; //exit and do not grade
 
-        }
+		}
 
-        $quiz_id = $_GET['quiz_id'];
-        $user_id = $_GET['user'];
+		$quiz_id = $_GET['quiz_id'];
+		$user_id = $_GET['user'];
 
 
-        $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-        $quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $quiz_grade = 0;
-        $count = 0;
-        $quiz_grade_total = $_POST['quiz_grade_total'];
-        $all_question_grades = array();
-        $all_answers_feedback = array();
+		$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
+		$quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$quiz_grade = 0;
+		$count = 0;
+		$quiz_grade_total = $_POST['quiz_grade_total'];
+		$all_question_grades = array();
+		$all_answers_feedback = array();
 
-        foreach( $questions as $question ) {
+		foreach( $questions as $question ) {
 
-            ++$count;
-            $question_id = $question->ID;
+			++$count;
+			$question_id = $question->ID;
 
-            if( isset( $_POST[ 'question_' . $question_id ] ) ) {
+			if( isset( $_POST[ 'question_' . $question_id ] ) ) {
 
-                $question_grade = 0;
-                if( $_POST[ 'question_' . $question_id ] == 'right' ) {
+				$question_grade = 0;
+				if( $_POST[ 'question_' . $question_id ] == 'right' ) {
 
-                    $question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
+					$question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
 
-                }
+				}
 
-                // add data to the array that will, after the loop, be stored on the lesson status
-                $all_question_grades[ $question_id ] = $question_grade;
+				// add data to the array that will, after the loop, be stored on the lesson status
+				$all_question_grades[ $question_id ] = $question_grade;
 
-                // tally up the total quiz grade
-                $quiz_grade += $question_grade;
+				// tally up the total quiz grade
+				$quiz_grade += $question_grade;
 
-            } // endif
+			} // endif
 
-            // Question answer feedback / notes
-            $question_feedback = '';
-            if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
+			// Question answer feedback / notes
+			$question_feedback = '';
+			if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
 
-                $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
+				$question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
 
-            }
-            $all_answers_feedback[ $question_id ] = $question_feedback;
+			}
+			$all_answers_feedback[ $question_id ] = $question_feedback;
 
-        } // end for each $questions
+		} // end for each $questions
 
-        //store all question grades on the lesson status
-        Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
+		//store all question grades on the lesson status
+		Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
 
-        //store the feedback from grading
-        Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
+		//store the feedback from grading
+		Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
 
-        // $_POST['all_questions_graded'] is set when all questions have been graded
-        // in the class sensei grading user quiz -> display()
-        if( $_POST['all_questions_graded'] == 'yes' ) {
+		// $_POST['all_questions_graded'] is set when all questions have been graded
+		// in the class sensei grading user quiz -> display()
+		if( $_POST['all_questions_graded'] == 'yes' ) {
 
-            // set the users total quiz grade
+			// set the users total quiz grade
 			if ( 0 < intval( $quiz_grade_total ) ) {
-            $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
-
-            // Duplicating what Frontend->sensei_complete_quiz() does
-            $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-            $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
-            $lesson_metadata = array();
-            if ( $pass_required ) {
-                // Student has reached the pass mark and lesson is complete
-                if ( $quiz_passmark <= $grade ) {
-                    $lesson_status = 'passed';
-                }
-                else {
-                    $lesson_status = 'failed';
-                } // End If Statement
-            }
-            // Student only has to partake the quiz
-            else {
-                $lesson_status = 'graded';
-            }
-            $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
+
+			// Duplicating what Frontend->sensei_complete_quiz() does
+			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+			$quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+			$lesson_metadata = array();
+			if ( $pass_required ) {
+				// Student has reached the pass mark and lesson is complete
+				if ( $quiz_passmark <= $grade ) {
+					$lesson_status = 'passed';
+				}
+				else {
+					$lesson_status = 'failed';
+				} // End If Statement
+			}
+			// Student only has to partake the quiz
+			else {
+				$lesson_status = 'graded';
+			}
+			$lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
 
-            Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
+			Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
 
-            if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
+			if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
 
-                /**
-                 * Summary.
-                 *
-                 * Description.
-                 *
-                 * @since 1.7.0
-                 *
-                 * @param int  $user_id
-                 * @param int $quiz_lesson_id
-                 */
-                do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
+				/**
+				 * Summary.
+				 *
+				 * Description.
+				 *
+				 * @since 1.7.0
+				 *
+				 * @param int  $user_id
+				 * @param int $quiz_lesson_id
+				 */
+				do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
 
-            } // end if in_array
+			} // end if in_array
 
-        }// end if $_POST['all_que...
+		}// end if $_POST['all_que...
 
-        if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
+		if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        } elseif ( isset( $_POST['_wp_http_referer'] ) ) {
+		} elseif ( isset( $_POST['_wp_http_referer'] ) ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
+			$load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
 
-        } else {
+		} else {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        }
+		}
 
-        wp_safe_redirect( esc_url_raw( $load_url ) );
-        exit;
+		wp_safe_redirect( esc_url_raw( $load_url ) );
+		exit;
 
-    } // end admin_process_grading_submission
+	} // end admin_process_grading_submission
 
 	public function get_redirect_url() {
 		// Parse POST data
@@ -706,398 +706,398 @@ 
 		} // End If Statement
 	} // End sensei_grading_notices()
 
-    /**
-     * Grade quiz automatically
-     *
-     * This function grades each question automatically if there all questions are auto gradable. If not
-     * the quiz will not be auto gradable.
-     *
-     * @since 1.7.4
-     *
-     * @param  integer $quiz_id         ID of quiz
-     * @param  array $submitted questions id ans answers {
-     *          @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
-     *
-     * @return int $quiz_grade total sum of all question grades
-     */
-    public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
-
-        if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
-            || $quiz_grade_type != 'auto' ) {
-            return false; // exit early
-        }
-
-
-        $user_id = get_current_user_id();
-        $lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
-        $quiz_autogradable = true;
-
-        /**
-         * Filter the types of question types that can be automatically graded.
-         *
-         * This filter fires inside the auto grade quiz function and provides you with the default list.
-         *
-         * @param array {
-         *      'multiple-choice',
-         *      'boolean',
-         *      'gap-fill'.
-         * }
-         */
-        $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
-
-        $grade_total = 0;
-        $all_question_grades = array();
-        foreach( $submitted as $question_id => $answer ) {
-
-            // check if the question is autogradable, either by type, or because the grade is 0
-            $question_type = Sensei()->question->get_question_type( $question_id );
+	/**
+	 * Grade quiz automatically
+	 *
+	 * This function grades each question automatically if there all questions are auto gradable. If not
+	 * the quiz will not be auto gradable.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param  integer $quiz_id         ID of quiz
+	 * @param  array $submitted questions id ans answers {
+	 *          @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
+	 *
+	 * @return int $quiz_grade total sum of all question grades
+	 */
+	public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+
+		if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
+			|| $quiz_grade_type != 'auto' ) {
+			return false; // exit early
+		}
+
+
+		$user_id = get_current_user_id();
+		$lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
+		$quiz_autogradable = true;
+
+		/**
+		 * Filter the types of question types that can be automatically graded.
+		 *
+		 * This filter fires inside the auto grade quiz function and provides you with the default list.
+		 *
+		 * @param array {
+		 *      'multiple-choice',
+		 *      'boolean',
+		 *      'gap-fill'.
+		 * }
+		 */
+		$autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
+
+		$grade_total = 0;
+		$all_question_grades = array();
+		foreach( $submitted as $question_id => $answer ) {
+
+			// check if the question is autogradable, either by type, or because the grade is 0
+			$question_type = Sensei()->question->get_question_type( $question_id );
 			$achievable_grade = Sensei()->question->get_question_grade( $question_id );
 			// Question has a zero grade, so skip grading
 			if ( 0 == $achievable_grade ) {
 				$all_question_grades[ $question_id ] = $achievable_grade;
 			}
-            elseif ( in_array( $question_type, $autogradable_question_types ) ) {
-                // Get user question grade
-                $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
-                $all_question_grades[ $question_id ] = $question_grade;
-                $grade_total += $question_grade;
+			elseif ( in_array( $question_type, $autogradable_question_types ) ) {
+				// Get user question grade
+				$question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
+				$all_question_grades[ $question_id ] = $question_grade;
+				$grade_total += $question_grade;
 
-            } else {
+			} else {
 
-                // There is a question that cannot be autograded
-                $quiz_autogradable = false;
+				// There is a question that cannot be autograded
+				$quiz_autogradable = false;
 
-            } // end if in_array( $question_type...
+			} // end if in_array( $question_type...
 
-        }// end for each question
+		}// end for each question
 
-        // Only if the whole quiz was autogradable do we set a grade
-        if ( $quiz_autogradable ) {
+		// Only if the whole quiz was autogradable do we set a grade
+		if ( $quiz_autogradable ) {
 
-            $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
+			$quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
 			// Check for zero total from grades
 			if ( 0 < $quiz_total ) {
-            $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
 
-        } else {
+		} else {
 
-            $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
+			$grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
 
-        }
-
-        // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
-        // when doing manual grading.
-        Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
+		}
 
-        return $grade;
+		// store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
+		// when doing manual grading.
+		Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
 
-    } // End grade_quiz_auto()
+		return $grade;
 
-    /**
-     * Grade question automatically
-     *
-     * This function checks the question typ and then grades it accordingly.
-     *
-     * @since 1.7.4
-     *
-     * @param integer $question_id
-     * @param string $question_type of the standard Sensei question types
-     * @param string $answer
-     * @param int $user_id
-     *
-     * @return int $question_grade
-     */
-    public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
-
-        if( intval( $user_id ) == 0 ) {
-
-            $user_id = get_current_user_id();
-
-        }
-
-        if( ! ( intval( $question_id ) > 0 ) ) {
-
-            return false;
-
-        }
-
-
-        Sensei()->question->get_question_type( $question_id );
-
-        /**
-         * Applying a grade before the auto grading takes place.
-         *
-         * This filter is applied just before the question is auto graded. It fires in the context of a single question
-         * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
-         * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
-         *
-         * @param int $question_grade default false
-         * @param int $question_id
-         * @param string $question_type one of the Sensei question type.
-         * @param string $answer user supplied question answer
-         */
-        $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
+	} // End grade_quiz_auto()
 
-        if ( false !== $question_grade ) {
+	/**
+	 * Grade question automatically
+	 *
+	 * This function checks the question typ and then grades it accordingly.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param integer $question_id
+	 * @param string $question_type of the standard Sensei question types
+	 * @param string $answer
+	 * @param int $user_id
+	 *
+	 * @return int $question_grade
+	 */
+	public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
 
-            return $question_grade;
+		if( intval( $user_id ) == 0 ) {
 
-        }
+			$user_id = get_current_user_id();
 
-        // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+		}
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+		if( ! ( intval( $question_id ) > 0 ) ) {
 
-            if( 0 == get_magic_quotes_gpc() ) {
-                $answer = wp_unslash( $answer );
-            }
-            $answer = (array) $answer;
-            if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
-                // Loop through all answers ensure none are 'missing'
-                $all_correct = true;
-                foreach ( $answer as $check_answer ) {
-                    if ( !in_array( $check_answer, $right_answer ) ) {
-                        $all_correct = false;
-                    }
-                }
-                // If all correct then grade
-                if ( $all_correct ) {
-                    $question_grade = Sensei()->question->get_question_grade( $question_id );
-                }
-            }
+			return false;
 
-        } elseif( 'gap-fill' == $question_type ){
+		}
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-        } else{
+		Sensei()->question->get_question_type( $question_id );
 
-            /**
-             * Grading questions that are not auto gradable.
-             *
-             * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
-             * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
-             *
-             * @param int $question_grade default zero
-             * @param int $question_id
-             * @param string $question_type one of the Sensei question type.
-             * @param string $answer user supplied question answer
-             */
-            $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
+		/**
+		 * Applying a grade before the auto grading takes place.
+		 *
+		 * This filter is applied just before the question is auto graded. It fires in the context of a single question
+		 * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
+		 * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
+		 *
+		 * @param int $question_grade default false
+		 * @param int $question_id
+		 * @param string $question_type one of the Sensei question type.
+		 * @param string $answer user supplied question answer
+		 */
+		$question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
 
-        } // end if $question_type
+		if ( false !== $question_grade ) {
 
-        return $question_grade;
-    } // end grade_question_auto
+			return $question_grade;
 
-    /**
-     * Grading logic specifically for the gap fill questions
-     *
-     * @since 1.9.0
-     * @param $question_id
-     * @param $user_answer
-     *
-     * @return bool | int false or the grade given to the user answer
-     */
-    public static function grade_gap_fill_question( $question_id, $user_answer ){
+		}
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+		// auto grading core
+		if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
 
-        if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
-            $user_answer = wp_unslash( $user_answer );
-        }
+			$right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
 
-        /**
-         * case sensitive grading filter
-         *
-         * alter the value simply use this code in your plugin or the themes functions.php
-         * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
-         *
-         * @param bool $do_case_sensitive_comparison default false.
-         *
-         * @since 1.9.0
-         */
-        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
+			if( 0 == get_magic_quotes_gpc() ) {
+				$answer = wp_unslash( $answer );
+			}
+			$answer = (array) $answer;
+			if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
+				// Loop through all answers ensure none are 'missing'
+				$all_correct = true;
+				foreach ( $answer as $check_answer ) {
+					if ( !in_array( $check_answer, $right_answer ) ) {
+						$all_correct = false;
+					}
+				}
+				// If all correct then grade
+				if ( $all_correct ) {
+					$question_grade = Sensei()->question->get_question_grade( $question_id );
+				}
+			}
 
-        if( $do_case_sensitive_comparison ){
+		} elseif( 'gap-fill' == $question_type ){
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
+			$question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-                return Sensei()->question->get_question_grade( $question_id );
+		} else{
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+			/**
+			 * Grading questions that are not auto gradable.
+			 *
+			 * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
+			 * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
+			 *
+			 * @param int $question_grade default zero
+			 * @param int $question_id
+			 * @param string $question_type one of the Sensei question type.
+			 * @param string $answer user supplied question answer
+			 */
+			$question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+		} // end if $question_type
 
-                    return Sensei()->question->get_question_grade($question_id);
+		return $question_grade;
+	} // end grade_question_auto
 
-                }else{
+	/**
+	 * Grading logic specifically for the gap fill questions
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 * @param $user_answer
+	 *
+	 * @return bool | int false or the grade given to the user answer
+	 */
+	public static function grade_gap_fill_question( $question_id, $user_answer ){
 
-                    return false;
+		$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
+		$gapfill_array = explode( '||', $right_answer );
 
-                }
+		if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
+			$user_answer = wp_unslash( $user_answer );
+		}
 
-            }else{
+		/**
+		 * case sensitive grading filter
+		 *
+		 * alter the value simply use this code in your plugin or the themes functions.php
+		 * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
+		 *
+		 * @param bool $do_case_sensitive_comparison default false.
+		 *
+		 * @since 1.9.0
+		 */
+		$do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
 
-                return false;
+		if( $do_case_sensitive_comparison ){
 
-            }
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
 
-        }else{
+				return Sensei()->question->get_question_grade( $question_id );
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
 
-               return Sensei()->question->get_question_grade( $question_id );
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+					return Sensei()->question->get_question_grade($question_id);
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+				}else{
 
-                    return  Sensei()->question->get_question_grade( $question_id );
+					return false;
 
-                }else{
+				}
 
-                    return false;
+			}else{
 
-                }
+				return false;
 
-            }else{
+			}
+
+		}else{
+
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+
+			   return Sensei()->question->get_question_grade( $question_id );
+
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+
+					return  Sensei()->question->get_question_grade( $question_id );
+
+				}else{
+
+					return false;
+
+				}
 
-                return false;
+			}else{
+
+				return false;
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Counts the lessons that have been graded manually and automatically
+	 *
+	 * @since 1.9.0
+	 * @return int $number_of_graded_lessons
+	 */
+	public static function get_graded_lessons_count(){
 
-            }
+		global $wpdb;
 
-        }
+		$comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Counts the lessons that have been graded manually and automatically
-     *
-     * @since 1.9.0
-     * @return int $number_of_graded_lessons
-     */
-    public static function get_graded_lessons_count(){
+		return $number_of_graded_lessons;
+	}
 
-        global $wpdb;
+	/**
+	 * Add together all the graded lesson grades
+	 *
+	 * @since 1.9.0
+	 * @return double $sum_of_all_grades
+	 */
+	public static function get_graded_lessons_sum(){
 
-        $comment_query_piece[ 'select']  = "SELECT   COUNT(*) AS total";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $number_of_graded_lessons = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $number_of_graded_lessons;
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Add together all the graded lesson grades
-     *
-     * @since 1.9.0
-     * @return double $sum_of_all_grades
-     */
-    public static function get_graded_lessons_sum(){
+		return $sum_of_all_grades;
 
-        global $wpdb;
+	}
 
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade')";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+	/**
+	 * Get the sum of all grades for the given user.
+	 *
+	 * @since 1.9.0
+	 * @param $user_id
+	 * @return double
+	 */
+	public static function get_user_graded_lessons_sum( $user_id ){
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$clean_user_id = esc_sql( $user_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $sum_of_all_grades;
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    }
+		return $sum_of_all_grades;
+	}
 
-    /**
-     * Get the sum of all grades for the given user.
-     *
-     * @since 1.9.0
-     * @param $user_id
-     * @return double
-     */
-    public static function get_user_graded_lessons_sum( $user_id ){
-        global $wpdb;
+	/**
+	 * Get the sum of all user grades for the given lesson.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int lesson_id
+	 * @return double
+	 */
+	public static function get_lessons_users_grades_sum( $lesson_id ){
 
-        $clean_user_id = esc_sql( $user_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.user_id = {$clean_user_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		global $wpdb;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		$clean_lesson_id = esc_sql( $lesson_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-        return $sum_of_all_grades;
-    }
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Get the sum of all user grades for the given lesson.
-     *
-     * @since 1.9.0
-     *
-     * @param int lesson_id
-     * @return double
-     */
-    public static function get_lessons_users_grades_sum( $lesson_id ){
+		return $sum_of_all_grades;
 
-        global $wpdb;
+	}//get_lessons_user_grades_sum
 
-        $clean_lesson_id = esc_sql( $lesson_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_lesson_status') AND ( {$wpdb->commentmeta}.meta_key = 'grade') AND {$wpdb->comments}.comment_post_ID = {$clean_lesson_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+	/**
+	 * Get the sum of all user grades for the given course.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int $course_id
+	 * @return double
+	 */
+	public static function get_course_users_grades_sum( $course_id ){
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
+		global $wpdb;
 
-        return $sum_of_all_grades;
+		$clean_course_id = esc_sql( $course_id);
+		$comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
+		$comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
+		$comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
+		$comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
 
-    }//get_lessons_user_grades_sum
+		$comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
+		$sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
 
-    /**
-     * Get the sum of all user grades for the given course.
-     *
-     * @since 1.9.0
-     *
-     * @param int $course_id
-     * @return double
-     */
-    public static function get_course_users_grades_sum( $course_id ){
-
-        global $wpdb;
-
-        $clean_course_id = esc_sql( $course_id);
-        $comment_query_piece[ 'select']  = "SELECT SUM({$wpdb->commentmeta}.meta_value) AS meta_sum";
-        $comment_query_piece[ 'from']    = " FROM {$wpdb->comments}  INNER JOIN {$wpdb->commentmeta}  ON ( {$wpdb->comments}.comment_ID = {$wpdb->commentmeta}.comment_id ) ";
-        $comment_query_piece[ 'where']   = " WHERE {$wpdb->comments}.comment_type IN ('sensei_course_status') AND ( {$wpdb->commentmeta}.meta_key = 'percent') AND {$wpdb->comments}.comment_post_ID = {$clean_course_id} ";
-        $comment_query_piece[ 'orderby'] = " ORDER BY {$wpdb->comments}.comment_date_gmt DESC ";
+		return $sum_of_all_grades;
 
-        $comment_query = $comment_query_piece['select'] . $comment_query_piece['from'] . $comment_query_piece['where'] . $comment_query_piece['orderby'];
-        $sum_of_all_grades = intval( $wpdb->get_var( $comment_query, 0, 0 ) );
-
-        return $sum_of_all_grades;
-
-    }//get_lessons_user_grades_sum
+	}//get_lessons_user_grades_sum
 
 } // End Class
 

includes/class-sensei-notices.php

Indentation +8 added lines, -8 removed lines

@@ -14,8 +14,8 @@ 
 class Sensei_Notices{
 
 	/**
-	*  @var $notices
-	*/
+	 *  @var $notices
+	 */
 	protected $notices;
 
 	/**
@@ -24,8 +24,8 @@ 
 	protected $has_printed;
 
 	/**
-	*  constructor 
- 	*/
+	 *  constructor 
+	 */
 	public function __construct(){
 		//initialize the notices variable
 		$this->notices = array();
@@ -79,10 +79,10 @@ 
 	} // end print_notice()
 
 	/**
-	*  Clear all notices  
-	* 
-	* @return void
-	*/
+	 *  Clear all notices  
+	 * 
+	 * @return void
+	 */
 	public function clear_notices(){
 		// assign an empty array to clear all existing notices
 		$this->notices = array();

includes/class-sensei-templates.php

Indentation +508 added lines, -508 removed lines

@@ -12,662 +12,662 @@ 
  */
 class Sensei_Templates {
 
-    /**
-     *  Load the template files from within sensei/templates/ or the the theme if overrided within the theme.
-     *
-     * @since 1.9.0
-     * @param string $slug
-     * @param string $name default: ''
-     *
-     * @return void
-     */
-    public static function get_part(  $slug, $name = ''  ){
+	/**
+	 *  Load the template files from within sensei/templates/ or the the theme if overrided within the theme.
+	 *
+	 * @since 1.9.0
+	 * @param string $slug
+	 * @param string $name default: ''
+	 *
+	 * @return void
+	 */
+	public static function get_part(  $slug, $name = ''  ){
+
+		$template = '';
+		$plugin_template_url = Sensei()->template_url;
+		$plugin_template_path = Sensei()->plugin_path() . "/templates/";
+
+		// Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php
+		if ( $name ){
+
+			$template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) );
 
-        $template = '';
-        $plugin_template_url = Sensei()->template_url;
-        $plugin_template_path = Sensei()->plugin_path() . "/templates/";
-
-        // Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php
-        if ( $name ){
-
-            $template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) );
-
-        }
+		}
 
-        // Get default slug-name.php
-        if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){
+		// Get default slug-name.php
+		if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){
 
-            $template = $plugin_template_path . "{$slug}-{$name}.php";
+			$template = $plugin_template_path . "{$slug}-{$name}.php";
 
-        }
+		}
 
 
-        // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php
-        if ( !$template ){
+		// If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php
+		if ( !$template ){
 
-            $template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) );
+			$template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) );
 
-        }
+		}
 
 
-        if ( $template ){
+		if ( $template ){
 
-            load_template( $template, false );
+			load_template( $template, false );
 
-        }
+		}
 
-    } // end get part
+	} // end get part
 
-    /**
-     * Get the template.
-     *
-     * @since 1.9.0
-     *
-     * @param $template_name
-     * @param array $args
-     * @param string $template_path
-     * @param string $default_path
-     */
-    public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	/**
+	 * Get the template.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $template_name
+	 * @param array $args
+	 * @param string $template_path
+	 * @param string $default_path
+	 */
+	public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
 
-        if ( $args && is_array($args) )
-            extract( $args );
+		if ( $args && is_array($args) )
+			extract( $args );
 
-        $located = self::locate_template( $template_name, $template_path, $default_path );
+		$located = self::locate_template( $template_name, $template_path, $default_path );
 
-        if( ! empty( $located ) ){
+		if( ! empty( $located ) ){
 
-            do_action( 'sensei_before_template_part', $template_name, $template_path, $located );
+			do_action( 'sensei_before_template_part', $template_name, $template_path, $located );
 
-            include( $located );
+			include( $located );
 
-            do_action( 'sensei_after_template_part', $template_name, $template_path, $located );
+			do_action( 'sensei_after_template_part', $template_name, $template_path, $located );
 
-        }
+		}
 
-    } // end get template
+	} // end get template
+
+	/**
+	 * Check if the template file exists. A wrapper for WP locate_template.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $template_name
+	 * @param string $template_path
+	 * @param string $default_path
+	 *
+	 * @return mixed|void
+	 */
+	public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+
+		if ( ! $template_path ) $template_path = Sensei()->template_url;
+		if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
+
+		// Look within passed path within the theme - this is priority
+		$template = locate_template(
+			array(
+				$template_path . $template_name,
+				$template_name
+			)
+		);
+
+		// Get default template
+		if ( ! $template ){
+
+			$template = $default_path . $template_name;
 
-    /**
-     * Check if the template file exists. A wrapper for WP locate_template.
-     *
-     * @since 1.9.0
-     *
-     * @param $template_name
-     * @param string $template_path
-     * @param string $default_path
-     *
-     * @return mixed|void
-     */
-    public static function locate_template( $template_name, $template_path = '', $default_path = '' ) {
+		}
+		// return nothing for file that do not exist
+		if( !file_exists( $template ) ){
+			$template = '';
+		}
 
-        if ( ! $template_path ) $template_path = Sensei()->template_url;
-        if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/';
+		// Return what we found
+		return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path );
 
-        // Look within passed path within the theme - this is priority
-        $template = locate_template(
-            array(
-                $template_path . $template_name,
-                $template_name
-            )
-        );
+	} // end locate
 
-        // Get default template
-        if ( ! $template ){
+	/**
+	 * Determine which Sensei template to load based on the
+	 * current page context.
+	 *
+	 * @since 1.0
+	 *
+	 * @param string $template
+	 * @return string $template
+	 */
+	public static function template_loader ( $template = '' ) {
 
-            $template = $default_path . $template_name;
+		global $wp_query, $email_template;
 
-        }
-        // return nothing for file that do not exist
-        if( !file_exists( $template ) ){
-            $template = '';
-        }
+		$find = array( 'woothemes-sensei.php' );
+		$file = '';
 
-        // Return what we found
-        return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path );
+		if ( isset( $email_template ) && $email_template ) {
 
-    } // end locate
+			$file 	= 'emails/' . $email_template;
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-    /**
-     * Determine which Sensei template to load based on the
-     * current page context.
-     *
-     * @since 1.0
-     *
-     * @param string $template
-     * @return string $template
-     */
-    public static function template_loader ( $template = '' ) {
+		} elseif ( is_single() && get_post_type() == 'course' ) {
 
-        global $wp_query, $email_template;
+			// possible backward compatible template include if theme overrides content-single-course.php
+			// this template was removed in 1.9.0 and code all moved into the main single-course.php file
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true );
 
-        $find = array( 'woothemes-sensei.php' );
-        $file = '';
+			$file 	= 'single-course.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        if ( isset( $email_template ) && $email_template ) {
 
-            $file 	= 'emails/' . $email_template;
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+		} elseif ( is_single() && get_post_type() == 'lesson' ) {  // check
 
-        } elseif ( is_single() && get_post_type() == 'course' ) {
+			// possible backward compatible template include if theme overrides content-single-lesson.php
+			// this template was removed in 1.9.0 and code all moved into the main single-lesson.php file
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true );
 
-            // possible backward compatible template include if theme overrides content-single-course.php
-            // this template was removed in 1.9.0 and code all moved into the main single-course.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true );
+			$file 	= 'single-lesson.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            $file 	= 'single-course.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+		} elseif ( is_single() && get_post_type() == 'quiz' ) {  // check
 
+			// possible backward compatible template include if theme overrides content-single-quiz.php
+			// this template was removed in 1.9.0 and code all moved into the main single-quiz.php file
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true);
 
-        } elseif ( is_single() && get_post_type() == 'lesson' ) {  // check
+			$file 	= 'single-quiz.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            // possible backward compatible template include if theme overrides content-single-lesson.php
-            // this template was removed in 1.9.0 and code all moved into the main single-lesson.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true );
 
-            $file 	= 'single-lesson.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+		} elseif ( is_single() && get_post_type() == 'sensei_message' ) { //// check
 
-        } elseif ( is_single() && get_post_type() == 'quiz' ) {  // check
+			// possible backward compatible template include if theme overrides content-single-message.php
+			// this template was removed in 1.9.0 and code all moved into the main single-message.php file
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true );
 
-            // possible backward compatible template include if theme overrides content-single-quiz.php
-            // this template was removed in 1.9.0 and code all moved into the main single-quiz.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true);
+			$file 	= 'single-message.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            $file 	= 'single-quiz.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+		} elseif ( is_post_type_archive( 'course' )
+					|| is_page( Sensei()->get_page_id( 'courses' ) )
+					|| is_tax( 'course-category' )) {
 
+			// possible backward compatible template include if theme overrides 'taxonomy-course-category'
+			// this template was removed in 1.9.0 and replaced by archive-course.php
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php');
 
-        } elseif ( is_single() && get_post_type() == 'sensei_message' ) { //// check
+			$file 	= 'archive-course.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            // possible backward compatible template include if theme overrides content-single-message.php
-            // this template was removed in 1.9.0 and code all moved into the main single-message.php file
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true );
+		} elseif ( is_post_type_archive( 'sensei_message' ) ) {
 
-            $file 	= 'single-message.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'archive-message.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( is_post_type_archive( 'course' )
-                    || is_page( Sensei()->get_page_id( 'courses' ) )
-                    || is_tax( 'course-category' )) {
+		} elseif( is_tax( 'lesson-tag' ) ) {
 
-            // possible backward compatible template include if theme overrides 'taxonomy-course-category'
-            // this template was removed in 1.9.0 and replaced by archive-course.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php');
+			// possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php'
+			// this template was removed in 1.9.0 and replaced by archive-lesson.php
+			self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' );
 
-            $file 	= 'archive-course.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file 	= 'archive-lesson.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( is_post_type_archive( 'sensei_message' ) ) {
+		} elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) {
 
-            $file 	= 'archive-message.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			// Override for sites with static home page
+			$wp_query->is_home = false;
 
-        } elseif( is_tax( 'lesson-tag' ) ) {
+			$file 	= 'learner-profile.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            // possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php'
-            // this template was removed in 1.9.0 and replaced by archive-lesson.php
-            self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' );
+		} elseif ( isset( $wp_query->query_vars['course_results'] ) ) {
 
-            $file 	= 'archive-lesson.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			// Override for sites with static home page
+			$wp_query->is_home = false;
 
-        } elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) {
+			$file = 'course-results.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-            // Override for sites with static home page
-            $wp_query->is_home = false;
+		}elseif( is_author()
+				 && Sensei_Teacher::is_a_teacher( get_query_var('author') )
+				 && ! user_can( get_query_var('author'), 'manage_options' ) ){
 
-            $file 	= 'learner-profile.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$file = 'teacher-archive.php';
+			$find[] = $file;
+			$find[] = Sensei()->template_url . $file;
 
-        } elseif ( isset( $wp_query->query_vars['course_results'] ) ) {
+		} // Load the template file
 
-            // Override for sites with static home page
-            $wp_query->is_home = false;
+		// if file is present set it to be loaded otherwise continue with the initial template given by WP
+		if ( $file ) {
 
-            $file = 'course-results.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+			$template = locate_template( $find );
+			if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
 
-        }elseif( is_author()
-                 && Sensei_Teacher::is_a_teacher( get_query_var('author') )
-                 && ! user_can( get_query_var('author'), 'manage_options' ) ){
+		} // End If Statement
 
-            $file = 'teacher-archive.php';
-            $find[] = $file;
-            $find[] = Sensei()->template_url . $file;
+		return $template;
 
-        } // Load the template file
+	} // End template_loader()
 
-	    // if file is present set it to be loaded otherwise continue with the initial template given by WP
-        if ( $file ) {
+	/**
+	 * This function loads the no-permissions template for users with no access
+	 * if a Sensei template was loaded.
+	 *
+	 * This function doesn't determine the permissions. Permissions must be determined
+	 * before loading this function as it only gets the template.
+	 *
+	 * This function also checks the user theme for overrides to ensure the right template
+	 * file is returned.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function get_no_permission_template( ){
 
-            $template = locate_template( $find );
-            if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+		// possible backward compatible template loading
+		// this template was removed in 1.9.0 and code all moved into the no-permissions.php file
+		self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true );
 
-        } // End If Statement
+		$file 	= 'no-permissions.php';
+		$find[] = $file;
+		$find[] = Sensei()->template_url . $file;
 
-        return $template;
+		$template = locate_template( $find );
+		if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
 
-    } // End template_loader()
+		// set a global constant so that we know that we're in this template
+		define('SENSEI_NO_PERMISSION', true );
 
-    /**
-     * This function loads the no-permissions template for users with no access
-     * if a Sensei template was loaded.
-     *
-     * This function doesn't determine the permissions. Permissions must be determined
-     * before loading this function as it only gets the template.
-     *
-     * This function also checks the user theme for overrides to ensure the right template
-     * file is returned.
-     *
-     * @since 1.9.0
-     */
-    public static function get_no_permission_template( ){
+		return $template;
 
-        // possible backward compatible template loading
-        // this template was removed in 1.9.0 and code all moved into the no-permissions.php file
-        self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true );
+	}
 
-        $file 	= 'no-permissions.php';
-        $find[] = $file;
-        $find[] = Sensei()->template_url . $file;
+	/**
+	 * This function is specifically created for loading template files from the theme.
+	 *
+	 * This function checks if the user has overwritten the templates like in their theme. If they have it in their theme it will load the header and the footer
+	 * around the singular content file from their theme and exit.
+	 *
+	 * If none is found this function will do nothing. If a template is found this funciton
+	 * will exit execution of the script an not continue.
+	 *
+	 * @since 1.9.0
+	 * @param string $template
+	 * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true
+	 */
+	public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){
 
-        $template = locate_template( $find );
-        if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file;
+		$found_template = locate_template( array( $template ) );
+		if( $found_template ){
 
-	    // set a global constant so that we know that we're in this template
-	    define('SENSEI_NO_PERMISSION', true );
+			if( $load_header_footer ){
 
-        return $template;
+				get_sensei_header();
+				include( $found_template );
+				get_sensei_footer();
 
-    }
+			}else{
 
-    /**
-     * This function is specifically created for loading template files from the theme.
-     *
-     * This function checks if the user has overwritten the templates like in their theme. If they have it in their theme it will load the header and the footer
-     * around the singular content file from their theme and exit.
-     *
-     * If none is found this function will do nothing. If a template is found this funciton
-     * will exit execution of the script an not continue.
-     *
-     * @since 1.9.0
-     * @param string $template
-     * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true
-     */
-    public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){
+				include( $found_template );
 
-        $found_template = locate_template( array( $template ) );
-        if( $found_template ){
+			}
 
-            if( $load_header_footer ){
+			exit;
 
-                get_sensei_header();
-                include( $found_template );
-                get_sensei_footer();
-
-            }else{
-
-                include( $found_template );
-
-            }
-
-            exit;
-
-        }
-
-    }
+		}
 
+	}
 
-    /**
-     * Hooks the deprecated archive content hook into the hook again just in
-     * case other developers have used it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecated_archive_course_content_hook(){
-
-        sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
-
-    }// end deprecated_archive_hook
 
-    /**
-     * A generic function for echoing the post title
-     *
-     * @since 1.9.0
-     * @param  WP_Post $post
-     */
-    public static function the_title( $post ){
-
-        // ID passed in
-        if( is_numeric( $post ) ){
-            $post = get_post( $post );
-        }
-
-        /**
-         * Filter the template html tag for the title
-         *
-         * @since 1.9.0
-         *
-         * @param $title_html_tag default is 'h3'
-         */
-        $title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
-
-        /**
-         * Filter the title classes
-         *
-         * @since 1.9.0
-         * @param string $title_classes defaults to $post_type-title
-         */
-        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
+	/**
+	 * Hooks the deprecated archive content hook into the hook again just in
+	 * case other developers have used it.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecated_archive_course_content_hook(){
 
-        $html= '';
-        $html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
-        $html .= '<a href="' . get_permalink( $post->ID ) . '" >';
-        $html .= $post->post_title ;
-        $html .= '</a>';
-        $html .= '</'. $title_html_tag. '>';
-        echo $html;
-
-    }// end the title
-
-    /**
-     * This function adds the hooks inside and above the single course content for
-     * backwards compatibility sake.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_course_inside_before_hooks(){
-
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
-        sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-
-    }// end deprecated_single_course_inside_before_hooks
-
-    /**
-     * This function adds the hooks to sensei_course_single_lessons for
-     * backwards compatibility sake.  and provides developers with an alternative.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecate_sensei_course_single_lessons_hook(){
+		sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' );
 
-        sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
+	}// end deprecated_archive_hook
 
-    }// deprecate_sensei_course_single_lessons_hook
+	/**
+	 * A generic function for echoing the post title
+	 *
+	 * @since 1.9.0
+	 * @param  WP_Post $post
+	 */
+	public static function the_title( $post ){
 
-    /**
-     * Deprecated all deprecated_single_main_content_hook hooked actions.
-     *
-     * The content must be dealt with inside the respective templates.
-     *
-     * @since 1.9.0
-     * @deprecated 1.9.0
-     */
-    public static function deprecated_single_main_content_hook(){
+		// ID passed in
+		if( is_numeric( $post ) ){
+			$post = get_post( $post );
+		}
 
-            if( is_singular( 'course' ) ) {
+		/**
+		 * Filter the template html tag for the title
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param $title_html_tag default is 'h3'
+		 */
+		$title_html_tag = apply_filters('sensei_the_title_html_tag','h3');
+
+		/**
+		 * Filter the title classes
+		 *
+		 * @since 1.9.0
+		 * @param string $title_classes defaults to $post_type-title
+		 */
+		$title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' );
+
+		$html= '';
+		$html .= '<'. $title_html_tag .' class="'. $title_classes .'" >';
+		$html .= '<a href="' . get_permalink( $post->ID ) . '" >';
+		$html .= $post->post_title ;
+		$html .= '</a>';
+		$html .= '</'. $title_html_tag. '>';
+		echo $html;
+
+	}// end the title
+
+	/**
+	 * This function adds the hooks inside and above the single course content for
+	 * backwards compatibility sake.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_course_inside_before_hooks(){
+
+		sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
+		sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+
+	}// end deprecated_single_course_inside_before_hooks
+
+	/**
+	 * This function adds the hooks to sensei_course_single_lessons for
+	 * backwards compatibility sake.  and provides developers with an alternative.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecate_sensei_course_single_lessons_hook(){
+
+		sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after');
+
+	}// deprecate_sensei_course_single_lessons_hook
+
+	/**
+	 * Deprecated all deprecated_single_main_content_hook hooked actions.
+	 *
+	 * The content must be dealt with inside the respective templates.
+	 *
+	 * @since 1.9.0
+	 * @deprecated 1.9.0
+	 */
+	public static function deprecated_single_main_content_hook(){
+
+			if( is_singular( 'course' ) ) {
+
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
+
+			} elseif( is_singular( 'message' ) ){
+
+				sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
+			}
+
+	}// end deprecated_single_course_single_main_content_hook
+
+	/**
+	 * Deprecate the  old sensei modules
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_before_hook(){
+
+		sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
 
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after');
-
-            } elseif( is_singular( 'message' ) ){
-
-                sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after');
-            }
-
-    }// end deprecated_single_course_single_main_content_hook
-
-    /**
-     * Deprecate the  old sensei modules
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_before_hook(){
+	}
 
-        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' );
+	/**
+	 * Deprecate the  old sensei modules after hooks
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_module_after_hook(){
 
-    }
-
-    /**
-     * Deprecate the  old sensei modules after hooks
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_module_after_hook(){
+		sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
 
-        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' );
+	}
 
-    }
+	/**
+	 * Deprecate the single message hooks for post types.
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_all_post_type_single_title_hooks(){
 
-    /**
-     * Deprecate the single message hooks for post types.
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_all_post_type_single_title_hooks(){
+		if( is_singular( 'sensei_message' ) ){
 
-        if( is_singular( 'sensei_message' ) ){
+			sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
 
-            sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' );
+		}
 
-        }
+	}
 
-    }
+	/**
+	 * course_single_meta function.
+	 *
+	 * @access public
+	 * @return void
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_course_single_meta_hooks() {
 
-    /**
-     * course_single_meta function.
-     *
-     * @access public
-     * @return void
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_course_single_meta_hooks() {
+		// deprecate all these hooks
+		sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
+		sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
 
-        // deprecate all these hooks
-        sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' );
-        sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' );
+	} // End deprecate_course_single_meta_hooks
 
-    } // End deprecate_course_single_meta_hooks
+	/**
+	 * Run the deprecated hooks on the single lesson page
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
 
-    /**
-     * Run the deprecated hooks on the single lesson page
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() {
+		if( is_singular( 'lesson' ) ){
 
-        if( is_singular( 'lesson' ) ){
+			sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
+			sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
 
-            sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content',  get_the_ID() );
-            sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content',  get_the_ID() );
+		}
 
-        }
+	}// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
 
-    }// end sensei_deprecate_single_lesson_breadcrumbs_and_comments_hooks
+	/**
+	 * Deprecate the hook sensei_lesson_course_signup.
+	 *
+	 * The hook content will be linked directly on the recommended
+	 * sensei_single_lesson_content_inside_after
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_course_signup_hook(){
 
-    /**
-     * Deprecate the hook sensei_lesson_course_signup.
-     *
-     * The hook content will be linked directly on the recommended
-     * sensei_single_lesson_content_inside_after
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_course_signup_hook(){
+		$lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
+		$user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
 
-        $lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true );
-        $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() );
+		if(  !$user_taking_course ) {
 
-        if(  !$user_taking_course ) {
+			sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
 
-            sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id );
+		}
+	}// end deprecate_sensei_lesson_course_signup_hook
 
-        }
-    }// end deprecate_sensei_lesson_course_signup_hook
+	/**
+	 * Running the deprecated hook: sensei_lesson_single_meta
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_meta_hook(){
 
-    /**
-     * Running the deprecated hook: sensei_lesson_single_meta
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_meta_hook(){
+		if ( sensei_can_user_view_lesson()  ) {
 
-        if ( sensei_can_user_view_lesson()  ) {
+			sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
 
-            sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' );
 
+		}
 
-        }
+	}// end deprecate_sensei_lesson_single_meta_hook
 
-    }// end deprecate_sensei_lesson_single_meta_hook
+	/**
+	 * Deprecate the sensei lesson single title hook
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_lesson_single_title(){
 
-    /**
-     * Deprecate the sensei lesson single title hook
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_lesson_single_title(){
+		sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-        sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+	}// end deprecate_sensei_lesson_single_title
 
-    }// end deprecate_sensei_lesson_single_title
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_single_main_content_hook(){
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_single_main_content_hook(){
+		sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
 
-        sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' );
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	/**
+	 * hook in the deperecated single main content to the lesson
+	 * @deprecated since 1.9.0
+	 */
+	public  static function deprecate_lesson_image_hook(){
 
-    /**
-     * hook in the deperecated single main content to the lesson
-     * @deprecated since 1.9.0
-     */
-    public  static function deprecate_lesson_image_hook(){
+		sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
 
-        sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() );
+	}// end sensei_deprecate_lesson_single_main_content_hook
 
-    }// end sensei_deprecate_lesson_single_main_content_hook
+	/**
+	 * hook in the deprecated sensei_login_form hook for backwards
+	 * compatibility
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_login_form_hook(){
 
-    /**
-     * hook in the deprecated sensei_login_form hook for backwards
-     * compatibility
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_login_form_hook(){
+		sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
 
-        sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' );
+	} // end deprecate_sensei_login_form_hook
 
-    } // end deprecate_sensei_login_form_hook
+	/**
+	 * Fire the sensei_complete_course action.
+	 *
+	 * This is just a backwards compatible function to add the action
+	 * to a template. This should not be used as the function from this
+	 * hook will be added directly to my-courses page via one of the hooks there.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_sensei_complete_course_hook(){
 
-    /**
-     * Fire the sensei_complete_course action.
-     *
-     * This is just a backwards compatible function to add the action
-     * to a template. This should not be used as the function from this
-     * hook will be added directly to my-courses page via one of the hooks there.
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_sensei_complete_course_hook(){
+		do_action( 'sensei_complete_course' );
 
-        do_action( 'sensei_complete_course' );
+	} //fire_sensei_complete_course_hook
 
-    } //fire_sensei_complete_course_hook
+	/**
+	 * Fire the frontend message hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function  fire_frontend_messages_hook(){
 
-    /**
-     * Fire the frontend message hook
-     *
-     * @since 1.9.0
-     */
-    public static function  fire_frontend_messages_hook(){
+		do_action( 'sensei_frontend_messages' );
 
-        do_action( 'sensei_frontend_messages' );
+	}// end sensei_complete_course_action
 
-    }// end sensei_complete_course_action
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_before.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_before_user_course_content_hook(){
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_before.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_before_user_course_content_hook(){
+		sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
 
-        sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() );
+	}// deprecate_sensei_before_user_course_content_hook
 
-    }// deprecate_sensei_before_user_course_content_hook
+	/**
+	 * deprecate the sensei_before_user_course_content hook in favor
+	 * of sensei_my_courses_content_inside_after hook.
+	 *
+	 * @deprected since 1.9.0
+	 */
+	public static function  deprecate_sensei_after_user_course_content_hook(){
 
-    /**
-     * deprecate the sensei_before_user_course_content hook in favor
-     * of sensei_my_courses_content_inside_after hook.
-     *
-     * @deprected since 1.9.0
-     */
-    public static function  deprecate_sensei_after_user_course_content_hook(){
+		sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
 
-        sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() );
+	}// deprecate_sensei_after_user_course_content_hook
 
-    }// deprecate_sensei_after_user_course_content_hook
+	/**
+	 * Deprecate the 2 main hooks on the archive message template
+	 *
+	 * @deprecated since 1.9.0
+	 * @since 1.9.0
+	 */
+	public static function deprecated_archive_message_hooks (){
 
-    /**
-     * Deprecate the 2 main hooks on the archive message template
-     *
-     * @deprecated since 1.9.0
-     * @since 1.9.0
-     */
-    public static function deprecated_archive_message_hooks (){
+		sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
+		sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
 
-        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' );
-        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' );
+	}
 
-    }
+	/**
+	 * Run the sensei_complete_quiz for those still hooking
+	 * into but deprecated it.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_complete_quiz_action(){
 
-    /**
-     * Run the sensei_complete_quiz for those still hooking
-     * into but deprecated it.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_complete_quiz_action(){
+		sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
 
-        sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' );
+	}
 
-    }
+	/**
+	 * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
+	 * it to provide user with a better alternative.
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_quiz_question_type_action(){
 
-    /**
-     * Run the sensei_quiz_question_type action for those still hooing into it, but depreate
-     * it to provide user with a better alternative.
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_quiz_question_type_action(){
+		// Question Type
+		global $sensei_question_loop;
+		$question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
+		sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
 
-        // Question Type
-        global $sensei_question_loop;
-        $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID);
-        sensei_do_deprecated_action('sensei_quiz_question_type', '1.9.0', 'sensei_quiz_question_inside_after', $question_type);
-
-    }
+	}
 
 
 	public static function the_register_button( $post_id = "" ){
@@ -675,9 +675,9 @@ 
 		global $current_user, $post;
 
 		if ( ! get_option('users_can_register')
-		     || 'course' != get_post_type( $post_id )
-		     || ! empty( $current_user->caps )
-		     || ! Sensei()->settings->get('access_permission')  ) {
+			 || 'course' != get_post_type( $post_id )
+			 || ! empty( $current_user->caps )
+			 || ! Sensei()->settings->get('access_permission')  ) {
 
 			return;
 

includes/class-sensei.php

Indentation +1007 added lines, -1007 removed lines

@@ -10,910 +10,910 @@ 
  */
 class Sensei_Main {
 
-    /**
-     * @var string
-     * Reference to the main plugin file
-     */
-    private $file;
-
-    /**
-     * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
-     * @since 1.8.0
-     */
-    protected static $_instance = null;
-
-    /**
-     * Main reference to the plugins current version
-     */
-    public $version;
-
-    /**
-     * Public token, referencing for the text domain.
-     */
-    public $token = 'woothemes-sensei';
-
-    /**
-     * Plugin url and path for use when access resources.
-     */
-    public $plugin_url;
-    public $plugin_path;
-    public $template_url;
-
-    /**
-     * @var Sensei_PostTypes
-     * All Sensei sub classes. Currently used to access functionality contained within
-     * within Sensei sub classes e.g. Sensei()->course->all_courses()
-     */
-    public $post_types;
-
-    /**
-     * @var WooThemes_Sensei_Settings
-     */
-    public $settings;
-
-    /**
-     * @var WooThemes_Sensei_Course_Results
-     */
-    public $course_results;
-
-    /**
-     * @var Sensei_Updates
-     */
-    public $updates;
-    /**
-     * @var WooThemes_Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var WooThemes_Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var WooThemes_Sensei_Quiz
-     */
-    public $quiz;
-
-    /**
-     * @var WooThemes_Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var WooThemes_Sensei_Admin
-     */
-    public $admin;
-
-    /**
-     * @var WooThemes_Sensei_Frontend
-     */
-    public $frontend;
-
-    /**
-     * @var Sensei_Notices
-     */
-    public $notices;
-
-    /**
-     * @var WooThemes_Sensei_Grading
-     */
-    public $grading;
-
-    /**
-     * @var WooThemes_Sensei_Emails
-     */
-    public $emails;
-
-    /**
-     * @var WooThemes_Sensei_Learner_Profiles
-     */
-    public $learner_profiles;
-
-    /**
-     * @var Sensei_Teacher
-     */
-    public $teacher;
-
-    /**
-     * @var WooThemes_Sensei_Learners
-     */
-    public $learners;
-
-    /**
-     * @var array
-     * Global instance for access to the permissions message shown
-     * when users do not have the right privileges to access resources.
-     */
-    public $permissions_message;
-
-    /**
-     * @var Sensei_Core_Modules Sensei Modules functionality
-     */
-    public $modules;
-
-    /**
-     * @var Sensei_Analysis
-     */
-    public $analysis;
-
-    /**
-     * Constructor method.
-     * @param  string $file The base file of the plugin.
-     * @since  1.0.0
-     */
-    public function __construct ( $file ) {
-
-        // Setup object data
-        $this->file = $file;
-        $this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
-        $this->plugin_path = trailingslashit( dirname( $file ) );
-        $this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
-
-        // Initialize the core Sensei functionality
-        $this->init();
-
-        // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
-
-        // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
-
-        // Image Sizes
-        $this->init_image_sizes();
-
-        // load all hooks
-        $this->load_hooks();
-
-    } // End __construct()
-
-    /**
-     * Load the foundations of Sensei.
-     * @since 1.9.0
-     */
-    protected function init(){
-
-        // Localisation
-        $this->load_plugin_textdomain();
-        add_action( 'init', array( $this, 'load_localisation' ), 0 );
-
-        // Setup settings
-        $this->settings = new Sensei_Settings();
-
-        // load the shortcode loader into memory, so as to listen to all for
-        // all shortcodes on the front end
-        new Sensei_Shortcode_Loader();
-
-    }
-
-    /**
-     * Global Sensei Instance
-     *
-     * Ensure that only one instance of the main Sensei class can be loaded.
-     *
-     * @since 1.8.0
-     * @static
-     * @see WC()
-     * @return WooThemes_Sensei Instance.
-     */
-    public static function instance() {
+	/**
+	 * @var string
+	 * Reference to the main plugin file
+	 */
+	private $file;
+
+	/**
+	 * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
+	 * @since 1.8.0
+	 */
+	protected static $_instance = null;
+
+	/**
+	 * Main reference to the plugins current version
+	 */
+	public $version;
+
+	/**
+	 * Public token, referencing for the text domain.
+	 */
+	public $token = 'woothemes-sensei';
+
+	/**
+	 * Plugin url and path for use when access resources.
+	 */
+	public $plugin_url;
+	public $plugin_path;
+	public $template_url;
+
+	/**
+	 * @var Sensei_PostTypes
+	 * All Sensei sub classes. Currently used to access functionality contained within
+	 * within Sensei sub classes e.g. Sensei()->course->all_courses()
+	 */
+	public $post_types;
+
+	/**
+	 * @var WooThemes_Sensei_Settings
+	 */
+	public $settings;
+
+	/**
+	 * @var WooThemes_Sensei_Course_Results
+	 */
+	public $course_results;
+
+	/**
+	 * @var Sensei_Updates
+	 */
+	public $updates;
+	/**
+	 * @var WooThemes_Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var WooThemes_Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var WooThemes_Sensei_Quiz
+	 */
+	public $quiz;
+
+	/**
+	 * @var WooThemes_Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var WooThemes_Sensei_Admin
+	 */
+	public $admin;
+
+	/**
+	 * @var WooThemes_Sensei_Frontend
+	 */
+	public $frontend;
+
+	/**
+	 * @var Sensei_Notices
+	 */
+	public $notices;
+
+	/**
+	 * @var WooThemes_Sensei_Grading
+	 */
+	public $grading;
+
+	/**
+	 * @var WooThemes_Sensei_Emails
+	 */
+	public $emails;
+
+	/**
+	 * @var WooThemes_Sensei_Learner_Profiles
+	 */
+	public $learner_profiles;
+
+	/**
+	 * @var Sensei_Teacher
+	 */
+	public $teacher;
+
+	/**
+	 * @var WooThemes_Sensei_Learners
+	 */
+	public $learners;
+
+	/**
+	 * @var array
+	 * Global instance for access to the permissions message shown
+	 * when users do not have the right privileges to access resources.
+	 */
+	public $permissions_message;
+
+	/**
+	 * @var Sensei_Core_Modules Sensei Modules functionality
+	 */
+	public $modules;
+
+	/**
+	 * @var Sensei_Analysis
+	 */
+	public $analysis;
+
+	/**
+	 * Constructor method.
+	 * @param  string $file The base file of the plugin.
+	 * @since  1.0.0
+	 */
+	public function __construct ( $file ) {
+
+		// Setup object data
+		$this->file = $file;
+		$this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
+		$this->plugin_path = trailingslashit( dirname( $file ) );
+		$this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
+
+		// Initialize the core Sensei functionality
+		$this->init();
+
+		// Installation
+		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+
+		// Run this on activation.
+		register_activation_hook( $this->file, array( $this, 'activation' ) );
+
+		// Image Sizes
+		$this->init_image_sizes();
+
+		// load all hooks
+		$this->load_hooks();
+
+	} // End __construct()
+
+	/**
+	 * Load the foundations of Sensei.
+	 * @since 1.9.0
+	 */
+	protected function init(){
+
+		// Localisation
+		$this->load_plugin_textdomain();
+		add_action( 'init', array( $this, 'load_localisation' ), 0 );
+
+		// Setup settings
+		$this->settings = new Sensei_Settings();
+
+		// load the shortcode loader into memory, so as to listen to all for
+		// all shortcodes on the front end
+		new Sensei_Shortcode_Loader();
+
+	}
+
+	/**
+	 * Global Sensei Instance
+	 *
+	 * Ensure that only one instance of the main Sensei class can be loaded.
+	 *
+	 * @since 1.8.0
+	 * @static
+	 * @see WC()
+	 * @return WooThemes_Sensei Instance.
+	 */
+	public static function instance() {
 
-        if ( is_null( self::$_instance ) ) {
+		if ( is_null( self::$_instance ) ) {
 
-            //Sensei requires a reference to the main Sensei plugin file
-            $sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
+			//Sensei requires a reference to the main Sensei plugin file
+			$sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
 
-            self::$_instance = new self( $sensei_main_plugin_file  );
+			self::$_instance = new self( $sensei_main_plugin_file  );
 
-            // load the global class objects needed throughout Sensei
-            self::$_instance->initialize_global_objects();
+			// load the global class objects needed throughout Sensei
+			self::$_instance->initialize_global_objects();
 
-        }
+		}
 
-        return self::$_instance;
+		return self::$_instance;
 
-    } // end instance()
+	} // end instance()
 
-    /**
-     * This function is linked into the activation
-     * hook to reset flush the urls to ensure Sensei post types show up.
-     *
-     * @since 1.9.0
-     *
-     * @param $plugin
-     */
-    public static function activation_flush_rules( $plugin ){
+	/**
+	 * This function is linked into the activation
+	 * hook to reset flush the urls to ensure Sensei post types show up.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $plugin
+	 */
+	public static function activation_flush_rules( $plugin ){
 
-        if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
+		if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
 
-            flush_rewrite_rules(true);
+			flush_rewrite_rules(true);
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Cloning is forbidden.
-     * @since 1.8.0
-     */
-    public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
-    }
+	/**
+	 * Cloning is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __clone() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
+	}
 
-    /**
-     * Unserializing instances of this class is forbidden.
-     * @since 1.8.0
-     */
-    public function __wakeup() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
-    }
+	/**
+	 * Unserializing instances of this class is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __wakeup() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' );
+	}
 
-    /**
-     * Load the properties for the main Sensei object
-     *
-     * @since 1.9.0
-     */
-    public function initialize_global_objects(){
+	/**
+	 * Load the properties for the main Sensei object
+	 *
+	 * @since 1.9.0
+	 */
+	public function initialize_global_objects(){
 
-        // Setup post types.
-        $this->post_types = new Sensei_PostTypes();
+		// Setup post types.
+		$this->post_types = new Sensei_PostTypes();
 
-        // Lad the updates class
-        $this->updates = new Sensei_Updates( $this );
+		// Lad the updates class
+		$this->updates = new Sensei_Updates( $this );
 
-        // Load Course Results Class
-        $this->course_results = new Sensei_Course_Results();
+		// Load Course Results Class
+		$this->course_results = new Sensei_Course_Results();
 
-        // Load the teacher role
-        $this->teacher = new Sensei_Teacher();
+		// Load the teacher role
+		$this->teacher = new Sensei_Teacher();
 
-        // Add the Course class
-        $this->course = $this->post_types->course;
+		// Add the Course class
+		$this->course = $this->post_types->course;
 
-        // Add the lesson class
-        $this->lesson = $this->post_types->lesson;
+		// Add the lesson class
+		$this->lesson = $this->post_types->lesson;
 
-        // Add the question class
-        $this->question = $this->post_types->question;
+		// Add the question class
+		$this->question = $this->post_types->question;
 
-        //Add the quiz class
-        $this->quiz = $this->post_types->quiz;
+		//Add the quiz class
+		$this->quiz = $this->post_types->quiz;
 
-        // load the modules class after all plugsin are loaded
-	    $this->load_modules_class();
+		// load the modules class after all plugsin are loaded
+		$this->load_modules_class();
 
-        // Load Learner Management Functionality
-        $this->learners = new Sensei_Learner_Management( $this->file );
+		// Load Learner Management Functionality
+		$this->learners = new Sensei_Learner_Management( $this->file );
 
-        // Differentiate between administration and frontend logic.
-        if ( is_admin() ) {
+		// Differentiate between administration and frontend logic.
+		if ( is_admin() ) {
 
-            // Load Admin Welcome class
-            new Sensei_Welcome();
+			// Load Admin Welcome class
+			new Sensei_Welcome();
 
-            // Load Admin Class
-            $this->admin = new Sensei_Admin( $this->file );
+			// Load Admin Class
+			$this->admin = new Sensei_Admin( $this->file );
 
-            // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $this->file );
+			// Load Analysis Reports
+			$this->analysis = new Sensei_Analysis( $this->file );
 
-        } else {
+		} else {
 
-            // Load Frontend Class
-            $this->frontend = new Sensei_Frontend();
+			// Load Frontend Class
+			$this->frontend = new Sensei_Frontend();
 
-            // Load notice Class
-            $this->notices = new Sensei_Notices();
+			// Load notice Class
+			$this->notices = new Sensei_Notices();
 
-            // Load built in themes support integration
-            new Sensei_Theme_Integration_Loader();
+			// Load built in themes support integration
+			new Sensei_Theme_Integration_Loader();
 
 
-        }
+		}
 
-        // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $this->file );
+		// Load Grading Functionality
+		$this->grading = new Sensei_Grading( $this->file );
 
-        // Load Email Class
-        $this->emails = new Sensei_Emails( $this->file );
+		// Load Email Class
+		$this->emails = new Sensei_Emails( $this->file );
 
-        // Load Learner Profiles Class
-        $this->learner_profiles = new Sensei_Learner_Profiles();
+		// Load Learner Profiles Class
+		$this->learner_profiles = new Sensei_Learner_Profiles();
 
-    }
+	}
 
-    /**
-     * Initialize all Sensei hooks
-     *
-     * @since 1.9.0
-     */
-    public function load_hooks(){
+	/**
+	 * Initialize all Sensei hooks
+	 *
+	 * @since 1.9.0
+	 */
+	public function load_hooks(){
 
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+		add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
 
-        // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
+		// Filter comment counts
+		add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
 
-        add_action( 'body_class', array( $this, 'body_class' ) );
+		add_action( 'body_class', array( $this, 'body_class' ) );
 
-        // Check for and activate JetPack LaTeX support
-        add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules
+		// Check for and activate JetPack LaTeX support
+		add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules
 
-        // check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
-        add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
+		// check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
+		add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
 
-    }
+	}
 
-    /**
-     * Run Sensei updates.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function run_updates() {
-        // Run updates if administrator
-        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
+	/**
+	 * Run Sensei updates.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function run_updates() {
+		// Run updates if administrator
+		if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
 
-            $this->updates->update();
+			$this->updates->update();
 
-        } // End If Statement
-    } // End run_updates()
+		} // End If Statement
+	} // End run_updates()
 
-    /**
-     * Register the widgets.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function register_widgets () {
-        // Widget List (key => value is filename => widget class).
-        $widget_list = apply_filters( 'sensei_registered_widgets_list', array( 	'course-component' 	=> 'Course_Component',
-                'lesson-component' 	=> 'Lesson_Component',
-                'course-categories' => 'Course_Categories',
-                'category-courses' 	=> 'Category_Courses' )
-        );
-        foreach ( $widget_list as $key => $value ) {
-            if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
-            }
-        } // End For Loop
+	/**
+	 * Register the widgets.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function register_widgets () {
+		// Widget List (key => value is filename => widget class).
+		$widget_list = apply_filters( 'sensei_registered_widgets_list', array( 	'course-component' 	=> 'Course_Component',
+				'lesson-component' 	=> 'Lesson_Component',
+				'course-categories' => 'Course_Categories',
+				'category-courses' 	=> 'Category_Courses' )
+		);
+		foreach ( $widget_list as $key => $value ) {
+			if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) {
+				require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
+				register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+			}
+		} // End For Loop
 
-        do_action( 'sensei_register_widgets' );
+		do_action( 'sensei_register_widgets' );
 
-    } // End register_widgets()
+	} // End register_widgets()
 
-    /**
-     * Load the plugin's localisation file.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function load_localisation () {
+	/**
+	 * Load the plugin's localisation file.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function load_localisation () {
 
-        load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+		load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
 
-    } // End load_localisation()
+	} // End load_localisation()
 
-    /**
-     * Load the plugin textdomain from the main WordPress "languages" folder.
-     * @access  public
-     * @since   1.0.0
-     * @return  void
-     */
-    public function load_plugin_textdomain () {
-
-        $domain = 'woothemes-sensei';
-        // The "plugin_locale" filter is also used in load_plugin_textdomain()
-        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
-        load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' );
-        load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' );
-
-    } // End load_plugin_textdomain()
-
-    /**
-     * Run on activation.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function activation () {
-
-        $this->register_plugin_version();
-
-    } // End activation()
-
-
-    /**
-     * Register activation hooks.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function install () {
-
-        register_activation_hook( $this->file, array( $this, 'activate_sensei' ) );
-        register_activation_hook( $this->file, 'flush_rewrite_rules' );
-
-    } // End install()
-
-
-    /**
-     * Run on activation of the plugin.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    public function activate_sensei () {
-
-        update_option( 'skip_install_sensei_pages', 0 );
-        update_option( 'sensei_installed', 1 );
-
-    } // End activate_sensei()
-
-    /**
-     * Register the plugin's version.
-     * @access public
-     * @since  1.0.0
-     * @return void
-     */
-    private function register_plugin_version () {
-        if ( $this->version != '' ) {
-
-            update_option( 'woothemes-sensei-version', $this->version );
-
-        }
-    } // End register_plugin_version()
-
-    /**
-     * Ensure that "post-thumbnails" support is available for those themes that don't register it.
-     * @access  public
-     * @since   1.0.1
-     * @return  void
-     */
-    public function ensure_post_thumbnails_support () {
+	/**
+	 * Load the plugin textdomain from the main WordPress "languages" folder.
+	 * @access  public
+	 * @since   1.0.0
+	 * @return  void
+	 */
+	public function load_plugin_textdomain () {
+
+		$domain = 'woothemes-sensei';
+		// The "plugin_locale" filter is also used in load_plugin_textdomain()
+		$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+		load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' );
+		load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+
+	} // End load_plugin_textdomain()
+
+	/**
+	 * Run on activation.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function activation () {
+
+		$this->register_plugin_version();
+
+	} // End activation()
+
+
+	/**
+	 * Register activation hooks.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function install () {
+
+		register_activation_hook( $this->file, array( $this, 'activate_sensei' ) );
+		register_activation_hook( $this->file, 'flush_rewrite_rules' );
+
+	} // End install()
+
+
+	/**
+	 * Run on activation of the plugin.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	public function activate_sensei () {
+
+		update_option( 'skip_install_sensei_pages', 0 );
+		update_option( 'sensei_installed', 1 );
+
+	} // End activate_sensei()
+
+	/**
+	 * Register the plugin's version.
+	 * @access public
+	 * @since  1.0.0
+	 * @return void
+	 */
+	private function register_plugin_version () {
+		if ( $this->version != '' ) {
+
+			update_option( 'woothemes-sensei-version', $this->version );
+
+		}
+	} // End register_plugin_version()
+
+	/**
+	 * Ensure that "post-thumbnails" support is available for those themes that don't register it.
+	 * @access  public
+	 * @since   1.0.1
+	 * @return  void
+	 */
+	public function ensure_post_thumbnails_support () {
 
-        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
+		if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
 
-    } // End ensure_post_thumbnails_support()
+	} // End ensure_post_thumbnails_support()
 
-    /**
-     * template_loader function.
-     *
-     * @access public
-     * @param mixed $template
-     * @return void
-     * @deprecated
-     */
-    public function template_loader ( $template = '' ) {
+	/**
+	 * template_loader function.
+	 *
+	 * @access public
+	 * @param mixed $template
+	 * @return void
+	 * @deprecated
+	 */
+	public function template_loader ( $template = '' ) {
 
-        _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
-        Sensei_Templates::template_loader( $template );
+		_deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
+		Sensei_Templates::template_loader( $template );
 
-    } // End template_loader()
+	} // End template_loader()
 
-    /**
-     * Determine the relative path to the plugin's directory.
-     * @access public
-     * @since  1.0.0
-     * @return string $sensei_plugin_path
-     */
-    public function plugin_path () {
+	/**
+	 * Determine the relative path to the plugin's directory.
+	 * @access public
+	 * @since  1.0.0
+	 * @return string $sensei_plugin_path
+	 */
+	public function plugin_path () {
 
-        if ( $this->plugin_path ) {
+		if ( $this->plugin_path ) {
 
-            $sensei_plugin_path =  $this->plugin_path;
+			$sensei_plugin_path =  $this->plugin_path;
 
-        }else{
+		}else{
 
-            $sensei_plugin_path = plugin_dir_path( __FILE__ );
+			$sensei_plugin_path = plugin_dir_path( __FILE__ );
 
-        }
+		}
 
-        return $sensei_plugin_path;
+		return $sensei_plugin_path;
 
-    } // End plugin_path()
+	} // End plugin_path()
 
-    /**
-     * Retrieve the ID of a specified page setting.
-     * @access public
-     * @since  1.0.0
-     * @param  string $page
-     * @return int
-     */
-    public function get_page_id ( $page ) {
-        $page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
-        return ( $page ) ? $page : -1;
-    } // End get_page_id()
+	/**
+	 * Retrieve the ID of a specified page setting.
+	 * @access public
+	 * @since  1.0.0
+	 * @param  string $page
+	 * @return int
+	 */
+	public function get_page_id ( $page ) {
+		$page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) );
+		return ( $page ) ? $page : -1;
+	} // End get_page_id()
 
-    /**
-     * check_user_permissions function.
-     *
-     * @access public
-     * @param string $page (default: '')
-     *
-     * @return bool
-     */
-    public function check_user_permissions ( $page = '' ) {
+	/**
+	 * check_user_permissions function.
+	 *
+	 * @access public
+	 * @param string $page (default: '')
+	 *
+	 * @return bool
+	 */
+	public function check_user_permissions ( $page = '' ) {
 
-        global $current_user, $post;
+		global $current_user, $post;
 
-        $user_allowed = false;
+		$user_allowed = false;
 
-        switch ( $page ) {
-	        case 'course-single':
-		        // check for prerequisite course or lesson,
-		        $course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true );
-		        $update_course          = Sensei_WC::course_update( $post->ID );
+		switch ( $page ) {
+			case 'course-single':
+				// check for prerequisite course or lesson,
+				$course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true );
+				$update_course          = Sensei_WC::course_update( $post->ID );
 
-		        // Count completed lessons
-		        if ( 0 < absint( $course_prerequisite_id ) ) {
+				// Count completed lessons
+				if ( 0 < absint( $course_prerequisite_id ) ) {
 
-			        $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
+					$prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
 
-		        } else {
-			        $prerequisite_complete = true;
-		        } // End If Statement
+				} else {
+					$prerequisite_complete = true;
+				} // End If Statement
 
-		        // Handles restrictions on the course
-		        if ( ( ! $prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) ) {
+				// Handles restrictions on the course
+				if ( ( ! $prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) ) {
 
-			        $user_allowed = false;
-			        $course_link  = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-			        $this->notices->add_notice( sprintf( __( 'Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link ), 'info' );
+					$user_allowed = false;
+					$course_link  = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->notices->add_notice( sprintf( __( 'Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link ), 'info' );
 
-		        } elseif( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $post->ID ) && ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
+				} elseif( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $post->ID ) && ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
 
-			        $message = sprintf( __( 'Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei' ), '<a href="'.sensei_user_login_url().'">', '</a>' );
-			        $this->notices->add_notice( $message, 'info' );
+					$message = sprintf( __( 'Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei' ), '<a href="'.sensei_user_login_url().'">', '</a>' );
+					$this->notices->add_notice( $message, 'info' );
 
 
-		        } elseif ( ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
+				} elseif ( ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) {
 
 					// users who haven't started the course are allowed to view it
-			        $user_allowed                         = true;
-
-
-
-		        } else  {
-
-                    $user_allowed = true;
-
-                } // End If Statement
-                break;
-            case 'lesson-single':
-                // Check for WC purchase
-                $lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
-
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                $is_preview = Sensei_Utils::is_preview_lesson( $post->ID );
-
-                if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
-                    $user_allowed = true;
-                } elseif( $this->access_settings() && false == $is_preview ) {
-
-                    $user_allowed = true;
-
-                } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                    if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            $this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link );
-                        }
-                    } else {
-                        if ( $is_preview ) {
-                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            /** This filter is documented in class-woothemes-sensei-frontend.php */
-                            $this->permissions_message['message'] =  sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
-                        }
-                    } // End If Statement
-                } // End If Statement
-                break;
-            case 'quiz-single':
-                $lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true );
-                $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true );
-
-                $update_course = Sensei_WC::course_update( $lesson_course_id );
-                if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
-
-                    // Check for prerequisite lesson for this quiz
-                    $lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true);
-                    $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID);
-
-                    // Handle restrictions
-                    if( sensei_all_access() ) {
-
-                        $user_allowed = true;
-
-                    } else {
-
-                        if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) {
-
-                            $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                            $lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>';
-                            $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link );
-
-                        } else {
-
-                            $user_allowed = true;
-
-                        } // End If Statement
-                    } // End If Statement
-                } elseif( $this->access_settings() ) {
-                    // Check if the user has started the course
-
-                    if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) {
-
-                        $user_allowed = false;
-                        $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                        $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                        $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
-                        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
-                            $this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
-                        } else {
-                            $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
-                        } // End If Statement
-                    } else {
-                        $user_allowed = true;
-                    } // End If Statement
-                } else {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link );
-                } // End If Statement
-                break;
-            default:
-                $user_allowed = true;
-                break;
-
-        } // End Switch Statement
-
-        /**
-         * filter the permissions message shown on sensei post types.
-         *
-         * @since 1.8.7
-         *
-         * @param array $permissions_message{
-         *
-         *   @type string $title
-         *   @type string $message
-         *
-         * }
-         * @param string $post_id
-         */
-        $this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
+					$user_allowed                         = true;
+
+
+
+				} else  {
+
+					$user_allowed = true;
+
+				} // End If Statement
+				break;
+			case 'lesson-single':
+				// Check for WC purchase
+				$lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true );
+
+				$update_course = Sensei_WC::course_update( $lesson_course_id );
+				$is_preview = Sensei_Utils::is_preview_lesson( $post->ID );
+
+				if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+					$user_allowed = true;
+				} elseif( $this->access_settings() && false == $is_preview ) {
+
+					$user_allowed = true;
+
+				} else {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
+					if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
+						if ( $is_preview ) {
+							$this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+						} else {
+							$this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link );
+						}
+					} else {
+						if ( $is_preview ) {
+							$this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link );
+						} else {
+							/** This filter is documented in class-woothemes-sensei-frontend.php */
+							$this->permissions_message['message'] =  sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link );
+						}
+					} // End If Statement
+				} // End If Statement
+				break;
+			case 'quiz-single':
+				$lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true );
+				$lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true );
+
+				$update_course = Sensei_WC::course_update( $lesson_course_id );
+				if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
+
+					// Check for prerequisite lesson for this quiz
+					$lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true);
+					$user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID);
+
+					// Handle restrictions
+					if( sensei_all_access() ) {
+
+						$user_allowed = true;
+
+					} else {
+
+						if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) {
+
+							$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+							$lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>';
+							$this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link );
+
+						} else {
+
+							$user_allowed = true;
+
+						} // End If Statement
+					} // End If Statement
+				} elseif( $this->access_settings() ) {
+					// Check if the user has started the course
+
+					if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) {
+
+						$user_allowed = false;
+						$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+						$course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+						$wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true );
+						if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) {
+							$this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+						} else {
+							$this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link );
+						} // End If Statement
+					} else {
+						$user_allowed = true;
+					} // End If Statement
+				} else {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link );
+				} // End If Statement
+				break;
+			default:
+				$user_allowed = true;
+				break;
+
+		} // End Switch Statement
+
+		/**
+		 * filter the permissions message shown on sensei post types.
+		 *
+		 * @since 1.8.7
+		 *
+		 * @param array $permissions_message{
+		 *
+		 *   @type string $title
+		 *   @type string $message
+		 *
+		 * }
+		 * @param string $post_id
+		 */
+		$this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
 
 		// add the permissions message to the stack
 
-        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
-            $user_allowed = true;
-        }
-
-        /**
-         * Filter the permissions check final result. Which determines if the user has
-         * access to the given page.
-         *
-         * @since 1.0
-         *
-         * @param boolean $user_allowed
-         * @param integer $user_id
-         *
-         */
-        return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID );
-
-    } // End get_placeholder_image()
-
-
-    /**
-     * Check if visitors have access permission. If the "access_permission" setting is active, do a log in check.
-     * @since  1.0.0
-     * @access public
-     * @return bool
-     */
-    public function access_settings () {
-
-        if( sensei_all_access() ) return true;
-
-        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
-            if ( is_user_logged_in() ) {
-                return true;
-            } else {
-                return false;
-            } // End If Statement
-        } else {
-            return true;
-        } // End If Statement
-    } // End access_settings()
-
-    /**
-     * load_class loads in class files
-     * @since   1.2.0
-     * @access  public
-     * @return  void
-     */
-    public function load_class ( $class_name = '' ) {
-        if ( '' != $class_name && '' != $this->token ) {
-            require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' );
-        } // End If Statement
-    } // End load_class()
-
-    /**
-     * Filtering wp_count_comments to ensure that Sensei comments are ignored
-     * @since   1.4.0
-     * @access  public
-     * @param  array   $comments
-     * @param  integer $post_id
-     * @return array
-     */
-    public function sensei_count_comments( $comments, $post_id ) {
-        global $wpdb;
-
-        $post_id = (int) $post_id;
-
-        $count = wp_cache_get("comments-{$post_id}", 'counts');
-
-        if ( false !== $count ) {
-            return $count;
-        }
-
-        $statuses = array( '' ); // Default to the WP normal comments
-        $stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A );
-        foreach ( (array) $stati AS $status ) {
-            if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) {
-                $statuses[] = $status['comment_type'];
-            }
-        }
-        $where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
-
-        if ( $post_id > 0 )
-            $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
-
-        $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
-
-        $total = 0;
-        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
-        foreach ( (array) $count as $row ) {
-            // Don't count post-trashed toward totals
-            if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
-                $total += $row['num_comments'];
-            if ( isset( $approved[$row['comment_approved']] ) )
-                $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
-        }
-
-        $stats['total_comments'] = $total;
-        foreach ( $approved as $key ) {
-            if ( empty($stats[$key]) )
-                $stats[$key] = 0;
-        }
-
-        $stats = (object) $stats;
-        wp_cache_set("comments-{$post_id}", $stats, 'counts');
-
-        return $stats;
-    }
-
-    /**
-     * Init images.
-     *
-     * @since 1.4.5
-     * @access public
-     * @return void
-     */
-    public function init_image_sizes() {
-        $course_archive_thumbnail 	= $this->get_image_size( 'course_archive_image' );
-        $course_single_thumbnail	= $this->get_image_size( 'course_single_image' );
-        $lesson_archive_thumbnail 	= $this->get_image_size( 'lesson_archive_image' );
-        $lesson_single_thumbnail	= $this->get_image_size( 'lesson_single_image' );
-
-        add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] );
-        add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] );
-        add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] );
-        add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] );
-    }
-
-    /**
-     * Get an image size.
-     *
-     * Variable is filtered by sensei_get_image_size_{image_size}
-     *
-     * @since 1.4.5
-     * @access public
-     * @param mixed $image_size
-     * @return string
-     */
-    public function get_image_size( $image_size ) {
-
-        // Only return sizes we define in settings
-        if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) )
-            return apply_filters( 'sensei_get_image_size_' . $image_size, '' );
-
-        if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) {
-            $this->settings->settings[ $image_size . '_width' ] = false;
-        }
-        if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) {
-            $this->settings->settings[ $image_size . '_height' ] = false;
-        }
-        if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) {
-            $this->settings->settings[ $image_size . '_hard_crop' ] = false;
-        }
-
-        $size = array_filter( array(
-            'width' => $this->settings->settings[ $image_size . '_width' ],
-            'height' => $this->settings->settings[ $image_size . '_height' ],
-            'crop' => $this->settings->settings[ $image_size . '_hard_crop' ]
-        ) );
-
-        $size['width'] 	= isset( $size['width'] ) ? $size['width'] : '100';
-        $size['height'] = isset( $size['height'] ) ? $size['height'] : '100';
-        $size['crop'] 	= isset( $size['crop'] ) ? $size['crop'] : 0;
-
-        return apply_filters( 'sensei_get_image_size_' . $image_size, $size );
-    }
-
-    public function body_class( $classes ) {
-        if( is_sensei() ) {
-            $classes[] = 'sensei';
-        }
-        return $classes;
-    }
-
-    /**
-     * Checks that the Jetpack Beautiful Maths module has been activated to support LaTeX within question titles and answers
-     *
-     * @return null
-     * @since 1.7.0
-     */
-    public function jetpack_latex_support() {
-        if ( function_exists( 'latex_markup') ) {
-            add_filter( 'sensei_question_title', 'latex_markup' );
-            add_filter( 'sensei_answer_text', 'latex_markup' );
-        }
-    }
-
-    /**
-     * Load the module functionality.
-     *
-     * This function is hooked into plugins_loaded to avoid conflicts with
-     * the retired modules extension.
-     *
-     * @since 1.8.0
-     */
-    public function load_modules_class(){
-        global $sensei_modules;
-
-        if( !class_exists( 'Sensei_Modules' )
-            &&  'Sensei_Modules' != get_class( $sensei_modules ) ) {
-
-            //Load the modules class
-            require_once( 'class-sensei-modules.php');
-            Sensei()->modules = new Sensei_Core_Modules( $this->file );
-
-        }else{
-            // fallback for people still using the modules extension.
-            global $sensei_modules;
-            Sensei()->modules = $sensei_modules;
-            add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 );
-        }
-    }
-
-    /**
-     * Tell the user to that the modules extension is no longer needed.
-     *
-     * @since 1.8.0
-     */
-    public function disable_sensei_modules_extension(){ ?>
+		if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
+			$user_allowed = true;
+		}
+
+		/**
+		 * Filter the permissions check final result. Which determines if the user has
+		 * access to the given page.
+		 *
+		 * @since 1.0
+		 *
+		 * @param boolean $user_allowed
+		 * @param integer $user_id
+		 *
+		 */
+		return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID );
+
+	} // End get_placeholder_image()
+
+
+	/**
+	 * Check if visitors have access permission. If the "access_permission" setting is active, do a log in check.
+	 * @since  1.0.0
+	 * @access public
+	 * @return bool
+	 */
+	public function access_settings () {
+
+		if( sensei_all_access() ) return true;
+
+		if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
+			if ( is_user_logged_in() ) {
+				return true;
+			} else {
+				return false;
+			} // End If Statement
+		} else {
+			return true;
+		} // End If Statement
+	} // End access_settings()
+
+	/**
+	 * load_class loads in class files
+	 * @since   1.2.0
+	 * @access  public
+	 * @return  void
+	 */
+	public function load_class ( $class_name = '' ) {
+		if ( '' != $class_name && '' != $this->token ) {
+			require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' );
+		} // End If Statement
+	} // End load_class()
+
+	/**
+	 * Filtering wp_count_comments to ensure that Sensei comments are ignored
+	 * @since   1.4.0
+	 * @access  public
+	 * @param  array   $comments
+	 * @param  integer $post_id
+	 * @return array
+	 */
+	public function sensei_count_comments( $comments, $post_id ) {
+		global $wpdb;
+
+		$post_id = (int) $post_id;
+
+		$count = wp_cache_get("comments-{$post_id}", 'counts');
+
+		if ( false !== $count ) {
+			return $count;
+		}
+
+		$statuses = array( '' ); // Default to the WP normal comments
+		$stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A );
+		foreach ( (array) $stati AS $status ) {
+			if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) {
+				$statuses[] = $status['comment_type'];
+			}
+		}
+		$where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
+
+		if ( $post_id > 0 )
+			$where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+
+		$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
+
+		$total = 0;
+		$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
+		foreach ( (array) $count as $row ) {
+			// Don't count post-trashed toward totals
+			if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+				$total += $row['num_comments'];
+			if ( isset( $approved[$row['comment_approved']] ) )
+				$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
+		}
+
+		$stats['total_comments'] = $total;
+		foreach ( $approved as $key ) {
+			if ( empty($stats[$key]) )
+				$stats[$key] = 0;
+		}
+
+		$stats = (object) $stats;
+		wp_cache_set("comments-{$post_id}", $stats, 'counts');
+
+		return $stats;
+	}
+
+	/**
+	 * Init images.
+	 *
+	 * @since 1.4.5
+	 * @access public
+	 * @return void
+	 */
+	public function init_image_sizes() {
+		$course_archive_thumbnail 	= $this->get_image_size( 'course_archive_image' );
+		$course_single_thumbnail	= $this->get_image_size( 'course_single_image' );
+		$lesson_archive_thumbnail 	= $this->get_image_size( 'lesson_archive_image' );
+		$lesson_single_thumbnail	= $this->get_image_size( 'lesson_single_image' );
+
+		add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] );
+		add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] );
+		add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] );
+		add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] );
+	}
+
+	/**
+	 * Get an image size.
+	 *
+	 * Variable is filtered by sensei_get_image_size_{image_size}
+	 *
+	 * @since 1.4.5
+	 * @access public
+	 * @param mixed $image_size
+	 * @return string
+	 */
+	public function get_image_size( $image_size ) {
+
+		// Only return sizes we define in settings
+		if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) )
+			return apply_filters( 'sensei_get_image_size_' . $image_size, '' );
+
+		if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) {
+			$this->settings->settings[ $image_size . '_width' ] = false;
+		}
+		if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) {
+			$this->settings->settings[ $image_size . '_height' ] = false;
+		}
+		if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) {
+			$this->settings->settings[ $image_size . '_hard_crop' ] = false;
+		}
+
+		$size = array_filter( array(
+			'width' => $this->settings->settings[ $image_size . '_width' ],
+			'height' => $this->settings->settings[ $image_size . '_height' ],
+			'crop' => $this->settings->settings[ $image_size . '_hard_crop' ]
+		) );
+
+		$size['width'] 	= isset( $size['width'] ) ? $size['width'] : '100';
+		$size['height'] = isset( $size['height'] ) ? $size['height'] : '100';
+		$size['crop'] 	= isset( $size['crop'] ) ? $size['crop'] : 0;
+
+		return apply_filters( 'sensei_get_image_size_' . $image_size, $size );
+	}
+
+	public function body_class( $classes ) {
+		if( is_sensei() ) {
+			$classes[] = 'sensei';
+		}
+		return $classes;
+	}
+
+	/**
+	 * Checks that the Jetpack Beautiful Maths module has been activated to support LaTeX within question titles and answers
+	 *
+	 * @return null
+	 * @since 1.7.0
+	 */
+	public function jetpack_latex_support() {
+		if ( function_exists( 'latex_markup') ) {
+			add_filter( 'sensei_question_title', 'latex_markup' );
+			add_filter( 'sensei_answer_text', 'latex_markup' );
+		}
+	}
+
+	/**
+	 * Load the module functionality.
+	 *
+	 * This function is hooked into plugins_loaded to avoid conflicts with
+	 * the retired modules extension.
+	 *
+	 * @since 1.8.0
+	 */
+	public function load_modules_class(){
+		global $sensei_modules;
+
+		if( !class_exists( 'Sensei_Modules' )
+			&&  'Sensei_Modules' != get_class( $sensei_modules ) ) {
+
+			//Load the modules class
+			require_once( 'class-sensei-modules.php');
+			Sensei()->modules = new Sensei_Core_Modules( $this->file );
+
+		}else{
+			// fallback for people still using the modules extension.
+			global $sensei_modules;
+			Sensei()->modules = $sensei_modules;
+			add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 );
+		}
+	}
+
+	/**
+	 * Tell the user to that the modules extension is no longer needed.
+	 *
+	 * @since 1.8.0
+	 */
+	public function disable_sensei_modules_extension(){ ?>
         <div class="notice updated fade">
             <p>
                 <?php
-                $plugin_manage_url = admin_url().'plugins.php#sensei-modules';
-                $plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> ';
-                ?>
+				$plugin_manage_url = admin_url().'plugins.php#sensei-modules';
+				$plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> ';
+				?>
                 <strong> Modules are now included in Sensei,</strong> so you no longer need the Sensei Modules extension.
                 Please deactivate and delete it from your <?php echo $plugin_link_element; ?>. (This will not affect your existing modules).
             </p>
@@ -921,200 +921,200 @@ 
 
     <?php }// end function
 
-    /**
-     * Sensei wide rewrite flush call.
-     *
-     * To use this simply update the option 'sensei_flush_rewrite_rules' to 1
-     *
-     * After the option is one the Rules will be flushed.
-     *
-     * @since 1.9.0
-     */
-    public function flush_rewrite_rules(){
-
-        // ensures that the rewrite rules are flushed on the second
-        // attempt. This ensure that the settings for any other process
-        // have been completed and saved to the database before we refresh the
-        // rewrite rules.
-        $option =  get_option('sensei_flush_rewrite_rules');
-        if( '1' == $option ) {
-
-            update_option('sensei_flush_rewrite_rules', '2');
-
-        }elseif( '2' == $option ) {
-
-            flush_rewrite_rules();
-            update_option('sensei_flush_rewrite_rules', '0');
-
-        }
-
-    } // end flush_rewrite_rules
-
-    /**
-     * Calling this function will tell Sensei to flush rewrite
-     * rules on the next load.
-     *
-     * @since 1.9.0
-     */
-    public function initiate_rewrite_rules_flush(){
-
-        update_option('sensei_flush_rewrite_rules', '1');
-
-    }
-
-    /**
-     * sensei_woocommerce_email_course_details adds detail to email
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::email_course_details
-     *
-     * @since   1.4.5
-     * @access  public
-     * @param   WC_Order $order
-     *
-     * @return  void
-     */
-    public function sensei_woocommerce_email_course_details( $order ) {
-
-        Sensei_WC::email_course_details( $order );
-
-    } // end func email course details
-
-    /**
-     * @deprecated since 1.9.0, movde to the Sensei_WC class
-     * @param $user_id
-     * @param $subscription_key
-     */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){
-
-        Sensei_WC::reactivate_subscription( $user_id, $subscription_key );
-    }
-
-    /**
-     * @deprecated since 1.9.0, movde to the Sensei_WC class
-     * @param $user_id
-     * @param $subscription_key
-     */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){
-
-        Sensei_WC::end_subscription( $user_id, $subscription_key );
-    }
-
-    /**
-     * sensei_woocommerce_complete_order description
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::complete_order( $order_id );
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     *
-     * @return  void
-     */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
-
-        Sensei_WC::complete_order( $order_id );
-
-    } // End sensei_woocommerce_complete_order()
-
-    /**
-     * Runs when an order is cancelled.
-     *
-     * @deprecated since 1.9.0
-     *
-     * @since   1.2.0
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
-
-        Sensei_WC::cancel_order( $order_id );
-
-    } // End sensei_woocommerce_cancel_order()
-
-    /**
-     * sensei_activate_subscription runs when a subscription product is purchased
-     * @deprecated since 1.9.0
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
-
-        Sensei_WC::activate_subscription( $order_id );
-
-    } // End sensei_activate_subscription()
-
-    /**
-     * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
-     * @deprecated since 1.9.0
-     * @since  1.0.0
-     * @param  int 			$course_id  (default: 0)
-     * @param  array/Object $order_user (default: array()) Specific user's data.
-     * @return bool|int
-     */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
-
-        return Sensei_WC::course_update( $course_id, $order_user );
-
-    } // End woocommerce_course_update()
-
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @deprecated since 1.9.0
-     * @since   1.1.1
-     *
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     *
-     * @return   WC_Product $wc_product_object
-     */
-    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
-
-        return Sensei_WC::get_product_object( $wc_product_id, $product_type );
-
-    } // End sensei_get_woocommerce_product_object()
-
-    /**
-     * Setup required WooCommerce settings.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function set_woocommerce_functionality() {
-
-        _deprecated_function('Sensei()->set_woocommerce_functionality', 'Sensei 1.9.0');
-
-    } // End set_woocommerce_functionality()
-
-    /**
-     * Disable guest checkout if a course product is in the cart
-     * @deprecated since 1.9.0
-     * @param  boolean $guest_checkout Current guest checkout setting
-     * @return boolean                 Modified guest checkout setting
-     */
-    public function disable_guest_checkout( $guest_checkout ) {
-
-        return Sensei_WC::disable_guest_checkout( $guest_checkout );
-
-    }// end disable_guest_checkout
-
-    /**
-     * Change order status with virtual products to completed
-     *
-     * @deprecated since 1.9.0 use Sensei_WC::virtual_order_payment_complete( $order_status, $order_id )
-     *
-     * @since  1.1.0
-     * @param string $order_status
-     * @param int $order_id
-     * @return string
-     **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
-
-        return  Sensei_WC::virtual_order_payment_complete( $order_status, $order_id );
-    }
+	/**
+	 * Sensei wide rewrite flush call.
+	 *
+	 * To use this simply update the option 'sensei_flush_rewrite_rules' to 1
+	 *
+	 * After the option is one the Rules will be flushed.
+	 *
+	 * @since 1.9.0
+	 */
+	public function flush_rewrite_rules(){
+
+		// ensures that the rewrite rules are flushed on the second
+		// attempt. This ensure that the settings for any other process
+		// have been completed and saved to the database before we refresh the
+		// rewrite rules.
+		$option =  get_option('sensei_flush_rewrite_rules');
+		if( '1' == $option ) {
+
+			update_option('sensei_flush_rewrite_rules', '2');
+
+		}elseif( '2' == $option ) {
+
+			flush_rewrite_rules();
+			update_option('sensei_flush_rewrite_rules', '0');
+
+		}
+
+	} // end flush_rewrite_rules
+
+	/**
+	 * Calling this function will tell Sensei to flush rewrite
+	 * rules on the next load.
+	 *
+	 * @since 1.9.0
+	 */
+	public function initiate_rewrite_rules_flush(){
+
+		update_option('sensei_flush_rewrite_rules', '1');
+
+	}
+
+	/**
+	 * sensei_woocommerce_email_course_details adds detail to email
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::email_course_details
+	 *
+	 * @since   1.4.5
+	 * @access  public
+	 * @param   WC_Order $order
+	 *
+	 * @return  void
+	 */
+	public function sensei_woocommerce_email_course_details( $order ) {
+
+		Sensei_WC::email_course_details( $order );
+
+	} // end func email course details
+
+	/**
+	 * @deprecated since 1.9.0, movde to the Sensei_WC class
+	 * @param $user_id
+	 * @param $subscription_key
+	 */
+	public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){
+
+		Sensei_WC::reactivate_subscription( $user_id, $subscription_key );
+	}
+
+	/**
+	 * @deprecated since 1.9.0, movde to the Sensei_WC class
+	 * @param $user_id
+	 * @param $subscription_key
+	 */
+	public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){
+
+		Sensei_WC::end_subscription( $user_id, $subscription_key );
+	}
+
+	/**
+	 * sensei_woocommerce_complete_order description
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::complete_order( $order_id );
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 *
+	 * @return  void
+	 */
+	public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+
+		Sensei_WC::complete_order( $order_id );
+
+	} // End sensei_woocommerce_complete_order()
+
+	/**
+	 * Runs when an order is cancelled.
+	 *
+	 * @deprecated since 1.9.0
+	 *
+	 * @since   1.2.0
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_cancel_order ( $order_id ) {
+
+		Sensei_WC::cancel_order( $order_id );
+
+	} // End sensei_woocommerce_cancel_order()
+
+	/**
+	 * sensei_activate_subscription runs when a subscription product is purchased
+	 * @deprecated since 1.9.0
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_activate_subscription(  $order_id = 0 ) {
+
+		Sensei_WC::activate_subscription( $order_id );
+
+	} // End sensei_activate_subscription()
+
+	/**
+	 * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 * @deprecated since 1.9.0
+	 * @since  1.0.0
+	 * @param  int 			$course_id  (default: 0)
+	 * @param  array/Object $order_user (default: array()) Specific user's data.
+	 * @return bool|int
+	 */
+	public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+
+		return Sensei_WC::course_update( $course_id, $order_user );
+
+	} // End woocommerce_course_update()
+
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @deprecated since 1.9.0
+	 * @since   1.1.1
+	 *
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 *
+	 * @return   WC_Product $wc_product_object
+	 */
+	public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
+
+		return Sensei_WC::get_product_object( $wc_product_id, $product_type );
+
+	} // End sensei_get_woocommerce_product_object()
+
+	/**
+	 * Setup required WooCommerce settings.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function set_woocommerce_functionality() {
+
+		_deprecated_function('Sensei()->set_woocommerce_functionality', 'Sensei 1.9.0');
+
+	} // End set_woocommerce_functionality()
+
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 * @deprecated since 1.9.0
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public function disable_guest_checkout( $guest_checkout ) {
+
+		return Sensei_WC::disable_guest_checkout( $guest_checkout );
+
+	}// end disable_guest_checkout
+
+	/**
+	 * Change order status with virtual products to completed
+	 *
+	 * @deprecated since 1.9.0 use Sensei_WC::virtual_order_payment_complete( $order_status, $order_id )
+	 *
+	 * @since  1.1.0
+	 * @param string $order_status
+	 * @param int $order_id
+	 * @return string
+	 **/
+	public function virtual_order_payment_complete( $order_status, $order_id ) {
+
+		return  Sensei_WC::virtual_order_payment_complete( $order_status, $order_id );
+	}
 
 } // End Class
 

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

Indentation +115 added lines, -115 removed lines

@@ -16,148 +16,148 @@
  */
 class Sensei_Shortcode_Unpurchased_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
-
-    /**
-     * @var string number of items to show on the current page
-     * Default: all.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
-
-            $this->order =  'ASC';
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: all.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
 
-        // course query parameters to be used for all courses
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            // the number specified by the user will be used later in this function
-            'posts_per_page' => 1000,
-            'orderby'          => $this->orderby,
-            'order'            => $this->order
-        );
+		// course query parameters to be used for all courses
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			// the number specified by the user will be used later in this function
+			'posts_per_page' => 1000,
+			'orderby'          => $this->orderby,
+			'order'            => $this->order
+		);
 
-        // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
+		// get all the courses that has a product attached
+		$all_courses_query = new WP_Query( $query_args );
 
-        $paid_courses_not_taken = array();
-        // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
+		$paid_courses_not_taken = array();
+		// look through all course and find the purchasable ones that user has not purchased
+		foreach( $all_courses_query->posts as $course ){
 
-            // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
-                &&
-                ! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
+			// only keep the courses with a product including only  courses that the user not taking
+			$course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
+			if( is_numeric( $course_product_id )
+				&&
+				! Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
+			){
 
-                    $paid_courses_not_taken[] = $course->ID;
+					$paid_courses_not_taken[] = $course->ID;
 
-                }
+				}
 
-        } // end foreach
+		} // end foreach
 
-        // setup the course query again and only use the course the user has not purchased.
-        // this query will be loaded into the global WP_Query in the render function.
-        $query_args[ 'post__in' ] = $paid_courses_not_taken;
-        $query_args[ 'posts_per_page' ] = $this->number;
+		// setup the course query again and only use the course the user has not purchased.
+		// this query will be loaded into the global WP_Query in the render function.
+		$query_args[ 'post__in' ] = $paid_courses_not_taken;
+		$query_args[ 'posts_per_page' ] = $this->number;
 
-        $this->query = new WP_Query( $query_args );
+		$this->query = new WP_Query( $query_args );
 
-    }// end setup _course_query
+	}// end setup _course_query
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in() ) {
 
-            $anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
-            $anchor_after = '</a>';
-            $notice = sprintf(
-                __('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
-                $anchor_before,
-                $anchor_after
-            );
+			$anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >';
+			$anchor_after = '</a>';
+			$notice = sprintf(
+				__('You must be logged in to view the non-purchased courses. Click here to %slogin%s.'),
+				$anchor_before,
+				$anchor_after
+			);
 
-            Sensei()->notices->add_notice( $notice, 'info' );
-            Sensei()->notices->maybe_print_notices();
+			Sensei()->notices->add_notice( $notice, 'info' );
+			Sensei()->notices->maybe_print_notices();
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        ob_start();
-        Sensei()->notices->maybe_print_notices();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+		ob_start();
+		Sensei()->notices->maybe_print_notices();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }
\ No newline at end of file

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

Indentation +86 added lines, -86 removed lines

@@ -17,91 +17,91 @@
  */
 class Sensei_Shortcode_User_Messages implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query
-     * messages for the current user
-     */
-    protected $messages_query;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        $this->setup_messages_query();
-
-    }
-
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_messages_query(){
-
-        $user = wp_get_current_user();
-
-        $args = array(
-            'post_type' => 'sensei_message',
-            'posts_per_page' => 500,
-            'orderby' => 'date',
-            'order' => 'DESC',
-            'post_status' => 'publish',
-            'meta_query' => array(
-                array(
-                    'key'     => '_sender',
-                    'value'   => $user->user_login,
-                    'compare' => '=',
-                ),
-            ),
-        );
-
-        $this->messages_query  = new WP_Query( $args );
-    }
-
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
-
-        if( !is_user_logged_in() ){
-
-            Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
-
-        } elseif( 0 == $this->messages_query->post_count ){
-
-            Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
-        }
-
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
-
-        // don't show anything if messages are disable
-        if( $messages_disabled_in_settings ){
-            return '';
-        }
-
-        //set the wp_query to the current messages query
-        global $wp_query;
-        $wp_query = $this->messages_query;
-
-        ob_start();
-        Sensei()->notices->maybe_print_notices();
-        Sensei_Templates::get_part('loop', 'message');
-        $messages_html = ob_get_clean();
-
-        // set back the global query
-        wp_reset_query();
-
-        return $messages_html;
-
-    }// end render
+	/**
+	 * @var WP_Query
+	 * messages for the current user
+	 */
+	protected $messages_query;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		$this->setup_messages_query();
+
+	}
+
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_messages_query(){
+
+		$user = wp_get_current_user();
+
+		$args = array(
+			'post_type' => 'sensei_message',
+			'posts_per_page' => 500,
+			'orderby' => 'date',
+			'order' => 'DESC',
+			'post_status' => 'publish',
+			'meta_query' => array(
+				array(
+					'key'     => '_sender',
+					'value'   => $user->user_login,
+					'compare' => '=',
+				),
+			),
+		);
+
+		$this->messages_query  = new WP_Query( $args );
+	}
+
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
+
+		if( !is_user_logged_in() ){
+
+			Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
+
+		} elseif( 0 == $this->messages_query->post_count ){
+
+			Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
+		}
+
+		$messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
+											|| ! Sensei()->settings->settings['messages_disable'] ) ;
+
+		// don't show anything if messages are disable
+		if( $messages_disabled_in_settings ){
+			return '';
+		}
+
+		//set the wp_query to the current messages query
+		global $wp_query;
+		$wp_query = $this->messages_query;
+
+		ob_start();
+		Sensei()->notices->maybe_print_notices();
+		Sensei_Templates::get_part('loop', 'message');
+		$messages_html = ob_get_clean();
+
+		// set back the global query
+		wp_reset_query();
+
+		return $messages_html;
+
+	}// end render
 
 }// end class
\ No newline at end of file

templates/single-quiz.php

Indentation +74 added lines, -74 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * The Template for displaying all Quiz Questions.
- *
- * Override this template by copying it to yourtheme/sensei/single-quiz.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all Quiz Questions.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/single-quiz.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php  get_sensei_header();  ?>
@@ -17,19 +17,19 @@ 
 
     <?php
 
-        /**
-         * Hook inside the single quiz post above the content
-         *
-         * @since 1.9.0
-         *
-         * @hooked Sensei_Quiz::the_title               - 20
-         * @hooked Sensei_Quiz::the_user_status_message - 40
-         * @param integer $quiz_id
-         *
-         */
-        do_action( 'sensei_single_quiz_content_inside_before', get_the_ID() );
+		/**
+		 * Hook inside the single quiz post above the content
+		 *
+		 * @since 1.9.0
+		 *
+		 * @hooked Sensei_Quiz::the_title               - 20
+		 * @hooked Sensei_Quiz::the_user_status_message - 40
+		 * @param integer $quiz_id
+		 *
+		 */
+		do_action( 'sensei_single_quiz_content_inside_before', get_the_ID() );
 
-    ?>
+	?>
 
 	<?php if ( sensei_can_user_view_lesson() ) : ?>
 
@@ -41,16 +41,16 @@ 
 
 	                <?php
 
-	                    /**
-	                     * Action inside before the question content on single-quiz page
-	                     *
-	                     * @hooked WooThemes_Sensei_Quiz::the_user_status_message  - 10
-	                     *
-	                     * @param string $the_quiz_id
-	                     */
-	                    do_action( 'sensei_single_quiz_questions_before', get_the_id() );
+						/**
+						 * Action inside before the question content on single-quiz page
+						 *
+						 * @hooked WooThemes_Sensei_Quiz::the_user_status_message  - 10
+						 *
+						 * @param string $the_quiz_id
+						 */
+						do_action( 'sensei_single_quiz_questions_before', get_the_id() );
 
-	                ?>
+					?>
 
 
 
@@ -62,35 +62,35 @@ 
 
 	                        <?php
 
-	                            /**
-	                             * Action inside before the question content on single-quiz page
-	                             *
-	                             * @hooked WooThemes_Sensei_Question::the_question_title        - 10
-	                             * @hooked WooThemes_Sensei_Question::the_question_description  - 20
-	                             * @hooked WooThemes_Sensei_Question::the_question_media        - 30
-	                             * @hooked WooThemes_Sensei_Question::the_question_hidden_field - 40
-	                             *
-	                             * @since 1.9.0
-	                             * @param string $the_question_id
-	                             */
-	                            do_action( 'sensei_quiz_question_inside_before', sensei_get_the_question_id() );
-
-	                        ?>
+								/**
+								 * Action inside before the question content on single-quiz page
+								 *
+								 * @hooked WooThemes_Sensei_Question::the_question_title        - 10
+								 * @hooked WooThemes_Sensei_Question::the_question_description  - 20
+								 * @hooked WooThemes_Sensei_Question::the_question_media        - 30
+								 * @hooked WooThemes_Sensei_Question::the_question_hidden_field - 40
+								 *
+								 * @since 1.9.0
+								 * @param string $the_question_id
+								 */
+								do_action( 'sensei_quiz_question_inside_before', sensei_get_the_question_id() );
+
+							?>
 
 	                        <?php sensei_the_question_content(); ?>
 
 	                        <?php
 
-	                            /**
-	                             * Action inside before the question content on single-quiz page
-	                             *
-	                             * @hooked WooThemes_Sensei_Question::answer_feedback_notes
-	                             *
-	                             * @param string $the_question_id
-	                             */
-	                            do_action( 'sensei_quiz_question_inside_after', sensei_get_the_question_id() );
+								/**
+								 * Action inside before the question content on single-quiz page
+								 *
+								 * @hooked WooThemes_Sensei_Question::answer_feedback_notes
+								 *
+								 * @param string $the_question_id
+								 */
+								do_action( 'sensei_quiz_question_inside_after', sensei_get_the_question_id() );
 
-	                        ?>
+							?>
 
 	                    </li>
 
@@ -100,14 +100,14 @@ 
 
 	                <?php
 
-	                    /**
-	                     * Action inside before the question content on single-quiz page
-	                     *
-	                     * @param string $the_quiz_id
-	                     */
-	                    do_action( 'sensei_single_quiz_questions_after', get_the_id() );
+						/**
+						 * Action inside before the question content on single-quiz page
+						 *
+						 * @param string $the_quiz_id
+						 */
+						do_action( 'sensei_single_quiz_questions_after', get_the_id() );
 
-	                ?>
+					?>
 
 	            </form>
 	        <?php else:  ?>
@@ -118,9 +118,9 @@ 
 
 
 	        <?php
-	            $quiz_lesson = Sensei()->quiz->data->quiz_lesson;
-	            do_action( 'sensei_quiz_back_link', $quiz_lesson  );
-	        ?>
+				$quiz_lesson = Sensei()->quiz->data->quiz_lesson;
+				do_action( 'sensei_quiz_back_link', $quiz_lesson  );
+			?>
 
         </section>
 
@@ -128,17 +128,17 @@ 
 
     <?php
 
-    /**
-     * Hook inside the single quiz post above the content
-     *
-     * @since 1.9.0
-     *
-     * @param integer $quiz_id
-     *
-     */
-    do_action( 'sensei_single_quiz_content_inside_after', get_the_ID() );
-
-    ?>
+	/**
+	 * Hook inside the single quiz post above the content
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param integer $quiz_id
+	 *
+	 */
+	do_action( 'sensei_single_quiz_content_inside_after', get_the_ID() );
+
+	?>
 
 </article><!-- .quiz -->
 

includes/class-sensei-quiz.php

Indentation +884 added lines, -884 removed lines

@@ -24,69 +24,69 @@ 
 	 */
 	public function __construct ( $file = __FILE__ ) {
 		$this->file = $file;
-        $this->token = 'quiz';
+		$this->token = 'quiz';
 		$this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' );
 		add_action( 'save_post', array( $this, 'update_author' ));
 
 		// listen to the reset button click
 		add_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
 
-        // fire the complete quiz button submit for grading action
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
+		// fire the complete quiz button submit for grading action
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
 
 		// fire the save user answers quiz button click responder
 		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_save_quiz_answers_listener' ) );
 
-        // fire the load global data function
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
+		// fire the load global data function
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
 
-        add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
+		add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
 
 
-    } // End __construct()
+	} // End __construct()
 
 	/**
-	* Update the quiz author when the lesson post type is save
-	*
-	* @param int $post_id
-	* @return void
-	*/
+	 * Update the quiz author when the lesson post type is save
+	 *
+	 * @param int $post_id
+	 * @return void
+	 */
 	public function update_author( $post_id ){
 
 		// If this isn't a 'lesson' post, don't update it.
-        // if this is a revision don't save it
-	    if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
-            || wp_is_post_revision( $post_id ) ) {
+		// if this is a revision don't save it
+		if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
+			|| wp_is_post_revision( $post_id ) ) {
 
-                return;
+				return;
 
-        }
-	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+		}
+		// get the lesson author id to be use late
+		$saved_post = get_post( $post_id );
+		$new_lesson_author_id =  $saved_post->post_author;
 
-	    //get the lessons quiz
+		//get the lessons quiz
 		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		foreach ( (array) $lesson_quizzes as $quiz_item ) {
 
-	    	if( ! $quiz_item ) {
-	    		continue;
-	    	}
+			if( ! $quiz_item ) {
+				continue;
+			}
 
-		    // setup the quiz items new author value
+			// setup the quiz items new author value
 			$my_post = array(
-			      'ID'           => $quiz_item,
-			      'post_author' =>  $new_lesson_author_id
+				  'ID'           => $quiz_item,
+				  'post_author' =>  $new_lesson_author_id
 			);
 
-            // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+			// remove the action so that it doesn't fire again
+			remove_action( 'save_post', array( $this, 'update_author' ));
 
 			// Update the post into the database
 		  	wp_update_post( $my_post );
-	    }
+		}
 
-	    return;
+		return;
 	}// end update_author
 
 
@@ -117,32 +117,32 @@ 
 	} // end lesson
 
 
-    /**
-     * user_save_quiz_answers_listener
-     *
-     * This function hooks into the quiz page and accepts the answer form save post.
-     * @since 1.7.3
-     * @return bool $saved;
-     */
-    public function user_save_quiz_answers_listener(){
+	/**
+	 * user_save_quiz_answers_listener
+	 *
+	 * This function hooks into the quiz page and accepts the answer form save post.
+	 * @since 1.7.3
+	 * @return bool $saved;
+	 */
+	public function user_save_quiz_answers_listener(){
 
-        if( ! isset( $_POST[ 'quiz_save' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		if( ! isset( $_POST[ 'quiz_save' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
-        // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+		global $post;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
+		// call the save function
+		self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
 
-        // remove the hook as it should only fire once per click
-        remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
+		// remove the hook as it should only fire once per click
+		remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
 
-    } // end user_save_quiz_answers_listener
+	} // end user_save_quiz_answers_listener
 
 	/**
 	 * Save the user answers for the given lesson's quiz
@@ -153,7 +153,7 @@ 
 	 * @access public
 	 *
 	 * @param array $quiz_answers
-     * @param array $files from global $_FILES
+	 * @param array $files from global $_FILES
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
@@ -161,11 +161,11 @@ 
 	 */
 	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        // make sure the parameters are valid before continuing
+		// make sure the parameters are valid before continuing
 		if( empty( $lesson_id ) || empty( $user_id )
 			|| 'lesson' != get_post_type( $lesson_id )
 			||!get_userdata( $user_id )
@@ -176,25 +176,25 @@ 
 		}
 
 
-        // start the lesson before saving the data in case the user has not started the lesson
-        $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		// start the lesson before saving the data in case the user has not started the lesson
+		$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
 
 		//prepare the answers
 		$prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files );
 
 		// save the user data
-        $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
+		$answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
 
 		// were the answers saved correctly?
 		if( intval( $answers_saved ) > 0){
 
-            // save transient to make retrieval faster
-            $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+			// save transient to make retrieval faster
+			$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+			set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
 
-            // update the message showed to user
-            Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
-        }
+			// update the message showed to user
+			Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+		}
 
 		return $answers_saved;
 
@@ -202,9 +202,9 @@ 
 
 	/**
 	 * Get the user answers for the given lesson's quiz.
-     *
-     * This function returns the data that is stored on the lesson as meta and is not compatible with
-     * retrieving data for quiz answer before sensei 1.7.4
+	 *
+	 * This function returns the data that is stored on the lesson as meta and is not compatible with
+	 * retrieving data for quiz answer before sensei 1.7.4
 	 *
 	 *
 	 * @since 1.7.4
@@ -224,27 +224,27 @@ 
 			return false;
 		}
 
-        // save some time and get the transient cached data
-        $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $transient_cached_answers = get_transient( $transient_key );
+		// save some time and get the transient cached data
+		$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$transient_cached_answers = get_transient( $transient_key );
 
-        // return the transient or get the values get the values from the comment meta
-        if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
+		// return the transient or get the values get the values from the comment meta
+		if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
 
-            $encoded_user_answers = $transient_cached_answers;
+			$encoded_user_answers = $transient_cached_answers;
 
-        }else{
+		}else{
 
-            $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
+			$encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
 
-        } // end if transient check
+		} // end if transient check
 
 		if( ! is_array( $encoded_user_answers ) ){
 			return false;
 		}
 
-        //set the transient with the new valid data for faster retrieval in future
-        set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
+		//set the transient with the new valid data for faster retrieval in future
+		set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
 
 		// decode an unserialize all answers
 		foreach( $encoded_user_answers as $question_id => $encoded_answer ) {
@@ -278,8 +278,8 @@ 
 		$current_quiz_id = $post->ID;
 		$lesson_id = $this->get_lesson_id( $current_quiz_id );
 
-        // reset all user data
-        $this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
+		// reset all user data
+		$this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
 
 		//this function should only run once
 		remove_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
@@ -290,7 +290,7 @@ 
 	 * Complete/ submit  quiz hooked function
 	 *
 	 * This function listens to the complete button submit action and processes the users submitted answers
-     * not that this function submits the given users quiz answers for grading.
+	 * not that this function submits the given users quiz answers for grading.
 	 *
 	 * @since  1.7.4
 	 * @access public
@@ -300,90 +300,90 @@ 
 	 */
 	public function user_quiz_submit_listener() {
 
-        // only respond to valid quiz completion submissions
-        if( ! isset( $_POST[ 'quiz_complete' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		// only respond to valid quiz completion submissions
+		if( ! isset( $_POST[ 'quiz_complete' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+		global $post, $current_user;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
 
-        self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
+		self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
 
 	} // End sensei_complete_quiz()
 
-    /**
-     * This function set's up the data need for the quiz page
-     *
-     * This function hooks into sensei_complete_quiz and load the global data for the
-     * current quiz.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     */
-    public function load_global_quiz_data(){
+	/**
+	 * This function set's up the data need for the quiz page
+	 *
+	 * This function hooks into sensei_complete_quiz and load the global data for the
+	 * current quiz.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 */
+	public function load_global_quiz_data(){
 
-        global  $post, $current_user;
-        $this->data = new stdClass();
+		global  $post, $current_user;
+		$this->data = new stdClass();
 
-        // Default grade
-        $grade = 0;
+		// Default grade
+		$grade = 0;
 
-        // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+		// Get Quiz Questions
+		$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
 
-        $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
+		$quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
 
-        // Get quiz grade type
-        $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
+		// Get quiz grade type
+		$quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
 
-        // Get quiz pass setting
-        $pass_required = get_post_meta( $post->ID, '_pass_required', true );
+		// Get quiz pass setting
+		$pass_required = get_post_meta( $post->ID, '_pass_required', true );
 
-        // Get quiz pass mark
-        $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
+		// Get quiz pass mark
+		$quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
 
-        // Get latest quiz answers and grades
-        $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
-        $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
-        $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-        }
+		// Get latest quiz answers and grades
+		$lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
+		$user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
+		$user_quiz_grade = 0;
+		if( isset( $user_lesson_status->comment_ID ) ) {
+			$user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		}
 
-        if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
+		if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
 
-        // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
-        $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        } // End If Statement
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		} // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
+		$reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+		//backwards compatibility
+		if( 'on' == $reset_allowed ) {
+			$reset_allowed = 1;
+		}
 
-        // Build frontend data object for backwards compatibility
-        // using this is no longer recommended
-        $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $this->data->quiz_passmark = $quiz_passmark;
-        $this->data->quiz_lesson = $quiz_lesson_id;
-        $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
-        $this->data->user_lesson_end = $user_lesson_end;
-        $this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $this->data->lesson_quiz_questions = $lesson_quiz_questions;
-        $this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
+		// Build frontend data object for backwards compatibility
+		// using this is no longer recommended
+		$this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$this->data->quiz_passmark = $quiz_passmark;
+		$this->data->quiz_lesson = $quiz_lesson_id;
+		$this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		$this->data->user_lesson_end = $user_lesson_end;
+		$this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$this->data->lesson_quiz_questions = $lesson_quiz_questions;
+		$this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
 
-    } // end load_global_quiz_data
+	} // end load_global_quiz_data
 
 
 	/**
@@ -413,25 +413,25 @@ 
 		foreach( $unprepared_answers as $question_id => $answer ) {
 
 			//get the current questions question type
-            $question_type = Sensei()->question->get_question_type( $question_id );
+			$question_type = Sensei()->question->get_question_type( $question_id );
 
 			// Sanitise answer
 			if( 0 == get_magic_quotes_gpc() ) {
 				$answer = wp_unslash( $answer );
 			}
 
-            // compress the answer for saving
+			// compress the answer for saving
 			if( 'multi-line' == $question_type ) {
-                $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
-                $file_key = 'file_upload_' . $question_id;
-                if( isset( $files[ $file_key ] ) ) {
-                        $attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
-                        if( $attachment_id ) {
-                            $answer = $attachment_id;
-                        }
-                    }
-            } // end if
+				$answer = esc_html( $answer );
+			}elseif( 'file-upload' == $question_type  ){
+				$file_key = 'file_upload_' . $question_id;
+				if( isset( $files[ $file_key ] ) ) {
+						$attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
+						if( $attachment_id ) {
+							$answer = $attachment_id;
+						}
+					}
+			} // end if
 
 			$prepared_answers[ $question_id ] =  base64_encode( maybe_serialize( $answer ) );
 
@@ -440,813 +440,813 @@ 
 		return $prepared_answers;
 	} // prepare_form_submitted_answers
 
-    /**
-     * Reset user submitted questions
-     *
-     * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
-     * the save_user_answers as currently the saved and submitted answers are stored differently.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     * @return bool $reset_success
-     * @param int $user_id
-     * @param int $lesson_id
-     */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+	/**
+	 * Reset user submitted questions
+	 *
+	 * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
+	 * the save_user_answers as currently the saved and submitted answers are stored differently.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 * @return bool $reset_success
+	 * @param int $user_id
+	 * @param int $lesson_id
+	 */
+	public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+
+		//make sure the parameters are valid
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			|| ! get_userdata( $user_id ) ){
+			return false;
+		}
+
+
+
+		//get the users lesson status to make
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		if( ! isset( $user_lesson_status->comment_ID ) ) {
+			// this user is not taking this lesson so this process is not needed
+			return false;
+		}
+
+		//get the lesson quiz and course
+		$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+
+		// reset the transients
+		$answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+		$answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		delete_transient( $answers_transient_key );
+		delete_transient( $grades_transient_key );
+		delete_transient( $answers_feedback_transient_key );
+
+		// reset the quiz answers and feedback notes
+		$deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
+		$deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
+		$deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+		// Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
+		Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+
+		Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+
+		// Update course completion
+		Sensei_Utils::update_course_status( $user_id, $course_id );
 
-        //make sure the parameters are valid
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            || ! get_userdata( $user_id ) ){
-            return false;
-        }
-
-
-
-        //get the users lesson status to make
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-        if( ! isset( $user_lesson_status->comment_ID ) ) {
-            // this user is not taking this lesson so this process is not needed
-            return false;
-        }
+		// Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
+		do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
+		Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
 
-        //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		return ( $deleted_answers && $deleted_grades ) ;
 
-        // reset the transients
-        $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
-        $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-        delete_transient( $answers_transient_key );
-        delete_transient( $grades_transient_key );
-        delete_transient( $answers_feedback_transient_key );
+	} // end reset_user_lesson_data
 
-        // reset the quiz answers and feedback notes
-        $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
-        $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
-        $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+	 /**
+	  * Submit the users quiz answers for grading
+	  *
+	  * This function accepts users answers and stores it but also initiates the grading
+	  * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
+	  *
+	  * @since 1.7.4
+	  * @access public
+	  *
+	  * @param array $quiz_answers
+	  * @param array $files from $_FILES
+	  * @param int $user_id
+	  * @param int $lesson_id
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
 
-        // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-        Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+		 $answers_submitted = false;
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-        // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_id );
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_answers ) ){
 
-        // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
-        do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
-        Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+			 return false;
 
-        return ( $deleted_answers && $deleted_grades ) ;
+		 }
 
-    } // end reset_user_lesson_data
+		 // Default grade
+		 $grade = 0;
 
-     /**
-      * Submit the users quiz answers for grading
-      *
-      * This function accepts users answers and stores it but also initiates the grading
-      * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
-      *
-      * @since 1.7.4
-      * @access public
-      *
-      * @param array $quiz_answers
-      * @param array $files from $_FILES
-      * @param int $user_id
-      * @param int $lesson_id
-      *
-      * @return bool $answers_submitted
-      */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+		 // Get Quiz ID
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 
-         $answers_submitted = false;
+		 // Get quiz grade type
+		 $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
+		 // Get quiz pass setting
+		 $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
 
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_answers ) ){
+		 // Get the minimum percentage need to pass this quiz
+		 $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
 
-             return false;
+		 // Handle Quiz Questions asked
+		 // This is to ensure we save the questions that we've asked this user and that this can't be change unless
+		 // the quiz is reset by admin or user( user: only if the setting is enabled ).
+		 // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
+		 if( empty( $questions_asked ) ){
 
-         }
+			 $questions_asked = array_keys( $quiz_answers );
+			 $questions_asked_string = implode( ',', $questions_asked );
 
-         // Default grade
-         $grade = 0;
+			 // Save questions that were asked in this quiz
+			 update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
 
-         // Get Quiz ID
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		 }
 
-         // Get quiz grade type
-         $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		 // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
+		 self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
 
-         // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+		 // Grade quiz
+		 $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
 
-         // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+		 // Get Lesson Grading Setting
+		 $lesson_metadata = array();
+		 $lesson_status = 'ungraded'; // Default when completing a quiz
 
-         // Handle Quiz Questions asked
-         // This is to ensure we save the questions that we've asked this user and that this can't be change unless
-         // the quiz is reset by admin or user( user: only if the setting is enabled ).
-         // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
-         if( empty( $questions_asked ) ){
+		 // At this point the answers have been submitted
+		 $answers_submitted = true;
 
-             $questions_asked = array_keys( $quiz_answers );
-             $questions_asked_string = implode( ',', $questions_asked );
-
-             // Save questions that were asked in this quiz
-             update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
+		 // if this condition is false the quiz should manually be graded by admin
+		 if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
 
-         }
+			 // Quiz has been automatically Graded
+			 if ( 'on' == $pass_required ) {
 
-         // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
-         self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
+				 // Student has reached the pass mark and lesson is complete
+				 if ( $quiz_pass_percentage <= $grade ) {
 
-         // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+					 $lesson_status = 'passed';
 
-         // Get Lesson Grading Setting
-         $lesson_metadata = array();
-         $lesson_status = 'ungraded'; // Default when completing a quiz
+				 } else {
 
-         // At this point the answers have been submitted
-         $answers_submitted = true;
+					 $lesson_status = 'failed';
 
-         // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+				 } // End If Statement
 
-             // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+			 } else {
 
-                 // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+				 // Student only has to partake the quiz
+				 $lesson_status = 'graded';
+
+			 }
+
+			 $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
+
+		 } // end if ! is_wp_error( $grade ...
+
+		 Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
 
-                     $lesson_status = 'passed';
+		 if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
 
-                 } else {
+			 /**
+			  * Lesson end action hook
+			  *
+			  * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
+			  *
+			  * @param int $user_id
+			  * @param int $lesson_id
+			  */
+			 do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
 
-                     $lesson_status = 'failed';
+		 }
 
-                 } // End If Statement
+		 /**
+		  * User quiz has been submitted
+		  *
+		  * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
+		  * results.
+		  *
+		  * @param int $user_id
+		  * @param int $quiz_id
+		  * @param string $grade
+		  * @param string $quiz_pass_percentage
+		  * @param string $quiz_grade_type
+		  */
+		 do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
 
-             } else {
+		 return $answers_submitted;
 
-                 // Student only has to partake the quiz
-                 $lesson_status = 'graded';
-
-             }
-
-             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
-
-         } // end if ! is_wp_error( $grade ...
-
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+	 }// end submit_answers_for_grading
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+	 /**
+	  * Get the user question answer
+	  *
+	  * This function gets the the users saved answer on given quiz for the given question parameter
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool|null $answers_submitted
+	  */
+	 public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
 
-             /**
-              * Lesson end action hook
-              *
-              * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
-              *
-              * @param int $user_id
-              * @param int $lesson_id
-              */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-         }
+			 return false;
+		 }
+
+		 if( ! ( intval( $user_id ) > 0 )   ){
+			 $user_id = get_current_user_id();
+		 }
+
+		 $users_answers = $this->get_user_answers( $lesson_id, $user_id );
+
+		 if( !$users_answers || empty( $users_answers )
+		 ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
+
+			 //Fallback for pre 1.7.4 data
+			 $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
+
+			 if( ! isset( $comment->comment_content ) ){
+				 return NULL;
+			 }
+
+			 return maybe_unserialize( base64_decode( $comment->comment_content ) );
+		 }
+
+		 return $users_answers[ $question_id ];
+
+	 }// end get_user_question_answer
+
+	 /**
+	  * Saving the users quiz question grades
+	  *
+	  * This function save all the grades for all the question in a given quiz on the lesson
+	  * comment meta. It makes use of transients to save the grades for easier access at a later stage
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param array $quiz_grades{
+	  *      @type int $question_id
+	  *      @type int $question_grade
+	  * }
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return bool
+	  */
+	 public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_grades ) ){
+
+			 return false;
+
+		 }
+
+		 $success = false;
+
+		 // save that data for the user on the lesson comment meta
+		 $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
+
+		 // were the grades save successfully ?
+		 if( intval( $comment_meta_id ) > 0 ) {
+
+			 $success = true;
+			 // save transient
+			 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+			 set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
+		 }
+
+		 return $success;
+
+	 }// end set_user_grades
+
+	 /**
+	  * Retrieve the users quiz question grades
+	  *
+	  * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return array $user_quiz_grades or false if none exists for this users
+	  */
+	 public function get_user_grades( $lesson_id, $user_id = 0 ){
+
+		 $user_grades = array();
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // save some time and get the transient cached data
+		 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+		 $user_grades = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $user_grades  ) || false != $user_grades ){
+
+			 $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
+
+		 } // end if transient check
+
+		 // if there is no data for this user
+		 if( ! is_array( $user_grades ) ){
+			 return false;
+		 }
+
+		 return $user_grades;
+
+	 }// end  get_user_grades
+
+	 /**
+	  * Get the user question grade
+	  *
+	  * This function gets the grade on a quiz for the given question parameter
+	  * It does NOT do any grading. It simply retrieves the data that was stored during grading.
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $question_grade
+	  */
+	 public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
+
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
+
+			 return false;
+		 }
+
+		 $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+
+		 if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+
+			 //fallback to data pre 1.7.4
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 $fall_back_grade = false;
+			 if( isset( $question_activity->comment_ID ) ){
+				 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
+			 }
+
+			 return $fall_back_grade;
+
+		 } // end if $all_user_grades...
+
+		 return $all_user_grades[ $question_id ];
+
+	 }// end get_user_question_grade
+
+	 /**
+	  * Save the user's answers feedback
+	  *
+	  * For this function you must supply all three parameters. If will return false one is left out.
+	  * The data will be saved on the lesson ID supplied.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false or int $feedback_saved
+	  */
+	public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
+
+		// make sure the parameters are valid before continuing
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			||!get_userdata( $user_id )
+			|| !is_array( $answers_feedback ) ){
+
+			return false;
+
+		}
+
+
+		// check if the lesson is started before saving, if not start the lesson for the user
+		if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
+			Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		}
 
-         /**
-          * User quiz has been submitted
-          *
-          * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
-          * results.
-          *
-          * @param int $user_id
-          * @param int $quiz_id
-          * @param string $grade
-          * @param string $quiz_pass_percentage
-          * @param string $quiz_grade_type
-          */
-         do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
+		// encode the feedback
+		$encoded_answers_feedback =  array();
+		foreach( $answers_feedback as $question_id => $feedback ){
+			$encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
+		}
+
+		// save the user data
+		$feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
+
+		//Were the the question feedback save correctly?
+		if( intval( $feedback_saved ) > 0){
+
+			// save transient to make retrieval faster in future
+			 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+			 set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
 
-         return $answers_submitted;
+		}
+
+		return $feedback_saved;
+
+	} // end save_user_answers_feedback
+
+	 /**
+	  * Get the user's answers feedback.
+	  *
+	  * This function returns the feedback submitted by the teacher/admin
+	  * during grading. Grading occurs manually or automatically.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false | array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  */
+	 public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+
+		 $answers_feedback = array();
 
-     }// end submit_answers_for_grading
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-     /**
-      * Get the user question answer
-      *
-      * This function gets the the users saved answer on given quiz for the given question parameter
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool|null $answers_submitted
-      */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // first check the transient to save a few split seconds
+		 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		 $encoded_feedback = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $encoded_feedback  ) || !$encoded_feedback ){
+
+			 $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
+
+		 } // end if transient check
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // if there is no data for this user
+		 if( ! is_array( $encoded_feedback ) ){
+			 return false;
+		 }
 
-             return false;
-         }
-
-         if( ! ( intval( $user_id ) > 0 )   ){
-             $user_id = get_current_user_id();
-         }
-
-         $users_answers = $this->get_user_answers( $lesson_id, $user_id );
-
-         if( !$users_answers || empty( $users_answers )
-         ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
-
-             //Fallback for pre 1.7.4 data
-             $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
-
-             if( ! isset( $comment->comment_content ) ){
-                 return NULL;
-             }
-
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
-         }
-
-         return $users_answers[ $question_id ];
-
-     }// end get_user_question_answer
-
-     /**
-      * Saving the users quiz question grades
-      *
-      * This function save all the grades for all the question in a given quiz on the lesson
-      * comment meta. It makes use of transients to save the grades for easier access at a later stage
-      *
-      * @since 1.7.4
-      *
-      * @param array $quiz_grades{
-      *      @type int $question_id
-      *      @type int $question_grade
-      * }
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return bool
-      */
-     public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_grades ) ){
-
-             return false;
-
-         }
-
-         $success = false;
-
-         // save that data for the user on the lesson comment meta
-         $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
-
-         // were the grades save successfully ?
-         if( intval( $comment_meta_id ) > 0 ) {
-
-             $success = true;
-             // save transient
-             $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-             set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
-         }
-
-         return $success;
-
-     }// end set_user_grades
-
-     /**
-      * Retrieve the users quiz question grades
-      *
-      * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
-      *
-      * @since 1.7.4
-      *
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return array $user_quiz_grades or false if none exists for this users
-      */
-     public function get_user_grades( $lesson_id, $user_id = 0 ){
-
-         $user_grades = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // save some time and get the transient cached data
-         $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-         $user_grades = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
-
-             $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
-             return false;
-         }
-
-         return $user_grades;
-
-     }// end  get_user_grades
-
-     /**
-      * Get the user question grade
-      *
-      * This function gets the grade on a quiz for the given question parameter
-      * It does NOT do any grading. It simply retrieves the data that was stored during grading.
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $question_grade
-      */
-     public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
-
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
-
-             return false;
-         }
-
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
-
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
-
-             //fallback to data pre 1.7.4
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
-             $fall_back_grade = false;
-             if( isset( $question_activity->comment_ID ) ){
-                 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
-             }
-
-             return $fall_back_grade;
-
-         } // end if $all_user_grades...
-
-         return $all_user_grades[ $question_id ];
-
-     }// end get_user_question_grade
-
-     /**
-      * Save the user's answers feedback
-      *
-      * For this function you must supply all three parameters. If will return false one is left out.
-      * The data will be saved on the lesson ID supplied.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false or int $feedback_saved
-      */
-    public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
-
-        // make sure the parameters are valid before continuing
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            ||!get_userdata( $user_id )
-            || !is_array( $answers_feedback ) ){
-
-            return false;
-
-        }
-
-
-        // check if the lesson is started before saving, if not start the lesson for the user
-        if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
-            Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
-        }
-
-        // encode the feedback
-        $encoded_answers_feedback =  array();
-        foreach( $answers_feedback as $question_id => $feedback ){
-            $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
-        }
-
-        // save the user data
-        $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
-
-        //Were the the question feedback save correctly?
-        if( intval( $feedback_saved ) > 0){
-
-            // save transient to make retrieval faster in future
-             $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-             set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
-
-        }
-
-        return $feedback_saved;
-
-    } // end save_user_answers_feedback
-
-     /**
-      * Get the user's answers feedback.
-      *
-      * This function returns the feedback submitted by the teacher/admin
-      * during grading. Grading occurs manually or automatically.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false | array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      */
-     public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
-
-         $answers_feedback = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // first check the transient to save a few split seconds
-         $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-         $encoded_feedback = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
-
-             $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
-             return false;
-         }
-
-         foreach( $encoded_feedback as $question_id => $feedback ){
+		 foreach( $encoded_feedback as $question_id => $feedback ){
 
-             $answers_feedback[ $question_id ] = base64_decode( $feedback );
+			 $answers_feedback[ $question_id ] = base64_decode( $feedback );
 
-         }
+		 }
 
-         return $answers_feedback;
+		 return $answers_feedback;
 
-     } // end get_user_answers_feedback
+	 } // end get_user_answers_feedback
 
-     /**
-      * Get the user's answer feedback for a specific question.
-      *
-      * This function gives you a single answer note/feedback string
-      * for the user on the given question.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $question_id
-      * @param int $user_id
-      *
-      * @return string $feedback or bool if false
-      */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+	 /**
+	  * Get the user's answer feedback for a specific question.
+	  *
+	  * This function gives you a single answer note/feedback string
+	  * for the user on the given question.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $question_id
+	  * @param int $user_id
+	  *
+	  * @return string $feedback or bool if false
+	  */
+	 public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
 
-         $feedback = false;
+		 $feedback = false;
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-             return false;
-         }
+			 return false;
+		 }
 
-         // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+		 // get all the feedback for the user on the given lesson
+		 $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
 
-         if( !$all_feedback || empty( $all_feedback )
-             || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
+		 if( !$all_feedback || empty( $all_feedback )
+			 || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
 
-             //fallback to data pre 1.7.4
+			 //fallback to data pre 1.7.4
 
-             // setup the sensei data query
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 // setup the sensei data query
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
 
-             // set the default to false and return that if no old data is available.
-             if( isset( $question_activity->comment_ID ) ){
-                 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
-             }
+			 // set the default to false and return that if no old data is available.
+			 if( isset( $question_activity->comment_ID ) ){
+				 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
+			 }
 
-             // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
-             }
+			 // finally use the default question feedback
+			 if( empty( $feedback ) ){
+				 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+			 }
 
-             return $feedback;
+			 return $feedback;
 
-         }
+		 }
 
-         return $all_feedback[ $question_id ];
+		 return $all_feedback[ $question_id ];
 
-     } // end get_user_question_feedback
+	 } // end get_user_question_feedback
 
-     /**
-      * Check if a quiz has no questions, and redirect back to lesson.
-      *
-      * Though a quiz is created for each lesson, it should not be visible
-      * unless it has questions.
-      *
-      * @since 1.9.0
-      * @access public
-      * @param none
-      * @return void
-      */
+	 /**
+	  * Check if a quiz has no questions, and redirect back to lesson.
+	  *
+	  * Though a quiz is created for each lesson, it should not be visible
+	  * unless it has questions.
+	  *
+	  * @since 1.9.0
+	  * @access public
+	  * @param none
+	  * @return void
+	  */
 
-     public function quiz_has_no_questions() {
+	 public function quiz_has_no_questions() {
 
-         if( ! is_singular( 'quiz' ) )  {
-             return;
-         }
+		 if( ! is_singular( 'quiz' ) )  {
+			 return;
+		 }
 
-         global $post;
+		 global $post;
 
-         $lesson_id = $this->get_lesson_id($post->ID);
+		 $lesson_id = $this->get_lesson_id($post->ID);
 
-         $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+		 $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
 
-         $lesson = get_post($lesson_id);
+		 $lesson = get_post($lesson_id);
 
-         if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
+		 if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
 
-             wp_redirect(get_permalink($lesson->ID), 301);
-             exit;
+			 wp_redirect(get_permalink($lesson->ID), 301);
+			 exit;
 
-         }
+		 }
 
-     } // end quiz_has_no_questions
+	 } // end quiz_has_no_questions
 
 /**
-  * Deprecate the sensei_single_main_content on the single-quiz template.
-  *
-  * @deprecated since 1.9.0
-  */
+ * Deprecate the sensei_single_main_content on the single-quiz template.
+ *
+ * @deprecated since 1.9.0
+ */
  public static function deprecate_quiz_sensei_single_main_content_hook(){
 
-     sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
+	 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
  }
-    /*
+	/*
      * Deprecate the sensei_quiz_single_title on the single-quiz template.
      *
      * @deprecated since 1.9.0
      */
-     public static function deprecate_quiz_sensei_quiz_single_title_hook(){
+	 public static function deprecate_quiz_sensei_quiz_single_title_hook(){
 
-         sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
+		 sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
-     }
+	 }
 
-     /**
-      * Filter the single title and add the Quiz to it.
-      *
-      * @param string $title
-      * @param int $id title post id
-      * @return string $quiz_title
-      */
-     public static function single_quiz_title( $title, $post_id ){
+	 /**
+	  * Filter the single title and add the Quiz to it.
+	  *
+	  * @param string $title
+	  * @param int $id title post id
+	  * @return string $quiz_title
+	  */
+	 public static function single_quiz_title( $title, $post_id ){
 
-         if( 'quiz' == get_post_type( $post_id ) ){
+		 if( 'quiz' == get_post_type( $post_id ) ){
 
-             $title_with_no_quizzes = $title;
+			 $title_with_no_quizzes = $title;
 
-             // if the title has quiz, remove it: legacy titles have the word quiz stored.
-             if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
+			 // if the title has quiz, remove it: legacy titles have the word quiz stored.
+			 if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
 
-                 // remove all possible appearances of quiz
-                 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
-                 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
-                 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
+				 // remove all possible appearances of quiz
+				 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
+				 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
+				 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
 
-             }
+			 }
 
-             $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
-         }
+			 $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
+		 }
 
-         /**
-          * hook document in class-woothemes-sensei-message.php
-          */
-         return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
+		 /**
+		  * hook document in class-woothemes-sensei-message.php
+		  */
+		 return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
 
-     }
+	 }
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function start_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function start_quiz_questions_loop(){
 
-         global $sensei_question_loop;
+		 global $sensei_question_loop;
 
-         //intialize the questions loop object
-         $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
+		 //intialize the questions loop object
+		 $sensei_question_loop['current'] = -1;
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
 
 
-         $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
+		 $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
 
-         if( count( $questions  ) > 0  ){
+		 if( count( $questions  ) > 0  ){
 
-             $sensei_question_loop['total']   =  count( $questions );
-             $sensei_question_loop['questions'] = $questions;
-             $sensei_question_loop['quiz_id'] = get_the_ID();
+			 $sensei_question_loop['total']   =  count( $questions );
+			 $sensei_question_loop['questions'] = $questions;
+			 $sensei_question_loop['quiz_id'] = get_the_ID();
 
-         }
+		 }
 
-     }// static function
+	 }// static function
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function stop_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function stop_quiz_questions_loop(){
 
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
-         $sensei_question_loop['quiz_id'] = '';
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
+		 $sensei_question_loop['quiz_id'] = '';
 
-     }
+	 }
 
-     /**
-      * Output the title for the single quiz page
-      *
-      * @since 1.9.0
-      */
-     public static function the_title(){
-         ?>
+	 /**
+	  * Output the title for the single quiz page
+	  *
+	  * @since 1.9.0
+	  */
+	 public static function the_title(){
+		 ?>
          <header>
 
              <h1>
 
                  <?php
-                 /**
-                  * Filter documented in class-sensei-messages.php the_title
-                  */
-                 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
-                 ?>
+				 /**
+				  * Filter documented in class-sensei-messages.php the_title
+				  */
+				 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
+				 ?>
 
              </h1>
 
          </header>
 
          <?php
-     }//the_title
+	 }//the_title
 
-     /**
-      * Output the sensei quiz status message.
-      *
-      * @param $quiz_id
-      */
-    public static function  the_user_status_message( $quiz_id ){
+	 /**
+	  * Output the sensei quiz status message.
+	  *
+	  * @param $quiz_id
+	  */
+	public static function  the_user_status_message( $quiz_id ){
 
-        $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
-        echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+		$lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
+		echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
 
-    }
+	}
 
-     /**
-      * This functions runs the old sensei_quiz_action_buttons action
-      * for backwards compatiblity sake.
-      *
-      * @since 1.9.0
-      * @deprecated
-      */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+	 /**
+	  * This functions runs the old sensei_quiz_action_buttons action
+	  * for backwards compatiblity sake.
+	  *
+	  * @since 1.9.0
+	  * @deprecated
+	  */
+	 public static function deprecate_sensei_quiz_action_buttons_hook(){
 
-         sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
+		 sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
 
-     }
+	 }
 
-     /**
-      * The quiz action buttons needed to ouput quiz
-      * action such as reset complete and save.
-      *
-      * @since 1.3.0
-      */
-     public static function action_buttons() {
+	 /**
+	  * The quiz action buttons needed to ouput quiz
+	  * action such as reset complete and save.
+	  *
+	  * @since 1.3.0
+	  */
+	 public static function action_buttons() {
 
-         global $post, $current_user;
+		 global $post, $current_user;
 
-         $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
-         $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-         $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
-         $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+		 $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
+		 $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
+		 $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+		 $show_actions = true;
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
 
-         //setup quiz grade
-         $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
+		 //setup quiz grade
+		 $user_quiz_grade = '';
+		 if( ! empty( $user_lesson_status  ) ){
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
 
 
-         if( intval( $lesson_prerequisite ) > 0 ) {
+		 if( intval( $lesson_prerequisite ) > 0 ) {
 
-             // If the user hasn't completed the prereq then hide the current actions
-             $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
+			 // If the user hasn't completed the prereq then hide the current actions
+			 $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
 
-         }
-         if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+		 }
+		 if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
 
-             // Get Reset Settings
-             $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
+			 // Get Reset Settings
+			 $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
 
              <!-- Action Nonce's -->
              <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce"
@@ -1273,55 +1273,55 @@ 
 
          <?php }
 
-     } // End sensei_quiz_action_buttons()
-
-     /**
-      * Fetch the quiz grade
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return double $user_quiz_grade
-      */
-     public static function get_user_quiz_grade( $lesson_id, $user_id ){
-
-         // get the quiz grade
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $user_quiz_grade = 0;
-         if( isset( $user_lesson_status->comment_ID ) ) {
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
-
-         return (double) $user_quiz_grade;
-
-     }
-
-     /**
-      * Check the quiz reset property for a given lesson's quiz.
-      *
-      * The data is stored on the quiz but going forward the quiz post
-      * type will be retired, hence the lesson_id is a require parameter.
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @return bool
-      */
-     public static function is_reset_allowed( $lesson_id ){
-
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-         //backwards compatibility
-         if( 'on' == $reset_allowed ) {
-             $reset_allowed = 1;
-         }
-
-         return (bool) $reset_allowed;
-
-     }
+	 } // End sensei_quiz_action_buttons()
+
+	 /**
+	  * Fetch the quiz grade
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return double $user_quiz_grade
+	  */
+	 public static function get_user_quiz_grade( $lesson_id, $user_id ){
+
+		 // get the quiz grade
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $user_quiz_grade = 0;
+		 if( isset( $user_lesson_status->comment_ID ) ) {
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
+
+		 return (double) $user_quiz_grade;
+
+	 }
+
+	 /**
+	  * Check the quiz reset property for a given lesson's quiz.
+	  *
+	  * The data is stored on the quiz but going forward the quiz post
+	  * type will be retired, hence the lesson_id is a require parameter.
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @return bool
+	  */
+	 public static function is_reset_allowed( $lesson_id ){
+
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+
+		 $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		 //backwards compatibility
+		 if( 'on' == $reset_allowed ) {
+			 $reset_allowed = 1;
+		 }
+
+		 return (bool) $reset_allowed;
+
+	 }
 
  } // End Class WooThemes_Sensei_Quiz