woothemes / sensei

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

Indentation +83 added lines, -83 removed lines

@@ -15,88 +15,88 @@
  */
 class Sensei_Shortcode_User_Messages implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array $messages{
-     *     @type WP_Post
-     * }
-     * 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 ){
-
-        if( is_user_logged_in() ){
-
-            $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(){
-
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
-
-        if( empty( $this->messages_query ) || $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_Templates::get_part('loop', 'message');
-        $messages_html = ob_get_clean();
-
-        // set back the global query
-        wp_reset_query();
-
-        return $messages_html;
-
-    }// end render
+	/**
+	 * @var array $messages{
+	 *     @type WP_Post
+	 * }
+	 * 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 ){
+
+		if( is_user_logged_in() ){
+
+			$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(){
+
+		$messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
+											|| ! Sensei()->settings->settings['messages_disable'] ) ;
+
+		if( empty( $this->messages_query ) || $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_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

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_user_messages] shortcode. The current users messages.
@@ -31,9 +31,9 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        if( is_user_logged_in() ){
+        if (is_user_logged_in()) {
 
             $this->setup_messages_query();
 
@@ -46,7 +46,7 @@ 
      *
      * @return mixed
      */
-    public function setup_messages_query(){
+    public function setup_messages_query() {
 
         $user = wp_get_current_user();
 
@@ -65,7 +65,7 @@ 
             ),
         );
 
-        $this->messages_query  = new WP_Query( $args );
+        $this->messages_query = new WP_Query($args);
     }
 
     /**
@@ -73,12 +73,12 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
+        $messages_disabled_in_settings = ! ( ! isset(Sensei()->settings->settings['messages_disable'])
+                                            || ! Sensei()->settings->settings['messages_disable']);
 
-        if( empty( $this->messages_query ) || $messages_disabled_in_settings ){
+        if (empty($this->messages_query) || $messages_disabled_in_settings) {
 
             return '';
 

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis User Profile List Table Class

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

Indentation +110 added lines, -110 removed lines

@@ -13,115 +13,115 @@
  */
 class Sensei_Shortcode_Featured_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: -1.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
-
-    /**
-     * @var string teacher id to limit the courses to
-     */
-    protected $teacher;
-
-    /**
-     * 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->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
-
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
-
-            $this->order =  'ASC';
-
-        }else{
-
-            // 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();
-    }
-
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
-
-        //for non numeric teacher arguments value query by author_name and not author
-        $teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
-
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            'orderby'          => $this->orderby,
-            'order'            => $this->order,
-            'posts_per_page'   => $this->number,
-            $teacher_query_by  => $this->teacher,
-            'meta_value' 	   => 'featured',
-            'meta_key' 		   => '_course_featured',
-            'meta_compare' 	   => '=',
-            'suppress_filters' => 0,
-        );
-
-        $this->query = new WP_Query( $query_args );
-
-    }// end setup _course_query
-
-    /**
-     * Rendering the shortcode this class is responsible for.
-     */
-    public function render(){
-
-        global $wp_query;
-
-        // keep a reference to old query
-        $current_global_query = $wp_query;
-
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
-
-        ob_start();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
-
-        //restore old query
-        $wp_query = $current_global_query;
-
-        return $shortcode_output;
-
-    }// end render
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: -1.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
+
+	/**
+	 * @var string teacher id to limit the courses to
+	 */
+	protected $teacher;
+
+	/**
+	 * 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->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
+
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+
+			$this->order =  'ASC';
+
+		}else{
+
+			// 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();
+	}
+
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
+
+		//for non numeric teacher arguments value query by author_name and not author
+		$teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
+
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			'orderby'          => $this->orderby,
+			'order'            => $this->order,
+			'posts_per_page'   => $this->number,
+			$teacher_query_by  => $this->teacher,
+			'meta_value' 	   => 'featured',
+			'meta_key' 		   => '_course_featured',
+			'meta_compare' 	   => '=',
+			'suppress_filters' => 0,
+		);
+
+		$this->query = new WP_Query( $query_args );
+
+	}// end setup _course_query
+
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 */
+	public function render(){
+
+		global $wp_query;
+
+		// keep a reference to old query
+		$current_global_query = $wp_query;
+
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
+
+		ob_start();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
+
+		//restore old query
+		$wp_query = $current_global_query;
+
+		return $shortcode_output;
+
+	}// end render
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  * Sensei Feature Course rendering class
  *
@@ -49,22 +49,22 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->teacher = isset($attributes['teacher']) ? $attributes['teacher'] : '';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'date';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'DESC';
 
         }
 
@@ -78,10 +78,10 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
         //for non numeric teacher arguments value query by author_name and not author
-        $teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
+        $teacher_query_by = is_numeric($this->teacher) ? 'author' : 'author_name';
 
         $query_args = array(
             'post_type'        => 'course',
@@ -96,14 +96,14 @@ 
             'suppress_filters' => 0,
         );
 
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
     /**
      * Rendering the shortcode this class is responsible for.
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
@@ -115,7 +115,7 @@ 
 
         ob_start();
         Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         //restore old query
         $wp_query = $current_global_query;

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Post Types Class
@@ -146,7 +149,7 @@ 
 
              return get_page_uri( $settings_course_page->ID );
 
-        }else{
+        } else{
 
             return 'courses';
 

includes/shortcodes/interface-sensei-shortcode.php

Indentation +13 added lines, -13 removed lines

@@ -12,19 +12,19 @@
  */
 interface Sensei_Shortcode_Interface {
 
-    /**
-     * All constructors must implement and accept $attributes and $content as arguments
-     *
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode
-     * @return mixed
-     */
-    public function __construct($attributes, $content, $shortcode);
+	/**
+	 * All constructors must implement and accept $attributes and $content as arguments
+	 *
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode
+	 * @return mixed
+	 */
+	public function __construct($attributes, $content, $shortcode);
 
-    /**
-     * @return string generated output
-     */
-    public function render();
+	/**
+	 * @return string generated output
+	 */
+	public function render();
 
 }// end interface
\ No newline at end of file

includes/shortcodes/class-sensei-shortcode-course-page.php

Indentation +92 added lines, -92 removed lines

@@ -14,97 +14,97 @@ 
  */
 class Sensei_Shortcode_Course_Page implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array $course_page_query{
-     *     @type WP_Post
-     * }
-     * The courses query
-     */
-    protected $course_page_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->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
-        $this->setup_course_query();
-
-    }
-
-    /**
-     * create the courses query .
-     *
-     * @return mixed
-     */
-    public function setup_course_query(){
-
-        if( empty( $this->id ) ){
-            return;
-        }
-
-        $args = array(
-            'post_type' => 'course',
-            'posts_per_page' => 1,
-            'post_status' => 'publish',
-            'post__in' => array( $this->id ),
-        );
-
-        $this->course_page_query  = new WP_Query( $args );
-
-    }
-
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
-
-        if( empty(  $this->id  ) ){
-
-            return sprintf( __( 'Please supply a course ID for the shortcode: %s', 'woothemes-sensei' ),'[sensei_course_page id=""]') ;
-
-        }
-
-        //set the wp_query to the current courses query
-        global $wp_query, $post;
-
-        // backups
-        $global_post_ref = $post;
-        $global_wp_query_ref = $wp_query;
-
-        $post = get_post( $this->id );
-        $wp_query->post = get_post( $this->id ); //  set this in case some the course hooks resets the query
-        $wp_query = $this->course_page_query;
-
-        ob_start();
-        self::the_single_course_content();
-        $shortcode_output = ob_get_clean();
-
-        // set back the global query and post
-        // restore global backups
-        $wp_query       = $global_wp_query_ref;
-        $post           = $global_post_ref;
-        $wp_query->post = $global_post_ref;
-        wp_reset_query();
-
-        return $shortcode_output;
-
-    }// end render
-
-    /**
-     * Print out the single course content markup
-     *
-     * @since 1.9.0
-     */
-    public static function the_single_course_content(){
-        ?>
+	/**
+	 * @var array $course_page_query{
+	 *     @type WP_Post
+	 * }
+	 * The courses query
+	 */
+	protected $course_page_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->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
+		$this->setup_course_query();
+
+	}
+
+	/**
+	 * create the courses query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_course_query(){
+
+		if( empty( $this->id ) ){
+			return;
+		}
+
+		$args = array(
+			'post_type' => 'course',
+			'posts_per_page' => 1,
+			'post_status' => 'publish',
+			'post__in' => array( $this->id ),
+		);
+
+		$this->course_page_query  = new WP_Query( $args );
+
+	}
+
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
+
+		if( empty(  $this->id  ) ){
+
+			return sprintf( __( 'Please supply a course ID for the shortcode: %s', 'woothemes-sensei' ),'[sensei_course_page id=""]') ;
+
+		}
+
+		//set the wp_query to the current courses query
+		global $wp_query, $post;
+
+		// backups
+		$global_post_ref = $post;
+		$global_wp_query_ref = $wp_query;
+
+		$post = get_post( $this->id );
+		$wp_query->post = get_post( $this->id ); //  set this in case some the course hooks resets the query
+		$wp_query = $this->course_page_query;
+
+		ob_start();
+		self::the_single_course_content();
+		$shortcode_output = ob_get_clean();
+
+		// set back the global query and post
+		// restore global backups
+		$wp_query       = $global_wp_query_ref;
+		$post           = $global_post_ref;
+		$wp_query->post = $global_post_ref;
+		wp_reset_query();
+
+		return $shortcode_output;
+
+	}// end render
+
+	/**
+	 * Print out the single course content markup
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_single_course_content(){
+		?>
 
         <article <?php post_class( array( 'course', 'post' ) ); ?> >
 
@@ -122,6 +122,6 @@ 
         </article>
 
         <?php
-    }// end the_single_course_content
+	}// end the_single_course_content
 
 }// end class

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_course_page] shortcode. Display a single course based on the ID parameter given
@@ -30,9 +30,9 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        $this->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
+        $this->id = isset($attributes['id']) ? $attributes['id'] : '';
         $this->setup_course_query();
 
     }
@@ -42,9 +42,9 @@ 
      *
      * @return mixed
      */
-    public function setup_course_query(){
+    public function setup_course_query() {
 
-        if( empty( $this->id ) ){
+        if (empty($this->id)) {
             return;
         }
 
@@ -52,10 +52,10 @@ 
             'post_type' => 'course',
             'posts_per_page' => 1,
             'post_status' => 'publish',
-            'post__in' => array( $this->id ),
+            'post__in' => array($this->id),
         );
 
-        $this->course_page_query  = new WP_Query( $args );
+        $this->course_page_query = new WP_Query($args);
 
     }
 
@@ -64,11 +64,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( empty(  $this->id  ) ){
+        if (empty($this->id)) {
 
-            return sprintf( __( 'Please supply a course ID for the shortcode: %s', 'woothemes-sensei' ),'[sensei_course_page id=""]') ;
+            return sprintf(__('Please supply a course ID for the shortcode: %s', 'woothemes-sensei'), '[sensei_course_page id=""]');
 
         }
 
@@ -79,8 +79,8 @@ 
         $global_post_ref = $post;
         $global_wp_query_ref = $wp_query;
 
-        $post = get_post( $this->id );
-        $wp_query->post = get_post( $this->id ); //  set this in case some the course hooks resets the query
+        $post = get_post($this->id);
+        $wp_query->post = get_post($this->id); //  set this in case some the course hooks resets the query
         $wp_query = $this->course_page_query;
 
         ob_start();
@@ -103,13 +103,13 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_single_course_content(){
+    public static function the_single_course_content() {
         ?>
 
-        <article <?php post_class( array( 'course', 'post' ) ); ?> >
+        <article <?php post_class(array('course', 'post')); ?> >
 
 
-            <?php  do_action( 'sensei_single_course_content_inside_before' );  ?>
+            <?php  do_action('sensei_single_course_content_inside_before'); ?>
 
             <section class="entry fix">
 
@@ -117,7 +117,7 @@ 
 
             </section>
 
-            <?php  do_action( 'sensei_single_course_content_inside_after' );  ?>
+            <?php  do_action('sensei_single_course_content_inside_after'); ?>
 
         </article>
 

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis User Profile List Table Class

includes/shortcodes/class-sensei-shortcode-teachers.php

Indentation +191 added lines, -191 removed lines

@@ -17,270 +17,270 @@
  */
 class Sensei_Shortcode_Teachers implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_User_Query keeps a reference to the user query created
-     */
-    protected $user_query;
+	/**
+	 * @var WP_User_Query keeps a reference to the user query created
+	 */
+	protected $user_query;
 
-    /**
-     * @var which user id's to include
-     */
-    protected $include;
+	/**
+	 * @var which user id's to include
+	 */
+	protected $include;
 
-    /**
-     * @var which user id's to exclude
-     */
-    protected $exclude;
+	/**
+	 * @var which user id's to exclude
+	 */
+	protected $exclude;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        $include = isset( $attributes['include'] ) ? explode( ',', $attributes['include'] ) : '';
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',', $attributes['exclude'] ) : '';
+		$include = isset( $attributes['include'] ) ? explode( ',', $attributes['include'] ) : '';
+		$exclude = isset( $attributes['exclude'] ) ? explode( ',', $attributes['exclude'] ) : '';
 
-        // convert teacher usernames given to the id
-        $this->include = $this->convert_usernames_to_ids( $include );
-        $this->exclude = $this->convert_usernames_to_ids( $exclude );
+		// convert teacher usernames given to the id
+		$this->include = $this->convert_usernames_to_ids( $include );
+		$this->exclude = $this->convert_usernames_to_ids( $exclude );
 
-        $this->setup_teacher_query();
+		$this->setup_teacher_query();
 
-    }
+	}
 
-    /**
-     *
-     * Setup the user query that will be used in the render method
-     *
-     * @since 1.9.0
-     */
-    protected function setup_teacher_query(){
+	/**
+	 *
+	 * Setup the user query that will be used in the render method
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_teacher_query(){
 
-        $user_query_args = array(
-            'role' => 'teacher',
-        );
+		$user_query_args = array(
+			'role' => 'teacher',
+		);
 
-        $this->user_query = new WP_User_Query( $user_query_args );
+		$this->user_query = new WP_User_Query( $user_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(){
 
-        $all_users = $this->user_query->get_results();
-        // if the user has specified more users add them as well.
-        if( ! empty( $this->include ) ){
+		$all_users = $this->user_query->get_results();
+		// if the user has specified more users add them as well.
+		if( ! empty( $this->include ) ){
 
-            $included_users_query = new WP_User_Query( array( 'include' => $this->include ) );
-            $included_users = $included_users_query->get_results();
-            if( ! empty( $included_users ) ){
+			$included_users_query = new WP_User_Query( array( 'include' => $this->include ) );
+			$included_users = $included_users_query->get_results();
+			if( ! empty( $included_users ) ){
 
-                $merged_users = array_merge( $all_users, $included_users );
-                $all_users = $this->users_unique( $merged_users );
-                $all_users = $this->users_sort( $all_users );
+				$merged_users = array_merge( $all_users, $included_users );
+				$all_users = $this->users_unique( $merged_users );
+				$all_users = $this->users_sort( $all_users );
 
-            }
+			}
 
-        }
+		}
 
-        // exclude the users not wanted
-        if( ! empty( $this->exclude ) ){
+		// exclude the users not wanted
+		if( ! empty( $this->exclude ) ){
 
-            $all_users = $this->exclude_users( $all_users, $this->exclude );
+			$all_users = $this->exclude_users( $all_users, $this->exclude );
 
-        }
+		}
 
-        if( ! count( $all_users )> 0  ){
-            return '';
-        }
+		if( ! count( $all_users )> 0  ){
+			return '';
+		}
 
 
-        $users_output = '';
+		$users_output = '';
 
-        foreach ( $all_users as $user ) {
+		foreach ( $all_users as $user ) {
 
-            $user_display_name = $this->get_user_public_name( $user );
+			$user_display_name = $this->get_user_public_name( $user );
 
-            /**
-             * Sensei teachers shortcode list item filter
-             *
-             * @since 1.9.0
-             *
-             * @param string $teacher_li the html for the teacher li
-             * @param WP_User $user
-             */
-            $users_output .= apply_filters( 'sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'. get_author_posts_url( $user->ID ) . '">'. $user_display_name .  '<a/></li>', $user );
+			/**
+			 * Sensei teachers shortcode list item filter
+			 *
+			 * @since 1.9.0
+			 *
+			 * @param string $teacher_li the html for the teacher li
+			 * @param WP_User $user
+			 */
+			$users_output .= apply_filters( 'sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'. get_author_posts_url( $user->ID ) . '">'. $user_display_name .  '<a/></li>', $user );
 
-        }
+		}
 
-        return '<ul class="sensei-teachers">' . $users_output . '</ul>';
+		return '<ul class="sensei-teachers">' . $users_output . '</ul>';
 
-    }// end render
+	}// end render
 
-    /**
-     * remove duplicate user objects from and array of users
-     *
-     * @since 1.9.0
-     *
-     * @param array $users{
-     *   @type WP_User
-     * }
-     *
-     * @return array $unique_users {
-     *   @type WP_User
-     * }
-     */
-    public  function users_unique( $users ){
+	/**
+	 * remove duplicate user objects from and array of users
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $users{
+	 *   @type WP_User
+	 * }
+	 *
+	 * @return array $unique_users {
+	 *   @type WP_User
+	 * }
+	 */
+	public  function users_unique( $users ){
 
-        $array_unique_users_ids = array();
-        foreach( $users as $index => $user ){
+		$array_unique_users_ids = array();
+		foreach( $users as $index => $user ){
 
-            if(  in_array( $user->ID,  $array_unique_users_ids)  ){
+			if(  in_array( $user->ID,  $array_unique_users_ids)  ){
 
-                // exclude this user as it is already in the list
-                unset( $users[ $index ] );
+				// exclude this user as it is already in the list
+				unset( $users[ $index ] );
 
-            }else{
+			}else{
 
-                // add teh user to the list of users
-                $array_unique_users_ids[] = $user->ID;
+				// add teh user to the list of users
+				$array_unique_users_ids[] = $user->ID;
 
-            }
+			}
 
-        }
+		}
 
-        return $users;
+		return $users;
 
-    }// end users_unique
+	}// end users_unique
 
