woothemes / sensei

includes/class-sensei.php

Doc Comments +3 added lines, -3 removed lines

@@ -403,7 +403,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;
@@ -642,7 +642,7 @@ 
      * @since  1.0.0
      * @param  int 			$course_id  (default: 0)
      * @param  array/Object $order_user (default: array()) Specific user's data.
-     * @return bool|int
+     * @return boolean|string
      */
     public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
         global $current_user;
@@ -1241,7 +1241,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 +1306 added lines, -1306 removed lines

@@ -14,1323 +14,1323 @@ 
  */
 class Sensei_Main {
 
-    /**
-     * @var string
-     * Reference to the main plugin file
-     */
-    private $file;
-
-    /**
-     * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
-     * @since 1.8.0
-     */
-    protected static $_instance = null;
-
-    /**
-     * Main reference to the plugins current version
-     */
-    public $version;
-
-    /**
-     * Public token, referencing for the text domain.
-     */
-    public $token = 'woothemes-sensei';
-
-    /**
-     * Plugin url and path for use when access resources.
-     */
-    public $plugin_url;
-    public $plugin_path;
-    public $template_url;
-
-    /**
-     * @var Sensei_PostTypes
-     * All Sensei sub classes. Currently used to access functionality contained within
-     * within Sensei sub classes e.g. Sensei()->course->all_courses()
-     */
-    public $post_types;
-
-    /**
-     * @var WooThemes_Sensei_Settings
-     */
-    public $settings;
-
-    /**
-     * @var WooThemes_Sensei_Course_Results
-     */
-    public $course_results;
-
-    /**
-     * @var Sensei_Updates
-     */
-    public $updates;
-    /**
-     * @var WooThemes_Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var WooThemes_Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var WooThemes_Sensei_Quiz
-     */
-    public $quiz;
-
-    /**
-     * @var WooThemes_Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var WooThemes_Sensei_Admin
-     */
-    public $admin;
-
-    /**
-     * @var WooThemes_Sensei_Frontend
-     */
-    public $frontend;
-
-    /**
-     * @var Sensei_Notices
-     */
-    public $notices;
-
-    /**
-     * @var WooThemes_Sensei_Grading
-     */
-    public $grading;
-
-    /**
-     * @var WooThemes_Sensei_Emails
-     */
-    public $emails;
-
-    /**
-     * @var WooThemes_Sensei_Learner_Profiles
-     */
-    public $learner_profiles;
-
-    /**
-     * @var Sensei_Teacher
-     */
-    public $teacher;
-
-    /**
-     * @var WooThemes_Sensei_Learners
-     */
-    public $learners;
-
-    /**
-     * @var array
-     * Global instance for access to the permissions message shown
-     * when users do not have the right privileges to access resources.
-     */
-    public $permissions_message;
-
-    /**
-     * @var Sensei_Core_Modules Sensei Modules functionality
-     */
-    public $modules;
-
-    /**
-     * @var Sensei_Analysis
-     */
-    public $analysis;
-
-    /**
-     * Constructor method.
-     * @param  string $file The base file of the plugin.
-     * @since  1.0.0
-     */
-    public function __construct ( $file ) {
-
-        // Setup object data
-        $this->file = $file;
-        $this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
-        $this->plugin_path = trailingslashit( dirname( $file ) );
-        $this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
-        $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();
-
-        // Run this on activation.
-        register_activation_hook( $this->file, array( $this, 'activation' ) );
-
-        // load the classes need throughout sensei
-        $this->initialize_global_objects();
-
-        // Image Sizes
-        $this->init_image_sizes();
-
-        // Force WooCommerce Required Settings
-        $this->set_woocommerce_functionality();
-
-        // load all hooks
-        $this->load_hooks();
-
-    } // End __construct()
-
-    /**
-     * Load the foundations of Sensei.
-     * @since 1.9.0
-     */
-    protected function init(){
-
-        // Localisation
-        $this->load_plugin_textdomain();
-        add_action( 'init', array( $this, 'load_localisation' ), 0 );
-
-        // load the shortcode loader into memory, so as to listen to all for
-        // all shortcodes on the front end
-        new Sensei_Shortcode_Loader();
-
-    }
+	/**
+	 * @var string
+	 * Reference to the main plugin file
+	 */
+	private $file;
+
+	/**
+	 * @var Sensei_Main $_instance to the the main and only instance of the Sensei class.
+	 * @since 1.8.0
+	 */
+	protected static $_instance = null;
+
+	/**
+	 * Main reference to the plugins current version
+	 */
+	public $version;
+
+	/**
+	 * Public token, referencing for the text domain.
+	 */
+	public $token = 'woothemes-sensei';
+
+	/**
+	 * Plugin url and path for use when access resources.
+	 */
+	public $plugin_url;
+	public $plugin_path;
+	public $template_url;
+
+	/**
+	 * @var Sensei_PostTypes
+	 * All Sensei sub classes. Currently used to access functionality contained within
+	 * within Sensei sub classes e.g. Sensei()->course->all_courses()
+	 */
+	public $post_types;
+
+	/**
+	 * @var WooThemes_Sensei_Settings
+	 */
+	public $settings;
+
+	/**
+	 * @var WooThemes_Sensei_Course_Results
+	 */
+	public $course_results;
+
+	/**
+	 * @var Sensei_Updates
+	 */
+	public $updates;
+	/**
+	 * @var WooThemes_Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var WooThemes_Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var WooThemes_Sensei_Quiz
+	 */
+	public $quiz;
+
+	/**
+	 * @var WooThemes_Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var WooThemes_Sensei_Admin
+	 */
+	public $admin;
+
+	/**
+	 * @var WooThemes_Sensei_Frontend
+	 */
+	public $frontend;
+
+	/**
+	 * @var Sensei_Notices
+	 */
+	public $notices;
+
+	/**
+	 * @var WooThemes_Sensei_Grading
+	 */
+	public $grading;
+
+	/**
+	 * @var WooThemes_Sensei_Emails
+	 */
+	public $emails;
+
+	/**
+	 * @var WooThemes_Sensei_Learner_Profiles
+	 */
+	public $learner_profiles;
+
+	/**
+	 * @var Sensei_Teacher
+	 */
+	public $teacher;
+
+	/**
+	 * @var WooThemes_Sensei_Learners
+	 */
+	public $learners;
+
+	/**
+	 * @var array
+	 * Global instance for access to the permissions message shown
+	 * when users do not have the right privileges to access resources.
+	 */
+	public $permissions_message;
+
+	/**
+	 * @var Sensei_Core_Modules Sensei Modules functionality
+	 */
+	public $modules;
+
+	/**
+	 * @var Sensei_Analysis
+	 */
+	public $analysis;
+
+	/**
+	 * Constructor method.
+	 * @param  string $file The base file of the plugin.
+	 * @since  1.0.0
+	 */
+	public function __construct ( $file ) {
+
+		// Setup object data
+		$this->file = $file;
+		$this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) );
+		$this->plugin_path = trailingslashit( dirname( $file ) );
+		$this->template_url	= apply_filters( 'sensei_template_url', 'sensei/' );
+		$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();
+
+		// Run this on activation.
+		register_activation_hook( $this->file, array( $this, 'activation' ) );
+
+		// load the classes need throughout sensei
+		$this->initialize_global_objects();
+
+		// Image Sizes
+		$this->init_image_sizes();
+
+		// Force WooCommerce Required Settings
+		$this->set_woocommerce_functionality();
+
+		// load all hooks
+		$this->load_hooks();
+
+	} // End __construct()
+
+	/**
+	 * Load the foundations of Sensei.
+	 * @since 1.9.0
+	 */
+	protected function init(){
+
+		// Localisation
+		$this->load_plugin_textdomain();
+		add_action( 'init', array( $this, 'load_localisation' ), 0 );
+
+		// load the shortcode loader into memory, so as to listen to all for
+		// all shortcodes on the front end
+		new Sensei_Shortcode_Loader();
+
+	}
 
-    /**
-     * Global Sensei Instance
-     *
-     * Ensure that only one instance of the main Sensei class can be loaded.
-     *
-     * @since 1.8.0
-     * @static
-     * @see WC()
-     * @return WooThemes_Sensei Instance.
-     */
-    public static function instance() {
+	/**
+	 * Global Sensei Instance
+	 *
+	 * Ensure that only one instance of the main Sensei class can be loaded.
+	 *
+	 * @since 1.8.0
+	 * @static
+	 * @see WC()
+	 * @return WooThemes_Sensei Instance.
+	 */
+	public static function instance() {
 
-        if ( is_null( self::$_instance ) ) {
+		if ( is_null( self::$_instance ) ) {
 
-            //Sensei requires a reference to the main Sensei plugin file
-            $sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
+			//Sensei requires a reference to the main Sensei plugin file
+			$sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php';
 
-            self::$_instance = new self( $sensei_main_plugin_file  );
+			self::$_instance = new self( $sensei_main_plugin_file  );
 
-        }
+		}
 
-        return self::$_instance;
+		return self::$_instance;
 
-    } // end instance()
+	} // end instance()
 
-    /**
-     * This function is linked into the activation
-     * hook to reset flush the urls to ensure Sensei post types show up.
-     *
-     * @since 1.9.0
-     *
-     * @param $plugin
-     */
-    public static function activation_flush_rules( $plugin ){
+	/**
+	 * This function is linked into the activation
+	 * hook to reset flush the urls to ensure Sensei post types show up.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $plugin
+	 */
+	public static function activation_flush_rules( $plugin ){
 
-        if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
+		if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){
 
-            flush_rewrite_rules(true);
+			flush_rewrite_rules(true);
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Cloning is forbidden.
-     * @since 1.8.0
-     */
-    public function __clone() {
-        _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '2.1' );
-    }
+	/**
+	 * 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' );
-    }
+	/**
+	 * Unserializing instances of this class is forbidden.
+	 * @since 1.8.0
+	 */
+	public function __wakeup() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '2.1' );
+	}
 
-    /**
-     * Load the properties for the main Sensei object
-     *
-     * @since 1.9.0
-     */
-    public function initialize_global_objects(){
+	/**
+	 * Load the properties for the main Sensei object
+	 *
+	 * @since 1.9.0
+	 */
+	public function initialize_global_objects(){
 
-        // Setup post types.
-        $this->post_types = new Sensei_PostTypes();
+		// Setup post types.
+		$this->post_types = new Sensei_PostTypes();
 
-        // Lad the updates class
-        $this->updates = new Sensei_Updates( $this );
+		// Lad the updates class
+		$this->updates = new Sensei_Updates( $this );
 
-        // Setup settings
-        $this->settings = new Sensei_Settings();
+		// Setup settings
+		$this->settings = new Sensei_Settings();
 
-        // Load Course Results Class
-        $this->course_results = new Sensei_Course_Results();
+		// Load Course Results Class
+		$this->course_results = new Sensei_Course_Results();
 
-        // Load the teacher role
-        $this->teacher = new Sensei_Teacher();
+		// Load the teacher role
+		$this->teacher = new Sensei_Teacher();
 
-        // Add the Course class
-        $this->course = $this->post_types->course;
+		// Add the Course class
+		$this->course = $this->post_types->course;
 
-        // Add the lesson class
-        $this->lesson = $this->post_types->lesson;
+		// Add the lesson class
+		$this->lesson = $this->post_types->lesson;
 
-        // Add the question class
-        $this->question = $this->post_types->question;
+		// Add the question class
+		$this->question = $this->post_types->question;
 
-        //Add the quiz class
-        $this->quiz = $this->post_types->quiz;
+		//Add the quiz class
+		$this->quiz = $this->post_types->quiz;
 
-        // load the modules class after all plugsin are loaded
-        add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
+		// load the modules class after all plugsin are loaded
+		add_action( 'plugins_loaded', array( $this, 'load_modules_class' ) );
 
-        // Load Learner Management Functionality
-        $this->learners = new Sensei_Learner_Management( $this->file );
+		// Load Learner Management Functionality
+		$this->learners = new Sensei_Learner_Management( $this->file );
 
-        // Differentiate between administration and frontend logic.
-        if ( is_admin() ) {
+		// Differentiate between administration and frontend logic.
+		if ( is_admin() ) {
 
-            // Load Admin Welcome class
-            new Sensei_Welcome();
+			// Load Admin Welcome class
+			new Sensei_Welcome();
 
-            // Load Admin Class
-            $this->admin = new Sensei_Admin( $this->file );
+			// Load Admin Class
+			$this->admin = new Sensei_Admin( $this->file );
 
-            // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $this->file );
+			// Load Analysis Reports
+			$this->analysis = new Sensei_Analysis( $this->file );
 
-        } else {
+		} else {
 
-            // Load Frontend Class
-            $this->frontend = new Sensei_Frontend();
+			// Load Frontend Class
+			$this->frontend = new Sensei_Frontend();
 
-            // Load notice Class
-            $this->notices = new Sensei_Notices();
+			// Load notice Class
+			$this->notices = new Sensei_Notices();
 
-        }
+		}
 
-        // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $this->file );
+		// Load Grading Functionality
+		$this->grading = new Sensei_Grading( $this->file );
 
-        // Load Email Class
-        $this->emails = new Sensei_Emails( $this->file );
+		// Load Email Class
+		$this->emails = new Sensei_Emails( $this->file );
 
-        // Load Learner Profiles Class
-        $this->learner_profiles = new Sensei_Learner_Profiles();
+		// Load Learner Profiles Class
+		$this->learner_profiles = new Sensei_Learner_Profiles();
 
-    }
+	}
 
-    /**
-     * Initialize all Sensei hooks
-     *
-     * @since 1.9.0
-     */
-    public function load_hooks(){
-
-        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 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 );
-
-        // Filter comment counts
-        add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 );
-
-        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 flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
-        add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
-
-    }
-
-    /**
-     * Run Sensei updates.
-     * @access  public
-     * @since   1.1.0
-     * @return  void
-     */
-    public function run_updates() {
-        // Run updates if administrator
-        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
-
-            $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-' . $key  . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
-            }
-        } // End For Loop
-
-        do_action( 'sensei_register_widgets' );
-
-    } // 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' );
-        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 bool|int
-     */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
-        global $current_user;
-
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
-
-        $data_update = false;
-
-        // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
-
-        // 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: '')
-     *
-     * @return bool
-     */
-    public function check_user_permissions ( $page = '' ) {
-        // 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 false;
-        }
-
-
-        // 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 bool
-     */
-    public function access_settings () {
-
-        if( sensei_all_access() ) return true;
-
-        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
-            if ( is_user_logged_in() ) {
-                return true;
-            } else {
-                return false;
-            } // End If Statement
-        } else {
-            return true;
-        } // End If Statement
-    } // End access_settings()
-
-    /**
-     * 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->get_user_id() );
-            $order_user['ID'] = $user->ID;
-            $order_user['user_login'] = $user->user_login;
-            $order_user['user_email'] = $user->user_email;
-            $order_user['user_url'] = $user->user_url;
-            // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
-                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->get_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(){ ?>
+	/**
+	 * Initialize all Sensei hooks
+	 *
+	 * @since 1.9.0
+	 */
+	public function load_hooks(){
+
+		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+		add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+
+		// 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 );
+
+		// 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 );
+
+		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 flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1
+		add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 );
+
+	}
+
+	/**
+	 * Run Sensei updates.
+	 * @access  public
+	 * @since   1.1.0
+	 * @return  void
+	 */
+	public function run_updates() {
+		// Run updates if administrator
+		if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) {
+
+			$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-' . $key  . '.php' ) ) {
+				require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
+				register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+			}
+		} // End For Loop
+
+		do_action( 'sensei_register_widgets' );
+
+	} // 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' );
+		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 bool|int
+	 */
+	public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+		global $current_user;
+
+		if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+
+		$data_update = false;
+
+		// Get the product ID
+		$wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+
+		// 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: '')
+	 *
+	 * @return bool
+	 */
+	public function check_user_permissions ( $page = '' ) {
+		// 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 false;
+		}
+
+
+		// 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 bool
+	 */
+	public function access_settings () {
+
+		if( sensei_all_access() ) return true;
+
+		if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) {
+			if ( is_user_logged_in() ) {
+				return true;
+			} else {
+				return false;
+			} // End If Statement
+		} else {
+			return true;
+		} // End If Statement
+	} // End access_settings()
+
+	/**
+	 * 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->get_user_id() );
+			$order_user['ID'] = $user->ID;
+			$order_user['user_login'] = $user->user_login;
+			$order_user['user_email'] = $user->user_email;
+			$order_user['user_url'] = $user->user_url;
+			// Run through each product ordered
+			if ( 0 < sizeof( $order->get_items() ) ) {
+				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->get_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>
@@ -1338,46 +1338,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 +305 added lines, -305 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
@@ -146,23 +146,23 @@ 
      * @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'));
 
         // load the classes need throughout sensei
         $this->initialize_global_objects();
@@ -182,11 +182,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
@@ -206,12 +206,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);
 
         }
 
@@ -227,9 +227,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);
 
@@ -242,7 +242,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');
     }
 
     /**
@@ -250,7 +250,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');
     }
 
     /**
@@ -258,13 +258,13 @@ 
      *
      * @since 1.9.0
      */
-    public function initialize_global_objects(){
+    public function initialize_global_objects() {
 
         // Setup post types.
         $this->post_types = new Sensei_PostTypes();
 
         // Lad the updates class
-        $this->updates = new Sensei_Updates( $this );
+        $this->updates = new Sensei_Updates($this);
 
         // Setup settings
         $this->settings = new Sensei_Settings();
@@ -288,22 +288,22 @@ 
         $this->quiz = $this->post_types->quiz;
 
         // load the modules class after all plugsin are loaded
-        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_Learner_Management( $this->file );
+        $this->learners = new Sensei_Learner_Management($this->file);
 
         // 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( $this->file );
+            $this->admin = new Sensei_Admin($this->file);
 
             // Load Analysis Reports
-            $this->analysis = new Sensei_Analysis( $this->file );
+            $this->analysis = new Sensei_Analysis($this->file);
 
         } else {
 
@@ -316,10 +316,10 @@ 
         }
 
         // Load Grading Functionality
-        $this->grading = new Sensei_Grading( $this->file );
+        $this->grading = new Sensei_Grading($this->file);
 
         // Load Email Class
-        $this->emails = new Sensei_Emails( $this->file );
+        $this->emails = new Sensei_Emails($this->file);
 
         // Load Learner Profiles Class
         $this->learner_profiles = new Sensei_Learner_Profiles();
@@ -331,40 +331,40 @@ 
      *
      * @since 1.9.0
      */
-    public function load_hooks(){
+    public function load_hooks() {
 
-        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-        add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) );
+        add_action('widgets_init', array($this, 'register_widgets'));
+        add_action('after_setup_theme', array($this, 'ensure_post_thumbnails_support'));
 
         // 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);
 
     }
 
@@ -376,7 +376,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();
 
@@ -393,10 +393,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()
 
@@ -405,14 +405,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',
@@ -423,9 +423,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;
                             }
@@ -445,17 +445,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
@@ -464,7 +464,7 @@ 
             } // End If Statement
 
             // virtual order, mark as completed
-            if ( $virtual_order ) {
+            if ($virtual_order) {
                 return 'completed';
             } // End If Statement
         } // End If Statement
@@ -477,21 +477,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-' . $key  . '.php' ) ) {
-                require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' );
-                register_widget( 'WooThemes_Sensei_' . $value . '_Widget' );
+        foreach ($widget_list as $key => $value) {
+            if (file_exists($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php')) {
+                require_once($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php');
+                register_widget('WooThemes_Sensei_'.$value.'_Widget');
             }
         } // End For Loop
 
-        do_action( 'sensei_register_widgets' );
+        do_action('sensei_register_widgets');
 
     } // End register_widgets()
 
@@ -501,8 +501,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()
 
     /**
@@ -511,12 +511,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()
 
     /**
@@ -525,7 +525,7 @@ 
      * @since  1.0.0
      * @return void
      */
-    public function activation () {
+    public function activation() {
         $this->register_plugin_version();
     } // End activation()
 
@@ -536,9 +536,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()
 
 
@@ -548,9 +548,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()
 
     /**
@@ -559,8 +559,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 );
@@ -570,7 +570,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()
 
@@ -580,8 +580,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()
 
 
@@ -593,10 +593,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' );
-        Sensei_Templates::template_loader( $template );
+        _deprecated_function('Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead');
+        Sensei_Templates::template_loader($template);
 
     } // End template_loader()
 
@@ -606,15 +606,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__);
 
         }
 
@@ -630,9 +630,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()
 
 
@@ -644,18 +644,18 @@ 
      * @param  array/Object $order_user (default: array()) Specific user's data.
      * @return bool|int
      */
-    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
+    public function woocommerce_course_update($course_id = 0, $order_user = array()) {
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+        if ( ! isset($current_user) || ! $current_user->ID > 0) return false;
 
         $data_update = false;
 
         // Get the product ID
-        $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true );
+        $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true);
 
         // Check if in the admin
-        if ( is_admin() ) {
+        if (is_admin()) {
             $user_login = $order_user['user_login'];
             $user_email = $order_user['user_email'];
             $user_url = $order_user['user_url'];
@@ -668,25 +668,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
@@ -704,14 +704,14 @@ 
      *
      * @return bool
      */
-    public function check_user_permissions ( $page = '' ) {
+    public function check_user_permissions($page = '') {
         // 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 false;
         }
 
@@ -721,104 +721,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:
@@ -840,14 +840,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()
 
 
@@ -857,12 +857,12 @@ 
      * @access public
      * @return bool
      */
-    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;
@@ -879,38 +879,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->get_user_id() );
+            $order = new WC_Order($order_id);
+            $user = get_user_by('id', $order->get_user_id());
             $order_user['ID'] = $user->ID;
             $order_user['user_login'] = $user->user_login;
             $order_user['user_email'] = $user->user_email;
             $order_user['user_url'] = $user->user_url;
             // Run through each product ordered
-            if ( 0 < sizeof( $order->get_items() ) ) {
-                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()
 
@@ -921,36 +921,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
@@ -964,9 +964,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']);
     }
 
     /**
@@ -977,18 +977,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->get_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->get_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
 
@@ -1003,30 +1003,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
 
@@ -1044,9 +1044,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()
 
@@ -1057,17 +1057,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'];
@@ -1075,15 +1075,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
@@ -1097,12 +1097,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;
         }
 
@@ -1110,14 +1110,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';
@@ -1126,9 +1126,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(
@@ -1143,16 +1143,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>';
                         }
                     }
                 }
@@ -1168,44 +1168,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;
         }
 
@@ -1223,15 +1223,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']);
     }
 
     /**
@@ -1244,37 +1244,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;
@@ -1287,9 +1287,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');
         }
     }
 
@@ -1301,21 +1301,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);
         }
     }
 
@@ -1324,12 +1324,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).
@@ -1347,18 +1347,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');
@@ -1373,7 +1373,7 @@ 
      *
      * @since 1.9.0
      */
-    public function initiate_rewrite_rules_flush(){
+    public function initiate_rewrite_rules_flush() {
 
         update_option('sensei_flush_rewrite_rules', '1');
 
@@ -1386,4 +1386,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class Woothemes_Sensei extends Sensei_Main{ }
+class Woothemes_Sensei extends Sensei_Main { }

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
@@ -159,7 +162,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' ) );
@@ -447,7 +452,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;
 
@@ -612,7 +619,7 @@ 
 
             $sensei_plugin_path =  $this->plugin_path;
 
-        }else{
+        } else{
 
             $sensei_plugin_path = plugin_dir_path( __FILE__ );
 
@@ -647,7 +654,9 @@ 
     public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) {
         global $current_user;
 
-        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false;
+        if ( ! isset( $current_user ) || !$current_user->ID > 0 ) {
+        	return false;
+        }
 
         $data_update = false;
 
@@ -731,8 +740,7 @@ 
 
                     $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID );
 
-                }
-                else {
+                } else {
                     $prerequisite_complete = true;
                 } // End If Statement
                 // Handles restrictions
@@ -859,7 +867,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() ) {
@@ -1188,8 +1198,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 );
 
@@ -1197,16 +1208,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;
@@ -1247,8 +1261,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;
@@ -1311,7 +1326,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;
@@ -1358,7 +1373,7 @@ 
 
             update_option('sensei_flush_rewrite_rules', '2');
 
-        }elseif( '2' == $option ) {
+        } elseif( '2' == $option ) {
 
             flush_rewrite_rules();
             update_option('sensei_flush_rewrite_rules', '0');

includes/class-sensei-course-results.php

Indentation +50 added lines, -50 removed lines

@@ -14,10 +14,10 @@ 
  */
 class Sensei_Course_Results {
 
-    /**
-     * @var string
-     */
-    public  $courses_url_base;
+	/**
+	 * @var string
+	 */
+	public  $courses_url_base;
 
 	/**
 	 * Constructor.
@@ -98,7 +98,7 @@ 
 		global $wp_query,  $current_user;
 
 		if( isset( $wp_query->query_vars['course_results'] ) ) {
-            Sensei_Templates::get_template( 'course-results/course-info.php' );
+			Sensei_Templates::get_template( 'course-results/course-info.php' );
 		}
 
 	}
@@ -117,20 +117,20 @@ 
 
 		sensei_do_deprecated_action( 'sensei_course_results_lessons','1.9.','sensei_course_results_content_inside_after', $course );
 
-        sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID );
+		sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID );
 
 	}
 
 	/**
 	 * Load template for displaying course lessons
-     *
+	 *
 	 * @since  1.4.0
 	 * @return void
 	 */
 	public function course_lessons() {
 
 		global $course;
-        _deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' );
+		_deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' );
 
 	}
 
@@ -147,62 +147,62 @@ 
 		return $classes;
 	}
 
-    /**
-     * Deprecate the sensei_course_results_content hook
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_course_results_content_hook(){
+	/**
+	 * Deprecate the sensei_course_results_content hook
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_course_results_content_hook(){
 
-        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before');
+		sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before');
 
-    }
+	}
 
-    /**
-     * Fire the sensei frontend message hook
-     *
-     * @since 1.9.0
-     */
-    public static function fire_sensei_message_hook(){
+	/**
+	 * Fire the sensei frontend message hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function fire_sensei_message_hook(){
 
-        do_action( 'sensei_frontend_messages' );
+		do_action( 'sensei_frontend_messages' );
 
-    }
+	}
 
-    /**
-     * Deprecate the course_results info hook
-     *
-     * @since 1.9.0
-     */
-    public static function deprecate_course_result_info_hook(){
+	/**
+	 * Deprecate the course_results info hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function deprecate_course_result_info_hook(){
 
-        sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' );
 
-    }
+	}
 
-    /**
-     * Deprecate the sensei_course_results_top hook
-     *
-     * @deprecate since 1.9.0
-     */
-    public static function deprecate_course_results_top_hook(){
+	/**
+	 * Deprecate the sensei_course_results_top hook
+	 *
+	 * @deprecate since 1.9.0
+	 */
+	public static function deprecate_course_results_top_hook(){
 
-        global $course;
-        sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID );
+		global $course;
+		sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID );
 
-    }
+	}
 
-    /**
-     * Fire the course image hook
-     *
-     * @since 1.8.0
-     */
-    public static function fire_course_image_hook(){
+	/**
+	 * Fire the course image hook
+	 *
+	 * @since 1.8.0
+	 */
+	public static function fire_course_image_hook(){
 
-        global $course;
-        do_action( 'sensei_course_image', $course->ID );
+		global $course;
+		do_action( 'sensei_course_image', $course->ID );
 
-    }
+	}
 
 } // End Class
 

includes/class-sensei-frontend.php

Spacing +451 added lines, -451 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Frontend Class
@@ -21,78 +21,78 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Template output actions
-		add_action( 'sensei_before_main_content', array( $this, 'sensei_output_content_wrapper' ), 10 );
-		add_action( 'sensei_after_main_content', array( $this, 'sensei_output_content_wrapper_end' ), 10 );
-		add_action( 'sensei_lesson_archive_lesson_title', array( $this, 'sensei_lesson_archive_lesson_title' ), 10 );
+		add_action('sensei_before_main_content', array($this, 'sensei_output_content_wrapper'), 10);
+		add_action('sensei_after_main_content', array($this, 'sensei_output_content_wrapper_end'), 10);
+		add_action('sensei_lesson_archive_lesson_title', array($this, 'sensei_lesson_archive_lesson_title'), 10);
 
 		// 1.2.1
-		add_action( 'sensei_complete_lesson', array( $this, 'sensei_complete_lesson' ) );
-		add_action( 'init', array( $this, 'sensei_complete_course' ), 5 );
-		add_action( 'sensei_frontend_messages', array( $this, 'sensei_frontend_messages' ) );
-		add_action( 'sensei_lesson_video', array( $this, 'sensei_lesson_video' ), 10, 1 );
-		add_action( 'sensei_complete_lesson_button', array( $this, 'sensei_complete_lesson_button' ) );
-		add_action( 'sensei_reset_lesson_button', array( $this, 'sensei_reset_lesson_button' ) );
+		add_action('sensei_complete_lesson', array($this, 'sensei_complete_lesson'));
+		add_action('init', array($this, 'sensei_complete_course'), 5);
+		add_action('sensei_frontend_messages', array($this, 'sensei_frontend_messages'));
+		add_action('sensei_lesson_video', array($this, 'sensei_lesson_video'), 10, 1);
+		add_action('sensei_complete_lesson_button', array($this, 'sensei_complete_lesson_button'));
+		add_action('sensei_reset_lesson_button', array($this, 'sensei_reset_lesson_button'));
 
-		add_action( 'sensei_course_archive_meta', array( $this, 'sensei_course_archive_meta' ) );
+		add_action('sensei_course_archive_meta', array($this, 'sensei_course_archive_meta'));
 
-		add_action( 'sensei_lesson_tag_main_content', array( $this, 'sensei_lesson_archive_main_content' ), 10 );
-		add_action( 'sensei_no_permissions_main_content', array( $this, 'sensei_no_permissions_main_content' ), 10 );
+		add_action('sensei_lesson_tag_main_content', array($this, 'sensei_lesson_archive_main_content'), 10);
+		add_action('sensei_no_permissions_main_content', array($this, 'sensei_no_permissions_main_content'), 10);
 
-		add_action( 'sensei_lesson_meta', array( $this, 'sensei_lesson_meta' ), 10 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'sensei_course_start' ), 10 );
+		add_action('sensei_lesson_meta', array($this, 'sensei_lesson_meta'), 10);
+		add_action('sensei_single_course_content_inside_before', array($this, 'sensei_course_start'), 10);
 
 		// add_filter( 'get_comments_number', array( $this, 'sensei_lesson_comment_count' ), 1 );
-		add_filter( 'the_title', array( $this, 'sensei_lesson_preview_title' ), 10, 2 );
+		add_filter('the_title', array($this, 'sensei_lesson_preview_title'), 10, 2);
 
 		//1.6.2
-		add_filter( 'wp_login_failed', array( $this, 'sensei_login_fail_redirect' ), 10 );
-		add_filter( 'init', array( $this, 'sensei_handle_login_request' ), 10 );
+		add_filter('wp_login_failed', array($this, 'sensei_login_fail_redirect'), 10);
+		add_filter('init', array($this, 'sensei_handle_login_request'), 10);
 		//1.6.3
-		add_action( 'init', array( $this, 'sensei_process_registration' ), 2 );
+		add_action('init', array($this, 'sensei_process_registration'), 2);
 		//1.7.0
-		add_action( 'sensei_pagination', array( $this, 'sensei_breadcrumb' ), 80, 1 );
+		add_action('sensei_pagination', array($this, 'sensei_breadcrumb'), 80, 1);
 
 		// Fix pagination for course archive pages when filtering by course type
-		add_filter( 'pre_get_posts', array( $this, 'sensei_course_archive_pagination' ) );
+		add_filter('pre_get_posts', array($this, 'sensei_course_archive_pagination'));
 
 		// Scripts and Styles
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Custom Menu Item filters
-		add_filter( 'wp_setup_nav_menu_item', array( $this, 'sensei_setup_nav_menu_item' ) );
-		add_filter( 'wp_nav_menu_objects', array( $this, 'sensei_wp_nav_menu_objects' ) );
+		add_filter('wp_setup_nav_menu_item', array($this, 'sensei_setup_nav_menu_item'));
+		add_filter('wp_nav_menu_objects', array($this, 'sensei_wp_nav_menu_objects'));
 		// Search Results filters
-		add_filter( 'post_class', array( $this, 'sensei_search_results_classes' ), 10 );
+		add_filter('post_class', array($this, 'sensei_search_results_classes'), 10);
 		// Only show course & lesson excerpts in search results
-		add_filter( 'the_content', array( $this, 'sensei_search_results_excerpt' ) );
+		add_filter('the_content', array($this, 'sensei_search_results_excerpt'));
 
         //Use WooCommerce filter to show admin bar to Teachers.
-        add_action( 'init', array( $this, 'sensei_show_admin_bar') );
+        add_action('init', array($this, 'sensei_show_admin_bar'));
 
         // Remove course from active courses if an order is cancelled or refunded
-		add_action( 'woocommerce_order_status_processing_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_processing_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_completed_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'remove_active_course' ), 10, 1 );
+		add_action('woocommerce_order_status_processing_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_processing_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_completed_to_refunded', array($this, 'remove_active_course'), 10, 1);
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'remove_active_course'), 10, 1);
 
 		// Make sure correct courses are marked as active for users
-		add_action( 'sensei_before_my_courses', array( $this, 'activate_purchased_courses' ), 10, 1 );
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'activate_purchased_single_course' ), 10 );
+		add_action('sensei_before_my_courses', array($this, 'activate_purchased_courses'), 10, 1);
+		add_action('sensei_single_course_content_inside_before', array($this, 'activate_purchased_single_course'), 10);
 
 		// Lesson tags
