woothemes / sensei

templates/globals/pagination-posts.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Pagination - Posts
- *
- * @author 		WooThemes
- * @package 	Sensei/Templates
- * @version     1.1.0
- */
+	 * Pagination - Posts
+	 *
+	 * @author 		WooThemes
+	 * @package 	Sensei/Templates
+	 * @version     1.1.0
+	 */
 
 if ( ! defined( 'ABSPATH' ) ) exit;
 

templates/loop-message.php

Indentation +41 added lines, -41 removed lines

@@ -1,67 +1,67 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for outputting Message Archive items
- *
- * Override this template by copying it to yourtheme/sensei/loop-message.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for outputting Message Archive items
+	 *
+	 * Override this template by copying it to yourtheme/sensei/loop-message.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 /**
- * This runs before the the message loop items in the loop-message.php template. It runs
- * only only for the message post type. This loop will not run if the current wp_query
- * has no posts.
- *
- * @since 1.9.0
- */
+	 * This runs before the the message loop items in the loop-message.php template. It runs
+	 * only only for the message post type. This loop will not run if the current wp_query
+	 * has no posts.
+	 *
+	 * @since 1.9.0
+	 */
 do_action( 'sensei_loop_message_before' );
 ?>
 
 <div class="message-container" >
 
     <?php
-    /**
-     * This runs before the post type items in the loop.php template. It
-     * runs within the message loop <ul> tag.
-     *
-     * @since 1.9.0
-     */
-    do_action( 'sensei_loop_message_inside_before' );
-    ?>
+	/**
+	 * This runs before the post type items in the loop.php template. It
+	 * runs within the message loop <ul> tag.
+	 *
+	 * @since 1.9.0
+	 */
+	do_action( 'sensei_loop_message_inside_before' );
+	?>
 
     <?php
-    // loop through all messages
-    while ( have_posts() ) { the_post();
+	// loop through all messages
+	while ( have_posts() ) { the_post();
 
-        sensei_load_template_part('content','message');
+		sensei_load_template_part('content','message');
 
-    }
-    ?>
+	}
+	?>
 
     <?php
-    /**
-     * This runs after the post type items in the loop.php template. It runs
-     * only for the specified post type
-     *
-     * @since 1.9.0
-     */
-    do_action( 'sensei_loop_message_inside_after' );
-    ?>
+	/**
+	 * This runs after the post type items in the loop.php template. It runs
+	 * only for the specified post type
+	 *
+	 * @since 1.9.0
+	 */
+	do_action( 'sensei_loop_message_inside_after' );
+	?>
 
 </div>
 
 <?php
 /**
- * This runs after the post type items in the loop.php template. It runs
- * only for the specified post type
- *
- * @since 1.9.0
- */
+	 * This runs after the post type items in the loop.php template. It runs
+	 * only for the specified post type
+	 *
+	 * @since 1.9.0
+	 */
 do_action( 'sensei_loop_message_after' );
 ?>

templates/emails/admin-teacher-new-course-created.php

Indentation +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Teacher new message email
- *
- * @author WooThemes
- * @package Sensei/Templates/Emails/HTML
- */
+	 * Teacher new message email
+	 *
+	 * @author WooThemes
+	 * @package Sensei/Templates/Emails/HTML
+	 */
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 // Get data for email content
@@ -35,9 +35,9 @@ 
 <p style="<?php echo esc_attr( $style_small ); ?>">
     <?php
 
-    echo __( 'You can review and publish the new course here:  ', 'woothemes-sensei' ) . '<a href="' . esc_url( $sensei_email_data['course_edit_link'] ) . '">'. $sensei_email_data['course_name']. '</a>';
+	echo __( 'You can review and publish the new course here:  ', 'woothemes-sensei' ) . '<a href="' . esc_url( $sensei_email_data['course_edit_link'] ) . '">'. $sensei_email_data['course_name']. '</a>';
 
-    ?>
+	?>
 </p>
 
 <?php

templates/single-quiz/question_type-file-upload.php

Indentation +18 added lines, -18 removed lines

@@ -1,24 +1,24 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying File Upload Questions.
- *
- * Override this template by copying it to yourtheme/sensei/single-quiz/question_type-file-upload.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying File Upload Questions.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/single-quiz/question_type-file-upload.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
 
 ?>
 
@@ -34,11 +34,11 @@ 
 
         <?php
 
-        printf( __( 'Submitted file: %1$s', 'woothemes-sensei' ), '<a href="' . esc_url(  $question_data[ 'answer_media_url' ] )
-            . '" target="_blank">'
-            . esc_html(  $question_data[ 'answer_media_filename' ] ) . '</a>' );
+		printf( __( 'Submitted file: %1$s', 'woothemes-sensei' ), '<a href="' . esc_url(  $question_data[ 'answer_media_url' ] )
+			. '" target="_blank">'
+			. esc_html(  $question_data[ 'answer_media_filename' ] ) . '</a>' );
 