-    /**
-     * Exclude users based ont he ids given.
-     *
-     * @since 1.9.0
-     *
-     * @param array $users
-     * @param array $exclude_ids
-     * @return array
-     */
-    public function exclude_users( $users, $exclude_ids ){
+	/**
+	 * Exclude users based ont he ids given.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $users
+	 * @param array $exclude_ids
+	 * @return array
+	 */
+	public function exclude_users( $users, $exclude_ids ){
 
-        foreach( $users as $index => $user ){
+		foreach( $users as $index => $user ){
 
-            if( in_array( $user->ID, $exclude_ids )  ){
+			if( in_array( $user->ID, $exclude_ids )  ){
 
-                // remove the user from the list
-                unset( $users[ $index ] );
+				// remove the user from the list
+				unset( $users[ $index ] );
 
-            }
+			}
 
-        }
+		}
 
-        return $users;
+		return $users;
 
-    }// end exclude_users
+	}// end exclude_users
 
-    /**
-     * Convert mixed array of user id and user names to only be an array of user_ids
-     *
-     * @param array $users
-     * @return array $users_ids
-     */
-    public function convert_usernames_to_ids( $users ){
+	/**
+	 * Convert mixed array of user id and user names to only be an array of user_ids
+	 *
+	 * @param array $users
+	 * @return array $users_ids
+	 */
+	public function convert_usernames_to_ids( $users ){
 
-        // backup
-        $users_ids = array();
+		// backup
+		$users_ids = array();
 
-        if ( is_array($users) ) {
+		if ( is_array($users) ) {
 
-            foreach ($users as $user_id_or_username) {
+			foreach ($users as $user_id_or_username) {
 
-                if (!is_numeric($user_id_or_username)) {
+				if (!is_numeric($user_id_or_username)) {
 
-                    $user_name = $user_id_or_username;
-                    $user = get_user_by('login', $user_name);
+					$user_name = $user_id_or_username;
+					$user = get_user_by('login', $user_name);
 
-                    if (is_a($user, 'WP_User')) {
-                        $users_ids[] = $user->ID;
-                    }
+					if (is_a($user, 'WP_User')) {
+						$users_ids[] = $user->ID;
+					}
 
-                } else {
+				} else {
 
-                    $user_id = $user_id_or_username;
-                    $users_ids[] = $user_id;
+					$user_id = $user_id_or_username;
+					$users_ids[] = $user_id;
 
-                }
+				}
 
-            }
-        }
+			}
+		}
 
-        return $users_ids;
-    }
+		return $users_ids;
+	}
 
-    /**
-     * Returns the first name and last name or the display name of a user.
-     *
-     * @since 1.9.0
-     *
-     * @param $user
-     * @return string $user_public_name
-     */
-    public function get_user_public_name( $user ){
+	/**
+	 * Returns the first name and last name or the display name of a user.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $user
+	 * @return string $user_public_name
+	 */
+	public function get_user_public_name( $user ){
 
-        if (!empty($user->first_name) && !empty($user->last_name)) {
+		if (!empty($user->first_name) && !empty($user->last_name)) {
 
-            $user_public_name = $user->first_name . ' ' . $user->last_name;
+			$user_public_name = $user->first_name . ' ' . $user->last_name;
 
-        }
+		}
 
-        else {
+		else {
 
-            $user_public_name = $user->display_name;
+			$user_public_name = $user->display_name;
 
-        }
+		}
 
-        return $user_public_name;
-    }
+		return $user_public_name;
+	}
 
-    /**
-     *
-     * Sort user objects by user display
-     *
-     * @since 1.9.0
-     *
-     * @param $users
-     * @return  array $sorted_users
-     */
-    public function users_sort( $users ){
+	/**
+	 *
+	 * Sort user objects by user display
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $users
+	 * @return  array $sorted_users
+	 */
+	public function users_sort( $users ){
 
-        $sorted_users = $users;
+		$sorted_users = $users;
 
-        uasort( $sorted_users, array( $this, 'custom_user_sort' ) );
+		uasort( $sorted_users, array( $this, 'custom_user_sort' ) );
 
-        return $sorted_users;
-    }
+		return $sorted_users;
+	}
 
-    /**
-     * Used in the uasort function to sort users by title
-     *
-     * @since 1.9.0
-     *
-     * @param $user_1
-     * @param $user_2
-     * @return int
-     */
-    public function custom_user_sort($user_1, $user_2){
+	/**
+	 * Used in the uasort function to sort users by title
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $user_1
+	 * @param $user_2
+	 * @return int
+	 */
+	public function custom_user_sort($user_1, $user_2){
 
-        return strcasecmp( $this->get_user_public_name( $user_1 ), $this->get_user_public_name( $user_2 )  );
+		return strcasecmp( $this->get_user_public_name( $user_1 ), $this->get_user_public_name( $user_2 )  );
 
-    }// end custom_user_sort
+	}// end custom_user_sort
 
 }// end class
\ No newline at end of file

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_teachers] shortcode. Will show a list of teachers
@@ -40,14 +40,14 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        $include = isset( $attributes['include'] ) ? explode( ',', $attributes['include'] ) : '';
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',', $attributes['exclude'] ) : '';
+        $include = isset($attributes['include']) ? explode(',', $attributes['include']) : '';
+        $exclude = isset($attributes['exclude']) ? explode(',', $attributes['exclude']) : '';
 
         // convert teacher usernames given to the id
-        $this->include = $this->convert_usernames_to_ids( $include );
-        $this->exclude = $this->convert_usernames_to_ids( $exclude );
+        $this->include = $this->convert_usernames_to_ids($include);
+        $this->exclude = $this->convert_usernames_to_ids($exclude);
 
         $this->setup_teacher_query();
 