-		add_action( 'sensei_lesson_meta_extra', array( $this, 'lesson_tags_display' ), 10, 1 );
-		add_action( 'pre_get_posts', array( $this, 'lesson_tag_archive_filter' ), 10, 1 );
-		add_filter( 'sensei_lessons_archive_text', array( $this, 'lesson_tag_archive_header' ) );
-		add_action( 'sensei_loop_lesson_inside_before', array( $this, 'lesson_tag_archive_description' ), 11 );
+		add_action('sensei_lesson_meta_extra', array($this, 'lesson_tags_display'), 10, 1);
+		add_action('pre_get_posts', array($this, 'lesson_tag_archive_filter'), 10, 1);
+		add_filter('sensei_lessons_archive_text', array($this, 'lesson_tag_archive_header'));
+		add_action('sensei_loop_lesson_inside_before', array($this, 'lesson_tag_archive_description'), 11);
 
 		// Hide Sensei activity comments from lesson and course pages
-		add_filter( 'wp_list_comments_args', array( $this, 'hide_sensei_activity' ) );
+		add_filter('wp_list_comments_args', array($this, 'hide_sensei_activity'));
 	} // End __construct()
 
 	/**
@@ -102,11 +102,11 @@ 
 	 * @since  1.7.3
 	 * @return array|mixed
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( 'lesson' == $key || 'course' == $key ) {
-			if ( WP_DEBUG ) {
-				trigger_error( sprintf( 'Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3' ) );
+		if ('lesson' == $key || 'course' == $key) {
+			if (WP_DEBUG) {
+				trigger_error(sprintf('Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3'));
 			}
 			return Sensei()->$key;
 		}
@@ -119,32 +119,32 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_scripts () {
+	public function enqueue_scripts() {
 
 		$disable_js = false;
-		if ( isset( Sensei()->settings->settings[ 'js_disable' ] ) ) {
-			$disable_js = Sensei()->settings->settings[ 'js_disable' ];
+		if (isset(Sensei()->settings->settings['js_disable'])) {
+			$disable_js = Sensei()->settings->settings['js_disable'];
 		} // End If Statement
-		if ( ! $disable_js ) {
+		if ( ! $disable_js) {
 
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+			$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 			// My Courses tabs script
-			wp_register_script( Sensei()->token . '-user-dashboard', esc_url( Sensei()->plugin_url . 'assets/js/user-dashboard' . $suffix . '.js' ), array( 'jquery-ui-tabs' ), Sensei()->version, true );
-			wp_enqueue_script( Sensei()->token . '-user-dashboard' );
+			wp_register_script(Sensei()->token.'-user-dashboard', esc_url(Sensei()->plugin_url.'assets/js/user-dashboard'.$suffix.'.js'), array('jquery-ui-tabs'), Sensei()->version, true);
+			wp_enqueue_script(Sensei()->token.'-user-dashboard');
 
 
             // Course Archive javascript
-            if( is_post_type_archive( 'course' ) ){
+            if (is_post_type_archive('course')) {
 
-                wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true );
-                wp_enqueue_script( 'sensei-course-archive-js' );
+                wp_register_script('sensei-course-archive-js', esc_url(Sensei()->plugin_url.'assets/js/frontend/course-archive'.$suffix.'.js'), array('jquery'), '1', true);
+                wp_enqueue_script('sensei-course-archive-js');
 
             }
 
 
 			// Allow additional scripts to be loaded
-			do_action( 'sensei_additional_scripts' );
+			do_action('sensei_additional_scripts');
 
 		} // End If Statement
 
@@ -155,24 +155,24 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
 
 		$disable_styles = false;
-		if ( isset( Sensei()->settings->settings[ 'styles_disable' ] ) ) {
-			$disable_styles = Sensei()->settings->settings[ 'styles_disable' ];
+		if (isset(Sensei()->settings->settings['styles_disable'])) {
+			$disable_styles = Sensei()->settings->settings['styles_disable'];
 		} // End If Statement
 
 		// Add filter for theme overrides
-		$disable_styles = apply_filters( 'sensei_disable_styles', $disable_styles );
+		$disable_styles = apply_filters('sensei_disable_styles', $disable_styles);
 
-		if ( ! $disable_styles ) {
+		if ( ! $disable_styles) {
 
-			wp_register_style( Sensei()->token . '-frontend', Sensei()->plugin_url . 'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( Sensei()->token . '-frontend' );
+			wp_register_style(Sensei()->token.'-frontend', Sensei()->plugin_url.'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style(Sensei()->token.'-frontend');
 
 			// Allow additional stylesheets to be loaded
-			do_action( 'sensei_additional_styles' );
+			do_action('sensei_additional_styles');
 
 		} // End If Statement
 
@@ -188,10 +188,10 @@ 
 	 * @param string $name (default: '')
 	 * @return void
 	 */
-	function sensei_get_template_part( $slug, $name = '' ) {
+	function sensei_get_template_part($slug, $name = '') {
 
-        _deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' );
-        Sensei_Templates::get_part( $slug, $name );
+        _deprecated_function('class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part');
+        Sensei_Templates::get_part($slug, $name);
 
 	} // End sensei_get_template_part()
 
@@ -206,10 +206,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
+	function sensei_get_template($template_name, $args = array(), $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' );
-        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path  );
+        _deprecated_function('sensei_get_template', '1.9.0', 'Sensei_Templates::get_template');
+        Sensei_Templates::get_template($template_name, $args, $template_path, $default_path);
 
 	} // End sensei_get_template()
 
@@ -223,10 +223,10 @@ 
 	 * @param string $default_path (default: '')
 	 * @return void
 	 */
-	function sensei_locate_template( $template_name, $template_path = '', $default_path = '' ) {
+	function sensei_locate_template($template_name, $template_path = '', $default_path = '') {
 
-        _deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' );
-        Sensei_Templates::locate_template( $template_name, $template_path, $default_path );
+        _deprecated_function('sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template');
+        Sensei_Templates::locate_template($template_name, $template_path, $default_path);
 
 	} // End sensei_locate_template()
 
@@ -240,20 +240,20 @@ 
 	function sensei_output_content_wrapper() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-start.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-start.php',
             'wrappers/wrapper-start.php'
         );
 
-        $template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $template ) ){
+        $template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-start.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-start.php');
             return;
 
         }
 
-		Sensei_Templates::get_template( 'globals/wrapper-start.php' );
+		Sensei_Templates::get_template('globals/wrapper-start.php');
 
 	} // End sensei_output_content_wrapper()
 