-        ?>
+		?>
 
     </p>
     <?php if( !  $question_data[ 'lesson_complete' ]  ) { ?>

templates/single-quiz/question_type-single-line.php

Indentation +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
 
 ?>
 

templates/single-quiz/question_type-multi-line.php

Indentation +8 added lines, -8 removed lines

@@ -14,19 +14,19 @@
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
 
 ?>
 
 <?php
 
-    Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ]  ,
-                                                'textquestion' . $question_data[ 'ID' ] ,
-                                                'sensei_question[' . $question_data[ 'ID' ] . ']' );
+	Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ]  ,
+												'textquestion' . $question_data[ 'ID' ] ,
+												'sensei_question[' . $question_data[ 'ID' ] . ']' );
 
 ?>
 

includes/class-sensei-utils.php

Indentation +492 added lines, -492 removed lines

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

templates/course-results/lessons.php

Indentation +63 added lines, -63 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying all course lessons on the course results page.
- *
- * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all course lessons on the course results page.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 
 global $course;
 ?>
@@ -17,13 +17,13 @@ 
 <?php if ( is_user_logged_in() ): ?>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, just above the lessons header.
-     * @since 1.4.0
-     */
-    do_action( 'sensei_course_results_before_lessons', $course->ID );
-    ?>
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, just above the lessons header.
+	 * @since 1.4.0
+	 */
+	do_action( 'sensei_course_results_before_lessons', $course->ID );
+	?>
 
     <header>
 
@@ -36,33 +36,33 @@ 
         <?php
 
 		$displayed_lessons = array();
-        $modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
+		$modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
 
-        // List modules with lessons
-        foreach( $modules as $module ) {
+		// List modules with lessons
+		foreach( $modules as $module ) {
 
-            $lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
-            $lessons = $lessons_query->get_posts();
+			$lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
+			$lessons = $lessons_query->get_posts();
 
-            if( count( $lessons ) > 0 ) { ?>
+			if( count( $lessons ) > 0 ) { ?>
 
                 <h3> <?php echo $module->name; ?></h3>
 
                 <?php
-                $count = 0;
-                foreach( $lessons as $lesson ) {
-
-                    $lesson_grade = 'n/a';
-                    $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                    if ( $has_questions ) {
-                        $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
-                        // Get user quiz grade
-                        $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                        if ( $lesson_grade ) {
-                            $lesson_grade .= '%';
-                        }
-                    }
-                    ?>
+				$count = 0;
+				foreach( $lessons as $lesson ) {
+
+					$lesson_grade = 'n/a';
+					$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+					if ( $has_questions ) {
+						$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
+						// Get user quiz grade
+						$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+						if ( $lesson_grade ) {
+							$lesson_grade .= '%';
+						}
+					}
+					?>
                     <h2>
 
                         <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ); ?>"
@@ -80,17 +80,17 @@ 
 
                 <?php
 
-                }// end for each
+				}// end for each
 
-            }// end if count lesson
+			}// end if count lesson
 
-        } // end for each module
-        ?>
+		} // end for each module
+		?>
 
         <?php
 
-        $lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
-        if( 0 < count( $lessons ) ): ?>
+		$lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
+		if( 0 < count( $lessons ) ): ?>
 
 			<h3>
 
@@ -101,17 +101,17 @@ 
             <?php foreach ( $lessons as $lesson ): ?>
 
                 <?php
-                $lesson_grade = 'n/a';
-                $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                if ( $has_questions ) {
-                    $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
-                    // Get user quiz grade
-                    $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                    if ( $lesson_grade ) {
-                        $lesson_grade .= '%';
-                    }
-                }
-                ?>
+				$lesson_grade = 'n/a';
+				$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+				if ( $has_questions ) {
+					$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
+					// Get user quiz grade
+					$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+					if ( $lesson_grade ) {
+						$lesson_grade .= '%';
+					}
+				}
+				?>
 
                 <h2>
 
@@ -137,10 +137,10 @@ 
 
                 <?php
 
-                    $course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
-                    echo $course_user_grade . '%';
+					$course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
+					echo $course_user_grade . '%';
 
-                ?>
+				?>
 
             </span>
 
@@ -149,13 +149,13 @@ 
     </article>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, at the bottom of all lessons.
-     *
-     * @since 1.4.0
-     */
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, at the bottom of all lessons.
+	 *
+	 * @since 1.4.0
+	 */
 	do_action( 'sensei_course_results_after_lessons', $course->ID );
-    ?>
+	?>
 
 <?php endif; //user logged in ?>
\ No newline at end of file

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

Indentation +86 added lines, -86 removed lines

@@ -15,91 +15,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->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->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