@@ -59,13 +59,13 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_teacher_query(){
+    protected function setup_teacher_query() {
 
         $user_query_args = array(
             'role' => 'teacher',
         );
 
-        $this->user_query = new WP_User_Query( $user_query_args );
+        $this->user_query = new WP_User_Query($user_query_args);
 
     }// end setup _course_query
 
@@ -74,41 +74,41 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         $all_users = $this->user_query->get_results();
         // if the user has specified more users add them as well.
-        if( ! empty( $this->include ) ){
+        if ( ! empty($this->include)) {
 
-            $included_users_query = new WP_User_Query( array( 'include' => $this->include ) );
+            $included_users_query = new WP_User_Query(array('include' => $this->include));
             $included_users = $included_users_query->get_results();
-            if( ! empty( $included_users ) ){
+            if ( ! empty($included_users)) {
 
-                $merged_users = array_merge( $all_users, $included_users );
-                $all_users = $this->users_unique( $merged_users );
-                $all_users = $this->users_sort( $all_users );
+                $merged_users = array_merge($all_users, $included_users);
+                $all_users = $this->users_unique($merged_users);
+                $all_users = $this->users_sort($all_users);
 
             }
 
         }
 
         // exclude the users not wanted
-        if( ! empty( $this->exclude ) ){
+        if ( ! empty($this->exclude)) {
 
-            $all_users = $this->exclude_users( $all_users, $this->exclude );
+            $all_users = $this->exclude_users($all_users, $this->exclude);
 
         }
 
-        if( ! count( $all_users )> 0  ){
+        if ( ! count($all_users) > 0) {
             return '';
         }
 
 
         $users_output = '';
 
-        foreach ( $all_users as $user ) {
+        foreach ($all_users as $user) {
 
-            $user_display_name = $this->get_user_public_name( $user );
+            $user_display_name = $this->get_user_public_name($user);
 
             /**
              * Sensei teachers shortcode list item filter
@@ -118,11 +118,11 @@ 
              * @param string $teacher_li the html for the teacher li
              * @param WP_User $user
              */
-            $users_output .= apply_filters( 'sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'. get_author_posts_url( $user->ID ) . '">'. $user_display_name .  '<a/></li>', $user );
+            $users_output .= apply_filters('sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'.get_author_posts_url($user->ID).'">'.$user_display_name.'<a/></li>', $user);
 
         }
 
-        return '<ul class="sensei-teachers">' . $users_output . '</ul>';
+        return '<ul class="sensei-teachers">'.$users_output.'</ul>';
 
     }// end render
 
@@ -139,17 +139,17 @@ 
      *   @type WP_User
      * }
      */
-    public  function users_unique( $users ){
+    public  function users_unique($users) {
 
         $array_unique_users_ids = array();
-        foreach( $users as $index => $user ){
+        foreach ($users as $index => $user) {
 
-            if(  in_array( $user->ID,  $array_unique_users_ids)  ){
+            if (in_array($user->ID, $array_unique_users_ids)) {
 
                 // exclude this user as it is already in the list
-                unset( $users[ $index ] );
+                unset($users[$index]);
 
-            }else{
+            } else {
 
                 // add teh user to the list of users
                 $array_unique_users_ids[] = $user->ID;
@@ -171,14 +171,14 @@ 
      * @param array $exclude_ids
      * @return array
      */
-    public function exclude_users( $users, $exclude_ids ){
+    public function exclude_users($users, $exclude_ids) {
 
-        foreach( $users as $index => $user ){
+        foreach ($users as $index => $user) {
 
-            if( in_array( $user->ID, $exclude_ids )  ){
+            if (in_array($user->ID, $exclude_ids)) {
 
                 // remove the user from the list
-                unset( $users[ $index ] );
+                unset($users[$index]);
 
             }
 
@@ -194,16 +194,16 @@ 
      * @param array $users
      * @return array $users_ids
      */
-    public function convert_usernames_to_ids( $users ){
+    public function convert_usernames_to_ids($users) {
 
         // backup
         $users_ids = array();
 
-        if ( is_array($users) ) {
+        if (is_array($users)) {
 
             foreach ($users as $user_id_or_username) {
 
-                if (!is_numeric($user_id_or_username)) {
+                if ( ! is_numeric($user_id_or_username)) {
 
                     $user_name = $user_id_or_username;
                     $user = get_user_by('login', $user_name);
@@ -233,11 +233,11 @@ 
      * @param $user
      * @return string $user_public_name
      */
-    public function get_user_public_name( $user ){
+    public function get_user_public_name($user) {
 
-        if (!empty($user->first_name) && !empty($user->last_name)) {
+        if ( ! empty($user->first_name) && ! empty($user->last_name)) {
 
-            $user_public_name = $user->first_name . ' ' . $user->last_name;
+            $user_public_name = $user->first_name.' '.$user->last_name;
 
         }
 
@@ -259,11 +259,11 @@ 
      * @param $users
      * @return  array $sorted_users
      */
-    public function users_sort( $users ){
+    public function users_sort($users) {
 
         $sorted_users = $users;
 
-        uasort( $sorted_users, array( $this, 'custom_user_sort' ) );
+        uasort($sorted_users, array($this, 'custom_user_sort'));
 
         return $sorted_users;
     }
@@ -277,9 +277,9 @@ 
      * @param $user_2
      * @return int
      */
-    public function custom_user_sort($user_1, $user_2){
+    public function custom_user_sort($user_1, $user_2) {
 
-        return strcasecmp( $this->get_user_public_name( $user_1 ), $this->get_user_public_name( $user_2 )  );
+        return strcasecmp($this->get_user_public_name($user_1), $this->get_user_public_name($user_2));
 
     }// end custom_user_sort
 

Braces +6 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 /**
  *
  * Renders the [sensei_teachers] shortcode. Will show a list of teachers
@@ -149,7 +152,7 @@ 
                 // exclude this user as it is already in the list
                 unset( $users[ $index ] );
 
-            }else{
+            } else{
 
                 // add teh user to the list of users
                 $array_unique_users_ids[] = $user->ID;
@@ -239,9 +242,7 @@ 
 
             $user_public_name = $user->first_name . ' ' . $user->last_name;
 
-        }
-
-        else {
+        } else {
 
             $user_public_name = $user->display_name;
 

includes/class-sensei.php

Braces +35 added lines, -20 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei_Main
@@ -156,7 +159,9 @@ 
         $this->init();
 
         // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
+        	$this->install();
+        }
 
         // Run this on activation.
         register_activation_hook( $this->file, array( $this, 'activation' ) );
@@ -442,7 +447,9 @@ 
      **/
     public function virtual_order_payment_complete( $order_status, $order_id ) {
         $order = new WC_Order( $order_id );
-        if ( ! isset ( $order ) ) return;
+        if ( ! isset ( $order ) ) {
+        	return;
+        }
         if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
             $virtual_order = true;
 
@@ -606,7 +613,7 @@ 
 
             $sensei_plugin_path =  $this->plugin_path;
 
-        }else{
+        } else{
 
             $sensei_plugin_path = plugin_dir_path( __FILE__ );
 
@@ -641,7 +648,9 @@ 
     public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return;
+        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) {
+        	return;
+        }
 
         $data_update = false;
 
@@ -725,8 +734,7 @@ 
 
                     $prerequisite_complete = WooThemes_Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
 
-                }
-                else {
+                } else {
                     $prerequisite_complete = true;
                 } // End If Statement
                 // Handles restrictions
@@ -853,7 +861,9 @@ 
      */
     public function access_settings () {
 
-        if( sensei_all_access() ) return true;
+        if( sensei_all_access() ) {
+        	return true;
+        }
 
         if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
             if ( is_user_logged_in() ) {
@@ -1182,8 +1192,9 @@ 
         }
         $where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')";
 
-        if ( $post_id > 0 )
-            $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+        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 );
 
@@ -1191,16 +1202,19 @@ 
         $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'];
+            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;
+            if ( empty($stats[$key]) ) {
+                            $stats[$key] = 0;
+            }
         }
 
         $stats = (object) $stats;
@@ -1241,8 +1255,9 @@ 
     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 ( ! 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;
@@ -1305,7 +1320,7 @@ 
             require_once( 'class-sensei-modules.php');
             Sensei()->modules = new Sensei_Core_Modules( $this->file );
 
-        }else{
+        } else{
             // fallback for people still using the modules extension.
             global $sensei_modules;
             Sensei()->modules = $sensei_modules;
@@ -1352,7 +1367,7 @@ 
 
             update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+        } elseif( '2' == $option ) {
 
             flush_rewrite_rules();
             update_option('sensei_flush_rewrite_rules', '0');

Doc Comments +4 added lines, -4 removed lines

@@ -398,7 +398,7 @@ 
     /**
      * Disable guest checkout if a course product is in the cart
      * @param  boolean $guest_checkout Current guest checkout setting
-     * @return boolean                 Modified guest checkout setting
+     * @return string|boolean                 Modified guest checkout setting
      */
     public function disable_guest_checkout( $guest_checkout ) {
         global $woocommerce;
@@ -584,7 +584,7 @@ 
      *
      * @access public
      * @param mixed $template
-     * @return void
+     * @return string
      * @deprecated
      */
     public function template_loader ( $template = '' ) {
@@ -849,7 +849,7 @@ 
      * 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 void
+     * @return boolean
      */
     public function access_settings () {
 
@@ -1235,7 +1235,7 @@ 
      *
      * @since 1.4.5
      * @access public
-     * @param mixed $image_size
+     * @param string $image_size
      * @return string
      */
     public function get_image_size( $image_size ) {

Indentation +1298 added lines, -1298 removed lines

@@ -14,1316 +14,1316 @@ 
  */
 class Sensei_Main {
 
-    /**
-     * @var file
-     * Reference to the main plugin file
-     */
-    private $file;
-
-    /**
-     * @var $_instance reference 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 WooThemes_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 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 String
-     */
-    public $notice;
-
-    /**
-     * @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/' );
-        $this->permissions_message = array( 'title' => __( 'Permission Denied', 'woothemes-sensei' ), 'message' => __( 'Unfortunately you do not have permissions to access this page.', 'woothemes-sensei' ) );
-
-        // Initialize the core Sensei functionality
-        $this->init();
+	/**
+	 * @var file
+	 * Reference to the main plugin file
+	 */
+	private $file;
+
+	/**
+	 * @var $_instance reference 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 WooThemes_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 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 String
+	 */
+	public $notice;
+
+	/**
+	 * @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/' );
+		$this->permissions_message = array( 'title' => __( 'Permission Denied', 'woothemes-sensei' ), 'message' => __( 'Unfortunately you do not have permissions to access this page.', 'woothemes-sensei' ) );
+
+		// Initialize the core Sensei functionality
+		$this->init();
 
-        // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+		// Installation
+		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
 
-        // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
+		// Run this on activation.
+		register_activation_hook( $this->file, array( $this, 'activation' ) );
 
-        // Setup post types.
-        $this->post_types = new Sensei_PostTypes();
-        $this->post_types->token = 'woothemes-sensei-posttypes';
-
-        // Lad the updates class
-        $this->updates = new WooThemes_Sensei_Updates( $this );
-
-        // Setup settings screen.
-        $this->settings = new Sensei_Settings();
-        $this->settings->token = 'woothemes-sensei-settings';
-
-        // Setup Admin Settings data
-        if ( is_admin() ) {
-
-            $this->settings->has_tabs 	= true;
-            $this->settings->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->settings->menu_label	= __( 'Settings', 'woothemes-sensei' );
-            $this->settings->page_slug	= 'woothemes-sensei-settings';
+		// Setup post types.
+		$this->post_types = new Sensei_PostTypes();
+		$this->post_types->token = 'woothemes-sensei-posttypes';
+
+		// Lad the updates class
+		$this->updates = new WooThemes_Sensei_Updates( $this );
+
+		// Setup settings screen.
+		$this->settings = new Sensei_Settings();
+		$this->settings->token = 'woothemes-sensei-settings';
+
+		// Setup Admin Settings data
+		if ( is_admin() ) {
+
+			$this->settings->has_tabs 	= true;
+			$this->settings->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
+			$this->settings->menu_label	= __( 'Settings', 'woothemes-sensei' );
+			$this->settings->page_slug	= 'woothemes-sensei-settings';
 
-        } // End If Statement
+		} // End If Statement
 
-        $this->settings->setup_settings();
-        $this->settings->get_settings();
+		$this->settings->setup_settings();
+		$this->settings->get_settings();
 
-        // Load Course Results Class
-        $this->course_results = new Sensei_Course_Results();
-        $this->course_results->token = $this->token;
+		// Load Course Results Class
+		$this->course_results = new Sensei_Course_Results();
+		$this->course_results->token = $this->token;
 
-        // 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
-        add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
+		// load the modules class
+		add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
 
-        // Load Learner Management Functionality
-        $this->learners = new Sensei_Learners( $file );
-        $this->learners->token = $this->token;
+		// Load Learner Management Functionality
+		$this->learners = new Sensei_Learners( $file );
+		$this->learners->token = $this->token;
 
-        // 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( $file );
-            $this->admin->token = $this->token;
+			// Load Admin Class
+			$this->admin = new Sensei_Admin( $file );
+			$this->admin->token = $this->token;
 
-            // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $file );
-            $this->analysis->token = $this->token;
+			// Load Analysis Reports
+			$this->analysis = new Sensei_Analysis( $file );
+			$this->analysis->token = $this->token;
 
 
-        } else {
+		} else {
 
-            // Load Frontend Class
-            $this->frontend = new Sensei_Frontend();
-            $this->frontend->token = $this->token;
-            $this->frontend->init();
+			// Load Frontend Class
+			$this->frontend = new Sensei_Frontend();
+			$this->frontend->token = $this->token;
+			$this->frontend->init();
 
-            // Load notice Class
-            $this->notices = new Sensei_Notices();
+			// Load notice Class
+			$this->notices = new Sensei_Notices();
 
-        }
+		}
 
-        // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $file );
-        $this->grading->token = $this->token;
+		// Load Grading Functionality
+		$this->grading = new Sensei_Grading( $file );
+		$this->grading->token = $this->token;
 
-        // Load Email Class
-        $this->emails = new Sensei_Emails( $file );
-        $this->emails->token = $this->token;
+		// Load Email Class
+		$this->emails = new Sensei_Emails( $file );
+		$this->emails->token = $this->token;
 
-        // Load Learner Profiles Class
-        $this->learner_profiles = new Sensei_Learner_Profiles();
-        $this->learner_profiles->token = $this->token;
+		// Load Learner Profiles Class
+		$this->learner_profiles = new Sensei_Learner_Profiles();
+		$this->learner_profiles->token = $this->token;
 
-        // Image Sizes
-        $this->init_image_sizes();
+		// Image Sizes
+		$this->init_image_sizes();
 
-        // Force WooCommerce Required Settings
-        $this->set_woocommerce_functionality();
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+		// Force WooCommerce Required Settings
+		$this->set_woocommerce_functionality();
+		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+		add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
 
-        // WooCommerce Payment Actions
-        add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
+		// WooCommerce Payment Actions
+		add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
+		add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
+		add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
+		add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
 
-        // WooCommerce Subscriptions Actions
-        add_action( 'reactivated_subscription', array( $this, 'sensei_woocommerce_reactivate_subscription' ), 10, 2 );
-        add_action( 'subscription_expired' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_end_of_prepaid_term' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'cancelled_subscription' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_put_on-hold' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		// WooCommerce Subscriptions Actions
+		add_action( 'reactivated_subscription', array( $this, 'sensei_woocommerce_reactivate_subscription' ), 10, 2 );
+		add_action( 'subscription_expired' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'subscription_end_of_prepaid_term' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'cancelled_subscription' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+		add_action( 'subscription_put_on-hold' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
 
-        // Add Email link to course orders
-        add_action( 'woocommerce_email_after_order_table', array( $this, 'sensei_woocommerce_email_course_details' ), 10, 1 );
+		// Add Email link to course orders
+		add_action( 'woocommerce_email_after_order_table', array( $this, 'sensei_woocommerce_email_course_details' ), 10, 1 );
 
-        // 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 );
 
-    } // End __construct()
+	} // End __construct()
 
-    /**
-     * Load the foundations of Sensei.
-     * @since 1.9.0
-     */
-    protected function init(){
+	/**
+	 * 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 );
+		// Localisation
+		$this->load_plugin_textdomain();
+		add_action( 'init', array( $this, 'load_localisation' ), 0 );
 
-        // load the shortcode loader into memory, so as to listen to all for
-        // all shortcodes on the front end
-        new Sensei_Shortcode_Loader();
+		// load the shortcode loader into memory, so as to listen to all for
+		// all shortcodes on the front end
+		new Sensei_Shortcode_Loader();
 
-    }
+	}
 
-    /**
-     * 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  ){
-
-            flush_rewrite_rules(true);
-
-        }
-
-    }
-
-    /**
-     * 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 ) ) {
-
-            //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  );
-
-        }
-
-        return self::$_instance;
-
-    } // end instance()
-
-    /**
-     * Cloning is forbidden.
-     * @since 1.8.0
-     */
-    public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '2.1' );
-    }
-
-    /**
-     * Unserializing instances of this class is forbidden.
-     * @since 1.8.0
-     */
-    public function __wakeup() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '2.1' );
-    }
-
-    /**
-     * 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();
-
-        } // End If Statement
-    } // End run_updates()
-
-    /**
-     * Setup required WooCommerce settings.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function set_woocommerce_functionality() {
-        // Disable guest checkout if a course is in the cart as we need a valid user to store data for
-        add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( $this, 'disable_guest_checkout' ) );
-
-        // Mark orders with virtual products as complete rather then stay processing
-        add_filter( 'woocommerce_payment_complete_order_status', array( $this, 'virtual_order_payment_complete' ), 10, 2 );
-
-    } // End set_woocommerce_functionality()
-
-    /**
-     * Disable guest checkout if a course product is in the cart
-     * @param  boolean $guest_checkout Current guest checkout setting
-     * @return boolean                 Modified guest checkout setting
-     */
-    public function disable_guest_checkout( $guest_checkout ) {
-        global $woocommerce;
-
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-
-            if( isset( $woocommerce->cart->cart_contents ) && count( $woocommerce->cart->cart_contents ) > 0 ) {
-                foreach( $woocommerce->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
-                        $args = array(
-                            'posts_per_page' => -1,
-                            'post_type' => 'course',
-                            'meta_query' => array(
-                                array(
-                                    'key' => '_course_woocommerce_product',
-                                    'value' => $product['product_id']
-                                )
-                            )
-                        );
-                        $posts = get_posts( $args );
-                        if( $posts && count( $posts ) > 0 ) {
-                            foreach( $posts as $course ) {
-                                $guest_checkout = '';
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return $guest_checkout;
-    }
-
-    /**
-     * Change order status with virtual products to completed
-     * @since  1.1.0
-     * @param string $order_status
-     * @param int $order_id
-     * @return string
-     **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
-        $order = new WC_Order( $order_id );
-        if ( ! isset ( $order ) ) return;
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
-            $virtual_order = true;
-
-            if ( count( $order->get_items() ) > 0 ) {
-                foreach( $order->get_items() as $item ) {
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
-                            $virtual_order = false;
-                            break;
-                        } // End If Statement
-                    } // End If Statement
-                } // End For Loop
-            } // End If Statement
-
-            // virtual order, mark as completed
-            if ( $virtual_order ) {
-                return 'completed';
-            } // End If Statement
-        } // End If Statement
-        return $order_status;
-    }
-
-    /**
-     * 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-' . esc_attr( $key ) . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . esc_attr( $key ) . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
-            }
-        } // End For Loop
-
-        do_action( 'sensei_register_widgets' );
-    } // End register_widgets()
-
-    /**
-     * 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/' );
-    } // 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 != '' ) {
-
-            // Check previous version to see if forced updates must run
-            // $old_version = get_option( 'woothemes-sensei-version', false );
-            // if( $old_version && version_compare( $old_version, '1.7.0', '<' )  ) {
-            // 	update_option( 'woothemes-sensei-force-updates', $this->version );
-            // } else {
-            // 	delete_option( 'woothemes-sensei-force-updates' );
-            // }
-
-            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' ); }
-    } // End ensure_post_thumbnails_support()
-
-
-    /**
-     * 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' );
-        return Sensei_Templates::template_loader( $template );
-
-    } // 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 () {
-
-        if ( $this->plugin_path ) {
-
-            $sensei_plugin_path =  $this->plugin_path;
-
-        }else{
-
-            $sensei_plugin_path = plugin_dir_path( __FILE__ );
-
-        }
-
-        return $sensei_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()
-
-
-    /**
-     * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
-     * @access public
-     * @since  1.0.0
-     * @param  int 			$course_id  (default: 0)
-     * @param  array/Object $order_user (default: array()) Specific user's data.
-     * @return void
-     */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
-        global $current_user;
-
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return;
-
-        $data_update = false;
-
-        // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
-
-        // Check if in the admin
-        if ( is_admin() ) {
-            $user_login = $order_user['user_login'];
-            $user_email = $order_user['user_email'];
-            $user_url = $order_user['user_url'];
-            $user_id = $order_user['ID'];
-        } else {
-            $user_login = $current_user->user_login;
-            $user_email = $current_user->user_email;
-            $user_url = $current_user->user_url;
-            $user_id = $current_user->ID;
-        } // End If Statement
-
-        // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
-                // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
-            }
-        }
-
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
-
-        if( ! $is_user_taking_course ) {
-
-            if ( Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product( $user_email, $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
-
-                $activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
-
-                $is_user_taking_course = false;
-                if ( true == $activity_logged ) {
-                    $is_user_taking_course = true;
-                } // End If Statement
-            } // End If Statement
-        }
-
-        return $is_user_taking_course;
-    } // End woocommerce_course_update()
-
-
-    /**
-     * check_user_permissions function.
-     *
-     * @access public
-     * @param string $page (default: '')
-     * @param array $data (default: array())
-     * @return bool
-     */
-    public function check_user_permissions ( $page = '', $data = array() ) {
-        // REFACTOR
-        global $current_user, $post;
-
-        // if use is not logged in
-        if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission') ){
-            $this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei' );
-            $this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
-            return;
-        }
-
-
-        // Get User Meta
-        get_currentuserinfo();
-
-        $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 = $this->woocommerce_course_update( $post->ID );
-                // Count completed lessons
-                if ( 0 < absint( $course_prerequisite_id ) ) {
-
-                    $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
-
-                }
-                else {
-                    $prerequisite_complete = true;
-                } // End If Statement
-                // Handles restrictions
-                if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
-                } 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 = $this->woocommerce_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 = $this->woocommerce_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 );
-
-
-        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
-            $user_allowed = true;
-        }
-
-        return apply_filters( 'sensei_access_permissions', $user_allowed );
-    } // 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 void
-     */
-    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()
-
-    /**
-     * sensei_woocommerce_complete_order description
-     * @since   1.0.3
-     * @access  public
-     * @param   int $order_id WC order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
-        $order_user = array();
-        // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
-            // Get order object
-            $order = new WC_Order( $order_id );
-            $user = get_user_by( 'id', $order->user_id );
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
-                foreach( $order->get_items() as $item ) {
-                    $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                        $item_id = $item['variation_id'];
-                        $product_type = 'variation';
-                    } else {
-                        $item_id = $item['product_id'];
-                    } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-                    // Get courses that use the WC product
-                    $courses = $this->post_types->course->get_product_courses( $_product->id );
-                    // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-                    } // End For Loop
-                } // End For Loop
-            } // End If Statement
-            // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
-        } // End If Statement
-    } // End sensei_woocommerce_complete_order()
-
-    /**
-     * Runs when an order is cancelled.
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
-
-        // Get order object
-        $order = new WC_Order( $order_id );
-
-        // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
-
-            // Get order user
-            $user_id = $order->__get( 'user_id' );
-
-            foreach( $order->get_items() as $item ) {
-
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    $item_id = $item['product_id'];
-                } // End If Statement
-                $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-
-                // Get courses that use the WC product
-                $courses = array();
-                $courses = $this->post_types->course->get_product_courses( $item_id );
-
-                // Loop and update those courses
-                foreach ($courses as $course_item){
-                    // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
-                } // End For Loop
-            } // End For Loop
-        } // End If Statement
-    } // End sensei_woocommerce_cancel_order()
-
-    /**
-     * Runs when an subscription is cancelled or expires.
-     * @since   1.3.3
-     * @access  public
-     * @param   integer $user_id User ID
-     * @param   integer $subscription_key Subscription Unique Key
-     * @return  void
-     */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        self::sensei_woocommerce_cancel_order( $subscription['order_id'] );
-    }
-
-    /**
-     * Runs when an subscription is re-activated after suspension.
-     * @since   1.3.3
-     * @access  public
-     * @param   integer $user_id User ID
-     * @param   integer $subscription_key Subscription Unique Key
-     * @return  void
-     */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        $order = new WC_Order( $subscription['order_id'] );
-        $user = get_user_by( 'id', $order->user_id );
-        $order_user = array();
-        $order_user['ID'] = $user->ID;
-        $order_user['user_login'] = $user->user_login;
-        $order_user['user_email'] = $user->user_email;
-        $order_user['user_url'] = $user->user_url;
-        $courses = $this->post_types->course->get_product_courses( $subscription['product_id'] );
-        foreach ( $courses as $course_item ){
-            $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-        } // End For Loop
-    } // End sensei_woocommerce_reactivate_subscription
-
-    /**
-     * Returns the WooCommerce Product Object
-     *
-     * The code caters for pre and post WooCommerce 2.2 installations.
-     *
-     * @since   1.1.1
-     * @access  public
-     * @param   integer $wc_product_id Product ID or Variation ID
-     * @param   string  $product_type  '' or 'variation'
-     * @return   WC_Product $wc_product_object
-     */
-    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
-
-        $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
-
-            // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
-
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
-
-            } elseif ( function_exists( 'get_product' ) ) {
-
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
-
-            } else {
-
-                // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
-
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
-
-                } else {
-
-                    $wc_product_object = new WC_Product( $wc_product_id );
-
-                } // End If Statement
-
-            } // End If Statement
-
-        } // End If Statement
-
-        return $wc_product_object;
-
-    } // End sensei_get_woocommerce_product_object()
-
-    /**
-     * 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()
-
-    /**
-     * sensei_activate_subscription runs when a subscription product is purchased
-     * @since   1.2.0
-     * @access  public
-     * @param   integer $order_id order ID
-     * @return  void
-     */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
-        if ( 0 < intval( $order_id ) ) {
-            $order = new WC_Order( $order_id );
-            $user = get_user_by('id', $order->user_id);
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if (sizeof($order->get_items())>0) {
-                foreach($order->get_items() as $item) {
-                    $product_type = '';
-                    if (isset($item['variation_id']) && $item['variation_id'] > 0) {
-                        $item_id = $item['variation_id'];
-                        $product_type = 'subscription_variation';
-                    } else {
-                        $item_id = $item['product_id'];
-                    } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
-                    // Get courses that use the WC product
-                    $courses = array();
-                    if ( $product_type == 'subscription_variation' ) {
-                        $courses = $this->post_types->course->get_product_courses( $item_id );
-                    } // End If Statement
-                    // Loop and update those courses
-                    foreach ($courses as $course_item){
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
-                    } // End For Loop
-                } // End For Loop
-            } // End If Statement
-        } // End If Statement
-    } // End sensei_activate_subscription()
-
-    /**
-     * sensei_woocommerce_email_course_details adds detail to email
-     * @since   1.4.5
-     * @access  public
-     * @param   WC_Order $order
-     * @return  void
-     */
-    public function sensei_woocommerce_email_course_details( $order ) {
-        global $woocommerce;
-
-        // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
-
-        $order_items = $order->get_items();
-        $order_id = $order->id;
-
-        //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
-
-        echo '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
-
-        foreach ( $order_items as $item ) {
-
-                $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
-                    // If item has variation_id then its from variation
-                    $item_id = $item['variation_id'];
-                    $product_type = 'variation';
-                } else {
-                    // If not its real product set its id to item_id
-                    $item_id = $item['product_id'];
-                } // End If Statement
-
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
-
-                if( $user_id ) {
-
-                    // Get all courses for product
-                    $args = array(
-                        'posts_per_page' => -1,
-                        'post_type' => 'course',
-                        'meta_query' => array(
-                            array(
-                                'key' => '_course_woocommerce_product',
-                                'value' => $item_id
-                            )
-                        ),
-                        'orderby' => 'menu_order date',
-                        'order' => 'ASC',
-                    );
-                    $courses = get_posts( $args );
-
-                    if( $courses && count( $courses ) > 0 ) {
-
-                        foreach( $courses as $course ) {
-
-                            $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
-
-                            echo '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 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(){ ?>
+	/**
+	 * 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  ){
+
+			flush_rewrite_rules(true);
+
+		}
+
+	}
+
+	/**
+	 * 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 ) ) {
+
+			//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  );
+
+		}
+
+		return self::$_instance;
+
+	} // end instance()
+
+	/**
+	 * Cloning is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __clone() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '2.1' );
+	}
+
+	/**
+	 * Unserializing instances of this class is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __wakeup() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '2.1' );
+	}
+
+	/**
+	 * 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();
+
+		} // End If Statement
+	} // End run_updates()
+
+	/**
+	 * Setup required WooCommerce settings.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function set_woocommerce_functionality() {
+		// Disable guest checkout if a course is in the cart as we need a valid user to store data for
+		add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( $this, 'disable_guest_checkout' ) );
+
+		// Mark orders with virtual products as complete rather then stay processing
+		add_filter( 'woocommerce_payment_complete_order_status', array( $this, 'virtual_order_payment_complete' ), 10, 2 );
+
+	} // End set_woocommerce_functionality()
+
+	/**
+	 * Disable guest checkout if a course product is in the cart
+	 * @param  boolean $guest_checkout Current guest checkout setting
+	 * @return boolean                 Modified guest checkout setting
+	 */
+	public function disable_guest_checkout( $guest_checkout ) {
+		global $woocommerce;
+
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+
+			if( isset( $woocommerce->cart->cart_contents ) && count( $woocommerce->cart->cart_contents ) > 0 ) {
+				foreach( $woocommerce->cart->cart_contents as $cart_key => $product ) {
+					if( isset( $product['product_id'] ) ) {
+						$args = array(
+							'posts_per_page' => -1,
+							'post_type' => 'course',
+							'meta_query' => array(
+								array(
+									'key' => '_course_woocommerce_product',
+									'value' => $product['product_id']
+								)
+							)
+						);
+						$posts = get_posts( $args );
+						if( $posts && count( $posts ) > 0 ) {
+							foreach( $posts as $course ) {
+								$guest_checkout = '';
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $guest_checkout;
+	}
+
+	/**
+	 * Change order status with virtual products to completed
+	 * @since  1.1.0
+	 * @param string $order_status
+	 * @param int $order_id
+	 * @return string
+	 **/
+	public function virtual_order_payment_complete( $order_status, $order_id ) {
+		$order = new WC_Order( $order_id );
+		if ( ! isset ( $order ) ) return;
+		if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+			$virtual_order = true;
+
+			if ( count( $order->get_items() ) > 0 ) {
+				foreach( $order->get_items() as $item ) {
+					if ( $item['product_id'] > 0 ) {
+						$_product = $order->get_product_from_item( $item );
+						if ( ! $_product->is_virtual() ) {
+							$virtual_order = false;
+							break;
+						} // End If Statement
+					} // End If Statement
+				} // End For Loop
+			} // End If Statement
+
+			// virtual order, mark as completed
+			if ( $virtual_order ) {
+				return 'completed';
+			} // End If Statement
+		} // End If Statement
+		return $order_status;
+	}
+
+	/**
+	 * 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-' . esc_attr( $key ) . '.php' ) ) {
+				require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . esc_attr( $key ) . '.php' );
+				register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+			}
+		} // End For Loop
+
+		do_action( 'sensei_register_widgets' );
+	} // End register_widgets()
+
+	/**
+	 * 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/' );
+	} // 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 != '' ) {
+
+			// Check previous version to see if forced updates must run
+			// $old_version = get_option( 'woothemes-sensei-version', false );
+			// if( $old_version && version_compare( $old_version, '1.7.0', '<' )  ) {
+			// 	update_option( 'woothemes-sensei-force-updates', $this->version );
+			// } else {
+			// 	delete_option( 'woothemes-sensei-force-updates' );
+			// }
+
+			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' ); }
+	} // End ensure_post_thumbnails_support()
+
+
+	/**
+	 * 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' );
+		return Sensei_Templates::template_loader( $template );
+
+	} // 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 () {
+
+		if ( $this->plugin_path ) {
+
+			$sensei_plugin_path =  $this->plugin_path;
+
+		}else{
+
+			$sensei_plugin_path = plugin_dir_path( __FILE__ );
+
+		}
+
+		return $sensei_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()
+
+
+	/**
+	 * If WooCommerce is activated and the customer has purchased the course, update Sensei to indicate that they are taking the course.
+	 * @access public
+	 * @since  1.0.0
+	 * @param  int 			$course_id  (default: 0)
+	 * @param  array/Object $order_user (default: array()) Specific user's data.
+	 * @return void
+	 */
+	public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+		global $current_user;
+
+		if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return;
+
+		$data_update = false;
+
+		// Get the product ID
+		$wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+
+		// Check if in the admin
+		if ( is_admin() ) {
+			$user_login = $order_user['user_login'];
+			$user_email = $order_user['user_email'];
+			$user_url = $order_user['user_url'];
+			$user_id = $order_user['ID'];
+		} else {
+			$user_login = $current_user->user_login;
+			$user_email = $current_user->user_email;
+			$user_url = $current_user->user_url;
+			$user_id = $current_user->ID;
+		} // End If Statement
+
+		// This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
+		$course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
+		if( 0 < absint( $course_prerequisite_id ) ) {
+			$prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
+			if ( ! $prereq_course_complete ) {
+				// Remove all course user meta
+				return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+			}
+		}
+
+		$is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+
+		if( ! $is_user_taking_course ) {
+
+			if ( Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product( $user_email, $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
+
+				$activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
+
+				$is_user_taking_course = false;
+				if ( true == $activity_logged ) {
+					$is_user_taking_course = true;
+				} // End If Statement
+			} // End If Statement
+		}
+
+		return $is_user_taking_course;
+	} // End woocommerce_course_update()
+
+
+	/**
+	 * check_user_permissions function.
+	 *
+	 * @access public
+	 * @param string $page (default: '')
+	 * @param array $data (default: array())
+	 * @return bool
+	 */
+	public function check_user_permissions ( $page = '', $data = array() ) {
+		// REFACTOR
+		global $current_user, $post;
+
+		// if use is not logged in
+		if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission') ){
+			$this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei' );
+			$this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
+			return;
+		}
+
+
+		// Get User Meta
+		get_currentuserinfo();
+
+		$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 = $this->woocommerce_course_update( $post->ID );
+				// Count completed lessons
+				if ( 0 < absint( $course_prerequisite_id ) ) {
+
+					$prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
+
+				}
+				else {
+					$prerequisite_complete = true;
+				} // End If Statement
+				// Handles restrictions
+				if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
+					$this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
+					$course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
+					$this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
+				} 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 = $this->woocommerce_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 = $this->woocommerce_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 );
+
+
+		if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
+			$user_allowed = true;
+		}
+
+		return apply_filters( 'sensei_access_permissions', $user_allowed );
+	} // 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 void
+	 */
+	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()
+
+	/**
+	 * sensei_woocommerce_complete_order description
+	 * @since   1.0.3
+	 * @access  public
+	 * @param   int $order_id WC order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+		$order_user = array();
+		// Check for WooCommerce
+		if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+			// Get order object
+			$order = new WC_Order( $order_id );
+			$user = get_user_by( 'id', $order->user_id );
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if ( 0 < sizeof( $order->get_items() ) ) {
+				foreach( $order->get_items() as $item ) {
+					$product_type = '';
+					if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+						$item_id = $item['variation_id'];
+						$product_type = 'variation';
+					} else {
+						$item_id = $item['product_id'];
+					} // End If Statement
+					$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+					// Get courses that use the WC product
+					$courses = $this->post_types->course->get_product_courses( $_product->id );
+					// Loop and update those courses
+					foreach ( $courses as $course_item ) {
+						$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+					} // End For Loop
+				} // End For Loop
+			} // End If Statement
+			// Add meta to indicate that payment has been completed successfully
+			update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+		} // End If Statement
+	} // End sensei_woocommerce_complete_order()
+
+	/**
+	 * Runs when an order is cancelled.
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_woocommerce_cancel_order ( $order_id ) {
+
+		// Get order object
+		$order = new WC_Order( $order_id );
+
+		// Run through each product ordered
+		if ( 0 < sizeof( $order->get_items() ) ) {
+
+			// Get order user
+			$user_id = $order->__get( 'user_id' );
+
+			foreach( $order->get_items() as $item ) {
+
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					$item_id = $item['product_id'];
+				} // End If Statement
+				$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+
+				// Get courses that use the WC product
+				$courses = array();
+				$courses = $this->post_types->course->get_product_courses( $item_id );
+
+				// Loop and update those courses
+				foreach ($courses as $course_item){
+					// Check and Remove course from courses user meta
+					$dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+				} // End For Loop
+			} // End For Loop
+		} // End If Statement
+	} // End sensei_woocommerce_cancel_order()
+
+	/**
+	 * Runs when an subscription is cancelled or expires.
+	 * @since   1.3.3
+	 * @access  public
+	 * @param   integer $user_id User ID
+	 * @param   integer $subscription_key Subscription Unique Key
+	 * @return  void
+	 */
+	public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ) {
+		$subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
+		self::sensei_woocommerce_cancel_order( $subscription['order_id'] );
+	}
+
+	/**
+	 * Runs when an subscription is re-activated after suspension.
+	 * @since   1.3.3
+	 * @access  public
+	 * @param   integer $user_id User ID
+	 * @param   integer $subscription_key Subscription Unique Key
+	 * @return  void
+	 */
+	public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ) {
+		$subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
+		$order = new WC_Order( $subscription['order_id'] );
+		$user = get_user_by( 'id', $order->user_id );
+		$order_user = array();
+		$order_user['ID'] = $user->ID;
+		$order_user['user_login'] = $user->user_login;
+		$order_user['user_email'] = $user->user_email;
+		$order_user['user_url'] = $user->user_url;
+		$courses = $this->post_types->course->get_product_courses( $subscription['product_id'] );
+		foreach ( $courses as $course_item ){
+			$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+		} // End For Loop
+	} // End sensei_woocommerce_reactivate_subscription
+
+	/**
+	 * Returns the WooCommerce Product Object
+	 *
+	 * The code caters for pre and post WooCommerce 2.2 installations.
+	 *
+	 * @since   1.1.1
+	 * @access  public
+	 * @param   integer $wc_product_id Product ID or Variation ID
+	 * @param   string  $product_type  '' or 'variation'
+	 * @return   WC_Product $wc_product_object
+	 */
+	public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) {
+
+		$wc_product_object = false;
+		if ( 0 < intval( $wc_product_id ) ) {
+
+			// Get the product
+			if ( function_exists( 'wc_get_product' ) ) {
+
+				$wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+
+			} elseif ( function_exists( 'get_product' ) ) {
+
+				$wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+
+			} else {
+
+				// Pre WC 2.0
+				if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+
+					$wc_product_object = new WC_Product_Variation( $wc_product_id );
+
+				} else {
+
+					$wc_product_object = new WC_Product( $wc_product_id );
+
+				} // End If Statement
+
+			} // End If Statement
+
+		} // End If Statement
+
+		return $wc_product_object;
+
+	} // End sensei_get_woocommerce_product_object()
+
+	/**
+	 * 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()
+
+	/**
+	 * sensei_activate_subscription runs when a subscription product is purchased
+	 * @since   1.2.0
+	 * @access  public
+	 * @param   integer $order_id order ID
+	 * @return  void
+	 */
+	public function sensei_activate_subscription(  $order_id = 0 ) {
+		if ( 0 < intval( $order_id ) ) {
+			$order = new WC_Order( $order_id );
+			$user = get_user_by('id', $order->user_id);
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if (sizeof($order->get_items())>0) {
+				foreach($order->get_items() as $item) {
+					$product_type = '';
+					if (isset($item['variation_id']) && $item['variation_id'] > 0) {
+						$item_id = $item['variation_id'];
+						$product_type = 'subscription_variation';
+					} else {
+						$item_id = $item['product_id'];
+					} // End If Statement
+					$_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+					// Get courses that use the WC product
+					$courses = array();
+					if ( $product_type == 'subscription_variation' ) {
+						$courses = $this->post_types->course->get_product_courses( $item_id );
+					} // End If Statement
+					// Loop and update those courses
+					foreach ($courses as $course_item){
+						$update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+					} // End For Loop
+				} // End For Loop
+			} // End If Statement
+		} // End If Statement
+	} // End sensei_activate_subscription()
+
+	/**
+	 * sensei_woocommerce_email_course_details adds detail to email
+	 * @since   1.4.5
+	 * @access  public
+	 * @param   WC_Order $order
+	 * @return  void
+	 */
+	public function sensei_woocommerce_email_course_details( $order ) {
+		global $woocommerce;
+
+		// exit early if not wc-completed or wc-processing
+		if( 'wc-completed' != $order->post_status
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
+
+		$order_items = $order->get_items();
+		$order_id = $order->id;
+
+		//If object have items go through them all to find course
+		if ( 0 < sizeof( $order_items ) ) {
+
+		echo '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+
+		foreach ( $order_items as $item ) {
+
+				$product_type = '';
+				if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+					// If item has variation_id then its from variation
+					$item_id = $item['variation_id'];
+					$product_type = 'variation';
+				} else {
+					// If not its real product set its id to item_id
+					$item_id = $item['product_id'];
+				} // End If Statement
+
+				$user_id = get_post_meta( $order_id, '_customer_user', true );
+
+				if( $user_id ) {
+
+					// Get all courses for product
+					$args = array(
+						'posts_per_page' => -1,
+						'post_type' => 'course',
+						'meta_query' => array(
+							array(
+								'key' => '_course_woocommerce_product',
+								'value' => $item_id
+							)
+						),
+						'orderby' => 'menu_order date',
+						'order' => 'ASC',
+					);
+					$courses = get_posts( $args );
+
+					if( $courses && count( $courses ) > 0 ) {
+
+						foreach( $courses as $course ) {
+
+							$title = $course->post_title;
+							$permalink = get_permalink( $course->ID );
+
+							echo '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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>
@@ -1331,46 +1331,46 @@ 
 
     <?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(){
+	/**
+	 * 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 ) {
+		// 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');
+			update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+		}elseif( '2' == $option ) {
 
-            flush_rewrite_rules();
-            update_option('sensei_flush_rewrite_rules', '0');
+			flush_rewrite_rules();
+			update_option('sensei_flush_rewrite_rules', '0');
 
-        }
+		}
 
-    } // end flush_rewrite_rules
+	} // 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(){
+	/**
+	 * 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');
+		update_option('sensei_flush_rewrite_rules', '1');
 
-    }
+	}
 
 } // End Class
 

Spacing +306 added lines, -306 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei_Main
@@ -142,41 +142,41 @@ 
      * @param  string $file The base file of the plugin.
      * @since  1.0.0
      */
-    public function __construct ( $file ) {
+    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/' );
-        $this->permissions_message = array( 'title' => __( 'Permission Denied', 'woothemes-sensei' ), 'message' => __( 'Unfortunately you do not have permissions to access this page.', 'woothemes-sensei' ) );
+        $this->plugin_url = trailingslashit(plugins_url('', $plugin = $file));
+        $this->plugin_path = trailingslashit(dirname($file));
+        $this->template_url = apply_filters('sensei_template_url', 'sensei/');
+        $this->permissions_message = array('title' => __('Permission Denied', 'woothemes-sensei'), 'message' => __('Unfortunately you do not have permissions to access this page.', 'woothemes-sensei'));
 
         // Initialize the core Sensei functionality
         $this->init();
 
         // Installation
-        if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install();
+        if (is_admin() && ! defined('DOING_AJAX')) $this->install();
 
         // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
+        register_activation_hook($this->file, array($this, 'activation'));
 
         // Setup post types.
         $this->post_types = new Sensei_PostTypes();
         $this->post_types->token = 'woothemes-sensei-posttypes';
 
         // Lad the updates class
-        $this->updates = new WooThemes_Sensei_Updates( $this );
+        $this->updates = new WooThemes_Sensei_Updates($this);
 
         // Setup settings screen.
         $this->settings = new Sensei_Settings();
         $this->settings->token = 'woothemes-sensei-settings';
 
         // Setup Admin Settings data
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $this->settings->has_tabs 	= true;
-            $this->settings->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->settings->menu_label	= __( 'Settings', 'woothemes-sensei' );
+            $this->settings->name = __('Sensei Settings', 'woothemes-sensei');
+            $this->settings->menu_label = __('Settings', 'woothemes-sensei');
             $this->settings->page_slug	= 'woothemes-sensei-settings';
 
         } // End If Statement
@@ -204,24 +204,24 @@ 
         $this->quiz = $this->post_types->quiz;
 
         // load the modules class
-        add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
+        add_action('plugins_loaded', array($this, 'load_modules_class'));
 
         // Load Learner Management Functionality
-        $this->learners = new Sensei_Learners( $file );
+        $this->learners = new Sensei_Learners($file);
         $this->learners->token = $this->token;
 
         // Differentiate between administration and frontend logic.
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             // Load Admin Welcome class
             new Sensei_Welcome();
 
             // Load Admin Class
-            $this->admin = new Sensei_Admin( $file );
+            $this->admin = new Sensei_Admin($file);
             $this->admin->token = $this->token;
 
             // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $file );
+            $this->analysis = new Sensei_Analysis($file);
             $this->analysis->token = $this->token;
 
 
@@ -238,11 +238,11 @@ 
         }
 
         // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $file );
+        $this->grading = new Sensei_Grading($file);
         $this->grading->token = $this->token;
 
         // Load Email Class
-        $this->emails = new Sensei_Emails( $file );
+        $this->emails = new Sensei_Emails($file);
         $this->emails->token = $this->token;
 
         // Load Learner Profiles Class
@@ -254,38 +254,38 @@ 
 
         // Force WooCommerce Required Settings
         $this->set_woocommerce_functionality();
-        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'));
 
         // WooCommerce Payment Actions
-        add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
-        add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
-        add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
+        add_action('woocommerce_payment_complete', array($this, 'sensei_woocommerce_complete_order'));
+        add_action('woocommerce_thankyou', array($this, 'sensei_woocommerce_complete_order'));
+        add_action('woocommerce_order_status_completed', array($this, 'sensei_woocommerce_complete_order'));
+        add_action('woocommerce_order_status_processing', array($this, 'sensei_woocommerce_complete_order'));
+        add_action('woocommerce_order_status_cancelled', array($this, 'sensei_woocommerce_cancel_order'));
+        add_action('woocommerce_order_status_refunded', array($this, 'sensei_woocommerce_cancel_order'));
+        add_action('subscriptions_activated_for_order', array($this, 'sensei_activate_subscription'));
 
         // WooCommerce Subscriptions Actions
-        add_action( 'reactivated_subscription', array( $this, 'sensei_woocommerce_reactivate_subscription' ), 10, 2 );
-        add_action( 'subscription_expired' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_end_of_prepaid_term' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'cancelled_subscription' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
-        add_action( 'subscription_put_on-hold' , array( $this, 'sensei_woocommerce_subscription_ended' ), 10, 2 );
+        add_action('reactivated_subscription', array($this, 'sensei_woocommerce_reactivate_subscription'), 10, 2);
+        add_action('subscription_expired', array($this, 'sensei_woocommerce_subscription_ended'), 10, 2);
+        add_action('subscription_end_of_prepaid_term', array($this, 'sensei_woocommerce_subscription_ended'), 10, 2);
+        add_action('cancelled_subscription', array($this, 'sensei_woocommerce_subscription_ended'), 10, 2);
+        add_action('subscription_put_on-hold', array($this, 'sensei_woocommerce_subscription_ended'), 10, 2);
 
         // Add Email link to course orders
-        add_action( 'woocommerce_email_after_order_table', array( $this, 'sensei_woocommerce_email_course_details' ), 10, 1 );
+        add_action('woocommerce_email_after_order_table', array($this, 'sensei_woocommerce_email_course_details'), 10, 1);
 
         // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
+        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
+        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 );
+        add_action('init', array($this, 'flush_rewrite_rules'), 101);
 
     } // End __construct()
 
@@ -293,11 +293,11 @@ 
      * Load the foundations of Sensei.
      * @since 1.9.0
      */
-    protected function init(){
+    protected function init() {
 
         // Localisation
         $this->load_plugin_textdomain();
-        add_action( 'init', array( $this, 'load_localisation' ), 0 );
+        add_action('init', array($this, 'load_localisation'), 0);
 
         // load the shortcode loader into memory, so as to listen to all for
         // all shortcodes on the front end
@@ -313,9 +313,9 @@ 
      *
      * @param $plugin
      */
-    public static function activation_flush_rules( $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);
 
@@ -335,12 +335,12 @@ 
      */
     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_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);
 
         }
 
@@ -353,7 +353,7 @@ 
      * @since 1.8.0
      */
     public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '2.1' );
+        _doing_it_wrong(__FUNCTION__, __('Cheatin&#8217; huh?', 'woothemes-sensei'), '2.1');
     }
 
     /**
@@ -361,7 +361,7 @@ 
      * @since 1.8.0
      */
     public function __wakeup() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'woothemes-sensei' ), '2.1' );
+        _doing_it_wrong(__FUNCTION__, __('Cheatin&#8217; huh?', 'woothemes-sensei'), '2.1');
     }
 
     /**
@@ -372,7 +372,7 @@ 
      */
     public function run_updates() {
         // Run updates if administrator
-        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
+        if (current_user_can('manage_options') || current_user_can('manage_sensei')) {
 
             $this->updates->update();
 
@@ -387,10 +387,10 @@ 
      */
     public function set_woocommerce_functionality() {
         // Disable guest checkout if a course is in the cart as we need a valid user to store data for
-        add_filter( 'pre_option_woocommerce_enable_guest_checkout', array( $this, 'disable_guest_checkout' ) );
+        add_filter('pre_option_woocommerce_enable_guest_checkout', array($this, 'disable_guest_checkout'));
 
         // Mark orders with virtual products as complete rather then stay processing
-        add_filter( 'woocommerce_payment_complete_order_status', array( $this, 'virtual_order_payment_complete' ), 10, 2 );
+        add_filter('woocommerce_payment_complete_order_status', array($this, 'virtual_order_payment_complete'), 10, 2);
 
     } // End set_woocommerce_functionality()
 
@@ -399,14 +399,14 @@ 
      * @param  boolean $guest_checkout Current guest checkout setting
      * @return boolean                 Modified guest checkout setting
      */
-    public function disable_guest_checkout( $guest_checkout ) {
+    public function disable_guest_checkout($guest_checkout) {
         global $woocommerce;
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
 
-            if( isset( $woocommerce->cart->cart_contents ) && count( $woocommerce->cart->cart_contents ) > 0 ) {
-                foreach( $woocommerce->cart->cart_contents as $cart_key => $product ) {
-                    if( isset( $product['product_id'] ) ) {
+            if (isset($woocommerce->cart->cart_contents) && count($woocommerce->cart->cart_contents) > 0) {
+                foreach ($woocommerce->cart->cart_contents as $cart_key => $product) {
+                    if (isset($product['product_id'])) {
                         $args = array(
                             'posts_per_page' => -1,
                             'post_type' => 'course',
@@ -417,9 +417,9 @@ 
                                 )
                             )
                         );
-                        $posts = get_posts( $args );
-                        if( $posts && count( $posts ) > 0 ) {
-                            foreach( $posts as $course ) {
+                        $posts = get_posts($args);
+                        if ($posts && count($posts) > 0) {
+                            foreach ($posts as $course) {
                                 $guest_checkout = '';
                                 break;
                             }
@@ -439,17 +439,17 @@ 
      * @param int $order_id
      * @return string
      **/
-    public function virtual_order_payment_complete( $order_status, $order_id ) {
-        $order = new WC_Order( $order_id );
-        if ( ! isset ( $order ) ) return;
-        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) {
+    public function virtual_order_payment_complete($order_status, $order_id) {
+        $order = new WC_Order($order_id);
+        if ( ! isset ($order)) return;
+        if ($order_status == 'wc-processing' && ($order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed')) {
             $virtual_order = true;
 
-            if ( count( $order->get_items() ) > 0 ) {
-                foreach( $order->get_items() as $item ) {
-                    if ( $item['product_id'] > 0 ) {
-                        $_product = $order->get_product_from_item( $item );
-                        if ( ! $_product->is_virtual() ) {
+            if (count($order->get_items()) > 0) {
+                foreach ($order->get_items() as $item) {
+                    if ($item['product_id'] > 0) {
+                        $_product = $order->get_product_from_item($item);
+                        if ( ! $_product->is_virtual()) {
                             $virtual_order = false;
                             break;
                         } // End If Statement
@@ -458,7 +458,7 @@ 
             } // End If Statement
 
             // virtual order, mark as completed
-            if ( $virtual_order ) {
+            if ($virtual_order) {
                 return 'completed';
             } // End If Statement
         } // End If Statement
@@ -471,21 +471,21 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function register_widgets () {
+    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',
+        $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' )
+                'category-courses' 	=> 'Category_Courses')
         );
-        foreach ( $widget_list as $key => $value ) {
-            if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . esc_attr( $key ) . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . esc_attr( $key ) . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+        foreach ($widget_list as $key => $value) {
+            if (file_exists($this->plugin_path.'widgets/widget-woothemes-sensei-'.esc_attr($key).'.php')) {
+                require_once($this->plugin_path.'widgets/widget-woothemes-sensei-'.esc_attr($key).'.php');
+                register_widget('WooThemes_Sensei_'.$value.'_Widget');
             }
         } // End For Loop
 
-        do_action( 'sensei_register_widgets' );
+        do_action('sensei_register_widgets');
     } // End register_widgets()
 
     /**
@@ -494,8 +494,8 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function load_localisation () {
-        load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' );
+    public function load_localisation() {
+        load_plugin_textdomain('woothemes-sensei', false, dirname(plugin_basename($this->file)).'/lang/');
     } // End load_localisation()
 
     /**
@@ -504,12 +504,12 @@ 
      * @since   1.0.0
      * @return  void
      */
-    public function load_plugin_textdomain () {
+    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/' );
+        $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()
 
     /**
@@ -518,7 +518,7 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function activation () {
+    public function activation() {
         $this->register_plugin_version();
     } // End activation()
 
@@ -529,9 +529,9 @@ 
      * @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' );
+    public function install() {
+        register_activation_hook($this->file, array($this, 'activate_sensei'));
+        register_activation_hook($this->file, 'flush_rewrite_rules');
     } // End install()
 
 
@@ -541,9 +541,9 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function activate_sensei () {
-        update_option( 'skip_install_sensei_pages', 0 );
-        update_option( 'sensei_installed', 1 );
+    public function activate_sensei() {
+        update_option('skip_install_sensei_pages', 0);
+        update_option('sensei_installed', 1);
     } // End activate_sensei()
 
     /**
@@ -552,8 +552,8 @@ 
      * @since  1.0.0
      * @return void
      */
-    private function register_plugin_version () {
-        if ( $this->version != '' ) {
+    private function register_plugin_version() {
+        if ($this->version != '') {
 
             // Check previous version to see if forced updates must run
             // $old_version = get_option( 'woothemes-sensei-version', false );
@@ -563,7 +563,7 @@ 
             // 	delete_option( 'woothemes-sensei-force-updates' );
             // }
 
-            update_option( 'woothemes-sensei-version', $this->version );
+            update_option('woothemes-sensei-version', $this->version);
         }
     } // End register_plugin_version()
 
@@ -573,8 +573,8 @@ 
      * @since   1.0.1
      * @return  void
      */
-    public function ensure_post_thumbnails_support () {
-        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); }
+    public function ensure_post_thumbnails_support() {
+        if ( ! current_theme_supports('post-thumbnails')) { add_theme_support('post-thumbnails'); }
     } // End ensure_post_thumbnails_support()
 
 
@@ -586,10 +586,10 @@ 
      * @return void
      * @deprecated
      */
-    public function template_loader ( $template = '' ) {
+    public function template_loader($template = '') {
 
-        _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' );
-        return Sensei_Templates::template_loader( $template );
+        _deprecated_function('Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead');
+        return Sensei_Templates::template_loader($template);
 
     } // End template_loader()
 
@@ -599,15 +599,15 @@ 
      * @since  1.0.0
      * @return string $sensei_plugin_path
      */
-    public function 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__);
 
         }
 
@@ -623,9 +623,9 @@ 
      * @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;
+    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()
 
 
@@ -637,18 +637,18 @@ 
      * @param  array/Object $order_user (default: array()) Specific user's data.
      * @return void
      */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+    public function woocommerce_course_update($course_id = 0, $order_user = array()) {
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return;
+        if ( ! isset($current_user) || ! $current_user->ID > 0) return;
 
         $data_update = false;
 
         // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+        $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true);
 
         // Check if in the admin
-        if ( is_admin() ) {
+        if (is_admin()) {
             $user_login = $order_user['user_login'];
             $user_email = $order_user['user_email'];
             $user_url = $order_user['user_url'];
@@ -661,25 +661,25 @@ 
         } // End If Statement
 
         // This doesn't appear to be purely WooCommerce related. Should it be in a separate function?
-        $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true );
-        if( 0 < absint( $course_prerequisite_id ) ) {
-            $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) );
-            if ( ! $prereq_course_complete ) {
+        $course_prerequisite_id = (int) get_post_meta($course_id, '_course_prerequisite', true);
+        if (0 < absint($course_prerequisite_id)) {
+            $prereq_course_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, intval($user_id));
+            if ( ! $prereq_course_complete) {
                 // Remove all course user meta
-                return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+                return Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
             }
         }
 
-        $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) );
+        $is_user_taking_course = Sensei_Utils::user_started_course(intval($course_id), intval($user_id));
 
-        if( ! $is_user_taking_course ) {
+        if ( ! $is_user_taking_course) {
 
-            if ( Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product( $user_email, $user_id, $wc_post_id ) && ( 0 < $wc_post_id ) ) {
+            if (Sensei_WC::is_woocommerce_active() && Sensei_Utils::sensei_customer_bought_product($user_email, $user_id, $wc_post_id) && (0 < $wc_post_id)) {
 
-                $activity_logged = Sensei_Utils::user_start_course( intval( $user_id), intval( $course_id ) );
+                $activity_logged = Sensei_Utils::user_start_course(intval($user_id), intval($course_id));
 
                 $is_user_taking_course = false;
-                if ( true == $activity_logged ) {
+                if (true == $activity_logged) {
                     $is_user_taking_course = true;
                 } // End If Statement
             } // End If Statement
@@ -697,14 +697,14 @@ 
      * @param array $data (default: array())
      * @return bool
      */
-    public function check_user_permissions ( $page = '', $data = array() ) {
+    public function check_user_permissions($page = '', $data = array()) {
         // REFACTOR
         global $current_user, $post;
 
         // if use is not logged in
-        if ( empty( $current_user->caps ) && Sensei()->settings->get('access_permission') ){
-            $this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei' );
-            $this->permissions_message['message'] = sprintf( __('You must be logged in to view this %s'), get_post_type() );
+        if (empty($current_user->caps) && Sensei()->settings->get('access_permission')) {
+            $this->permissions_message['title'] = __('Restricted Access', 'woothemes-sensei');
+            $this->permissions_message['message'] = sprintf(__('You must be logged in to view this %s'), get_post_type());
             return;
         }
 
@@ -714,104 +714,104 @@ 
 
         $user_allowed = false;
 
-        switch ( $page ) {
+        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 = $this->woocommerce_course_update( $post->ID );
+                $course_prerequisite_id = (int) get_post_meta($post->ID, '_course_prerequisite', true);
+                $update_course = $this->woocommerce_course_update($post->ID);
                 // Count completed lessons
-                if ( 0 < absint( $course_prerequisite_id ) ) {
+                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
                 // Handles restrictions
-                if ( !$prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) {
-                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' );
-                    $course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>';
-                    $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link );
+                if ( ! $prerequisite_complete && 0 < absint($course_prerequisite_id)) {
+                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei');
+                    $course_link = '<a href="'.esc_url(get_permalink($course_prerequisite_id)).'">'.__('course', 'woothemes-sensei').'</a>';
+                    $this->permissions_message['message'] = sprintf(__('Please complete the previous %1$s before taking this course.', 'woothemes-sensei'), $course_link);
                 } 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 );
+                $lesson_course_id = get_post_meta($post->ID, '_lesson_course', true);
 
-                $update_course = $this->woocommerce_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 ) ) {
+                $update_course = $this->woocommerce_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 ) {
+                } 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 );
+                    $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 );
+                            $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 );
+                        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 );
+                            $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 );
+                $lesson_id = get_post_meta($post->ID, '_quiz_lesson', true);
+                $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true);
 
-                $update_course = $this->woocommerce_course_update( $lesson_course_id );
-                if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) {
+                $update_course = $this->woocommerce_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);
+                    $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() ) {
+                    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 );
+                        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() ) {
+                } 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'] ) ) ) {
+                    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 );
+                        $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 );
+                            $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 );
+                    $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:
@@ -833,14 +833,14 @@ 
          * }
          * @param string $post_id
          */
-        $this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID );
+        $this->permissions_message = apply_filters('sensei_permissions_message', $this->permissions_message, $post->ID);
 
 
-        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) {
+        if (sensei_all_access() || Sensei_Utils::is_preview_lesson($post->ID)) {
             $user_allowed = true;
         }
 
-        return apply_filters( 'sensei_access_permissions', $user_allowed );
+        return apply_filters('sensei_access_permissions', $user_allowed);
     } // End get_placeholder_image()
 
 
@@ -850,12 +850,12 @@ 
      * @access public
      * @return void
      */
-    public function access_settings () {
+    public function access_settings() {
 
-        if( sensei_all_access() ) return true;
+        if (sensei_all_access()) return true;
 
-        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
-            if ( is_user_logged_in() ) {
+        if (isset($this->settings->settings['access_permission']) && (true == $this->settings->settings['access_permission'])) {
+            if (is_user_logged_in()) {
                 return true;
             } else {
                 return false;
@@ -872,38 +872,38 @@ 
      * @param   int $order_id WC order ID
      * @return  void
      */
-    public function sensei_woocommerce_complete_order ( $order_id = 0 ) {
+    public function sensei_woocommerce_complete_order($order_id = 0) {
         $order_user = array();
         // Check for WooCommerce
-        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) {
+        if (Sensei_WC::is_woocommerce_active() && (0 < $order_id)) {
             // Get order object
-            $order = new WC_Order( $order_id );
-            $user = get_user_by( 'id', $order->user_id );
+            $order = new WC_Order($order_id);
+            $user = get_user_by('id', $order->user_id);
             $order_user['ID'] = $user->ID;
             $order_user['user_login'] = $user->user_login;
             $order_user['user_email'] = $user->user_email;
             $order_user['user_url'] = $user->user_url;
             // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
-                foreach( $order->get_items() as $item ) {
+            if (0 < sizeof($order->get_items())) {
+                foreach ($order->get_items() as $item) {
                     $product_type = '';
-                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                    if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
                         $item_id = $item['variation_id'];
                         $product_type = 'variation';
                     } else {
                         $item_id = $item['product_id'];
                     } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+                    $_product = $this->sensei_get_woocommerce_product_object($item_id, $product_type);
                     // Get courses that use the WC product
-                    $courses = $this->post_types->course->get_product_courses( $_product->id );
+                    $courses = $this->post_types->course->get_product_courses($_product->id);
                     // Loop and update those courses
-                    foreach ( $courses as $course_item ) {
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+                    foreach ($courses as $course_item) {
+                        $update_course = $this->woocommerce_course_update($course_item->ID, $order_user);
                     } // End For Loop
                 } // End For Loop
             } // End If Statement
             // Add meta to indicate that payment has been completed successfully
-            update_post_meta( $order_id, 'sensei_payment_complete', '1' );
+            update_post_meta($order_id, 'sensei_payment_complete', '1');
         } // End If Statement
     } // End sensei_woocommerce_complete_order()
 
@@ -914,36 +914,36 @@ 
      * @param   integer $order_id order ID
      * @return  void
      */
-    public function sensei_woocommerce_cancel_order ( $order_id ) {
+    public function sensei_woocommerce_cancel_order($order_id) {
 
         // Get order object
-        $order = new WC_Order( $order_id );
+        $order = new WC_Order($order_id);
 
         // Run through each product ordered
-        if ( 0 < sizeof( $order->get_items() ) ) {
+        if (0 < sizeof($order->get_items())) {
 
             // Get order user
-            $user_id = $order->__get( 'user_id' );
+            $user_id = $order->__get('user_id');
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
                 } else {
                     $item_id = $item['product_id'];
                 } // End If Statement
-                $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+                $_product = $this->sensei_get_woocommerce_product_object($item_id, $product_type);
 
                 // Get courses that use the WC product
                 $courses = array();
-                $courses = $this->post_types->course->get_product_courses( $item_id );
+                $courses = $this->post_types->course->get_product_courses($item_id);
 
                 // Loop and update those courses
-                foreach ($courses as $course_item){
+                foreach ($courses as $course_item) {
                     // Check and Remove course from courses user meta
-                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id );
+                    $dataset_changes = Sensei_Utils::sensei_remove_user_from_course($course_item->ID, $user_id);
                 } // End For Loop
             } // End For Loop
         } // End If Statement
@@ -957,9 +957,9 @@ 
      * @param   integer $subscription_key Subscription Unique Key
      * @return  void
      */
-    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        self::sensei_woocommerce_cancel_order( $subscription['order_id'] );
+    public function sensei_woocommerce_subscription_ended($user_id, $subscription_key) {
+        $subscription = WC_Subscriptions_Manager::get_users_subscription($user_id, $subscription_key);
+        self::sensei_woocommerce_cancel_order($subscription['order_id']);
     }
 
     /**
@@ -970,18 +970,18 @@ 
      * @param   integer $subscription_key Subscription Unique Key
      * @return  void
      */
-    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ) {
-        $subscription = WC_Subscriptions_Manager::get_users_subscription( $user_id, $subscription_key );
-        $order = new WC_Order( $subscription['order_id'] );
-        $user = get_user_by( 'id', $order->user_id );
+    public function sensei_woocommerce_reactivate_subscription($user_id, $subscription_key) {
+        $subscription = WC_Subscriptions_Manager::get_users_subscription($user_id, $subscription_key);
+        $order = new WC_Order($subscription['order_id']);
+        $user = get_user_by('id', $order->user_id);
         $order_user = array();
         $order_user['ID'] = $user->ID;
         $order_user['user_login'] = $user->user_login;
         $order_user['user_email'] = $user->user_email;
         $order_user['user_url'] = $user->user_url;
-        $courses = $this->post_types->course->get_product_courses( $subscription['product_id'] );
-        foreach ( $courses as $course_item ){
-            $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+        $courses = $this->post_types->course->get_product_courses($subscription['product_id']);
+        foreach ($courses as $course_item) {
+            $update_course = $this->woocommerce_course_update($course_item->ID, $order_user);
         } // End For Loop
     } // End sensei_woocommerce_reactivate_subscription
 
@@ -996,30 +996,30 @@ 
      * @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 = '' ) {
+    public function sensei_get_woocommerce_product_object($wc_product_id = 0, $product_type = '') {
 
         $wc_product_object = false;
-        if ( 0 < intval( $wc_product_id ) ) {
+        if (0 < intval($wc_product_id)) {
 
             // Get the product
-            if ( function_exists( 'wc_get_product' ) ) {
+            if (function_exists('wc_get_product')) {
 
-                $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3
+                $wc_product_object = wc_get_product($wc_product_id); // Post WC 2.3
 
-            } elseif ( function_exists( 'get_product' ) ) {
+            } elseif (function_exists('get_product')) {
 
-                $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0
+                $wc_product_object = get_product($wc_product_id); // Post WC 2.0
 
             } else {
 
                 // Pre WC 2.0
-                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) {
+                if ('variation' == $product_type || 'subscription_variation' == $product_type) {
 
-                    $wc_product_object = new WC_Product_Variation( $wc_product_id );
+                    $wc_product_object = new WC_Product_Variation($wc_product_id);
 
                 } else {
 
-                    $wc_product_object = new WC_Product( $wc_product_id );
+                    $wc_product_object = new WC_Product($wc_product_id);
 
                 } // End If Statement
 
@@ -1037,9 +1037,9 @@ 
      * @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' );
+    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()
 
@@ -1050,17 +1050,17 @@ 
      * @param   integer $order_id order ID
      * @return  void
      */
-    public function sensei_activate_subscription(  $order_id = 0 ) {
-        if ( 0 < intval( $order_id ) ) {
-            $order = new WC_Order( $order_id );
+    public function sensei_activate_subscription($order_id = 0) {
+        if (0 < intval($order_id)) {
+            $order = new WC_Order($order_id);
             $user = get_user_by('id', $order->user_id);
             $order_user['ID'] = $user->ID;
             $order_user['user_login'] = $user->user_login;
             $order_user['user_email'] = $user->user_email;
             $order_user['user_url'] = $user->user_url;
             // Run through each product ordered
-            if (sizeof($order->get_items())>0) {
-                foreach($order->get_items() as $item) {
+            if (sizeof($order->get_items()) > 0) {
+                foreach ($order->get_items() as $item) {
                     $product_type = '';
                     if (isset($item['variation_id']) && $item['variation_id'] > 0) {
                         $item_id = $item['variation_id'];
@@ -1068,15 +1068,15 @@ 
                     } else {
                         $item_id = $item['product_id'];
                     } // End If Statement
-                    $_product = $this->sensei_get_woocommerce_product_object( $item_id, $product_type );
+                    $_product = $this->sensei_get_woocommerce_product_object($item_id, $product_type);
                     // Get courses that use the WC product
                     $courses = array();
-                    if ( $product_type == 'subscription_variation' ) {
-                        $courses = $this->post_types->course->get_product_courses( $item_id );
+                    if ($product_type == 'subscription_variation') {
+                        $courses = $this->post_types->course->get_product_courses($item_id);
                     } // End If Statement
                     // Loop and update those courses
-                    foreach ($courses as $course_item){
-                        $update_course = $this->woocommerce_course_update( $course_item->ID, $order_user );
+                    foreach ($courses as $course_item) {
+                        $update_course = $this->woocommerce_course_update($course_item->ID, $order_user);
                     } // End For Loop
                 } // End For Loop
             } // End If Statement
@@ -1090,12 +1090,12 @@ 
      * @param   WC_Order $order
      * @return  void
      */
-    public function sensei_woocommerce_email_course_details( $order ) {
+    public function sensei_woocommerce_email_course_details($order) {
         global $woocommerce;
 
         // exit early if not wc-completed or wc-processing
-        if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+        if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
@@ -1103,14 +1103,14 @@ 
         $order_id = $order->id;
 
         //If object have items go through them all to find course
-        if ( 0 < sizeof( $order_items ) ) {
+        if (0 < sizeof($order_items)) {
 
-        echo '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>';
+        echo '<h2>'.__('Course details', 'woothemes-sensei').'</h2>';
 
-        foreach ( $order_items as $item ) {
+        foreach ($order_items as $item) {
 
                 $product_type = '';
-                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+                if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
                     // If item has variation_id then its from variation
                     $item_id = $item['variation_id'];
                     $product_type = 'variation';
@@ -1119,9 +1119,9 @@ 
                     $item_id = $item['product_id'];
                 } // End If Statement
 
-                $user_id = get_post_meta( $order_id, '_customer_user', true );
+                $user_id = get_post_meta($order_id, '_customer_user', true);
 
-                if( $user_id ) {
+                if ($user_id) {
 
                     // Get all courses for product
                     $args = array(
@@ -1136,16 +1136,16 @@ 
                         'orderby' => 'menu_order date',
                         'order' => 'ASC',
                     );
-                    $courses = get_posts( $args );
+                    $courses = get_posts($args);
 
-                    if( $courses && count( $courses ) > 0 ) {
+                    if ($courses && count($courses) > 0) {
 
-                        foreach( $courses as $course ) {
+                        foreach ($courses as $course) {
 
                             $title = $course->post_title;
-                            $permalink = get_permalink( $course->ID );
+                            $permalink = get_permalink($course->ID);
 
-                            echo '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>';
+                            echo '<p><strong>'.sprintf(__('View course: %1$s', 'woothemes-sensei'), '</strong><a href="'.esc_url($permalink).'">'.$title.'</a>').'</p>';
                         }
                     }
                 }
@@ -1161,44 +1161,44 @@ 
      * @param  integer $post_id
      * @return array
      */
-    public function sensei_count_comments( $comments, $post_id ) {
+    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 ) {
+        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 = 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 ) ) . "')";
+        $where = "WHERE comment_type IN ('".join("', '", array_unique($statuses))."')";
 
-        if ( $post_id > 0 )
-            $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+        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 );
+        $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 ) {
+        foreach ((array) $count as $row) {
             // Don't count post-trashed toward totals
-            if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+            if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'])
                 $total += $row['num_comments'];
-            if ( isset( $approved[$row['comment_approved']] ) )
+            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]) )
+        foreach ($approved as $key) {
+            if (empty($stats[$key]))
                 $stats[$key] = 0;
         }
 
@@ -1216,15 +1216,15 @@ 
      * @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'] );
+        $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']);
     }
 
     /**
@@ -1237,37 +1237,37 @@ 
      * @param mixed $image_size
      * @return string
      */
-    public function get_image_size( $image_size ) {
+    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 ( ! 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.'_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.'_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;
+        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 = 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;
+        $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 );
+        return apply_filters('sensei_get_image_size_'.$image_size, $size);
     }
 
-    public function body_class( $classes ) {
-        if( is_sensei() ) {
+    public function body_class($classes) {
+        if (is_sensei()) {
             $classes[] = 'sensei';
         }
         return $classes;
@@ -1280,9 +1280,9 @@ 
      * @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' );
+        if (function_exists('latex_markup')) {
+            add_filter('sensei_question_title', 'latex_markup');
+            add_filter('sensei_answer_text', 'latex_markup');
         }
     }
 
@@ -1294,21 +1294,21 @@ 
      *
      * @since 1.8.0
      */
-    public function load_modules_class(){
+    public function load_modules_class() {
         global $sensei_modules;
 
-        if( !class_exists( 'Sensei_Modules' )
-            &&  'Sensei_Modules' != get_class( $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 );
+            require_once('class-sensei-modules.php');
+            Sensei()->modules = new Sensei_Core_Modules($this->file);
 
-        }else{
+        } 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 );
+            add_action('admin_notices', array($this, 'disable_sensei_modules_extension'), 30);
         }
     }
 
@@ -1317,12 +1317,12 @@ 
      *
      * @since 1.8.0
      */
-    public function disable_sensei_modules_extension(){ ?>
+    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_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).
@@ -1340,18 +1340,18 @@ 
      *
      * @since 1.9.0
      */
-    public function flush_rewrite_rules(){
+    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 ) {
+        $option = get_option('sensei_flush_rewrite_rules');
+        if ('1' == $option) {
 
             update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+        }elseif ('2' == $option) {
 
             flush_rewrite_rules();
             update_option('sensei_flush_rewrite_rules', '0');
@@ -1366,7 +1366,7 @@ 
      *
      * @since 1.9.0
      */
-    public function initiate_rewrite_rules_flush(){
+    public function initiate_rewrite_rules_flush() {
 
         update_option('sensei_flush_rewrite_rules', '1');
 
@@ -1379,4 +1379,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class Woothemes_Sensei extends Sensei_Main{ }
+class Woothemes_Sensei extends Sensei_Main { }

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

Indentation +19 added lines, -19 removed lines

@@ -162,10 +162,10 @@ 
 			'order' => $order,
 		);
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 		switch ( $this->type ) {
 			case 'courses':
@@ -222,10 +222,10 @@ 
 		);
 
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 
 		// Start the csv with the column headings
@@ -263,7 +263,7 @@ 
 	 * Generates the overall array for a single item in the display
 	 * @since  1.7.0
 	 * @param object $item The current item
-     * @return array $column_data;
+	 * @return array $column_data;
 	 */
 	protected function get_row_data( $item ) {
 
@@ -422,8 +422,8 @@ 
 
 				// Output the users data
 				if ( $this->csv_output ) {
-                    $user_name = Sensei()->learners->get_learner_full_name( $item->ID );
-                }
+					$user_name = Sensei()->learners->get_learner_full_name( $item->ID );
+				}
 				else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
 					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
@@ -517,17 +517,17 @@ 
 		// This stops the full meta data of each user being loaded
 		$args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' );
 
-        /**
-         * Filter the WP_User_Query arguments
-         * @since 1.6.0
-         * @param $args
-         */
-        $args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
+		/**
+		 * Filter the WP_User_Query arguments
+		 * @since 1.6.0
+		 * @param $args
+		 */
+		$args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
 		$wp_user_search = new WP_User_Query( $args );
-        $learners = $wp_user_search->get_results();
+		$learners = $wp_user_search->get_results();
 		$this->total_items = $wp_user_search->get_total();
 
-        return $learners;
+		return $learners;
 
 	} // End get_learners()
 

Braces +8 added lines, -9 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis Overview List Table Class
@@ -306,8 +309,7 @@ 
 				// Output course data
 				if ( $this->csv_output ) {
 					$course_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-				}
-				else {
+				} else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID ), admin_url( 'admin.php' ) );
 
 					$course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
@@ -363,16 +365,14 @@ 
 				// Output lesson data
 				if ( $this->csv_output ) {
 					$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-				}
-				else {
+				} else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
 					$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
 
 					if ( $course_id ) {
 						$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
 						$course_title = '<a href="' . esc_url( $url ) . '">' . $course_title . '</a>';
-					}
-					else {
+					} else {
 						$course_title = __('n/a', 'woothemes-sensei');
 					}
 					if ( is_numeric( $lesson_average_grade ) ) {
@@ -423,8 +423,7 @@ 
 				// Output the users data
 				if ( $this->csv_output ) {
                     $user_name = Sensei()->learners->get_learner_full_name( $item->ID );
-                }
-				else {
+                } else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
 					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
 					$user_average_grade .= '%';

Spacing +186 added lines, -186 removed lines

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

includes/class-sensei-grading-user-quiz.php

Indentation +8 added lines, -8 removed lines

@@ -41,9 +41,9 @@ 
 
 	/**
 	 * Display output to the admin view
-     *
-     * This view is shown when grading a quiz for a single user in admin under grading
-     *
+	 *
+	 * This view is shown when grading a quiz for a single user in admin under grading
+	 *
 	 * @since  1.3.0
 	 * @return html
 	 */
@@ -57,8 +57,8 @@ 
 		$user_quiz_grade_total = 0;
 		$quiz_grade_total = 0;
 		$quiz_grade = 0;
-        $lesson_id = $this->lesson_id;
-        $user_id = $this->user_id;
+		$lesson_id = $this->lesson_id;
+		$user_id = $this->user_id;
 
 		?><form name="<?php esc_attr_e( 'quiz_' . $this->quiz_id ); ?>" action="" method="post">
 			<?php wp_nonce_field( 'sensei_manual_grading', '_wp_sensei_manual_grading_nonce' ); ?>
@@ -206,11 +206,11 @@ 
 						<p class="user-answer"><?php
 							foreach ( $user_answer_content as $_user_answer ) {
 
-                                if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){
+								if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){
 
-                                    $_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) );
+									$_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) );
 
-                                }
+								}
 
 								echo apply_filters( 'sensei_answer_text', $_user_answer ) . "<br>";
 							}

Braces +5 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Grading User Quiz Class
@@ -172,8 +175,7 @@ 
 				++$correct_answers;
 				++$graded_count;
 				$user_question_grade = 0;
-			}
-			elseif( intval( $user_question_grade ) > 0 ) {
+			} elseif( intval( $user_question_grade ) > 0 ) {
 				$graded_class = 'user_right';
 				++$correct_answers;
 				$user_quiz_grade_total += $user_question_grade;

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Grading User Quiz Class
@@ -22,10 +22,10 @@ 
 	 * @since  1.3.0
 	 * @return  void
 	 */
-	public function __construct ( $user_id = 0, $quiz_id = 0 ) {
-		$this->user_id = intval( $user_id );
-		$this->quiz_id = intval( $quiz_id );
-		$this->lesson_id = get_post_meta( $this->quiz_id, '_quiz_lesson', true );
+	public function __construct($user_id = 0, $quiz_id = 0) {
+		$this->user_id = intval($user_id);
+		$this->quiz_id = intval($quiz_id);
+		$this->lesson_id = get_post_meta($this->quiz_id, '_quiz_lesson', true);
 	} // End __construct()
 
 	/**
@@ -35,7 +35,7 @@ 
 	 * @return array
 	 */
 	public function build_data_array() {
-		$data_array = Sensei_Utils::sensei_get_quiz_questions( $this->quiz_id );
+		$data_array = Sensei_Utils::sensei_get_quiz_questions($this->quiz_id);
 		return $data_array;
 	} // End build_data_array()
 
@@ -60,94 +60,94 @@ 
         $lesson_id = $this->lesson_id;
         $user_id = $this->user_id;
 
-		?><form name="<?php esc_attr_e( 'quiz_' . $this->quiz_id ); ?>" action="" method="post">
-			<?php wp_nonce_field( 'sensei_manual_grading', '_wp_sensei_manual_grading_nonce' ); ?>
-			<input type="hidden" name="sensei_manual_grade" value="<?php esc_attr_e( $this->quiz_id ); ?>" />
-			<input type="hidden" name="sensei_grade_next_learner" value="<?php esc_attr_e( $this->user_id ); ?>" />
+		?><form name="<?php esc_attr_e('quiz_'.$this->quiz_id); ?>" action="" method="post">
+			<?php wp_nonce_field('sensei_manual_grading', '_wp_sensei_manual_grading_nonce'); ?>
+			<input type="hidden" name="sensei_manual_grade" value="<?php esc_attr_e($this->quiz_id); ?>" />
+			<input type="hidden" name="sensei_grade_next_learner" value="<?php esc_attr_e($this->user_id); ?>" />
 			<div class="total_grade_display">
-				<span><?php esc_attr_e( __( 'Grade:', 'woothemes-sensei' ) ); ?></span>
+				<span><?php esc_attr_e(__('Grade:', 'woothemes-sensei')); ?></span>
 				<span class="total_grade_total"><?php echo $user_quiz_grade_total; ?></span> / <span class="quiz_grade_total"><?php echo $quiz_grade_total; ?></span> (<span class="total_grade_percent"><?php echo $quiz_grade; ?></span>%)
 			</div>
 			<div class="buttons">
-				<input type="submit" value="<?php esc_attr_e( __( 'Save', 'woothemes-sensei' ) ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
-				<input type="button" value="<?php esc_attr_e( __( 'Auto grade', 'woothemes-sensei' ) ); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" />
-				<input type="reset" value="<?php esc_attr_e( __( 'Reset', 'woothemes-sensei' ) ); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" />
+				<input type="submit" value="<?php esc_attr_e(__('Save', 'woothemes-sensei')); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
+				<input type="button" value="<?php esc_attr_e(__('Auto grade', 'woothemes-sensei')); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" />
+				<input type="reset" value="<?php esc_attr_e(__('Reset', 'woothemes-sensei')); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" />
 			</div>
 			<div class="clear"></div><br/><?php
 
-		$lesson_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $this->lesson_id, 'user_id' => $this->user_id, 'type' => 'sensei_lesson_status', 'field' => 'comment_ID' ) );
-		$user_quiz_grade = get_comment_meta( $lesson_status_id, 'grade', true );
+		$lesson_status_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $this->lesson_id, 'user_id' => $this->user_id, 'type' => 'sensei_lesson_status', 'field' => 'comment_ID'));
+		$user_quiz_grade = get_comment_meta($lesson_status_id, 'grade', true);
 		$correct_answers = 0;
 
-		foreach( $questions as $question ) {
+		foreach ($questions as $question) {
 			$question_id = $question->ID;
 			++$count;
 
 			$type = false;
 			$type_name = '';
 
-			$type = Sensei()->question->get_question_type( $question_id );
+			$type = Sensei()->question->get_question_type($question_id);
 
-			$question_answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $user_id );
+			$question_answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, $user_id);
 
 
-			$question_grade_total = Sensei()->question->get_question_grade( $question_id );
+			$question_grade_total = Sensei()->question->get_question_grade($question_id);
 			$quiz_grade_total += $question_grade_total;
 
-			$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-			$user_answer_content = Sensei()->quiz->get_user_question_answer( $lesson_id, $question_id, $user_id );
-			$type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+			$right_answer = get_post_meta($question_id, '_question_right_answer', true);
+			$user_answer_content = Sensei()->quiz->get_user_question_answer($lesson_id, $question_id, $user_id);
+			$type_name = __('Multiple Choice', 'woothemes-sensei');
 			$grade_type = 'manual-grade';
 
-			switch( $type ) {
+			switch ($type) {
 				case 'boolean':
-					$type_name = __( 'True/False', 'woothemes-sensei' );
-					$right_answer = ucfirst( $right_answer );
-					$user_answer_content = ucfirst( $user_answer_content );
+					$type_name = __('True/False', 'woothemes-sensei');
+					$right_answer = ucfirst($right_answer);
+					$user_answer_content = ucfirst($user_answer_content);
 					$grade_type = 'auto-grade';
 				break;
 				case 'multiple-choice':
-					$type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+					$type_name = __('Multiple Choice', 'woothemes-sensei');
 					$grade_type = 'auto-grade';
 				break;
 				case 'gap-fill':
-					$type_name = __( 'Gap Fill', 'woothemes-sensei' );
+					$type_name = __('Gap Fill', 'woothemes-sensei');
 
-					$right_answer_array = explode( '||', $right_answer );
-					if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-					if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-					if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+					$right_answer_array = explode('||', $right_answer);
+					if (isset($right_answer_array[0])) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+					if (isset($right_answer_array[1])) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+					if (isset($right_answer_array[2])) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-					if( ! $user_answer_content ) {
+					if ( ! $user_answer_content) {
 						$user_answer_content = '______';
 					}
 
-					$right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
-					$user_answer_content = $gapfill_pre . ' <span class="highlight">' . $user_answer_content . '</span> ' . $gapfill_post;
+					$right_answer = $gapfill_pre.' <span class="highlight">'.$gapfill_gap.'</span> '.$gapfill_post;
+					$user_answer_content = $gapfill_pre.' <span class="highlight">'.$user_answer_content.'</span> '.$gapfill_post;
 					$grade_type = 'auto-grade';
 
 				break;
 				case 'multi-line':
-					$type_name = __( 'Multi Line', 'woothemes-sensei' );
+					$type_name = __('Multi Line', 'woothemes-sensei');
 					$grade_type = 'manual-grade';
 				break;
 				case 'single-line':
-					$type_name = __( 'Single Line', 'woothemes-sensei' );
+					$type_name = __('Single Line', 'woothemes-sensei');
 					$grade_type = 'manual-grade';
 				break;
 				case 'file-upload':
-					$type_name = __( 'File Upload', 'woothemes-sensei' );
+					$type_name = __('File Upload', 'woothemes-sensei');
 					$grade_type = 'manual-grade';
 
 					// Get uploaded file
-					if( $user_answer_content ) {
+					if ($user_answer_content) {
 						$attachment_id = $user_answer_content;
 						$answer_media_url = $answer_media_filename = '';
-						if( 0 < intval( $attachment_id ) ) {
-							$answer_media_url = wp_get_attachment_url( $attachment_id );
-							$answer_media_filename = basename( $answer_media_url );
-							if( $answer_media_url && $answer_media_filename ) {
-								$user_answer_content = sprintf( __( 'Submitted file: %1$s', 'woothemes-sensei' ), '<a href="' . esc_url( $answer_media_url ) . '" target="_blank">' . esc_html( $answer_media_filename ) . '</a>' );
+						if (0 < intval($attachment_id)) {
+							$answer_media_url = wp_get_attachment_url($attachment_id);
+							$answer_media_filename = basename($answer_media_url);
+							if ($answer_media_url && $answer_media_filename) {
+								$user_answer_content = sprintf(__('Submitted file: %1$s', 'woothemes-sensei'), '<a href="'.esc_url($answer_media_url).'" target="_blank">'.esc_html($answer_media_filename).'</a>');
 							}
 						}
 					} else {
@@ -160,12 +160,12 @@ 
 			}
 			$user_answer_content = (array) $user_answer_content;
 			$right_answer = (array) $right_answer;
-			$question_title = sprintf( __( 'Question %d: ', 'woothemes-sensei' ), $count ) . $type_name;
+			$question_title = sprintf(__('Question %d: ', 'woothemes-sensei'), $count).$type_name;
 
 			$graded_class = '';
-			$user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, $user_id );
+			$user_question_grade = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, $user_id);
 			$graded_class = 'ungraded';
-			if ( 0 == $question_grade_total && 0 == intval( $user_question_grade ) ) {
+			if (0 == $question_grade_total && 0 == intval($user_question_grade)) {
 				// Question skips grading
 				$grade_type = 'zero-graded';
 				$graded_class = '';
@@ -173,86 +173,86 @@ 
 				++$graded_count;
 				$user_question_grade = 0;
 			}
-			elseif( intval( $user_question_grade ) > 0 ) {
+			elseif (intval($user_question_grade) > 0) {
 				$graded_class = 'user_right';
 				++$correct_answers;
 				$user_quiz_grade_total += $user_question_grade;
 				++$graded_count;
 			} else {
-				if( ! is_string( $user_question_grade ) && intval( $user_question_grade ) == 0 ) {
+				if ( ! is_string($user_question_grade) && intval($user_question_grade) == 0) {
 					$graded_class = 'user_wrong';
 					++$graded_count;
 				}
 				$user_question_grade = 0;
 			}
 
-			?><div class="postbox question_box <?php esc_attr_e( $type ); ?> <?php esc_attr_e( $grade_type ); ?> <?php esc_attr_e( $graded_class ); ?>" id="<?php esc_attr_e( 'question_' . $question_id . '_box' ); ?>">
+			?><div class="postbox question_box <?php esc_attr_e($type); ?> <?php esc_attr_e($grade_type); ?> <?php esc_attr_e($graded_class); ?>" id="<?php esc_attr_e('question_'.$question_id.'_box'); ?>">
 				<div class="handlediv" title="Click to toggle"><br></div>
 				<h3 class="hndle"><span><?php echo $question_title; ?></span></h3>
 				<div class="inside">
 					<div class="sensei-grading-actions">
 						<div class="actions">
-							<input type="hidden" class="question_id" value="<?php esc_attr_e( $question_id ); ?>" />
-							<input type="hidden" class="question_total_grade" name="question_total_grade" value="<?php echo esc_attr( $question_grade_total ); ?>" />
-							<span class="grading-mark icon_right"><input type="radio" class="<?php esc_attr_e( 'question_' . $question_id . '_right_option' ); ?>" name="<?php esc_attr_e( 'question_' . $question_id ); ?>" value="right" <?php checked( $graded_class, 'user_right', true ); ?> /></span>
-							<span class="grading-mark icon_wrong"><input type="radio" class="<?php esc_attr_e( 'question_' . $question_id . '_wrong_option' ); ?>" name="<?php esc_attr_e( 'question_' . $question_id ); ?>" value="wrong" <?php checked( $graded_class, 'user_wrong', true ); ?> /></span>
-							<input type="number" class="question-grade" name="<?php esc_attr_e( 'question_' . $question_id . '_grade' ); ?>" id="<?php esc_attr_e( 'question_' . $question_id . '_grade' ); ?>" value="<?php echo esc_attr( $user_question_grade ); ?>" min="0" max="<?php echo esc_attr( $question_grade_total ); ?>" />
+							<input type="hidden" class="question_id" value="<?php esc_attr_e($question_id); ?>" />
+							<input type="hidden" class="question_total_grade" name="question_total_grade" value="<?php echo esc_attr($question_grade_total); ?>" />
+							<span class="grading-mark icon_right"><input type="radio" class="<?php esc_attr_e('question_'.$question_id.'_right_option'); ?>" name="<?php esc_attr_e('question_'.$question_id); ?>" value="right" <?php checked($graded_class, 'user_right', true); ?> /></span>
+							<span class="grading-mark icon_wrong"><input type="radio" class="<?php esc_attr_e('question_'.$question_id.'_wrong_option'); ?>" name="<?php esc_attr_e('question_'.$question_id); ?>" value="wrong" <?php checked($graded_class, 'user_wrong', true); ?> /></span>
+							<input type="number" class="question-grade" name="<?php esc_attr_e('question_'.$question_id.'_grade'); ?>" id="<?php esc_attr_e('question_'.$question_id.'_grade'); ?>" value="<?php echo esc_attr($user_question_grade); ?>" min="0" max="<?php echo esc_attr($question_grade_total); ?>" />
 							<span class="question-grade-total"><?php echo $question_grade_total; ?></span>
 						</div>
 					</div>
 					<div class="sensei-grading-answer">
-						<h4><?php echo apply_filters( 'sensei_question_title', $question->post_title ); ?></h4>
-						<?php echo apply_filters( 'the_content', $question->post_content );?>
+						<h4><?php echo apply_filters('sensei_question_title', $question->post_title); ?></h4>
+						<?php echo apply_filters('the_content', $question->post_content); ?>
 						<p class="user-answer"><?php
-							foreach ( $user_answer_content as $_user_answer ) {
+							foreach ($user_answer_content as $_user_answer) {
 
-                                if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){
+                                if ('multi-line' == Sensei()->question->get_question_type($question->ID)) {
 
-                                    $_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) );
+                                    $_user_answer = htmlspecialchars_decode(nl2br(esc_html($_user_answer)));
 
                                 }
 
-								echo apply_filters( 'sensei_answer_text', $_user_answer ) . "<br>";
+								echo apply_filters('sensei_answer_text', $_user_answer)."<br>";
 							}
 						?></p>
 						<div class="right-answer">
-							<h5><?php _e( 'Correct answer', 'woothemes-sensei' ) ?></h5>
+							<h5><?php _e('Correct answer', 'woothemes-sensei') ?></h5>
 							<span class="correct-answer"><?php
-								foreach ( $right_answer as $_right_answer ) {
+								foreach ($right_answer as $_right_answer) {
 
-									echo apply_filters( 'sensei_answer_text', $_right_answer ) . "<br>";
+									echo apply_filters('sensei_answer_text', $_right_answer)."<br>";
 
 								}
 							?></span>
 						</div>
 						<div class="answer-notes">
-							<h5><?php _e( 'Grading Notes', 'woothemes-sensei' ) ?></h5>
-							<textarea class="correct-answer" name="questions_feedback[<?php esc_attr_e( $question_id ); ?>]" placeholder="<?php _e( 'Add notes here...', 'woothemes-sensei' ) ?>"><?php echo $question_answer_notes; ?></textarea>
+							<h5><?php _e('Grading Notes', 'woothemes-sensei') ?></h5>
+							<textarea class="correct-answer" name="questions_feedback[<?php esc_attr_e($question_id); ?>]" placeholder="<?php _e('Add notes here...', 'woothemes-sensei') ?>"><?php echo $question_answer_notes; ?></textarea>
 						</div>
 					</div>
 				</div>
 			</div><?php
 		}
 
-		$quiz_grade = intval( $user_quiz_grade );
+		$quiz_grade = intval($user_quiz_grade);
 		$all_graded = 'no';
-		if( intval( $count ) == intval( $graded_count ) ) {
+		if (intval($count) == intval($graded_count)) {
 			$all_graded = 'yes';
 		}
 
-		?>  <input type="hidden" name="total_grade" id="total_grade" value="<?php esc_attr_e( $user_quiz_grade_total ); ?>" />
-			<input type="hidden" name="total_questions" id="total_questions" value="<?php esc_attr_e( $count ); ?>" />
-			<input type="hidden" name="quiz_grade_total" id="quiz_grade_total" value="<?php esc_attr_e( $quiz_grade_total ); ?>" />
-			<input type="hidden" name="total_graded_questions" id="total_graded_questions" value="<?php esc_attr_e( $graded_count ); ?>" />
-			<input type="hidden" name="all_questions_graded" id="all_questions_graded" value="<?php esc_attr_e( $all_graded ); ?>" />
+		?>  <input type="hidden" name="total_grade" id="total_grade" value="<?php esc_attr_e($user_quiz_grade_total); ?>" />
+			<input type="hidden" name="total_questions" id="total_questions" value="<?php esc_attr_e($count); ?>" />
+			<input type="hidden" name="quiz_grade_total" id="quiz_grade_total" value="<?php esc_attr_e($quiz_grade_total); ?>" />
+			<input type="hidden" name="total_graded_questions" id="total_graded_questions" value="<?php esc_attr_e($graded_count); ?>" />
+			<input type="hidden" name="all_questions_graded" id="all_questions_graded" value="<?php esc_attr_e($all_graded); ?>" />
 			<div class="total_grade_display">
-				<span><?php esc_attr_e( __( 'Grade:', 'woothemes-sensei' ) ); ?></span>
+				<span><?php esc_attr_e(__('Grade:', 'woothemes-sensei')); ?></span>
 				<span class="total_grade_total"><?php echo $user_quiz_grade_total; ?></span> / <span class="quiz_grade_total"><?php echo $quiz_grade_total; ?></span> (<span class="total_grade_percent"><?php echo $quiz_grade; ?></span>%)
 			</div>
 			<div class="buttons">
-				<input type="submit" value="<?php esc_attr_e( 'Save' ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
-				<input type="button" value="<?php esc_attr_e( __( 'Auto grade', 'woothemes-sensei' ) ); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" />
-				<input type="reset" value="<?php esc_attr_e( __( 'Reset', 'woothemes-sensei' ) ); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" />
+				<input type="submit" value="<?php esc_attr_e('Save'); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
+				<input type="button" value="<?php esc_attr_e(__('Auto grade', 'woothemes-sensei')); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" />
+				<input type="reset" value="<?php esc_attr_e(__('Reset', 'woothemes-sensei')); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" />
 			</div>
 			<div class="clear"></div>
 			<script type="text/javascript">
@@ -271,4 +271,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Grading_User_Quiz extends Sensei_Grading_User_Quiz{}
+class WooThemes_Sensei_Grading_User_Quiz extends Sensei_Grading_User_Quiz {}

includes/class-sensei-grading-main.php

Indentation +2 added lines, -2 removed lines

@@ -253,7 +253,7 @@ 
 			$grade = __( 'N/A', 'woothemes-sensei' );
 		}
 
-        $title = Sensei()->learners->get_learner_full_name( $item->user_id );
+		$title = Sensei()->learners->get_learner_full_name( $item->user_id );
 
 		// QuizID to be deprecated
 		$quiz_id = get_post_meta( $item->comment_post_ID, '_lesson_quiz', true );
@@ -303,7 +303,7 @@ 
 	 */
 	public function no_items() {
 
-        _e( 'No submissions found.', 'woothemes-sensei' );
+		_e( 'No submissions found.', 'woothemes-sensei' );
 
 	} // End no_items()
 

Braces +11 added lines, -15 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Grading Overview List Table Class
@@ -155,8 +158,7 @@ 
 
 		if( $this->lesson_id ) {
 			$activity_args['post_id'] = $this->lesson_id;
-		}
-		elseif( $this->course_id ) {
+		} elseif( $this->course_id ) {
 			// Currently not possible to restrict to a single Course, as that requires WP_Comment to support multiple
 			// post_ids (i.e. every lesson within the Course), WP 4.1 ( https://core.trac.wordpress.org/changeset/29808 )
 			if ( version_compare($wp_version, '4.1', '>=') ) {
@@ -231,24 +233,19 @@ 
 		if( 'complete' == $item->comment_approved ) {
 			$status_html = '<span class="graded">' . __( 'Completed', 'woothemes-sensei' ) . '</span>';
 			$grade =  __( 'No Grade', 'woothemes-sensei' );
-		}
-		elseif( 'graded' == $item->comment_approved ) {
+		} elseif( 'graded' == $item->comment_approved ) {
 			$status_html = '<span class="graded">' .  __( 'Graded', 'woothemes-sensei' )  . '</span>';
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
-		}
-		elseif( 'passed' == $item->comment_approved ) {
+		} elseif( 'passed' == $item->comment_approved ) {
 			$status_html = '<span class="passed">' .  __( 'Passed', 'woothemes-sensei' )  . '</span>';
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
-		}
-		elseif( 'failed' == $item->comment_approved ) {
+		} elseif( 'failed' == $item->comment_approved ) {
 			$status_html = '<span class="failed">' .  __( 'Failed', 'woothemes-sensei' )  . '</span>';
 			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
-		}
-		elseif( 'ungraded' == $item->comment_approved ) {
+		} elseif( 'ungraded' == $item->comment_approved ) {
 			$status_html = '<span class="ungraded">' .  __( 'Ungraded', 'woothemes-sensei' )  . '</span>';
 			$grade = __( 'N/A', 'woothemes-sensei' );
-		}
-		else {
+		} else {
 			$status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
 			$grade = __( 'N/A', 'woothemes-sensei' );
 		}
@@ -276,8 +273,7 @@ 
 		$course_title = '';
 		if ( !empty($course_id) && version_compare($wp_version, '4.1', '>=') ) {
 			$course_title = '<a href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) ) ) . '">' . get_the_title( $course_id ) . '</a>';
-		}
-		else if ( !empty($course_id) ) {
+		} else if ( !empty($course_id) ) {
 			$course_title = get_the_title( $course_id );
 		}
 		$lesson_title = '<a href="' . add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->comment_post_ID ), admin_url( 'admin.php' ) ) . '">' . get_the_title( $item->comment_post_ID ) . '</a>';

Spacing +130 added lines, -130 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Grading Overview List Table Class
@@ -25,7 +25,7 @@ 
 	 * @since  1.3.0
 	 * @return  void
 	 */
-	public function __construct ( $args = null ) {
+	public function __construct($args = null) {
 
 		$defaults = array(
 			'course_id' => 0,
@@ -33,24 +33,24 @@ 
 			'user_id' => false,
 			'view' => 'ungraded',
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$this->course_id = intval( $args['course_id'] );
-		$this->lesson_id = intval( $args['lesson_id'] );
-		if ( !empty($args['user_id']) ) {
-			$this->user_id = intval( $args['user_id'] );
+		$this->course_id = intval($args['course_id']);
+		$this->lesson_id = intval($args['lesson_id']);
+		if ( ! empty($args['user_id'])) {
+			$this->user_id = intval($args['user_id']);
 		}
 
-		if( !empty( $args['view'] ) && in_array( $args['view'], array( 'in-progress', 'graded', 'ungraded', 'all' ) ) ) {
+		if ( ! empty($args['view']) && in_array($args['view'], array('in-progress', 'graded', 'ungraded', 'all'))) {
 			$this->view = $args['view'];
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'grading_main' );
+		parent::__construct('grading_main');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 	} // End __construct()
 
 	/**
@@ -60,16 +60,16 @@ 
 	 */
 	function get_columns() {
 		$columns = array(
-			'title' => __( 'Learner', 'woothemes-sensei' ),
-			'course' => __( 'Course', 'woothemes-sensei' ),
-			'lesson' => __( 'Lesson', 'woothemes-sensei' ),
-			'updated' => __( 'Updated', 'woothemes-sensei' ),
-			'user_status' => __( 'Status', 'woothemes-sensei' ),
-			'user_grade' => __( 'Grade', 'woothemes-sensei' ),
+			'title' => __('Learner', 'woothemes-sensei'),
+			'course' => __('Course', 'woothemes-sensei'),
+			'lesson' => __('Lesson', 'woothemes-sensei'),
+			'updated' => __('Updated', 'woothemes-sensei'),
+			'user_status' => __('Status', 'woothemes-sensei'),
+			'user_grade' => __('Grade', 'woothemes-sensei'),
 			'action' => '',
 		);
 
-		$columns = apply_filters( 'sensei_grading_default_columns', $columns, $this );
+		$columns = apply_filters('sensei_grading_default_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -80,14 +80,14 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array(
-			'title' => array( 'title', false ),
-			'course' => array( 'course', false ),
-			'lesson' => array( 'lesson', false ),
-			'updated' => array( 'updated', false ),
-			'user_status' => array( 'user_status', false ),
-			'user_grade' => array( 'user_grade', false ),
+			'title' => array('title', false),
+			'course' => array('course', false),
+			'lesson' => array('lesson', false),
+			'updated' => array('updated', false),
+			'user_status' => array('user_status', false),
+			'user_grade' => array('user_grade', false),
 		);
-		$columns = apply_filters( 'sensei_grading_default_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_grading_default_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -101,47 +101,47 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'DESC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $this->search ) {
+		if ($this->search) {
 			$user_args = array(
-				'search' => '*' . $this->search . '*',
+				'search' => '*'.$this->search.'*',
 				'fields' => 'ID',
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_grading_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_grading_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				// Store for reuse on counts
 				$this->user_ids = $learners_search->get_results();
 			}
 		} // End If Statement
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$activity_args = array(
@@ -153,27 +153,27 @@ 
 			'status' => 'any',
 		);
 
-		if( $this->lesson_id ) {
+		if ($this->lesson_id) {
 			$activity_args['post_id'] = $this->lesson_id;
 		}
-		elseif( $this->course_id ) {
+		elseif ($this->course_id) {
 			// Currently not possible to restrict to a single Course, as that requires WP_Comment to support multiple
 			// post_ids (i.e. every lesson within the Course), WP 4.1 ( https://core.trac.wordpress.org/changeset/29808 )
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$activity_args['post__in'] = Sensei()->course->course_lessons( $this->course_id, 'any', 'ids' );
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$activity_args['post__in'] = Sensei()->course->course_lessons($this->course_id, 'any', 'ids');
 			}
 		}
 		// Sub select to group of learners
-		if ( $this->user_ids ) {
+		if ($this->user_ids) {
 			$activity_args['user_id'] = (array) $this->user_ids;
 		}
 		// Restrict to a single Learner
-		if( $this->user_id ) {
+		if ($this->user_id) {
 			$activity_args['user_id'] = $this->user_id;
 		}
 
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'in-progress' :
 				$activity_args['status'] = 'in-progress';
 				break;
@@ -183,7 +183,7 @@ 
 				break;
 
 			case 'graded' :
-				$activity_args['status'] = array( 'graded', 'passed', 'failed' );
+				$activity_args['status'] = array('graded', 'passed', 'failed');
 				break;
 
 			case 'all' :
@@ -192,31 +192,31 @@ 
 				break;
 		} // End switch
 
-		$activity_args = apply_filters( 'sensei_grading_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_grading_filter_statuses', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$total_statuses = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$total_statuses = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $total_statuses < $activity_args['offset'] ) {
-			$new_paged = floor( $total_statuses / $activity_args['number'] );
+		if ($total_statuses < $activity_args['offset']) {
+			$new_paged = floor($total_statuses / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($statuses) ) {
-			$statuses = array( $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = array($statuses);
 		}
 		$this->total_items = $total_statuses;
 		$this->items = $statuses;
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -224,73 +224,73 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 		global $wp_version;
 
 		$grade = '';
-		if( 'complete' == $item->comment_approved ) {
-			$status_html = '<span class="graded">' . __( 'Completed', 'woothemes-sensei' ) . '</span>';
-			$grade =  __( 'No Grade', 'woothemes-sensei' );
+		if ('complete' == $item->comment_approved) {
+			$status_html = '<span class="graded">'.__('Completed', 'woothemes-sensei').'</span>';
+			$grade = __('No Grade', 'woothemes-sensei');
 		}
-		elseif( 'graded' == $item->comment_approved ) {
-			$status_html = '<span class="graded">' .  __( 'Graded', 'woothemes-sensei' )  . '</span>';
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
+		elseif ('graded' == $item->comment_approved) {
+			$status_html = '<span class="graded">'.__('Graded', 'woothemes-sensei').'</span>';
+			$grade = get_comment_meta($item->comment_ID, 'grade', true).'%';
 		}
-		elseif( 'passed' == $item->comment_approved ) {
-			$status_html = '<span class="passed">' .  __( 'Passed', 'woothemes-sensei' )  . '</span>';
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
+		elseif ('passed' == $item->comment_approved) {
+			$status_html = '<span class="passed">'.__('Passed', 'woothemes-sensei').'</span>';
+			$grade = get_comment_meta($item->comment_ID, 'grade', true).'%';
 		}
-		elseif( 'failed' == $item->comment_approved ) {
-			$status_html = '<span class="failed">' .  __( 'Failed', 'woothemes-sensei' )  . '</span>';
-			$grade = get_comment_meta( $item->comment_ID, 'grade', true) . '%';
+		elseif ('failed' == $item->comment_approved) {
+			$status_html = '<span class="failed">'.__('Failed', 'woothemes-sensei').'</span>';
+			$grade = get_comment_meta($item->comment_ID, 'grade', true).'%';
 		}
-		elseif( 'ungraded' == $item->comment_approved ) {
-			$status_html = '<span class="ungraded">' .  __( 'Ungraded', 'woothemes-sensei' )  . '</span>';
-			$grade = __( 'N/A', 'woothemes-sensei' );
+		elseif ('ungraded' == $item->comment_approved) {
+			$status_html = '<span class="ungraded">'.__('Ungraded', 'woothemes-sensei').'</span>';
+			$grade = __('N/A', 'woothemes-sensei');
 		}
 		else {
-			$status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
-			$grade = __( 'N/A', 'woothemes-sensei' );
+			$status_html = '<span class="in-progress">'.__('In Progress', 'woothemes-sensei').'</span>';
+			$grade = __('N/A', 'woothemes-sensei');
 		}
 
-        $title = Sensei()->learners->get_learner_full_name( $item->user_id );
+        $title = Sensei()->learners->get_learner_full_name($item->user_id);
 
 		// QuizID to be deprecated
-		$quiz_id = get_post_meta( $item->comment_post_ID, '_lesson_quiz', true );
-		$quiz_link = esc_url( add_query_arg( array( 'page' => $this->page_slug, 'user' => $item->user_id, 'quiz_id' => $quiz_id ), admin_url( 'admin.php' ) ) );
+		$quiz_id = get_post_meta($item->comment_post_ID, '_lesson_quiz', true);
+		$quiz_link = esc_url(add_query_arg(array('page' => $this->page_slug, 'user' => $item->user_id, 'quiz_id' => $quiz_id), admin_url('admin.php')));
 
 		$grade_link = '';
-		switch( $item->comment_approved ) {
+		switch ($item->comment_approved) {
 			case 'ungraded':
-				$grade_link = '<a class="button-primary button" href="' . $quiz_link . '">' . __('Grade quiz', 'woothemes-sensei' ) . '</a>';
+				$grade_link = '<a class="button-primary button" href="'.$quiz_link.'">'.__('Grade quiz', 'woothemes-sensei').'</a>';
 				break;
 
 			case 'graded':
 			case 'passed':
 			case 'failed':
-				$grade_link = '<a class="button-secondary button" href="' . $quiz_link . '">' . __('Review grade', 'woothemes-sensei' ) . '</a>';
+				$grade_link = '<a class="button-secondary button" href="'.$quiz_link.'">'.__('Review grade', 'woothemes-sensei').'</a>';
 				break;
 		}
 
-		$course_id = get_post_meta( $item->comment_post_ID, '_lesson_course', true );
+		$course_id = get_post_meta($item->comment_post_ID, '_lesson_course', true);
 		$course_title = '';
-		if ( !empty($course_id) && version_compare($wp_version, '4.1', '>=') ) {
-			$course_title = '<a href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) ) ) . '">' . get_the_title( $course_id ) . '</a>';
+		if ( ! empty($course_id) && version_compare($wp_version, '4.1', '>=')) {
+			$course_title = '<a href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'))).'">'.get_the_title($course_id).'</a>';
 		}
-		else if ( !empty($course_id) ) {
-			$course_title = get_the_title( $course_id );
+		else if ( ! empty($course_id)) {
+			$course_title = get_the_title($course_id);
 		}
-		$lesson_title = '<a href="' . add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->comment_post_ID ), admin_url( 'admin.php' ) ) . '">' . get_the_title( $item->comment_post_ID ) . '</a>';
+		$lesson_title = '<a href="'.add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->comment_post_ID), admin_url('admin.php')).'">'.get_the_title($item->comment_post_ID).'</a>';
 
-		$column_data = apply_filters( 'sensei_grading_main_column_data', array(
-				'title' => '<strong><a class="row-title" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id ), admin_url( 'admin.php' ) ) ) . '"">' . $title . '</a></strong>',
+		$column_data = apply_filters('sensei_grading_main_column_data', array(
+				'title' => '<strong><a class="row-title" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->user_id), admin_url('admin.php'))).'"">'.$title.'</a></strong>',
 				'course' => $course_title,
 				'lesson' => $lesson_title,
 				'updated' => $item->comment_date,
 				'user_status' => $status_html,
 				'user_grade' => $grade,
 				'action' => $grade_link,
-			), $item, $course_id );
+			), $item, $course_id);
 
 		return $column_data;
 	}
@@ -303,7 +303,7 @@ 
 	 */
 	public function no_items() {
 
-        _e( 'No submissions found.', 'woothemes-sensei' );
+        _e('No submissions found.', 'woothemes-sensei');
 
 	} // End no_items()
 
@@ -316,35 +316,35 @@ 
 		global  $wp_version;
 
 		echo '<div class="grading-selects">';
-		do_action( 'sensei_grading_before_dropdown_filters' );
+		do_action('sensei_grading_before_dropdown_filters');
 
-		echo '<div class="select-box">' . "\n";
+		echo '<div class="select-box">'."\n";
 
-			echo '<select id="grading-course-options" name="grading_course" class="chosen_select widefat">' . "\n";
+			echo '<select id="grading-course-options" name="grading_course" class="chosen_select widefat">'."\n";
 
-				echo Sensei()->grading->courses_drop_down_html( $this->course_id );
+				echo Sensei()->grading->courses_drop_down_html($this->course_id);
 
-			echo '</select>' . "\n";
+			echo '</select>'."\n";
 
-		echo '</div>' . "\n";
+		echo '</div>'."\n";
 
-		echo '<div class="select-box">' . "\n";
+		echo '<div class="select-box">'."\n";
 
-			echo '<select id="grading-lesson-options" data-placeholder="&larr; ' . __( 'Select a course', 'woothemes-sensei' ) . '" name="grading_lesson" class="chosen_select widefat">' . "\n";
+			echo '<select id="grading-lesson-options" data-placeholder="&larr; '.__('Select a course', 'woothemes-sensei').'" name="grading_lesson" class="chosen_select widefat">'."\n";
 
-				echo Sensei()->grading->lessons_drop_down_html( $this->course_id, $this->lesson_id );
+				echo Sensei()->grading->lessons_drop_down_html($this->course_id, $this->lesson_id);
 
-			echo '</select>' . "\n";
+			echo '</select>'."\n";
 
-		echo '</div>' . "\n";
+		echo '</div>'."\n";
 
-		if( $this->course_id && $this->lesson_id ) {
+		if ($this->course_id && $this->lesson_id) {
 
-			echo '<div class="select-box reset-filter">' . "\n";
+			echo '<div class="select-box reset-filter">'."\n";
 
-				echo '<a class="button-secondary" href="' . esc_url( remove_query_arg( array( 'lesson_id', 'course_id' ) ) ) . '">' . __( 'Reset filter', 'woothemes-sensei' ) . '</a>' . "\n";
+				echo '<a class="button-secondary" href="'.esc_url(remove_query_arg(array('lesson_id', 'course_id'))).'">'.__('Reset filter', 'woothemes-sensei').'</a>'."\n";
 
-			echo '</div>' . "\n";
+			echo '</div>'."\n";
 
 		}
 
@@ -359,26 +359,26 @@ 
 		$query_args = array(
 			'page' => $this->page_slug,
 		);
-		if( $this->course_id ) {
+		if ($this->course_id) {
 			// Currently not possible to restrict to a single Course, as that requires WP_Comment to support multiple
 			// post_ids (i.e. every lesson within the Course), WP 4.1 ( https://core.trac.wordpress.org/changeset/29808 )
 			$query_args['course_id'] = $this->course_id;
-			if ( version_compare($wp_version, '4.1', '>=') ) {
-				$count_args['post__in'] = Sensei()->course->course_lessons( $this->course_id, 'any', 'ids' );
+			if (version_compare($wp_version, '4.1', '>=')) {
+				$count_args['post__in'] = Sensei()->course->course_lessons($this->course_id, 'any', 'ids');
 			}
 		}
-		if( $this->lesson_id ) {
+		if ($this->lesson_id) {
 			$query_args['lesson_id'] = $this->lesson_id;
 			// Restrict to a single lesson
 			$count_args['post_id'] = $this->lesson_id;
 		}
-		if( $this->search ) {
+		if ($this->search) {
 			$query_args['s'] = $this->search;
 		}
-		if ( !empty($this->user_ids) ) {
+		if ( ! empty($this->user_ids)) {
 			$count_args['user_id'] = $this->user_ids;
 		}
-		if( !empty($this->user_id) ) {
+		if ( ! empty($this->user_id)) {
 			$query_args['user_id'] = $this->user_id;
 			$count_args['user_id'] = $this->user_id;
 		}
@@ -386,7 +386,7 @@ 
 		$all_lessons_count = $ungraded_lessons_count = $graded_lessons_count = $inprogress_lessons_count = 0;
 		$all_class = $ungraded_class = $graded_class = $inprogress_class = '';
 
-		switch( $this->view ) :
+		switch ($this->view) :
 			case 'all':
 				$all_class = 'current';
 				break;
@@ -402,7 +402,7 @@ 
 				break;
 		endswitch;
 
-		$counts = Sensei()->grading->count_statuses( apply_filters( 'sensei_grading_count_statues', $count_args ) );
+		$counts = Sensei()->grading->count_statuses(apply_filters('sensei_grading_count_statues', $count_args));
 
 		$inprogress_lessons_count = $counts['in-progress'];
 		$ungraded_lessons_count = $counts['ungraded'];
@@ -418,19 +418,19 @@ 
 		$inprogress_args['view'] = 'in-progress';
 
 		$format = '<a class="%s" href="%s">%s <span class="count">(%s)</span></a>';
-		$menu['all'] = sprintf( $format, $all_class, esc_url( add_query_arg( $all_args, admin_url( 'admin.php' ) ) ), __( 'All', 'woothemes-sensei' ), number_format( (int) $all_lessons_count ) );
-		$menu['ungraded'] = sprintf( $format, $ungraded_class, esc_url( add_query_arg( $ungraded_args, admin_url( 'admin.php' ) ) ), __( 'Ungraded', 'woothemes-sensei' ), number_format( (int) $ungraded_lessons_count ) );
-		$menu['graded'] = sprintf( $format, $graded_class, esc_url( add_query_arg( $graded_args, admin_url( 'admin.php' ) ) ), __( 'Graded', 'woothemes-sensei' ), number_format( (int) $graded_lessons_count ) );
-		$menu['in-progress'] = sprintf( $format, $inprogress_class, esc_url( add_query_arg( $inprogress_args, admin_url( 'admin.php' ) ) ), __( 'In Progress', 'woothemes-sensei' ), number_format( (int) $inprogress_lessons_count ) );
-
-		$menu = apply_filters( 'sensei_grading_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu['all'] = sprintf($format, $all_class, esc_url(add_query_arg($all_args, admin_url('admin.php'))), __('All', 'woothemes-sensei'), number_format((int) $all_lessons_count));
+		$menu['ungraded'] = sprintf($format, $ungraded_class, esc_url(add_query_arg($ungraded_args, admin_url('admin.php'))), __('Ungraded', 'woothemes-sensei'), number_format((int) $ungraded_lessons_count));
+		$menu['graded'] = sprintf($format, $graded_class, esc_url(add_query_arg($graded_args, admin_url('admin.php'))), __('Graded', 'woothemes-sensei'), number_format((int) $graded_lessons_count));
+		$menu['in-progress'] = sprintf($format, $inprogress_class, esc_url(add_query_arg($inprogress_args, admin_url('admin.php'))), __('In Progress', 'woothemes-sensei'), number_format((int) $inprogress_lessons_count));
+
+		$menu = apply_filters('sensei_grading_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 
 	} // End data_table_header()
@@ -451,4 +451,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Grading_Main extends Sensei_Grading_Main{}
+class WooThemes_Sensei_Grading_Main extends Sensei_Grading_Main {}