@@ -267,21 +267,21 @@ 
 	function sensei_output_content_wrapper_end() {
 
 	    // backwards compatibility check for old location under the wrappers directory of the active theme
-        $backwards_compatible_wrapper_location =   array(
-            Sensei()->template_url . 'wrappers/wrapper-end.php',
+        $backwards_compatible_wrapper_location = array(
+            Sensei()->template_url.'wrappers/wrapper-end.php',
             'wrappers/wrapper-end.php'
         );
 
-        $backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location );
-        if( !empty( $backwards_compatible_template ) ){
+        $backwards_compatible_template = locate_template($backwards_compatible_wrapper_location);
+        if ( ! empty($backwards_compatible_template)) {
 
-            Sensei_Templates::get_template( 'wrappers/wrapper-end.php' );
+            Sensei_Templates::get_template('wrappers/wrapper-end.php');
             return;
 
         }
 
 
-		Sensei_Templates::get_template( 'globals/wrapper-end.php' );
+		Sensei_Templates::get_template('globals/wrapper-end.php');
 
 	} // End sensei_output_content_wrapper_end()
 
@@ -294,57 +294,57 @@ 
 	 */
 	public static function load_content_pagination() {
 
-        if( is_singular('course') ) {
+        if (is_singular('course')) {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-posts.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-posts.php' );
+                Sensei_Templates::get_template('wrappers/pagination-posts.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-posts.php' );
+			Sensei_Templates::get_template('globals/pagination-posts.php');
 
-		} elseif( is_singular('lesson') ) {
+		} elseif (is_singular('lesson')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-lesson.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' );
+                Sensei_Templates::get_template('wrappers/pagination-lesson.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-lesson.php' );
+			Sensei_Templates::get_template('globals/pagination-lesson.php');
 
-		} elseif( is_singular('quiz') ) {
+		} elseif (is_singular('quiz')) {
 
 		    // backwards compatibility check for old location under the wrappers directory of the active theme
-		    $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) );
-            if( !empty( $template ) ){
+		    $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-quiz.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' );
+                Sensei_Templates::get_template('wrappers/pagination-quiz.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination-quiz.php' );
+			Sensei_Templates::get_template('globals/pagination-quiz.php');
 
 		} else {
 
             // backwards compatibility check for old location under the wrappers directory of the active theme
-            $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) );
-            if( !empty( $template ) ){
+            $template = locate_template(array(Sensei()->template_url.'wrappers/pagination.php'));
+            if ( ! empty($template)) {
 
-                Sensei_Templates::get_template( 'wrappers/pagination.php' );
+                Sensei_Templates::get_template('wrappers/pagination.php');
                 return;
 
             }
 
-			Sensei_Templates::get_template( 'globals/pagination.php' );
+			Sensei_Templates::get_template('globals/pagination.php');
 
 		} // End If Statement
 
@@ -370,21 +370,21 @@ 
 	 * @param object $item
 	 * @return object $item
 	 */
-	public function sensei_setup_nav_menu_item( $item ) {
+	public function sensei_setup_nav_menu_item($item) {
 		global $pagenow, $wp_rewrite;
 
-		if( 'nav-menus.php' != $pagenow && !defined('DOING_AJAX') && isset( $item->url ) && 'custom' == $item->type ) {
+		if ('nav-menus.php' != $pagenow && ! defined('DOING_AJAX') && isset($item->url) && 'custom' == $item->type) {
 
 			// Set up Sensei menu links
-			$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-			$my_account_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+			$course_page_id = intval(Sensei()->settings->settings['course_page']);
+			$my_account_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
 			$course_page_url = Sensei_Course::get_courses_page_url();
-			$lesson_archive_url = get_post_type_archive_link( 'lesson' );
-			$my_courses_url = get_permalink( $my_account_page_id );
-			$my_messages_url = get_post_type_archive_link( 'sensei_message' );
+			$lesson_archive_url = get_post_type_archive_link('lesson');
+			$my_courses_url = get_permalink($my_account_page_id);
+			$my_messages_url = get_post_type_archive_link('sensei_message');
 
-			switch ( $item->url ) {
+			switch ($item->url) {
 				case '#senseicourses':
 					$item->url = $course_page_url;
 					break;
@@ -401,7 +401,7 @@ 
 					$item->url = $my_messages_url;
                     // if no archive link exist for sensei_message
                     // set it back to the place holder
-                    if( ! $item->url ){
+                    if ( ! $item->url) {
 
                         $item->url = '#senseimymessages';
 
@@ -409,21 +409,21 @@ 
 					break;
 
 				case '#senseilearnerprofile':
-					$item->url = esc_url( Sensei()->learner_profiles->get_permalink() );
+					$item->url = esc_url(Sensei()->learner_profiles->get_permalink());
 					break;
 
 				case '#senseiloginlogout':
-						$logout_url = wp_logout_url( home_url() );
+						$logout_url = wp_logout_url(home_url());
 						// Login link links to the My Courses page, to avoid the WP dashboard.
 						$login_url = $my_courses_url;
 
-						$item->url = ( is_user_logged_in() ? $logout_url : $login_url );
+						$item->url = (is_user_logged_in() ? $logout_url : $login_url);
 
 						// determine the menu title login or logout
-						if ( is_user_logged_in() ) {
-							$menu_title =  __( 'Logout'  ,'woothemes-sensei');
+						if (is_user_logged_in()) {
+							$menu_title = __('Logout', 'woothemes-sensei');
 						} else {
-							$menu_title =  __( 'Login'  ,'woothemes-sensei');
+							$menu_title = __('Login', 'woothemes-sensei');
 						}
 
 						/**
@@ -433,7 +433,7 @@ 
 						 *
 						 * @param $menu_title
 						 */
-						$item->title = apply_filters( 'sensei_login_logout_menu_title', $menu_title );
+						$item->title = apply_filters('sensei_login_logout_menu_title', $menu_title);
 
 					break;
 
@@ -441,12 +441,12 @@ 
 					break;
 			}
 
-			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
-			$item_url = untrailingslashit( $item->url );
-			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
+			$_root_relative_current = untrailingslashit($_SERVER['REQUEST_URI']);
+			$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_root_relative_current);
+			$item_url = untrailingslashit($item->url);
+			$_indexless_current = untrailingslashit(preg_replace('/'.preg_quote($wp_rewrite->index, '/').'$/', '', $current_url));
 			// Highlight current menu item
-			if ( $item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+			if ($item_url && in_array($item_url, array($current_url, $_indexless_current, $_root_relative_current))) {
 				$item->classes[] = 'current-menu-item current_page_item';
 			}
 
@@ -465,26 +465,26 @@ 
 	 * @param object $sorted_menu_items
 	 * @return object $sorted_menu_items
 	 */
-	public function sensei_wp_nav_menu_objects( $sorted_menu_items ) {
+	public function sensei_wp_nav_menu_objects($sorted_menu_items) {
 
-		foreach( $sorted_menu_items as $k=>$item ) {
+		foreach ($sorted_menu_items as $k=>$item) {
 
 			// Remove the My Messages link for logged out users or if Private Messages are disabled
-			if( ! get_post_type_archive_link( 'sensei_message' )
-                && '#senseimymessages' == $item->url ) {
+			if ( ! get_post_type_archive_link('sensei_message')
+                && '#senseimymessages' == $item->url) {
 
-				if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) {
+				if ( ! is_user_logged_in() || (isset(Sensei()->settings->settings['messages_disable']) && Sensei()->settings->settings['messages_disable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
 			// Remove the My Profile link for logged out users.
-			if( Sensei()->learner_profiles->get_permalink() == $item->url ) {
+			if (Sensei()->learner_profiles->get_permalink() == $item->url) {
 
-				if ( !is_user_logged_in() || ! ( isset( Sensei()->settings->settings[ 'learner_profile_enable' ] ) && Sensei()->settings->settings[ 'learner_profile_enable' ] ) ) {
+				if ( ! is_user_logged_in() || ! (isset(Sensei()->settings->settings['learner_profile_enable']) && Sensei()->settings->settings['learner_profile_enable'])) {
 
-					unset( $sorted_menu_items[$k] );
+					unset($sorted_menu_items[$k]);
 
 				}
 			}
@@ -496,7 +496,7 @@ 
 	function sensei_search_results_classes($classes) {
 	    global $post;
 	    // Handle Search Classes for Courses, Lessons, and WC Products
-	    if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) {
+	    if (isset($post->post_type) && (('course' == $post->post_type) || ('lesson' == $post->post_type) || ('product' == $post->post_type))) {
 	    	$classes[] = 'post';
 		} // End If Statement
 	    return $classes;
@@ -524,18 +524,18 @@ 
      * @param bool|false $return
      * @return string|void
 	 */
-	function sensei_course_image( $course_id, $width = '100', $height = '100', $return = false ) {
+	function sensei_course_image($course_id, $width = '100', $height = '100', $return = false) {
 
-        trigger_error( 'Sensei Deprecated function: sensei_course_image since 1.9.0 . Please use Sensei()->course->course_image instead.');
+        trigger_error('Sensei Deprecated function: sensei_course_image since 1.9.0 . Please use Sensei()->course->course_image instead.');
 
-    	if ( ! $return ) {
+    	if ( ! $return) {
 
-			echo Sensei()->course->course_image( $course_id, $width, $height );
+			echo Sensei()->course->course_image($course_id, $width, $height);
             return '';
 
 		} // End If Statement
 
-		return Sensei()->course->course_image( $course_id, $width, $height );
+		return Sensei()->course->course_image($course_id, $width, $height);
 
 	} // End sensei_course_image()
 
@@ -550,15 +550,15 @@ 
      * @param bool|false $widget
      * @return string
 	 */
-	function sensei_lesson_image( $lesson_id, $width = '100', $height = '100', $return = false, $widget = false ) {
+	function sensei_lesson_image($lesson_id, $width = '100', $height = '100', $return = false, $widget = false) {
 
-        if( ! $return ){
+        if ( ! $return) {
 
-            echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+            echo Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
             return '';
         }
 
-        return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget );
+        return Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget);
 
 	} // End sensei_lesson_image()
 
@@ -566,20 +566,20 @@ 
      * @since 1.0.0
      * @param WP_Query $query
      */
-    function sensei_course_archive_pagination( $query ) {
+    function sensei_course_archive_pagination($query) {
 
-		if( ! is_admin() && $query->is_main_query() && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'newcourses', 'featuredcourses', 'freecourses', 'paidcourses' ) ) ) {
+		if ( ! is_admin() && $query->is_main_query() && isset($_GET['action']) && in_array($_GET['action'], array('newcourses', 'featuredcourses', 'freecourses', 'paidcourses'))) {
 
 			$amount = 0;
-			if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
-				$amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+			if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
+				$amount = absint(Sensei()->settings->settings['course_archive_amount']);
 			}
 
-			if( $amount ) {
-				$query->set( 'posts_per_page', $amount );
+			if ($amount) {
+				$query->set('posts_per_page', $amount);
 			}
 
-			$query->set( 'orderby', 'menu_order date' );
+			$query->set('orderby', 'menu_order date');
 
 		}
 	}
@@ -595,7 +595,7 @@ 
 	function sensei_course_archive_header(  ) {
 
         trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header ');
-        WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' );
+        WooThemes_Sensei_Course::archive_header('', '<header class="archive-header"><h1>', '</h1></header>');
 
 	} // sensei_course_archive_header()
 
@@ -608,15 +608,15 @@ 
 	 * @return void
 	 */
 	public function sensei_lesson_archive_header( ) {
-        _deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' );
+        _deprecated_function('WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header');
         Sensei()->lesson->the_archive_header();
 	} // sensei_course_archive_header()
 
     /**
      * @deprecated since 1.9.0
      */
-	public function sensei_message_archive_header( ){
-        _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense');
+	public function sensei_message_archive_header( ) {
+        _deprecated_function('Sensei_Frontend::sensei_message_archive_header', 'Please use: Sense');
         Sensei_Messages::the_archive_header();
 	} // sensei_message_archive_header()
 
@@ -626,15 +626,15 @@ 
      * @param WP_Post $post_item
 	 * @return void
 	 */
-	function sensei_course_archive_course_title( $post_item ) {
-		if ( isset( $post_item->ID ) && ( 0 < $post_item->ID ) ) {
-			$post_id = absint( $post_item->ID );
+	function sensei_course_archive_course_title($post_item) {
+		if (isset($post_item->ID) && (0 < $post_item->ID)) {
+			$post_id = absint($post_item->ID);
     		$post_title = $post_item->post_title;
 		} else {
 			$post_id = get_the_ID();
     		$post_title = get_the_title();
 		} // End If Statement
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_course_archive_course_title()
 
 	/**
@@ -645,7 +645,7 @@ 
 	public function sensei_lesson_archive_lesson_title() {
 		$post_id = get_the_ID();
     	$post_title = get_the_title();
-		?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php
+		?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php
 	} // End sensei_lesson_archive_lesson_title()
 
 	/**
@@ -654,40 +654,40 @@ 
 	 * @param  integer $id course, lesson or quiz id
 	 * @return void
 	 */
-	public function sensei_breadcrumb( $id = 0 ) {
+	public function sensei_breadcrumb($id = 0) {
 
 		// Only output on lesson, quiz and taxonomy (module) pages
-		if( ! ( is_tax( 'module' ) || is_singular( 'lesson' ) || is_singular( 'quiz' ) ) ) return;
+		if ( ! (is_tax('module') || is_singular('lesson') || is_singular('quiz'))) return;
 
-		if( empty( $id )  ){
+		if (empty($id)) {
 
             $id = get_the_ID();
 
         }
 
-		$sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' );
-		$separator = apply_filters( 'sensei_breadcrumb_separator', '&gt;' );
+		$sensei_breadcrumb_prefix = __('Back to: ', 'woothemes-sensei');
+		$separator = apply_filters('sensei_breadcrumb_separator', '&gt;');
 
-		$html = '<section class="sensei-breadcrumb">' . $sensei_breadcrumb_prefix;
+		$html = '<section class="sensei-breadcrumb">'.$sensei_breadcrumb_prefix;
 		// Lesson
-		if ( is_singular( 'lesson' ) && 0 < intval( $id ) ) {
-			$course_id = intval( get_post_meta( $id, '_lesson_course', true ) );
-			if( ! $course_id ) {
+		if (is_singular('lesson') && 0 < intval($id)) {
+			$course_id = intval(get_post_meta($id, '_lesson_course', true));
+			if ( ! $course_id) {
 				return;
 			}
-			$html .= '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Back to the course', 'woothemes-sensei' ) . '">' . get_the_title( $course_id ) . '</a>';
+			$html .= '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Back to the course', 'woothemes-sensei').'">'.get_the_title($course_id).'</a>';
     	} // End If Statement
     	// Quiz
-		if ( is_singular( 'quiz' ) && 0 < intval( $id ) ) {
-			$lesson_id = intval( get_post_meta( $id, '_quiz_lesson', true ) );
-			if( ! $lesson_id ) {
+		if (is_singular('quiz') && 0 < intval($id)) {
+			$lesson_id = intval(get_post_meta($id, '_quiz_lesson', true));
+			if ( ! $lesson_id) {
 				return;
 			}
-			 $html .= '<a href="' . esc_url( get_permalink( $lesson_id ) ) . '" title="' .  __( 'Back to the lesson', 'woothemes-sensei' ) . '">' . get_the_title( $lesson_id ) . '</a>';
+			 $html .= '<a href="'.esc_url(get_permalink($lesson_id)).'" title="'.__('Back to the lesson', 'woothemes-sensei').'">'.get_the_title($lesson_id).'</a>';
     	} // End If Statement
 
     	// Allow other plugins to filter html
-    	$html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator );
+    	$html = apply_filters('sensei_breadcrumb_output', $html, $separator);
     	$html .= '</section>';
 
     	echo $html;
@@ -699,25 +699,25 @@ 
      */
 	public function sensei_lesson_course_signup_link( ) {
 
-        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' );
+        _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link');
         WooThemes_Sensei_Lesson::course_signup_link();
 	}
 
-	public function lesson_tags_display( $lesson_id = 0 ) {
-		if( $lesson_id ) {
-			$tags = wp_get_post_terms( $lesson_id, 'lesson-tag' );
-			if( $tags && count( $tags ) > 0 ) {
+	public function lesson_tags_display($lesson_id = 0) {
+		if ($lesson_id) {
+			$tags = wp_get_post_terms($lesson_id, 'lesson-tag');
+			if ($tags && count($tags) > 0) {
 				$tag_list = '';
-				foreach( $tags as $tag ) {
-					$tag_link = get_term_link( $tag, 'lesson-tag' );
-					if( ! is_wp_error( $tag_link ) ) {
-						if( $tag_list ) { $tag_list .= ', '; }
-						$tag_list .= '<a href="' . $tag_link . '">' . $tag->name . '</a>';
+				foreach ($tags as $tag) {
+					$tag_link = get_term_link($tag, 'lesson-tag');
+					if ( ! is_wp_error($tag_link)) {
+						if ($tag_list) { $tag_list .= ', '; }
+						$tag_list .= '<a href="'.$tag_link.'">'.$tag->name.'</a>';
 					}
 				}
-				if( $tag_list ) {
+				if ($tag_list) {
 					?><section class="lesson-tags">
-		    			<?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?>
+		    			<?php printf(__('Lesson tags: %1$s', 'woothemes-sensei'), $tag_list); ?>
 		    		</section><?php
 		    	}
 	    	}
@@ -727,51 +727,51 @@ 
     /**
      * @param WP_Query $query
      */
-	public function lesson_tag_archive_filter( $query ) {
-    	if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) {
+	public function lesson_tag_archive_filter($query) {
+    	if (is_tax('lesson-tag') && $query->is_main_query()) {
     		// Limit to lessons only
-    		$query->set( 'post_type', 'lesson' );
+    		$query->set('post_type', 'lesson');
 
     		// Set order of lessons
-    		$query->set( 'orderby', 'menu_order' );
-    		$query->set( 'order', 'ASC' );
+    		$query->set('orderby', 'menu_order');
+    		$query->set('order', 'ASC');
 
     	}
     }
 
-    public function lesson_tag_archive_header( $title ) {
-		if( is_tax( 'lesson-tag' ) ) {
-			$title = sprintf( __( 'Lesson tag: %1$s', 'woothemes-sensei' ), apply_filters( 'sensei_lesson_tag_archive_title', get_queried_object()->name ) );
+    public function lesson_tag_archive_header($title) {
+		if (is_tax('lesson-tag')) {
+			$title = sprintf(__('Lesson tag: %1$s', 'woothemes-sensei'), apply_filters('sensei_lesson_tag_archive_title', get_queried_object()->name));
 		}
 		return $title;
 	}
 
 	public function lesson_tag_archive_description() {
-		if( is_tax( 'lesson-tag' ) ) {
+		if (is_tax('lesson-tag')) {
 			$tag = get_queried_object();
-			echo '<p class="archive-description lesson-description">' . apply_filters( 'sensei_lesson_tag_archive_description', nl2br( $tag->description ), $tag->term_id ) . '</p>';
+			echo '<p class="archive-description lesson-description">'.apply_filters('sensei_lesson_tag_archive_description', nl2br($tag->description), $tag->term_id).'</p>';
 		}
 	}
 
 	public function sensei_complete_lesson() {
-		global $post,  $current_user;
+		global $post, $current_user;
 		// Handle Quiz Completion
-		if ( isset( $_POST['quiz_action'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_lesson_noonce' ], 'woothemes_sensei_complete_lesson_noonce' ) ) {
+		if (isset($_POST['quiz_action']) && wp_verify_nonce($_POST['woothemes_sensei_complete_lesson_noonce'], 'woothemes_sensei_complete_lesson_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['quiz_action'] );
+			$sanitized_submit = esc_html($_POST['quiz_action']);
 
 			switch ($sanitized_submit) {
                 case 'lesson-complete':
 
-					Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true );
+					Sensei_Utils::sensei_start_lesson($post->ID, $current_user->ID, $complete = true);
 
 					break;
 
                 case 'lesson-reset':
 
-					Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_lesson($post->ID, $current_user->ID);
 
-					$this->messages = '<div class="sensei-message note">' .  __( 'Lesson Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+					$this->messages = '<div class="sensei-message note">'.__('Lesson Reset Successfully.', 'woothemes-sensei').'</div>';
 					break;
 
 				default:
@@ -785,14 +785,14 @@ 
 	} // End sensei_complete_lesson()
 
 	public function sensei_complete_course() {
-		global $post,  $current_user, $wp_query;
-		if ( isset( $_POST['course_complete'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_course_noonce' ], 'woothemes_sensei_complete_course_noonce' ) ) {
+		global $post, $current_user, $wp_query;
+		if (isset($_POST['course_complete']) && wp_verify_nonce($_POST['woothemes_sensei_complete_course_noonce'], 'woothemes_sensei_complete_course_noonce')) {
 
-			$sanitized_submit = esc_html( $_POST['course_complete'] );
-			$sanitized_course_id = absint( esc_html( $_POST['course_complete_id'] ) );
+			$sanitized_submit = esc_html($_POST['course_complete']);
+			$sanitized_course_id = absint(esc_html($_POST['course_complete_id']));
 			// Handle submit data
 			switch ($sanitized_submit) {
-				case __( 'Mark as Complete', 'woothemes-sensei' ):
+				case __('Mark as Complete', 'woothemes-sensei'):
 
 					// Add user to course
 					$course_metadata = array(
@@ -800,15 +800,15 @@ 
 						'percent' => 0, // No completed lessons yet
 						'complete' => 0,
 					);
-					$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata );
+					$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata);
 
-					if ( $activity_logged ) {
+					if ($activity_logged) {
 						// Get all course lessons
-						$course_lesson_ids = Sensei()->course->course_lessons( $sanitized_course_id, 'any', 'ids' );
+						$course_lesson_ids = Sensei()->course->course_lessons($sanitized_course_id, 'any', 'ids');
 						// Mark all quiz user meta lessons as complete
-						foreach ( $course_lesson_ids as $lesson_item_id ){
+						foreach ($course_lesson_ids as $lesson_item_id) {
 							// Mark lesson as complete
-							$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_item_id, $current_user->ID, $complete = true );
+							$activity_logged = Sensei_Utils::sensei_start_lesson($lesson_item_id, $current_user->ID, $complete = true);
 						} // End For Loop
 
 						// Update with final stats
@@ -816,22 +816,22 @@ 
 							'percent' => 100,
 							'complete' => count($course_lesson_ids),
 						);
-						$activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'complete', $course_metadata );
+						$activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'complete', $course_metadata);
 
-						do_action( 'sensei_user_course_end', $current_user->ID, $sanitized_course_id );
+						do_action('sensei_user_course_end', $current_user->ID, $sanitized_course_id);
 
 						// Success message
-						$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s marked as complete.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+						$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s marked as complete.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					} // End If Statement
 
 					break;
 
-				case __( 'Delete Course', 'woothemes-sensei' ):
+				case __('Delete Course', 'woothemes-sensei'):
 
-					Sensei_Utils::sensei_remove_user_from_course( $sanitized_course_id, $current_user->ID );
+					Sensei_Utils::sensei_remove_user_from_course($sanitized_course_id, $current_user->ID);
 
 					// Success message
-					$this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s deleted.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>';
+					$this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s deleted.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>';
 					break;
 
 				default:
@@ -847,25 +847,25 @@ 
 	 * @param int $lesson_id
 	 * @return array
 	 */
-	public function sensei_get_user_quiz_answers( $lesson_id = 0 ) {
+	public function sensei_get_user_quiz_answers($lesson_id = 0) {
 		global $current_user;
 
 		$user_answers = array();
 
-		if ( 0 < intval( $lesson_id ) ) {
-			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $lesson_id );
-			foreach( $lesson_quiz_questions as $question ) {
-				$answer = maybe_unserialize( base64_decode( Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content' ) ) ) );
-				$user_answers[ $question->ID ] = $answer;
+		if (0 < intval($lesson_id)) {
+			$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($lesson_id);
+			foreach ($lesson_quiz_questions as $question) {
+				$answer = maybe_unserialize(base64_decode(Sensei_Utils::sensei_get_activity_value(array('post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content'))));
+				$user_answers[$question->ID] = $answer;
 			}
 		}
 
 		return $user_answers;
 	} // End sensei_get_user_quiz_answers()
 
-	public function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) {
-		_deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" );
-		return Sensei_Utils::user_completed_lesson( $post_id, $user_id );
+	public function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) {
+		_deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()");
+		return Sensei_Utils::user_completed_lesson($post_id, $user_id);
 	} // End sensei_has_user_completed_lesson()
 
 /**
@@ -875,14 +875,14 @@ 
 		Sensei()->notices->print_notices();
 	} // End sensei_frontend_messages()
 
-	public function sensei_lesson_video( $post_id = 0 ) {
-		if ( 0 < intval( $post_id ) ) {
-			$lesson_video_embed = get_post_meta( $post_id, '_lesson_video_embed', true );
-			if ( 'http' == substr( $lesson_video_embed, 0, 4) ) {
+	public function sensei_lesson_video($post_id = 0) {
+		if (0 < intval($post_id)) {
+			$lesson_video_embed = get_post_meta($post_id, '_lesson_video_embed', true);
+			if ('http' == substr($lesson_video_embed, 0, 4)) {
         		// V2 - make width and height a setting for video embed
-        		$lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ );
+        		$lesson_video_embed = wp_oembed_get(esc_url($lesson_video_embed)/*, array( 'width' => 100 , 'height' => 100)*/);
         	} // End If Statement
-        	if ( '' != $lesson_video_embed ) {
+        	if ('' != $lesson_video_embed) {
         	?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php
         	} // End If Statement
         } // End If Statement
@@ -894,19 +894,19 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$pass_required = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-	    	$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+	    	$pass_required = get_post_meta($quiz_id, '_pass_required', true);
 	    }
-		if( ! $quiz_id || ( $quiz_id && ! $pass_required ) ) {
+		if ( ! $quiz_id || ($quiz_id && ! $pass_required)) {
 			?>
-			<form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+			<form class="lesson_button_form" method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 	            <input type="hidden"
                        name="woothemes_sensei_complete_lesson_noonce"
                        id="woothemes_sensei_complete_lesson_noonce"
-                       value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>"
+                       value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>"
                 />
 
 	            <input type="hidden" name="quiz_action" value="lesson-complete" />
@@ -914,7 +914,7 @@ 
                 <input type="submit"
                        name="quiz_complete"
                        class="quiz-submit complete"
-                       value="<?php _e( 'Complete Lesson', 'woothemes-sensei' ); ?>"/>
+                       value="<?php _e('Complete Lesson', 'woothemes-sensei'); ?>"/>
 
 	        </form>
 			<?php
@@ -927,25 +927,25 @@ 
 		$quiz_id = 0;
 
 		// Lesson quizzes
-		$quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID );
+		$quiz_id = Sensei()->lesson->lesson_quizzes($post->ID);
 		$reset_allowed = true;
-		if( $quiz_id ) {
+		if ($quiz_id) {
 			// Get quiz pass setting
-			$reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+			$reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
 		}
-		if ( ! $quiz_id || !empty($reset_allowed) ) {
+		if ( ! $quiz_id || ! empty($reset_allowed)) {
 		?>
-		<form method="POST" action="<?php echo esc_url( get_permalink() ); ?>">
+		<form method="POST" action="<?php echo esc_url(get_permalink()); ?>">
 
             <input
             type="hidden"
-            name="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            id="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>"
-            value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>" />
+            name="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            id="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>"
+            value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>" />
 
             <input type="hidden" name="quiz_action" value="lesson-reset" />
 
-            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e( 'Reset Lesson', 'woothemes-sensei' ); ?>"/>
+            <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e('Reset Lesson', 'woothemes-sensei'); ?>"/>
 
         </form>
 		<?php
@@ -968,23 +968,23 @@ 
 		$post_title = get_the_title();
 		$author_display_name = get_the_author();
 		$author_id = get_the_author_meta('ID');
-		$category_output = get_the_term_list( $post_id, 'course-category', '', ', ', '' );
-		$free_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $post_id ) );
+		$category_output = get_the_term_list($post_id, 'course-category', '', ', ', '');
+		$free_lesson_count = intval(Sensei()->course->course_lesson_preview_count($post_id));
 		?><section class="entry">
         	<p class="sensei-course-meta">
-           	<?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>
-		   	<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+           	<?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?>
+		   	<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . '&nbsp;' . __( 'Lessons', 'woothemes-sensei' ); ?></span>
-		   	<?php if ( '' != $category_output ) { ?>
-		   	<span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+		   	<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>
+		   	<?php if ('' != $category_output) { ?>
+		   	<span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
 		   	<?php } // End If Statement ?>
-		   	<?php sensei_simple_course_price( $post_id ); ?>
+		   	<?php sensei_simple_course_price($post_id); ?>
         	</p>
         	<p class="course-excerpt"><?php the_excerpt(); ?></p>
-        	<?php if ( 0 < $free_lesson_count ) {
-                $free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?>
-                <p class="sensei-free-lessons"><a href="<?php echo get_permalink( $post_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?></a> - <?php echo $free_lessons; ?></p>
+        	<?php if (0 < $free_lesson_count) {
+                $free_lessons = sprintf(__('You can access %d of this course\'s lessons for free', 'woothemes-sensei'), $free_lesson_count); ?>
+                <p class="sensei-free-lessons"><a href="<?php echo get_permalink($post_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?></a> - <?php echo $free_lessons; ?></p>
             <?php } ?>
 		</section><?php
 	} // End sensei_course_archive_meta()
@@ -1007,33 +1007,33 @@ 
     * @deprecated since 1.9.0
     */
 	public function sensei_message_archive_main_content() {
-		_deprecated_function( 'Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed' );
+		_deprecated_function('Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed');
 	} // End sensei_lesson_archive_main_content()
 
     /**
     * @deprecated since 1.9.0
     */
 	public function sensei_no_permissions_main_content() {
-        _deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' );
+        _deprecated_function('Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed');
 	} // End sensei_no_permissions_main_content()
 
 	public function sensei_course_category_main_content() {
 		global $post;
-		if ( have_posts() ) { ?>
+		if (have_posts()) { ?>
 
 			<section id="main-course" class="course-container">
 
-                <?php do_action( 'sensei_course_archive_header' ); ?>
+                <?php do_action('sensei_course_archive_header'); ?>
 
-                <?php while ( have_posts() ) { the_post(); ?>
+                <?php while (have_posts()) { the_post(); ?>
 
-                    <article class="<?php echo join( ' ', get_post_class( array( 'course', 'post' ), get_the_ID() ) ); ?>">
+                    <article class="<?php echo join(' ', get_post_class(array('course', 'post'), get_the_ID())); ?>">
 
-	    			    <?php do_action( 'sensei_course_image', get_the_ID() ); ?>
+	    			    <?php do_action('sensei_course_image', get_the_ID()); ?>
 
-	    			    <?php do_action( 'sensei_course_archive_course_title', $post ); ?>
+	    			    <?php do_action('sensei_course_archive_course_title', $post); ?>
 
-	    			    <?php do_action( 'sensei_course_archive_meta' ); ?>
+	    			    <?php do_action('sensei_course_archive_meta'); ?>
 
 	    		    </article>
 
@@ -1045,7 +1045,7 @@ 
 
 			<p>
 
-                <?php _e( 'No courses found that match your selection.', 'woothemes-sensei' ); ?>
+                <?php _e('No courses found that match your selection.', 'woothemes-sensei'); ?>
 
             </p>
 
@@ -1062,12 +1062,12 @@ 
 				<div class="col-1">
 					<?php
 					// output the actual form markup
-                    Sensei_Templates::get_template( 'user/login-form.php');
+                    Sensei_Templates::get_template('user/login-form.php');
 					?>
 				</div>
 
 			<?php
-			if ( get_option('users_can_register') ) {
+			if (get_option('users_can_register')) {
 
 				// get current url
 				$action_url = get_permalink();
@@ -1075,38 +1075,38 @@ 
 				?>
 
 				<div class="col-2">
-					<h2><?php _e( 'Register', 'woothemes-sensei' ); ?></h2>
+					<h2><?php _e('Register', 'woothemes-sensei'); ?></h2>
 
-					<form method="post" class="register"  action="<?php echo esc_url( $action_url ); ?>" >
+					<form method="post" class="register"  action="<?php echo esc_url($action_url); ?>" >
 
-						<?php do_action( 'sensei_register_form_start' ); ?>
+						<?php do_action('sensei_register_form_start'); ?>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_username"><?php _e( 'Username', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty( $_POST['sensei_reg_username'] ) ) esc_attr_e( $_POST['sensei_reg_username'] ); ?>" />
+							<label for="sensei_reg_username"><?php _e('Username', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty($_POST['sensei_reg_username'])) esc_attr_e($_POST['sensei_reg_username']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_email"><?php _e( 'Email address', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty( $_POST['sensei_reg_email'] ) ) esc_attr_e( $_POST['sensei_reg_email'] ); ?>" />
+							<label for="sensei_reg_email"><?php _e('Email address', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty($_POST['sensei_reg_email'])) esc_attr_e($_POST['sensei_reg_email']); ?>" />
 						</p>
 
 						<p class="form-row form-row-wide">
-							<label for="sensei_reg_password"><?php _e( 'Password', 'woothemes-sensei' ); ?> <span class="required">*</span></label>
-							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty( $_POST['sensei_reg_password'] ) ) esc_attr_e( $_POST['sensei_reg_password'] ); ?>" />
+							<label for="sensei_reg_password"><?php _e('Password', 'woothemes-sensei'); ?> <span class="required">*</span></label>
+							<input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty($_POST['sensei_reg_password'])) esc_attr_e($_POST['sensei_reg_password']); ?>" />
 						</p>
 
 						<!-- Spam Trap -->
-						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woothemes-sensei' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
+						<div style="left:-999em; position:absolute;"><label for="trap"><?php _e('Anti-spam', 'woothemes-sensei'); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
 
-						<?php do_action( 'sensei_register_form_fields' ); ?>
-						<?php do_action( 'register_form' ); ?>
+						<?php do_action('sensei_register_form_fields'); ?>
+						<?php do_action('register_form'); ?>
 
 						<p class="form-row">
-							<input type="submit" class="button" name="register" value="<?php _e( 'Register', 'woothemes-sensei' ); ?>" />
+							<input type="submit" class="button" name="register" value="<?php _e('Register', 'woothemes-sensei'); ?>" />
 						</p>
 
-						<?php do_action( 'sensei_register_form_end' ); ?>
+						<?php do_action('sensei_register_form_end'); ?>
 
 					</form>
 				</div>
@@ -1119,17 +1119,17 @@ 
 		<?php
 	} // End sensei_login_form()
 
-	public function sensei_lesson_meta( $post_id = 0 ) {
+	public function sensei_lesson_meta($post_id = 0) {
 		global $post;
-		if ( 0 < intval( $post_id ) ) {
-		$lesson_course_id = absint( get_post_meta( $post_id, '_lesson_course', true ) );
+		if (0 < intval($post_id)) {
+		$lesson_course_id = absint(get_post_meta($post_id, '_lesson_course', true));
 		?><section class="entry">
             <p class="sensei-course-meta">
-			    <?php if ( isset( Sensei()->settings->settings[ 'lesson_author' ] ) && ( Sensei()->settings->settings[ 'lesson_author' ] ) ) { ?>
-			    <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span>
+			    <?php if (isset(Sensei()->settings->settings['lesson_author']) && (Sensei()->settings->settings['lesson_author'])) { ?>
+			    <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span>
 			    <?php } ?>
-                <?php if ( 0 < intval( $lesson_course_id ) ) { ?>
-                <span class="lesson-course"><?php echo '&nbsp;' . sprintf( __( 'Part of: %s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '" title="' . __( 'View course', 'woothemes-sensei' ) . '"><em>' . get_the_title( $lesson_course_id ) . '</em></a>' ); ?></span>
+                <?php if (0 < intval($lesson_course_id)) { ?>
+                <span class="lesson-course"><?php echo '&nbsp;'.sprintf(__('Part of: %s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($lesson_course_id)).'" title="'.__('View course', 'woothemes-sensei').'"><em>'.get_the_title($lesson_course_id).'</em></a>'); ?></span>
                 <?php } ?>
             </p>
             <p class="lesson-excerpt"><?php the_excerpt( ); ?></p>
@@ -1137,36 +1137,36 @@ 
 		} // End If Statement
 	} // sensei_lesson_meta()
 
-	public function sensei_lesson_preview_title_text( $course_id ) {
+	public function sensei_lesson_preview_title_text($course_id) {
 
-		$preview_text = __( ' (Preview)', 'woothemes-sensei' );
+		$preview_text = __(' (Preview)', 'woothemes-sensei');
 
 		//if this is a paid course
-		if ( Sensei_WC::is_woocommerce_active() ) {
-    	    $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-    	    if ( 0 < $wc_post_id ) {
-    	    	$preview_text = __( ' (Free Preview)', 'woothemes-sensei' );
+		if (Sensei_WC::is_woocommerce_active()) {
+    	    $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
+    	    if (0 < $wc_post_id) {
+    	    	$preview_text = __(' (Free Preview)', 'woothemes-sensei');
     	    } // End If Statement
     	}
     	return $preview_text;
 	}
 
-	public function sensei_lesson_preview_title( $title = '', $id = 0 ) {
+	public function sensei_lesson_preview_title($title = '', $id = 0) {
 		global $post, $current_user;
 
 		// Limit to lessons and check if lesson ID matches filtered post ID
 		// @see https://github.com/woothemes/sensei/issues/574
-		if( isset( $post->ID ) && $id == $post->ID && 'lesson' == get_post_type( $post ) ) {
+		if (isset($post->ID) && $id == $post->ID && 'lesson' == get_post_type($post)) {
 
 			// Limit to main query only
-			if( is_main_query() ) {
+			if (is_main_query()) {
 
 				// Get the course ID
-				$course_id = get_post_meta( $post->ID, '_lesson_course', true );
+				$course_id = get_post_meta($post->ID, '_lesson_course', true);
 
 				// Check if the user is taking the course
-				if( is_singular( 'lesson' ) && Sensei_Utils::is_preview_lesson( $post->ID ) && ! Sensei_Utils::user_started_course( $course_id, $current_user->ID ) && $post->ID == $id ) {
-					$title .= ' ' . $this->sensei_lesson_preview_title_text( $course_id );
+				if (is_singular('lesson') && Sensei_Utils::is_preview_lesson($post->ID) && ! Sensei_Utils::user_started_course($course_id, $current_user->ID) && $post->ID == $id) {
+					$title .= ' '.$this->sensei_lesson_preview_title_text($course_id);
 				}
 			}
 		}
@@ -1177,23 +1177,23 @@ 
 		global $post, $current_user;
 
 		// Check if the user is taking the course
-		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		$is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID);
 		// Handle user starting the course
-		if ( isset( $_POST['course_start'] )
-		    && wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' )
-		    && !$is_user_taking_course ) {
+		if (isset($_POST['course_start'])
+		    && wp_verify_nonce($_POST['woothemes_sensei_start_course_noonce'], 'woothemes_sensei_start_course_noonce')
+		    && ! $is_user_taking_course) {
 
 			// Start the course
-			$activity_logged = Sensei_Utils::user_start_course( $current_user->ID, $post->ID );
+			$activity_logged = Sensei_Utils::user_start_course($current_user->ID, $post->ID);
 			$this->data = new stdClass();
 			$this->data->is_user_taking_course = false;
-			if ( $activity_logged ) {
+			if ($activity_logged) {
 				$this->data->is_user_taking_course = true;
 
 				// Refresh page to avoid re-posting
 				?>
 
-			    <script type="text/javascript"> window.location = '<?php echo get_permalink( $post->ID ); ?>'; </script>
+			    <script type="text/javascript"> window.location = '<?php echo get_permalink($post->ID); ?>'; </script>
 
 			    <?php
 			} // End If Statement
@@ -1204,15 +1204,15 @@ 
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' );
-        Sensei()->course->the_course_meta( get_post() );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta', '1.9.0', 'Sensei_Course::the_course_meta()');
+        Sensei()->course->the_course_meta(get_post());
 	} // End sensei_course_meta()
 
     /**
      * @deprecated since 1.9.0
      */
 	public function sensei_course_meta_video() {
-        _deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' );
+        _deprecated_function('Sensei_Frontend::sensei_course_meta_video', '1.9.0', 'Sensei_Course::the_course_video()');
         Sensei_Course::the_course_video();
 	} // End sensei_course_meta_video()
 
@@ -1227,12 +1227,12 @@ 
     public function sensei_woocommerce_in_cart_message() {
 		global $post, $woocommerce;
 
-		$wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() );
-		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+		$wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true));
+        $user_course_status_id = Sensei_Utils::user_started_course($post->ID, get_current_user_id());
+		if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-			if ( Sensei_WC::is_product_in_cart( $wc_post_id ) ) {
-				echo '<div class="sensei-message info">' . sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei') . '</div>', '<a class="cart-complete" href="' . $woocommerce->cart->get_checkout_url() . '" title="' . __('complete the purchase', 'woothemes-sensei') . '">' . __('complete the purchase', 'woothemes-sensei') . '</a>' );
+			if (Sensei_WC::is_product_in_cart($wc_post_id)) {
+				echo '<div class="sensei-message info">'.sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei').'</div>', '<a class="cart-complete" href="'.$woocommerce->cart->get_checkout_url().'" title="'.__('complete the purchase', 'woothemes-sensei').'">'.__('complete the purchase', 'woothemes-sensei').'</a>');
 			} // End If Statement
 
 		} // End If Statement
@@ -1240,7 +1240,7 @@ 
 	} // End sensei_woocommerce_in_cart_message()
 
 	// Deprecated
-	public function sensei_lesson_comment_count( $count ) {
+	public function sensei_lesson_comment_count($count) {
 		return $count;
 	} // End sensei_lesson_comment_count()
 
@@ -1249,11 +1249,11 @@ 
 	 * @param  string $content Original content
 	 * @return string          Modified content
 	 */
-	public function sensei_search_results_excerpt( $content ) {
+	public function sensei_search_results_excerpt($content) {
 		global $post;
 
-		if( is_search() && in_array( $post->post_type, array( 'course', 'lesson' ) ) ) {
-			$content = '<p class="course-excerpt">' . the_excerpt( ) . '</p>';
+		if (is_search() && in_array($post->post_type, array('course', 'lesson'))) {
+			$content = '<p class="course-excerpt">'.the_excerpt( ).'</p>';
 		}
 
 		return $content;
@@ -1264,11 +1264,11 @@ 
 	 * @param  integer $order_id ID of order
 	 * @return void
 	 */
-	public function remove_active_course( $order_id ) {
-		$order = new WC_Order( $order_id );
+	public function remove_active_course($order_id) {
+		$order = new WC_Order($order_id);
 
-		foreach ( $order->get_items() as $item ) {
-			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+		foreach ($order->get_items() as $item) {
+			if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 				// If item has variation_id then its a variation of the product
 				$item_id = $item['variation_id'];
 			} else {
@@ -1276,11 +1276,11 @@ 
 				$item_id = $item['product_id'];
 			} 
 
-            if ( $item_id > 0 ) {
+            if ($item_id > 0) {
 
-				$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(
@@ -1296,13 +1296,13 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $args );
+					$course_ids = get_posts($args);
 
-					if( $course_ids && count( $course_ids ) > 0 ) {
-						foreach( $course_ids as $course_id ) {
+					if ($course_ids && count($course_ids) > 0) {
+						foreach ($course_ids as $course_id) {
 
 							// Remove all course user meta
-							Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id );
+							Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id);
 
 						} // End For Loop
 					} // End If Statement
@@ -1318,16 +1318,16 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function activate_purchased_courses( $user_id = 0 ) {
+	public function activate_purchased_courses($user_id = 0) {
 
-		if( $user_id ) {
+		if ($user_id) {
 
-			if( Sensei_WC::is_woocommerce_active() ) {
+			if (Sensei_WC::is_woocommerce_active()) {
 
 				// Get all user's orders
 				$order_args = array(
 					'post_type' => 'shop_order',
-					'post_status' =>  array( 'wc-processing', 'wc-completed' ),
+					'post_status' =>  array('wc-processing', 'wc-completed'),
 					'posts_per_page' => -1,
 					'meta_query' => array(
 						array(
@@ -1337,25 +1337,25 @@ 
 					),
 				);
 
-				$orders = get_posts( $order_args );
+				$orders = get_posts($order_args);
 
 				$product_ids = array();
 				$order_ids = array();
 
-				foreach( $orders as $post_id ) {
+				foreach ($orders as $post_id) {
 
 					// Only process each order once
-					$processed = get_post_meta( $post_id, 'sensei_products_processed', true );
+					$processed = get_post_meta($post_id, 'sensei_products_processed', true);
 
-					if( $processed && $processed == 'processed' ) {
+					if ($processed && $processed == 'processed') {
 						continue;
 					}
 
 					// Get course product IDs from order
-					$order = new WC_Order( $post_id );
+					$order = new WC_Order($post_id);
 
 					$items = $order->get_items();
-					foreach( $items as $item ) {
+					foreach ($items as $item) {
                                             if (isset($item['variation_id']) && $item['variation_id'] > 0) {
                                                 $item_id = $item['variation_id'];
                                                 $product_type = 'variation';
@@ -1369,7 +1369,7 @@ 
 					$order_ids[] = $post_id;
 				}
 
-				if( count( $product_ids ) > 0 ) {
+				if (count($product_ids) > 0) {
 
 					// Get all courses from user's orders
 					$course_args = array(
@@ -1386,31 +1386,31 @@ 
 						'order' => 'ASC',
 						'fields' => 'ids',
 					);
-					$course_ids = get_posts( $course_args );
+					$course_ids = get_posts($course_args);
 
-					foreach( $course_ids as $course_id ) {
+					foreach ($course_ids as $course_id) {
 
-						$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+						$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 						// Ignore course if already completed
-						if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+						if (Sensei_Utils::user_completed_course($user_course_status)) {
 							continue;
 						}
 
 						// Ignore course if already started
-						if( $user_course_status ) {
+						if ($user_course_status) {
 							continue;
 						}
 
 						// Mark course as started by user
-						Sensei_Utils::user_start_course( $user_id, $course_id );
+						Sensei_Utils::user_start_course($user_id, $course_id);
 					}
 				}
 
-				if( count( $order_ids ) > 0 ) {
-					foreach( $order_ids as $order_id ) {
+				if (count($order_ids) > 0) {
+					foreach ($order_ids as $order_id) {
 						// Mark order as processed
-						update_post_meta( $order_id, 'sensei_products_processed', 'processed' );
+						update_post_meta($order_id, 'sensei_products_processed', 'processed');
 					}
 				}
 			}
@@ -1424,28 +1424,28 @@ 
 	public function activate_purchased_single_course() {
 		global $post, $current_user;
 
-		if( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 
-			if( ! is_user_logged_in() ) return;
-			if( ! isset( $post->ID ) ) return;
+			if ( ! is_user_logged_in()) return;
+			if ( ! isset($post->ID)) return;
 
 			$user_id = $current_user->ID;
 			$course_id = $post->ID;
-			$course_product_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true );
-			if( ! $course_product_id ) {
+			$course_product_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true);
+			if ( ! $course_product_id) {
 				return;
 			}
 
-			$user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id );
+			$user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id);
 
 			// Ignore course if already completed
-			if( Sensei_Utils::user_completed_course( $user_course_status ) ) {
+			if (Sensei_Utils::user_completed_course($user_course_status)) {
 
 				return;
 			}
 
 			// Ignore course if already started
-			if( $user_course_status ) {
+			if ($user_course_status) {
 				return;
 			}
 
@@ -1453,7 +1453,7 @@ 
 			$order_args = array(
 				'post_type' => 'shop_order',
 				'posts_per_page' => -1,
-				'post_status' => array( 'wc-processing', 'wc-completed' ),
+				'post_status' => array('wc-processing', 'wc-completed'),
 				'meta_query' => array(
 					array(
 						'key' => '_customer_user',
@@ -1462,27 +1462,27 @@ 
 				),
 				'fields' => 'ids',
 			);
-			$orders = get_posts( $order_args );
+			$orders = get_posts($order_args);
 
-			foreach( $orders as $order_post_id ) {
+			foreach ($orders as $order_post_id) {
 
 				// Get course product IDs from order
-				$order = new WC_Order( $order_post_id );
+				$order = new WC_Order($order_post_id);
 
 				$items = $order->get_items();
-				foreach( $items as $item ) {
-                    $product = wc_get_product( $item['product_id'] );
+				foreach ($items as $item) {
+                    $product = wc_get_product($item['product_id']);
 
                     // handle product bundles
-                    if( $product->is_type('bundle') ){
+                    if ($product->is_type('bundle')) {
 
-                        $bundled_product = new WC_Product_Bundle( $product->id );
+                        $bundled_product = new WC_Product_Bundle($product->id);
                         $bundled_items = $bundled_product->get_bundled_items();
 
-                        foreach( $bundled_items as $bundled_item ){
+                        foreach ($bundled_items as $bundled_item) {
 
-                            if( $bundled_item->product_id == $course_product_id ) {
-                                Sensei_Utils::user_start_course( $user_id, $course_id );
+                            if ($bundled_item->product_id == $course_product_id) {
+                                Sensei_Utils::user_start_course($user_id, $course_id);
                                 return;
                             }
 
@@ -1491,8 +1491,8 @@ 
                     } else {
 
                     // handle regular products
-                        if( $item['product_id'] == $course_product_id ) {
-                            Sensei_Utils::user_start_course( $user_id, $course_id );
+                        if ($item['product_id'] == $course_product_id) {
+                            Sensei_Utils::user_start_course($user_id, $course_id);
                             return;
                         }
 
@@ -1508,9 +1508,9 @@ 
 	 * @param  array  $args Default arguments
 	 * @return array        Modified arguments
 	 */
-	public function hide_sensei_activity( $args = array() ) {
+	public function hide_sensei_activity($args = array()) {
 
-		if( is_singular( 'lesson' ) || is_singular( 'course' ) ) {
+		if (is_singular('lesson') || is_singular('course')) {
 			$args['type'] = 'comment';
 		}
 
@@ -1527,9 +1527,9 @@ 
 
 		//if not posted from the sensei login form let
 		// WordPress or any other party handle the failed request
-	    if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form']  ){
+	    if ( ! isset($_REQUEST['form']) || 'sensei-login' != $_REQUEST['form']) {
 
-	    	return ;
+	    	return;
 
 	    }
 
@@ -1537,9 +1537,9 @@ 
     	$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']);
 
    		 // if there's a valid referrer, and it's not the default log-in screen
-	    if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){
+	    if ( ! empty($referrer) && ! strstr($referrer, 'wp-login') && ! strstr($referrer, 'wp-admin')) {
 	        // let's append some information (login=failed) to the URL for the theme to use
-	        wp_redirect( esc_url_raw( add_query_arg('login', 'failed',  $referrer) ) );
+	        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 	    	exit;
     	}
 	}// End sensei_login_fail_redirect_to_front_end_login
@@ -1553,10 +1553,10 @@ 
 
 
 		// Check that it is a sensei login request and if it has a valid nonce
-	    if(  isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) {
+	    if (isset($_REQUEST['form']) && 'sensei-login' == $_REQUEST['form']) {
 
 	    	// Validate the login request nonce
-		    if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){
+		    if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'sensei-login')) {
 		    	return;
 		    }
 
@@ -1565,47 +1565,47 @@ 
 		    $referrer = $_REQUEST['_wp_http_referer'];
 		    //$redirect = $_REQUEST['_sensei_redirect'];
 
-		    if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) )
-		    	 && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){
+		    if ((isset($_REQUEST['log']) && ! empty($_REQUEST['log']))
+		    	 && (isset($_REQUEST['pwd']) && ! empty($_REQUEST['pwd']))) {
 
 		    	// when the user has entered a password or username do the sensei login
 		    	$creds = array();
 
 		    	// check if the requests login is an email address
-		    	if( is_email(  trim( $_REQUEST['log'] ) )  ){
+		    	if (is_email(trim($_REQUEST['log']))) {
 		    		// query wordpress for the users details
-		    		$user =	get_user_by( 'email', sanitize_email( $_REQUEST['log'] )  );
+		    		$user = get_user_by('email', sanitize_email($_REQUEST['log']));
 
 		    		// validate the user object
-		    		if( !$user ){
+		    		if ( ! $user) {
 
 		    			// the email doesnt exist
-                        wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+                        wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
 		        		exit;
 
 		    		}
 
 		    		//assigne the username to the creds array for further processing
-		    		$creds['user_login'] =  $user->user_login ;
+		    		$creds['user_login'] = $user->user_login;
 
-		    	}else{
+		    	} else {
 
 		    		// process this as a default username login
-		    		$creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ;
+		    		$creds['user_login'] = sanitize_text_field($_REQUEST['log']);
 
 		    	}
 
 				// get setup the rest of the creds array
-				$creds['user_password'] = sanitize_text_field( $_REQUEST['pwd'] );
-				$creds['remember'] = isset( $_REQUEST['rememberme'] ) ? true : false ;
+				$creds['user_password'] = sanitize_text_field($_REQUEST['pwd']);
+				$creds['remember'] = isset($_REQUEST['rememberme']) ? true : false;
 
 				//attempt logging in with the given details
-				$user = wp_signon( $creds, false );
+				$user = wp_signon($creds, false);
 
-				if ( is_wp_error($user) ){ // on login failure
-                    wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) );
+				if (is_wp_error($user)) { // on login failure
+                    wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer)));
                     exit;
-				}else{ // on login success
+				} else { // on login success
 
 					/**
 					* change the redirect url programatically
@@ -1615,21 +1615,21 @@ 
 					* @param string $referrer the page where the current url wheresensei login form was posted from
 					*/
 
-					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg( 'login', $referrer ) );
+					$success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg('login', $referrer));
 
-					wp_redirect( esc_url_raw( $success_redirect_url ) );
+					wp_redirect(esc_url_raw($success_redirect_url));
 		        	exit;
 
 				}	// end is_wp_error($user)
 
-		    }else{ // if username or password is empty
+		    } else { // if username or password is empty
 
-                wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) );
+                wp_redirect(esc_url_raw(add_query_arg('login', 'emptyfields', $referrer)));
 		        exit;
 
 		    } // end if username $_REQUEST['log']  and password $_REQUEST['pwd'] is empty
 
-	    }elseif( ( isset( $_GET['login'] ) ) ) {
+	    }elseif ((isset($_GET['login']))) {
 	    	// else if this request is a redircect from a previously faile login request
 	    	$this->login_message_process();
 
@@ -1648,87 +1648,87 @@ 
 	 * @return void redirect
 	 *
 	 */
-	public function sensei_process_registration(){
+	public function sensei_process_registration() {
 		global 	 $current_user;
 		// check the for the sensei specific registration requests
-		if( !isset( $_POST['sensei_reg_username'] ) && ! isset( $_POST['sensei_reg_email'] ) && !isset( $_POST['sensei_reg_password'] )){
+		if ( ! isset($_POST['sensei_reg_username']) && ! isset($_POST['sensei_reg_email']) && ! isset($_POST['sensei_reg_password'])) {
 			// exit functionas this is not a sensei registration request
-			return ;
+			return;
 		}
 		// check for spam throw cheating huh
-		if( isset( $_POST['email_2'] ) &&  '' !== $_POST['email_2']   ){
+		if (isset($_POST['email_2']) && '' !== $_POST['email_2']) {
 			$message = 'Error:  The spam field should be empty';
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 			return;
 		}
 
 		// retreive form variables
-		$new_user_name		= sanitize_user( $_POST['sensei_reg_username'] );
-		$new_user_email		= $_POST['sensei_reg_email'];
-		$new_user_password	= $_POST['sensei_reg_password'];
+		$new_user_name = sanitize_user($_POST['sensei_reg_username']);
+		$new_user_email = $_POST['sensei_reg_email'];
+		$new_user_password = $_POST['sensei_reg_password'];
 
 		// Check the username
 		$username_error_notice = '';
-		if ( $new_user_name == '' ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: Please enter a username.' );
-		} elseif ( ! validate_username( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' );
-		} elseif ( username_exists( $new_user_name ) ) {
-			$username_error_notice =  __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' );
+		if ($new_user_name == '') {
+			$username_error_notice = __('<strong>ERROR</strong>: Please enter a username.');
+		} elseif ( ! validate_username($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.');
+		} elseif (username_exists($new_user_name)) {
+			$username_error_notice = __('<strong>ERROR</strong>: This username is already registered. Please choose another one.');
 		}
 
 		// exit on username error
-		if( '' !== $username_error_notice ){
-			Sensei()->notices->add_notice( $username_error_notice , 'alert');
+		if ('' !== $username_error_notice) {
+			Sensei()->notices->add_notice($username_error_notice, 'alert');
 			return;
 		}
 
 		// Check the e-mail address
 		$email_error_notice = '';
-		if ( $new_user_email == '' ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: Please type your e-mail address.' );
-		} elseif ( ! is_email( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' );
-		} elseif ( email_exists( $new_user_email ) ) {
-			$email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' );
+		if ($new_user_email == '') {
+			$email_error_notice = __('<strong>ERROR</strong>: Please type your e-mail address.');
+		} elseif ( ! is_email($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: The email address isn&#8217;t correct.');
+		} elseif (email_exists($new_user_email)) {
+			$email_error_notice = __('<strong>ERROR</strong>: This email is already registered, please choose another one.');
 		}
 
 		// exit on email address error
-		if( '' !== $email_error_notice ){
-			Sensei()->notices->add_notice( $email_error_notice , 'alert');
+		if ('' !== $email_error_notice) {
+			Sensei()->notices->add_notice($email_error_notice, 'alert');
 			return;
 		}
 
 		//check user password
 
 		// exit on email address error
-		if( empty( $new_user_password ) ){
-			Sensei()->notices->add_notice(  __( '<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.' )  , 'alert');
+		if (empty($new_user_password)) {
+			Sensei()->notices->add_notice(__('<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.'), 'alert');
 			return;
 		}
 
 		// register user
-		$user_id = wp_create_user( $new_user_name, $new_user_password, $new_user_email );
-		if ( ! $user_id || is_wp_error( $user_id ) ) {
-			Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ), 'alert');
+		$user_id = wp_create_user($new_user_name, $new_user_password, $new_user_email);
+		if ( ! $user_id || is_wp_error($user_id)) {
+			Sensei()->notices->add_notice(sprintf(__('<strong>ERROR</strong>: Couldn\'t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')), 'alert');
 		}
 
 		// notify the user
-		wp_new_user_notification( $user_id, $new_user_password );
+		wp_new_user_notification($user_id, $new_user_password);
 
 		// set global current user aka log the user in
-		$current_user = get_user_by( 'id', $user_id );
-		wp_set_auth_cookie( $user_id, true );
+		$current_user = get_user_by('id', $user_id);
+		wp_set_auth_cookie($user_id, true);
 
 		// Redirect
 		global $wp;
-		if ( wp_get_referer() ) {
-			$redirect = esc_url( wp_get_referer() );
+		if (wp_get_referer()) {
+			$redirect = esc_url(wp_get_referer());
 		} else {
-			$redirect = esc_url( home_url( $wp->request ) );
+			$redirect = esc_url(home_url($wp->request));
 		}
 
-		wp_redirect( apply_filters( 'sensei_registration_redirect', $redirect ) );
+		wp_redirect(apply_filters('sensei_registration_redirect', $redirect));
 		exit;
 
 	} // end  sensei_process_registration)()
@@ -1739,7 +1739,7 @@ 
 	 * @return void redirect
 	 * @since 1.7.0
 	 */
-	public function login_message_process(){
+	public function login_message_process() {
 
 
 		    // setup the message variables
@@ -1747,16 +1747,16 @@ 
 
 			//only output message if the url contains login=failed and login=emptyfields
 
-			if( $_GET['login'] == 'failed' ){
+			if ($_GET['login'] == 'failed') {
 
-				$message = __('Incorrect login details', 'woothemes-sensei' );
+				$message = __('Incorrect login details', 'woothemes-sensei');
 
-			}elseif( $_GET['login'] == 'emptyfields'  ){
+			}elseif ($_GET['login'] == 'emptyfields') {
 
-				$message= __('Please enter your username and password', 'woothemes-sensei' );
+				$message = __('Please enter your username and password', 'woothemes-sensei');
 			}
 
-			Sensei()->notices->add_notice( $message, 'alert');
+			Sensei()->notices->add_notice($message, 'alert');
 
 	}// end login_message_process
 
@@ -1768,11 +1768,11 @@ 
      * @return void redirect
      *
      */
-    public function sensei_show_admin_bar () {
+    public function sensei_show_admin_bar() {
 
         if (current_user_can('edit_courses')) {
 
-            add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1);
+            add_filter('woocommerce_disable_admin_bar', '__return_false', 10, 1);
 
         }
 
@@ -1785,4 +1785,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Frontend extends Sensei_Frontend{}
+class WooThemes_Sensei_Frontend extends Sensei_Frontend {}

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

Indentation +86 added lines, -86 removed lines

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

Spacing +12 added lines, -12 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.
@@ -29,7 +29,7 @@ 
      * @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->setup_messages_query();
 
@@ -40,7 +40,7 @@ 
      *
      * @return mixed
      */
-    public function setup_messages_query(){
+    public function setup_messages_query() {
 
         $user = wp_get_current_user();
 
@@ -59,7 +59,7 @@ 
             ),
         );
 
-        $this->messages_query  = new WP_Query( $args );
+        $this->messages_query = new WP_Query($args);
     }
 
     /**
@@ -67,22 +67,22 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( !is_user_logged_in() ){
+        if ( ! is_user_logged_in()) {
 
-            Sensei()->notices->add_notice( __('Please login to view your messages.','woothemes-sensei') , 'alert'  );
+            Sensei()->notices->add_notice(__('Please login to view your messages.', 'woothemes-sensei'), 'alert');
 
-        } elseif( 0 == $this->messages_query->post_count ){
+        } elseif (0 == $this->messages_query->post_count) {
 
-            Sensei()->notices->add_notice( __( 'You do not have any messages.', 'woothemes-sensei') , 'alert'  );
+            Sensei()->notices->add_notice(__('You do not have any messages.', 'woothemes-sensei'), 'alert');
         }
 
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
+        $messages_disabled_in_settings = ! ( ! isset(Sensei()->settings->settings['messages_disable'])
+                                            || ! Sensei()->settings->settings['messages_disable']);
 
         // don't show anything if messages are disable
-        if( $messages_disabled_in_settings ){
+        if ($messages_disabled_in_settings) {
             return '';
         }
 

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_Student::get_full_name( $item->ID );
-                }
+					$user_name = Sensei_Student::get_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()
 

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_Student::get_full_name( $item->ID );
+				if ($this->csv_output) {
+                    $user_name = Sensei_Student::get_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-teacher.php

Indentation +1339 added lines, -1339 removed lines

@@ -14,251 +14,251 @@ 
  */
 class Sensei_Teacher {
 
-    /**
-     * $teacher_role
-     *
-     * Keeps a reference to the teacher role object
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    protected $teacher_role;
-
-    /**
-     * $token
-     *
-     * Keeps a reference to the global sensei token
-     *
-     * @access protected
-     * @since 1.8.0
-     */
-    public  $token;
-
-    /**
-     * Sensei_Teacher::__constructor
-     *
-     * Constructor Function
-     *
-     * @since 1.8.0
-     * @access public
-     */
-    public function __construct ( ) {
-
-        add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
-        add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
-        add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
-        add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
-        add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
-
-        add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
-
-        //filter the quiz submissions
-        add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
-
-        //grading totals count only those belonging to the teacher
-        add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
-
-        // show the courses owned by a user on his author archive page
-        add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
-
-        // notify admin when a teacher creates a course
-        add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
-
-        // limit the analysis view to only the users taking courses belong to this teacher
-        add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
-
-        // give teacher access to question post type
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
-
-        // Teacher column on the courses list on the admin edit screen
-        add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
-        add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
-
-        //admin edit messages query limit teacher
-        add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
-
-        //add filter by teacher on courses list
-        add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
-        add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
-
-        // Handle media library restrictions
-        add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
-        add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
-
-        // update lesson owner to course teacher when saved
-        add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
-
-        // If a Teacher logs in, redirect to /wp-admin/
-        add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
-
-
-        add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
-        add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
-
-
-    } // end __constructor()
-
-    /**
-     * Sensei_Teacher::create_teacher_role
-     *
-     * This function checks if the role exist, if not it creates it.
-     * for the teacher role
-     *
-     * @since 1.8.0
-     * @access public
-     * @return void
-     */
-    public function create_role ( ) {
-
-        // check if the role exists
-        $this->teacher_role = get_role( 'teacher' );
-
-        // if the the teacher is not a valid WordPress role create it
-       if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
-           // create the role
-           $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
-       }
-
-       // add the capabilities before returning
-        $this->add_capabilities();
-
-    }// end create_teacher_role
-
-    /**
-     * Sensei_Teacher::add_capabilities
-     *
-     * @since 1.8.0
-     * @access protected
-     */
-    protected function add_capabilities ( ) {
-
-        // if this is not a valid WP_Role object exit without adding anything
-        if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
-            return;
-        }
-
-        /**
-         * Sensei teachers capabilities array filter
-         *
-         * These capabilities will be applied to the teacher role
-         * @param array $capabilities
-         * keys: (string) $cap_name => (bool) $grant
-         */
-        $caps = apply_filters( 'sensei_teacher_role_capabilities', array(
-            // General access rules
-            'read' => true,
-            'manage_sensei_grades' => true,
-            'moderate_comments'=> true,
-            'upload_files'	=> true,
-            'edit_files'	=> true,
-
-            //Lessons
-            'publish_lessons'	 => true,
-            'manage_lesson_categories'	 => true,
-            'edit_lessons'	 => true,
-            'edit_published_lessons'  => true,
-            'edit_private_lessons' => true,
-            'read_private_lessons' => true,
-            'delete_published_lessons' => true,
-
-            // Courses
-            'create_courses' => true,
-            'publish_courses'	 => false,
-            'manage_course_categories'	 => true,
-            'edit_courses'	 => true,
-            'edit_published_courses'  => true,
-            'edit_private_courses' => true,
-            'read_private_courses' => true,
-            'delete_published_courses' => true,
-
-            // Quiz
-            'publish_quizzes'	 => true,
-            'edit_quizzes'	 => true,
-            'edit_published_quizzes'  => true,
-            'edit_private_quizzes' => true,
-            'read_private_quizzes' => true,
-
-            // Questions
-            'publish_questions'	 => true,
-            'edit_questions'	 => true,
-            'edit_published_questions'  => true,
-            'edit_private_questions' => true,
-            'read_private_questions' => true,
-
-            //messages
-            'publish_sensei_messages'	 => true,
-            'edit_sensei_messages'	 => true,
-            'edit_published_sensei_messages'  => true,
-            'edit_private_sensei_messages' => true,
-            'read_private_sensei_messages' => true,
-
-            // Comments -
-            // Necessary cap so Teachers can moderate comments
-            // on their own lessons. We restrict access to other
-            // post types in $this->restrict_posts_menu_page()
-
-            'edit_posts' => true,
-
-        ));
-
-        foreach ( $caps as $cap => $grant ) {
-
-            // load the capability on to the teacher role
-            $this->teacher_role->add_cap($cap, $grant);
-
-        } // end for each
-
-    }// end add_cap
-
-    /**
-     * Sensei_Teacher::teacher_meta_box
-     *
-     * Add the teacher metabox to the course post type edit screen
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameter string $post_type
-     * @parameter WP_Post $post
-     * @return void
-     */
-    public function add_teacher_meta_boxes ( $post ) {
-
-        if( !current_user_can('manage_options') ){
-            return;
-        }
-        add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
-            'course',
-            'side',
-            'core'
-        );
-
-    } // end teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::teacher_meta_box_content
-     *
-     * Render the teacher meta box markup
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     */
-    public function teacher_meta_box_content ( $post ) {
-
-        // get the current author
-        $current_author = $post->post_author;
-
-        //get the users authorised to author courses
-        $users = $this->get_teachers_and_authors();
-
-    ?>
+	/**
+	 * $teacher_role
+	 *
+	 * Keeps a reference to the teacher role object
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	protected $teacher_role;
+
+	/**
+	 * $token
+	 *
+	 * Keeps a reference to the global sensei token
+	 *
+	 * @access protected
+	 * @since 1.8.0
+	 */
+	public  $token;
+
+	/**
+	 * Sensei_Teacher::__constructor
+	 *
+	 * Constructor Function
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 */
+	public function __construct ( ) {
+
+		add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
+		add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
+		add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
+		add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
+		add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
+
+		add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
+
+		//filter the quiz submissions
+		add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
+
+		//grading totals count only those belonging to the teacher
+		add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
+
+		// show the courses owned by a user on his author archive page
+		add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
+
+		// notify admin when a teacher creates a course
+		add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
+
+		// limit the analysis view to only the users taking courses belong to this teacher
+		add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
+
+		// give teacher access to question post type
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
+
+		// Teacher column on the courses list on the admin edit screen
+		add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
+		add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
+
+		//admin edit messages query limit teacher
+		add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
+
+		//add filter by teacher on courses list
+		add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
+		add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
+
+		// Handle media library restrictions
+		add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
+		add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
+
+		// update lesson owner to course teacher when saved
+		add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+
+		// If a Teacher logs in, redirect to /wp-admin/
+		add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
+
+
+		add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
+		add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
+
+
+	} // end __constructor()
+
+	/**
+	 * Sensei_Teacher::create_teacher_role
+	 *
+	 * This function checks if the role exist, if not it creates it.
+	 * for the teacher role
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @return void
+	 */
+	public function create_role ( ) {
+
+		// check if the role exists
+		$this->teacher_role = get_role( 'teacher' );
+
+		// if the the teacher is not a valid WordPress role create it
+	   if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
+		   // create the role
+		   $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
+	   }
+
+	   // add the capabilities before returning
+		$this->add_capabilities();
+
+	}// end create_teacher_role
+
+	/**
+	 * Sensei_Teacher::add_capabilities
+	 *
+	 * @since 1.8.0
+	 * @access protected
+	 */
+	protected function add_capabilities ( ) {
+
+		// if this is not a valid WP_Role object exit without adding anything
+		if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
+			return;
+		}
+
+		/**
+		 * Sensei teachers capabilities array filter
+		 *
+		 * These capabilities will be applied to the teacher role
+		 * @param array $capabilities
+		 * keys: (string) $cap_name => (bool) $grant
+		 */
+		$caps = apply_filters( 'sensei_teacher_role_capabilities', array(
+			// General access rules
+			'read' => true,
+			'manage_sensei_grades' => true,
+			'moderate_comments'=> true,
+			'upload_files'	=> true,
+			'edit_files'	=> true,
+
+			//Lessons
+			'publish_lessons'	 => true,
+			'manage_lesson_categories'	 => true,
+			'edit_lessons'	 => true,
+			'edit_published_lessons'  => true,
+			'edit_private_lessons' => true,
+			'read_private_lessons' => true,
+			'delete_published_lessons' => true,
+
+			// Courses
+			'create_courses' => true,
+			'publish_courses'	 => false,
+			'manage_course_categories'	 => true,
+			'edit_courses'	 => true,
+			'edit_published_courses'  => true,
+			'edit_private_courses' => true,
+			'read_private_courses' => true,
+			'delete_published_courses' => true,
+
+			// Quiz
+			'publish_quizzes'	 => true,
+			'edit_quizzes'	 => true,
+			'edit_published_quizzes'  => true,
+			'edit_private_quizzes' => true,
+			'read_private_quizzes' => true,
+
+			// Questions
+			'publish_questions'	 => true,
+			'edit_questions'	 => true,
+			'edit_published_questions'  => true,
+			'edit_private_questions' => true,
+			'read_private_questions' => true,
+
+			//messages
+			'publish_sensei_messages'	 => true,
+			'edit_sensei_messages'	 => true,
+			'edit_published_sensei_messages'  => true,
+			'edit_private_sensei_messages' => true,
+			'read_private_sensei_messages' => true,
+
+			// Comments -
+			// Necessary cap so Teachers can moderate comments
+			// on their own lessons. We restrict access to other
+			// post types in $this->restrict_posts_menu_page()
+
+			'edit_posts' => true,
+
+		));
+
+		foreach ( $caps as $cap => $grant ) {
+
+			// load the capability on to the teacher role
+			$this->teacher_role->add_cap($cap, $grant);
+
+		} // end for each
+
+	}// end add_cap
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box
+	 *
+	 * Add the teacher metabox to the course post type edit screen
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameter string $post_type
+	 * @parameter WP_Post $post
+	 * @return void
+	 */
+	public function add_teacher_meta_boxes ( $post ) {
+
+		if( !current_user_can('manage_options') ){
+			return;
+		}
+		add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
+			'course',
+			'side',
+			'core'
+		);
+
+	} // end teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::teacher_meta_box_content
+	 *
+	 * Render the teacher meta box markup
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 */
+	public function teacher_meta_box_content ( $post ) {
+
+		// get the current author
+		$current_author = $post->post_author;
+
+		//get the users authorised to author courses
+		$users = $this->get_teachers_and_authors();
+
+	?>
         <select name="sensei-course-teacher-author" class="sensei course teacher">
 
             <?php foreach ( $users as $user_id ) { ?>
 
                     <?php
-                        $user = get_user_by('id', $user_id);
-                    ?>
+						$user = get_user_by('id', $user_id);
+					?>
                     <option <?php selected(  $current_author , $user_id , true ); ?> value="<?php echo $user_id; ?>" >
                         <?php echo  $user->display_name; ?>
                     </option>
@@ -269,1289 +269,1289 @@ 
 
         <?php
 
-    } // end render_teacher_meta_box()
-
-    /**
-     * Sensei_Teacher::get_teachers_and_authors
-     *
-     * Get a list of users who can author courses, lessons and quizes.
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function get_teachers_and_authors ( ){
-
-        $author_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'who'          => 'authors'
-        );
-
-        $authors = get_users( $author_query_args );
-
-        $teacher_query_args = array(
-            'blog_id'      => $GLOBALS['blog_id'],
-            'fields'       => 'any',
-            'role'         => 'teacher',
-        );
-
-        $teachers = get_users( $teacher_query_args );
-
-        return  array_unique( array_merge( $teachers, $authors ) );
-
-    }// end get_teachers_and_authors
-
-    /**
-     * Sensei_Teacher::save_teacher_meta_box
-     *
-     * Save the new teacher / author to course and all lessons
-     *
-     * Hooked into admin_init
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function save_teacher_meta_box ( $course_id ){
+	} // end render_teacher_meta_box()
+
+	/**
+	 * Sensei_Teacher::get_teachers_and_authors
+	 *
+	 * Get a list of users who can author courses, lessons and quizes.
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function get_teachers_and_authors ( ){
+
+		$author_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'who'          => 'authors'
+		);
+
+		$authors = get_users( $author_query_args );
+
+		$teacher_query_args = array(
+			'blog_id'      => $GLOBALS['blog_id'],
+			'fields'       => 'any',
+			'role'         => 'teacher',
+		);
+
+		$teachers = get_users( $teacher_query_args );
+
+		return  array_unique( array_merge( $teachers, $authors ) );
+
+	}// end get_teachers_and_authors
+
+	/**
+	 * Sensei_Teacher::save_teacher_meta_box
+	 *
+	 * Save the new teacher / author to course and all lessons
+	 *
+	 * Hooked into admin_init
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function save_teacher_meta_box ( $course_id ){
 
-        // check if this is a post from saving the teacher, if not exit early
-        if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
-            return;
-        }
+		// check if this is a post from saving the teacher, if not exit early
+		if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
+			return;
+		}
 
-        //don't fire this hook again
-        remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
+		//don't fire this hook again
+		remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
 
-        // get the current post object
-        $post = get_post( $course_id );
+		// get the current post object
+		$post = get_post( $course_id );
 
-        // get the current teacher/author
-        $current_author = absint( $post->post_author );
-        $new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
+		// get the current teacher/author
+		$current_author = absint( $post->post_author );
+		$new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
 
-        // loop through all post lessons to update their authors as well
-        $this->update_course_lessons_author( $course_id , $new_author );
+		// loop through all post lessons to update their authors as well
+		$this->update_course_lessons_author( $course_id , $new_author );
 
-        // do not do any processing if the selected author is the same as the current author
-        if( $current_author == $new_author ){
-            return;
-        }
+		// do not do any processing if the selected author is the same as the current author
+		if( $current_author == $new_author ){
+			return;
+		}
 
-        // save the course  author
-        $post_updates = array(
-            'ID' => $post->ID ,
-            'post_author' => $new_author
-        );
-        wp_update_post( $post_updates );
+		// save the course  author
+		$post_updates = array(
+			'ID' => $post->ID ,
+			'post_author' => $new_author
+		);
+		wp_update_post( $post_updates );
 
-        // ensure the the modules are update so that then new teacher has access to them
-        Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
+		// ensure the the modules are update so that then new teacher has access to them
+		Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
 
-        // notify the new teacher
-        $this->teacher_course_assigned_notification( $new_author, $course_id );
+		// notify the new teacher
+		$this->teacher_course_assigned_notification( $new_author, $course_id );
 
-    } // end save_teacher_meta_box
+	} // end save_teacher_meta_box
 
-    /**
-     * Update all the course terms set(selected) on the given course. Moving course term ownership to
-     * the new author. Making sure the course terms are maintained.
-     *
-     * This function also checks if terms are shared, with other courses
-     *
-     * @param $course_id
-     * @param $new_teacher_id
-     * @return void
-     */
-    public static function update_course_modules_author( $course_id ,$new_teacher_id ){
+	/**
+	 * Update all the course terms set(selected) on the given course. Moving course term ownership to
+	 * the new author. Making sure the course terms are maintained.
+	 *
+	 * This function also checks if terms are shared, with other courses
+	 *
+	 * @param $course_id
+	 * @param $new_teacher_id
+	 * @return void
+	 */
+	public static function update_course_modules_author( $course_id ,$new_teacher_id ){
 
-        if( empty( $course_id ) || empty( $new_teacher_id ) ){
-            return false;
-        }
+		if( empty( $course_id ) || empty( $new_teacher_id ) ){
+			return false;
+		}
 
-        $terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
+		$terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
 
-        if( empty( $terms_selected_on_course ) ){
-            return;
-        }
+		if( empty( $terms_selected_on_course ) ){
+			return;
+		}
 
-        foreach( $terms_selected_on_course as $term ){
+		foreach( $terms_selected_on_course as $term ){
 
-            $term_author = Sensei_Core_Modules::get_term_author( $term->slug );
-            if( $new_teacher_id != $term_author->ID  ){
+			$term_author = Sensei_Core_Modules::get_term_author( $term->slug );
+			if( $new_teacher_id != $term_author->ID  ){
 
-                $new_term = '';
+				$new_term = '';
 
-                //if the new teacher is admin first check to see if the term with this name already exists
-                if( user_can( $new_teacher_id, 'manage_options' ) ){
+				//if the new teacher is admin first check to see if the term with this name already exists
+				if( user_can( $new_teacher_id, 'manage_options' ) ){
 
-                    $slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
-                    $term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
-                    $existing_admin_terms = get_terms( 'module', $term_args );
-                    if( !empty( $existing_admin_terms ) ){
-                        // insert it even if it exists
-                        $new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
-                    }
-                }
+					$slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
+					$term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
+					$existing_admin_terms = get_terms( 'module', $term_args );
+					if( !empty( $existing_admin_terms ) ){
+						// insert it even if it exists
+						$new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
+					}
+				}
 
-                if( empty ( $new_term ) ){
+				if( empty ( $new_term ) ){
 
-                   //setup the new slug
-                   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
-
-                   // create new term and set it
-                   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
-
-                }
+				   //setup the new slug
+				   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
+
+				   // create new term and set it
+				   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
+
+				}
 
 
 
-                // if term exists
-                if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
+				// if term exists
+				if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
 
-                    $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
-                    $term_id = $existing_term->term_id;
+					$existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
+					$term_id = $existing_term->term_id;
 
-                }else{
+				}else{
 
-                    // for a new term simply get the term from the returned value
-                    $term_id = $new_term['term_id'];
+					// for a new term simply get the term from the returned value
+					$term_id = $new_term['term_id'];
 
-                } // end if term exist
+				} // end if term exist
 
-                // set the terms selected on the course
-                wp_set_object_terms( $course_id, $term_id , 'module', true );
+				// set the terms selected on the course
+				wp_set_object_terms( $course_id, $term_id , 'module', true );
 
-                // remove old term
-                wp_remove_object_terms( $course_id, $term->term_id, 'module' );
+				// remove old term
+				wp_remove_object_terms( $course_id, $term->term_id, 'module' );
 
-                // update the lessons within the current module term
-                $lessons = Sensei()->course->course_lessons( $course_id );
-                foreach( $lessons as $lesson  ){
+				// update the lessons within the current module term
+				$lessons = Sensei()->course->course_lessons( $course_id );
+				foreach( $lessons as $lesson  ){
 
-                    if( has_term( $term->slug, 'module', $lesson ) ){
+					if( has_term( $term->slug, 'module', $lesson ) ){
 
-                        // add the new term, the false at the end says to replace all terms on this module
-                        // with the new term.
-                        wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
-                        update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
-                    }
+						// add the new term, the false at the end says to replace all terms on this module
+						// with the new term.
+						wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
+						update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
+					}
 
-                }// end for each
+				}// end for each
 
-            }
-        }
+			}
+		}
 
-    }// end update_course_module_terms_author
+	}// end update_course_module_terms_author
 
-    /**
-     * Sensei_Teacher::update_course_lessons_author
-     *
-     * Update all course lessons and their quiz with a new author
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters
-     * @return array $users user id array
-     */
-    public function update_course_lessons_author ( $course_id, $new_author  ){
+	/**
+	 * Sensei_Teacher::update_course_lessons_author
+	 *
+	 * Update all course lessons and their quiz with a new author
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters
+	 * @return array $users user id array
+	 */
+	public function update_course_lessons_author ( $course_id, $new_author  ){
 
 
-        if( empty( $course_id ) || empty( $new_author ) ){
-            return false;
-        }
+		if( empty( $course_id ) || empty( $new_author ) ){
+			return false;
+		}
 
-        //get a list of course lessons
-        $lessons = Sensei()->course->course_lessons( $course_id );
+		//get a list of course lessons
+		$lessons = Sensei()->course->course_lessons( $course_id );
 
-        if( empty( $lessons )  ||  ! is_array( $lessons )  ){
-            return false;
-        }
+		if( empty( $lessons )  ||  ! is_array( $lessons )  ){
+			return false;
+		}
 
-        // update each lesson and quiz author
-        foreach( $lessons as $lesson ){
+		// update each lesson and quiz author
+		foreach( $lessons as $lesson ){
 
-            // don't update if the author is tha same as the new author
-            if( $new_author == $lesson->post_author ){
-                continue;
-            }
+			// don't update if the author is tha same as the new author
+			if( $new_author == $lesson->post_author ){
+				continue;
+			}
 
-            // update lesson author
-            wp_update_post( array(
-                'ID'=> $lesson->ID,
-                'post_author' => $new_author
-                ) );
+			// update lesson author
+			wp_update_post( array(
+				'ID'=> $lesson->ID,
+				'post_author' => $new_author
+				) );
 
-            // update quiz author
-            //get the lessons quiz
-            $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-            if( is_array( $lesson_quizzes ) ){
-                foreach ( $lesson_quizzes as $quiz_id ) {
-                    // update quiz with new author
-                    wp_update_post( array(
-                        'ID'           => $quiz_id,
-                        'post_author' =>  $new_author
-                    ) );
-                }
-            }else{
-                wp_update_post( array(
-                    'ID'           => $lesson_quizzes,
-                    'post_author' =>  $new_author
-                ) );
-            }
+			// update quiz author
+			//get the lessons quiz
+			$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+			if( is_array( $lesson_quizzes ) ){
+				foreach ( $lesson_quizzes as $quiz_id ) {
+					// update quiz with new author
+					wp_update_post( array(
+						'ID'           => $quiz_id,
+						'post_author' =>  $new_author
+					) );
+				}
+			}else{
+				wp_update_post( array(
+					'ID'           => $lesson_quizzes,
+					'post_author' =>  $new_author
+				) );
+			}
 
-        } // end for each lessons
+		} // end for each lessons
 
-        return true;
+		return true;
 
-    }// end update_course_lessons_author
-
-
-
-    /**
-     * Sensei_Teacher::course_analysis_teacher_access_limit
-     *
-     * Alter the query so that users can only see their courses on the analysis page
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters $query
-     * @return array $users user id array
-     */
-    public function course_analysis_teacher_access_limit ( $query ) {
-
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-            return $query;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $query;
-        }
-
-        $screen = get_current_screen();
-        $sensei_post_types = array('course', 'lesson', 'question' );
-
-        // exit early for the following conditions
-        $limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
-
-        if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
-            || ! in_array( $query->query['post_type'], $sensei_post_types ) ){
-            return $query;
-        }
-
-        global $current_user;
-        // set the query author to the current user to only show those those posts
-        $query->set( 'author', $current_user->ID );
-        return $query;
-
-    }// end course_analysis_teacher_access_limit
-
-
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Determine if we're in admin and the current logged in use is a teacher
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return bool $is_admin_teacher
-     */
-    public function is_admin_teacher ( ){
-
-        if( ! is_user_logged_in()){
-            return false;
-        }
-        $is_admin_teacher = false;
-
-        if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
-
-            $is_admin_teacher = true;
-
-        }
-
-        return $is_admin_teacher;
-
-    } // end is_admin_teacher
-
-    /**
-     * Show correct post counts on list table for Sensei post types
-     *
-     * @since 1.8.0
-     *
-     * @param  object $counts Default status counts
-     * @param  string $type   Current post type
-     * @param  string $perm   User permission level
-     * @return object         Modified status counts
-     */
-    public function list_table_counts( $counts, $type, $perm ) {
-        global $current_user;
-
-        if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
-            return $counts;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $counts;
-        }
-
-        $args = array(
-            'post_type' => $type,
-            'author' => $current_user->ID,
-            'posts_per_page' => -1
-        );
-
-         // Get all available statuses
-        $stati = get_post_stati();
-
-        // Update count object
-        foreach( $stati as $status ) {
-            $args['post_status'] = $status;
-            $posts = get_posts( $args );
-            $counts->$status = count( $posts );
-        }
-
-        return $counts;
-    }
-
-    /**
-     * Filter the post queries to show
-     * only lesson /course and users that belong
-     * to the current logged teacher.
-     *
-     * @since 1.8.0
-     *
-     */
-    public function filter_queries ( $query ) {
-        global $current_user;
-
-        if( ! $this->is_admin_teacher() ) {
-            return;
-        }
-
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return;
-        }
-
-        $screen = get_current_screen();
-        if( empty( $screen ) ) {
-            return $query;
-        }
-        switch( $screen->id ) {
-            case 'sensei_page_sensei_grading':
-            case 'sensei_page_sensei_analysis':
-            case 'sensei_page_sensei_learners':
-            case 'lesson':
-            case 'course':
-            case 'question':
-            case 'lesson_page_module-order':
-
-            /**
-             * sensei_filter_queries_set_author
-             * Filter the author Sensei set for queries
-             *
-             * @since 1.8.0
-             *
-             * @param int $user_id
-             * @param string $screen_id
-             *
-             */
-            $query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
-            break;
-        }
-    }
-
-    /**
-     * Limit grading quizzes to only those within courses belonging to the current teacher
-     * . This excludes the admin user.
-     *
-     * @since 1.8.0
-     * @hooked into the_comments
-     * @param array  $comments
-     *
-     * @return array $comments
-     */
-    public function filter_grading_activity_queries( $comments ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
-            return $comments ;
-        }
-
-        //check if we're on the grading screen
-        $screen = get_current_screen();
-
-        if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
-            return $comments;
-        }
-
-        // get the course and determine if the current teacher is the owner
-        // if not remove it from the list of comments to be returned
-        foreach( $comments as $key => $comment){
-            $lesson = get_post( $comment->comment_post_ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson->ID );
-            $course = get_post( $course_id );
-            if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
-                //remove this as the teacher should see this.
-                unset( $comments[ $key ] );
-            }
-        }
-        return $comments ;
-
-    }// end function filter grading
-
-    /**
-     * Limit the grading screen totals to only show lessons in the course
-     * belonging to the currently logged in teacher. This only applies to
-     * the teacher role.
-     *
-     * @since 1.8.0
-     *
-     * @hooked into sensei_count_statuses_args
-     * @param array $args
-     *
-     * @return array  $args
-     */
-    public function limit_grading_totals( $args ){
-
-        if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
-            return $args ;
-        }
-
-        //get the teachers courses
-        // the query is already filtered to only the teacher
-        $courses =  Sensei()->course->get_all_courses();
-
-        if( empty(  $courses ) || ! is_array( $courses ) ){
-            return $args;
-        }
-
-        //setup the lessons quizzes  to limit the grading totals to
-        $quiz_scope = array();
-        foreach( $courses as $course ){
-
-            $course_lessons = Sensei()->course->course_lessons( $course->ID );
-
-            if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
-
-                foreach(  $course_lessons as $lesson ){
-
-                    $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-                    if( !empty( $quiz_id ) ) {
-
-                        array_push( $quiz_scope, $quiz_id );
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        $args['post__in'] = $quiz_scope;
-
-        return $args;
-    }
-
-    /**
-     * It ensures that the author archive shows course by the current user.
-     *
-     * This function is hooked into the pre_get_posts filter
-     *
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public function add_courses_to_author_archive( $query ) {
-
-        if ( is_admin() || ! $query->is_author() ){
-            return $query;
-        }
-
-        // this should only apply to users with the teacher role
-        $current_page_user = get_user_by('login', $query->get('author_name') );
-        if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
-
-            return $query;
-
-        }
-
-        // Change post types depending on what is set already
-        $current_post_types = $query->get( 'post_type' );
-        if( empty( $current_post_types  ) ){
-
-            // if empty it means post by default, so add post so that it also includes that for now
-            $new_post_types = array( 'post', 'course' );
-
-        } elseif( is_array( $current_post_types  ) ) {
-
-            // merge the post types instead of overwriting it
-            $new_post_types = array_merge( $current_post_types, array( 'course' ) );
-
-        }else{
-
-            // in this instance it is probably just one post type in string format
-            $new_post_types =  array( $current_post_types , 'course');
-
-        }
-
-        // change the query before returning it
-        $query->set('post_type', $new_post_types );
-
-        /**
-         * Change the query on the teacher author archive template
-         *
-         * @since 1.8.4
-         * @param WP_Query $query
-         */
-        return apply_filters( 'sensei_teacher_archive_query', $query );
-
-    }
-
-    /**
-     * Notify teacher when someone assigns a course to their account.
-     *
-     * @since 1.8.0
-     *
-     * @param $teacher_id
-     * @param $course_id
-     * @return bool
-     */
-    public function teacher_course_assigned_notification( $teacher_id, $course_id ){
-
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
-            return false;
-        }
-
-        // if new user is the same as the current logged user, they don't need an email
-        if( $teacher_id == get_current_user_id() ){
-            return true;
-        }
-
-        // load the email class
-        include('emails/class-woothemes-sensei-teacher-new-course-assignment.php');
-        $email = new Teacher_New_Course_Assignment();
-        $email->trigger( $teacher_id, $course_id );
-
-        return true;
-    } // end  teacher_course_assigned_notification
-
-    /**
-     * Email the admin when a teacher creates a new course
-     *
-     * This function hooks into wp_insert_post
-     *
-     * @since 1.8.0
-     * @param int $course_id
-     * @return bool
-     */
-    public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
-
-        $course_id = $post->ID;
-
-        if( 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
-            || 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
-
-            return false;
-
-        }
-
-        /**
-         * Filter the option to send admin notification emails when teachers creation
-         * course.
-         *
-         * @since 1.8.0
-         *
-         * @param bool $on default true
-         */
-        if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
-            return false;
-        }
-
-        // setting up the data needed by the email template
-        global $sensei_email_data;
-        $template = 'admin-teacher-new-course-created';
-        $course = get_post( $course_id );
-        $teacher = new WP_User( $course->post_author );
-        $recipient = get_option('admin_email', true);
-
-        // don't send if the course is created by admin
-        if( $recipient == $teacher->user_email ){
-            return;
-        }
-
-        /**
-         * Filter the email Header for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $template
-         */
-        $heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
-
-        /**
-         * Filter the email subject for the the
-         * admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param string $subject default New course assigned to you
-         * @param string $template
-         */
-        $subject = apply_filters('sensei_email_subject',
-                                '['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
-                                $template );
-
-        //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
-
-        // Construct data array
-        $email_data = array(
-            'template'			=> $template,
-            'heading' =>  $heading,
-            'teacher'		=> $teacher,
-            'course_id'			=> $course_id,
-            'course_name'			=> $course->post_title,
-            'course_edit_link' => $course_edit_link,
-        );
-
-        /**
-         * Filter the sensei email data for the admin-teacher-new-course-created template
-         *
-         * @since 1.8.0
-         * @param array $email_data
-         * @param string $template
-         */
-        $sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
-
-        // Send mail
-        Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
-
-    }// end notify admin of course creation
-
-    /**
-     * Limit the analysis view to only the users taking courses belong to this teacher
-     *
-     * Hooked into sensei_analysis_get_learners
-     * @param array $args WP_User_Query arguments
-     * @return array $learners_query_results
-     */
-    public function limit_analysis_learners( $args ){
-
-        // show default for none teachers
-        if( ! Sensei()->teacher->is_admin_teacher() ) {
-                return $args;
-        }
-
-        // for teachers all courses only return those which belong to the teacher
-        // as they don't have access to course belonging to other users
-        $teacher_courses = Sensei()->course->get_all_courses();
+	}// end update_course_lessons_author
+
+
+
+	/**
+	 * Sensei_Teacher::course_analysis_teacher_access_limit
+	 *
+	 * Alter the query so that users can only see their courses on the analysis page
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters $query
+	 * @return array $users user id array
+	 */
+	public function course_analysis_teacher_access_limit ( $query ) {
+
+		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+			return $query;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $query;
+		}
+
+		$screen = get_current_screen();
+		$sensei_post_types = array('course', 'lesson', 'question' );
+
+		// exit early for the following conditions
+		$limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
+
+		if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
+			|| ! in_array( $query->query['post_type'], $sensei_post_types ) ){
+			return $query;
+		}
+
+		global $current_user;
+		// set the query author to the current user to only show those those posts
+		$query->set( 'author', $current_user->ID );
+		return $query;
+
+	}// end course_analysis_teacher_access_limit
+
+
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Determine if we're in admin and the current logged in use is a teacher
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return bool $is_admin_teacher
+	 */
+	public function is_admin_teacher ( ){
+
+		if( ! is_user_logged_in()){
+			return false;
+		}
+		$is_admin_teacher = false;
+
+		if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
+
+			$is_admin_teacher = true;
+
+		}
+
+		return $is_admin_teacher;
+
+	} // end is_admin_teacher
+
+	/**
+	 * Show correct post counts on list table for Sensei post types
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  object $counts Default status counts
+	 * @param  string $type   Current post type
+	 * @param  string $perm   User permission level
+	 * @return object         Modified status counts
+	 */
+	public function list_table_counts( $counts, $type, $perm ) {
+		global $current_user;
+
+		if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
+			return $counts;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $counts;
+		}
+
+		$args = array(
+			'post_type' => $type,
+			'author' => $current_user->ID,
+			'posts_per_page' => -1
+		);
+
+		 // Get all available statuses
+		$stati = get_post_stati();
+
+		// Update count object
+		foreach( $stati as $status ) {
+			$args['post_status'] = $status;
+			$posts = get_posts( $args );
+			$counts->$status = count( $posts );
+		}
+
+		return $counts;
+	}
+
+	/**
+	 * Filter the post queries to show
+	 * only lesson /course and users that belong
+	 * to the current logged teacher.
+	 *
+	 * @since 1.8.0
+	 *
+	 */
+	public function filter_queries ( $query ) {
+		global $current_user;
+
+		if( ! $this->is_admin_teacher() ) {
+			return;
+		}
+
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return;
+		}
+
+		$screen = get_current_screen();
+		if( empty( $screen ) ) {
+			return $query;
+		}
+		switch( $screen->id ) {
+			case 'sensei_page_sensei_grading':
+			case 'sensei_page_sensei_analysis':
+			case 'sensei_page_sensei_learners':
+			case 'lesson':
+			case 'course':
+			case 'question':
+			case 'lesson_page_module-order':
+
+			/**
+			 * sensei_filter_queries_set_author
+			 * Filter the author Sensei set for queries
+			 *
+			 * @since 1.8.0
+			 *
+			 * @param int $user_id
+			 * @param string $screen_id
+			 *
+			 */
+			$query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
+			break;
+		}
+	}
+
+	/**
+	 * Limit grading quizzes to only those within courses belonging to the current teacher
+	 * . This excludes the admin user.
+	 *
+	 * @since 1.8.0
+	 * @hooked into the_comments
+	 * @param array  $comments
+	 *
+	 * @return array $comments
+	 */
+	public function filter_grading_activity_queries( $comments ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
+			return $comments ;
+		}
+
+		//check if we're on the grading screen
+		$screen = get_current_screen();
+
+		if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
+			return $comments;
+		}
+
+		// get the course and determine if the current teacher is the owner
+		// if not remove it from the list of comments to be returned
+		foreach( $comments as $key => $comment){
+			$lesson = get_post( $comment->comment_post_ID );
+			$course_id = Sensei()->lesson->get_course_id( $lesson->ID );
+			$course = get_post( $course_id );
+			if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
+				//remove this as the teacher should see this.
+				unset( $comments[ $key ] );
+			}
+		}
+		return $comments ;
+
+	}// end function filter grading
+
+	/**
+	 * Limit the grading screen totals to only show lessons in the course
+	 * belonging to the currently logged in teacher. This only applies to
+	 * the teacher role.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @hooked into sensei_count_statuses_args
+	 * @param array $args
+	 *
+	 * @return array  $args
+	 */
+	public function limit_grading_totals( $args ){
+
+		if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
+			return $args ;
+		}
+
+		//get the teachers courses
+		// the query is already filtered to only the teacher
+		$courses =  Sensei()->course->get_all_courses();
+
+		if( empty(  $courses ) || ! is_array( $courses ) ){
+			return $args;
+		}
+
+		//setup the lessons quizzes  to limit the grading totals to
+		$quiz_scope = array();
+		foreach( $courses as $course ){
+
+			$course_lessons = Sensei()->course->course_lessons( $course->ID );
+
+			if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
+
+				foreach(  $course_lessons as $lesson ){
+
+					$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
+					if( !empty( $quiz_id ) ) {
+
+						array_push( $quiz_scope, $quiz_id );
+
+					}
+
+				}
+
+			}
+
+		}
+
+		$args['post__in'] = $quiz_scope;
+
+		return $args;
+	}
+
+	/**
+	 * It ensures that the author archive shows course by the current user.
+	 *
+	 * This function is hooked into the pre_get_posts filter
+	 *
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public function add_courses_to_author_archive( $query ) {
+
+		if ( is_admin() || ! $query->is_author() ){
+			return $query;
+		}
+
+		// this should only apply to users with the teacher role
+		$current_page_user = get_user_by('login', $query->get('author_name') );
+		if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
+
+			return $query;
+
+		}
+
+		// Change post types depending on what is set already
+		$current_post_types = $query->get( 'post_type' );
+		if( empty( $current_post_types  ) ){
+
+			// if empty it means post by default, so add post so that it also includes that for now
+			$new_post_types = array( 'post', 'course' );
+
+		} elseif( is_array( $current_post_types  ) ) {
+
+			// merge the post types instead of overwriting it
+			$new_post_types = array_merge( $current_post_types, array( 'course' ) );
+
+		}else{
+
+			// in this instance it is probably just one post type in string format
+			$new_post_types =  array( $current_post_types , 'course');
+
+		}
+
+		// change the query before returning it
+		$query->set('post_type', $new_post_types );
+
+		/**
+		 * Change the query on the teacher author archive template
+		 *
+		 * @since 1.8.4
+		 * @param WP_Query $query
+		 */
+		return apply_filters( 'sensei_teacher_archive_query', $query );
+
+	}
+
+	/**
+	 * Notify teacher when someone assigns a course to their account.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $teacher_id
+	 * @param $course_id
+	 * @return bool
+	 */
+	public function teacher_course_assigned_notification( $teacher_id, $course_id ){
+
+		if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
+			return false;
+		}
+
+		// if new user is the same as the current logged user, they don't need an email
+		if( $teacher_id == get_current_user_id() ){
+			return true;
+		}
+
+		// load the email class
+		include('emails/class-woothemes-sensei-teacher-new-course-assignment.php');
+		$email = new Teacher_New_Course_Assignment();
+		$email->trigger( $teacher_id, $course_id );
+
+		return true;
+	} // end  teacher_course_assigned_notification
+
+	/**
+	 * Email the admin when a teacher creates a new course
+	 *
+	 * This function hooks into wp_insert_post
+	 *
+	 * @since 1.8.0
+	 * @param int $course_id
+	 * @return bool
+	 */
+	public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
+
+		$course_id = $post->ID;
+
+		if( 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
+			|| 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
+
+			return false;
+
+		}
+
+		/**
+		 * Filter the option to send admin notification emails when teachers creation
+		 * course.
+		 *
+		 * @since 1.8.0
+		 *
+		 * @param bool $on default true
+		 */
+		if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
+			return false;
+		}
+
+		// setting up the data needed by the email template
+		global $sensei_email_data;
+		$template = 'admin-teacher-new-course-created';
+		$course = get_post( $course_id );
+		$teacher = new WP_User( $course->post_author );
+		$recipient = get_option('admin_email', true);
+
+		// don't send if the course is created by admin
+		if( $recipient == $teacher->user_email ){
+			return;
+		}
+
+		/**
+		 * Filter the email Header for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $template
+		 */
+		$heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
+
+		/**
+		 * Filter the email subject for the the
+		 * admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param string $subject default New course assigned to you
+		 * @param string $template
+		 */
+		$subject = apply_filters('sensei_email_subject',
+								'['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
+								$template );
+
+		//course edit link
+		$course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+
+		// Construct data array
+		$email_data = array(
+			'template'			=> $template,
+			'heading' =>  $heading,
+			'teacher'		=> $teacher,
+			'course_id'			=> $course_id,
+			'course_name'			=> $course->post_title,
+			'course_edit_link' => $course_edit_link,
+		);
+
+		/**
+		 * Filter the sensei email data for the admin-teacher-new-course-created template
+		 *
+		 * @since 1.8.0
+		 * @param array $email_data
+		 * @param string $template
+		 */
+		$sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
+
+		// Send mail
+		Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
+
+	}// end notify admin of course creation
+
+	/**
+	 * Limit the analysis view to only the users taking courses belong to this teacher
+	 *
+	 * Hooked into sensei_analysis_get_learners
+	 * @param array $args WP_User_Query arguments
+	 * @return array $learners_query_results
+	 */
+	public function limit_analysis_learners( $args ){
+
+		// show default for none teachers
+		if( ! Sensei()->teacher->is_admin_teacher() ) {
+				return $args;
+		}
+
+		// for teachers all courses only return those which belong to the teacher
+		// as they don't have access to course belonging to other users
+		$teacher_courses = Sensei()->course->get_all_courses();
 
-        // if the user has no courses they should see no users
-        if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
-            // tell the query to return 0 students
-            $args[ 'include'] = array( 0 );
-            return $args;
-
-        }
-
-        $learner_ids_for_teacher_courses = array();
-        foreach( $teacher_courses as $course ){
-
-            $course_learner_ids = array();
-            $activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
-
-            if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
-                continue; // skip to the next course as there are no users on this course
-            }
-
-            // it could be an array of comments or a single comment
-            if( is_array( $activity_comments ) ){
+		// if the user has no courses they should see no users
+		if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
+			// tell the query to return 0 students
+			$args[ 'include'] = array( 0 );
+			return $args;
+
+		}
+
+		$learner_ids_for_teacher_courses = array();
+		foreach( $teacher_courses as $course ){
+
+			$course_learner_ids = array();
+			$activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
+
+			if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
+				continue; // skip to the next course as there are no users on this course
+			}
+
+			// it could be an array of comments or a single comment
+			if( is_array( $activity_comments ) ){
 
-                foreach( $activity_comments as $comment ){
+				foreach( $activity_comments as $comment ){
 
-                    $user = get_userdata( $comment->user_id );
+					$user = get_userdata( $comment->user_id );
 
-                    if( empty( $user ) ){
-                        // next comment in this array
-                        continue;
-                    }
+					if( empty( $user ) ){
+						// next comment in this array
+						continue;
+					}
 
-                    $course_learner_ids[] = $user->ID;
-                }
+					$course_learner_ids[] = $user->ID;
+				}
 
-            }else{
+			}else{
 
-                $user = get_userdata( $activity_comments->user_id );
-                $course_learner_ids[] = $user->ID;
+				$user = get_userdata( $activity_comments->user_id );
+				$course_learner_ids[] = $user->ID;
 
-            }
+			}
 
-            // add learners on this course to the all courses learner list
-            $learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
+			// add learners on this course to the all courses learner list
+			$learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
 
-        }
+		}
 
-        // if there are no students taking the courses by this teacher don't show them any of the other users
-        if( empty( $learner_ids_for_teacher_courses ) ){
+		// if there are no students taking the courses by this teacher don't show them any of the other users
+		if( empty( $learner_ids_for_teacher_courses ) ){
 
-            $args[ 'include'] = array( 0 );
+			$args[ 'include'] = array( 0 );
 
-        }else{
+		}else{
 
-            $args[ 'include'] = $learner_ids_for_teacher_courses;
+			$args[ 'include'] = $learner_ids_for_teacher_courses;
 
-        }
+		}
 
-        // return the WP_Use_Query arguments
-        return $args;
+		// return the WP_Use_Query arguments
+		return $args;
 
-    }// end limit_analysis_learners
+	}// end limit_analysis_learners
 
-    /**
-     * Give teacher full admin access to the question post type
-     * in certain cases.
-     *
-     * @since 1.8.0
-     * @param $questions
-     * @return mixed
-     */
-    public function allow_teacher_access_to_questions( $questions, $quiz_id ){
+	/**
+	 * Give teacher full admin access to the question post type
+	 * in certain cases.
+	 *
+	 * @since 1.8.0
+	 * @param $questions
+	 * @return mixed
+	 */
+	public function allow_teacher_access_to_questions( $questions, $quiz_id ){
 
-        if( ! $this->is_admin_teacher() ){
-            return $questions;
-        }
+		if( ! $this->is_admin_teacher() ){
+			return $questions;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        // don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
-        remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
+		// don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
+		remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
 
-        if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
+		if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
-                $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
+				$questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
 
-                // set the teacher as the current use again
-                wp_set_current_user( $current_teacher_id );
-            }
+				// set the teacher as the current use again
+				wp_set_current_user( $current_teacher_id );
+			}
 
-        }
-        // attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
+		}
+		// attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
+		add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
 
-        return $questions;
-    }
+		return $questions;
+	}
 
-    /**
-     * Give the teacher role access to questions from the question bank
-     *
-     * @since 1.8.0
-     * @param $wp_query
-     * @return mixed
-     */
-    public function give_access_to_all_questions( $wp_query ){
+	/**
+	 * Give the teacher role access to questions from the question bank
+	 *
+	 * @since 1.8.0
+	 * @param $wp_query
+	 * @return mixed
+	 */
+	public function give_access_to_all_questions( $wp_query ){
 
-        if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
+		if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
 
-            return $wp_query;
-        }
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
-        if( ( isset($screen->id) && 'lesson' == $screen->id )
-            || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
+		$screen = get_current_screen();
+		if( ( isset($screen->id) && 'lesson' == $screen->id )
+			|| ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
 
-            $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+			$admin_user = get_user_by('email', get_bloginfo('admin_email'));
+			if( ! empty($admin_user) ){
 
-                $current_teacher_id = get_current_user_id();
+				$current_teacher_id = get_current_user_id();
 
-                // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
+				// set current user to admin so teacher can view all questions
+				wp_set_current_user( $admin_user->ID  );
 
-                //run new query as admin
-                $wp_query = new WP_Query( $wp_query->query );
+				//run new query as admin
+				$wp_query = new WP_Query( $wp_query->query );
 
-                //set the teache as current use again
-                wp_set_current_user( $current_teacher_id );
+				//set the teache as current use again
+				wp_set_current_user( $current_teacher_id );
 
-            }
-        }
+			}
+		}
 
-        return $wp_query;
-    }// end give_access_to_all_questions
+		return $wp_query;
+	}// end give_access_to_all_questions
 
-    /**
-     * Add new column heading to the course admin edit list
-     *
-     * @since 1.8.0
-     * @param $columns
-     * @return array
-     */
-    public function course_column_heading($columns) {
+	/**
+	 * Add new column heading to the course admin edit list
+	 *
+	 * @since 1.8.0
+	 * @param $columns
+	 * @return array
+	 */
+	public function course_column_heading($columns) {
 
-        if( $this->is_admin_teacher() ){
-            return $columns;
-        }
-        $new_columns = array(
-            'teacher' => __('Teacher', 'woothemes-sensei'),
-        );
-        return array_merge($columns, $new_columns);
+		if( $this->is_admin_teacher() ){
+			return $columns;
+		}
+		$new_columns = array(
+			'teacher' => __('Teacher', 'woothemes-sensei'),
+		);
+		return array_merge($columns, $new_columns);
 
-    }// end teacher column add
+	}// end teacher column add
 
-    /**
-     * Print out  teacher column data
-     *
-     * @since 1.8.0
-     * @param $column
-     * @param $course_id
-     */
-    public function course_column_data( $column, $course_id  ){
+	/**
+	 * Print out  teacher column data
+	 *
+	 * @since 1.8.0
+	 * @param $column
+	 * @param $course_id
+	 */
+	public function course_column_data( $column, $course_id  ){
 
-        if( $this->is_admin_teacher() || 'teacher' != $column  ){
-            return;
-        }
+		if( $this->is_admin_teacher() || 'teacher' != $column  ){
+			return;
+		}
 
-        $course = get_post( $course_id );
-        $teacher = get_userdata( $course->post_author );
+		$course = get_post( $course_id );
+		$teacher = get_userdata( $course->post_author );
 
-        if( !$teacher ){
-            return;
-        }
+		if( !$teacher ){
+			return;
+		}
 
-        echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
+		echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
 
-    }// end course_column_ data
+	}// end course_column_ data
 
-    /**
-     * Return only courses belonging to the given teacher.
-     *
-     *
-     * @since 1.8.0
-     *
-     * @param int $teacher_id
-     * @param bool $return_ids_only
-     *
-     * @return array $teachers_courses
-     */
-    public function get_teacher_courses( $teacher_id, $return_ids_only= false){
+	/**
+	 * Return only courses belonging to the given teacher.
+	 *
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $teacher_id
+	 * @param bool $return_ids_only
+	 *
+	 * @return array $teachers_courses
+	 */
+	public function get_teacher_courses( $teacher_id, $return_ids_only= false){
 
-        $teachers_courses = array();
+		$teachers_courses = array();
 
-        if( empty( $teacher_id  ) ){
-            $teacher_id = get_current_user_id();
-        }
+		if( empty( $teacher_id  ) ){
+			$teacher_id = get_current_user_id();
+		}
 
-        $all_courses = Sensei()->course->get_all_courses();
+		$all_courses = Sensei()->course->get_all_courses();
 
-        if( empty( $all_courses ) ){
-            return $all_courses;
-        }
+		if( empty( $all_courses ) ){
+			return $all_courses;
+		}
 
-        foreach( $all_courses as $course ){
+		foreach( $all_courses as $course ){
 
-            if( $course->post_author != $teacher_id  ){
-                continue;
-            }
+			if( $course->post_author != $teacher_id  ){
+				continue;
+			}
 
-            if( $return_ids_only ){
+			if( $return_ids_only ){
 
-                $teachers_courses[] = $course->ID;
+				$teachers_courses[] = $course->ID;
 
-            }else{
+			}else{
 
-                $teachers_courses[] = $course;
+				$teachers_courses[] = $course;
 
-            }
+			}
 
-        }
+		}
 
-        return $teachers_courses;
+		return $teachers_courses;
 
-    }
+	}
 
-    /**
-     * Limit the message display to only those sent to the current teacher
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return mixed
-     */
-    public function limit_edit_messages_query( $query ){
-        if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
-            return $query;
-        }
-
-        $teacher = wp_get_current_user();
-
-        $query->set( 'meta_key', '_receiver' );
-        $meta_query_args = array(
-            'key'     => '_receiver',
-            'value'   => $teacher->get('user_login') ,
-            'compare' => '='
-        );
+	/**
+	 * Limit the message display to only those sent to the current teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return mixed
+	 */
+	public function limit_edit_messages_query( $query ){
+		if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
+			return $query;
+		}
+
+		$teacher = wp_get_current_user();
+
+		$query->set( 'meta_key', '_receiver' );
+		$meta_query_args = array(
+			'key'     => '_receiver',
+			'value'   => $teacher->get('user_login') ,
+			'compare' => '='
+		);
 
-        $query->set('meta_query', $meta_query_args  );
+		$query->set('meta_query', $meta_query_args  );
 
-        return $query;
-    }
+		return $query;
+	}
 
 
-    /**
-     * Add options to filter courses by teacher
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function course_teacher_filter_options() {
-        global $typenow;
+	/**
+	 * Add options to filter courses by teacher
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function course_teacher_filter_options() {
+		global $typenow;
 
-        if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
-            return;
-        }
+		if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
+			return;
+		}
 
-        // get all roles
-        $roles = get_editable_roles();
+		// get all roles
+		$roles = get_editable_roles();
 
-        // get roles with the course edit capability
-        // and then get the users with those roles
-        $users_who_can_edit_courses = array();
-        foreach( $roles as $role_item ){
+		// get roles with the course edit capability
+		// and then get the users with those roles
+		$users_who_can_edit_courses = array();
+		foreach( $roles as $role_item ){
 
-            $role = get_role( strtolower( $role_item['name'] ) );
+			$role = get_role( strtolower( $role_item['name'] ) );
 
-            if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
+			if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
 
-                $user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
-                $role_users_who_can_edit_courses = get_users( $user_query_args );
+				$user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
+				$role_users_who_can_edit_courses = get_users( $user_query_args );
 
-                // add user from the current $user_role to all users
-                $users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
+				// add user from the current $user_role to all users
+				$users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
 
-            }
+			}
 
-        }
+		}
 
-        // Create the select element with the given users who can edit course
-        $selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-        $course_options = '';
-        foreach( $users_who_can_edit_courses as $user ) {
-            $course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
-        }
+		// Create the select element with the given users who can edit course
+		$selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+		$course_options = '';
+		foreach( $users_who_can_edit_courses as $user ) {
+			$course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
+		}
 
-        $output = '<select name="course_teacher" id="dropdown_course_teachers">';
-        $output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
-        $output .= $course_options;
-        $output .= '</select>';
+		$output = '<select name="course_teacher" id="dropdown_course_teachers">';
+		$output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
+		$output .= $course_options;
+		$output .= '</select>';
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Modify the main query on the admin course list screen
-     *
-     * @since 1.8.0
-     *
-     * @param $query
-     * @return $query
-     */
-    public function teacher_filter_query_modify( $query ){
-        global $typenow;
+	/**
+	 * Modify the main query on the admin course list screen
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $query
+	 * @return $query
+	 */
+	public function teacher_filter_query_modify( $query ){
+		global $typenow;
 
-        if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
-            return $query;
-        }
-        $course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
-
-        if( empty( $course_teacher ) ) {
-            return $query;
-        }
-
-        $query['author'] = $course_teacher;
-        return $query;
-    }
-
-    /**
-     * Only show current teacher's media in the media library
-     * @param  array $request Default request arguments
-     * @return array          Modified request arguments
-     */
-    public function restrict_media_library( $request = array() ) {
-
-        if( ! is_admin() ) {
-            return $request;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $request;
-        }
-
-        $screen = get_current_screen();
-
-        if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
-            $teacher = intval( get_current_user_id() );
-
-            if( $teacher ) {
-                $request['author__in'] = array( $teacher );
-            }
-        }
-
-        return $request;
-    } // End restrict_media_library()
-
-    /**
-     * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
-     * @param  array $query Default query arguments
-     * @return array        Modified query arguments
-     */
-    public function restrict_media_library_modal( $query = array() ) {
-
-        if( ! is_admin() ) {
-            return $query;
-        }
-
-        if( ! $this->is_admin_teacher() ) {
-            return $query;
-        }
-
-        $teacher = intval( get_current_user_id() );
-
-        if( $teacher ) {
-            $query['author__in'] = array( $teacher );
-        }
-
-        return $query;
-    } // End restrict_media_library_modal()
-
-    /**
-     * When saving the lesson, update the teacher if the lesson belongs to a course
-     *
-     * @since 1.8.0
-     *
-     * @param int $lesson_id
-     */
-    public function update_lesson_teacher( $lesson_id ){
-
-        if( 'lesson'!= get_post_type() ){
-            return;
-        }
+		if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
+			return $query;
+		}
+		$course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+
+		if( empty( $course_teacher ) ) {
+			return $query;
+		}
+
+		$query['author'] = $course_teacher;
+		return $query;
+	}
+
+	/**
+	 * Only show current teacher's media in the media library
+	 * @param  array $request Default request arguments
+	 * @return array          Modified request arguments
+	 */
+	public function restrict_media_library( $request = array() ) {
+
+		if( ! is_admin() ) {
+			return $request;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $request;
+		}
+
+		$screen = get_current_screen();
+
+		if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
+			$teacher = intval( get_current_user_id() );
+
+			if( $teacher ) {
+				$request['author__in'] = array( $teacher );
+			}
+		}
+
+		return $request;
+	} // End restrict_media_library()
+
+	/**
+	 * Only show current teacher's media in the media library modal on the course/lesson/quesion edit screen
+	 * @param  array $query Default query arguments
+	 * @return array        Modified query arguments
+	 */
+	public function restrict_media_library_modal( $query = array() ) {
+
+		if( ! is_admin() ) {
+			return $query;
+		}
+
+		if( ! $this->is_admin_teacher() ) {
+			return $query;
+		}
+
+		$teacher = intval( get_current_user_id() );
+
+		if( $teacher ) {
+			$query['author__in'] = array( $teacher );
+		}
+
+		return $query;
+	} // End restrict_media_library_modal()
+
+	/**
+	 * When saving the lesson, update the teacher if the lesson belongs to a course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param int $lesson_id
+	 */
+	public function update_lesson_teacher( $lesson_id ){
+
+		if( 'lesson'!= get_post_type() ){
+			return;
+		}
 
-        // this should only run once per request cycle
-        remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+		// this should only run once per request cycle
+		remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
 
-        if(  empty( $course_id ) || ! $course_id ){
-            return;
-        }
+		if(  empty( $course_id ) || ! $course_id ){
+			return;
+		}
 
-        $course = get_post( $course_id );
+		$course = get_post( $course_id );
 
-        $lesson_update_args= array(
-            'ID' => $lesson_id ,
-            'post_author' => $course->post_author
-        );
-        wp_update_post( $lesson_update_args );
+		$lesson_update_args= array(
+			'ID' => $lesson_id ,
+			'post_author' => $course->post_author
+		);
+		wp_update_post( $lesson_update_args );
 
-    } // end update_lesson_teacher
+	} // end update_lesson_teacher
 
-    /**
-     * Sensei_Teacher::limit_teacher_edit_screen_post_types
-     *
-     * Limit teachers to only see their courses, lessons and questions
-     *
-     * @since 1.8.0
-     * @access public
-     * @parameters array $wp_query
-     * @return WP_Query $wp_query
-     */
-    public function limit_teacher_edit_screen_post_types( $wp_query ) {
-        global $current_user;
+	/**
+	 * Sensei_Teacher::limit_teacher_edit_screen_post_types
+	 *
+	 * Limit teachers to only see their courses, lessons and questions
+	 *
+	 * @since 1.8.0
+	 * @access public
+	 * @parameters array $wp_query
+	 * @return WP_Query $wp_query
+	 */
+	public function limit_teacher_edit_screen_post_types( $wp_query ) {
+		global $current_user;
 
-        //exit early
-        if( ! $this->is_admin_teacher() ){
-            return $wp_query;
-        }
+		//exit early
+		if( ! $this->is_admin_teacher() ){
+			return $wp_query;
+		}
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
-            return $wp_query;
-        }
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return $wp_query;
+		}
 
-        $screen = get_current_screen();
+		$screen = get_current_screen();
 
-        if( empty( $screen ) ){
-            return $wp_query;
-        }
+		if( empty( $screen ) ){
+			return $wp_query;
+		}
 
-        // for any of these conditions limit what the teacher will see
-        $limit_screens = array(
-            'edit-lesson',
-            'edit-course',
-            'edit-question',
-            'course_page_course-order',
-            'lesson_page_lesson-order',
-        );
+		// for any of these conditions limit what the teacher will see
+		$limit_screens = array(
+			'edit-lesson',
+			'edit-course',
+			'edit-question',
+			'course_page_course-order',
+			'lesson_page_lesson-order',
+		);
 
-        if(  in_array($screen->id  , $limit_screens ) ) {
+		if(  in_array($screen->id  , $limit_screens ) ) {
 
-            // set the query author to the current user to only show those those posts
-            $wp_query->set( 'author', $current_user->ID );
-        }
+			// set the query author to the current user to only show those those posts
+			$wp_query->set( 'author', $current_user->ID );
+		}
 
-        return $wp_query;
+		return $wp_query;
 
-    } // end limit_teacher_edit_screen_post_types()
+	} // end limit_teacher_edit_screen_post_types()
 
 
-    /**
-     * Sensei_Teacher::teacher_login_redirect
-     *
-     * Redirect teachers to /wp-admin/ after login
-     *
-     * @since 1.8.7
-     * @access public
-     * @param string $user_login
-     * @param object $user
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::teacher_login_redirect
+	 *
+	 * Redirect teachers to /wp-admin/ after login
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @param string $user_login
+	 * @param object $user
+	 * @return void
+	 */
 
-    public function teacher_login_redirect( $user_login, $user  ) {
+	public function teacher_login_redirect( $user_login, $user  ) {
 
-        if (user_can($user, 'edit_courses')) {
+		if (user_can($user, 'edit_courses')) {
 
-            if (isset($_POST['redirect_to'])) {
+			if (isset($_POST['redirect_to'])) {
 
-                wp_redirect($_POST['redirect_to'], 303);
+				wp_redirect($_POST['redirect_to'], 303);
 
-                exit;
+				exit;
 
-            } else {
+			} else {
 
-                wp_redirect(admin_url(), 303);
+				wp_redirect(admin_url(), 303);
 
-                exit;
+				exit;
 
-            }
-        }
+			}
+		}
 
-    } // end teacher_login_redirect()
+	} // end teacher_login_redirect()
 
 
 
-    /**
-     * Sensei_Teacher::restrict_posts_menu_page()
-     *
-     * Remove the Posts menu page for teachers and restrict access to it.
-     * We have to do this because we give teachers the 'edit_posts' cap
-     * so they can 'moderate_comments' as well.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters void
-     * @return void
-     */
+	/**
+	 * Sensei_Teacher::restrict_posts_menu_page()
+	 *
+	 * Remove the Posts menu page for teachers and restrict access to it.
+	 * We have to do this because we give teachers the 'edit_posts' cap
+	 * so they can 'moderate_comments' as well.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters void
+	 * @return void
+	 */
 
-    public function restrict_posts_menu_page() {
+	public function restrict_posts_menu_page() {
 
-        global $pagenow, $typenow;
+		global $pagenow, $typenow;
 
-        $user = wp_get_current_user();
+		$user = wp_get_current_user();
 
-        /**
-         * Filter the option to hide the Posts menu page.
-         *
-         * @since 1.8.7
-         *
-         * @param bool $restrict default true
-         */
+		/**
+		 * Filter the option to hide the Posts menu page.
+		 *
+		 * @since 1.8.7
+		 *
+		 * @param bool $restrict default true
+		 */
 
-        $restrict = apply_filters('sensei_restrict_posts_menu_page', true );
+		$restrict = apply_filters('sensei_restrict_posts_menu_page', true );
 
-        if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
+		if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
 
-            remove_menu_page('edit.php');
+			remove_menu_page('edit.php');
 
-            if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
+			if ($pagenow == "edit.php" || $pagenow == "post-new.php") {
 
-                if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
+				if ($typenow == '' || $typenow == 'post' || $typenow == 'page') {
 
-                    wp_die('You do not have sufficient permissions to access this page.');
+					wp_die('You do not have sufficient permissions to access this page.');
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    } // end restrict_posts_menu_page()
+	} // end restrict_posts_menu_page()
 
-    /**
-     * Sensei_Teacher::restrict_comment_moderation()
-     *
-     * Restrict commendation moderation for teachers
-     * so they can only moderate comments made to posts they own.
-     *
-     * @since 1.8.7
-     * @access public
-     * @parameters obj $clauses
-     * @return obj $clauses
-     */
+	/**
+	 * Sensei_Teacher::restrict_comment_moderation()
+	 *
+	 * Restrict commendation moderation for teachers
+	 * so they can only moderate comments made to posts they own.
+	 *
+	 * @since 1.8.7
+	 * @access public
+	 * @parameters obj $clauses
+	 * @return obj $clauses
+	 */
 
-    public function restrict_comment_moderation($clauses) {
+	public function restrict_comment_moderation($clauses) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
+		if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
 
-            $clauses->query_vars['post_author'] = get_current_user_id();
+			$clauses->query_vars['post_author'] = get_current_user_id();
 
-        }
+		}
 
-        return $clauses;
+		return $clauses;
 
-    }   // end restrict_comment_moderation()
+	}   // end restrict_comment_moderation()
 
-    /**
-     * Determine if a user is a teacher by ID
-     *
-     * @param int $user_id
-     *
-     * @return bool
-     */
-    public static function is_a_teacher( $user_id ){
+	/**
+	 * Determine if a user is a teacher by ID
+	 *
+	 * @param int $user_id
+	 *
+	 * @return bool
+	 */
+	public static function is_a_teacher( $user_id ){
 
-        $user = get_user_by('id', $user_id);
+		$user = get_user_by('id', $user_id);
 
-        if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
+		if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
 
-            return true;
+			return true;
 
-        }else{
+		}else{
 
-            return false;
+			return false;
 
-        }
+		}
 
-    }// end is_a_teacher
+	}// end is_a_teacher
 
-    /**
-     * The archive title on the teacher archive filter
-     *
-     * @since 1.9.0
-     */
-    public static function archive_title(){
+	/**
+	 * The archive title on the teacher archive filter
+	 *
+	 * @since 1.9.0
+	 */
+	public static function archive_title(){
 
-        $author = get_user_by( 'id', get_query_var( 'author' ) );
-        $author_name = $author->display_name;
-        ?>
+		$author = get_user_by( 'id', get_query_var( 'author' ) );
+		$author_name = $author->display_name;
+		?>
             <h2 class="teacher-archive-title">
 
                 <?php echo sprintf( __( 'All courses by %s', 'woothemes-sensei') , $author_name ); ?>
@@ -1559,17 +1559,17 @@ 
             </h2>
         <?php
 
-    }// archive title
+	}// archive title
 
-    /**
-     * Removing course meta on the teacher archive page
-     *
-     * @since 1.9.0
-     */
-    public static function remove_course_meta_on_teacher_archive(){
+	/**
+	 * Removing course meta on the teacher archive page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function remove_course_meta_on_teacher_archive(){
 
-        remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
+		remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
 
-    }
+	}
 
 } // End Class

Spacing +282 added lines, -282 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Teacher class
@@ -42,58 +42,58 @@ 
      * @since 1.8.0
      * @access public
      */
-    public function __construct ( ) {
+    public function __construct( ) {
 
-        add_action( 'add_meta_boxes', array( $this , 'add_teacher_meta_boxes' ) , 10, 2 );
-        add_action( 'save_post',  array( $this, 'save_teacher_meta_box' ) );
-        add_filter( 'parse_query', array( $this, 'limit_teacher_edit_screen_post_types' ));
-        add_filter( 'pre_get_posts', array( $this, 'course_analysis_teacher_access_limit' ) );
-        add_filter( 'wp_count_posts', array( $this, 'list_table_counts' ), 10, 3 );
+        add_action('add_meta_boxes', array($this, 'add_teacher_meta_boxes'), 10, 2);
+        add_action('save_post', array($this, 'save_teacher_meta_box'));
+        add_filter('parse_query', array($this, 'limit_teacher_edit_screen_post_types'));
+        add_filter('pre_get_posts', array($this, 'course_analysis_teacher_access_limit'));
+        add_filter('wp_count_posts', array($this, 'list_table_counts'), 10, 3);
 
-        add_action( 'pre_get_posts', array( $this, 'filter_queries' ) );
+        add_action('pre_get_posts', array($this, 'filter_queries'));
 
         //filter the quiz submissions
-        add_filter( 'sensei_check_for_activity' , array( $this, 'filter_grading_activity_queries') );
+        add_filter('sensei_check_for_activity', array($this, 'filter_grading_activity_queries'));
 
         //grading totals count only those belonging to the teacher
-        add_filter('sensei_count_statuses_args', array( $this, 'limit_grading_totals' ) );
+        add_filter('sensei_count_statuses_args', array($this, 'limit_grading_totals'));
 
         // show the courses owned by a user on his author archive page
-        add_filter( 'pre_get_posts', array( $this, 'add_courses_to_author_archive' ) );
+        add_filter('pre_get_posts', array($this, 'add_courses_to_author_archive'));
 
         // notify admin when a teacher creates a course
-        add_action( 'transition_post_status',array( $this, 'notify_admin_teacher_course_creation' ), 10, 3 );
+        add_action('transition_post_status', array($this, 'notify_admin_teacher_course_creation'), 10, 3);
 
         // limit the analysis view to only the users taking courses belong to this teacher
-        add_filter( 'sensei_analysis_overview_filter_users',array( $this, 'limit_analysis_learners' ) , 5, 1 );
+        add_filter('sensei_analysis_overview_filter_users', array($this, 'limit_analysis_learners'), 5, 1);
 
         // give teacher access to question post type
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20, 2 );
+        add_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20, 2);
 
         // Teacher column on the courses list on the admin edit screen
-        add_filter('manage_edit-course_columns' , array( $this, 'course_column_heading'), 10,1 );
-        add_filter('manage_course_posts_custom_column' , array( $this, 'course_column_data'), 10,2 );
+        add_filter('manage_edit-course_columns', array($this, 'course_column_heading'), 10, 1);
+        add_filter('manage_course_posts_custom_column', array($this, 'course_column_data'), 10, 2);
 
         //admin edit messages query limit teacher
-        add_filter( 'pre_get_posts', array( $this, 'limit_edit_messages_query' ) );
+        add_filter('pre_get_posts', array($this, 'limit_edit_messages_query'));
 
         //add filter by teacher on courses list
-        add_action( 'restrict_manage_posts', array( $this, 'course_teacher_filter_options' ) );
-        add_filter( 'request', array( $this, 'teacher_filter_query_modify' ) );
+        add_action('restrict_manage_posts', array($this, 'course_teacher_filter_options'));
+        add_filter('request', array($this, 'teacher_filter_query_modify'));
 
         // Handle media library restrictions
-        add_filter( 'request', array( $this, 'restrict_media_library' ), 10, 1 );
-        add_filter( 'ajax_query_attachments_args', array( $this, 'restrict_media_library_modal' ), 10, 1 );
+        add_filter('request', array($this, 'restrict_media_library'), 10, 1);
+        add_filter('ajax_query_attachments_args', array($this, 'restrict_media_library_modal'), 10, 1);
 
         // update lesson owner to course teacher when saved
-        add_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+        add_action('save_post', array($this, 'update_lesson_teacher'));
 
         // If a Teacher logs in, redirect to /wp-admin/
-        add_filter( 'wp_login', array( $this, 'teacher_login_redirect') , 10, 2 );
+        add_filter('wp_login', array($this, 'teacher_login_redirect'), 10, 2);
 
 
-        add_action( 'admin_menu', array( $this, 'restrict_posts_menu_page'), 10);
-        add_filter('pre_get_comments',  array ($this, 'restrict_comment_moderation'), 10, 1);
+        add_action('admin_menu', array($this, 'restrict_posts_menu_page'), 10);
+        add_filter('pre_get_comments', array($this, 'restrict_comment_moderation'), 10, 1);
 
 
     } // end __constructor()
@@ -108,15 +108,15 @@ 
      * @access public
      * @return void
      */
-    public function create_role ( ) {
+    public function create_role( ) {
 
         // check if the role exists
-        $this->teacher_role = get_role( 'teacher' );
+        $this->teacher_role = get_role('teacher');
 
         // if the the teacher is not a valid WordPress role create it
-       if ( ! is_a( $this->teacher_role, 'WP_Role' ) ) {
+       if ( ! is_a($this->teacher_role, 'WP_Role')) {
            // create the role
-           $this->teacher_role = add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ) );
+           $this->teacher_role = add_role('teacher', __('Teacher', 'woothemes-sensei'));
        }
 
        // add the capabilities before returning
@@ -130,10 +130,10 @@ 
      * @since 1.8.0
      * @access protected
      */
-    protected function add_capabilities ( ) {
+    protected function add_capabilities( ) {
 
         // if this is not a valid WP_Role object exit without adding anything
-        if(  ! is_a( $this->teacher_role, 'WP_Role' ) || empty( $this->teacher_role ) ) {
+        if ( ! is_a($this->teacher_role, 'WP_Role') || empty($this->teacher_role)) {
             return;
         }
 
@@ -144,7 +144,7 @@ 
          * @param array $capabilities
          * keys: (string) $cap_name => (bool) $grant
          */
-        $caps = apply_filters( 'sensei_teacher_role_capabilities', array(
+        $caps = apply_filters('sensei_teacher_role_capabilities', array(
             // General access rules
             'read' => true,
             'manage_sensei_grades' => true,
@@ -201,7 +201,7 @@ 
 
         ));
 
-        foreach ( $caps as $cap => $grant ) {
+        foreach ($caps as $cap => $grant) {
 
             // load the capability on to the teacher role
             $this->teacher_role->add_cap($cap, $grant);
@@ -221,12 +221,12 @@ 
      * @parameter WP_Post $post
      * @return void
      */
-    public function add_teacher_meta_boxes ( $post ) {
+    public function add_teacher_meta_boxes($post) {
 
-        if( !current_user_can('manage_options') ){
+        if ( ! current_user_can('manage_options')) {
             return;
         }
-        add_meta_box( 'sensei-teacher',  __( 'Teacher' , 'woothemes-sensei'),  array( $this , 'teacher_meta_box_content' ),
+        add_meta_box('sensei-teacher', __('Teacher', 'woothemes-sensei'), array($this, 'teacher_meta_box_content'),
             'course',
             'side',
             'core'
@@ -243,7 +243,7 @@ 
      * @access public
      * @parameters
      */
-    public function teacher_meta_box_content ( $post ) {
+    public function teacher_meta_box_content($post) {
 
         // get the current author
         $current_author = $post->post_author;
@@ -254,12 +254,12 @@ 
     ?>
         <select name="sensei-course-teacher-author" class="sensei course teacher">
 
-            <?php foreach ( $users as $user_id ) { ?>
+            <?php foreach ($users as $user_id) { ?>
 
                     <?php
                         $user = get_user_by('id', $user_id);
                     ?>
-                    <option <?php selected(  $current_author , $user_id , true ); ?> value="<?php echo $user_id; ?>" >
+                    <option <?php selected($current_author, $user_id, true); ?> value="<?php echo $user_id; ?>" >
                         <?php echo  $user->display_name; ?>
                     </option>
 
@@ -281,7 +281,7 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function get_teachers_and_authors ( ){
+    public function get_teachers_and_authors( ) {
 
         $author_query_args = array(
             'blog_id'      => $GLOBALS['blog_id'],
@@ -289,7 +289,7 @@ 
             'who'          => 'authors'
         );
 
-        $authors = get_users( $author_query_args );
+        $authors = get_users($author_query_args);
 
         $teacher_query_args = array(
             'blog_id'      => $GLOBALS['blog_id'],
@@ -297,9 +297,9 @@ 
             'role'         => 'teacher',
         );
 
-        $teachers = get_users( $teacher_query_args );
+        $teachers = get_users($teacher_query_args);
 
-        return  array_unique( array_merge( $teachers, $authors ) );
+        return  array_unique(array_merge($teachers, $authors));
 
     }// end get_teachers_and_authors
 
@@ -315,43 +315,43 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function save_teacher_meta_box ( $course_id ){
+    public function save_teacher_meta_box($course_id) {
 
         // check if this is a post from saving the teacher, if not exit early
-        if(! isset( $_POST[ 'sensei-course-teacher-author' ] ) || ! isset( $_POST['post_ID'] )  ){
+        if ( ! isset($_POST['sensei-course-teacher-author']) || ! isset($_POST['post_ID'])) {
             return;
         }
 
         //don't fire this hook again
-        remove_action('save_post', array( $this, 'save_teacher_meta_box' ) );
+        remove_action('save_post', array($this, 'save_teacher_meta_box'));
 
         // get the current post object
-        $post = get_post( $course_id );
+        $post = get_post($course_id);
 
         // get the current teacher/author
-        $current_author = absint( $post->post_author );
-        $new_author = absint( $_POST[ 'sensei-course-teacher-author' ] );
+        $current_author = absint($post->post_author);
+        $new_author = absint($_POST['sensei-course-teacher-author']);
 
         // loop through all post lessons to update their authors as well
-        $this->update_course_lessons_author( $course_id , $new_author );
+        $this->update_course_lessons_author($course_id, $new_author);
 
         // do not do any processing if the selected author is the same as the current author
-        if( $current_author == $new_author ){
+        if ($current_author == $new_author) {
             return;
         }
 
         // save the course  author
         $post_updates = array(
-            'ID' => $post->ID ,
+            'ID' => $post->ID,
             'post_author' => $new_author
         );
-        wp_update_post( $post_updates );
+        wp_update_post($post_updates);
 
         // ensure the the modules are update so that then new teacher has access to them
-        Sensei_Teacher::update_course_modules_author( $course_id, $new_author );
+        Sensei_Teacher::update_course_modules_author($course_id, $new_author);
 
         // notify the new teacher
-        $this->teacher_course_assigned_notification( $new_author, $course_id );
+        $this->teacher_course_assigned_notification($new_author, $course_id);
 
     } // end save_teacher_meta_box
 
@@ -365,56 +365,56 @@ 
      * @param $new_teacher_id
      * @return void
      */
-    public static function update_course_modules_author( $course_id ,$new_teacher_id ){
+    public static function update_course_modules_author($course_id, $new_teacher_id) {
 
-        if( empty( $course_id ) || empty( $new_teacher_id ) ){
+        if (empty($course_id) || empty($new_teacher_id)) {
             return false;
         }
 
-        $terms_selected_on_course = wp_get_object_terms( $course_id, 'module' );
+        $terms_selected_on_course = wp_get_object_terms($course_id, 'module');
 
-        if( empty( $terms_selected_on_course ) ){
+        if (empty($terms_selected_on_course)) {
             return;
         }
 
-        foreach( $terms_selected_on_course as $term ){
+        foreach ($terms_selected_on_course as $term) {
 
-            $term_author = Sensei_Core_Modules::get_term_author( $term->slug );
-            if( $new_teacher_id != $term_author->ID  ){
+            $term_author = Sensei_Core_Modules::get_term_author($term->slug);
+            if ($new_teacher_id != $term_author->ID) {
 
                 $new_term = '';
 
                 //if the new teacher is admin first check to see if the term with this name already exists
-                if( user_can( $new_teacher_id, 'manage_options' ) ){
+                if (user_can($new_teacher_id, 'manage_options')) {
 
-                    $slug_without_teacher_id = str_ireplace(' ', '-', trim( $term->name ) );
-                    $term_args = array( 'slug'=> $slug_without_teacher_id, 'hide_empty' => false, );
-                    $existing_admin_terms = get_terms( 'module', $term_args );
-                    if( !empty( $existing_admin_terms ) ){
+                    $slug_without_teacher_id = str_ireplace(' ', '-', trim($term->name));
+                    $term_args = array('slug'=> $slug_without_teacher_id, 'hide_empty' => false,);
+                    $existing_admin_terms = get_terms('module', $term_args);
+                    if ( ! empty($existing_admin_terms)) {
                         // insert it even if it exists
-                        $new_term = get_term( $existing_admin_terms[0]->term_id, 'module', ARRAY_A );
+                        $new_term = get_term($existing_admin_terms[0]->term_id, 'module', ARRAY_A);
                     }
                 }
 
-                if( empty ( $new_term ) ){
+                if (empty ($new_term)) {
 
                    //setup the new slug
-                   $new_author_term_slug =  $new_teacher_id . '-' . str_ireplace(' ', '-', trim( $term->name ) );
+                   $new_author_term_slug = $new_teacher_id.'-'.str_ireplace(' ', '-', trim($term->name));
 
                    // create new term and set it
-                   $new_term = wp_insert_term( $term->name,'module', array('slug'=> $new_author_term_slug )  );
+                   $new_term = wp_insert_term($term->name, 'module', array('slug'=> $new_author_term_slug));
 
                 }
 
 
 
                 // if term exists
-                if( is_wp_error( $new_term ) && isset( $new_term->errors['term_exists'] ) ){
+                if (is_wp_error($new_term) && isset($new_term->errors['term_exists'])) {
 
-                    $existing_term = get_term_by( 'slug', $new_author_term_slug, 'module');
+                    $existing_term = get_term_by('slug', $new_author_term_slug, 'module');
                     $term_id = $existing_term->term_id;
 
-                }else{
+                } else {
 
                     // for a new term simply get the term from the returned value
                     $term_id = $new_term['term_id'];
@@ -422,21 +422,21 @@ 
                 } // end if term exist
 
                 // set the terms selected on the course
-                wp_set_object_terms( $course_id, $term_id , 'module', true );
+                wp_set_object_terms($course_id, $term_id, 'module', true);
 
                 // remove old term
-                wp_remove_object_terms( $course_id, $term->term_id, 'module' );
+                wp_remove_object_terms($course_id, $term->term_id, 'module');
 
                 // update the lessons within the current module term
-                $lessons = Sensei()->course->course_lessons( $course_id );
-                foreach( $lessons as $lesson  ){
+                $lessons = Sensei()->course->course_lessons($course_id);
+                foreach ($lessons as $lesson) {
 
-                    if( has_term( $term->slug, 'module', $lesson ) ){
+                    if (has_term($term->slug, 'module', $lesson)) {
 
                         // add the new term, the false at the end says to replace all terms on this module
                         // with the new term.
-                        wp_set_object_terms( $lesson->ID, $term_id , 'module', false );
-                        update_post_meta( $lesson->ID, '_order_module_' . intval( $term_id ), 0 );
+                        wp_set_object_terms($lesson->ID, $term_id, 'module', false);
+                        update_post_meta($lesson->ID, '_order_module_'.intval($term_id), 0);
                     }
 
                 }// end for each
@@ -456,50 +456,50 @@ 
      * @parameters
      * @return array $users user id array
      */
-    public function update_course_lessons_author ( $course_id, $new_author  ){
+    public function update_course_lessons_author($course_id, $new_author) {
 
 
-        if( empty( $course_id ) || empty( $new_author ) ){
+        if (empty($course_id) || empty($new_author)) {
             return false;
         }
 
         //get a list of course lessons
-        $lessons = Sensei()->course->course_lessons( $course_id );
+        $lessons = Sensei()->course->course_lessons($course_id);
 
-        if( empty( $lessons )  ||  ! is_array( $lessons )  ){
+        if (empty($lessons) || ! is_array($lessons)) {
             return false;
         }
 
         // update each lesson and quiz author
-        foreach( $lessons as $lesson ){
+        foreach ($lessons as $lesson) {
 
             // don't update if the author is tha same as the new author
-            if( $new_author == $lesson->post_author ){
+            if ($new_author == $lesson->post_author) {
                 continue;
             }
 
             // update lesson author
-            wp_update_post( array(
+            wp_update_post(array(
                 'ID'=> $lesson->ID,
                 'post_author' => $new_author
-                ) );
+                ));
 
             // update quiz author
             //get the lessons quiz
-            $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-            if( is_array( $lesson_quizzes ) ){
-                foreach ( $lesson_quizzes as $quiz_id ) {
+            $lesson_quizzes = Sensei()->lesson->lesson_quizzes($lesson->ID);
+            if (is_array($lesson_quizzes)) {
+                foreach ($lesson_quizzes as $quiz_id) {
                     // update quiz with new author
-                    wp_update_post( array(
+                    wp_update_post(array(
                         'ID'           => $quiz_id,
                         'post_author' =>  $new_author
-                    ) );
+                    ));
                 }
-            }else{
-                wp_update_post( array(
+            } else {
+                wp_update_post(array(
                     'ID'           => $lesson_quizzes,
                     'post_author' =>  $new_author
-                ) );
+                ));
             }
 
         } // end for each lessons
@@ -520,30 +520,30 @@ 
      * @parameters $query
      * @return array $users user id array
      */
-    public function course_analysis_teacher_access_limit ( $query ) {
+    public function course_analysis_teacher_access_limit($query) {
 
-        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
             return $query;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return $query;
         }
 
         $screen = get_current_screen();
-        $sensei_post_types = array('course', 'lesson', 'question' );
+        $sensei_post_types = array('course', 'lesson', 'question');
 
         // exit early for the following conditions
-        $limit_screen_ids = array( 'sensei_page_sensei_analysis', 'course_page_module-order' );
+        $limit_screen_ids = array('sensei_page_sensei_analysis', 'course_page_module-order');
 
-        if( ! $this->is_admin_teacher() || empty( $screen ) || ! in_array( $screen->id ,$limit_screen_ids )
-            || ! in_array( $query->query['post_type'], $sensei_post_types ) ){
+        if ( ! $this->is_admin_teacher() || empty($screen) || ! in_array($screen->id, $limit_screen_ids)
+            || ! in_array($query->query['post_type'], $sensei_post_types)) {
             return $query;
         }
 
         global $current_user;
         // set the query author to the current user to only show those those posts
-        $query->set( 'author', $current_user->ID );
+        $query->set('author', $current_user->ID);
         return $query;
 
     }// end course_analysis_teacher_access_limit
@@ -559,14 +559,14 @@ 
      * @parameters array $wp_query
      * @return bool $is_admin_teacher
      */
-    public function is_admin_teacher ( ){
+    public function is_admin_teacher( ) {
 
-        if( ! is_user_logged_in()){
+        if ( ! is_user_logged_in()) {
             return false;
         }
         $is_admin_teacher = false;
 
-        if( is_admin() && Sensei_Teacher::is_a_teacher( get_current_user_id() )  ){
+        if (is_admin() && Sensei_Teacher::is_a_teacher(get_current_user_id())) {
 
             $is_admin_teacher = true;
 
@@ -586,14 +586,14 @@ 
      * @param  string $perm   User permission level
      * @return object         Modified status counts
      */
-    public function list_table_counts( $counts, $type, $perm ) {
+    public function list_table_counts($counts, $type, $perm) {
         global $current_user;
 
-        if( ! in_array( $type, array( 'course', 'lesson', 'question' ) ) ) {
+        if ( ! in_array($type, array('course', 'lesson', 'question'))) {
             return $counts;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $counts;
         }
 
@@ -607,10 +607,10 @@ 
         $stati = get_post_stati();
 
         // Update count object
-        foreach( $stati as $status ) {
+        foreach ($stati as $status) {
             $args['post_status'] = $status;
-            $posts = get_posts( $args );
-            $counts->$status = count( $posts );
+            $posts = get_posts($args);
+            $counts->$status = count($posts);
         }
 
         return $counts;
@@ -624,22 +624,22 @@ 
      * @since 1.8.0
      *
      */
-    public function filter_queries ( $query ) {
+    public function filter_queries($query) {
         global $current_user;
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return;
         }
 
         $screen = get_current_screen();
-        if( empty( $screen ) ) {
+        if (empty($screen)) {
             return $query;
         }
-        switch( $screen->id ) {
+        switch ($screen->id) {
             case 'sensei_page_sensei_grading':
             case 'sensei_page_sensei_analysis':
             case 'sensei_page_sensei_learners':
@@ -658,7 +658,7 @@ 
              * @param string $screen_id
              *
              */
-            $query->set( 'author', apply_filters( 'sensei_filter_queries_set_author', $current_user->ID, $screen->id ) );
+            $query->set('author', apply_filters('sensei_filter_queries_set_author', $current_user->ID, $screen->id));
             break;
         }
     }
@@ -673,31 +673,31 @@ 
      *
      * @return array $comments
      */
-    public function filter_grading_activity_queries( $comments ){
+    public function filter_grading_activity_queries($comments) {
 
-        if( !is_admin() || ! $this->is_admin_teacher() || is_numeric( $comments ) || ! is_array( $comments ) ){
-            return $comments ;
+        if ( ! is_admin() || ! $this->is_admin_teacher() || is_numeric($comments) || ! is_array($comments)) {
+            return $comments;
         }
 
         //check if we're on the grading screen
         $screen = get_current_screen();
 
-        if( empty( $screen ) || 'sensei_page_sensei_grading' != $screen->id ){
+        if (empty($screen) || 'sensei_page_sensei_grading' != $screen->id) {
             return $comments;
         }
 
         // get the course and determine if the current teacher is the owner
         // if not remove it from the list of comments to be returned
-        foreach( $comments as $key => $comment){
-            $lesson = get_post( $comment->comment_post_ID );
-            $course_id = Sensei()->lesson->get_course_id( $lesson->ID );
-            $course = get_post( $course_id );
-            if( ! isset( $course->post_author ) || intval( $course->post_author) != intval( get_current_user_id() ) ){
+        foreach ($comments as $key => $comment) {
+            $lesson = get_post($comment->comment_post_ID);
+            $course_id = Sensei()->lesson->get_course_id($lesson->ID);
+            $course = get_post($course_id);
+            if ( ! isset($course->post_author) || intval($course->post_author) != intval(get_current_user_id())) {
                 //remove this as the teacher should see this.
-                unset( $comments[ $key ] );
+                unset($comments[$key]);
             }
         }
-        return $comments ;
+        return $comments;
 
     }// end function filter grading
 
@@ -713,34 +713,34 @@ 
      *
      * @return array  $args
      */
-    public function limit_grading_totals( $args ){
+    public function limit_grading_totals($args) {
 
-        if( !is_admin() || ! $this->is_admin_teacher() || ! is_array( $args ) ){
-            return $args ;
+        if ( ! is_admin() || ! $this->is_admin_teacher() || ! is_array($args)) {
+            return $args;
         }
 
         //get the teachers courses
         // the query is already filtered to only the teacher
-        $courses =  Sensei()->course->get_all_courses();
+        $courses = Sensei()->course->get_all_courses();
 
-        if( empty(  $courses ) || ! is_array( $courses ) ){
+        if (empty($courses) || ! is_array($courses)) {
             return $args;
         }
 
         //setup the lessons quizzes  to limit the grading totals to
         $quiz_scope = array();
-        foreach( $courses as $course ){
+        foreach ($courses as $course) {
 
-            $course_lessons = Sensei()->course->course_lessons( $course->ID );
+            $course_lessons = Sensei()->course->course_lessons($course->ID);
 
-            if( ! empty( $course_lessons ) && is_array( $course_lessons  ) ){
+            if ( ! empty($course_lessons) && is_array($course_lessons)) {
 
-                foreach(  $course_lessons as $lesson ){
+                foreach ($course_lessons as $lesson) {
 
-                    $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID );
-                    if( !empty( $quiz_id ) ) {
+                    $quiz_id = Sensei()->lesson->lesson_quizzes($lesson->ID);
+                    if ( ! empty($quiz_id)) {
 
-                        array_push( $quiz_scope, $quiz_id );
+                        array_push($quiz_scope, $quiz_id);
 
                     }
 
@@ -763,41 +763,41 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public function add_courses_to_author_archive( $query ) {
+    public function add_courses_to_author_archive($query) {
 
-        if ( is_admin() || ! $query->is_author() ){
+        if (is_admin() || ! $query->is_author()) {
             return $query;
         }
 
         // this should only apply to users with the teacher role
-        $current_page_user = get_user_by('login', $query->get('author_name') );
-        if( ! $current_page_user || ! in_array('teacher', $current_page_user->roles ) )     {
+        $current_page_user = get_user_by('login', $query->get('author_name'));
+        if ( ! $current_page_user || ! in_array('teacher', $current_page_user->roles)) {
 
             return $query;
 
         }
 
         // Change post types depending on what is set already
-        $current_post_types = $query->get( 'post_type' );
-        if( empty( $current_post_types  ) ){
+        $current_post_types = $query->get('post_type');
+        if (empty($current_post_types)) {
 
             // if empty it means post by default, so add post so that it also includes that for now
-            $new_post_types = array( 'post', 'course' );
+            $new_post_types = array('post', 'course');
 
-        } elseif( is_array( $current_post_types  ) ) {
+        } elseif (is_array($current_post_types)) {
 
             // merge the post types instead of overwriting it
-            $new_post_types = array_merge( $current_post_types, array( 'course' ) );
+            $new_post_types = array_merge($current_post_types, array('course'));
 
-        }else{
+        } else {
 
             // in this instance it is probably just one post type in string format
-            $new_post_types =  array( $current_post_types , 'course');
+            $new_post_types = array($current_post_types, 'course');
 
         }
 
         // change the query before returning it
-        $query->set('post_type', $new_post_types );
+        $query->set('post_type', $new_post_types);
 
         /**
          * Change the query on the teacher author archive template
@@ -805,7 +805,7 @@ 
          * @since 1.8.4
          * @param WP_Query $query
          */
-        return apply_filters( 'sensei_teacher_archive_query', $query );
+        return apply_filters('sensei_teacher_archive_query', $query);
 
     }
 
@@ -818,21 +818,21 @@ 
      * @param $course_id
      * @return bool
      */
-    public function teacher_course_assigned_notification( $teacher_id, $course_id ){
+    public function teacher_course_assigned_notification($teacher_id, $course_id) {
 
-        if( 'course' != get_post_type( $course_id ) || ! get_userdata( $teacher_id ) ){
+        if ('course' != get_post_type($course_id) || ! get_userdata($teacher_id)) {
             return false;
         }
 
         // if new user is the same as the current logged user, they don't need an email
-        if( $teacher_id == get_current_user_id() ){
+        if ($teacher_id == get_current_user_id()) {
             return true;
         }
 
         // load the email class
         include('emails/class-woothemes-sensei-teacher-new-course-assignment.php');
         $email = new Teacher_New_Course_Assignment();
-        $email->trigger( $teacher_id, $course_id );
+        $email->trigger($teacher_id, $course_id);
 
         return true;
     } // end  teacher_course_assigned_notification
@@ -846,12 +846,12 @@ 
      * @param int $course_id
      * @return bool
      */
-    public function notify_admin_teacher_course_creation( $new_status, $old_status, $post ){
+    public function notify_admin_teacher_course_creation($new_status, $old_status, $post) {
 
         $course_id = $post->ID;
 
-        if( 'course' != get_post_type( $course_id ) || 'auto-draft' == get_post_status( $course_id )
-            || 'trash' == get_post_status( $course_id ) || 'draft' == get_post_status( $course_id ) ) {
+        if ('course' != get_post_type($course_id) || 'auto-draft' == get_post_status($course_id)
+            || 'trash' == get_post_status($course_id) || 'draft' == get_post_status($course_id)) {
 
             return false;
 
@@ -865,19 +865,19 @@ 
          *
          * @param bool $on default true
          */
-        if( ! apply_filters('sensei_notify_admin_new_course_creation', true ) ){
+        if ( ! apply_filters('sensei_notify_admin_new_course_creation', true)) {
             return false;
         }
 
         // setting up the data needed by the email template
         global $sensei_email_data;
         $template = 'admin-teacher-new-course-created';
-        $course = get_post( $course_id );
-        $teacher = new WP_User( $course->post_author );
+        $course = get_post($course_id);
+        $teacher = new WP_User($course->post_author);
         $recipient = get_option('admin_email', true);
 
         // don't send if the course is created by admin
-        if( $recipient == $teacher->user_email ){
+        if ($recipient == $teacher->user_email) {
             return;
         }
 
@@ -887,7 +887,7 @@ 
          * @since 1.8.0
          * @param string $template
          */
-        $heading = apply_filters( 'sensei_email_heading', __( 'New course created.', 'woothemes-sensei' ), $template );
+        $heading = apply_filters('sensei_email_heading', __('New course created.', 'woothemes-sensei'), $template);
 
         /**
          * Filter the email subject for the the
@@ -898,11 +898,11 @@ 
          * @param string $template
          */
         $subject = apply_filters('sensei_email_subject',
-                                '['. get_bloginfo( 'name', 'display' ) .'] '. __( 'New course created by', 'woothemes-sensei' ) . ' ' . $teacher->display_name ,
-                                $template );
+                                '['.get_bloginfo('name', 'display').'] '.__('New course created by', 'woothemes-sensei').' '.$teacher->display_name,
+                                $template);
 
         //course edit link
-        $course_edit_link = admin_url('post.php?post=' . $course_id . '&action=edit' );
+        $course_edit_link = admin_url('post.php?post='.$course_id.'&action=edit');
 
         // Construct data array
         $email_data = array(
@@ -921,10 +921,10 @@ 
          * @param array $email_data
          * @param string $template
          */
-        $sensei_email_data = apply_filters( 'sensei_email_data', $email_data , $template );
+        $sensei_email_data = apply_filters('sensei_email_data', $email_data, $template);
 
         // Send mail
-        Sensei()->emails->send( $recipient, $subject , Sensei()->emails->get_content( $template ) );
+        Sensei()->emails->send($recipient, $subject, Sensei()->emails->get_content($template));
 
     }// end notify admin of course creation
 
@@ -935,10 +935,10 @@ 
      * @param array $args WP_User_Query arguments
      * @return array $learners_query_results
      */
-    public function limit_analysis_learners( $args ){
+    public function limit_analysis_learners($args) {
 
         // show default for none teachers
-        if( ! Sensei()->teacher->is_admin_teacher() ) {
+        if ( ! Sensei()->teacher->is_admin_teacher()) {
                 return $args;
         }
 
@@ -947,31 +947,31 @@ 
         $teacher_courses = Sensei()->course->get_all_courses();
 
         // if the user has no courses they should see no users
-        if( empty( $teacher_courses ) ||  ! is_array( $teacher_courses ) ){
+        if (empty($teacher_courses) || ! is_array($teacher_courses)) {
             // tell the query to return 0 students
-            $args[ 'include'] = array( 0 );
+            $args['include'] = array(0);
             return $args;
 
         }
 
         $learner_ids_for_teacher_courses = array();
-        foreach( $teacher_courses as $course ){
+        foreach ($teacher_courses as $course) {
 
             $course_learner_ids = array();
-            $activity_comments =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id' ), true );
+            $activity_comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course->ID, 'type' => 'sensei_course_status', 'field' => 'user_id'), true);
 
-            if( empty( $activity_comments ) ||  ( is_array( $activity_comments  ) && ! ( count( $activity_comments ) > 0 ) ) ){
+            if (empty($activity_comments) || (is_array($activity_comments) && ! (count($activity_comments) > 0))) {
                 continue; // skip to the next course as there are no users on this course
             }
 
             // it could be an array of comments or a single comment
-            if( is_array( $activity_comments ) ){
+            if (is_array($activity_comments)) {
 
-                foreach( $activity_comments as $comment ){
+                foreach ($activity_comments as $comment) {
 
-                    $user = get_userdata( $comment->user_id );
+                    $user = get_userdata($comment->user_id);
 
-                    if( empty( $user ) ){
+                    if (empty($user)) {
                         // next comment in this array
                         continue;
                     }
@@ -979,26 +979,26 @@ 
                     $course_learner_ids[] = $user->ID;
                 }
 
-            }else{
+            } else {
 
-                $user = get_userdata( $activity_comments->user_id );
+                $user = get_userdata($activity_comments->user_id);
                 $course_learner_ids[] = $user->ID;
 
             }
 
             // add learners on this course to the all courses learner list
-            $learner_ids_for_teacher_courses = array_merge( $learner_ids_for_teacher_courses, $course_learner_ids );
+            $learner_ids_for_teacher_courses = array_merge($learner_ids_for_teacher_courses, $course_learner_ids);
 
         }
 
         // if there are no students taking the courses by this teacher don't show them any of the other users
-        if( empty( $learner_ids_for_teacher_courses ) ){
+        if (empty($learner_ids_for_teacher_courses)) {
 
-            $args[ 'include'] = array( 0 );
+            $args['include'] = array(0);
 
-        }else{
+        } else {
 
-            $args[ 'include'] = $learner_ids_for_teacher_courses;
+            $args['include'] = $learner_ids_for_teacher_courses;
 
         }
 
@@ -1015,35 +1015,35 @@ 
      * @param $questions
      * @return mixed
      */
-    public function allow_teacher_access_to_questions( $questions, $quiz_id ){
+    public function allow_teacher_access_to_questions($questions, $quiz_id) {
 
-        if( ! $this->is_admin_teacher() ){
+        if ( ! $this->is_admin_teacher()) {
             return $questions;
         }
 
         $screen = get_current_screen();
 
         // don't run this filter within this functions call to Sensei()->lesson->lesson_quiz_questions
-        remove_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20 );
+        remove_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20);
 
-        if( ! empty( $screen ) && 'lesson'== $screen->post_type ){
+        if ( ! empty($screen) && 'lesson' == $screen->post_type) {
 
             $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+            if ( ! empty($admin_user)) {
 
                 $current_teacher_id = get_current_user_id();
 
                 // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
-                $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id  );
+                wp_set_current_user($admin_user->ID);
+                $questions = Sensei()->lesson->lesson_quiz_questions($quiz_id);
 
                 // set the teacher as the current use again
-                wp_set_current_user( $current_teacher_id );
+                wp_set_current_user($current_teacher_id);
             }
 
         }
         // attach the filter again for other funtion calls to Sensei()->lesson->lesson_quiz_questions
-        add_filter( 'sensei_lesson_quiz_questions', array( $this, 'allow_teacher_access_to_questions' ), 20,2 );
+        add_filter('sensei_lesson_quiz_questions', array($this, 'allow_teacher_access_to_questions'), 20, 2);
 
         return $questions;
     }
@@ -1055,30 +1055,30 @@ 
      * @param $wp_query
      * @return mixed
      */
-    public function give_access_to_all_questions( $wp_query ){
+    public function give_access_to_all_questions($wp_query) {
 
-        if( ! $this->is_admin_teacher() || !function_exists( 'get_current_screen') || 'question' != $wp_query->get('post_type') ){
+        if ( ! $this->is_admin_teacher() || ! function_exists('get_current_screen') || 'question' != $wp_query->get('post_type')) {
 
             return $wp_query;
         }
 
         $screen = get_current_screen();
-        if( ( isset($screen->id) && 'lesson' == $screen->id )
-            || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ){
+        if ((isset($screen->id) && 'lesson' == $screen->id)
+            || (defined('DOING_AJAX') && DOING_AJAX)) {
 
             $admin_user = get_user_by('email', get_bloginfo('admin_email'));
-            if( ! empty($admin_user) ){
+            if ( ! empty($admin_user)) {
 
                 $current_teacher_id = get_current_user_id();
 
                 // set current user to admin so teacher can view all questions
-                wp_set_current_user( $admin_user->ID  );
+                wp_set_current_user($admin_user->ID);
 
                 //run new query as admin
-                $wp_query = new WP_Query( $wp_query->query );
+                $wp_query = new WP_Query($wp_query->query);
 
                 //set the teache as current use again
-                wp_set_current_user( $current_teacher_id );
+                wp_set_current_user($current_teacher_id);
 
             }
         }
@@ -1095,7 +1095,7 @@ 
      */
     public function course_column_heading($columns) {
 
-        if( $this->is_admin_teacher() ){
+        if ($this->is_admin_teacher()) {
             return $columns;
         }
         $new_columns = array(
@@ -1112,20 +1112,20 @@ 
      * @param $column
      * @param $course_id
      */
-    public function course_column_data( $column, $course_id  ){
+    public function course_column_data($column, $course_id) {
 
-        if( $this->is_admin_teacher() || 'teacher' != $column  ){
+        if ($this->is_admin_teacher() || 'teacher' != $column) {
             return;
         }
 
-        $course = get_post( $course_id );
-        $teacher = get_userdata( $course->post_author );
+        $course = get_post($course_id);
+        $teacher = get_userdata($course->post_author);
 
-        if( !$teacher ){
+        if ( ! $teacher) {
             return;
         }
 
-        echo '<a href="'. get_edit_user_link( $teacher->ID ) .'" >'. $teacher->display_name.'</a>';
+        echo '<a href="'.get_edit_user_link($teacher->ID).'" >'.$teacher->display_name.'</a>';
 
     }// end course_column_ data
 
@@ -1140,31 +1140,31 @@ 
      *
      * @return array $teachers_courses
      */
-    public function get_teacher_courses( $teacher_id, $return_ids_only= false){
+    public function get_teacher_courses($teacher_id, $return_ids_only = false) {
 
         $teachers_courses = array();
 
-        if( empty( $teacher_id  ) ){
+        if (empty($teacher_id)) {
             $teacher_id = get_current_user_id();
         }
 
         $all_courses = Sensei()->course->get_all_courses();
 
-        if( empty( $all_courses ) ){
+        if (empty($all_courses)) {
             return $all_courses;
         }
 
-        foreach( $all_courses as $course ){
+        foreach ($all_courses as $course) {
 
-            if( $course->post_author != $teacher_id  ){
+            if ($course->post_author != $teacher_id) {
                 continue;
             }
 
-            if( $return_ids_only ){
+            if ($return_ids_only) {
 
                 $teachers_courses[] = $course->ID;
 
-            }else{
+            } else {
 
                 $teachers_courses[] = $course;
 
@@ -1184,21 +1184,21 @@ 
      * @param $query
      * @return mixed
      */
-    public function limit_edit_messages_query( $query ){
-        if( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type') ){
+    public function limit_edit_messages_query($query) {
+        if ( ! $this->is_admin_teacher() || 'sensei_message' != $query->get('post_type')) {
             return $query;
         }
 
         $teacher = wp_get_current_user();
 
-        $query->set( 'meta_key', '_receiver' );
+        $query->set('meta_key', '_receiver');
         $meta_query_args = array(
             'key'     => '_receiver',
-            'value'   => $teacher->get('user_login') ,
+            'value'   => $teacher->get('user_login'),
             'compare' => '='
         );
 
-        $query->set('meta_query', $meta_query_args  );
+        $query->set('meta_query', $meta_query_args);
 
         return $query;
     }
@@ -1214,7 +1214,7 @@ 
     public function course_teacher_filter_options() {
         global $typenow;
 
-        if( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei') ) {
+        if ( ! is_admin() || 'course' != $typenow || ! current_user_can('manage_sensei')) {
             return;
         }
 
@@ -1224,31 +1224,31 @@ 
         // get roles with the course edit capability
         // and then get the users with those roles
         $users_who_can_edit_courses = array();
-        foreach( $roles as $role_item ){
+        foreach ($roles as $role_item) {
 
-            $role = get_role( strtolower( $role_item['name'] ) );
+            $role = get_role(strtolower($role_item['name']));
 
-            if( is_a( $role, 'WP_Role' ) && $role->has_cap('edit_courses') ){
+            if (is_a($role, 'WP_Role') && $role->has_cap('edit_courses')) {
 
-                $user_query_args = array( 'role' => $role->name, 'fields' => array( 'ID', 'display_name' ) );
-                $role_users_who_can_edit_courses = get_users( $user_query_args );
+                $user_query_args = array('role' => $role->name, 'fields' => array('ID', 'display_name'));
+                $role_users_who_can_edit_courses = get_users($user_query_args);
 
                 // add user from the current $user_role to all users
-                $users_who_can_edit_courses = array_merge( $users_who_can_edit_courses, $role_users_who_can_edit_courses );
+                $users_who_can_edit_courses = array_merge($users_who_can_edit_courses, $role_users_who_can_edit_courses);
 
             }
 
         }
 
         // Create the select element with the given users who can edit course
-        $selected = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+        $selected = isset($_GET['course_teacher']) ? $_GET['course_teacher'] : '';
         $course_options = '';
-        foreach( $users_who_can_edit_courses as $user ) {
-            $course_options .= '<option value="' . esc_attr( $user->ID ) . '" ' . selected( $selected, $user->ID, false ) . '>' .  $user->display_name . '</option>';
+        foreach ($users_who_can_edit_courses as $user) {
+            $course_options .= '<option value="'.esc_attr($user->ID).'" '.selected($selected, $user->ID, false).'>'.$user->display_name.'</option>';
         }
 
         $output = '<select name="course_teacher" id="dropdown_course_teachers">';
-        $output .= '<option value="">'.__( 'Show all teachers', 'woothemes-sensei' ).'</option>';
+        $output .= '<option value="">'.__('Show all teachers', 'woothemes-sensei').'</option>';
         $output .= $course_options;
         $output .= '</select>';
 
@@ -1263,15 +1263,15 @@ 
      * @param $query
      * @return $query
      */
-    public function teacher_filter_query_modify( $query ){
+    public function teacher_filter_query_modify($query) {
         global $typenow;
 
-        if( ! is_admin() && 'course' != $typenow  || ! current_user_can('manage_sensei')  ) {
+        if ( ! is_admin() && 'course' != $typenow || ! current_user_can('manage_sensei')) {
             return $query;
         }
-        $course_teacher = isset( $_GET['course_teacher'] ) ? $_GET['course_teacher'] : '';
+        $course_teacher = isset($_GET['course_teacher']) ? $_GET['course_teacher'] : '';
 
-        if( empty( $course_teacher ) ) {
+        if (empty($course_teacher)) {
             return $query;
         }
 
@@ -1284,23 +1284,23 @@ 
      * @param  array $request Default request arguments
      * @return array          Modified request arguments
      */
-    public function restrict_media_library( $request = array() ) {
+    public function restrict_media_library($request = array()) {
 
-        if( ! is_admin() ) {
+        if ( ! is_admin()) {
             return $request;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $request;
         }
 
         $screen = get_current_screen();
 
-        if( in_array( $screen->id, array( 'upload', 'course', 'lesson', 'question' ) ) ) {
-            $teacher = intval( get_current_user_id() );
+        if (in_array($screen->id, array('upload', 'course', 'lesson', 'question'))) {
+            $teacher = intval(get_current_user_id());
 
-            if( $teacher ) {
-                $request['author__in'] = array( $teacher );
+            if ($teacher) {
+                $request['author__in'] = array($teacher);
             }
         }
 
@@ -1312,20 +1312,20 @@ 
      * @param  array $query Default query arguments
      * @return array        Modified query arguments
      */
-    public function restrict_media_library_modal( $query = array() ) {
+    public function restrict_media_library_modal($query = array()) {
 
-        if( ! is_admin() ) {
+        if ( ! is_admin()) {
             return $query;
         }
 
-        if( ! $this->is_admin_teacher() ) {
+        if ( ! $this->is_admin_teacher()) {
             return $query;
         }
 
-        $teacher = intval( get_current_user_id() );
+        $teacher = intval(get_current_user_id());
 
-        if( $teacher ) {
-            $query['author__in'] = array( $teacher );
+        if ($teacher) {
+            $query['author__in'] = array($teacher);
         }
 
         return $query;
@@ -1338,28 +1338,28 @@ 
      *
      * @param int $lesson_id
      */
-    public function update_lesson_teacher( $lesson_id ){
+    public function update_lesson_teacher($lesson_id) {
 
-        if( 'lesson'!= get_post_type() ){
+        if ('lesson' != get_post_type()) {
             return;
         }
 
         // this should only run once per request cycle
-        remove_action( 'save_post',  array( $this, 'update_lesson_teacher' ) );
+        remove_action('save_post', array($this, 'update_lesson_teacher'));
 
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+        $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
-        if(  empty( $course_id ) || ! $course_id ){
+        if (empty($course_id) || ! $course_id) {
             return;
         }
 
-        $course = get_post( $course_id );
+        $course = get_post($course_id);
 
-        $lesson_update_args= array(
-            'ID' => $lesson_id ,
+        $lesson_update_args = array(
+            'ID' => $lesson_id,
             'post_author' => $course->post_author
         );
-        wp_update_post( $lesson_update_args );
+        wp_update_post($lesson_update_args);
 
     } // end update_lesson_teacher
 
@@ -1373,21 +1373,21 @@ 
      * @parameters array $wp_query
      * @return WP_Query $wp_query
      */
-    public function limit_teacher_edit_screen_post_types( $wp_query ) {
+    public function limit_teacher_edit_screen_post_types($wp_query) {
         global $current_user;
 
         //exit early
-        if( ! $this->is_admin_teacher() ){
+        if ( ! $this->is_admin_teacher()) {
             return $wp_query;
         }
 
-        if ( ! function_exists( 'get_current_screen' ) ) {
+        if ( ! function_exists('get_current_screen')) {
             return $wp_query;
         }
 
         $screen = get_current_screen();
 
-        if( empty( $screen ) ){
+        if (empty($screen)) {
             return $wp_query;
         }
 
@@ -1400,10 +1400,10 @@ 
             'lesson_page_lesson-order',
         );
 
-        if(  in_array($screen->id  , $limit_screens ) ) {
+        if (in_array($screen->id, $limit_screens)) {
 
             // set the query author to the current user to only show those those posts
-            $wp_query->set( 'author', $current_user->ID );
+            $wp_query->set('author', $current_user->ID);
         }
 
         return $wp_query;
@@ -1423,7 +1423,7 @@ 
      * @return void
      */
 
-    public function teacher_login_redirect( $user_login, $user  ) {
+    public function teacher_login_redirect($user_login, $user) {
 
         if (user_can($user, 'edit_courses')) {
 
@@ -1473,9 +1473,9 @@ 
          * @param bool $restrict default true
          */
 
-        $restrict = apply_filters('sensei_restrict_posts_menu_page', true );
+        $restrict = apply_filters('sensei_restrict_posts_menu_page', true);
 
-        if ( in_array( 'teacher', (array) $user->roles ) && !current_user_can('delete_posts') && $restrict) {
+        if (in_array('teacher', (array) $user->roles) && ! current_user_can('delete_posts') && $restrict) {
 
             remove_menu_page('edit.php');
 
@@ -1509,7 +1509,7 @@ 
 
         global $pagenow;
 
-        if( self::is_a_teacher( get_current_user_id() ) && $pagenow == "edit-comments.php") {
+        if (self::is_a_teacher(get_current_user_id()) && $pagenow == "edit-comments.php") {
 
             $clauses->query_vars['post_author'] = get_current_user_id();
 
@@ -1526,15 +1526,15 @@ 
      *
      * @return bool
      */
-    public static function is_a_teacher( $user_id ){
+    public static function is_a_teacher($user_id) {
 
         $user = get_user_by('id', $user_id);
 
-        if( isset( $user->roles ) && in_array(  'teacher',  $user->roles )   ){
+        if (isset($user->roles) && in_array('teacher', $user->roles)) {
 
             return true;
 
-        }else{
+        } else {
 
             return false;
 
@@ -1547,14 +1547,14 @@ 
      *
      * @since 1.9.0
      */
-    public static function archive_title(){
+    public static function archive_title() {
 
-        $author = get_user_by( 'id', get_query_var( 'author' ) );
+        $author = get_user_by('id', get_query_var('author'));
         $author_name = $author->display_name;
         ?>
             <h2 class="teacher-archive-title">
 
-                <?php echo sprintf( __( 'All courses by %s', 'woothemes-sensei') , $author_name ); ?>
+                <?php echo sprintf(__('All courses by %s', 'woothemes-sensei'), $author_name); ?>
 
             </h2>
         <?php
@@ -1566,9 +1566,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function remove_course_meta_on_teacher_archive(){
+    public static function remove_course_meta_on_teacher_archive() {
 
-        remove_action('sensei_course_content_inside_before', array( Sensei()->course, 'the_course_meta' ) );
+        remove_action('sensei_course_content_inside_before', array(Sensei()->course, 'the_course_meta'));
 
     }
 

includes/class-sensei-grading-main.php

Indentation +2 added lines, -2 removed lines

@@ -253,7 +253,7 @@ 
 			$grade = __( 'N/A', 'woothemes-sensei' );
 		}
 
-        $title = Sensei_Student::get_full_name( $item->user_id );
+		$title = Sensei_Student::get_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()
 

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_Student::get_full_name( $item->user_id );
+        $title = Sensei_Student::get_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 {}

includes/class-sensei-autoloader.php

Indentation +118 added lines, -118 removed lines

@@ -13,124 +13,124 @@
  */
 class Sensei_Autoloader {
 
-    /**
-     * @var path to the includes directory within Sensei.
-     */
-    private $include_path = 'includes';
-
-    /**
-     * @var array $class_file_map. List of classes mapped to their files
-     */
-    private $class_file_map = array();
-
-    /**
-     * Constructor
-     * @since 1.9.0
-     */
-    public function __construct(){
-
-        // make sure we do not override an existing autoload function
-        if( function_exists('__autoload') ){
-           spl_autoload_register( '__autoload' );
-        }
-
-        // setup a relative path for the current autoload instance
-        $this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
-
-        //setup the class file map
-        $this->initialize_class_file_map();
-
-        // add Sensei custom auto loader
-        spl_autoload_register( array( $this, 'autoload' )  );
-
-    }
-
-    /**
-     * Generate a list of Sensei class and map them the their respective
-     * files within the includes directory
-     *
-     * @since 1.9.0
-     */
-    public function initialize_class_file_map(){
-
-        $this->class_file_map = array(
-
-            /**
-             * Main Sensei class
-             */
-            'Sensei_Main' => 'class-sensei.php',
-
-            /**
-             * Admin
-             */
-            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
-            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
-
-            /**
-             * Shortcodes
-             */
-            'Sensei_Shortcode_Loader'              => 'shortcodes/class-sensei-shortcode-loader.php',
-            'Sensei_Shortcode_Interface'           => 'shortcodes/interface-sensei-shortcode.php',
-            'Sensei_Shortcode_Featured_Courses'    => 'shortcodes/class-sensei-shortcode-featured-courses.php',
-            'Sensei_Shortcode_User_Courses'        => 'shortcodes/class-sensei-shortcode-user-courses.php',
-            'Sensei_Shortcode_Courses'             => 'shortcodes/class-sensei-shortcode-courses.php',
-            'Sensei_Shortcode_Teachers'            => 'shortcodes/class-sensei-shortcode-teachers.php',
-            'Sensei_Shortcode_User_Messages'       => 'shortcodes/class-sensei-shortcode-user-messages.php',
-            'Sensei_Shortcode_Course_Page'         => 'shortcodes/class-sensei-shortcode-course-page.php',
-            'Sensei_Shortcode_Lesson_Page'         => 'shortcodes/class-sensei-shortcode-lesson-page.php',
-            'Sensei_Shortcode_Course_Categories'   => 'shortcodes/class-sensei-shortcode-course-categories.php',
-            'Sensei_Shortcode_Unpurchased_Courses' => 'shortcodes/class-sensei-shortcode-unpurchased-courses.php',
-            'Sensei_Legacy_Shortcodes'             => 'shortcodes/class-sensei-legacy-shortcodes.php',
-
-            /**
-             * WooCommerce
-             */
-            'Sensei_WC' => 'class-sensei-wc.php',
-
-        );
-    }
-
-    /**
-     * Autoload all sensei files as the class names are used.
-     */
-    public function autoload( $class ){
-
-        // only handle classes with the word `sensei` in it
-        if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
-
-            return;
-
-        }
-
-        // exit if we didn't provide mapping for this class
-        if( isset( $this->class_file_map[ $class ] ) ){
-
-            $file_location = $this->include_path . $this->class_file_map[ $class ];
-            require_once( $file_location);
-            return;
-
-        }
-
-        // check for file in the main includes directory
-        $class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
-        if( file_exists( $class_file_path ) ){
-
-            require_once( $class_file_path );
-            return;
-        }
-
-        // lastly check legacy types
-        $stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
-        $legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
-        if( file_exists( $legacy_class_file_path ) ){
-
-            require_once( $legacy_class_file_path );
-            return;
-        }
-
-        return;
-
-    }// end autoload
+	/**
+	 * @var path to the includes directory within Sensei.
+	 */
+	private $include_path = 'includes';
+
+	/**
+	 * @var array $class_file_map. List of classes mapped to their files
+	 */
+	private $class_file_map = array();
+
+	/**
+	 * Constructor
+	 * @since 1.9.0
+	 */
+	public function __construct(){
+
+		// make sure we do not override an existing autoload function
+		if( function_exists('__autoload') ){
+		   spl_autoload_register( '__autoload' );
+		}
+
+		// setup a relative path for the current autoload instance
+		$this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
+
+		//setup the class file map
+		$this->initialize_class_file_map();
+
+		// add Sensei custom auto loader
+		spl_autoload_register( array( $this, 'autoload' )  );
+
+	}
+
+	/**
+	 * Generate a list of Sensei class and map them the their respective
+	 * files within the includes directory
+	 *
+	 * @since 1.9.0
+	 */
+	public function initialize_class_file_map(){
+
+		$this->class_file_map = array(
+
+			/**
+			 * Main Sensei class
+			 */
+			'Sensei_Main' => 'class-sensei.php',
+
+			/**
+			 * Admin
+			 */
+			'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
+			'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
+
+			/**
+			 * Shortcodes
+			 */
+			'Sensei_Shortcode_Loader'              => 'shortcodes/class-sensei-shortcode-loader.php',
+			'Sensei_Shortcode_Interface'           => 'shortcodes/interface-sensei-shortcode.php',
+			'Sensei_Shortcode_Featured_Courses'    => 'shortcodes/class-sensei-shortcode-featured-courses.php',
+			'Sensei_Shortcode_User_Courses'        => 'shortcodes/class-sensei-shortcode-user-courses.php',
+			'Sensei_Shortcode_Courses'             => 'shortcodes/class-sensei-shortcode-courses.php',
+			'Sensei_Shortcode_Teachers'            => 'shortcodes/class-sensei-shortcode-teachers.php',
+			'Sensei_Shortcode_User_Messages'       => 'shortcodes/class-sensei-shortcode-user-messages.php',
+			'Sensei_Shortcode_Course_Page'         => 'shortcodes/class-sensei-shortcode-course-page.php',
+			'Sensei_Shortcode_Lesson_Page'         => 'shortcodes/class-sensei-shortcode-lesson-page.php',
+			'Sensei_Shortcode_Course_Categories'   => 'shortcodes/class-sensei-shortcode-course-categories.php',
+			'Sensei_Shortcode_Unpurchased_Courses' => 'shortcodes/class-sensei-shortcode-unpurchased-courses.php',
+			'Sensei_Legacy_Shortcodes'             => 'shortcodes/class-sensei-legacy-shortcodes.php',
+
+			/**
+			 * WooCommerce
+			 */
+			'Sensei_WC' => 'class-sensei-wc.php',
+
+		);
+	}
+
+	/**
+	 * Autoload all sensei files as the class names are used.
+	 */
+	public function autoload( $class ){
+
+		// only handle classes with the word `sensei` in it
+		if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
+
+			return;
+
+		}
+
+		// exit if we didn't provide mapping for this class
+		if( isset( $this->class_file_map[ $class ] ) ){
+
+			$file_location = $this->include_path . $this->class_file_map[ $class ];
+			require_once( $file_location);
+			return;
+
+		}
+
+		// check for file in the main includes directory
+		$class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
+		if( file_exists( $class_file_path ) ){
+
+			require_once( $class_file_path );
+			return;
+		}
+
+		// lastly check legacy types
+		$stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
+		$legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
+		if( file_exists( $legacy_class_file_path ) ){
+
+			require_once( $legacy_class_file_path );
+			return;
+		}
+
+		return;
+
+	}// end autoload
 
 }
 new Sensei_Autoloader();

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 /**
  * Sensei Autoloader Class
  *
@@ -27,21 +27,21 @@ 
      * Constructor
      * @since 1.9.0
      */
-    public function __construct(){
+    public function __construct() {
 
         // make sure we do not override an existing autoload function
-        if( function_exists('__autoload') ){
-           spl_autoload_register( '__autoload' );
+        if (function_exists('__autoload')) {
+           spl_autoload_register('__autoload');
         }
 
         // setup a relative path for the current autoload instance
-        $this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
+        $this->include_path = trailingslashit(untrailingslashit(dirname(__FILE__)));
 
         //setup the class file map
         $this->initialize_class_file_map();
 
         // add Sensei custom auto loader
-        spl_autoload_register( array( $this, 'autoload' )  );
+        spl_autoload_register(array($this, 'autoload'));
 
     }
 
@@ -51,7 +51,7 @@ 
      *
      * @since 1.9.0
      */
-    public function initialize_class_file_map(){
+    public function initialize_class_file_map() {
 
         $this->class_file_map = array(
 
@@ -63,8 +63,8 @@ 
             /**
              * Admin
              */
-            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
-            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
+            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php',
+            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php',
 
             /**
              * Shortcodes
@@ -93,38 +93,38 @@ 
     /**
      * Autoload all sensei files as the class names are used.
      */
-    public function autoload( $class ){
+    public function autoload($class) {
 
         // only handle classes with the word `sensei` in it
-        if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
+        if ( ! is_numeric(strpos(strtolower($class), 'sensei'))) {
 
             return;
 
         }
 
         // exit if we didn't provide mapping for this class
-        if( isset( $this->class_file_map[ $class ] ) ){
+        if (isset($this->class_file_map[$class])) {
 
-            $file_location = $this->include_path . $this->class_file_map[ $class ];
-            require_once( $file_location);
+            $file_location = $this->include_path.$this->class_file_map[$class];
+            require_once($file_location);
             return;
 
         }
 
         // check for file in the main includes directory
-        $class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
-        if( file_exists( $class_file_path ) ){
+        $class_file_path = $this->include_path.'class-'.str_replace('_', '-', strtolower($class)).'.php';
+        if (file_exists($class_file_path)) {
 
-            require_once( $class_file_path );
+            require_once($class_file_path);
             return;
         }
 
         // lastly check legacy types
-        $stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
-        $legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
-        if( file_exists( $legacy_class_file_path ) ){
+        $stripped_woothemes_from_class = str_replace('woothemes_', '', strtolower($class)); // remove woothemes
+        $legacy_class_file_path = $this->include_path.'class-'.str_replace('_', '-', strtolower($stripped_woothemes_from_class)).'.php';
+        if (file_exists($legacy_class_file_path)) {
 
-            require_once( $legacy_class_file_path );
+            require_once($legacy_class_file_path);
             return;
         }
 

includes/class-sensei-posttypes.php

Indentation +245 added lines, -245 removed lines

@@ -17,25 +17,25 @@ 
 	public $slider_labels;
 	public $role_caps;
 
-    /**
-     * @var Sensei_Course
-     */
-    public $course;
-
-    /**
-     * @var Sensei_Lesson
-     */
-    public $lesson;
-
-    /**
-     * @var Sensei_Question
-     */
-    public $question;
-
-    /**
-     * @var Sensei_Quiz
-     */
-    public $quiz;
+	/**
+	 * @var Sensei_Course
+	 */
+	public $course;
+
+	/**
+	 * @var Sensei_Lesson
+	 */
+	public $lesson;
+
+	/**
+	 * @var Sensei_Question
+	 */
+	public $question;
+
+	/**
+	 * @var Sensei_Quiz
+	 */
+	public $quiz;
 
 	/**
 	 * Constructor
@@ -45,7 +45,7 @@ 
 
 		// Setup Post Types
 		$this->labels = array();
-        $this->token = 'woothemes-sensei-posttypes';
+		$this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
 		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
@@ -104,94 +104,94 @@ 
 	/**
 	 * Setup the "course" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_course_post_type () {
 
 		$args = array(
-		    'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
-		    'public'              => true,
-		    'publicly_queryable'  => true,
-		    'show_ui'             => true,
-		    'show_in_menu'        => true,
-		    'show_in_admin_bar'   => true,
-		    'query_var'           => true,
-		    'rewrite'             => array(
-                'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
-                'with_front' => true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap'        => true,
-		    'capability_type'     => 'course',
-            'has_archive'         => $this->get_course_post_type_archive_slug(),
-		    'hierarchical'        => false,
-		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+			'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
+			'public'              => true,
+			'publicly_queryable'  => true,
+			'show_ui'             => true,
+			'show_in_menu'        => true,
+			'show_in_admin_bar'   => true,
+			'query_var'           => true,
+			'rewrite'             => array(
+				'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
+				'with_front' => true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap'        => true,
+			'capability_type'     => 'course',
+			'has_archive'         => $this->get_course_post_type_archive_slug(),
+			'hierarchical'        => false,
+			'menu_position'       => 51,
+			'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Course post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Course post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
 
 	} // End setup_course_post_type()
 
-    /**
-     * Figure out of the course post type has an archive and what it should be.
-     *
-     * This function should return 'courses' or the page_uri for the course page setting.
-     *
-     * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
-     * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
-     * page slug will not be returned. For any other pages without it the page URI will be returned.
-     *
-     *
-     * @sine 1.9.0
-     *
-     *
-     * @return false|string
-     */
-    public function get_course_post_type_archive_slug(){
+	/**
+	 * Figure out of the course post type has an archive and what it should be.
+	 *
+	 * This function should return 'courses' or the page_uri for the course page setting.
+	 *
+	 * For backward compatibility  sake ( pre 1.9 )If the course page set in settings
+	 * still has any of the old shortcodes: [newcourses][featuredcourses][freecourses][paidcourses] the
+	 * page slug will not be returned. For any other pages without it the page URI will be returned.
+	 *
+	 *
+	 * @sine 1.9.0
+	 *
+	 *
+	 * @return false|string
+	 */
+	public function get_course_post_type_archive_slug(){
 
-        $settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
+		$settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
 
-        // for a valid post that doesn't have any of the old short codes set the archive the same
-        // as the page URI
-        if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
+		// for a valid post that doesn't have any of the old short codes set the archive the same
+		// as the page URI
+		if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
 
-             return get_page_uri( $settings_course_page->ID );
+			 return get_page_uri( $settings_course_page->ID );
 
-        }else{
+		}else{
 
-            return 'courses';
+			return 'courses';
 
-        }
+		}
 
-    }// end course_post_type_determine_archive
+	}// end course_post_type_determine_archive
 
-    /**
-     * Check if given content has any of these old shortcodes:
-     * [newcourses][featuredcourses][freecourses][paidcourses]
-     *
-     * @since 1.9.0
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function has_old_shortcodes( $content ){
+	/**
+	 * Check if given content has any of these old shortcodes:
+	 * [newcourses][featuredcourses][freecourses][paidcourses]
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param string $content
+	 *
+	 * @return bool
+	 */
+	public function has_old_shortcodes( $content ){
 
-        return  ( has_shortcode( $content, 'newcourses')
-        || has_shortcode( $content, 'featuredcourses')
-        || has_shortcode( $content, 'freecourses')
-        || has_shortcode( $content, 'paidcourses') );
+		return  ( has_shortcode( $content, 'newcourses')
+		|| has_shortcode( $content, 'featuredcourses')
+		|| has_shortcode( $content, 'freecourses')
+		|| has_shortcode( $content, 'paidcourses') );
 
-    }// end has old shortcodes
+	}// end has old shortcodes
 
 
 	/**
@@ -213,32 +213,32 @@ 
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'query_var' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'lesson',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 52,
-		    'supports' => $supports_array
+			'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'query_var' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'lesson',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 52,
+			'supports' => $supports_array
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Lesson post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Lesson post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
 
 	} // End setup_lesson_post_type()
@@ -246,45 +246,45 @@ 
 	/**
 	 * Setup the "quiz" post type, it's admin menu item and the appropriate labels and permissions.
 	 * @since  1.0.0
-     * @uses  Sensei()
+	 * @uses  Sensei()
 	 * @return void
 	 */
 	public function setup_quiz_post_type () {
 
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(
-                $this->labels['quiz']['singular'],
-                $this->labels['quiz']['plural'],
-                $this->labels['quiz']['menu']
-            ),
-		    'public' => true,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'quiz',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+			'labels' => $this->create_post_type_labels(
+				$this->labels['quiz']['singular'],
+				$this->labels['quiz']['plural'],
+				$this->labels['quiz']['menu']
+			),
+			'public' => true,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'quiz',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 20, // Below "Pages"
+			'supports' => array( '' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Quiz post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Quiz post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
 
 	} // End setup_quiz_post_type()
@@ -298,34 +298,34 @@ 
 	public function setup_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => true,
-		    'show_ui' => true,
-		    'show_in_menu' => true,
-		    'show_in_nav_menus' => false,
-		    'query_var' => true,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  true,
-                'feeds' => true,
-                'pages' => true
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => true,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+			'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => true,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'show_in_nav_menus' => false,
+			'query_var' => true,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  true,
+				'feeds' => true,
+				'pages' => true
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => true,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title' )
 		);
 
-        /**
-         * Filter the arguments passed in when registering the Sensei Question post type.
-         *
-         * @since 1.9.0
-         * @param array $args
-         */
+		/**
+		 * Filter the arguments passed in when registering the Sensei Question post type.
+		 *
+		 * @since 1.9.0
+		 * @param array $args
+		 */
 		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
 
 	} // End setup_question_post_type()
@@ -338,26 +338,26 @@ 
 	public function setup_multiple_question_post_type () {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
-		    'public' => false,
-		    'publicly_queryable' => false,
-		    'show_ui' => false,
-		    'show_in_menu' => false,
-		    'show_in_nav_menus' => false,
-		    'query_var' => false,
-		    'exclude_from_search' => true,
-		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                'with_front' =>  false,
-                'feeds' => false,
-                'pages' => false
-            ),
-		    'map_meta_cap' => true,
-		    'capability_type' => 'question',
-		    'has_archive' => false,
-		    'hierarchical' => false,
-		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+			'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
+			'public' => false,
+			'publicly_queryable' => false,
+			'show_ui' => false,
+			'show_in_menu' => false,
+			'show_in_nav_menus' => false,
+			'query_var' => false,
+			'exclude_from_search' => true,
+			'rewrite' => array(
+				'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+				'with_front' =>  false,
+				'feeds' => false,
+				'pages' => false
+			),
+			'map_meta_cap' => true,
+			'capability_type' => 'question',
+			'has_archive' => false,
+			'hierarchical' => false,
+			'menu_position' => 51,
+			'supports' => array( 'title', 'custom-fields' )
 		);
 
 		register_post_type( 'multiple_question', $args );
@@ -374,34 +374,34 @@ 
 		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
 
 			$args = array(
-			    'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
-			    'public' => true,
-			    'publicly_queryable' => true,
-			    'show_ui' => true,
-			    'show_in_menu' => 'sensei',
-			    'show_in_nav_menus' => true,
-			    'query_var' => true,
-			    'exclude_from_search' => true,
-			    'rewrite' => array(
-                    'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
-                    'with_front' =>  false,
-                    'feeds' => false,
-                    'pages' => true
-                ),
-			    'map_meta_cap' => true,
-			    'capability_type' => 'question',
-			    'has_archive' => true,
-			    'hierarchical' => false,
-			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+				'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
+				'public' => true,
+				'publicly_queryable' => true,
+				'show_ui' => true,
+				'show_in_menu' => 'sensei',
+				'show_in_nav_menus' => true,
+				'query_var' => true,
+				'exclude_from_search' => true,
+				'rewrite' => array(
+					'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+					'with_front' =>  false,
+					'feeds' => false,
+					'pages' => true
+				),
+				'map_meta_cap' => true,
+				'capability_type' => 'question',
+				'has_archive' => true,
+				'hierarchical' => false,
+				'menu_position' => 50,
+				'supports' => array( 'title', 'editor', 'comments' ),
 			);
 
-            /**
-             * Filter the arguments passed in when registering the Sensei sensei_message post type.
-             *
-             * @since 1.9.0
-             * @param array $args
-             */
+			/**
+			 * Filter the arguments passed in when registering the Sensei sensei_message post type.
+			 *
+			 * @since 1.9.0
+			 * @param array $args
+			 */
 			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
 		}
 	} // End setup_sensei_message_post_type()
@@ -434,11 +434,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_courses',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_courses',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_courses',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_courses',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_course_category_slug', _x( 'course-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -474,7 +474,7 @@ 
 			'show_ui' => true, /* TO DO - future releases */
 			'query_var' => true,
 			'show_in_nav_menus' => false,
-            'public' => false,
+			'public' => false,
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -546,11 +546,11 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_questions',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_questions',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_questions',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_questions',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_category_slug', _x( 'question-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -584,11 +584,11 @@ 
 			'show_ui' => true,
 			'query_var' => true,
 			'show_in_nav_menus' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_lessons',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_lessons',),
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_lessons',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_lessons',),
 			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_lesson_tag_slug', _x( 'lesson-tag', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
 		);
 
@@ -622,19 +622,19 @@ 
 	 */
 	private function create_post_type_labels ( $singular, $plural, $menu ) {
 		$labels = array(
-		    'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
-		    'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
-		    'add_new' => __( 'Add New', 'woothemes-sensei' ),
-		    'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
-		    'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
-		    'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
-		    'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
-		    'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
-		    'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
-		    'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+			'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
+			'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
+			'add_new' => __( 'Add New', 'woothemes-sensei' ),
+			'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
+			'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
+			'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
+			'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
+			'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
+			'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
+			'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+			'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+			'parent_item_colon' => '',
+			'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
 		  );
 
 		return $labels;
@@ -707,7 +707,7 @@ 
 	 * Assigns the defaults for each user role capabilities.
 	 *
 	 * @since  1.1.0
-     *
+	 *
 	 * @param array $post_types
 	 * @return void
 	 */
@@ -775,7 +775,7 @@ 
 	 * Adds a 'Edit Quiz' link to the admin bar when viewing a Quiz linked to a corresponding Lesson
 	 * 
 	 * @since  1.7.0
-     * @param WP_Admin_Bar $bar
+	 * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
 	public function quiz_admin_bar_menu( $bar ) {

Spacing +237 added lines, -237 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Post Types Class
@@ -41,43 +41,43 @@ 
 	 * Constructor
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Setup Post Types
 		$this->labels = array();
         $this->token = 'woothemes-sensei-posttypes';
 
 		$this->setup_post_type_labels_base();
-		add_action( 'init', array( $this, 'setup_course_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_multiple_question_post_type' ), 100 );
-		add_action( 'init', array( $this, 'setup_sensei_message_post_type' ), 100 );
+		add_action('init', array($this, 'setup_course_post_type'), 100);
+		add_action('init', array($this, 'setup_lesson_post_type'), 100);
+		add_action('init', array($this, 'setup_quiz_post_type'), 100);
+		add_action('init', array($this, 'setup_question_post_type'), 100);
+		add_action('init', array($this, 'setup_multiple_question_post_type'), 100);
+		add_action('init', array($this, 'setup_sensei_message_post_type'), 100);
 
 		// Setup Taxonomies
-		add_action( 'init', array( $this, 'setup_course_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_quiz_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_type_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_question_category_taxonomy' ), 100 );
-		add_action( 'init', array( $this, 'setup_lesson_tag_taxonomy' ), 100 );
+		add_action('init', array($this, 'setup_course_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_quiz_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_type_taxonomy'), 100);
+		add_action('init', array($this, 'setup_question_category_taxonomy'), 100);
+		add_action('init', array($this, 'setup_lesson_tag_taxonomy'), 100);
 
 		// Load Post Type Objects
-		$default_post_types = array( 'course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages' ) ;
-		$this->load_posttype_objects( $default_post_types );
+		$default_post_types = array('course' => 'Course', 'lesson' => 'Lesson', 'quiz' => 'Quiz', 'question' => 'Question', 'messages' => 'Messages');
+		$this->load_posttype_objects($default_post_types);
 
 		// Admin functions
-		if ( is_admin() ) {
-			$this->set_role_cap_defaults( $default_post_types );
+		if (is_admin()) {
+			$this->set_role_cap_defaults($default_post_types);
 			global $pagenow;
-			if ( ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) ) {
-				add_filter( 'enter_title_here', array( $this, 'enter_title_here' ), 10 );
-				add_filter( 'post_updated_messages', array( $this, 'setup_post_type_messages' ) );
+			if (($pagenow == 'post.php' || $pagenow == 'post-new.php')) {
+				add_filter('enter_title_here', array($this, 'enter_title_here'), 10);
+				add_filter('post_updated_messages', array($this, 'setup_post_type_messages'));
 			} // End If Statement
 		} // End If Statement
 
 		// Add 'Edit Quiz' link to admin bar
-		add_action( 'admin_bar_menu', array( $this, 'quiz_admin_bar_menu' ), 81 );
+		add_action('admin_bar_menu', array($this, 'quiz_admin_bar_menu'), 81);
 
 	} // End __construct()
 
@@ -88,12 +88,12 @@ 
 	 * @param array $posttypes (default: array())
 	 * @return void
 	 */
-	public function load_posttype_objects( $posttypes = array() ) {
+	public function load_posttype_objects($posttypes = array()) {
 
-		foreach ( $posttypes as $posttype_token => $posttype_name ) {
+		foreach ($posttypes as $posttype_token => $posttype_name) {
 
 			// Load the files
-			$class_name = 'WooThemes_Sensei_' . $posttype_name;
+			$class_name = 'WooThemes_Sensei_'.$posttype_name;
 			$this->$posttype_token = new $class_name();
 			$this->$posttype_token->token = $posttype_token;
 
@@ -107,10 +107,10 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_course_post_type () {
+	public function setup_course_post_type() {
 
 		$args = array(
-		    'labels'              => $this->create_post_type_labels( $this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu'] ),
+		    'labels'              => $this->create_post_type_labels($this->labels['course']['singular'], $this->labels['course']['plural'], $this->labels['course']['menu']),
 		    'public'              => true,
 		    'publicly_queryable'  => true,
 		    'show_ui'             => true,
@@ -118,7 +118,7 @@ 
 		    'show_in_admin_bar'   => true,
 		    'query_var'           => true,
 		    'rewrite'             => array(
-                'slug' => esc_attr( apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url base', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_course_slug', _x('course', 'post type single url base', 'woothemes-sensei'))),
                 'with_front' => true,
                 'feeds' => true,
                 'pages' => true
@@ -128,7 +128,7 @@ 
             'has_archive'         => $this->get_course_post_type_archive_slug(),
 		    'hierarchical'        => false,
 		    'menu_position'       => 51,
-		    'supports'            => array( 'title', 'editor', 'excerpt', 'thumbnail' )
+		    'supports'            => array('title', 'editor', 'excerpt', 'thumbnail')
 		);
 
         /**
@@ -137,7 +137,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'course', apply_filters( 'sensei_register_post_type_course', $args ) );
+		register_post_type('course', apply_filters('sensei_register_post_type_course', $args));
 
 	} // End setup_course_post_type()
 
@@ -156,17 +156,17 @@ 
      *
      * @return false|string
      */
-    public function get_course_post_type_archive_slug(){
+    public function get_course_post_type_archive_slug() {
 
-        $settings_course_page = get_post( Sensei()->settings->get( 'course_page' ) );
+        $settings_course_page = get_post(Sensei()->settings->get('course_page'));
 
         // for a valid post that doesn't have any of the old short codes set the archive the same
         // as the page URI
-        if( is_a( $settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes( $settings_course_page->post_content ) ){
+        if (is_a($settings_course_page, 'WP_Post') && ! $this->has_old_shortcodes($settings_course_page->post_content)) {
 
-             return get_page_uri( $settings_course_page->ID );
+             return get_page_uri($settings_course_page->ID);
 
-        }else{
+        } else {
 
             return 'courses';
 
@@ -184,12 +184,12 @@ 
      *
      * @return bool
      */
-    public function has_old_shortcodes( $content ){
+    public function has_old_shortcodes($content) {
 
-        return  ( has_shortcode( $content, 'newcourses')
-        || has_shortcode( $content, 'featuredcourses')
-        || has_shortcode( $content, 'freecourses')
-        || has_shortcode( $content, 'paidcourses') );
+        return  (has_shortcode($content, 'newcourses')
+        || has_shortcode($content, 'featuredcourses')
+        || has_shortcode($content, 'freecourses')
+        || has_shortcode($content, 'paidcourses'));
 
     }// end has old shortcodes
 
@@ -200,27 +200,27 @@ 
 	 * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_lesson_post_type () {
+	public function setup_lesson_post_type() {
 
 
-		$supports_array = array( 'title', 'editor', 'excerpt', 'thumbnail', 'page-attributes' );
+		$supports_array = array('title', 'editor', 'excerpt', 'thumbnail', 'page-attributes');
 		$allow_comments = false;
-		if ( isset( Sensei()->settings->settings[ 'lesson_comments' ] ) ) {
-			$allow_comments = Sensei()->settings->settings[ 'lesson_comments' ];
+		if (isset(Sensei()->settings->settings['lesson_comments'])) {
+			$allow_comments = Sensei()->settings->settings['lesson_comments'];
 		} // End If Statement
-		if ( $allow_comments ) {
-			array_push( $supports_array, 'comments' );
+		if ($allow_comments) {
+			array_push($supports_array, 'comments');
 		} // End If Statement
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels(  $this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['lesson']['singular'], $this->labels['lesson']['plural'], $this->labels['lesson']['menu']),
 		    'public' => true,
 		    'publicly_queryable' => true,
 		    'show_ui' => true,
 		    'show_in_menu' => true,
 		    'query_var' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_lesson_slug', _x( 'lesson', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_lesson_slug', _x('lesson', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -239,7 +239,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'lesson', apply_filters( 'sensei_register_post_type_lesson', $args ) );
+		register_post_type('lesson', apply_filters('sensei_register_post_type_lesson', $args));
 
 	} // End setup_lesson_post_type()
 
@@ -249,7 +249,7 @@ 
      * @uses  Sensei()
 	 * @return void
 	 */
-	public function setup_quiz_post_type () {
+	public function setup_quiz_post_type() {
 
 
 		$args = array(
@@ -266,7 +266,7 @@ 
 		    'query_var' => true,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_quiz_slug', _x( 'quiz', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_quiz_slug', _x('quiz', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -276,7 +276,7 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 20, // Below "Pages"
-		    'supports' => array( '' )
+		    'supports' => array('')
 		);
 
         /**
@@ -285,7 +285,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'quiz', apply_filters( 'sensei_register_post_type_quiz', $args ) );
+		register_post_type('quiz', apply_filters('sensei_register_post_type_quiz', $args));
 
 	} // End setup_quiz_post_type()
 
@@ -295,10 +295,10 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_question_post_type () {
+	public function setup_question_post_type() {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['question']['singular'], $this->labels['question']['plural'], $this->labels['question']['menu']),
 		    'public' => false,
 		    'publicly_queryable' => true,
 		    'show_ui' => true,
@@ -307,7 +307,7 @@ 
 		    'query_var' => true,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_question_slug', _x( 'question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_question_slug', _x('question', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  true,
                 'feeds' => true,
                 'pages' => true
@@ -317,7 +317,7 @@ 
 		    'has_archive' => true,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title' )
+		    'supports' => array('title')
 		);
 
         /**
@@ -326,7 +326,7 @@ 
          * @since 1.9.0
          * @param array $args
          */
-		register_post_type( 'question', apply_filters('sensei_register_post_type_question', $args ) );
+		register_post_type('question', apply_filters('sensei_register_post_type_question', $args));
 
 	} // End setup_question_post_type()
 
@@ -335,10 +335,10 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_multiple_question_post_type () {
+	public function setup_multiple_question_post_type() {
 
 		$args = array(
-		    'labels' => $this->create_post_type_labels( $this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu'] ),
+		    'labels' => $this->create_post_type_labels($this->labels['multiple_question']['singular'], $this->labels['multiple_question']['plural'], $this->labels['multiple_question']['menu']),
 		    'public' => false,
 		    'publicly_queryable' => false,
 		    'show_ui' => false,
@@ -347,7 +347,7 @@ 
 		    'query_var' => false,
 		    'exclude_from_search' => true,
 		    'rewrite' => array(
-                'slug' => esc_attr( apply_filters( 'sensei_multiple_question_slug', _x( 'multiple_question', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                'slug' => esc_attr(apply_filters('sensei_multiple_question_slug', _x('multiple_question', 'post type single slug', 'woothemes-sensei'))),
                 'with_front' =>  false,
                 'feeds' => false,
                 'pages' => false
@@ -357,10 +357,10 @@ 
 		    'has_archive' => false,
 		    'hierarchical' => false,
 		    'menu_position' => 51,
-		    'supports' => array( 'title', 'custom-fields' )
+		    'supports' => array('title', 'custom-fields')
 		);
 
-		register_post_type( 'multiple_question', $args );
+		register_post_type('multiple_question', $args);
 	} // End setup_multiple_question_post_type()
 
 	/**
@@ -368,13 +368,13 @@ 
 	 * @since  1.6.0
 	 * @return void
 	 */
-	public function setup_sensei_message_post_type () {
+	public function setup_sensei_message_post_type() {
 
 
-		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
+		if ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable']) {
 
 			$args = array(
-			    'labels' => $this->create_post_type_labels( $this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu'] ),
+			    'labels' => $this->create_post_type_labels($this->labels['sensei_message']['singular'], $this->labels['sensei_message']['plural'], $this->labels['sensei_message']['menu']),
 			    'public' => true,
 			    'publicly_queryable' => true,
 			    'show_ui' => true,
@@ -383,7 +383,7 @@ 
 			    'query_var' => true,
 			    'exclude_from_search' => true,
 			    'rewrite' => array(
-                    'slug' => esc_attr( apply_filters( 'sensei_messages_slug', _x( 'messages', 'post type single slug', 'woothemes-sensei' ) ) ) ,
+                    'slug' => esc_attr(apply_filters('sensei_messages_slug', _x('messages', 'post type single slug', 'woothemes-sensei'))),
                     'with_front' =>  false,
                     'feeds' => false,
                     'pages' => true
@@ -393,7 +393,7 @@ 
 			    'has_archive' => true,
 			    'hierarchical' => false,
 			    'menu_position' => 50,
-			    'supports' => array( 'title', 'editor', 'comments' ),
+			    'supports' => array('title', 'editor', 'comments'),
 			);
 
             /**
@@ -402,7 +402,7 @@ 
              * @since 1.9.0
              * @param array $args
              */
-			register_post_type( 'sensei_message', apply_filters('sensei_register_post_type_sensei_message',  $args ) );
+			register_post_type('sensei_message', apply_filters('sensei_register_post_type_sensei_message', $args));
 		}
 	} // End setup_sensei_message_post_type()
 
@@ -411,20 +411,20 @@ 
 	 * @since  1.1.0
 	 * @return void
 	 */
-	public function setup_course_category_taxonomy () {
+	public function setup_course_category_taxonomy() {
 		// "Course Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Course Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Course Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Course Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Course Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Course Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Course Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Course Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Course Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Course Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Course Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Course Categories', 'woothemes-sensei' ),
+			'name' => _x('Course Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Course Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Course Categories', 'woothemes-sensei'),
+			'all_items' => __('All Course Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Course Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Course Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Course Category', 'woothemes-sensei'),
+			'update_item' => __('Update Course Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Course Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Course Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Course Categories', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -439,10 +439,10 @@ 
                 'edit_terms'   => 'edit_courses',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_courses',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_course_category_slug', _x( 'course-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_course_category_slug', _x('course-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'course-category', array( 'course' ), $args );
+		register_taxonomy('course-category', array('course'), $args);
 
 	} // End setup_course_category_taxonomy()
 
@@ -451,20 +451,20 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function setup_quiz_type_taxonomy () {
+	public function setup_quiz_type_taxonomy() {
 		// "Quiz Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Quiz Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Quiz Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Quiz Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Quiz Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Quiz Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Quiz Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Quiz Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Quiz Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Quiz Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Quiz Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Quiz Types', 'woothemes-sensei' ),
+			'name' => _x('Quiz Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Quiz Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Quiz Types', 'woothemes-sensei'),
+			'all_items' => __('All Quiz Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Quiz Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Quiz Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Quiz Type', 'woothemes-sensei'),
+			'update_item' => __('Update Quiz Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Quiz Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Quiz Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Quiz Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -475,10 +475,10 @@ 
 			'query_var' => true,
 			'show_in_nav_menus' => false,
             'public' => false,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_quiz_type_slug', _x( 'quiz-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_quiz_type_slug', _x('quiz-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'quiz-type', array( 'quiz' ), $args );
+		register_taxonomy('quiz-type', array('quiz'), $args);
 	} // End setup_quiz_type_taxonomy()
 
 	/**
@@ -486,20 +486,20 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_type_taxonomy () {
+	public function setup_question_type_taxonomy() {
 		// "Question Types" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Types', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Type', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Types', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Types', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Type', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Type:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Type', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Type', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Type', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Type Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Question Types', 'woothemes-sensei' ),
+			'name' => _x('Question Types', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Type', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Types', 'woothemes-sensei'),
+			'all_items' => __('All Question Types', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Type', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Type:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Type', 'woothemes-sensei'),
+			'update_item' => __('Update Question Type', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Type', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Type Name', 'woothemes-sensei'),
+			'menu_name' => __('Question Types', 'woothemes-sensei'),
 			'popular_items' => null // Hides the "Popular" section above the "add" form in the admin.
 		);
 
@@ -511,10 +511,10 @@ 
 			'query_var' => false,
 			'show_in_nav_menus' => false,
 			'show_admin_column' => true,
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_type_slug', _x( 'question-type', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_type_slug', _x('question-type', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-type', array( 'question' ), $args );
+		register_taxonomy('question-type', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -522,20 +522,20 @@ 
 	 * @since  1.3.0
 	 * @return void
 	 */
-	public function setup_question_category_taxonomy () {
+	public function setup_question_category_taxonomy() {
 		// "Question Categories" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Question Categories', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Question Category', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Question Categories', 'woothemes-sensei' ),
-			'all_items' => __( 'All Question Categories', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Question Category', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Question Category:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Question Category', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Question Category', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Question Category', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Question Category Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Categories', 'woothemes-sensei' ),
+			'name' => _x('Question Categories', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Question Category', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Question Categories', 'woothemes-sensei'),
+			'all_items' => __('All Question Categories', 'woothemes-sensei'),
+			'parent_item' => __('Parent Question Category', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Question Category:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Question Category', 'woothemes-sensei'),
+			'update_item' => __('Update Question Category', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Question Category', 'woothemes-sensei'),
+			'new_item_name' => __('New Question Category Name', 'woothemes-sensei'),
+			'menu_name' => __('Categories', 'woothemes-sensei'),
 		);
 
 		$args = array(
@@ -551,10 +551,10 @@ 
                 'edit_terms'   => 'edit_questions',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_questions',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_question_category_slug', _x( 'question-category', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_question_category_slug', _x('question-category', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'question-category', array( 'question' ), $args );
+		register_taxonomy('question-category', array('question'), $args);
 	} // End setup_question_type_taxonomy()
 
 	/**
@@ -562,20 +562,20 @@ 
 	 * @since  1.5.0
 	 * @return void
 	 */
-	public function setup_lesson_tag_taxonomy () {
+	public function setup_lesson_tag_taxonomy() {
 		// "Lesson Tags" Custom Taxonomy
 		$labels = array(
-			'name' => _x( 'Lesson Tags', 'taxonomy general name', 'woothemes-sensei' ),
-			'singular_name' => _x( 'Lesson Tag', 'taxonomy singular name', 'woothemes-sensei' ),
-			'search_items' =>  __( 'Search Lesson Tags', 'woothemes-sensei' ),
-			'all_items' => __( 'All Lesson Tags', 'woothemes-sensei' ),
-			'parent_item' => __( 'Parent Tag', 'woothemes-sensei' ),
-			'parent_item_colon' => __( 'Parent Tag:', 'woothemes-sensei' ),
-			'edit_item' => __( 'Edit Lesson Tag', 'woothemes-sensei' ),
-			'update_item' => __( 'Update Lesson Tag', 'woothemes-sensei' ),
-			'add_new_item' => __( 'Add New Lesson Tag', 'woothemes-sensei' ),
-			'new_item_name' => __( 'New Tag Name', 'woothemes-sensei' ),
-			'menu_name' => __( 'Lesson Tags', 'woothemes-sensei' )
+			'name' => _x('Lesson Tags', 'taxonomy general name', 'woothemes-sensei'),
+			'singular_name' => _x('Lesson Tag', 'taxonomy singular name', 'woothemes-sensei'),
+			'search_items' =>  __('Search Lesson Tags', 'woothemes-sensei'),
+			'all_items' => __('All Lesson Tags', 'woothemes-sensei'),
+			'parent_item' => __('Parent Tag', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Tag:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Lesson Tag', 'woothemes-sensei'),
+			'update_item' => __('Update Lesson Tag', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Lesson Tag', 'woothemes-sensei'),
+			'new_item_name' => __('New Tag Name', 'woothemes-sensei'),
+			'menu_name' => __('Lesson Tags', 'woothemes-sensei')
 		);
 
 		$args = array(
@@ -589,10 +589,10 @@ 
                 'edit_terms'   => 'edit_lessons',
                 'delete_terms' => 'manage_categories',
                 'assign_terms' => 'edit_lessons',),
-			'rewrite' => array( 'slug' => esc_attr( apply_filters( 'sensei_lesson_tag_slug', _x( 'lesson-tag', 'taxonomy archive slug', 'woothemes-sensei' ) ) ) )
+			'rewrite' => array('slug' => esc_attr(apply_filters('sensei_lesson_tag_slug', _x('lesson-tag', 'taxonomy archive slug', 'woothemes-sensei'))))
 		);
 
-		register_taxonomy( 'lesson-tag', array( 'lesson' ), $args );
+		register_taxonomy('lesson-tag', array('lesson'), $args);
 	} // End setup_lesson_tag_taxonomy()
 
 	/**
@@ -600,15 +600,15 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function setup_post_type_labels_base () {
-		$this->labels = array( 'course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array() );
+	private function setup_post_type_labels_base() {
+		$this->labels = array('course' => array(), 'lesson' => array(), 'quiz' => array(), 'question' => array());
 
-		$this->labels['course'] = array( 'singular' => __( 'Course', 'woothemes-sensei' ), 'plural' => __( 'Courses', 'woothemes-sensei' ), 'menu' => __( 'Courses', 'woothemes-sensei' ) );
-		$this->labels['lesson'] = array( 'singular' => __( 'Lesson', 'woothemes-sensei' ), 'plural' => __( 'Lessons', 'woothemes-sensei' ), 'menu' => __( 'Lessons', 'woothemes-sensei' ) );
-		$this->labels['quiz'] = array( 'singular' => __( 'Quiz', 'woothemes-sensei' ), 'plural' => __( 'Quizzes', 'woothemes-sensei' ), 'menu' => __( 'Quizzes', 'woothemes-sensei' ) );
-		$this->labels['question'] = array( 'singular' => __( 'Question', 'woothemes-sensei' ), 'plural' => __( 'Questions', 'woothemes-sensei' ), 'menu' => __( 'Questions', 'woothemes-sensei' ) );
-		$this->labels['multiple_question'] = array( 'singular' => __( 'Multiple Question', 'woothemes-sensei' ), 'plural' => __( 'Multiple Questions', 'woothemes-sensei' ), 'menu' => __( 'Multiple Questions', 'woothemes-sensei' ) );
-		$this->labels['sensei_message'] = array( 'singular' => __( 'Message', 'woothemes-sensei' ), 'plural' => __( 'Messages', 'woothemes-sensei' ), 'menu' => __( 'Messages', 'woothemes-sensei' ) );
+		$this->labels['course'] = array('singular' => __('Course', 'woothemes-sensei'), 'plural' => __('Courses', 'woothemes-sensei'), 'menu' => __('Courses', 'woothemes-sensei'));
+		$this->labels['lesson'] = array('singular' => __('Lesson', 'woothemes-sensei'), 'plural' => __('Lessons', 'woothemes-sensei'), 'menu' => __('Lessons', 'woothemes-sensei'));
+		$this->labels['quiz'] = array('singular' => __('Quiz', 'woothemes-sensei'), 'plural' => __('Quizzes', 'woothemes-sensei'), 'menu' => __('Quizzes', 'woothemes-sensei'));
+		$this->labels['question'] = array('singular' => __('Question', 'woothemes-sensei'), 'plural' => __('Questions', 'woothemes-sensei'), 'menu' => __('Questions', 'woothemes-sensei'));
+		$this->labels['multiple_question'] = array('singular' => __('Multiple Question', 'woothemes-sensei'), 'plural' => __('Multiple Questions', 'woothemes-sensei'), 'menu' => __('Multiple Questions', 'woothemes-sensei'));
+		$this->labels['sensei_message'] = array('singular' => __('Message', 'woothemes-sensei'), 'plural' => __('Messages', 'woothemes-sensei'), 'menu' => __('Messages', 'woothemes-sensei'));
 
 	} // End setup_post_type_labels_base()
 
@@ -620,21 +620,21 @@ 
 	 * @param  string $menu     The menu item label
 	 * @return array            An array of the labels to be used
 	 */
-	private function create_post_type_labels ( $singular, $plural, $menu ) {
+	private function create_post_type_labels($singular, $plural, $menu) {
 		$labels = array(
-		    'name' => sprintf( _x( '%s', 'post type general name', 'woothemes-sensei' ), $plural ),
-		    'singular_name' => sprintf( _x( '%s', 'post type singular name', 'woothemes-sensei' ), $singular ),
-		    'add_new' => __( 'Add New', 'woothemes-sensei' ),
-		    'add_new_item' => sprintf( __( 'Add New %s', 'woothemes-sensei' ), $singular ),
-		    'edit_item' => sprintf( __( 'Edit %s', 'woothemes-sensei' ), $singular ),
-		    'new_item' => sprintf( __( 'New %s', 'woothemes-sensei' ), $singular ),
-		    'all_items' => sprintf( __( 'All %s', 'woothemes-sensei' ), $plural ),
-		    'view_item' => sprintf( __( 'View %s', 'woothemes-sensei' ), $singular ),
-		    'search_items' => sprintf( __( 'Search %s', 'woothemes-sensei' ), $plural ),
-		    'not_found' =>  sprintf( __( 'No %s found', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
-		    'not_found_in_trash' => sprintf( __( 'No %s found in Trash', 'woothemes-sensei' ), mb_strtolower( $plural, 'UTF-8') ),
+		    'name' => sprintf(_x('%s', 'post type general name', 'woothemes-sensei'), $plural),
+		    'singular_name' => sprintf(_x('%s', 'post type singular name', 'woothemes-sensei'), $singular),
+		    'add_new' => __('Add New', 'woothemes-sensei'),
+		    'add_new_item' => sprintf(__('Add New %s', 'woothemes-sensei'), $singular),
+		    'edit_item' => sprintf(__('Edit %s', 'woothemes-sensei'), $singular),
+		    'new_item' => sprintf(__('New %s', 'woothemes-sensei'), $singular),
+		    'all_items' => sprintf(__('All %s', 'woothemes-sensei'), $plural),
+		    'view_item' => sprintf(__('View %s', 'woothemes-sensei'), $singular),
+		    'search_items' => sprintf(__('Search %s', 'woothemes-sensei'), $plural),
+		    'not_found' =>  sprintf(__('No %s found', 'woothemes-sensei'), mb_strtolower($plural, 'UTF-8')),
+		    'not_found_in_trash' => sprintf(__('No %s found in Trash', 'woothemes-sensei'), mb_strtolower($plural, 'UTF-8')),
 		    'parent_item_colon' => '',
-		    'menu_name' => sprintf( __( '%s', 'woothemes-sensei' ), $menu )
+		    'menu_name' => sprintf(__('%s', 'woothemes-sensei'), $menu)
 		  );
 
 		return $labels;
@@ -646,14 +646,14 @@ 
 	 * @param  array $messages The existing array of messages for post types.
 	 * @return array           The modified array of messages for post types.
 	 */
-	public function setup_post_type_messages ( $messages ) {
+	public function setup_post_type_messages($messages) {
 		global $post, $post_ID;
 
-		$messages['course'] = $this->create_post_type_messages( 'course' );
-		$messages['lesson'] = $this->create_post_type_messages( 'lesson' );
-		$messages['quiz'] = $this->create_post_type_messages( 'quiz' );
-		$messages['question'] = $this->create_post_type_messages( 'question' );
-		$messages['multiple_question'] = $this->create_post_type_messages( 'multiple_question' );
+		$messages['course'] = $this->create_post_type_messages('course');
+		$messages['lesson'] = $this->create_post_type_messages('lesson');
+		$messages['quiz'] = $this->create_post_type_messages('quiz');
+		$messages['question'] = $this->create_post_type_messages('question');
+		$messages['multiple_question'] = $this->create_post_type_messages('multiple_question');
 
 		return $messages;
 	} // End setup_post_type_messages()
@@ -664,23 +664,23 @@ 
 	 * @param  string $post_type The post type for which to create messages.
 	 * @return array            An array of messages (empty array if the post type isn't one we're looking to work with).
 	 */
-	private function create_post_type_messages ( $post_type ) {
+	private function create_post_type_messages($post_type) {
 		global $post, $post_ID;
 
-		if ( ! isset( $this->labels[$post_type] ) ) { return array(); }
+		if ( ! isset($this->labels[$post_type])) { return array(); }
 
 		$messages = array(
 			0 => '',
-			1 => sprintf( __( '%1$s updated. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			2 => __( 'Custom field updated.' , 'woothemes-sensei' ),
-			3 => __( 'Custom field deleted.' , 'woothemes-sensei' ),
-			4 => sprintf( __( '%1$s updated.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			5 => isset( $_GET['revision'] ) ? sprintf( __( '%1$s restored to revision from %2$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6 => sprintf( __( '%1$s published. %2$sView %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a href="' . esc_url( get_permalink( $post_ID ) ) . '">', '</a>' ),
-			7 => sprintf( __( '%1$s saved.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'] ),
-			8 => sprintf( __( '%1$s submitted. %2$sPreview %1$s%3$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', '</a>' ),
-			9 => sprintf( __( '%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<strong>' . date_i18n( __( 'M j, Y @ G:i' , 'woothemes-sensei' ), strtotime( $post->post_date ) ) . '</strong>', '<a target="_blank" href="' . esc_url( get_permalink( $post_ID ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
-			10 => sprintf( __( '%1$s draft updated. %2$sPreview %3$s%4$s.' , 'woothemes-sensei' ), $this->labels[$post_type]['singular'], '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) . '">', $this->labels[$post_type]['singular'], '</a>' ),
+			1 => sprintf(__('%1$s updated. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			2 => __('Custom field updated.', 'woothemes-sensei'),
+			3 => __('Custom field deleted.', 'woothemes-sensei'),
+			4 => sprintf(__('%1$s updated.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			5 => isset($_GET['revision']) ? sprintf(__('%1$s restored to revision from %2$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6 => sprintf(__('%1$s published. %2$sView %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a href="'.esc_url(get_permalink($post_ID)).'">', '</a>'),
+			7 => sprintf(__('%1$s saved.', 'woothemes-sensei'), $this->labels[$post_type]['singular']),
+			8 => sprintf(__('%1$s submitted. %2$sPreview %1$s%3$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', '</a>'),
+			9 => sprintf(__('%1$s scheduled for: %2$s. %3$sPreview %4$s%5$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<strong>'.date_i18n(__('M j, Y @ G:i', 'woothemes-sensei'), strtotime($post->post_date)).'</strong>', '<a target="_blank" href="'.esc_url(get_permalink($post_ID)).'">', $this->labels[$post_type]['singular'], '</a>'),
+			10 => sprintf(__('%1$s draft updated. %2$sPreview %3$s%4$s.', 'woothemes-sensei'), $this->labels[$post_type]['singular'], '<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))).'">', $this->labels[$post_type]['singular'], '</a>'),
 		);
 
 		return $messages;
@@ -693,11 +693,11 @@ 
 	 * @param  string $title
 	 * @return string $title
 	 */
-	public function enter_title_here ( $title ) {
-		if ( get_post_type() == 'course' ) {
-			$title = __( 'Enter a title for this course here', 'woothemes-sensei' );
-		} elseif ( get_post_type() == 'lesson' ) {
-			$title = __( 'Enter a title for this lesson here', 'woothemes-sensei' );
+	public function enter_title_here($title) {
+		if (get_post_type() == 'course') {
+			$title = __('Enter a title for this course here', 'woothemes-sensei');
+		} elseif (get_post_type() == 'lesson') {
+			$title = __('Enter a title for this lesson here', 'woothemes-sensei');
 		}
 
 		return $title;
@@ -711,60 +711,60 @@ 
 	 * @param array $post_types
 	 * @return void
 	 */
-	public function set_role_cap_defaults( $post_types = array() ) {
+	public function set_role_cap_defaults($post_types = array()) {
 
-		foreach ( $post_types as $post_type_item => $post_type_name ) {
+		foreach ($post_types as $post_type_item => $post_type_name) {
 			// Super Admin
-			$this->role_caps[] =  array(	'administrator' 	=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+			$this->role_caps[] = array('administrator' 	=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s',
 																			'manage_sensei',
-																			'manage_sensei_grades' ),
-											'editor' 			=> array(	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																		 	'edit_' . $post_type_item . 's',
-																			'edit_others_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
-																			'read_private_' . $post_type_item . 's',
+																			'manage_sensei_grades'),
+											'editor' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																		 	'edit_'.$post_type_item.'s',
+																			'edit_others_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
+																			'read_private_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_private_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'delete_others_' . $post_type_item . 's',
-																			'edit_private_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'author' 			=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
-																			'publish_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_private_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'delete_others_'.$post_type_item.'s',
+																			'edit_private_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'author' 			=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
+																			'publish_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's',
-																			'delete_published_' . $post_type_item . 's',
-																			'edit_published_' . $post_type_item . 's' ),
-											'contributor' 		=> array( 	'edit_' . $post_type_item,
-																			'read_' . $post_type_item,
-																			'delete_' . $post_type_item,
-																			'create_' . $post_type_item . 's',
-																			'edit_' . $post_type_item . 's',
+																			'delete_'.$post_type_item.'s',
+																			'delete_published_'.$post_type_item.'s',
+																			'edit_published_'.$post_type_item.'s'),
+											'contributor' 		=> array('edit_'.$post_type_item,
+																			'read_'.$post_type_item,
+																			'delete_'.$post_type_item,
+																			'create_'.$post_type_item.'s',
+																			'edit_'.$post_type_item.'s',
 																			'read',
-																			'delete_' . $post_type_item . 's' ),
-											'subscriber' 		=> array( 	'read' )
+																			'delete_'.$post_type_item.'s'),
+											'subscriber' 		=> array('read')
 
 										);
 		} // End For Loop
@@ -778,16 +778,16 @@ 
      * @param WP_Admin_Bar $bar
 	 * @return void
 	 */
-	public function quiz_admin_bar_menu( $bar ) {
-		if ( is_single() && 'quiz' == get_queried_object()->post_type ) {
-			$lesson_id = get_post_meta( get_queried_object()->ID, '_quiz_lesson', true );
-			if ( $lesson_id ) {
+	public function quiz_admin_bar_menu($bar) {
+		if (is_single() && 'quiz' == get_queried_object()->post_type) {
+			$lesson_id = get_post_meta(get_queried_object()->ID, '_quiz_lesson', true);
+			if ($lesson_id) {
 				$object_type = get_post_type_object('quiz');
-				$bar->add_menu( array(
+				$bar->add_menu(array(
 					'id' => 'edit',
 					'title' => $object_type->labels->edit_item,
-					'href' => get_edit_post_link( $lesson_id ),
-				) );
+					'href' => get_edit_post_link($lesson_id),
+				));
 			}
 		}
 	}
@@ -799,4 +799,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_PostTypes extends Sensei_PostTypes{}
+class WooThemes_Sensei_PostTypes extends Sensei_PostTypes {}