woothemes / sensei

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

Indentation +60 added lines, -60 removed lines

@@ -14,88 +14,88 @@
  */
 class Sensei_Shortcode_Lesson_Page implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array $lesson_page_query {
-     *     @type WP_Post
-     * }
-     * The lessons query
-     */
-    protected $lesson_page_query;
+	/**
+	 * @var array $lesson_page_query {
+	 *     @type WP_Post
+	 * }
+	 * The lessons query
+	 */
+	protected $lesson_page_query;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        $this->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
-        $this->setup_lesson_query();
+		$this->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
+		$this->setup_lesson_query();
 
-    }
+	}
 
-    /**
-     * create the lessons query .
-     *
-     * @return mixed
-     */
-    public function setup_lesson_query(){
+	/**
+	 * create the lessons query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_lesson_query(){
 
-        if( empty( $this->id ) ){
-            return;
-        }
+		if( empty( $this->id ) ){
+			return;
+		}
 
-        $args = array(
-            'post_type' => 'lesson',
-            'posts_per_page' => 1,
-            'post_status' => 'publish',
-            'post__in' => array( $this->id ),
-        );
+		$args = array(
+			'post_type' => 'lesson',
+			'posts_per_page' => 1,
+			'post_status' => 'publish',
+			'post__in' => array( $this->id ),
+		);
 
-        $this->lesson_page_query  = new WP_Query( $args );
+		$this->lesson_page_query  = new WP_Query( $args );
 
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        if( empty(  $this->id  ) ){
+		if( empty(  $this->id  ) ){
 
-            return __( 'Please supply a lesson ID for this shortcode.', 'woothemes-sensei' );
+			return __( 'Please supply a lesson ID for this shortcode.', 'woothemes-sensei' );
 
-        }
+		}
 
-        //set the wp_query to the current lessons query
-        global $wp_query;
-        $wp_query = $this->lesson_page_query;
+		//set the wp_query to the current lessons query
+		global $wp_query;
+		$wp_query = $this->lesson_page_query;
 
-        if( have_posts() ){
+		if( have_posts() ){
 
-            the_post();
+			the_post();
 
-        }else{
+		}else{
 
-            return __('No posts found.', 'woothemes-sensei');
+			return __('No posts found.', 'woothemes-sensei');
 
-        }
+		}
 
-        ob_start();
-        Sensei_Templates::get_template('content-single-lesson.php');
-        $shortcode_output = ob_get_clean();
+		ob_start();
+		Sensei_Templates::get_template('content-single-lesson.php');
+		$shortcode_output = ob_get_clean();
 
-        // set back the global query
-        wp_reset_query();
+		// set back the global query
+		wp_reset_query();
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }// end class
 

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_lesson_page] shortcode. Display a single lesson based on the ID parameter given.
@@ -30,9 +30,9 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        $this->id = isset( $attributes['id'] ) ? $attributes['id'] : '';
+        $this->id = isset($attributes['id']) ? $attributes['id'] : '';
         $this->setup_lesson_query();
 
     }
@@ -42,9 +42,9 @@ 
      *
      * @return mixed
      */
-    public function setup_lesson_query(){
+    public function setup_lesson_query() {
 
-        if( empty( $this->id ) ){
+        if (empty($this->id)) {
             return;
         }
 
@@ -52,10 +52,10 @@ 
             'post_type' => 'lesson',
             'posts_per_page' => 1,
             'post_status' => 'publish',
-            'post__in' => array( $this->id ),
+            'post__in' => array($this->id),
         );
 
-        $this->lesson_page_query  = new WP_Query( $args );
+        $this->lesson_page_query = new WP_Query($args);
 
     }
 
@@ -64,11 +64,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( empty(  $this->id  ) ){
+        if (empty($this->id)) {
 
-            return __( 'Please supply a lesson ID for this shortcode.', 'woothemes-sensei' );
+            return __('Please supply a lesson ID for this shortcode.', 'woothemes-sensei');
 
         }
 
@@ -76,11 +76,11 @@ 
         global $wp_query;
         $wp_query = $this->lesson_page_query;
 
-        if( have_posts() ){
+        if (have_posts()) {
 
             the_post();
 
-        }else{
+        } else {
 
             return __('No posts found.', 'woothemes-sensei');
 

Braces +5 added lines, -2 removed lines

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

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

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// security check
 /**
  * Sensei Shortcode Loader Class
  *

Indentation +161 added lines, -161 removed lines

@@ -15,172 +15,172 @@
  */
 class Sensei_Shortcode_Loader{
 
-    /**
-     * @var array {
-     *  type string $shortcode
-     *  type Sensei_Shortcode
-     * } all the shortcodes and which class to instantiate when they are called from
-     * WordPress's do_shortcode() function.
-     *
-     */
-    protected $shortcode_classes;
-
-    /**
-     * Run all the functions that needs to be hooked into WordPress
-     *
-     * @since 1.9.0
-     */
-    public function __construct(){
-
-        // create a list of shortcodes and the class that handles them
-        $this->setup_shortcode_class_map();
-
-        // setup all the shortcodes and load the listener into WP
-        $this->initialize_shortcodes();
-
-        // add sensei body class for shortcodes
-        add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
-
-        // array( $this, 'add_body_class')
-
-    }
-
-    /**
-     * Array of shortcode classes that should be instantiated when WordPress loads
-     * a Sensei specific shortcode.
-     * This list contains:
-     * $shortcode => $class_name
-     *
-     * $shortcode is the actual shortcode the user will add to the editor
-     * $class_name is the name of the class that will be instantiated to handle
-     * the rendering of the shortcode.
-     *
-     * NOTE: When adding a new shortcode here be sure to load your shortcodes class
-     * in class-sensei-autoloader class_file_map function
-     */
-    public function setup_shortcode_class_map(){
-
-        $this->shortcode_classes = array(
-            'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
-            'sensei_user_courses'        => 'Sensei_Shortcode_User_Courses',
-            'sensei_courses'             => 'Sensei_Shortcode_Courses',
-            'sensei_teachers'            => 'Sensei_Shortcode_Teachers',
-            'sensei_user_messages'       => 'Sensei_Shortcode_User_Messages',
-            'sensei_course_page'         => 'Sensei_Shortcode_Course_Page',
-            'sensei_lesson_page'         => 'Sensei_Shortcode_Lesson_Page',
-            'sensei_course_categories'   => 'Sensei_Shortcode_Course_Categories',
-            'sensei_unpurchased_courses' => 'Sensei_Shortcode_Unpurchased_Courses',
-        );
-
-        // legacy shortcode handling:
-        Sensei_Legacy_Shortcodes::init();
-
-    }
-
-    /**
-     * Add all shortcodes here
-     *
-     * This function adds shortcodes to WP that links to other functionality.
-     * @since 1.9.0
-     */
-    public function initialize_shortcodes(){
-
-        // shortcodes should only respond to front end calls
-        if( is_admin() || defined( 'DOING_AJAX' ) ){
-            return;
-        }
-
-        /**
-         * Tell WP to run this classes load_shortcode function for all the
-         * shortcodes registered here in.
-         *
-         * With this method we only load shortcode classes when we need them.
-         */
-        foreach( $this->shortcode_classes as $shortcode => $class ){
-
-            // all Sensei shortcodes are rendered by this loader class
-            // it acts as an interface between wp and the shortcodes registered
-            // above
-            add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
-
-        }
-
-    }
-
-    /**
-     * Respond to WordPress do_shortcode calls
-     * for shortcodes registered in the initialize_shortcodes function.
-     *
-     * @since 1.9.0
-     *
-     * @param $attributes
-     * @param $content
-     * @param $code the shortcode that is being requested
-     *
-     * @return string
-     */
-    public function render_shortcode( $attributes='', $content='', $code ){
-
-        // only respond if the shortcode that we've added shortcode
-        // classes for.
-        if( ! isset( $this->shortcode_classes[ $code ] ) ){
-            return '';
-        }
-
-        // create an instances of the current requested shortcode
-        $shortcode_handling_class = $this->shortcode_classes[ $code ];
-        $shortcode = new $shortcode_handling_class( $attributes, $content, $code );
-
-        // we expect the sensei class instantiated to implement the Sensei_Shortcode interface
-        if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
-
-            $message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
-            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
-
-        }
-
-        return $shortcode->render();
-
-    }
-
-    /**
-     * Add the Sensei body class if
-     * the current page has a Sensei shortcode.
-     *
-     * Note: legacy shortcodes not supported here.
-     *
-     * @since 1.9.0
-     *
-     * @param array $classes
-     * @return array
-     */
-    public function possibly_add_body_class ( $classes ) {
-
-        global $post;
-
-        $has_sensei_shortcode = false;
-
-        if ( is_a( $post, 'WP_Post' ) ) {
-
-            // check all registered Sensei shortcodes (not legacy shortcodes)
-            foreach ( $this->shortcode_classes as $shortcode => $class ){
-
-                if ( has_shortcode( $post->post_content, $shortcode ) ) {
+	/**
+	 * @var array {
+	 *  type string $shortcode
+	 *  type Sensei_Shortcode
+	 * } all the shortcodes and which class to instantiate when they are called from
+	 * WordPress's do_shortcode() function.
+	 *
+	 */
+	protected $shortcode_classes;
+
+	/**
+	 * Run all the functions that needs to be hooked into WordPress
+	 *
+	 * @since 1.9.0
+	 */
+	public function __construct(){
+
+		// create a list of shortcodes and the class that handles them
+		$this->setup_shortcode_class_map();
+
+		// setup all the shortcodes and load the listener into WP
+		$this->initialize_shortcodes();
+
+		// add sensei body class for shortcodes
+		add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
+
+		// array( $this, 'add_body_class')
+
+	}
+
+	/**
+	 * Array of shortcode classes that should be instantiated when WordPress loads
+	 * a Sensei specific shortcode.
+	 * This list contains:
+	 * $shortcode => $class_name
+	 *
+	 * $shortcode is the actual shortcode the user will add to the editor
+	 * $class_name is the name of the class that will be instantiated to handle
+	 * the rendering of the shortcode.
+	 *
+	 * NOTE: When adding a new shortcode here be sure to load your shortcodes class
+	 * in class-sensei-autoloader class_file_map function
+	 */
+	public function setup_shortcode_class_map(){
+
+		$this->shortcode_classes = array(
+			'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
+			'sensei_user_courses'        => 'Sensei_Shortcode_User_Courses',
+			'sensei_courses'             => 'Sensei_Shortcode_Courses',
+			'sensei_teachers'            => 'Sensei_Shortcode_Teachers',
+			'sensei_user_messages'       => 'Sensei_Shortcode_User_Messages',
+			'sensei_course_page'         => 'Sensei_Shortcode_Course_Page',
+			'sensei_lesson_page'         => 'Sensei_Shortcode_Lesson_Page',
+			'sensei_course_categories'   => 'Sensei_Shortcode_Course_Categories',
+			'sensei_unpurchased_courses' => 'Sensei_Shortcode_Unpurchased_Courses',
+		);
+
+		// legacy shortcode handling:
+		Sensei_Legacy_Shortcodes::init();
+
+	}
+
+	/**
+	 * Add all shortcodes here
+	 *
+	 * This function adds shortcodes to WP that links to other functionality.
+	 * @since 1.9.0
+	 */
+	public function initialize_shortcodes(){
+
+		// shortcodes should only respond to front end calls
+		if( is_admin() || defined( 'DOING_AJAX' ) ){
+			return;
+		}
+
+		/**
+		 * Tell WP to run this classes load_shortcode function for all the
+		 * shortcodes registered here in.
+		 *
+		 * With this method we only load shortcode classes when we need them.
+		 */
+		foreach( $this->shortcode_classes as $shortcode => $class ){
+
+			// all Sensei shortcodes are rendered by this loader class
+			// it acts as an interface between wp and the shortcodes registered
+			// above
+			add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
+
+		}
+
+	}
+
+	/**
+	 * Respond to WordPress do_shortcode calls
+	 * for shortcodes registered in the initialize_shortcodes function.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $attributes
+	 * @param $content
+	 * @param $code the shortcode that is being requested
+	 *
+	 * @return string
+	 */
+	public function render_shortcode( $attributes='', $content='', $code ){
+
+		// only respond if the shortcode that we've added shortcode
+		// classes for.
+		if( ! isset( $this->shortcode_classes[ $code ] ) ){
+			return '';
+		}
+
+		// create an instances of the current requested shortcode
+		$shortcode_handling_class = $this->shortcode_classes[ $code ];
+		$shortcode = new $shortcode_handling_class( $attributes, $content, $code );
+
+		// we expect the sensei class instantiated to implement the Sensei_Shortcode interface
+		if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
+
+			$message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
+			_doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
+
+		}
+
+		return $shortcode->render();
+
+	}
+
+	/**
+	 * Add the Sensei body class if
+	 * the current page has a Sensei shortcode.
+	 *
+	 * Note: legacy shortcodes not supported here.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public function possibly_add_body_class ( $classes ) {
+
+		global $post;
+
+		$has_sensei_shortcode = false;
+
+		if ( is_a( $post, 'WP_Post' ) ) {
+
+			// check all registered Sensei shortcodes (not legacy shortcodes)
+			foreach ( $this->shortcode_classes as $shortcode => $class ){
+
+				if ( has_shortcode( $post->post_content, $shortcode ) ) {
 
-                    $has_sensei_shortcode = true;
-                }
+					$has_sensei_shortcode = true;
+				}
 
-            }
-        }
+			}
+		}
 
-        if( $has_sensei_shortcode ) {
-            $classes[] = 'sensei' ;
-        }
+		if( $has_sensei_shortcode ) {
+			$classes[] = 'sensei' ;
+		}
 
 
-        return $classes;
-
-    }
+		return $classes;
+
+	}
 
 } // end class Sensei_Shortcodes
 new Sensei_Shortcode_Loader();

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check
+if ( ! defined('ABSPATH')) exit; // security check
 /**
  * Sensei Shortcode Loader Class
  *
@@ -13,7 +13,7 @@ 
  * @category Shortcodes
  * @since 1.9.0
  */
-class Sensei_Shortcode_Loader{
+class Sensei_Shortcode_Loader {
 
     /**
      * @var array {
@@ -30,7 +30,7 @@ 
      *
      * @since 1.9.0
      */
-    public function __construct(){
+    public function __construct() {
 
         // create a list of shortcodes and the class that handles them
         $this->setup_shortcode_class_map();
@@ -39,7 +39,7 @@ 
         $this->initialize_shortcodes();
 
         // add sensei body class for shortcodes
-        add_filter( 'body_class', array( $this, 'possibly_add_body_class' ));
+        add_filter('body_class', array($this, 'possibly_add_body_class'));
 
         // array( $this, 'add_body_class')
 
@@ -58,7 +58,7 @@ 
      * NOTE: When adding a new shortcode here be sure to load your shortcodes class
      * in class-sensei-autoloader class_file_map function
      */
-    public function setup_shortcode_class_map(){
+    public function setup_shortcode_class_map() {
 
         $this->shortcode_classes = array(
             'sensei_featured_courses'    => 'Sensei_Shortcode_Featured_Courses',
@@ -83,10 +83,10 @@ 
      * This function adds shortcodes to WP that links to other functionality.
      * @since 1.9.0
      */
-    public function initialize_shortcodes(){
+    public function initialize_shortcodes() {
 
         // shortcodes should only respond to front end calls
-        if( is_admin() || defined( 'DOING_AJAX' ) ){
+        if (is_admin() || defined('DOING_AJAX')) {
             return;
         }
 
@@ -96,12 +96,12 @@ 
          *
          * With this method we only load shortcode classes when we need them.
          */
-        foreach( $this->shortcode_classes as $shortcode => $class ){
+        foreach ($this->shortcode_classes as $shortcode => $class) {
 
             // all Sensei shortcodes are rendered by this loader class
             // it acts as an interface between wp and the shortcodes registered
             // above
-            add_shortcode( $shortcode, array( $this,'render_shortcode' ) );
+            add_shortcode($shortcode, array($this, 'render_shortcode'));
 
         }
 
@@ -119,23 +119,23 @@ 
      *
      * @return string
      */
-    public function render_shortcode( $attributes='', $content='', $code ){
+    public function render_shortcode($attributes = '', $content = '', $code) {
 
         // only respond if the shortcode that we've added shortcode
         // classes for.
-        if( ! isset( $this->shortcode_classes[ $code ] ) ){
+        if ( ! isset($this->shortcode_classes[$code])) {
             return '';
         }
 
         // create an instances of the current requested shortcode
-        $shortcode_handling_class = $this->shortcode_classes[ $code ];
-        $shortcode = new $shortcode_handling_class( $attributes, $content, $code );
+        $shortcode_handling_class = $this->shortcode_classes[$code];
+        $shortcode = new $shortcode_handling_class($attributes, $content, $code);
 
         // we expect the sensei class instantiated to implement the Sensei_Shortcode interface
-        if( ! in_array( 'Sensei_Shortcode_Interface', class_implements( $shortcode) ) ){
+        if ( ! in_array('Sensei_Shortcode_Interface', class_implements($shortcode))) {
 
             $message = "The rendering class for your shortcode: $code, must implement the Sensei_Shortcode interface";
-            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode',$message, '1.9.0' );
+            _doing_it_wrong('Sensei_Shortcode_Loader::render_shortcode', $message, '1.9.0');
 
         }
 
@@ -154,18 +154,18 @@ 
      * @param array $classes
      * @return array
      */
-    public function possibly_add_body_class ( $classes ) {
+    public function possibly_add_body_class($classes) {
 
         global $post;
 
         $has_sensei_shortcode = false;
 
-        if ( is_a( $post, 'WP_Post' ) ) {
+        if (is_a($post, 'WP_Post')) {
 
             // check all registered Sensei shortcodes (not legacy shortcodes)
-            foreach ( $this->shortcode_classes as $shortcode => $class ){
+            foreach ($this->shortcode_classes as $shortcode => $class) {
 
-                if ( has_shortcode( $post->post_content, $shortcode ) ) {
+                if (has_shortcode($post->post_content, $shortcode)) {
 
                     $has_sensei_shortcode = true;
                 }
@@ -173,8 +173,8 @@ 
             }
         }
 
-        if( $has_sensei_shortcode ) {
-            $classes[] = 'sensei' ;
+        if ($has_sensei_shortcode) {
+            $classes[] = 'sensei';
         }
 
 

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

Indentation +110 added lines, -110 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +5 added lines, -2 removed lines

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

includes/shortcodes/interface-sensei-shortcode.php

Indentation +13 added lines, -13 removed lines

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

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

Indentation +92 added lines, -92 removed lines

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

Spacing +16 added lines, -16 removed lines

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

Braces +4 added lines, -1 removed lines

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

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

Indentation +191 added lines, -191 removed lines

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

Spacing +41 added lines, -41 removed lines

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

Braces +6 added lines, -5 removed lines

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

includes/class-sensei-modules.php

Spacing +259 added lines, -259 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Sensei Modules Class
@@ -21,33 +21,33 @@ 
     private $order_page_slug;
     public $taxonomy;
 
-    public function __construct( $file )
+    public function __construct($file)
     {
         $this->file = $file;
         $this->dir = dirname($this->file);
-        $this->assets_dir = trailingslashit($this->dir) . 'assets';
+        $this->assets_dir = trailingslashit($this->dir).'assets';
         $this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
         $this->taxonomy = 'module';
         $this->order_page_slug = 'module-order';
 
         // setup taxonomy
-        add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
+        add_action('init', array($this, 'setup_modules_taxonomy'), 10);
 
         // Manage lesson meta boxes for taxonomy
-        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
+        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2);
 
         // Save lesson meta box
         add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
 
         //Reset the none modules lessons transient
-        add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
+        add_action('save_post', array('Sensei_Core_Modules', 'reset_none_modules_transient'));
 
         // Frontend styling
         add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
 
         // Admin styling
         add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
+        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 20, 2);
 
         // Handle module completion record
         add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
@@ -55,20 +55,20 @@ 
         add_action('wp', array($this, 'save_module_progress'), 10);
 
         // Handle module ordering
-        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
+        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30);
         add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
         add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
 
         // Ensure modules always show under courses
-        add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
+        add_action('admin_menu', array($this, 'remove_lessons_menu_model_taxonomy'), 10);
+        add_action('admin_menu', array($this, 'remove_courses_menu_model_taxonomy'), 10);
+        add_action('admin_menu', array($this, 'redirect_to_lesson_module_taxonomy_to_course'), 20);
 
         // Add course field to taxonomy
-        add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
-        add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
-        add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+        add_action($this->taxonomy.'_add_form_fields', array($this, 'add_module_fields'), 50, 1);
+        add_action($this->taxonomy.'_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
+        add_action('edited_'.$this->taxonomy, array($this, 'save_module_course'), 10, 2);
+        add_action('created_'.$this->taxonomy, array($this, 'save_module_course'), 10, 2);
         add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
 
         // Manage module taxonomy archive page
@@ -80,10 +80,10 @@ 
         add_filter('body_class', array($this, 'module_archive_body_class'));
 
         // add modules to the single course template
-        add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
+        add_action('sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template'), 8);
 
         //Single Course modules actions. Add to single-course/course-modules.php
-        add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
+        add_action('sensei_single_course_modules_before', array($this, 'course_modules_title'), 20);
 
         // Set up display on single lesson page
         add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
@@ -95,22 +95,22 @@ 
         add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
 
         // Manage module taxonomy columns
-        add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
-        add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
+        add_filter('manage_edit-'.$this->taxonomy.'_columns', array($this, 'taxonomy_column_headings'), 1, 1);
+        add_filter('manage_'.$this->taxonomy.'_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
         add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
 
         //store new modules created on the course edit screen
-        add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
+        add_action('wp_ajax_sensei_add_new_module_term', array('Sensei_Core_Modules', 'add_new_module_term'));
 
         // for non admin users, only show taxonomies that belong to them
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
-        add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
+        add_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
+        add_filter('get_object_terms', array($this, 'filter_course_selected_terms'), 20, 3);
 
         // add the teacher name next to the module term in for admin users
-        add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
+        add_filter('get_terms', array($this, 'append_teacher_name_to_module'), 70, 3);
 
         // remove the default modules  metabox
-        add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
+        add_action('admin_init', array('Sensei_Core_Modules', 'remove_default_modules_box'));
 
     } // end constructor
 
@@ -127,9 +127,9 @@ 
      * @return void
      * @deprecated since 1.9.0
      */
-    public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
+    public function change_module_term_slug($term_id, $tt_id, $taxonomy) {
 
-        _deprecated_function('change_module_term_slug', '1.9.0' );
+        _deprecated_function('change_module_term_slug', '1.9.0');
 
     }// end add_module_term_group
 
@@ -143,20 +143,20 @@ 
      *
      * @return void
      */
-    public function modules_metaboxes( $post_type, $post )
+    public function modules_metaboxes($post_type, $post)
     {
-        if ('lesson' == $post_type ) {
+        if ('lesson' == $post_type) {
 
             // Remove default taxonomy meta box from Lesson edit screen
-            remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
+            remove_meta_box($this->taxonomy.'div', 'lesson', 'side');
 
             // Add custom meta box to limit module selection to one per lesson
-            add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
+            add_meta_box($this->taxonomy.'_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
         }
 
-        if( 'course' == $post_type ){
+        if ('course' == $post_type) {
             // Course modules selection metabox
-            add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
+            add_meta_box($this->taxonomy.'_course_mb', __('Course Modules', 'woothemes-sensei'), array($this, 'course_module_metabox'), 'course', 'side', 'core');
         }
     }
 
@@ -192,21 +192,21 @@ 
             $modules = $this->get_course_modules($lesson_course);
 
             // Build the HTML to output
-            $html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
+            $html .= '<input type="hidden" name="'.esc_attr('woo_lesson_'.$this->taxonomy.'_nonce').'" id="'.esc_attr('woo_lesson_'.$this->taxonomy.'_nonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename($this->file))).'" />';
             if (is_array($modules) && count($modules) > 0) {
-                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
-                $html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">'."\n";
+                $html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>';
                 foreach ($modules as $module) {
-                    $html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
+                    $html .= '<option value="'.esc_attr(absint($module->term_id)).'"'.selected($module->term_id, $lesson_module, false).'>'.esc_html($module->name).'</option>'."\n";
                 }
-                $html .= '</select>' . "\n";
+                $html .= '</select>'."\n";
             } else {
-                $course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
-                $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
+                $course_url = admin_url('post.php?post='.urlencode($lesson_course).'&action=edit');
+                $html .= '<p>'.sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="'.esc_url($course_url).'">', '</a>').'</p>';
             } // End If Statement
 
         } else {
-            $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
+            $html .= '<p>'.sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>').'</p>';
         } // End If Statement
 
         // Output the HTML
@@ -225,38 +225,38 @@ 
         global $post;
 
         // Verify post type and nonce
-        if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
-            ||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
+        if ((get_post_type() != 'lesson') || ! isset($_POST['woo_lesson_'.$this->taxonomy.'_nonce'])
+            ||! wp_verify_nonce($_POST['woo_lesson_'.$this->taxonomy.'_nonce'], plugin_basename($this->file))) {
             return $post_id;
         }
 
         // Check if user has permissions to edit lessons
         $post_type = get_post_type_object($post->post_type);
-        if (!current_user_can($post_type->cap->edit_post, $post_id)) {
+        if ( ! current_user_can($post_type->cap->edit_post, $post_id)) {
             return $post_id;
         }
 
         // Check if user has permissions to edit this specific post
-        if (!current_user_can('edit_post', $post_id)) {
+        if ( ! current_user_can('edit_post', $post_id)) {
             return $post_id;
         }
 
         // Cast module ID as an integer if selected, otherwise leave as empty string
-        if ( isset( $_POST['lesson_module'] ) ) {
+        if (isset($_POST['lesson_module'])) {
 
-            if( empty ( $_POST['lesson_module'] ) ){
-                wp_delete_object_term_relationships($post_id, $this->taxonomy  );
+            if (empty ($_POST['lesson_module'])) {
+                wp_delete_object_term_relationships($post_id, $this->taxonomy);
                 return true;
             }
 
-            $module_id = intval( $_POST['lesson_module'] );
+            $module_id = intval($_POST['lesson_module']);
 
             // Assign lesson to selected module
             wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
 
             // Set default order for lesson inside module
-            if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
-                update_post_meta($post_id, '_order_module_' . $module_id, 0);
+            if ( ! get_post_meta($post_id, '_order_module_'.$module_id, true)) {
+                update_post_meta($post_id, '_order_module_'.$module_id, 0);
             }
         }
 
@@ -314,7 +314,7 @@ 
         $module_courses = array();
         if (isset($courses) && is_array($courses)) {
             foreach ($courses as $course) {
-                $module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
+                $module_courses[] = array('id' =>$course->ID, 'details'=>$course->post_title);
             }
         }
 
@@ -324,8 +324,8 @@ 
                     for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label></th>
             <td>
                 <input type="hidden"
-                       data-defaults="<?php echo esc_attr( json_encode($module_courses)); ?>"
-                       value="<?php echo esc_attr( json_encode($module_courses) ); ?>"
+                       data-defaults="<?php echo esc_attr(json_encode($module_courses)); ?>"
+                       value="<?php echo esc_attr(json_encode($module_courses)); ?>"
                        id="module_courses" name="module_courses"
                        class="ajax_chosen_select_courses"
                        placeholder="<?php esc_attr_e('Search for courses...', 'woothemes-sensei'); ?>"
@@ -370,11 +370,11 @@ 
         }
 
         // Add module to selected courses
-        if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
+        if (isset($_POST['module_courses']) && ! empty($_POST['module_courses'])) {
 
-            $course_ids = explode( ",", $_POST['module_courses'] );
+            $course_ids = explode(",", $_POST['module_courses']);
 
-            foreach ( $course_ids as $course_id ) {
+            foreach ($course_ids as $course_id) {
 
                 wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
 
@@ -438,11 +438,11 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function single_course_modules(){
+    public function single_course_modules() {
 
-        _deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
+        _deprecated_function('Sensei_Modules->single_course_modules', 'Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
         // only show modules on the course that has modules
-        if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
+        if (is_singular('course') && has_term('', 'module')) {
 
             $this->load_course_module_content_template();
 
@@ -459,15 +459,15 @@ 
 
         if (method_exists('WooThemes_Sensei_Utils', 'is_preview_lesson') && WooThemes_Sensei_Utils::is_preview_lesson($lesson_id)) {
             $is_user_taking_course = WooThemes_Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
-            if (!$is_user_taking_course) {
+            if ( ! $is_user_taking_course) {
                 if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
                     $title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
                     // Remove brackets for display here
                     $title_text = str_replace('(', '', $title_text);
                     $title_text = str_replace(')', '', $title_text);
-                    $title_text = '<span class="preview-label">' . $title_text . '</span>';
+                    $title_text = '<span class="preview-label">'.$title_text.'</span>';
                 }
-                $title .= ' ' . $title_text;
+                $title .= ' '.$title_text;
             }
         }
 
@@ -481,8 +481,8 @@ 
         if (is_singular('lesson')) {
             if (has_term('', $this->taxonomy, $post->ID)) {
                 $module = $this->get_lesson_module($post->ID);
-                if( $module ) {
-                    $html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
+                if ($module) {
+                    $html .= ' '.$separator.' <a href="'.esc_url($module->url).'" title="'.__('Back to the module', 'woothemes-sensei').'">'.$module->name.'</a>';
                 }
             }
         }
@@ -490,7 +490,7 @@ 
         if (is_tax($this->taxonomy)) {
             if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
                 $course_id = intval($_GET['course_id']);
-                $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>';
             }
         }
         return $html;
@@ -505,18 +505,18 @@ 
      */
     public function module_archive_template($template) {
 
-        if ( ! is_tax($this->taxonomy) ) {
+        if ( ! is_tax($this->taxonomy)) {
             return $template;
         }
 
         $file = 'archive-lesson.php';
-        $find = array( $file, Sensei()->template_url . $file );
+        $find = array($file, Sensei()->template_url.$file);
 
         // locate the template file
         $template = locate_template($find);
-        if (!$template) {
+        if ( ! $template) {
 
-            $template = Sensei()->plugin_path() . 'templates/' . $file;
+            $template = Sensei()->plugin_path().'templates/'.$file;
 
         }
 
@@ -542,7 +542,7 @@ 
             // Set order of lessons
             if (version_compare(Sensei()->version, '1.6.0', '>=')) {
                 $module_id = $query->queried_object_id;
-                $query->set('meta_key', '_order_module_' . $module_id);
+                $query->set('meta_key', '_order_module_'.$module_id);
                 $query->set('orderby', 'meta_value_num date');
             } else {
                 $query->set('orderby', 'menu_order');
@@ -603,10 +603,10 @@ 
                     $status = __('In progress', 'woothemes-sensei');
                     $class = 'in-progress';
                 }
-                echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
+                echo '<p class="status '.esc_attr($class).'">'.$status.'</p>';
             }
 
-            echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
+            echo '<p class="archive-description module-description">'.apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id).'</p>';
         }
     }
 
@@ -731,7 +731,7 @@ 
     public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
     {
         $module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
-        update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
+        update_user_meta(intval($user_id), '_module_progress_'.intval($course_id).'_'.intval($module_id), intval($module_progress));
 
         do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
     }
@@ -748,9 +748,9 @@ 
      */
     public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
     {
-        $module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
+        $module_progress = get_user_meta(intval($user_id), '_module_progress_'.intval($course_id).'_'.intval($module_id), true);
         if ($module_progress) {
-            return (float)$module_progress;
+            return (float) $module_progress;
         }
         return false;
     }
@@ -803,7 +803,7 @@ 
         }
         $module_progress = ($completed_count / $lesson_count) * 100;
 
-        return (float)$module_progress;
+        return (float) $module_progress;
     }
 
     /**
@@ -816,7 +816,7 @@ 
     public function register_modules_admin_menu_items()
     {
         //add the modules link under the Course main menu
-        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
+        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module', '');
 
         // Regsiter new admin page for module ordering
         $hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
@@ -843,19 +843,19 @@ 
             $ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
 
             if ($ordered) {
-                $html .= '<div class="updated fade">' . "\n";
-                $html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
-                $html .= '</div>' . "\n";
+                $html .= '<div class="updated fade">'."\n";
+                $html .= '<p>'.__('The module order has been saved for this course.', 'woothemes-sensei').'</p>'."\n";
+                $html .= '</div>'."\n";
             }
         }
 
         $courses = Sensei()->course->get_all_courses();
 
-        $html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
-        $html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
-        $html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
-        $html .= '<select id="module-order-course" name="course_id">' . "\n";
-        $html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
+        $html .= '<form action="'.admin_url('edit.php').'" method="get">'."\n";
+        $html .= '<input type="hidden" name="post_type" value="course" />'."\n";
+        $html .= '<input type="hidden" name="page" value="'.esc_attr($this->order_page_slug).'" />'."\n";
+        $html .= '<select id="module-order-course" name="course_id">'."\n";
+        $html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'."\n";
 
         foreach ($courses as $course) {
             if (has_term('', $this->taxonomy, $course->ID)) {
@@ -863,30 +863,30 @@ 
                 if (isset($_GET['course_id'])) {
                     $course_id = intval($_GET['course_id']);
                 }
-                $html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
+                $html .= '<option value="'.esc_attr(intval($course->ID)).'" '.selected($course->ID, $course_id, false).'>'.get_the_title($course->ID).'</option>'."\n";
             }
         }
 
-        $html .= '</select>' . "\n";
-        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
-        $html .= '</form>' . "\n";
+        $html .= '</select>'."\n";
+        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="'.__('Select', 'woothemes-sensei').'" />'."\n";
+        $html .= '</form>'."\n";
 
         if (isset($_GET['course_id'])) {
             $course_id = intval($_GET['course_id']);
             if ($course_id > 0) {
                 $modules = $this->get_course_modules($course_id);
-                $modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
+                $modules = $this->append_teacher_name_to_module($modules, array('module'), array());
                 if ($modules) {
 
                     $order = $this->get_course_module_order($course_id);
 
-                    $order_string='';
+                    $order_string = '';
                     if ($order) {
                         $order_string = implode(',', $order);
                     }
 
-                    $html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-                    $html .= '<ul class="sortable-module-list">' . "\n";
+                    $html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+                    $html .= '<ul class="sortable-module-list">'."\n";
                     $count = 0;
                     foreach ($modules as $module) {
                         $count++;
@@ -900,14 +900,14 @@ 
                         if ($count % 2 != 0) {
                             $class .= ' alternate';
                         }
-                        $html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
+                        $html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($module->term_id).'" style="width: 100%;"> '.$module->name.'</span></li>'."\n";
                     }
-                    $html .= '</ul>' . "\n";
+                    $html .= '</ul>'."\n";
 
-                    $html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
-                    $html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-                    $html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
-                    $html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
+                    $html .= '<input type="hidden" name="module-order" value="'.$order_string.'" />'."\n";
+                    $html .= '<input type="hidden" name="course_id" value="'.$course_id.'" />'."\n";
+                    $html .= '<input type="submit" class="button-primary" value="'.__('Save module order', 'woothemes-sensei').'" />'."\n";
+                    $html .= '<a href="'.admin_url('post.php?post='.$course_id.'&action=edit').'" class="button-secondary">'.__('Edit course', 'woothemes-sensei').'</a>'."\n";
                 }
             }
         }
@@ -944,7 +944,7 @@ 
     {
         if ($column == 'module_order') {
             if (has_term('', $this->taxonomy, $course_id)) {
-                echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
+                echo '<a class="button-secondary" href="'.admin_url('edit.php?post_type=course&page=module-order&course_id='.urlencode(intval($course_id))).'">'.__('Order modules', 'woothemes-sensei').'</a>';
             }
         }
     }
@@ -1036,7 +1036,7 @@ 
                 $args['post_type'] = 'lesson';
                 $lessons = get_posts($args);
                 $total_lessons = count($lessons);
-                $column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
+                $column_data = '<a href="'.admin_url('edit.php?module='.urlencode($module->slug).'&post_type=lesson').'">'.intval($total_lessons).'</a>';
                 break;
         }
 
@@ -1054,7 +1054,7 @@ 
     public function analysis_overview_column_title($columns)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $new_columns = array();
             if (is_array($columns) && 0 < count($columns)) {
                 foreach ($columns as $column => $title) {
@@ -1082,15 +1082,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated column data
      */
-    public function analysis_overview_column_data($columns, $lesson )
+    public function analysis_overview_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $lesson_module = '';
             $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
             if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
                 foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+                    $lesson_module = '<a href="'.esc_url(admin_url('edit-tags.php?action=edit&taxonomy='.urlencode($this->taxonomy).'&tag_ID='.urlencode($single_module->term_id))).'">'.$single_module->name.'</a>';
                     break;
                 }
             }
@@ -1111,7 +1111,7 @@ 
      */
     public function analysis_course_column_title($columns)
     {
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+        if (isset($_GET['view']) && 'lessons' == $_GET['view']) {
             $columns['lesson_module'] = __('Module', 'woothemes-sensei');
         }
         return $columns;
@@ -1126,15 +1126,15 @@ 
      * @param  WP_Post $lesson
      * @return array              Updated columns data
      */
-    public function analysis_course_column_data($columns, $lesson )
+    public function analysis_course_column_data($columns, $lesson)
     {
 
-        if ( isset( $_GET['course_id'] ) ) {
+        if (isset($_GET['course_id'])) {
             $lesson_module = '';
             $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
             if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
                 foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+                    $lesson_module = '<a href="'.esc_url(admin_url('edit-tags.php?action=edit&taxonomy='.urlencode($this->taxonomy).'&tag_ID='.urlencode($single_module->term_id))).'">'.$single_module->name.'</a>';
                     break;
                 }
             }
@@ -1161,7 +1161,7 @@ 
     public function get_lesson_module($lesson_id = 0)
     {
         $lesson_id = intval($lesson_id);
-        if ( ! ( intval( $lesson_id > 0) ) ) {
+        if ( ! (intval($lesson_id > 0))) {
             return false;
         }
 
@@ -1169,13 +1169,13 @@ 
         $modules = wp_get_post_terms($lesson_id, $this->taxonomy);
 
         //check if error returned
-        if( empty( $modules ) || isset( $modules['errors']  ) ){
+        if (empty($modules) || isset($modules['errors'])) {
             return false;
         }
 
        // get the last item in the array there should be only be 1 really.
        // this method works for all php versions.
-       foreach( $modules as $module ){
+       foreach ($modules as $module) {
            break;
        }
 
@@ -1188,7 +1188,7 @@ 
         if (isset($course_id) && 0 < $course_id) {
 
             // the course should contain the same module taxonomy term for this to be valid
-            if( ! has_term( $module, $this->taxonomy, $course_id)){
+            if ( ! has_term($module, $this->taxonomy, $course_id)) {
                 return false;
             }
 
@@ -1262,8 +1262,8 @@ 
     {
 
 
-        wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-frontend');
+        wp_register_style($this->taxonomy.'-frontend', esc_url($this->assets_url).'css/modules-frontend.css', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-frontend');
     }
 
     /**
@@ -1273,37 +1273,37 @@ 
      *
      * @return void
      */
-    public function admin_enqueue_scripts( $hook ) {
+    public function admin_enqueue_scripts($hook) {
 
         /**
          * Filter the page hooks where modules admin script can be loaded on.
          *
          * @param array $white_listed_pages
          */
-        $script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
+        $script_on_pages_white_list = apply_filters('sensei_module_admin_script_page_white_lists', array(
             'edit-tags.php',
             'course_page_module-order',
             'post-new.php',
             'post.php'
-        ) );
+        ));
 
-        if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
+        if ( ! in_array($hook, $script_on_pages_white_list)) {
             return;
         }
 
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-        wp_enqueue_script( 'sensei-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
-        wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version , true );
-        wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'select2' ), Sensei()->version, true );
+        wp_enqueue_script('sensei-chosen', Sensei()->plugin_url.'assets/chosen/chosen.jquery'.$suffix.'.js', array('jquery'), Sensei()->version, true);
+        wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery'.$suffix.'.js', array('jquery', 'sensei-chosen'), Sensei()->version, true);
+        wp_enqueue_script($this->taxonomy.'-admin', esc_url($this->assets_url).'js/modules-admin'.$suffix.'.js', array('jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'select2'), Sensei()->version, true);
 
         // localized module data
         $localize_modulesAdmin = array(
-            'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
-            'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
+            'search_courses_nonce' => wp_create_nonce('search-courses'),
+            'selectPlaceholder'    => __('Search for courses', 'woothemes-sensei')
         );
 
-        wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
+        wp_localize_script($this->taxonomy.'-admin', 'modulesAdmin', $localize_modulesAdmin);
     }
 
     /**
@@ -1316,8 +1316,8 @@ 
     public function admin_enqueue_styles() {
 
 
-        wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-sortable');
+        wp_register_style($this->taxonomy.'-sortable', esc_url($this->assets_url).'css/modules-admin.css', '', Sensei()->version);
+        wp_enqueue_style($this->taxonomy.'-sortable');
 
     }
 
@@ -1331,9 +1331,9 @@ 
      */
     public function course_modules_title( ) {
 
-       if( sensei_module_has_lessons() ){
+       if (sensei_module_has_lessons()) {
 
-            echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
+            echo '<header><h2>'.__('Modules', 'woothemes-sensei').'</h2></header>';
 
         }
 
@@ -1346,18 +1346,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function load_course_module_content_template(){
+    public function load_course_module_content_template() {
 
         // load backwards compatible template name if it exists in the users theme
-        $located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
-        if( $located_template ){
+        $located_template = locate_template(Sensei()->template_url.'single-course/course-modules.php');
+        if ($located_template) {
 
-            Sensei_Templates::get_template( 'single-course/course-modules.php' );
+            Sensei_Templates::get_template('single-course/course-modules.php');
             return;
 
         }
 
-        Sensei_Templates::get_template( 'single-course/modules.php' );
+        Sensei_Templates::get_template('single-course/modules.php');
 
     } // end course_module_content
 
@@ -1370,15 +1370,15 @@ 
      * @param $term_id
      * @return array $lessons
      */
-    public function get_lessons( $course_id , $term_id ){
+    public function get_lessons($course_id, $term_id) {
 
-        $lesson_query = $this->get_lessons_query( $course_id, $term_id );
+        $lesson_query = $this->get_lessons_query($course_id, $term_id);
 
-        if( isset( $lesson_query->posts ) ){
+        if (isset($lesson_query->posts)) {
 
             return $lesson_query->posts;
 
-        }else{
+        } else {
 
             return array();
 
@@ -1395,9 +1395,9 @@ 
      * @param $term_id
      * @return WP_Query $lessons_query
      */
-    public function get_lessons_query( $course_id , $term_id ){
+    public function get_lessons_query($course_id, $term_id) {
 
-        if( empty( $term_id ) || empty( $course_id ) ){
+        if (empty($term_id) || empty($course_id)) {
 
             return array();
 
@@ -1418,7 +1418,7 @@ 
                 array(
                     'taxonomy' => 'module',
                     'field' => 'id',
-                    'terms' => intval( $term_id )
+                    'terms' => intval($term_id)
                 )
             ),
             'orderby' => 'menu_order',
@@ -1426,12 +1426,12 @@ 
             'suppress_filters' => 0
         );
 
-        if (version_compare( Sensei()->version, '1.6.0', '>=')) {
-            $args['meta_key'] = '_order_module_' . intval( $term_id );
+        if (version_compare(Sensei()->version, '1.6.0', '>=')) {
+            $args['meta_key'] = '_order_module_'.intval($term_id);
             $args['orderby'] = 'meta_value_num date';
         }
 
-        $lessons_query = new WP_Query( $args );
+        $lessons_query = new WP_Query($args);
 
         return $lessons_query;
 
@@ -1446,37 +1446,37 @@ 
      *
      * @return array $non_module_lessons
      */
-    public function get_none_module_lessons( $course_id ){
+    public function get_none_module_lessons($course_id) {
 
         $non_module_lessons = array();
 
         //exit if there is no course id passed in
-        if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
+        if (empty($course_id) || 'course' != get_post_type($course_id)) {
 
             return $non_module_lessons;
         }
 
         //save some time and check if we already have the saved
-        if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
+        if (get_transient('sensei_'.$course_id.'_none_module_lessons')) {
 
-            return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
+            return get_transient('sensei_'.$course_id.'_none_module_lessons');
 
         }
 
         // create terms array which must be excluded from other arrays
-        $course_modules = $this->get_course_modules( $course_id );
+        $course_modules = $this->get_course_modules($course_id);
 
         //exit if there are no module on this course
-        if( empty( $course_modules ) || ! is_array( $course_modules ) ){
+        if (empty($course_modules) || ! is_array($course_modules)) {
 
-            return  Sensei()->course->course_lessons( $course_id );
+            return  Sensei()->course->course_lessons($course_id);
 
         }
 
         $terms = array();
-        foreach( $course_modules as $module ){
+        foreach ($course_modules as $module) {
 
-            array_push( $terms ,  $module->term_id );
+            array_push($terms, $module->term_id);
 
         }
 
@@ -1487,7 +1487,7 @@ 
             'meta_query' => array(
                 array(
                     'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
+                    'value' => intval($course_id),
                     'compare' => '='
                 )
             ),
@@ -1504,11 +1504,11 @@ 
             'suppress_filters' => 0
         );
 
-        $wp_lessons_query = new WP_Query( $args );
+        $wp_lessons_query = new WP_Query($args);
 
-        if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
+        if (isset($wp_lessons_query->posts) && count($wp_lessons_query->posts) > 0) {
             $non_module_lessons = $wp_lessons_query->get_posts();
-            set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
+            set_transient('sensei_'.$course_id.'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS);
         }
 
         return $non_module_lessons;
@@ -1519,7 +1519,7 @@ 
      *
      * @since 1.8.0
      */
-    public function setup_modules_taxonomy(){
+    public function setup_modules_taxonomy() {
 
         $labels = array(
             'name' => __('Modules', 'woothemes-sensei'),
@@ -1556,11 +1556,11 @@ 
             'show_in_nav_menus' => false,
             'show_in_quick_edit' => false,
             'show_ui' => true,
-            'rewrite' => array('slug' => $modules_rewrite_slug ),
+            'rewrite' => array('slug' => $modules_rewrite_slug),
             'labels' => $labels
         );
 
-        register_taxonomy( 'module' , array('course', 'lesson'), $args);
+        register_taxonomy('module', array('course', 'lesson'), $args);
 
     }// end setup_modules_taxonomy
 
@@ -1572,12 +1572,12 @@ 
      * @since 1.8.0
      * @return void
      */
-    function redirect_to_lesson_module_taxonomy_to_course( ){
+    function redirect_to_lesson_module_taxonomy_to_course( ) {
 
-        global $typenow , $taxnow;
+        global $typenow, $taxnow;
 
-        if( 'lesson'== $typenow && 'module'==$taxnow ){
-            wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
+        if ('lesson' == $typenow && 'module' == $taxnow) {
+            wp_safe_redirect(esc_url_raw('edit-tags.php?taxonomy=module&post_type=course'));
         }
 
     }// end redirect to course taxonomy
@@ -1590,18 +1590,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_lessons_menu_model_taxonomy(){
+    public function remove_lessons_menu_model_taxonomy() {
         global $submenu;
 
-        if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
+        if ( ! isset($submenu['edit.php?post_type=lesson']) || ! is_array($submenu['edit.php?post_type=lesson'])) {
             return; // exit
         }
 
         $lesson_main_menu = $submenu['edit.php?post_type=lesson'];
-        foreach( $lesson_main_menu as $index => $sub_item ){
+        foreach ($lesson_main_menu as $index => $sub_item) {
 
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=lesson'][ $index ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=lesson'][$index]);
             }
         }
 
@@ -1615,18 +1615,18 @@ 
      * @since 1.8.0
      * @return void
      */
-    public function remove_courses_menu_model_taxonomy(){
+    public function remove_courses_menu_model_taxonomy() {
         global $submenu;
 
-        if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
+        if ( ! isset($submenu['edit.php?post_type=course']) || ! is_array($submenu['edit.php?post_type=course'])) {
             return; // exit
         }
 
         $course_main_menu = $submenu['edit.php?post_type=course'];
-        foreach( $course_main_menu as $index => $sub_item ){
+        foreach ($course_main_menu as $index => $sub_item) {
 
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=course'][ $index ]);
+            if ('edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2]) {
+                unset($submenu['edit.php?post_type=course'][$index]);
             }
         }
 
@@ -1642,12 +1642,12 @@ 
      * @param string $term_name
      * @return array $owners { type WP_User }. Empty array if none if found.
      */
-    public static function get_term_authors( $term_name ){
+    public static function get_term_authors($term_name) {
 
-        $terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
+        $terms = get_terms(array('module'), array('name__like'=>$term_name, 'hide_empty' => false));
 
         $owners = array();
-        if( empty( $terms ) ){
+        if (empty($terms)) {
 
             return $owners;
 
@@ -1657,11 +1657,11 @@ 
 
 
         //if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
-        foreach( $terms as $term){
-            if( $term->name == $term_name ){
+        foreach ($terms as $term) {
+            if ($term->name == $term_name) {
 
                 // look for the author in the slug
-                $owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
+                $owners[] = Sensei_Core_Modules::get_term_author($term->slug);
 
             }// end if term name
 
@@ -1682,30 +1682,30 @@ 
      * @param $slug
      * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
      */
-    public static function get_term_author( $slug='' ){
+    public static function get_term_author($slug = '') {
 
-        $term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
+        $term_owner = get_user_by('email', get_bloginfo('admin_email'));
 
-        if( empty( $slug ) ){
+        if (empty($slug)) {
 
             return $term_owner;
 
         }
 
         // look for the author in the slug
-        $slug_parts = explode( '-', $slug );
+        $slug_parts = explode('-', $slug);
 
-        if( count( $slug_parts ) > 1 ){
+        if (count($slug_parts) > 1) {
 
             // get the user data
             $possible_user_id = $slug_parts[0];
-            $author = get_userdata( $possible_user_id );
+            $author = get_userdata($possible_user_id);
 
             // if the user doesnt exist for the first part of the slug
             // then this slug was also created by admin
-            if( is_a( $author, 'WP_User' ) ){
+            if (is_a($author, 'WP_User')) {
 
-                $term_owner =  $author;
+                $term_owner = $author;
 
             }
         }
@@ -1722,48 +1722,48 @@ 
      *
      * @param WP_Post $post Post object.
      */
-    public function course_module_metabox( $post ) {
+    public function course_module_metabox($post) {
 
         $tax_name = 'module';
-        $taxonomy = get_taxonomy( 'module' );
+        $taxonomy = get_taxonomy('module');
 
         ?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
-                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+                <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
             </ul>
 
             <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
                 <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-                    <?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+                    <?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
                 </ul>
             </div>
 
             <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
                 <?php
-                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                $name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
                 echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
                 ?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
-                    <?php wp_terms_checklist( $post->ID, array( 'taxonomy'=>$tax_name , 'popular_cats' => $popular_ids ) ); ?>
+                    <?php wp_terms_checklist($post->ID, array('taxonomy'=>$tax_name, 'popular_cats' => $popular_ids)); ?>
                 </ul>
             </div>
-            <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+            <?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
                 <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
                     <h4>
                         <a id="sensei-<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
                             <?php
                             /* translators: %s: add new taxonomy label */
-                            printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+                            printf(__('+ %s'), $taxonomy->labels->add_new_item);
                             ?>
                         </a>
                     </h4>
                     <p id="sensei-<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
-                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr( $taxonomy->labels->add_new_item ); ?></a>
-                        <?php wp_nonce_field( '_ajax_nonce-add-' . $tax_name, 'add_module_nonce' ); ?>
+                        <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
+                        <a class="button" id="sensei-<?php echo $tax_name; ?>-add-submit" class="button category-add-submit"><?php echo esc_attr($taxonomy->labels->add_new_item); ?></a>
+                        <?php wp_nonce_field('_ajax_nonce-add-'.$tax_name, 'add_module_nonce'); ?>
                         <span id="<?php echo $tax_name; ?>-ajax-response"></span>
                     </p>
                 </div>
@@ -1783,55 +1783,55 @@ 
     public static function add_new_module_term( ) {
 
 
-        if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
-            wp_send_json_error( array('error'=> 'wrong security nonce') );
+        if ( ! isset($_POST['security']) || ! wp_verify_nonce($_POST['security'], '_ajax_nonce-add-module')) {
+            wp_send_json_error(array('error'=> 'wrong security nonce'));
         }
 
         // get the term an create the new term storing infomration
-        $term_name = sanitize_text_field( $_POST['newTerm'] );
+        $term_name = sanitize_text_field($_POST['newTerm']);
 
-        if( current_user_can('manage_options' ) ) {
+        if (current_user_can('manage_options')) {
 
-            $term_slug = str_ireplace(' ', '-', trim( $term_name ) );
+            $term_slug = str_ireplace(' ', '-', trim($term_name));
 
         } else {
 
-            $term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
+            $term_slug = get_current_user_id().'-'.str_ireplace(' ', '-', trim($term_name));
 
         }
 
-        $course_id = sanitize_text_field( $_POST['course_id'] );
+        $course_id = sanitize_text_field($_POST['course_id']);
 
         // save the term
-        $slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
+        $slug = wp_insert_term($term_name, 'module', array('slug'=> $term_slug));
 
         // send error for all errors except term exits
-        if( is_wp_error( $slug ) ){
+        if (is_wp_error($slug)) {
 
             // prepare for possible term name and id to be passed down if term exists
             $term_data = array();
 
             // if term exists also send back the term name and id
-            if( isset( $slug->errors['term_exists'] ) ){
+            if (isset($slug->errors['term_exists'])) {
 
-                $term = get_term_by( 'slug', $term_slug, 'module');
+                $term = get_term_by('slug', $term_slug, 'module');
                 $term_data['name'] = $term_name;
                 $term_data['id'] = $term->term_id;
 
                 // set the object terms
-                wp_set_object_terms( $course_id, $term->term_id, 'module', true );
+                wp_set_object_terms($course_id, $term->term_id, 'module', true);
             }
 
-            wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
+            wp_send_json_error(array('errors'=>$slug->errors, 'term'=> $term_data));
 
         }
 
         //make sure the new term is checked for this course
 
-        wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
+        wp_set_object_terms($course_id, $slug['term_id'], 'module', true);
 
         // Handle request then generate response using WP_Ajax_Response
-        wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
+        wp_send_json_success(array('termId' => $slug['term_id'], 'termName' => $term_name));
 
     }
 
@@ -1843,26 +1843,26 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_module_terms( $terms, $taxonomies, $args ){
+    public function filter_module_terms($terms, $taxonomies, $args) {
 
         //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
+        if (current_user_can('manage_options') || ! in_array('module', $taxonomies) || ! is_admin()) {
             return $terms;
         }
 
         // avoid infinite call loop
-        remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+        remove_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
 
         // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
             // change only scrub the terms ids form the array keys
-            $terms = array_keys( $terms );
+            $terms = array_keys($terms);
         }
 
-        $teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
+        $teachers_terms = $this->filter_terms_by_owner($terms, get_current_user_id());
 
         // add filter again as removed above
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+        add_filter('get_terms', array($this, 'filter_module_terms'), 20, 3);
 
         return $teachers_terms;
     }// end filter_module_terms
@@ -1875,25 +1875,25 @@ 
      *
      * @since 1.8.0
      */
-    public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
+    public function filter_course_selected_terms($terms, $course_ids_array, $taxonomies) {
 
         //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
+        if (current_user_can('manage_options') || ! is_admin() || empty($terms)
             // only apply this to module only taxonomy queries so 1 taxonomy only:
-            ||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
+            ||  count($taxonomies) > 1 || ! in_array('module', $taxonomies)) {
             return $terms;
         }
 
-        $term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
+        $term_objects = $this->filter_terms_by_owner($terms, get_current_user_id());
 
         // if term objects were passed in send back objects
         // if term id were passed in send that back
-        if( is_object( $terms[0] ) ){
+        if (is_object($terms[0])) {
             return $term_objects;
         }
 
         $terms = array();
-        foreach( $term_objects as $term_object ){
+        foreach ($term_objects as $term_object) {
             $terms[] = $term_object->term_id;
         }
 
@@ -1911,20 +1911,20 @@ 
      * @param $user_id
      * @return array
      */
-    public function filter_terms_by_owner( $terms, $user_id ){
+    public function filter_terms_by_owner($terms, $user_id) {
 
         $users_terms = array();
 
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $term = get_term($term, 'module');
             }
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+            $author = Sensei_Core_Modules::get_term_author($term->slug);
 
-            if ( $user_id == $author->ID ) {
+            if ($user_id == $author->ID) {
                 // add the term to the teachers terms
                 $users_terms[] = $term;
             }
@@ -1943,34 +1943,34 @@ 
      *
      * @since 1.8.0
      */
-    public function append_teacher_name_to_module( $terms, $taxonomies, $args )
+    public function append_teacher_name_to_module($terms, $taxonomies, $args)
     {
 
         // only for admin users ont he module taxonomy
-        if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
+        if (empty($terms) || ! current_user_can('manage_options') || ! in_array('module', $taxonomies) || ! is_admin()) {
             return $terms;
         }
 
         // in certain cases the array is passed in as reference to the parent term_id => parent_id
         // simply return this as wp doesn't need an array of stdObject Term
-        if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
+        if (isset($args['fields']) && 'id=>parent' == $args['fields']) {
 
             return $terms;
 
         }
 
         // loop through and update all terms adding the author name
-        foreach( $terms as $index => $term ){
+        foreach ($terms as $index => $term) {
 
-            if( is_numeric( $term ) ){
+            if (is_numeric($term)) {
                 // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
+                $term = get_term($term, 'module');
             }
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+            $author = Sensei_Core_Modules::get_term_author($term->slug);
 
-            if( ! user_can( $author, 'manage_options' ) ) {
-                $term->name = $term->name . ' (' . $author->display_name . ') ';
+            if ( ! user_can($author, 'manage_options')) {
+                $term->name = $term->name.' ('.$author->display_name.') ';
             }
 
             // add the term to the teachers terms
@@ -1999,23 +1999,23 @@ 
      * @sine 1.9.0
      * @param $post_id
      */
-    public static function reset_none_modules_transient ( $post_id ){
+    public static function reset_none_modules_transient($post_id) {
 
         // this should only apply to course and lesson post types
-        if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
+        if (in_array(get_post_type($post_id), array('course', 'lesson'))) {
 
             $course_id = '';
 
-            if( 'lesson' == get_post_type( $post_id ) ){
+            if ('lesson' == get_post_type($post_id)) {
 
-                $course_id = Sensei()->lesson->get_course_id( $post_id );
+                $course_id = Sensei()->lesson->get_course_id($post_id);
 
             }
 
 
-            if( !empty( $course_id ) ){
+            if ( ! empty($course_id)) {
 
-                delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
+                delete_transient('sensei_'.$course_id.'_none_module_lessons');
 
             }
 
@@ -2030,9 +2030,9 @@ 
      * @deprecated since 1.9.0
      *
      */
-    public static function deprecate_sensei_single_course_modules_content(){
+    public static function deprecate_sensei_single_course_modules_content() {
 
-        sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
+        sensei_do_deprecated_action('sensei_single_course_modules_content', '1.9.0', 'sensei_single_course_modules_before or sensei_single_course_modules_after');
 
     }
 
@@ -2043,12 +2043,12 @@ 
      *
      * @since 1.9.0
      */
-    public static function setup_single_course_module_loop(){
+    public static function setup_single_course_module_loop() {
 
         global $sensei_modules_loop, $post;
         $course_id = $post->ID;
 
-        $modules = Sensei()->modules->get_course_modules( $course_id );
+        $modules = Sensei()->modules->get_course_modules($course_id);
 
         //initial setup
         $sensei_modules_loop['total'] = 0;
@@ -2056,22 +2056,22 @@ 
         $sensei_modules_loop['current'] = -1;
 
         // exit if this course doesn't have modules
-        if( !$modules || empty( $modules )  ){
+        if ( ! $modules || empty($modules)) {
             return;
         }
 
 
         $lessons_in_all_modules = array();
-        foreach( $modules as $term ){
+        foreach ($modules as $term) {
 
-            $lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
-            $lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
+            $lessons_in_this_module = Sensei()->modules->get_lessons($course_id, $term->term_id);
+            $lessons_in_all_modules = array_merge($lessons_in_all_modules, $lessons_in_this_module);
 
         }
 
 
         //setup all of the modules loop variables
-        $sensei_modules_loop['total'] = count( $modules );
+        $sensei_modules_loop['total'] = count($modules);
         $sensei_modules_loop['modules'] = $modules;
         $sensei_modules_loop['current'] = -1;
         $sensei_modules_loop['course_id'] = $course_id;
@@ -2084,7 +2084,7 @@ 
      * @since 1.9.0
      *
      */
-    public static function teardown_single_course_module_loop(){
+    public static function teardown_single_course_module_loop() {
 
         global $sensei_modules_loop, $wp_query, $post;
 

Braces +10 added lines, -5 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Sensei Modules Class
@@ -401,8 +403,9 @@ 
         $term = urldecode(stripslashes($_GET['term']));
 
         // Return nothing if term is empty
-        if (empty($term))
-            die();
+        if (empty($term)) {
+                    die();
+        }
 
         // Set a default if none is given
         $default = isset($_GET['default']) ? $_GET['default'] : __('No course', 'woothemes-sensei');
@@ -789,7 +792,9 @@ 
         );
         $lessons = get_posts($args);
 
-        if (is_wp_error($lessons) || 0 >= count($lessons)) return 0;
+        if (is_wp_error($lessons) || 0 >= count($lessons)) {
+        	return 0;
+        }
 
         $completed = false;
         $lesson_count = 0;
@@ -1378,7 +1383,7 @@ 
 
             return $lesson_query->posts;
 
-        }else{
+        } else{
 
             return array();
 

Indentation +1881 added lines, -1881 removed lines

@@ -14,265 +14,265 @@ 
  */
 class Sensei_Core_Modules
 {
-    private $dir;
-    private $file;
-    private $assets_dir;
-    private $assets_url;
-    private $order_page_slug;
-    public $taxonomy;
-
-    public function __construct( $file )
-    {
-        $this->file = $file;
-        $this->dir = dirname($this->file);
-        $this->assets_dir = trailingslashit($this->dir) . 'assets';
-        $this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
-        $this->taxonomy = 'module';
-        $this->order_page_slug = 'module-order';
-
-        // setup taxonomy
-        add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
-
-        // Manage lesson meta boxes for taxonomy
-        add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
-
-        // Save lesson meta box
-        add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
-
-        //Reset the none modules lessons transient
-        add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
-
-        // Frontend styling
-        add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
-
-        // Admin styling
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
-        add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
-
-        // Handle module completion record
-        add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
-        add_action('sensei_user_lesson_reset', array($this, 'save_lesson_module_progress'), 10, 2);
-        add_action('wp', array($this, 'save_module_progress'), 10);
-
-        // Handle module ordering
-        add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
-        add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
-        add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
-
-        // Ensure modules always show under courses
-        add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
-        add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
-
-        // Add course field to taxonomy
-        add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
-        add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
-        add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
-        add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
-
-        // Manage module taxonomy archive page
-        add_filter('template_include', array($this, 'module_archive_template'), 10);
-        add_action('pre_get_posts', array($this, 'module_archive_filter'), 10, 1);
-        add_filter('sensei_lessons_archive_text', array($this, 'module_archive_title'));
-        add_action('sensei_content_lesson_inside_before', array($this, 'module_archive_description'), 11);
-        add_action('sensei_pagination', array($this, 'module_navigation_links'), 11);
-        add_filter('body_class', array($this, 'module_archive_body_class'));
-
-        // add modules to the single course template
-        add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
-
-        //Single Course modules actions. Add to single-course/course-modules.php
-        add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
-
-        // Set up display on single lesson page
-        add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
-
-        // Add 'Modules' columns to Analysis tables
-        add_filter('sensei_analysis_overview_columns', array($this, 'analysis_overview_column_title'), 10, 2);
-        add_filter('sensei_analysis_overview_column_data', array($this, 'analysis_overview_column_data'), 10, 3);
-        add_filter('sensei_analysis_course_columns', array($this, 'analysis_course_column_title'), 10, 2);
-        add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
-
-        // Manage module taxonomy columns
-        add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
-        add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
-        add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
-
-        //store new modules created on the course edit screen
-        add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
-
-        // for non admin users, only show taxonomies that belong to them
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
-        add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
-
-        // add the teacher name next to the module term in for admin users
-        add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
-
-        // remove the default modules  metabox
-        add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
-
-    } // end constructor
-
-    /**
-     * Alter a module term slug when a new taxonomy term is created
-     * This will add the creators user name to the slug for uniqueness.
-     *
-     * @since 1.8.0
-     *
-     * @param $term_id
-     * @param $tt_id
-     * @param $taxonomy
-     *
-     * @return void
-     * @deprecated since 1.9.0
-     */
-    public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
-
-        _deprecated_function('change_module_term_slug', '1.9.0' );
-
-    }// end add_module_term_group
-
-    /**
-     * Hook in all meta boxes related tot he modules taxonomy
-     *
-     * @since 1.8.0
-     *
-     * @param string $post_type
-     * @param WP_Post $post
-     *
-     * @return void
-     */
-    public function modules_metaboxes( $post_type, $post )
-    {
-        if ('lesson' == $post_type ) {
-
-            // Remove default taxonomy meta box from Lesson edit screen
-            remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
-
-            // Add custom meta box to limit module selection to one per lesson
-            add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
-        }
-
-        if( 'course' == $post_type ){
-            // Course modules selection metabox
-            add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
-        }
-    }
-
-    /**
-     * Build content for custom module meta box
-     *
-     * @since 1.8.0
-     * @param  object $post Current post object
-     * @return void
-     */
-    public function lesson_module_metabox($post)
-    {
-
-        // Get lesson course
-        $lesson_course = get_post_meta($post->ID, '_lesson_course', true);
-
-        $html = '';
-
-        // Only show module selection if this lesson is part of a course
-        if ($lesson_course && $lesson_course > 0) {
-
-            // Get existing lesson module
-            $lesson_module = 0;
-            $lesson_module_list = wp_get_post_terms($post->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = $single_module->term_id;
-                    break;
-                }
-            }
-
-            // Get the available modules for this lesson's course
-            $modules = $this->get_course_modules($lesson_course);
-
-            // Build the HTML to output
-            $html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
-            if (is_array($modules) && count($modules) > 0) {
-                $html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
-                $html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
-                foreach ($modules as $module) {
-                    $html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
-                }
-                $html .= '</select>' . "\n";
-            } else {
-                $course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
-                $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
-            } // End If Statement
-
-        } else {
-            $html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
-        } // End If Statement
-
-        // Output the HTML
-        echo $html;
-    }
-
-    /**
-     * Save module to lesson
-     *
-     * @since 1.8.0
-     * @param  integer $post_id ID of post
-     * @return mixed            Post ID on permissions failure, boolean true on success
-     */
-    public function save_lesson_module($post_id)
-    {
-        global $post;
-
-        // Verify post type and nonce
-        if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
-            ||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
-            return $post_id;
-        }
-
-        // Check if user has permissions to edit lessons
-        $post_type = get_post_type_object($post->post_type);
-        if (!current_user_can($post_type->cap->edit_post, $post_id)) {
-            return $post_id;
-        }
-
-        // Check if user has permissions to edit this specific post
-        if (!current_user_can('edit_post', $post_id)) {
-            return $post_id;
-        }
-
-        // Cast module ID as an integer if selected, otherwise leave as empty string
-        if ( isset( $_POST['lesson_module'] ) ) {
-
-            if( empty ( $_POST['lesson_module'] ) ){
-                wp_delete_object_term_relationships($post_id, $this->taxonomy  );
-                return true;
-            }
-
-            $module_id = intval( $_POST['lesson_module'] );
-
-            // Assign lesson to selected module
-            wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
-
-            // Set default order for lesson inside module
-            if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
-                update_post_meta($post_id, '_order_module_' . $module_id, 0);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Display course field on new module screen
-     *
-     * @since 1.8.0
-     * @param object $taxonomy Taxonomy object
-     * @return void
-     */
-    public function add_module_fields($taxonomy)
-    {
-        ?>
+	private $dir;
+	private $file;
+	private $assets_dir;
+	private $assets_url;
+	private $order_page_slug;
+	public $taxonomy;
+
+	public function __construct( $file )
+	{
+		$this->file = $file;
+		$this->dir = dirname($this->file);
+		$this->assets_dir = trailingslashit($this->dir) . 'assets';
+		$this->assets_url = esc_url(trailingslashit(plugins_url('/assets/', $this->file)));
+		$this->taxonomy = 'module';
+		$this->order_page_slug = 'module-order';
+
+		// setup taxonomy
+		add_action( 'init', array( $this, 'setup_modules_taxonomy' ), 10 );
+
+		// Manage lesson meta boxes for taxonomy
+		add_action('add_meta_boxes', array($this, 'modules_metaboxes'), 20, 2 );
+
+		// Save lesson meta box
+		add_action('save_post', array($this, 'save_lesson_module'), 10, 1);
+
+		//Reset the none modules lessons transient
+		add_action( 'save_post', array( 'Sensei_Core_Modules', 'reset_none_modules_transient' ) );
+
+		// Frontend styling
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
+
+		// Admin styling
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'),  20 , 2 );
+
+		// Handle module completion record
+		add_action('sensei_lesson_status_updated', array($this, 'update_lesson_status_module_progress'), 10, 3);
+		add_action('sensei_user_lesson_reset', array($this, 'save_lesson_module_progress'), 10, 2);
+		add_action('wp', array($this, 'save_module_progress'), 10);
+
+		// Handle module ordering
+		add_action('admin_menu', array($this, 'register_modules_admin_menu_items'), 30 );
+		add_filter('manage_edit-course_columns', array($this, 'course_columns'), 11, 1);
+		add_action('manage_posts_custom_column', array($this, 'course_column_content'), 11, 2);
+
+		// Ensure modules always show under courses
+		add_action( 'admin_menu', array( $this, 'remove_lessons_menu_model_taxonomy' ) , 10 );
+		add_action( 'admin_menu', array( $this, 'remove_courses_menu_model_taxonomy' ) , 10 );
+		add_action( 'admin_menu', array( $this, 'redirect_to_lesson_module_taxonomy_to_course' ) , 20 );
+
+		// Add course field to taxonomy
+		add_action($this->taxonomy . '_add_form_fields', array($this, 'add_module_fields'), 50, 1);
+		add_action($this->taxonomy . '_edit_form_fields', array($this, 'edit_module_fields'), 1, 1);
+		add_action('edited_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+		add_action('created_' . $this->taxonomy, array($this, 'save_module_course'), 10, 2);
+		add_action('wp_ajax_sensei_json_search_courses', array($this, 'search_courses_json'));
+
+		// Manage module taxonomy archive page
+		add_filter('template_include', array($this, 'module_archive_template'), 10);
+		add_action('pre_get_posts', array($this, 'module_archive_filter'), 10, 1);
+		add_filter('sensei_lessons_archive_text', array($this, 'module_archive_title'));
+		add_action('sensei_content_lesson_inside_before', array($this, 'module_archive_description'), 11);
+		add_action('sensei_pagination', array($this, 'module_navigation_links'), 11);
+		add_filter('body_class', array($this, 'module_archive_body_class'));
+
+		// add modules to the single course template
+		add_action( 'sensei_single_course_content_inside_after', array($this, 'load_course_module_content_template') , 8 );
+
+		//Single Course modules actions. Add to single-course/course-modules.php
+		add_action('sensei_single_course_modules_before',array( $this,'course_modules_title' ), 20);
+
+		// Set up display on single lesson page
+		add_filter('sensei_breadcrumb_output', array($this, 'module_breadcrumb_link'), 10, 2);
+
+		// Add 'Modules' columns to Analysis tables
+		add_filter('sensei_analysis_overview_columns', array($this, 'analysis_overview_column_title'), 10, 2);
+		add_filter('sensei_analysis_overview_column_data', array($this, 'analysis_overview_column_data'), 10, 3);
+		add_filter('sensei_analysis_course_columns', array($this, 'analysis_course_column_title'), 10, 2);
+		add_filter('sensei_analysis_course_column_data', array($this, 'analysis_course_column_data'), 10, 3);
+
+		// Manage module taxonomy columns
+		add_filter('manage_edit-' . $this->taxonomy . '_columns', array($this, 'taxonomy_column_headings'), 1, 1);
+		add_filter('manage_' . $this->taxonomy . '_custom_column', array($this, 'taxonomy_column_content'), 1, 3);
+		add_filter('sensei_module_lesson_list_title', array($this, 'sensei_course_preview_titles'), 10, 2);
+
+		//store new modules created on the course edit screen
+		add_action( 'wp_ajax_sensei_add_new_module_term', array( 'Sensei_Core_Modules','add_new_module_term' ) );
+
+		// for non admin users, only show taxonomies that belong to them
+		add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		add_filter('get_object_terms', array( $this, 'filter_course_selected_terms' ), 20, 3 );
+
+		// add the teacher name next to the module term in for admin users
+		add_filter('get_terms', array( $this, 'append_teacher_name_to_module' ), 70, 3 );
+
+		// remove the default modules  metabox
+		add_action('admin_init',array( 'Sensei_Core_Modules' , 'remove_default_modules_box' ));
+
+	} // end constructor
+
+	/**
+	 * Alter a module term slug when a new taxonomy term is created
+	 * This will add the creators user name to the slug for uniqueness.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $term_id
+	 * @param $tt_id
+	 * @param $taxonomy
+	 *
+	 * @return void
+	 * @deprecated since 1.9.0
+	 */
+	public function change_module_term_slug( $term_id, $tt_id, $taxonomy ){
+
+		_deprecated_function('change_module_term_slug', '1.9.0' );
+
+	}// end add_module_term_group
+
+	/**
+	 * Hook in all meta boxes related tot he modules taxonomy
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $post_type
+	 * @param WP_Post $post
+	 *
+	 * @return void
+	 */
+	public function modules_metaboxes( $post_type, $post )
+	{
+		if ('lesson' == $post_type ) {
+
+			// Remove default taxonomy meta box from Lesson edit screen
+			remove_meta_box($this->taxonomy . 'div', 'lesson', 'side');
+
+			// Add custom meta box to limit module selection to one per lesson
+			add_meta_box($this->taxonomy . '_select', __('Lesson Module', 'woothemes-sensei'), array($this, 'lesson_module_metabox'), 'lesson', 'side', 'default');
+		}
+
+		if( 'course' == $post_type ){
+			// Course modules selection metabox
+			add_meta_box( $this->taxonomy . '_course_mb', __('Course Modules', 'woothemes-sensei'), array( $this, 'course_module_metabox'), 'course', 'side', 'core');
+		}
+	}
+
+	/**
+	 * Build content for custom module meta box
+	 *
+	 * @since 1.8.0
+	 * @param  object $post Current post object
+	 * @return void
+	 */
+	public function lesson_module_metabox($post)
+	{
+
+		// Get lesson course
+		$lesson_course = get_post_meta($post->ID, '_lesson_course', true);
+
+		$html = '';
+
+		// Only show module selection if this lesson is part of a course
+		if ($lesson_course && $lesson_course > 0) {
+
+			// Get existing lesson module
+			$lesson_module = 0;
+			$lesson_module_list = wp_get_post_terms($post->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = $single_module->term_id;
+					break;
+				}
+			}
+
+			// Get the available modules for this lesson's course
+			$modules = $this->get_course_modules($lesson_course);
+
+			// Build the HTML to output
+			$html .= '<input type="hidden" name="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" id="' . esc_attr('woo_lesson_' . $this->taxonomy . '_nonce') . '" value="' . esc_attr(wp_create_nonce(plugin_basename($this->file))) . '" />';
+			if (is_array($modules) && count($modules) > 0) {
+				$html .= '<select id="lesson-module-options" name="lesson_module" class="widefat">' . "\n";
+				$html .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>';
+				foreach ($modules as $module) {
+					$html .= '<option value="' . esc_attr(absint($module->term_id)) . '"' . selected($module->term_id, $lesson_module, false) . '>' . esc_html($module->name) . '</option>' . "\n";
+				}
+				$html .= '</select>' . "\n";
+			} else {
+				$course_url = admin_url('post.php?post=' . urlencode($lesson_course) . '&action=edit');
+				$html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease add some to %3$sthe course%4$s.%2$s', 'woothemes-sensei'), '<em>', '</em>', '<a href="' . esc_url($course_url) . '">', '</a>') . '</p>';
+			} // End If Statement
+
+		} else {
+			$html .= '<p>' . sprintf(__('No modules are available for this lesson yet. %1$sPlease select a course first.%2$s', 'woothemes-sensei'), '<em>', '</em>') . '</p>';
+		} // End If Statement
+
+		// Output the HTML
+		echo $html;
+	}
+
+	/**
+	 * Save module to lesson
+	 *
+	 * @since 1.8.0
+	 * @param  integer $post_id ID of post
+	 * @return mixed            Post ID on permissions failure, boolean true on success
+	 */
+	public function save_lesson_module($post_id)
+	{
+		global $post;
+
+		// Verify post type and nonce
+		if ((get_post_type() != 'lesson') || !isset($_POST['woo_lesson_' . $this->taxonomy . '_nonce'] )
+			||!wp_verify_nonce($_POST['woo_lesson_' . $this->taxonomy . '_nonce'], plugin_basename($this->file))) {
+			return $post_id;
+		}
+
+		// Check if user has permissions to edit lessons
+		$post_type = get_post_type_object($post->post_type);
+		if (!current_user_can($post_type->cap->edit_post, $post_id)) {
+			return $post_id;
+		}
+
+		// Check if user has permissions to edit this specific post
+		if (!current_user_can('edit_post', $post_id)) {
+			return $post_id;
+		}
+
+		// Cast module ID as an integer if selected, otherwise leave as empty string
+		if ( isset( $_POST['lesson_module'] ) ) {
+
+			if( empty ( $_POST['lesson_module'] ) ){
+				wp_delete_object_term_relationships($post_id, $this->taxonomy  );
+				return true;
+			}
+
+			$module_id = intval( $_POST['lesson_module'] );
+
+			// Assign lesson to selected module
+			wp_set_object_terms($post_id, $module_id, $this->taxonomy, false);
+
+			// Set default order for lesson inside module
+			if (!get_post_meta($post_id, '_order_module_' . $module_id, true)) {
+				update_post_meta($post_id, '_order_module_' . $module_id, 0);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Display course field on new module screen
+	 *
+	 * @since 1.8.0
+	 * @param object $taxonomy Taxonomy object
+	 * @return void
+	 */
+	public function add_module_fields($taxonomy)
+	{
+		?>
         <div class="form-field">
             <label for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label>
             <input type="hidden" id="module_courses" name="module_courses" class="ajax_chosen_select_courses"
@@ -281,44 +281,44 @@ 
                 class="description"><?php _e('Search for and select the courses that this module will belong to.', 'woothemes-sensei'); ?></span>
         </div>
     <?php
-    }
-
-    /**
-     * Display course field on module edit screen
-     *
-     * @since 1.8.0
-     * @param  object $module Module term object
-     * @return void
-     */
-    public function edit_module_fields($module)
-    {
-
-        $module_id = $module->term_id;
-
-        // Get module's existing courses
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            )
-        );
-        $courses = get_posts($args);
-
-        //build the defaults array
-        $module_courses = array();
-        if (isset($courses) && is_array($courses)) {
-            foreach ($courses as $course) {
-                $module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
-            }
-        }
-
-        ?>
+	}
+
+	/**
+	 * Display course field on module edit screen
+	 *
+	 * @since 1.8.0
+	 * @param  object $module Module term object
+	 * @return void
+	 */
+	public function edit_module_fields($module)
+	{
+
+		$module_id = $module->term_id;
+
+		// Get module's existing courses
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			)
+		);
+		$courses = get_posts($args);
+
+		//build the defaults array
+		$module_courses = array();
+		if (isset($courses) && is_array($courses)) {
+			foreach ($courses as $course) {
+				$module_courses[] =   array( 'id' =>$course->ID, 'details'=>$course->post_title );
+			}
+		}
+
+		?>
         <tr class="form-field">
             <th scope="row" valign="top"><label
                     for="module_courses"><?php _e('Course(s)', 'woothemes-sensei'); ?></label></th>
@@ -335,1399 +335,1399 @@ 
             </td>
         </tr>
     <?php
-    }
-
-    /**
-     * Save module course on add/edit
-     *
-     * @since 1.8.0
-     * @param  integer $module_id ID of module
-     * @return void
-     */
-    public function save_module_course($module_id)
-    {
-
-        // Get module's existing courses
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            )
-        );
-        $courses = get_posts($args);
-
-        // Remove module from existing courses
-        if (isset($courses) && is_array($courses)) {
-            foreach ($courses as $course) {
-                wp_remove_object_terms($course->ID, $module_id, $this->taxonomy);
-            }
-        }
-
-        // Add module to selected courses
-        if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
-
-            $course_ids = explode( ",", $_POST['module_courses'] );
-
-            foreach ( $course_ids as $course_id ) {
-
-                wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
-
-            }
-        }
-    }
-
-    /**
-     * Ajax function to search for courses matching term
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function search_courses_json()
-    {
-
-        // Security check
-        check_ajax_referer('search-courses', 'security');
-
-        // Set content type
-        header('Content-Type: application/json; charset=utf-8');
-
-        // Get user input
-        $term = urldecode(stripslashes($_GET['term']));
-
-        // Return nothing if term is empty
-        if (empty($term))
-            die();
-
-        // Set a default if none is given
-        $default = isset($_GET['default']) ? $_GET['default'] : __('No course', 'woothemes-sensei');
-
-        // Set up array of results
-        $found_courses = array('' => $default);
-
-        // Fetch results
-        $args = array(
-            'post_type' => 'course',
-            'post_status' => array('publish', 'draft', 'future', 'private'),
-            'posts_per_page' => -1,
-            'orderby' => 'title',
-            's' => $term
-        );
-        $courses = get_posts($args);
-
-        // Add results to array
-        if ($courses) {
-            foreach ($courses as $course) {
-                $found_courses[$course->ID] = $course->post_title;
-            }
-        }
-
-        // Encode and return results for processing & selection
-        echo json_encode($found_courses);
-        die();
-    }
-
-    /**
-     * display modules on single course pages
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function single_course_modules(){
-
-        _deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
-        // only show modules on the course that has modules
-        if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
-
-            $this->load_course_module_content_template();
-
-        }
-
-    } // end single_course_modules
-
-    public function sensei_course_preview_titles($title, $lesson_id)
-    {
-        global $post, $current_user;
-
-        $course_id = $post->ID;
-        $title_text = '';
-
-        if (method_exists('Sensei_Utils', 'is_preview_lesson') && Sensei_Utils::is_preview_lesson($lesson_id)) {
-            $is_user_taking_course = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
-            if (!$is_user_taking_course) {
-                if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
-                    $title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
-                    // Remove brackets for display here
-                    $title_text = str_replace('(', '', $title_text);
-                    $title_text = str_replace(')', '', $title_text);
-                    $title_text = '<span class="preview-label">' . $title_text . '</span>';
-                }
-                $title .= ' ' . $title_text;
-            }
-        }
-
-        return $title;
-    }
-
-    public function module_breadcrumb_link($html, $separator)
-    {
-        global $post;
-        // Lesson
-        if (is_singular('lesson')) {
-            if (has_term('', $this->taxonomy, $post->ID)) {
-                $module = $this->get_lesson_module($post->ID);
-                if( $module ) {
-                    $html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
-                }
-            }
-        }
-        // Module
-        if (is_tax($this->taxonomy)) {
-            if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-                $course_id = intval($_GET['course_id']);
-                $html .= '<a href="' . esc_url(get_permalink($course_id)) . '" title="' .  __('Back to the course', 'woothemes-sensei') . '">' . get_the_title($course_id) . '</a>';
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Set lesson archive template to display on module taxonomy archive page
-     *
-     * @since 1.8.0
-     * @param  string $template Default template
-     * @return string           Modified template
-     */
-    public function module_archive_template($template) {
-
-        if ( ! is_tax($this->taxonomy) ) {
-            return $template;
-        }
-
-        $file = 'archive-lesson.php';
-        $find = array( $file, Sensei()->template_url . $file );
-
-        // locate the template file
-        $template = locate_template($find);
-        if (!$template) {
-
-            $template = Sensei()->plugin_path() . 'templates/' . $file;
-
-        }
-
-
-        return $template;
-    }
-
-    /**
-     * Modify module taxonomy archive query
-     *
-     * @since 1.8.0
-     * @param  object $query The query object passed by reference
-     * @return void
-     */
-    public function module_archive_filter($query)
-    {
-        if (is_tax($this->taxonomy) && $query->is_main_query()) {
-
-
-            // Limit to lessons only
-            $query->set('post_type', 'lesson');
-
-            // Set order of lessons
-            if (version_compare(Sensei()->version, '1.6.0', '>=')) {
-                $module_id = $query->queried_object_id;
-                $query->set('meta_key', '_order_module_' . $module_id);
-                $query->set('orderby', 'meta_value_num date');
-            } else {
-                $query->set('orderby', 'menu_order');
-            }
-            $query->set('order', 'ASC');
-
-            // Limit to specific course if specified
-            if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-                $course_id = intval($_GET['course_id']);
-                $meta_query[] = array(
-                    'key' => '_lesson_course',
-                    'value' => intval($course_id)
-                );
-                $query->set('meta_query', $meta_query);
-            }
-
-        }
-    }
-
-    /**
-     * Modify archive page title
-     *
-     * @since 1.8.0
-     * @param  string $title Default title
-     * @return string        Modified title
-     */
-    public function module_archive_title($title)
-    {
-        if (is_tax($this->taxonomy)) {
-            $title = apply_filters('sensei_module_archive_title', get_queried_object()->name);
-        }
-        return $title;
-    }
-
-    /**
-     * Display module description on taxonomy archive page
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function module_archive_description()
-    {
-        if (is_tax($this->taxonomy)) {
-
-            $module = get_queried_object();
-
-            $module_progress = false;
-            if (is_user_logged_in() && isset($_GET['course_id']) && intval($_GET['course_id']) > 0) {
-                global $current_user;
-                wp_get_current_user();
-                $module_progress = $this->get_user_module_progress($module->term_id, $_GET['course_id'], $current_user->ID);
-            }
-
-            if ($module_progress && $module_progress > 0) {
-                $status = __('Completed', 'woothemes-sensei');
-                $class = 'completed';
-                if ($module_progress < 100) {
-                    $status = __('In progress', 'woothemes-sensei');
-                    $class = 'in-progress';
-                }
-                echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
-            }
-
-            echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
-        }
-    }
-
-    public function module_archive_body_class($classes)
-    {
-        if (is_tax($this->taxonomy)) {
-            $classes[] = 'module-archive';
-        }
-        return $classes;
-    }
-
-    /**
-     * Display module navigation links on module taxonomy archive page
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function module_navigation_links()
-    {
-        if (is_tax($this->taxonomy) && isset($_GET['course_id'])) {
-
-            $queried_module = get_queried_object();
-            $course_modules = $this->get_course_modules($_GET['course_id']);
-
-            $prev_module = false;
-            $next_module = false;
-            $on_current = false;
-            foreach ($course_modules as $module) {
-                $this_module = $module;
-                if ($on_current) {
-                    $next_module = $this_module;
-                    break;
-                }
-                if ($this_module == $queried_module) {
-                    $on_current = true;
-                } else {
-                    $prev_module = $module;
-                }
-            }
-
-            ?>
+	}
+
+	/**
+	 * Save module course on add/edit
+	 *
+	 * @since 1.8.0
+	 * @param  integer $module_id ID of module
+	 * @return void
+	 */
+	public function save_module_course($module_id)
+	{
+
+		// Get module's existing courses
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			)
+		);
+		$courses = get_posts($args);
+
+		// Remove module from existing courses
+		if (isset($courses) && is_array($courses)) {
+			foreach ($courses as $course) {
+				wp_remove_object_terms($course->ID, $module_id, $this->taxonomy);
+			}
+		}
+
+		// Add module to selected courses
+		if ( isset( $_POST['module_courses'] ) && ! empty( $_POST['module_courses'] ) ) {
+
+			$course_ids = explode( ",", $_POST['module_courses'] );
+
+			foreach ( $course_ids as $course_id ) {
+
+				wp_set_object_terms($course_id, $module_id, $this->taxonomy, true);
+
+			}
+		}
+	}
+
+	/**
+	 * Ajax function to search for courses matching term
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function search_courses_json()
+	{
+
+		// Security check
+		check_ajax_referer('search-courses', 'security');
+
+		// Set content type
+		header('Content-Type: application/json; charset=utf-8');
+
+		// Get user input
+		$term = urldecode(stripslashes($_GET['term']));
+
+		// Return nothing if term is empty
+		if (empty($term))
+			die();
+
+		// Set a default if none is given
+		$default = isset($_GET['default']) ? $_GET['default'] : __('No course', 'woothemes-sensei');
+
+		// Set up array of results
+		$found_courses = array('' => $default);
+
+		// Fetch results
+		$args = array(
+			'post_type' => 'course',
+			'post_status' => array('publish', 'draft', 'future', 'private'),
+			'posts_per_page' => -1,
+			'orderby' => 'title',
+			's' => $term
+		);
+		$courses = get_posts($args);
+
+		// Add results to array
+		if ($courses) {
+			foreach ($courses as $course) {
+				$found_courses[$course->ID] = $course->post_title;
+			}
+		}
+
+		// Encode and return results for processing & selection
+		echo json_encode($found_courses);
+		die();
+	}
+
+	/**
+	 * display modules on single course pages
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function single_course_modules(){
+
+		_deprecated_function('Sensei_Modules->single_course_modules','Sensei 1.9.0', 'Sensei()->modules->load_course_module_content_template');
+		// only show modules on the course that has modules
+		if( is_singular( 'course' ) && has_term( '', 'module' )  )  {
+
+			$this->load_course_module_content_template();
+
+		}
+
+	} // end single_course_modules
+
+	public function sensei_course_preview_titles($title, $lesson_id)
+	{
+		global $post, $current_user;
+
+		$course_id = $post->ID;
+		$title_text = '';
+
+		if (method_exists('Sensei_Utils', 'is_preview_lesson') && Sensei_Utils::is_preview_lesson($lesson_id)) {
+			$is_user_taking_course = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $current_user->ID, 'type' => 'sensei_course_status'));
+			if (!$is_user_taking_course) {
+				if (method_exists('WooThemes_Sensei_Frontend', 'sensei_lesson_preview_title_text')) {
+					$title_text = Sensei()->frontend->sensei_lesson_preview_title_text($course_id);
+					// Remove brackets for display here
+					$title_text = str_replace('(', '', $title_text);
+					$title_text = str_replace(')', '', $title_text);
+					$title_text = '<span class="preview-label">' . $title_text . '</span>';
+				}
+				$title .= ' ' . $title_text;
+			}
+		}
+
+		return $title;
+	}
+
+	public function module_breadcrumb_link($html, $separator)
+	{
+		global $post;
+		// Lesson
+		if (is_singular('lesson')) {
+			if (has_term('', $this->taxonomy, $post->ID)) {
+				$module = $this->get_lesson_module($post->ID);
+				if( $module ) {
+					$html .= ' ' . $separator . ' <a href="' . esc_url($module->url) . '" title="' .  __('Back to the module', 'woothemes-sensei') . '">' . $module->name . '</a>';
+				}
+			}
+		}
+		// Module
+		if (is_tax($this->taxonomy)) {
+			if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
+				$html .= '<a href="' . esc_url(get_permalink($course_id)) . '" title="' .  __('Back to the course', 'woothemes-sensei') . '">' . get_the_title($course_id) . '</a>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Set lesson archive template to display on module taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @param  string $template Default template
+	 * @return string           Modified template
+	 */
+	public function module_archive_template($template) {
+
+		if ( ! is_tax($this->taxonomy) ) {
+			return $template;
+		}
+
+		$file = 'archive-lesson.php';
+		$find = array( $file, Sensei()->template_url . $file );
+
+		// locate the template file
+		$template = locate_template($find);
+		if (!$template) {
+
+			$template = Sensei()->plugin_path() . 'templates/' . $file;
+
+		}
+
+
+		return $template;
+	}
+
+	/**
+	 * Modify module taxonomy archive query
+	 *
+	 * @since 1.8.0
+	 * @param  object $query The query object passed by reference
+	 * @return void
+	 */
+	public function module_archive_filter($query)
+	{
+		if (is_tax($this->taxonomy) && $query->is_main_query()) {
+
+
+			// Limit to lessons only
+			$query->set('post_type', 'lesson');
+
+			// Set order of lessons
+			if (version_compare(Sensei()->version, '1.6.0', '>=')) {
+				$module_id = $query->queried_object_id;
+				$query->set('meta_key', '_order_module_' . $module_id);
+				$query->set('orderby', 'meta_value_num date');
+			} else {
+				$query->set('orderby', 'menu_order');
+			}
+			$query->set('order', 'ASC');
+
+			// Limit to specific course if specified
+			if (isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
+				$meta_query[] = array(
+					'key' => '_lesson_course',
+					'value' => intval($course_id)
+				);
+				$query->set('meta_query', $meta_query);
+			}
+
+		}
+	}
+
+	/**
+	 * Modify archive page title
+	 *
+	 * @since 1.8.0
+	 * @param  string $title Default title
+	 * @return string        Modified title
+	 */
+	public function module_archive_title($title)
+	{
+		if (is_tax($this->taxonomy)) {
+			$title = apply_filters('sensei_module_archive_title', get_queried_object()->name);
+		}
+		return $title;
+	}
+
+	/**
+	 * Display module description on taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function module_archive_description()
+	{
+		if (is_tax($this->taxonomy)) {
+
+			$module = get_queried_object();
+
+			$module_progress = false;
+			if (is_user_logged_in() && isset($_GET['course_id']) && intval($_GET['course_id']) > 0) {
+				global $current_user;
+				wp_get_current_user();
+				$module_progress = $this->get_user_module_progress($module->term_id, $_GET['course_id'], $current_user->ID);
+			}
+
+			if ($module_progress && $module_progress > 0) {
+				$status = __('Completed', 'woothemes-sensei');
+				$class = 'completed';
+				if ($module_progress < 100) {
+					$status = __('In progress', 'woothemes-sensei');
+					$class = 'in-progress';
+				}
+				echo '<p class="status ' . esc_attr($class) . '">' . $status . '</p>';
+			}
+
+			echo '<p class="archive-description module-description">' . apply_filters('sensei_module_archive_description', nl2br($module->description), $module->term_id) . '</p>';
+		}
+	}
+
+	public function module_archive_body_class($classes)
+	{
+		if (is_tax($this->taxonomy)) {
+			$classes[] = 'module-archive';
+		}
+		return $classes;
+	}
+
+	/**
+	 * Display module navigation links on module taxonomy archive page
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function module_navigation_links()
+	{
+		if (is_tax($this->taxonomy) && isset($_GET['course_id'])) {
+
+			$queried_module = get_queried_object();
+			$course_modules = $this->get_course_modules($_GET['course_id']);
+
+			$prev_module = false;
+			$next_module = false;
+			$on_current = false;
+			foreach ($course_modules as $module) {
+				$this_module = $module;
+				if ($on_current) {
+					$next_module = $this_module;
+					break;
+				}
+				if ($this_module == $queried_module) {
+					$on_current = true;
+				} else {
+					$prev_module = $module;
+				}
+			}
+
+			?>
             <div id="post-entries" class="post-entries module-navigation fix">
                 <?php if ($next_module) {
-                    $module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($next_module, $this->taxonomy));
-                    ?>
+					$module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($next_module, $this->taxonomy));
+					?>
                     <div class="nav-next fr"><a href="<?php echo esc_url($module_link); ?>"
                                                 title="<?php esc_attr_e('Next module', 'woothemes-sensei'); ?>"><?php echo $next_module->name; ?>
                             <span class="meta-nav"></span></a></div>
                 <?php } ?>
                 <?php if ($prev_module) {
-                    $module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($prev_module, $this->taxonomy));
-                    ?>
+					$module_link = add_query_arg('course_id', intval($_GET['course_id']), get_term_link($prev_module, $this->taxonomy));
+					?>
                     <div class="nav-prev fl"><a href="<?php echo esc_url($module_link); ?>"
                                                 title="<?php _e('Previous module', 'woothemes-sensei'); ?>"><span
                                 class="meta-nav"></span> <?php echo $prev_module->name; ?></a></div>
                 <?php } ?>
             </div>
         <?php
-        }
-    }
-
-    /**
-     * Trigger save_lesson_module_progress() when a lesson status is updated for a specific user
-     *
-     * @since 1.8.0
-     * @param  string $status Status of the lesson for the user
-     * @param  integer $user_id ID of user
-     * @param  integer $lesson_id ID of lesson
-     * @return void
-     */
-    public function update_lesson_status_module_progress($status = '', $user_id = 0, $lesson_id = 0)
-    {
-        $this->save_lesson_module_progress($user_id, $lesson_id);
-    }
-
-    /**
-     * Save lesson's module progress for a specific user
-     *
-     * @since 1.8.0
-     * @param  integer $user_id ID of user
-     * @param  integer $lesson_id ID of lesson
-     * @return void
-     */
-    public function save_lesson_module_progress($user_id = 0, $lesson_id = 0)
-    {
-        $module = $this->get_lesson_module($lesson_id);
-        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
-        if ($module && $course_id) {
-            $this->save_user_module_progress(intval($module->term_id), intval($course_id), intval($user_id));
-        }
-    }
-
-    /**
-     * Save progress of module for user
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function save_module_progress()
-    {
-        if (is_tax($this->taxonomy) && is_user_logged_in() && isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
-            global $current_user;
-            wp_get_current_user();
-            $user_id = $current_user->ID;
-
-            $module = get_queried_object();
-
-            $this->save_user_module_progress(intval($module->term_id), intval($_GET['course_id']), intval($user_id));
-        }
-    }
-
-    /**
-     * Save module progess for user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @param  integer $user_id ID of user
-     * @return void
-     */
-    public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
-    {
-        $module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
-        update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
-
-        do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
-    }
-
-    /**
-     * Get module progress for a user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @param  integer $user_id ID of user
-     * @return mixed              Module progress percentage on success, false on failure
-     */
-    public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
-    {
-        $module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
-        if ($module_progress) {
-            return (float)$module_progress;
-        }
-        return false;
-    }
-
-    /**
-     * Calculate module progess for user
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $user_id ID of user
-     * @param  integer $module_id ID of module
-     * @param  integer $course_id ID of course
-     * @return integer            Module progress percentage
-     */
-    public function calculate_user_module_progress($user_id = 0, $module_id = 0, $course_id = 0)
-    {
-
-        $args = array(
-            'post_type' => 'lesson',
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => $module_id
-                )
-            ),
-            'meta_query' => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => $course_id
-                )
-            ),
-            'fields' => 'ids'
-        );
-        $lessons = get_posts($args);
-
-        if (is_wp_error($lessons) || 0 >= count($lessons)) return 0;
-
-        $completed = false;
-        $lesson_count = 0;
-        $completed_count = 0;
-        foreach ($lessons as $lesson_id) {
-            $completed = Sensei_Utils::user_completed_lesson($lesson_id, $user_id);
-            ++$lesson_count;
-            if ($completed) {
-                ++$completed_count;
-            }
-        }
-        $module_progress = ($completed_count / $lesson_count) * 100;
-
-        return (float)$module_progress;
-    }
-
-    /**
-     * Register admin screen for ordering modules
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function register_modules_admin_menu_items()
-    {
-        //add the modules link under the Course main menu
-        add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
-
-        // Regsiter new admin page for module ordering
-        $hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
-
-    }
-
-    /**
-     * Display Module Order screen
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function module_order_screen()
-    {
-        ?>
+		}
+	}
+
+	/**
+	 * Trigger save_lesson_module_progress() when a lesson status is updated for a specific user
+	 *
+	 * @since 1.8.0
+	 * @param  string $status Status of the lesson for the user
+	 * @param  integer $user_id ID of user
+	 * @param  integer $lesson_id ID of lesson
+	 * @return void
+	 */
+	public function update_lesson_status_module_progress($status = '', $user_id = 0, $lesson_id = 0)
+	{
+		$this->save_lesson_module_progress($user_id, $lesson_id);
+	}
+
+	/**
+	 * Save lesson's module progress for a specific user
+	 *
+	 * @since 1.8.0
+	 * @param  integer $user_id ID of user
+	 * @param  integer $lesson_id ID of lesson
+	 * @return void
+	 */
+	public function save_lesson_module_progress($user_id = 0, $lesson_id = 0)
+	{
+		$module = $this->get_lesson_module($lesson_id);
+		$course_id = get_post_meta($lesson_id, '_lesson_course', true);
+		if ($module && $course_id) {
+			$this->save_user_module_progress(intval($module->term_id), intval($course_id), intval($user_id));
+		}
+	}
+
+	/**
+	 * Save progress of module for user
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function save_module_progress()
+	{
+		if (is_tax($this->taxonomy) && is_user_logged_in() && isset($_GET['course_id']) && 0 < intval($_GET['course_id'])) {
+			global $current_user;
+			wp_get_current_user();
+			$user_id = $current_user->ID;
+
+			$module = get_queried_object();
+
+			$this->save_user_module_progress(intval($module->term_id), intval($_GET['course_id']), intval($user_id));
+		}
+	}
+
+	/**
+	 * Save module progess for user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @param  integer $user_id ID of user
+	 * @return void
+	 */
+	public function save_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
+	{
+		$module_progress = $this->calculate_user_module_progress($user_id, $module_id, $course_id);
+		update_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), intval($module_progress));
+
+		do_action('sensei_module_save_user_progress', $course_id, $module_id, $user_id, $module_progress);
+	}
+
+	/**
+	 * Get module progress for a user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @param  integer $user_id ID of user
+	 * @return mixed              Module progress percentage on success, false on failure
+	 */
+	public function get_user_module_progress($module_id = 0, $course_id = 0, $user_id = 0)
+	{
+		$module_progress = get_user_meta(intval($user_id), '_module_progress_' . intval($course_id) . '_' . intval($module_id), true);
+		if ($module_progress) {
+			return (float)$module_progress;
+		}
+		return false;
+	}
+
+	/**
+	 * Calculate module progess for user
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $user_id ID of user
+	 * @param  integer $module_id ID of module
+	 * @param  integer $course_id ID of course
+	 * @return integer            Module progress percentage
+	 */
+	public function calculate_user_module_progress($user_id = 0, $module_id = 0, $course_id = 0)
+	{
+
+		$args = array(
+			'post_type' => 'lesson',
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => $module_id
+				)
+			),
+			'meta_query' => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => $course_id
+				)
+			),
+			'fields' => 'ids'
+		);
+		$lessons = get_posts($args);
+
+		if (is_wp_error($lessons) || 0 >= count($lessons)) return 0;
+
+		$completed = false;
+		$lesson_count = 0;
+		$completed_count = 0;
+		foreach ($lessons as $lesson_id) {
+			$completed = Sensei_Utils::user_completed_lesson($lesson_id, $user_id);
+			++$lesson_count;
+			if ($completed) {
+				++$completed_count;
+			}
+		}
+		$module_progress = ($completed_count / $lesson_count) * 100;
+
+		return (float)$module_progress;
+	}
+
+	/**
+	 * Register admin screen for ordering modules
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function register_modules_admin_menu_items()
+	{
+		//add the modules link under the Course main menu
+		add_submenu_page('edit.php?post_type=course', __('Modules', 'woothemes-sensei'), __('Modules', 'woothemes-sensei'), 'manage_categories', 'edit-tags.php?taxonomy=module','' );
+
+		// Regsiter new admin page for module ordering
+		$hook = add_submenu_page('edit.php?post_type=course', __('Order Modules', 'woothemes-sensei'), __('Order Modules', 'woothemes-sensei'), 'edit_lessons', $this->order_page_slug, array($this, 'module_order_screen'));
+
+	}
+
+	/**
+	 * Display Module Order screen
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function module_order_screen()
+	{
+		?>
         <div id="<?php echo esc_attr($this->order_page_slug); ?>"
              class="wrap <?php echo esc_attr($this->order_page_slug); ?>">
         <h2><?php _e('Order Modules', 'woothemes-sensei'); ?></h2><?php
 
-        $html = '';
-
-        if (isset($_POST['module-order']) && 0 < strlen($_POST['module-order'])) {
-            $ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
-
-            if ($ordered) {
-                $html .= '<div class="updated fade">' . "\n";
-                $html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
-                $html .= '</div>' . "\n";
-            }
-        }
-
-        $courses = Sensei()->course->get_all_courses();
-
-        $html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
-        $html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
-        $html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
-        $html .= '<select id="module-order-course" name="course_id">' . "\n";
-        $html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
-
-        foreach ($courses as $course) {
-            if (has_term('', $this->taxonomy, $course->ID)) {
-                $course_id = '';
-                if (isset($_GET['course_id'])) {
-                    $course_id = intval($_GET['course_id']);
-                }
-                $html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
-            }
-        }
-
-        $html .= '</select>' . "\n";
-        $html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
-        $html .= '</form>' . "\n";
-
-        if (isset($_GET['course_id'])) {
-            $course_id = intval($_GET['course_id']);
-            if ($course_id > 0) {
-                $modules = $this->get_course_modules($course_id);
-                $modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
-                if ($modules) {
-
-                    $order = $this->get_course_module_order($course_id);
-
-                    $order_string='';
-                    if ($order) {
-                        $order_string = implode(',', $order);
-                    }
-
-                    $html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-                    $html .= '<ul class="sortable-module-list">' . "\n";
-                    $count = 0;
-                    foreach ($modules as $module) {
-                        $count++;
-                        $class = $this->taxonomy;
-                        if ($count == 1) {
-                            $class .= ' first';
-                        }
-                        if ($count == count($module)) {
-                            $class .= ' last';
-                        }
-                        if ($count % 2 != 0) {
-                            $class .= ' alternate';
-                        }
-                        $html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
-                    }
-                    $html .= '</ul>' . "\n";
-
-                    $html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
-                    $html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-                    $html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
-                    $html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
-                }
-            }
-        }
-
-        echo $html;
-
-        ?></div><?php
-    }
-
-    /**
-     * Add 'Module order' column to courses list table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Existing columns
-     * @return array           Modifed columns
-     */
-    public function course_columns($columns = array())
-    {
-        $columns['module_order'] = __('Module order', 'woothemes-sensei');
-        return $columns;
-    }
-
-    /**
-     * Load content in 'Module order' column
-     *
-     * @since 1.8.0
-     *
-     * @param  string $column Current column name
-     * @param  integer $course_id ID of course
-     * @return void
-     */
-    public function course_column_content($column = '', $course_id = 0)
-    {
-        if ($column == 'module_order') {
-            if (has_term('', $this->taxonomy, $course_id)) {
-                echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
-            }
-        }
-    }
-
-    /**
-     * Save module order for course
-     *
-     * @since 1.8.0
-     *
-     * @param  string $order_string Comma-separated string of module IDs
-     * @param  integer $course_id ID of course
-     * @return boolean                 True on success, false on failure
-     */
-    private function save_course_module_order($order_string = '', $course_id = 0)
-    {
-        if ($order_string && $course_id) {
-            $order = explode(',', $order_string);
-            update_post_meta(intval($course_id), '_module_order', $order);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get module order for course
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $course_id ID of course
-     * @return mixed              Module order on success, false if no module order has been saved
-     */
-    public function get_course_module_order($course_id = 0)
-    {
-        if ($course_id) {
-            $order = get_post_meta(intval($course_id), '_module_order', true);
-            return $order;
-        }
-        return false;
-    }
-
-    /**
-     * Modify module taxonomy columns
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function taxonomy_column_headings($columns)
-    {
-
-        unset($columns['posts']);
-
-        $columns['lessons'] = __('Lessons', 'woothemes-sensei');
-
-        return $columns;
-    }
-
-    /**
-     * Manage content in custom module taxonomy columns
-     *
-     * @since 1.8.0
-     *
-     * @param  string $column_data Default data for column
-     * @param  string $column_name Name of current column
-     * @param  integer $term_id ID of current term
-     * @return string               Modified column data
-     */
-    public function taxonomy_column_content($column_data, $column_name, $term_id)
-    {
-
-        $args = array(
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'tax_query' => array(
-                array(
-                    'taxonomy' => $this->taxonomy,
-                    'field' => 'id',
-                    'terms' => intval($term_id)
-                )
-            )
-        );
-
-        $module = get_term($term_id, $this->taxonomy);
-
-        switch ($column_name) {
-
-            case 'lessons':
-                $args['post_type'] = 'lesson';
-                $lessons = get_posts($args);
-                $total_lessons = count($lessons);
-                $column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
-                break;
-        }
-
-        return $column_data;
-    }
-
-    /**
-     * Add 'Module' columns to Analysis Lesson Overview table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function analysis_overview_column_title($columns)
-    {
-
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $new_columns = array();
-            if (is_array($columns) && 0 < count($columns)) {
-                foreach ($columns as $column => $title) {
-                    $new_columns[$column] = $title;
-                    if ($column == 'title') {
-                        $new_columns['lesson_module'] = __('Module', 'woothemes-sensei');
-                    }
-                }
-            }
-
-            if (0 < count($new_columns)) {
-                return $new_columns;
-            }
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Data for 'Module' column Analysis Lesson Overview table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Table column data
-     * @param  WP_Post $lesson
-     * @return array              Updated column data
-     */
-    public function analysis_overview_column_data($columns, $lesson )
-    {
-
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $lesson_module = '';
-            $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
-                    break;
-                }
-            }
-
-            $columns['lesson_module'] = $lesson_module;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Add 'Module' columns to Analysis Course table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Default columns
-     * @return array          Modified columns
-     */
-    public function analysis_course_column_title($columns)
-    {
-        if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
-            $columns['lesson_module'] = __('Module', 'woothemes-sensei');
-        }
-        return $columns;
-    }
-
-    /**
-     * Data for 'Module' column in Analysis Course table
-     *
-     * @since 1.8.0
-     *
-     * @param  array $columns Table column data
-     * @param  WP_Post $lesson
-     * @return array              Updated columns data
-     */
-    public function analysis_course_column_data($columns, $lesson )
-    {
-
-        if ( isset( $_GET['course_id'] ) ) {
-            $lesson_module = '';
-            $lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
-            if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
-                foreach ($lesson_module_list as $single_module) {
-                    $lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
-                    break;
-                }
-            }
-
-            $columns['lesson_module'] = $lesson_module;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Get module for lesson
-     *
-     * This function also checks if the module still
-     * exists on the course before returning it. Although
-     * the lesson has a module the same module must exist on the
-     * course for it to be valid.
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $lesson_id ID of lesson
-     * @return object             Module taxonomy term object
-     */
-    public function get_lesson_module($lesson_id = 0)
-    {
-        $lesson_id = intval($lesson_id);
-        if ( ! ( intval( $lesson_id > 0) ) ) {
-            return false;
-        }
-
-        // get taxonomy terms on this lesson
-        $modules = wp_get_post_terms($lesson_id, $this->taxonomy);
-
-        //check if error returned
-        if( empty( $modules ) || isset( $modules['errors']  ) ){
-            return false;
-        }
-
-       // get the last item in the array there should be only be 1 really.
-       // this method works for all php versions.
-       foreach( $modules as $module ){
-           break;
-       }
-
-        if ( ! isset($module) || ! is_object($module) || is_wp_error($module)) {
-            return false;
-        }
-
-        $module->url = get_term_link($module, $this->taxonomy);
-        $course_id = intval(get_post_meta(intval($lesson_id), '_lesson_course', true));
-        if (isset($course_id) && 0 < $course_id) {
-
-            // the course should contain the same module taxonomy term for this to be valid
-            if( ! has_term( $module, $this->taxonomy, $course_id)){
-                return false;
-            }
-
-            $module->url = esc_url(add_query_arg('course_id', intval($course_id), $module->url));
-        }
-        return $module;
-
-    }
-
-    /**
-     * Get ordered array of all modules in course
-     *
-     * @since 1.8.0
-     *
-     * @param  integer $course_id ID of course
-     * @return array              Ordered array of module taxonomy term objects
-     */
-    public function get_course_modules($course_id = 0)
-    {
-        $course_id = intval($course_id);
-        if (0 < $course_id) {
-
-            // Get modules for course
-            $modules = wp_get_post_terms($course_id, $this->taxonomy);
-
-            // Get custom module order for course
-            $order = $this->get_course_module_order($course_id);
-
-            // Sort by custom order if custom order exists
-            if ($order) {
-                $ordered_modules = array();
-                $unordered_modules = array();
-                foreach ($modules as $module) {
-                    $order_key = array_search($module->term_id, $order);
-                    if ($order_key !== false) {
-                        $ordered_modules[$order_key] = $module;
-                    } else {
-                        $unordered_modules[] = $module;
-                    }
-                }
-
-                // Order modules correctly
-                ksort($ordered_modules);
-
-                // Append modules that have not yet been ordered
-                if (count($unordered_modules) > 0) {
-                    $ordered_modules = array_merge($ordered_modules, $unordered_modules);
-                }
-
-            } else {
-
-                $ordered_modules = $modules;
-
-            }
-
-            return $ordered_modules;
-
-        }
-
-        return false;
-    }
-
-    /**
-     * Load frontend CSS
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function enqueue_styles()
-    {
-
-
-        wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-frontend');
-    }
-
-    /**
-     * Load admin Javascript
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function admin_enqueue_scripts( $hook ) {
-
-        /**
-         * Filter the page hooks where modules admin script can be loaded on.
-         *
-         * @param array $white_listed_pages
-         */
-        $script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
-            'edit-tags.php',
-            'course_page_module-order',
-            'post-new.php',
-            'post.php'
-        ) );
-
-        if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
-            return;
-        }
-
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-        wp_enqueue_script( 'sensei-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
-        wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version , true );
-        wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'select2' ), Sensei()->version, true );
-
-        // localized module data
-        $localize_modulesAdmin = array(
-            'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
-            'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
-        );
-
-        wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
-    }
-
-    /**
-     * Load admin CSS
-     *
-     * @since 1.8.0
-     *
-     * @return void
-     */
-    public function admin_enqueue_styles() {
-
-
-        wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
-        wp_enqueue_style($this->taxonomy . '-sortable');
-
-    }
-
-    /**
-     * Show the title modules on the single course template.
-     *
-     * Function is hooked into sensei_single_course_modules_before.
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function course_modules_title( ) {
-
-       if( sensei_module_has_lessons() ){
-
-            echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
-
-        }
-
-    }
-
-    /**
-     * Display the single course modules content this will only show
-     * if the course has modules.
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function load_course_module_content_template(){
-
-        // load backwards compatible template name if it exists in the users theme
-        $located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
-        if( $located_template ){
-
-            Sensei_Templates::get_template( 'single-course/course-modules.php' );
-            return;
-
-        }
-
-        Sensei_Templates::get_template( 'single-course/modules.php' );
-
-    } // end course_module_content
-
-    /**
-     * Returns all lessons for the given module ID
-     *
-     * @since 1.8.0
-     *
-     * @param $course_id
-     * @param $term_id
-     * @return array $lessons
-     */
-    public function get_lessons( $course_id , $term_id ){
-
-        $lesson_query = $this->get_lessons_query( $course_id, $term_id );
+		$html = '';
+
+		if (isset($_POST['module-order']) && 0 < strlen($_POST['module-order'])) {
+			$ordered = $this->save_course_module_order(esc_attr($_POST['module-order']), esc_attr($_POST['course_id']));
+
+			if ($ordered) {
+				$html .= '<div class="updated fade">' . "\n";
+				$html .= '<p>' . __('The module order has been saved for this course.', 'woothemes-sensei') . '</p>' . "\n";
+				$html .= '</div>' . "\n";
+			}
+		}
+
+		$courses = Sensei()->course->get_all_courses();
+
+		$html .= '<form action="' . admin_url('edit.php') . '" method="get">' . "\n";
+		$html .= '<input type="hidden" name="post_type" value="course" />' . "\n";
+		$html .= '<input type="hidden" name="page" value="' . esc_attr($this->order_page_slug) . '" />' . "\n";
+		$html .= '<select id="module-order-course" name="course_id">' . "\n";
+		$html .= '<option value="">' . __('Select a course', 'woothemes-sensei') . '</option>' . "\n";
+
+		foreach ($courses as $course) {
+			if (has_term('', $this->taxonomy, $course->ID)) {
+				$course_id = '';
+				if (isset($_GET['course_id'])) {
+					$course_id = intval($_GET['course_id']);
+				}
+				$html .= '<option value="' . esc_attr(intval($course->ID)) . '" ' . selected($course->ID, $course_id, false) . '>' . get_the_title($course->ID) . '</option>' . "\n";
+			}
+		}
+
+		$html .= '</select>' . "\n";
+		$html .= '<input type="submit" class="button-primary module-order-select-course-submit" value="' . __('Select', 'woothemes-sensei') . '" />' . "\n";
+		$html .= '</form>' . "\n";
+
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
+			if ($course_id > 0) {
+				$modules = $this->get_course_modules($course_id);
+				$modules = $this->append_teacher_name_to_module( $modules, array( 'module' ), array() );
+				if ($modules) {
+
+					$order = $this->get_course_module_order($course_id);
+
+					$order_string='';
+					if ($order) {
+						$order_string = implode(',', $order);
+					}
+
+					$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
+					$html .= '<ul class="sortable-module-list">' . "\n";
+					$count = 0;
+					foreach ($modules as $module) {
+						$count++;
+						$class = $this->taxonomy;
+						if ($count == 1) {
+							$class .= ' first';
+						}
+						if ($count == count($module)) {
+							$class .= ' last';
+						}
+						if ($count % 2 != 0) {
+							$class .= ' alternate';
+						}
+						$html .= '<li class="' . esc_attr($class) . '"><span rel="' . esc_attr($module->term_id) . '" style="width: 100%;"> ' . $module->name . '</span></li>' . "\n";
+					}
+					$html .= '</ul>' . "\n";
+
+					$html .= '<input type="hidden" name="module-order" value="' . $order_string . '" />' . "\n";
+					$html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
+					$html .= '<input type="submit" class="button-primary" value="' . __('Save module order', 'woothemes-sensei') . '" />' . "\n";
+					$html .= '<a href="' . admin_url('post.php?post=' . $course_id . '&action=edit') . '" class="button-secondary">' . __('Edit course', 'woothemes-sensei') . '</a>' . "\n";
+				}
+			}
+		}
+
+		echo $html;
+
+		?></div><?php
+	}
+
+	/**
+	 * Add 'Module order' column to courses list table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Existing columns
+	 * @return array           Modifed columns
+	 */
+	public function course_columns($columns = array())
+	{
+		$columns['module_order'] = __('Module order', 'woothemes-sensei');
+		return $columns;
+	}
+
+	/**
+	 * Load content in 'Module order' column
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $column Current column name
+	 * @param  integer $course_id ID of course
+	 * @return void
+	 */
+	public function course_column_content($column = '', $course_id = 0)
+	{
+		if ($column == 'module_order') {
+			if (has_term('', $this->taxonomy, $course_id)) {
+				echo '<a class="button-secondary" href="' . admin_url('edit.php?post_type=course&page=module-order&course_id=' . urlencode(intval($course_id))) . '">' . __('Order modules', 'woothemes-sensei') . '</a>';
+			}
+		}
+	}
+
+	/**
+	 * Save module order for course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $order_string Comma-separated string of module IDs
+	 * @param  integer $course_id ID of course
+	 * @return boolean                 True on success, false on failure
+	 */
+	private function save_course_module_order($order_string = '', $course_id = 0)
+	{
+		if ($order_string && $course_id) {
+			$order = explode(',', $order_string);
+			update_post_meta(intval($course_id), '_module_order', $order);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get module order for course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $course_id ID of course
+	 * @return mixed              Module order on success, false if no module order has been saved
+	 */
+	public function get_course_module_order($course_id = 0)
+	{
+		if ($course_id) {
+			$order = get_post_meta(intval($course_id), '_module_order', true);
+			return $order;
+		}
+		return false;
+	}
+
+	/**
+	 * Modify module taxonomy columns
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function taxonomy_column_headings($columns)
+	{
+
+		unset($columns['posts']);
+
+		$columns['lessons'] = __('Lessons', 'woothemes-sensei');
+
+		return $columns;
+	}
+
+	/**
+	 * Manage content in custom module taxonomy columns
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  string $column_data Default data for column
+	 * @param  string $column_name Name of current column
+	 * @param  integer $term_id ID of current term
+	 * @return string               Modified column data
+	 */
+	public function taxonomy_column_content($column_data, $column_name, $term_id)
+	{
+
+		$args = array(
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'tax_query' => array(
+				array(
+					'taxonomy' => $this->taxonomy,
+					'field' => 'id',
+					'terms' => intval($term_id)
+				)
+			)
+		);
+
+		$module = get_term($term_id, $this->taxonomy);
+
+		switch ($column_name) {
+
+			case 'lessons':
+				$args['post_type'] = 'lesson';
+				$lessons = get_posts($args);
+				$total_lessons = count($lessons);
+				$column_data = '<a href="' . admin_url('edit.php?module=' . urlencode($module->slug) . '&post_type=lesson') . '">' . intval($total_lessons) . '</a>';
+				break;
+		}
+
+		return $column_data;
+	}
+
+	/**
+	 * Add 'Module' columns to Analysis Lesson Overview table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function analysis_overview_column_title($columns)
+	{
+
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$new_columns = array();
+			if (is_array($columns) && 0 < count($columns)) {
+				foreach ($columns as $column => $title) {
+					$new_columns[$column] = $title;
+					if ($column == 'title') {
+						$new_columns['lesson_module'] = __('Module', 'woothemes-sensei');
+					}
+				}
+			}
+
+			if (0 < count($new_columns)) {
+				return $new_columns;
+			}
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Data for 'Module' column Analysis Lesson Overview table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Table column data
+	 * @param  WP_Post $lesson
+	 * @return array              Updated column data
+	 */
+	public function analysis_overview_column_data($columns, $lesson )
+	{
+
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$lesson_module = '';
+			$lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+					break;
+				}
+			}
+
+			$columns['lesson_module'] = $lesson_module;
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Add 'Module' columns to Analysis Course table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Default columns
+	 * @return array          Modified columns
+	 */
+	public function analysis_course_column_title($columns)
+	{
+		if ( isset( $_GET['view'] ) && 'lessons' == $_GET['view'] ) {
+			$columns['lesson_module'] = __('Module', 'woothemes-sensei');
+		}
+		return $columns;
+	}
+
+	/**
+	 * Data for 'Module' column in Analysis Course table
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  array $columns Table column data
+	 * @param  WP_Post $lesson
+	 * @return array              Updated columns data
+	 */
+	public function analysis_course_column_data($columns, $lesson )
+	{
+
+		if ( isset( $_GET['course_id'] ) ) {
+			$lesson_module = '';
+			$lesson_module_list = wp_get_post_terms($lesson->ID, $this->taxonomy);
+			if (is_array($lesson_module_list) && count($lesson_module_list) > 0) {
+				foreach ($lesson_module_list as $single_module) {
+					$lesson_module = '<a href="' . esc_url(admin_url('edit-tags.php?action=edit&taxonomy=' . urlencode($this->taxonomy) . '&tag_ID=' . urlencode($single_module->term_id))) . '">' . $single_module->name . '</a>';
+					break;
+				}
+			}
+
+			$columns['lesson_module'] = $lesson_module;
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Get module for lesson
+	 *
+	 * This function also checks if the module still
+	 * exists on the course before returning it. Although
+	 * the lesson has a module the same module must exist on the
+	 * course for it to be valid.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $lesson_id ID of lesson
+	 * @return object             Module taxonomy term object
+	 */
+	public function get_lesson_module($lesson_id = 0)
+	{
+		$lesson_id = intval($lesson_id);
+		if ( ! ( intval( $lesson_id > 0) ) ) {
+			return false;
+		}
+
+		// get taxonomy terms on this lesson
+		$modules = wp_get_post_terms($lesson_id, $this->taxonomy);
+
+		//check if error returned
+		if( empty( $modules ) || isset( $modules['errors']  ) ){
+			return false;
+		}
+
+	   // get the last item in the array there should be only be 1 really.
+	   // this method works for all php versions.
+	   foreach( $modules as $module ){
+		   break;
+	   }
+
+		if ( ! isset($module) || ! is_object($module) || is_wp_error($module)) {
+			return false;
+		}
+
+		$module->url = get_term_link($module, $this->taxonomy);
+		$course_id = intval(get_post_meta(intval($lesson_id), '_lesson_course', true));
+		if (isset($course_id) && 0 < $course_id) {
+
+			// the course should contain the same module taxonomy term for this to be valid
+			if( ! has_term( $module, $this->taxonomy, $course_id)){
+				return false;
+			}
+
+			$module->url = esc_url(add_query_arg('course_id', intval($course_id), $module->url));
+		}
+		return $module;
+
+	}
+
+	/**
+	 * Get ordered array of all modules in course
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param  integer $course_id ID of course
+	 * @return array              Ordered array of module taxonomy term objects
+	 */
+	public function get_course_modules($course_id = 0)
+	{
+		$course_id = intval($course_id);
+		if (0 < $course_id) {
+
+			// Get modules for course
+			$modules = wp_get_post_terms($course_id, $this->taxonomy);
+
+			// Get custom module order for course
+			$order = $this->get_course_module_order($course_id);
+
+			// Sort by custom order if custom order exists
+			if ($order) {
+				$ordered_modules = array();
+				$unordered_modules = array();
+				foreach ($modules as $module) {
+					$order_key = array_search($module->term_id, $order);
+					if ($order_key !== false) {
+						$ordered_modules[$order_key] = $module;
+					} else {
+						$unordered_modules[] = $module;
+					}
+				}
+
+				// Order modules correctly
+				ksort($ordered_modules);
+
+				// Append modules that have not yet been ordered
+				if (count($unordered_modules) > 0) {
+					$ordered_modules = array_merge($ordered_modules, $unordered_modules);
+				}
+
+			} else {
+
+				$ordered_modules = $modules;
+
+			}
+
+			return $ordered_modules;
+
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load frontend CSS
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function enqueue_styles()
+	{
+
+
+		wp_register_style($this->taxonomy . '-frontend', esc_url($this->assets_url) . 'css/modules-frontend.css', Sensei()->version );
+		wp_enqueue_style($this->taxonomy . '-frontend');
+	}
+
+	/**
+	 * Load admin Javascript
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function admin_enqueue_scripts( $hook ) {
+
+		/**
+		 * Filter the page hooks where modules admin script can be loaded on.
+		 *
+		 * @param array $white_listed_pages
+		 */
+		$script_on_pages_white_list = apply_filters( 'sensei_module_admin_script_page_white_lists', array(
+			'edit-tags.php',
+			'course_page_module-order',
+			'post-new.php',
+			'post.php'
+		) );
+
+		if ( ! in_array( $hook, $script_on_pages_white_list ) ) {
+			return;
+		}
+
+		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+
+		wp_enqueue_script( 'sensei-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true);
+		wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version , true );
+		wp_enqueue_script( $this->taxonomy . '-admin', esc_url( $this->assets_url ) . 'js/modules-admin' . $suffix . '.js', array( 'jquery', 'sensei-chosen', 'sensei-chosen-ajax', 'jquery-ui-sortable', 'select2' ), Sensei()->version, true );
+
+		// localized module data
+		$localize_modulesAdmin = array(
+			'search_courses_nonce' => wp_create_nonce( 'search-courses' ),
+			'selectPlaceholder'    => __( 'Search for courses', 'woothemes-sensei' )
+		);
+
+		wp_localize_script( $this->taxonomy . '-admin' ,'modulesAdmin', $localize_modulesAdmin );
+	}
+
+	/**
+	 * Load admin CSS
+	 *
+	 * @since 1.8.0
+	 *
+	 * @return void
+	 */
+	public function admin_enqueue_styles() {
+
+
+		wp_register_style($this->taxonomy . '-sortable', esc_url($this->assets_url) . 'css/modules-admin.css','',Sensei()->version );
+		wp_enqueue_style($this->taxonomy . '-sortable');
+
+	}
+
+	/**
+	 * Show the title modules on the single course template.
+	 *
+	 * Function is hooked into sensei_single_course_modules_before.
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function course_modules_title( ) {
+
+	   if( sensei_module_has_lessons() ){
+
+			echo '<header><h2>' . __('Modules', 'woothemes-sensei') . '</h2></header>';
+
+		}
+
+	}
+
+	/**
+	 * Display the single course modules content this will only show
+	 * if the course has modules.
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function load_course_module_content_template(){
+
+		// load backwards compatible template name if it exists in the users theme
+		$located_template= locate_template( Sensei()->template_url . 'single-course/course-modules.php' );
+		if( $located_template ){
+
+			Sensei_Templates::get_template( 'single-course/course-modules.php' );
+			return;
+
+		}
+
+		Sensei_Templates::get_template( 'single-course/modules.php' );
+
+	} // end course_module_content
+
+	/**
+	 * Returns all lessons for the given module ID
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 * @param $term_id
+	 * @return array $lessons
+	 */
+	public function get_lessons( $course_id , $term_id ){
+
+		$lesson_query = $this->get_lessons_query( $course_id, $term_id );
 
-        if( isset( $lesson_query->posts ) ){
+		if( isset( $lesson_query->posts ) ){
 
-            return $lesson_query->posts;
+			return $lesson_query->posts;
 
-        }else{
+		}else{
 
-            return array();
+			return array();
 
-        }
+		}
 
-    } // end get lessons
+	} // end get lessons
 
-    /**
-     * Returns all lessons for the given module ID
-     *
-     * @since 1.8.0
-     *
-     * @param $course_id
-     * @param $term_id
-     * @return WP_Query $lessons_query
-     */
-    public function get_lessons_query( $course_id , $term_id ){
-
-        if( empty( $term_id ) || empty( $course_id ) ){
-
-            return array();
-
-        }
-
-        $args = array(
-            'post_type' => 'lesson',
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'meta_query' => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => intval($course_id),
-                    'compare' => '='
-                )
-            ),
-            'tax_query' => array(
-                array(
-                    'taxonomy' => 'module',
-                    'field' => 'id',
-                    'terms' => intval( $term_id )
-                )
-            ),
-            'orderby' => 'menu_order',
-            'order' => 'ASC',
-            'suppress_filters' => 0
-        );
-
-        if (version_compare( Sensei()->version, '1.6.0', '>=')) {
-            $args['meta_key'] = '_order_module_' . intval( $term_id );
-            $args['orderby'] = 'meta_value_num date';
-        }
-
-        $lessons_query = new WP_Query( $args );
-
-        return $lessons_query;
-
-    } // end get lessons
-
-    /**
-     * Find the lesson in the given course that doesn't belong
-     * to any of the courses modules
-     *
-     *
-     * @param $course_id
-     *
-     * @return array $non_module_lessons
-     */
-    public function get_none_module_lessons( $course_id ){
-
-        $non_module_lessons = array();
-
-        //exit if there is no course id passed in
-        if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
-
-            return $non_module_lessons;
-        }
-
-        //save some time and check if we already have the saved
-        if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
-
-            return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
-
-        }
-
-        // create terms array which must be excluded from other arrays
-        $course_modules = $this->get_course_modules( $course_id );
-
-        //exit if there are no module on this course
-        if( empty( $course_modules ) || ! is_array( $course_modules ) ){
-
-            return  Sensei()->course->course_lessons( $course_id );
-
-        }
-
-        $terms = array();
-        foreach( $course_modules as $module ){
-
-            array_push( $terms ,  $module->term_id );
-
-        }
-
-        $args = array(
-            'post_type' => 'lesson',
-            'post_status' => 'publish',
-            'posts_per_page' => -1,
-            'meta_query' => array(
-                array(
-                    'key' => '_lesson_course',
-                    'value' => intval( $course_id ),
-                    'compare' => '='
-                )
-            ),
-            'tax_query' => array(
-                array(
-                    'taxonomy' => 'module',
-                    'field' => 'id',
-                    'terms' =>  $terms,
-                    'operator' => 'NOT IN'
-                )
-            ),
-            'orderby' => 'menu_order',
-            'order' => 'ASC',
-            'suppress_filters' => 0
-        );
-
-        $wp_lessons_query = new WP_Query( $args );
-
-        if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
-            $non_module_lessons = $wp_lessons_query->get_posts();
-            set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
-        }
-
-        return $non_module_lessons;
-    } // end get_none_module_lessons
-
-    /**
-     * Register the modules taxonomy
-     *
-     * @since 1.8.0
-     */
-    public function setup_modules_taxonomy(){
-
-        $labels = array(
-            'name' => __('Modules', 'woothemes-sensei'),
-            'singular_name' => __('Module', 'woothemes-sensei'),
-            'search_items' => __('Search Modules', 'woothemes-sensei'),
-            'all_items' => __('All Modules', 'woothemes-sensei'),
-            'parent_item' => __('Parent Module', 'woothemes-sensei'),
-            'parent_item_colon' => __('Parent Module:', 'woothemes-sensei'),
-            'edit_item' => __('Edit Module', 'woothemes-sensei'),
-            'update_item' => __('Update Module', 'woothemes-sensei'),
-            'add_new_item' => __('Add New Module', 'woothemes-sensei'),
-            'new_item_name' => __('New Module Name', 'woothemes-sensei'),
-            'menu_name' => __('Modules', 'woothemes-sensei'),
-        );
-
-        /**
-         * Filter to alter the Sensei Modules rewrite slug
-         *
-         * @since 1.8.0
-         * @param string default 'modules'
-         */
-        $modules_rewrite_slug = apply_filters('sensei_module_slug', 'modules');
-
-        $args = array(
-            'public' => true,
-            'hierarchical' => true,
-            'show_admin_column' => true,
-            'capabilities' => array(
-                'manage_terms' => 'manage_categories',
-                'edit_terms'   => 'edit_courses',
-                'delete_terms' => 'manage_categories',
-                'assign_terms' => 'edit_courses'
-            ),
-            'show_in_nav_menus' => false,
-            'show_in_quick_edit' => false,
-            'show_ui' => true,
-            'rewrite' => array('slug' => $modules_rewrite_slug ),
-            'labels' => $labels
-        );
-
-        register_taxonomy( 'module' , array('course', 'lesson'), $args);
-
-    }// end setup_modules_taxonomy
-
-    /**
-     * When the wants to edit the lesson modules redirect them to the course modules.
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    function redirect_to_lesson_module_taxonomy_to_course( ){
-
-        global $typenow , $taxnow;
-
-        if( 'lesson'== $typenow && 'module'==$taxnow ){
-            wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
-        }
-
-    }// end redirect to course taxonomy
-
-    /**
-     * Completely remove the module menu item under lessons.
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function remove_lessons_menu_model_taxonomy(){
-        global $submenu;
-
-        if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
-            return; // exit
-        }
-
-        $lesson_main_menu = $submenu['edit.php?post_type=lesson'];
-        foreach( $lesson_main_menu as $index => $sub_item ){
-
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=lesson'][ $index ]);
-            }
-        }
-
-    }// end remove lesson module tax
-
-    /**
-     * Completely remove the second modules under courses
-     *
-     * This function is hooked into the admin_menu
-     *
-     * @since 1.8.0
-     * @return void
-     */
-    public function remove_courses_menu_model_taxonomy(){
-        global $submenu;
-
-        if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
-            return; // exit
-        }
-
-        $course_main_menu = $submenu['edit.php?post_type=course'];
-        foreach( $course_main_menu as $index => $sub_item ){
-
-            if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
-                unset( $submenu['edit.php?post_type=course'][ $index ]);
-            }
-        }
-
-    }// end remove courses module tax
-
-    /**
-     * Determine the author of a module term term by looking at
-     * the prefixed author id. This function will query the full term object.
-     * Will return the admin user author could not be determined.
-     *
-     * @since 1.8.0
-     *
-     * @param string $term_name
-     * @return array $owners { type WP_User }. Empty array if none if found.
-     */
-    public static function get_term_authors( $term_name ){
-
-        $terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
-
-        $owners = array();
-        if( empty( $terms ) ){
-
-            return $owners;
+	/**
+	 * Returns all lessons for the given module ID
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $course_id
+	 * @param $term_id
+	 * @return WP_Query $lessons_query
+	 */
+	public function get_lessons_query( $course_id , $term_id ){
+
+		if( empty( $term_id ) || empty( $course_id ) ){
+
+			return array();
+
+		}
+
+		$args = array(
+			'post_type' => 'lesson',
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'meta_query' => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => intval($course_id),
+					'compare' => '='
+				)
+			),
+			'tax_query' => array(
+				array(
+					'taxonomy' => 'module',
+					'field' => 'id',
+					'terms' => intval( $term_id )
+				)
+			),
+			'orderby' => 'menu_order',
+			'order' => 'ASC',
+			'suppress_filters' => 0
+		);
+
+		if (version_compare( Sensei()->version, '1.6.0', '>=')) {
+			$args['meta_key'] = '_order_module_' . intval( $term_id );
+			$args['orderby'] = 'meta_value_num date';
+		}
+
+		$lessons_query = new WP_Query( $args );
+
+		return $lessons_query;
+
+	} // end get lessons
+
+	/**
+	 * Find the lesson in the given course that doesn't belong
+	 * to any of the courses modules
+	 *
+	 *
+	 * @param $course_id
+	 *
+	 * @return array $non_module_lessons
+	 */
+	public function get_none_module_lessons( $course_id ){
+
+		$non_module_lessons = array();
+
+		//exit if there is no course id passed in
+		if( empty( $course_id ) || 'course' != get_post_type( $course_id ) ) {
+
+			return $non_module_lessons;
+		}
+
+		//save some time and check if we already have the saved
+		if( get_transient( 'sensei_'. $course_id .'_none_module_lessons') ){
+
+			return get_transient( 'sensei_'. $course_id .'_none_module_lessons');
+
+		}
+
+		// create terms array which must be excluded from other arrays
+		$course_modules = $this->get_course_modules( $course_id );
+
+		//exit if there are no module on this course
+		if( empty( $course_modules ) || ! is_array( $course_modules ) ){
+
+			return  Sensei()->course->course_lessons( $course_id );
+
+		}
+
+		$terms = array();
+		foreach( $course_modules as $module ){
+
+			array_push( $terms ,  $module->term_id );
+
+		}
+
+		$args = array(
+			'post_type' => 'lesson',
+			'post_status' => 'publish',
+			'posts_per_page' => -1,
+			'meta_query' => array(
+				array(
+					'key' => '_lesson_course',
+					'value' => intval( $course_id ),
+					'compare' => '='
+				)
+			),
+			'tax_query' => array(
+				array(
+					'taxonomy' => 'module',
+					'field' => 'id',
+					'terms' =>  $terms,
+					'operator' => 'NOT IN'
+				)
+			),
+			'orderby' => 'menu_order',
+			'order' => 'ASC',
+			'suppress_filters' => 0
+		);
+
+		$wp_lessons_query = new WP_Query( $args );
+
+		if( isset( $wp_lessons_query->posts) && count( $wp_lessons_query->posts ) > 0  ){
+			$non_module_lessons = $wp_lessons_query->get_posts();
+			set_transient( 'sensei_'. $course_id .'_none_module_lessons', $non_module_lessons, 10 * DAY_IN_SECONDS );
+		}
+
+		return $non_module_lessons;
+	} // end get_none_module_lessons
+
+	/**
+	 * Register the modules taxonomy
+	 *
+	 * @since 1.8.0
+	 */
+	public function setup_modules_taxonomy(){
+
+		$labels = array(
+			'name' => __('Modules', 'woothemes-sensei'),
+			'singular_name' => __('Module', 'woothemes-sensei'),
+			'search_items' => __('Search Modules', 'woothemes-sensei'),
+			'all_items' => __('All Modules', 'woothemes-sensei'),
+			'parent_item' => __('Parent Module', 'woothemes-sensei'),
+			'parent_item_colon' => __('Parent Module:', 'woothemes-sensei'),
+			'edit_item' => __('Edit Module', 'woothemes-sensei'),
+			'update_item' => __('Update Module', 'woothemes-sensei'),
+			'add_new_item' => __('Add New Module', 'woothemes-sensei'),
+			'new_item_name' => __('New Module Name', 'woothemes-sensei'),
+			'menu_name' => __('Modules', 'woothemes-sensei'),
+		);
+
+		/**
+		 * Filter to alter the Sensei Modules rewrite slug
+		 *
+		 * @since 1.8.0
+		 * @param string default 'modules'
+		 */
+		$modules_rewrite_slug = apply_filters('sensei_module_slug', 'modules');
+
+		$args = array(
+			'public' => true,
+			'hierarchical' => true,
+			'show_admin_column' => true,
+			'capabilities' => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_courses',
+				'delete_terms' => 'manage_categories',
+				'assign_terms' => 'edit_courses'
+			),
+			'show_in_nav_menus' => false,
+			'show_in_quick_edit' => false,
+			'show_ui' => true,
+			'rewrite' => array('slug' => $modules_rewrite_slug ),
+			'labels' => $labels
+		);
+
+		register_taxonomy( 'module' , array('course', 'lesson'), $args);
+
+	}// end setup_modules_taxonomy
+
+	/**
+	 * When the wants to edit the lesson modules redirect them to the course modules.
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	function redirect_to_lesson_module_taxonomy_to_course( ){
+
+		global $typenow , $taxnow;
+
+		if( 'lesson'== $typenow && 'module'==$taxnow ){
+			wp_safe_redirect( esc_url_raw( 'edit-tags.php?taxonomy=module&post_type=course'  ) );
+		}
+
+	}// end redirect to course taxonomy
+
+	/**
+	 * Completely remove the module menu item under lessons.
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function remove_lessons_menu_model_taxonomy(){
+		global $submenu;
+
+		if( ! isset( $submenu['edit.php?post_type=lesson'] ) || !is_array( $submenu['edit.php?post_type=lesson'] ) ){
+			return; // exit
+		}
+
+		$lesson_main_menu = $submenu['edit.php?post_type=lesson'];
+		foreach( $lesson_main_menu as $index => $sub_item ){
+
+			if( 'edit-tags.php?taxonomy=module&amp;post_type=lesson' == $sub_item[2] ){
+				unset( $submenu['edit.php?post_type=lesson'][ $index ]);
+			}
+		}
+
+	}// end remove lesson module tax
+
+	/**
+	 * Completely remove the second modules under courses
+	 *
+	 * This function is hooked into the admin_menu
+	 *
+	 * @since 1.8.0
+	 * @return void
+	 */
+	public function remove_courses_menu_model_taxonomy(){
+		global $submenu;
+
+		if( ! isset( $submenu['edit.php?post_type=course'] ) || !is_array( $submenu['edit.php?post_type=course'] ) ){
+			return; // exit
+		}
+
+		$course_main_menu = $submenu['edit.php?post_type=course'];
+		foreach( $course_main_menu as $index => $sub_item ){
+
+			if( 'edit-tags.php?taxonomy=module&amp;post_type=course' == $sub_item[2] ){
+				unset( $submenu['edit.php?post_type=course'][ $index ]);
+			}
+		}
+
+	}// end remove courses module tax
+
+	/**
+	 * Determine the author of a module term term by looking at
+	 * the prefixed author id. This function will query the full term object.
+	 * Will return the admin user author could not be determined.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param string $term_name
+	 * @return array $owners { type WP_User }. Empty array if none if found.
+	 */
+	public static function get_term_authors( $term_name ){
+
+		$terms = get_terms( array( 'module') , array( 'name__like'=>$term_name, 'hide_empty' => false )  );
+
+		$owners = array();
+		if( empty( $terms ) ){
+
+			return $owners;
 
-        }
+		}
 
-        // setup the admin user
+		// setup the admin user
 
 
-        //if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
-        foreach( $terms as $term){
-            if( $term->name == $term_name ){
+		//if there are more handle them appropriately and get the ones we really need that matches the desired name exactly
+		foreach( $terms as $term){
+			if( $term->name == $term_name ){
 
-                // look for the author in the slug
-                $owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
+				// look for the author in the slug
+				$owners[] = Sensei_Core_Modules::get_term_author( $term->slug  );
 
-            }// end if term name
+			}// end if term name
 
-        } // end for each
+		} // end for each
 
-        return $owners;
+		return $owners;
 
-    }// end get_term_author
+	}// end get_term_author
 
-    /**
-     * Looks at a term slug and figures out
-     * which author created the slug. The author was
-     * appended when the user saved the module term in the course edit
-     * screen.
-     *
-     * @since 1.8.0
-     *
-     * @param $slug
-     * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
-     */
-    public static function get_term_author( $slug='' ){
+	/**
+	 * Looks at a term slug and figures out
+	 * which author created the slug. The author was
+	 * appended when the user saved the module term in the course edit
+	 * screen.
+	 *
+	 * @since 1.8.0
+	 *
+	 * @param $slug
+	 * @return WP_User $author if no author is found or invalid term is passed the admin user will be returned.
+	 */
+	public static function get_term_author( $slug='' ){
 
-        $term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
+		$term_owner = get_user_by( 'email', get_bloginfo( 'admin_email' ) );
 
-        if( empty( $slug ) ){
+		if( empty( $slug ) ){
 
-            return $term_owner;
+			return $term_owner;
 
-        }
+		}
 
-        // look for the author in the slug
-        $slug_parts = explode( '-', $slug );
+		// look for the author in the slug
+		$slug_parts = explode( '-', $slug );
 
-        if( count( $slug_parts ) > 1 ){
+		if( count( $slug_parts ) > 1 ){
 
-            // get the user data
-            $possible_user_id = $slug_parts[0];
-            $author = get_userdata( $possible_user_id );
+			// get the user data
+			$possible_user_id = $slug_parts[0];
+			$author = get_userdata( $possible_user_id );
 
-            // if the user doesnt exist for the first part of the slug
-            // then this slug was also created by admin
-            if( is_a( $author, 'WP_User' ) ){
+			// if the user doesnt exist for the first part of the slug
+			// then this slug was also created by admin
+			if( is_a( $author, 'WP_User' ) ){
 
-                $term_owner =  $author;
+				$term_owner =  $author;
 
-            }
-        }
+			}
+		}
 
-        return $term_owner;
-    }
+		return $term_owner;
+	}
 
-    /**
-     * Display the Sensei modules taxonomy terms metabox
-     *
-     * @since 1.8.0
-     *
-     * @hooked into add_meta_box
-     *
-     * @param WP_Post $post Post object.
-     */
-    public function course_module_metabox( $post ) {
+	/**
+	 * Display the Sensei modules taxonomy terms metabox
+	 *
+	 * @since 1.8.0
+	 *
+	 * @hooked into add_meta_box
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public function course_module_metabox( $post ) {
 
-        $tax_name = 'module';
-        $taxonomy = get_taxonomy( 'module' );
+		$tax_name = 'module';
+		$taxonomy = get_taxonomy( 'module' );
 
-        ?>
+		?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
@@ -1742,9 +1742,9 @@ 
 
             <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
                 <?php
-                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-                echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-                ?>
+				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+				?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
                     <?php wp_terms_checklist( $post->ID, array( 'taxonomy'=>$tax_name , 'popular_cats' => $popular_ids ) ); ?>
                 </ul>
@@ -1754,9 +1754,9 @@ 
                     <h4>
                         <a id="sensei-<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
                             <?php
-                            /* translators: %s: add new taxonomy label */
-                            printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
-                            ?>
+							/* translators: %s: add new taxonomy label */
+							printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+							?>
                         </a>
                     </h4>
                     <p id="sensei-<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
@@ -1771,331 +1771,331 @@ 
         </div>
     <?php
 
-    } // end course_module_metabox
+	} // end course_module_metabox
 
 
-    /**
-     * Submits a new module term prefixed with the
-     * the current author id.
-     *
-     * @since 1.8.0
-     */
-    public static function add_new_module_term( ) {
+	/**
+	 * Submits a new module term prefixed with the
+	 * the current author id.
+	 *
+	 * @since 1.8.0
+	 */
+	public static function add_new_module_term( ) {
 
 
-        if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
-            wp_send_json_error( array('error'=> 'wrong security nonce') );
-        }
+		if( ! isset( $_POST[ 'security' ] ) || ! wp_verify_nonce( $_POST[ 'security' ], '_ajax_nonce-add-module'  ) ){
+			wp_send_json_error( array('error'=> 'wrong security nonce') );
+		}
 
-        // get the term an create the new term storing infomration
-        $term_name = sanitize_text_field( $_POST['newTerm'] );
+		// get the term an create the new term storing infomration
+		$term_name = sanitize_text_field( $_POST['newTerm'] );
 
-        if( current_user_can('manage_options' ) ) {
+		if( current_user_can('manage_options' ) ) {
 
-            $term_slug = str_ireplace(' ', '-', trim( $term_name ) );
+			$term_slug = str_ireplace(' ', '-', trim( $term_name ) );
 
-        } else {
+		} else {
 
-            $term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
+			$term_slug =  get_current_user_id() . '-' . str_ireplace(' ', '-', trim( $term_name ) );
 
-        }
+		}
 
-        $course_id = sanitize_text_field( $_POST['course_id'] );
+		$course_id = sanitize_text_field( $_POST['course_id'] );
 
-        // save the term
-        $slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
+		// save the term
+		$slug = wp_insert_term( $term_name,'module', array('slug'=> $term_slug)  );
 
-        // send error for all errors except term exits
-        if( is_wp_error( $slug ) ){
+		// send error for all errors except term exits
+		if( is_wp_error( $slug ) ){
 
-            // prepare for possible term name and id to be passed down if term exists
-            $term_data = array();
+			// prepare for possible term name and id to be passed down if term exists
+			$term_data = array();
 
-            // if term exists also send back the term name and id
-            if( isset( $slug->errors['term_exists'] ) ){
+			// if term exists also send back the term name and id
+			if( isset( $slug->errors['term_exists'] ) ){
 
-                $term = get_term_by( 'slug', $term_slug, 'module');
-                $term_data['name'] = $term_name;
-                $term_data['id'] = $term->term_id;
+				$term = get_term_by( 'slug', $term_slug, 'module');
+				$term_data['name'] = $term_name;
+				$term_data['id'] = $term->term_id;
 
-                // set the object terms
-                wp_set_object_terms( $course_id, $term->term_id, 'module', true );
-            }
+				// set the object terms
+				wp_set_object_terms( $course_id, $term->term_id, 'module', true );
+			}
 
-            wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
+			wp_send_json_error(array( 'errors'=>$slug->errors , 'term'=> $term_data ) );
 
-        }
+		}
 
-        //make sure the new term is checked for this course
+		//make sure the new term is checked for this course
 
-        wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
+		wp_set_object_terms( $course_id, $slug['term_id'], 'module', true );
 
-        // Handle request then generate response using WP_Ajax_Response
-        wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
+		// Handle request then generate response using WP_Ajax_Response
+		wp_send_json_success( array( 'termId' => $slug['term_id'], 'termName' => $term_name ) );
 
-    }
+	}
 
-    /**
-     * Limit the course module metabox
-     * term list to only those on courses belonging to current teacher.
-     *
-     * Hooked into 'get_terms'
-     *
-     * @since 1.8.0
-     */
-    public function filter_module_terms( $terms, $taxonomies, $args ){
+	/**
+	 * Limit the course module metabox
+	 * term list to only those on courses belonging to current teacher.
+	 *
+	 * Hooked into 'get_terms'
+	 *
+	 * @since 1.8.0
+	 */
+	public function filter_module_terms( $terms, $taxonomies, $args ){
 
-        //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
-            return $terms;
-        }
+		//dont limit for admins and other taxonomies. This should also only apply to admin
+		if( current_user_can( 'manage_options' ) || !in_array( 'module', $taxonomies ) || ! is_admin()  ){
+			return $terms;
+		}
 
-        // avoid infinite call loop
-        remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		// avoid infinite call loop
+		remove_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
 
-        // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
-            // change only scrub the terms ids form the array keys
-            $terms = array_keys( $terms );
-        }
+		// in certain cases the array is passed in as reference to the parent term_id => parent_id
+		if( isset( $args['fields'] ) && 'id=>parent' == $args['fields'] ){
+			// change only scrub the terms ids form the array keys
+			$terms = array_keys( $terms );
+		}
 
-        $teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
+		$teachers_terms =  $this->filter_terms_by_owner( $terms, get_current_user_id() );
 
-        // add filter again as removed above
-        add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
+		// add filter again as removed above
+		add_filter('get_terms', array( $this, 'filter_module_terms' ), 20, 3 );
 
-        return $teachers_terms;
-    }// end filter_module_terms
+		return $teachers_terms;
+	}// end filter_module_terms
 
-    /**
-     * For the selected items on a course module only return those
-     * for the current user. This does not apply to admin and super admin users.
-     *
-     * hooked into get_object_terms
-     *
-     * @since 1.8.0
-     */
-    public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
+	/**
+	 * For the selected items on a course module only return those
+	 * for the current user. This does not apply to admin and super admin users.
+	 *
+	 * hooked into get_object_terms
+	 *
+	 * @since 1.8.0
+	 */
+	public function filter_course_selected_terms( $terms, $course_ids_array, $taxonomies ){
 
-        //dont limit for admins and other taxonomies. This should also only apply to admin
-        if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
-            // only apply this to module only taxonomy queries so 1 taxonomy only:
-            ||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
-            return $terms;
-        }
+		//dont limit for admins and other taxonomies. This should also only apply to admin
+		if( current_user_can( 'manage_options' ) || ! is_admin() || empty( $terms )
+			// only apply this to module only taxonomy queries so 1 taxonomy only:
+			||  count( $taxonomies ) > 1 || !in_array( 'module', $taxonomies )  ){
+			return $terms;
+		}
 
-        $term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
+		$term_objects = $this->filter_terms_by_owner( $terms, get_current_user_id() );
 
-        // if term objects were passed in send back objects
-        // if term id were passed in send that back
-        if( is_object( $terms[0] ) ){
-            return $term_objects;
-        }
+		// if term objects were passed in send back objects
+		// if term id were passed in send that back
+		if( is_object( $terms[0] ) ){
+			return $term_objects;
+		}
 
-        $terms = array();
-        foreach( $term_objects as $term_object ){
-            $terms[] = $term_object->term_id;
-        }
+		$terms = array();
+		foreach( $term_objects as $term_object ){
+			$terms[] = $term_object->term_id;
+		}
 
-        return $terms;
+		return $terms;
 
 
-    }// end filter_course_selected_terms
+	}// end filter_course_selected_terms
 
-    /**
-     * Filter the given terms and only return the
-     * terms that belong to the given user id.
-     *
-     * @since 1.8.0
-     * @param $terms
-     * @param $user_id
-     * @return array
-     */
-    public function filter_terms_by_owner( $terms, $user_id ){
+	/**
+	 * Filter the given terms and only return the
+	 * terms that belong to the given user id.
+	 *
+	 * @since 1.8.0
+	 * @param $terms
+	 * @param $user_id
+	 * @return array
+	 */
+	public function filter_terms_by_owner( $terms, $user_id ){
 
-        $users_terms = array();
+		$users_terms = array();
 
-        foreach( $terms as $index => $term ){
+		foreach( $terms as $index => $term ){
 
-            if( is_numeric( $term ) ){
-                // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
-            }
+			if( is_numeric( $term ) ){
+				// the term id was given, get the term object
+				$term = get_term( $term, 'module' );
+			}
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+			$author = Sensei_Core_Modules::get_term_author( $term->slug );
 
-            if ( $user_id == $author->ID ) {
-                // add the term to the teachers terms
-                $users_terms[] = $term;
-            }
+			if ( $user_id == $author->ID ) {
+				// add the term to the teachers terms
+				$users_terms[] = $term;
+			}
 
-        }
+		}
 
-        return $users_terms;
+		return $users_terms;
 
-    } // end filter terms by owner
+	} // end filter terms by owner
 
-    /**
-     * Add the teacher name next to modules. Only works in Admin for Admin users.
-     * This will not add name to terms belonging to admin user.
-     *
-     * Hooked into 'get_terms'
-     *
-     * @since 1.8.0
-     */
-    public function append_teacher_name_to_module( $terms, $taxonomies, $args )
-    {
+	/**
+	 * Add the teacher name next to modules. Only works in Admin for Admin users.
+	 * This will not add name to terms belonging to admin user.
+	 *
+	 * Hooked into 'get_terms'
+	 *
+	 * @since 1.8.0
+	 */
+	public function append_teacher_name_to_module( $terms, $taxonomies, $args )
+	{
 
-        // only for admin users ont he module taxonomy
-        if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
-            return $terms;
-        }
+		// only for admin users ont he module taxonomy
+		if ( empty( $terms ) || !current_user_can('manage_options') || !in_array('module', $taxonomies) || !is_admin()) {
+			return $terms;
+		}
 
-        // in certain cases the array is passed in as reference to the parent term_id => parent_id
-        // simply return this as wp doesn't need an array of stdObject Term
-        if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
+		// in certain cases the array is passed in as reference to the parent term_id => parent_id
+		// simply return this as wp doesn't need an array of stdObject Term
+		if (isset( $args['fields'] ) && 'id=>parent' == $args['fields']) {
 
-            return $terms;
+			return $terms;
 
-        }
+		}
 
-        // loop through and update all terms adding the author name
-        foreach( $terms as $index => $term ){
+		// loop through and update all terms adding the author name
+		foreach( $terms as $index => $term ){
 
-            if( is_numeric( $term ) ){
-                // the term id was given, get the term object
-                $term = get_term( $term, 'module' );
-            }
+			if( is_numeric( $term ) ){
+				// the term id was given, get the term object
+				$term = get_term( $term, 'module' );
+			}
 
-            $author = Sensei_Core_Modules::get_term_author( $term->slug );
+			$author = Sensei_Core_Modules::get_term_author( $term->slug );
 
-            if( ! user_can( $author, 'manage_options' ) ) {
-                $term->name = $term->name . ' (' . $author->display_name . ') ';
-            }
+			if( ! user_can( $author, 'manage_options' ) ) {
+				$term->name = $term->name . ' (' . $author->display_name . ') ';
+			}
 
-            // add the term to the teachers terms
-            $users_terms[] = $term;
+			// add the term to the teachers terms
+			$users_terms[] = $term;
 
-        }
+		}
 
-        return $users_terms;
-    }
+		return $users_terms;
+	}
 
-    /**
-     * Remove modules metabox that come by default
-     * with the modules taxonomy. We are removing this as
-     * we have created our own custom meta box.
-     */
-    public static function remove_default_modules_box() {
+	/**
+	 * Remove modules metabox that come by default
+	 * with the modules taxonomy. We are removing this as
+	 * we have created our own custom meta box.
+	 */
+	public static function remove_default_modules_box() {
 
-        remove_meta_box('modulediv', 'course', 'side');
+		remove_meta_box('modulediv', 'course', 'side');
 
-    }
+	}
 
-    /**
-     * When a course is save make sure to reset the transient set
-     * for it when determining the none module lessons.
-     *
-     * @sine 1.9.0
-     * @param $post_id
-     */
-    public static function reset_none_modules_transient ( $post_id ){
+	/**
+	 * When a course is save make sure to reset the transient set
+	 * for it when determining the none module lessons.
+	 *
+	 * @sine 1.9.0
+	 * @param $post_id
+	 */
+	public static function reset_none_modules_transient ( $post_id ){
 
-        // this should only apply to course and lesson post types
-        if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
+		// this should only apply to course and lesson post types
+		if( in_array( get_post_type( $post_id ), array( 'course', 'lesson' ) ) ){
 
-            $course_id = '';
+			$course_id = '';
 
-            if( 'lesson' == get_post_type( $post_id ) ){
+			if( 'lesson' == get_post_type( $post_id ) ){
 
-                $course_id = Sensei()->lesson->get_course_id( $post_id );
+				$course_id = Sensei()->lesson->get_course_id( $post_id );
 
-            }
+			}
 
 
-            if( !empty( $course_id ) ){
+			if( !empty( $course_id ) ){
 
-                delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
+				delete_transient( 'sensei_'. $course_id .'_none_module_lessons' );
 
-            }
+			}
 
-        } // end if is a course or a lesson
+		} // end if is a course or a lesson
 
-    } // end reset_none_modules_transient
+	} // end reset_none_modules_transient
 
-    /**
-     * This function calls the deprecated hook 'sensei_single_course_modules_content' to fire
-     *
-     * @since 1.9.0
-     * @deprecated since 1.9.0
-     *
-     */
-    public static function deprecate_sensei_single_course_modules_content(){
+	/**
+	 * This function calls the deprecated hook 'sensei_single_course_modules_content' to fire
+	 *
+	 * @since 1.9.0
+	 * @deprecated since 1.9.0
+	 *
+	 */
+	public static function deprecate_sensei_single_course_modules_content(){
 
-        sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
+		sensei_do_deprecated_action( 'sensei_single_course_modules_content','1.9.0','sensei_single_course_modules_before or sensei_single_course_modules_after' );
 
-    }
+	}
 
-    /**
-     * Setup the single course module loop.
-     *
-     * Setup the global $sensei_modules_loop
-     *
-     * @since 1.9.0
-     */
-    public static function setup_single_course_module_loop(){
+	/**
+	 * Setup the single course module loop.
+	 *
+	 * Setup the global $sensei_modules_loop
+	 *
+	 * @since 1.9.0
+	 */
+	public static function setup_single_course_module_loop(){
 
-        global $sensei_modules_loop, $post;
-        $course_id = $post->ID;
+		global $sensei_modules_loop, $post;
+		$course_id = $post->ID;
 
-        $modules = Sensei()->modules->get_course_modules( $course_id );
+		$modules = Sensei()->modules->get_course_modules( $course_id );
 
-        //initial setup
-        $sensei_modules_loop['total'] = 0;
-        $sensei_modules_loop['modules'] = array();
-        $sensei_modules_loop['current'] = -1;
+		//initial setup
+		$sensei_modules_loop['total'] = 0;
+		$sensei_modules_loop['modules'] = array();
+		$sensei_modules_loop['current'] = -1;
 
-        // exit if this course doesn't have modules
-        if( !$modules || empty( $modules )  ){
-            return;
-        }
+		// exit if this course doesn't have modules
+		if( !$modules || empty( $modules )  ){
+			return;
+		}
 
 
-        $lessons_in_all_modules = array();
-        foreach( $modules as $term ){
+		$lessons_in_all_modules = array();
+		foreach( $modules as $term ){
 
-            $lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
-            $lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
+			$lessons_in_this_module = Sensei()->modules->get_lessons( $course_id , $term->term_id);
+			$lessons_in_all_modules = array_merge(  $lessons_in_all_modules, $lessons_in_this_module  );
 
-        }
+		}
 
 
-        //setup all of the modules loop variables
-        $sensei_modules_loop['total'] = count( $modules );
-        $sensei_modules_loop['modules'] = $modules;
-        $sensei_modules_loop['current'] = -1;
-        $sensei_modules_loop['course_id'] = $course_id;
+		//setup all of the modules loop variables
+		$sensei_modules_loop['total'] = count( $modules );
+		$sensei_modules_loop['modules'] = $modules;
+		$sensei_modules_loop['current'] = -1;
+		$sensei_modules_loop['course_id'] = $course_id;
 
-    }// end setup_single_course_module_loop
+	}// end setup_single_course_module_loop
 
-    /**
-     * Tear down the course module loop.
-     *
-     * @since 1.9.0
-     *
-     */
-    public static function teardown_single_course_module_loop(){
+	/**
+	 * Tear down the course module loop.
+	 *
+	 * @since 1.9.0
+	 *
+	 */
+	public static function teardown_single_course_module_loop(){
 
-        global $sensei_modules_loop, $wp_query, $post;
+		global $sensei_modules_loop, $wp_query, $post;
 
-        //reset all of the modules loop variables
-        $sensei_modules_loop['total'] = 0;
-        $sensei_modules_loop['modules'] = array();
-        $sensei_modules_loop['current'] = -1;
+		//reset all of the modules loop variables
+		$sensei_modules_loop['total'] = 0;
+		$sensei_modules_loop['modules'] = array();
+		$sensei_modules_loop['current'] = -1;
 
-        // set the current course to be the global post again
-        wp_reset_query();
-        $post = $wp_query->post;
-    }// end teardown_single_course_module_loop
+		// set the current course to be the global post again
+		wp_reset_query();
+		$post = $wp_query->post;
+	}// end teardown_single_course_module_loop
 
 } // end modules class

Doc Comments +4 added lines

@@ -21,6 +21,9 @@ 
     private $order_page_slug;
     public $taxonomy;
 
+    /**
+     * @param string $file
+     */
     public function __construct( $file )
     {
         $this->file = $file;
@@ -1942,6 +1945,7 @@ 
      * Hooked into 'get_terms'
      *
      * @since 1.8.0
+     * @param string[] $taxonomies
      */
     public function append_teacher_name_to_module( $terms, $taxonomies, $args )
     {

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

Braces +8 added lines, -9 removed lines

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

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-grading-user-quiz.php

Indentation +8 added lines, -8 removed lines

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

Braces +5 added lines, -3 removed lines

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

Spacing +79 added lines, -79 removed lines

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