woothemes / sensei

includes/class-sensei-autoloader.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// security check, don't load file outside WP
 /**
  * Sensei Autoloader Class
  *

Spacing +21 added lines, -21 removed lines

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

Indentation +131 added lines, -131 removed lines

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

includes/class-sensei-posttypes.php

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';
 

Spacing +237 added lines, -237 removed lines

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

Indentation +245 added lines, -245 removed lines

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

includes/class-sensei-notices.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Notices Class
@@ -13,7 +13,7 @@ 
  * @since 1.6.3
  */
 
-class Sensei_Notices{
+class Sensei_Notices {
 
 	/**
 	*  @var $notices
@@ -23,7 +23,7 @@ 
 	/**
 	*  constructor 
  	*/
-	public function __construct(){
+	public function __construct() {
 		//initialize the notices variable
 		$this->notices = array();
 	}
@@ -39,9 +39,9 @@ 
 	* @return void
 	*/
 
-	public function add_notice( $content ,  $type = 'alert'   ){
+	public function add_notice($content, $type = 'alert') {
 		// append the new notice
-		$this->notices[] = array('content' => $content , 'type'=> $type );
+		$this->notices[] = array('content' => $content, 'type'=> $type);
 	} // end add_notice()
 
 	/**
@@ -53,12 +53,12 @@ 
 	* @return void
 	*/
 
-	public function print_notices(){
-		if(  count( $this->notices ) > 0  ){
+	public function print_notices() {
+		if (count($this->notices) > 0) {
 			foreach ($this->notices  as  $notice) {
 
-				$classes = 'sensei-message '. $notice['type'];
-				$html = '<div class="'. $classes . '">'. $notice['content'] . '</div>';
+				$classes = 'sensei-message '.$notice['type'];
+				$html = '<div class="'.$classes.'">'.$notice['content'].'</div>';
 
 				echo $html; 
 			}
@@ -73,7 +73,7 @@ 
 	* @return void
 	*/
 
-	public function clear_notices(){
+	public function clear_notices() {
 		// assign an empty array to clear all existing notices
 		$this->notices = array();
 	} // end clear_notices()
@@ -85,4 +85,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class Woothemes_Sensei_Notices extends Sensei_Notices{}
+class Woothemes_Sensei_Notices extends Sensei_Notices {}

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

Doc Comments -8 removed lines

@@ -33,10 +33,6 @@ 
 	* 
 	*
 	* 
-	* @param string $message 
-	* @param string $type defaults to alert options( alert, tick , download , info   )
-	*
-	* @return void
 	*/
 
 	public function add_notice( $content ,  $type = 'alert'   ){
@@ -47,10 +43,6 @@ 
 	/**
 	*  Output all notices added 
 	* 
-	* @param string $message 
-	* @param string $type
-	*
-	* @return void
 	*/
 
 	public function print_notices(){

Indentation +24 added lines, -24 removed lines

@@ -16,28 +16,28 @@ 
 class Sensei_Notices{
 
 	/**
-	*  @var $notices
-	*/
+	 *  @var $notices
+	 */
 	protected $notices;
 
 	/**
-	*  constructor 
- 	*/
+	 *  constructor 
+	 */
 	public function __construct(){
 		//initialize the notices variable
 		$this->notices = array();
 	}
 
 	/**
-	*  Add a notice to the array of notices for display at a later stage.
-	* 
-	*
-	* 
-	* @param string $message 
-	* @param string $type defaults to alert options( alert, tick , download , info   )
-	*
-	* @return void
-	*/
+	 *  Add a notice to the array of notices for display at a later stage.
+	 * 
+	 *
+	 * 
+	 * @param string $message 
+	 * @param string $type defaults to alert options( alert, tick , download , info   )
+	 *
+	 * @return void
+	 */
 
 	public function add_notice( $content ,  $type = 'alert'   ){
 		// append the new notice
@@ -45,13 +45,13 @@ 
 	} // end add_notice()
 
 	/**
-	*  Output all notices added 
-	* 
-	* @param string $message 
-	* @param string $type
-	*
-	* @return void
-	*/
+	 *  Output all notices added 
+	 * 
+	 * @param string $message 
+	 * @param string $type
+	 *
+	 * @return void
+	 */
 
 	public function print_notices(){
 		if(  count( $this->notices ) > 0  ){
@@ -68,10 +68,10 @@ 
 	} // end print_notice()
 
 	/**
-	*  Clear all notices  
-	* 
-	* @return void
-	*/
+	 *  Clear all notices  
+	 * 
+	 * @return void
+	 */
 
 	public function clear_notices(){
 		// assign an empty array to clear all existing notices

includes/emails/class-woothemes-sensei-email-teacher-completed-lesson.php

Spacing +12 added lines, -12 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_Completed_Lesson' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Teacher_Completed_Lesson')) :
 
 /**
  * Teacher Completed Lesson
@@ -31,8 +31,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'teacher-completed-lesson';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your student has completed a lesson', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has completed a lesson', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your student has completed a lesson', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your student has completed a lesson', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -41,31 +41,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $learner_id = 0, $lesson_id = 0 ) {
+	function trigger($learner_id = 0, $lesson_id = 0) {
 		global $sensei_email_data;
 
 		// Get learner user object
-		$this->learner = new WP_User( $learner_id );
+		$this->learner = new WP_User($learner_id);
 
 		// Get teacher ID and user object
-		$teacher_id = get_post_field( 'post_author', $lesson_id, 'raw' );
-		$this->teacher = new WP_User( $teacher_id );
+		$teacher_id = get_post_field('post_author', $lesson_id, 'raw');
+		$this->teacher = new WP_User($teacher_id);
 
         // Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $teacher_id,
 			'learner_id'		=> $learner_id,
 			'learner_name'		=> $this->learner->display_name,
 			'lesson_id'			=> $lesson_id,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (teacher)
-		$this->recipient = stripslashes( $this->teacher->user_email );
+		$this->recipient = stripslashes($this->teacher->user_email);
 
 		// Send mail
-        Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+        Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

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

Indentation +5 added lines, -5 removed lines

@@ -35,9 +35,9 @@ 
 	/**
 	 * trigger function.
 	 *
-     * @param int $learner_id
-     * @param int $lesson_id
-     *
+	 * @param int $learner_id
+	 * @param int $lesson_id
+	 *
 	 * @return void
 	 */
 	function trigger( $learner_id = 0, $lesson_id = 0 ) {
@@ -51,7 +51,7 @@ 
 		$teacher_id = get_post_field( 'post_author', $lesson_id, 'raw' );
 		$this->teacher = new WP_User( $teacher_id );
 
-        // Construct data array
+		// Construct data array
 		$sensei_email_data = apply_filters( 'sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
@@ -65,7 +65,7 @@ 
 		$this->recipient = stripslashes( $this->teacher->user_email );
 
 		// Send mail
-        Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
 	}
 }
 

includes/emails/class-woothemes-sensei-email-teacher-quiz-submitted.php

Spacing +14 added lines, -14 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_Quiz_Submitted' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Teacher_Quiz_Submitted')) :
 
 /**
  * Teacher Quiz Submitted
@@ -31,8 +31,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'teacher-quiz-submitted';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your student has submitted a quiz for grading', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has submitted a quiz for grading', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your student has submitted a quiz for grading', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your student has submitted a quiz for grading', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -41,20 +41,20 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $learner_id = 0, $quiz_id = 0 ) {
+	function trigger($learner_id = 0, $quiz_id = 0) {
 		global  $sensei_email_data;
 
 		// Get learner user object
-		$this->learner = new WP_User( $learner_id );
+		$this->learner = new WP_User($learner_id);
 
 		// Get teacher ID and user object
-        $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-        $course_id = get_post_meta( $lesson_id, '_lesson_course', true );
-		$teacher_id = get_post_field( 'post_author', $course_id, 'raw' );
-		$this->teacher = new WP_User( $teacher_id );
+        $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
+		$teacher_id = get_post_field('post_author', $course_id, 'raw');
+		$this->teacher = new WP_User($teacher_id);
 
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $teacher_id,
@@ -62,13 +62,13 @@ 
 			'learner_name'		=> $this->learner->display_name,
 			'quiz_id'			=> $quiz_id,
 			'lesson_id'			=> $lesson_id,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (teacher)
-		$this->recipient = stripslashes( $this->teacher->user_email );
+		$this->recipient = stripslashes($this->teacher->user_email);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

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

Indentation +6 added lines, -6 removed lines

@@ -34,10 +34,10 @@ 
 
 	/**
 	 * trigger function.
-     *
-     * @param integer $learner_id
-     * @param integer $quiz_id
-     *
+	 *
+	 * @param integer $learner_id
+	 * @param integer $quiz_id
+	 *
 	 * @return void
 	 */
 	function trigger( $learner_id = 0, $quiz_id = 0 ) {
@@ -47,8 +47,8 @@ 
 		$this->learner = new WP_User( $learner_id );
 
 		// Get teacher ID and user object
-        $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-        $course_id = get_post_meta( $lesson_id, '_lesson_course', true );
+		$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
+		$course_id = get_post_meta( $lesson_id, '_lesson_course', true );
 		$teacher_id = get_post_field( 'post_author', $course_id, 'raw' );
 		$this->teacher = new WP_User( $teacher_id );
 

includes/emails/class-woothemes-sensei-email-teacher-new-message.php

Spacing +21 added lines, -21 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_New_Message' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Teacher_New_Message')) :
 
 /**
  * Teacher New Message
@@ -32,8 +32,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'teacher-new-message';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] You have received a new private message', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has sent you a private message', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] You have received a new private message', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your student has sent you a private message', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -42,29 +42,29 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $message_id = 0 ) {
+	function trigger($message_id = 0) {
 		global  $sensei_email_data;
 
-		$this->message = get_post( $message_id );
+		$this->message = get_post($message_id);
 
-		$learner_username = get_post_meta( $message_id, '_sender', true );
-		$this->learner = get_user_by( 'login', $learner_username );
+		$learner_username = get_post_meta($message_id, '_sender', true);
+		$this->learner = get_user_by('login', $learner_username);
 
-		$teacher_username = get_post_meta( $message_id, '_receiver', true );
-		$this->teacher = get_user_by( 'login', $teacher_username );
+		$teacher_username = get_post_meta($message_id, '_receiver', true);
+		$this->teacher = get_user_by('login', $teacher_username);
 
-		$content_type = get_post_meta( $message_id, '_posttype', true );
-		$content_id = get_post_meta( $message_id, '_post', true );
-		$content_title = get_the_title( $content_id );
+		$content_type = get_post_meta($message_id, '_posttype', true);
+		$content_id = get_post_meta($message_id, '_post', true);
+		$content_title = get_the_title($content_id);
 
         // setup the post type parameter
-        $content_type = get_post_type( $content_id );
-        if( !$content_type ){
-            $content_type ='';
+        $content_type = get_post_type($content_id);
+        if ( ! $content_type) {
+            $content_type = '';
         }
 
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
             $content_type.'_id' => $content_id,
 			'heading'			=> $this->heading,
@@ -75,15 +75,15 @@ 
 			'message'			=> $this->message->post_content,
 			'content_title'		=> $content_title,
 			'content_type'		=> $content_type,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (teacher)
-		$this->recipient = stripslashes( $this->teacher->user_email );
+		$this->recipient = stripslashes($this->teacher->user_email);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 
-		wp_safe_redirect( esc_url_raw( add_query_arg( array( 'send' => 'complete' ) ) ) );
+		wp_safe_redirect(esc_url_raw(add_query_arg(array('send' => 'complete'))));
 		exit;
 	}
 }

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

Indentation +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 	 * trigger function.
 	 *
 	 * @access public
-     * @param integer $message_id
+	 * @param integer $message_id
 	 * @return void
 	 */
 	function trigger( $message_id = 0 ) {
@@ -55,16 +55,16 @@ 
 		$content_id = get_post_meta( $message_id, '_post', true );
 		$content_title = get_the_title( $content_id );
 
-        // setup the post type parameter
-        $content_type = get_post_type( $content_id );
-        if( !$content_type ){
-            $content_type ='';
-        }
+		// setup the post type parameter
+		$content_type = get_post_type( $content_id );
+		if( !$content_type ){
+			$content_type ='';
+		}
 
 		// Construct data array
 		$sensei_email_data = apply_filters( 'sensei_email_data', array(
 			'template'			=> $this->template,
-            $content_type.'_id' => $content_id,
+			$content_type.'_id' => $content_id,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $this->teacher->ID,
 			'learner_id'		=> $this->learner->ID,

includes/emails/class-woothemes-sensei-email-teacher-started-course.php

Spacing +12 added lines, -12 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_Started_Course' ) ) :
+if ( ! class_exists('WooThemes_Sensei_Email_Teacher_Started_Course')) :
 
 /**
  * Teacher Started Course
@@ -31,8 +31,8 @@ 
 	 */
 	function __construct() {
 		$this->template = 'teacher-started-course';
-		$this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your student has started a course', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template );
-		$this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has started a course', 'woothemes-sensei' ), $this->template );
+		$this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your student has started a course', 'woothemes-sensei'), get_bloginfo('name')), $this->template);
+		$this->heading = apply_filters('sensei_email_heading', __('Your student has started a course', 'woothemes-sensei'), $this->template);
 	}
 
 	/**
@@ -41,31 +41,31 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function trigger( $learner_id = 0, $course_id = 0 ) {
+	function trigger($learner_id = 0, $course_id = 0) {
 		global  $sensei_email_data;
 
 		// Get learner user object
-		$this->learner = new WP_User( $learner_id );
+		$this->learner = new WP_User($learner_id);
 
 		// Get teacher ID and user object
-		$teacher_id = get_post_field( 'post_author', $course_id, 'raw' );
-		$this->teacher = new WP_User( $teacher_id );
+		$teacher_id = get_post_field('post_author', $course_id, 'raw');
+		$this->teacher = new WP_User($teacher_id);
 
 		// Construct data array
-		$sensei_email_data = apply_filters( 'sensei_email_data', array(
+		$sensei_email_data = apply_filters('sensei_email_data', array(
 			'template'			=> $this->template,
 			'heading'			=> $this->heading,
 			'teacher_id'		=> $teacher_id,
 			'learner_id'		=> $learner_id,
 			'learner_name'		=> $this->learner->display_name,
 			'course_id'			=> $course_id,
-		), $this->template );
+		), $this->template);
 
 		// Set recipient (learner)
-		$this->recipient = stripslashes( $this->teacher->user_email );
+		$this->recipient = stripslashes($this->teacher->user_email);
 
 		// Send mail
-		Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) );
+		Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template));
 	}
 }
 

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

Indentation +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
 	/**
 	 * trigger function.
 	 *
-     * @param int $learner_id
-     * @param int $course_id
-     *
+	 * @param int $learner_id
+	 * @param int $course_id
+	 *
 	 * @return void
 	 */
 	function trigger( $learner_id = 0, $course_id = 0 ) {

includes/class-sensei-analysis.php

Braces +13 added lines, -19 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 Class
@@ -153,24 +156,19 @@ 
 		if ( 0 < $lesson_id ) {
 			// Viewing a specific Lesson and all its Learners
 			$this->analysis_lesson_users_view( $lesson_id );
-		}
-		elseif ( 0 < $course_id && !$user_id && 'user' == $type ) {
+		} elseif ( 0 < $course_id && !$user_id && 'user' == $type ) {
 			// Viewing a specific Course and all its Learners
 			$this->analysis_course_users_view( $course_id );
-		}
-		elseif ( 0 < $course_id && 0 < $user_id ) {
+		} elseif ( 0 < $course_id && 0 < $user_id ) {
 			// Viewing a specific Learner on a specific Course, showing their Lessons
 			$this->analysis_user_course_view( $course_id, $user_id );
-		}
-		elseif( 0 < $course_id ) {
+		} elseif( 0 < $course_id ) {
 			// Viewing a specific Course and all it's Lessons
 			$this->analysis_course_view( $course_id );
-		}
-		elseif ( 0 < $user_id ) {
+		} elseif ( 0 < $user_id ) {
 			// Viewing a specific Learner, and their Courses
 			$this->analysis_user_profile_view( $user_id );
-		}
-		else {
+		} else {
 			// Overview of all Learners, all Courses, or all Lessons
 			$this->analysis_default_view( $type );
 		} // End If Statement
@@ -569,20 +567,16 @@ 
 			if ( 0 < $lesson_id ) {
 				// Viewing a specific Lesson and all its Learners
 				$sensei_analysis_report_object = $this->load_report_object( 'Lesson', $lesson_id );
-			}
-			elseif ( 0 < $course_id && 0 < $user_id ) {
+			} elseif ( 0 < $course_id && 0 < $user_id ) {
 				// Viewing a specific User on a specific Course
 				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id, $user_id );
-			}
-			elseif( 0 < $course_id ) {
+			} elseif( 0 < $course_id ) {
 				// Viewing a specific Course and all it's Lessons, or it's Learners
 				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id );
-			}
-			elseif ( 0 < $user_id ) {
+			} elseif ( 0 < $user_id ) {
 				// Viewing a specific Learner, and their Courses
 				$sensei_analysis_report_object = $this->load_report_object( 'User_Profile', $user_id );
-			}
-			else {
+			} else {
 				// Overview of all Learners, all Courses, or all Lessons
 				$sensei_analysis_report_object = $this->load_report_object( 'Overview', $type );
 			} // End If Statement

Indentation +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
 
 		if ( current_user_can( 'manage_sensei_grades' ) ) {
 
-            add_submenu_page( 'sensei', __('Analysis', 'woothemes-sensei'),  __('Analysis', 'woothemes-sensei') , 'manage_sensei_grades', 'sensei_analysis', array( $this, 'analysis_page' ) );
+			add_submenu_page( 'sensei', __('Analysis', 'woothemes-sensei'),  __('Analysis', 'woothemes-sensei') , 'manage_sensei_grades', 'sensei_analysis', array( $this, 'analysis_page' ) );
 
 		}
 
@@ -89,7 +89,7 @@ 
 									'analysis-lesson'
 									);
 		foreach ( $classes_to_load as $class_file ) {
-            Sensei()->load_class( $class_file );
+			Sensei()->load_class( $class_file );
 		} // End For Loop
 	} // End load_data_table_files()
 
@@ -433,7 +433,7 @@ 
 
 			$user_id = intval( $_GET['user_id'] );
 			$url = esc_url( add_query_arg( array( 'page' => $this->page_slug, 'user' => $user_id ), admin_url( 'admin.php' ) ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
+			$user_name = Sensei_Learner::get_full_name( $user_id );
 			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
 
 		} // End If Statement
@@ -454,8 +454,8 @@ 
 			$user_id = intval( $_GET['user_id'] );
 			$user_data = get_userdata( $user_id );
 			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $user_id ), admin_url( 'admin.php' ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
-            $title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
+			$user_name = Sensei_Learner::get_full_name( $user_id );
+			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
 			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), $user_data->display_name );
 		} // End If Statement
 		if ( isset( $_GET['course_id'] ) ) { 

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * All functionality pertaining to the Admin Analysis in Sensei.
@@ -19,24 +19,24 @@ 
 	 * @since  1.0.0
 	 * @param string $file
 	 */
-	public function __construct ( $file ) {
+	public function __construct($file) {
 		$this->name = __('Analysis', 'woothemes-sensei');
 		$this->file = $file;
 		$this->page_slug = 'sensei_analysis';
 
 		// Admin functions
-		if ( is_admin() ) {
-			add_action( 'admin_menu', array( $this, 'analysis_admin_menu' ), 10);
-			add_action( 'analysis_wrapper_container', array( $this, 'wrapper_container'  ) );
-			if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
+		if (is_admin()) {
+			add_action('admin_menu', array($this, 'analysis_admin_menu'), 10);
+			add_action('analysis_wrapper_container', array($this, 'wrapper_container'));
+			if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
 
-				add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+				add_action('admin_print_styles', array($this, 'enqueue_styles'));
 
 			}
 
-			add_action( 'admin_init', array( $this, 'report_download_page' ) );
+			add_action('admin_init', array($this, 'report_download_page'));
 
-			add_filter( 'user_search_columns', array( $this, 'user_search_columns_filter' ), 10, 3 );
+			add_filter('user_search_columns', array($this, 'user_search_columns_filter'), 10, 3);
 		} // End If Statement
 	} // End __construct()
 
@@ -50,9 +50,9 @@ 
 	public function analysis_admin_menu() {
 		global $menu, $woocommerce;
 
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
+		if (current_user_can('manage_sensei_grades')) {
 
-            add_submenu_page( 'sensei', __('Analysis', 'woothemes-sensei'),  __('Analysis', 'woothemes-sensei') , 'manage_sensei_grades', 'sensei_analysis', array( $this, 'analysis_page' ) );
+            add_submenu_page('sensei', __('Analysis', 'woothemes-sensei'), __('Analysis', 'woothemes-sensei'), 'manage_sensei_grades', 'sensei_analysis', array($this, 'analysis_page'));
 
 		}
 
@@ -66,11 +66,11 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function enqueue_styles () {
+	public function enqueue_styles() {
 
-		wp_enqueue_style( 'woothemes-sensei-admin' );
+		wp_enqueue_style('woothemes-sensei-admin');
 
-		wp_enqueue_style( 'woothemes-sensei-settings-api', Sensei()->plugin_url . 'assets/css/settings.css', '', Sensei()->version );
+		wp_enqueue_style('woothemes-sensei-settings-api', Sensei()->plugin_url.'assets/css/settings.css', '', Sensei()->version);
 
 	} // End enqueue_styles()
 
@@ -82,14 +82,14 @@ 
 	public function load_data_table_files() {
 
 		// Load Analysis Classes
-		$classes_to_load = array(	'list-table',
+		$classes_to_load = array('list-table',
 									'analysis-overview',
 									'analysis-user-profile',
 									'analysis-course',
 									'analysis-lesson'
 									);
-		foreach ( $classes_to_load as $class_file ) {
-            Sensei()->load_class( $class_file );
+		foreach ($classes_to_load as $class_file) {
+            Sensei()->load_class($class_file);
 		} // End For Loop
 	} // End load_data_table_files()
 
@@ -100,13 +100,13 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_data_object( $name = '', $data = 0, $optional_data = null ) {
+	public function load_data_object($name = '', $data = 0, $optional_data = null) {
 		// Load Analysis data
-		$object_name = 'Sensei_Analysis_' . $name . '_List_Table';
-		if ( is_null($optional_data) ) {
-			$sensei_analysis_object = new $object_name( $data );
+		$object_name = 'Sensei_Analysis_'.$name.'_List_Table';
+		if (is_null($optional_data)) {
+			$sensei_analysis_object = new $object_name($data);
 		} else {
-			$sensei_analysis_object = new $object_name( $data, $optional_data );
+			$sensei_analysis_object = new $object_name($data, $optional_data);
 		}
 		$sensei_analysis_object->prepare_items();
 		return $sensei_analysis_object;
@@ -123,40 +123,40 @@ 
 		$course_id = 0;
 		$lesson_id = 0;
 		$user_id = 0;
-		if( isset( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
 		}
-		if( isset( $_GET['lesson_id'] ) ) {
-			$lesson_id = intval( $_GET['lesson_id'] );
+		if (isset($_GET['lesson_id'])) {
+			$lesson_id = intval($_GET['lesson_id']);
 		}
-		if( isset( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
+		if (isset($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
 		}
-		$type = isset( $_GET['view'] ) ? esc_html( $_GET['view'] ) : false;
+		$type = isset($_GET['view']) ? esc_html($_GET['view']) : false;
 
-		if ( 0 < $lesson_id ) {
+		if (0 < $lesson_id) {
 			// Viewing a specific Lesson and all its Learners
-			$this->analysis_lesson_users_view( $lesson_id );
+			$this->analysis_lesson_users_view($lesson_id);
 		}
-		elseif ( 0 < $course_id && !$user_id && 'user' == $type ) {
+		elseif (0 < $course_id && ! $user_id && 'user' == $type) {
 			// Viewing a specific Course and all its Learners
-			$this->analysis_course_users_view( $course_id );
+			$this->analysis_course_users_view($course_id);
 		}
-		elseif ( 0 < $course_id && 0 < $user_id ) {
+		elseif (0 < $course_id && 0 < $user_id) {
 			// Viewing a specific Learner on a specific Course, showing their Lessons
-			$this->analysis_user_course_view( $course_id, $user_id );
+			$this->analysis_user_course_view($course_id, $user_id);
 		}
-		elseif( 0 < $course_id ) {
+		elseif (0 < $course_id) {
 			// Viewing a specific Course and all it's Lessons
-			$this->analysis_course_view( $course_id );
+			$this->analysis_course_view($course_id);
 		}
-		elseif ( 0 < $user_id ) {
+		elseif (0 < $user_id) {
 			// Viewing a specific Learner, and their Courses
-			$this->analysis_user_profile_view( $user_id );
+			$this->analysis_user_profile_view($user_id);
 		}
 		else {
 			// Overview of all Learners, all Courses, or all Lessons
-			$this->analysis_default_view( $type );
+			$this->analysis_default_view($type);
 		} // End If Statement
 	} // End analysis_page()
 
@@ -165,35 +165,35 @@ 
 	 * @since  1.2.0
 	 * @return void
 	 */
-	public function analysis_default_view( $type ) {
+	public function analysis_default_view($type) {
 
 		// Load Analysis data
-		$sensei_analysis_overview = $this->load_data_object( 'Overview', $type );
+		$sensei_analysis_overview = $this->load_data_object('Overview', $type);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
 		$this->analysis_headers();
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap">
 			<div class="sensei-analysis-sidebar">
 				<?php
-				do_action( 'sensei_analysis_before_stats_boxes' );
-				foreach ( $sensei_analysis_overview->stats_boxes() as $key => $value ) {
-					$this->render_stats_box( esc_html( $key ), esc_html( $value ) );
+				do_action('sensei_analysis_before_stats_boxes');
+				foreach ($sensei_analysis_overview->stats_boxes() as $key => $value) {
+					$this->render_stats_box(esc_html($key), esc_html($value));
 				} // End For Loop
-				do_action( 'sensei_analysis_after_stats_boxes' );
+				do_action('sensei_analysis_after_stats_boxes');
 				?>
 			</div>
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_overview->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_default_view()
 
 	/**
@@ -202,26 +202,26 @@ 
 	 * @param integer $user_id
 	 * @return void
 	 */
-	public function analysis_user_profile_view( $user_id ) {
+	public function analysis_user_profile_view($user_id) {
 
 		// Load Analysis data
-		$sensei_analysis_user_profile = $this->load_data_object( 'User_Profile', $user_id );
+		$sensei_analysis_user_profile = $this->load_data_object('User_Profile', $user_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'user_profile' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'user_profile'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap user-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_user_profile->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_user_profile_view()
 
 	/**
@@ -230,26 +230,26 @@ 
 	 * @param integer $course_id
 	 * @return void
 	 */
-	public function analysis_course_view( $course_id ) {
+	public function analysis_course_view($course_id) {
 
 		// Load Analysis data
-		$sensei_analysis_course = $this->load_data_object( 'Course', $course_id );
+		$sensei_analysis_course = $this->load_data_object('Course', $course_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'course' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'course'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_course->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_course_view()
 
 	/**
@@ -259,26 +259,26 @@ 
 	 * @param integer $user_id
 	 * @return void
 	 */
-	public function analysis_user_course_view( $course_id, $user_id ) {
+	public function analysis_user_course_view($course_id, $user_id) {
 
 		// Load Analysis data
-		$sensei_analysis_user_course = $this->load_data_object( 'Course', $course_id, $user_id );
+		$sensei_analysis_user_course = $this->load_data_object('Course', $course_id, $user_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'user_course' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'user_course'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_user_course->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_user_course_view()
 
 	/**
@@ -287,26 +287,26 @@ 
 	 * @param integer $course_id
 	 * @return void
 	 */
-	public function analysis_course_users_view( $course_id ) {
+	public function analysis_course_users_view($course_id) {
 
 		// Load Analysis data
-		$sensei_analysis_course_users = $this->load_data_object( 'Course', $course_id );
+		$sensei_analysis_course_users = $this->load_data_object('Course', $course_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'course_users' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'course_users'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_course_users->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_course_users_view()
 
 	/**
@@ -315,26 +315,26 @@ 
 	 * @param integer $lesson_id
 	 * @return void
 	 */
-	public function analysis_lesson_users_view( $lesson_id ) {
+	public function analysis_lesson_users_view($lesson_id) {
 
 		// Load Analysis data
-		$sensei_analysis_lesson_users = $this->load_data_object( 'Lesson', $lesson_id );
+		$sensei_analysis_lesson_users = $this->load_data_object('Lesson', $lesson_id);
 		// Wrappers
-		do_action( 'analysis_before_container' );
-		do_action( 'analysis_wrapper_container', 'top' );
-		$this->analysis_headers( array( 'nav' => 'lesson_users' ) );
+		do_action('analysis_before_container');
+		do_action('analysis_wrapper_container', 'top');
+		$this->analysis_headers(array('nav' => 'lesson_users'));
 		?>
 		<div id="poststuff" class="sensei-analysis-wrap course-profile">
 			<div class="sensei-analysis-main">
 				<?php $sensei_analysis_lesson_users->display(); ?>
 			</div>
 			<div class="sensei-analysis-extra">
-				<?php do_action( 'sensei_analysis_extra' ); ?>
+				<?php do_action('sensei_analysis_extra'); ?>
 			</div>
 		</div>
 		<?php
-		do_action( 'analysis_wrapper_container', 'bottom' );
-		do_action( 'analysis_after_container' );
+		do_action('analysis_wrapper_container', 'bottom');
+		do_action('analysis_after_container');
 	} // End analysis_lesson_users_view()
 
 	/**
@@ -344,7 +344,7 @@ 
 	 * @param  $data string stats data
 	 * @return void
 	 */
-	public function render_stats_box( $title, $data ) {
+	public function render_stats_box($title, $data) {
 		?><div class="postbox">
 			<h2><span><?php echo $title; ?></span></h2>
 			<div class="inside">
@@ -358,14 +358,14 @@ 
 	 * @since  1.2.0
 	 * @return void
 	 */
-	public function analysis_headers( $args = array( 'nav' => 'default' ) ) {
+	public function analysis_headers($args = array('nav' => 'default')) {
 
-		$function = 'analysis_' . $args['nav'] . '_nav';
+		$function = 'analysis_'.$args['nav'].'_nav';
 		$this->$function();
 		?>
 			<p class="powered-by-woo">
 
-                <?php _e( 'Powered by', 'woothemes-sensei' ); ?>
+                <?php _e('Powered by', 'woothemes-sensei'); ?>
 
                 <a href="http://www.woothemes.com/" title="WooThemes">
 
@@ -376,7 +376,7 @@ 
             </p>
 
 		<?php
-		do_action( 'sensei_analysis_after_headers' );
+		do_action('sensei_analysis_after_headers');
 	} // End analysis_headers()
 
 	/**
@@ -385,10 +385,10 @@ 
 	 * @param $which string
 	 * @return void
 	 */
-	public function wrapper_container( $which ) {
-		if ( 'top' == $which ) {
+	public function wrapper_container($which) {
+		if ('top' == $which) {
 			?><div id="woothemes-sensei" class="wrap woothemes-sensei"><?php
-		} elseif ( 'bottom' == $which ) {
+		} elseif ('bottom' == $which) {
 			?></div><!--/#woothemes-sensei--><?php
 		} // End If Statement
 	} // End wrapper_container()
@@ -400,24 +400,24 @@ 
 	 */
 	public function analysis_default_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', esc_url( add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		$view = isset($_GET['view']) ? esc_html( $_GET['view'] ) : '';
-		switch ( $view ) { 
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		$view = isset($_GET['view']) ? esc_html($_GET['view']) : '';
+		switch ($view) { 
 			case 'courses' :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Courses', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;%s</span>', __('Courses', 'woothemes-sensei'));
 				break;
 
 			case 'lessons' :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Lessons', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;%s</span>', __('Lessons', 'woothemes-sensei'));
 				break;
 
 			case 'users' :
 			default :
-				$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;%s</span>', __( 'Learners', 'woothemes-sensei' ) );
+				$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;%s</span>', __('Learners', 'woothemes-sensei'));
 				break;
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_default_nav()
 
@@ -428,17 +428,17 @@ 
 	 */
 	public function analysis_user_profile_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', esc_url( add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		if (isset($_GET['user_id']) && 0 < intval($_GET['user_id'])) {
 
-			$user_id = intval( $_GET['user_id'] );
-			$url = esc_url( add_query_arg( array( 'page' => $this->page_slug, 'user' => $user_id ), admin_url( 'admin.php' ) ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
+			$user_id = intval($_GET['user_id']);
+			$url = esc_url(add_query_arg(array('page' => $this->page_slug, 'user' => $user_id), admin_url('admin.php')));
+            $user_name = Sensei_Learner::get_full_name($user_id);
+			$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name);
 
 		} // End If Statement
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_user_profile_nav()
 
@@ -449,22 +449,22 @@ 
 	 */
 	public function analysis_user_course_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', esc_url( add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
-			$user_id = intval( $_GET['user_id'] );
-			$user_data = get_userdata( $user_id );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $user_id ), admin_url( 'admin.php' ) );
-            $user_name = Sensei_Learner::get_full_name( $user_id );
-            $title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), $user_data->display_name );
+		$title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name));
+		if (isset($_GET['user_id']) && 0 < intval($_GET['user_id'])) {
+			$user_id = intval($_GET['user_id']);
+			$user_data = get_userdata($user_id);
+			$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $user_id), admin_url('admin.php'));
+            $user_name = Sensei_Learner::get_full_name($user_id);
+            $title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', $url, $user_name);
+			$title .= sprintf('&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), $user_data->display_name);
 		} // End If Statement
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_user_course_nav()
 
@@ -475,14 +475,14 @@ 
 	 */
 	public function analysis_course_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>',esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_course_nav()
 
@@ -493,14 +493,14 @@ 
 	 */
 	public function analysis_course_users_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['course_id'] ) ) { 
-			$course_id = intval( $_GET['course_id'] );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['course_id'])) { 
+			$course_id = intval($_GET['course_id']);
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_course_users_nav()
 
@@ -511,17 +511,17 @@ 
 	 */
 	public function analysis_lesson_users_nav() {
 
-		$title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) );
-		if ( isset( $_GET['lesson_id'] ) ) { 
-			$lesson_id = intval( $_GET['lesson_id'] );
-			$course_id = intval( get_post_meta( $lesson_id, '_lesson_course', true ) );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) );
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id ), admin_url( 'admin.php' ) );
-			$title .= sprintf( '&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $lesson_id ) );
+		$title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name));
+		if (isset($_GET['lesson_id'])) { 
+			$lesson_id = intval($_GET['lesson_id']);
+			$course_id = intval(get_post_meta($lesson_id, '_lesson_course', true));
+			$url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="course-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id));
+			$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id), admin_url('admin.php'));
+			$title .= sprintf('&nbsp;&nbsp;<span class="lesson-title">&gt;&nbsp;&nbsp;<a href="%s">%s</a></span>', esc_url($url), get_the_title($lesson_id));
 		}
 		?>
-			<h1><?php echo apply_filters( 'sensei_analysis_nav_title', $title ); ?></h1>
+			<h1><?php echo apply_filters('sensei_analysis_nav_title', $title); ?></h1>
 		<?php
 	} // End analysis_lesson_users_nav()
 
@@ -532,59 +532,59 @@ 
 	 */
 	public function report_download_page() {
 		// Check if is a report
-		if ( !empty( $_GET['sensei_report_download'] ) ) {
-			$report = sanitize_text_field( $_GET['sensei_report_download'] );
+		if ( ! empty($_GET['sensei_report_download'])) {
+			$report = sanitize_text_field($_GET['sensei_report_download']);
 
 			// Simple verification to ensure intent, Note that a Nonce is per user, so the URL can't be shared
-			if ( !wp_verify_nonce( $_REQUEST['_sdl_nonce'], 'sensei_csv_download-' . $report ) ) {
-				wp_die( __('Invalid request', 'woothemes-sensei') );
+			if ( ! wp_verify_nonce($_REQUEST['_sdl_nonce'], 'sensei_csv_download-'.$report)) {
+				wp_die(__('Invalid request', 'woothemes-sensei'));
 			}
 
 			// Setup the variables we might need
-			$filename = apply_filters( 'sensei_csv_export_filename', $report );
+			$filename = apply_filters('sensei_csv_export_filename', $report);
 			$course_id = 0;
 			$lesson_id = 0;
 			$user_id = 0;
-			if( isset( $_GET['course_id'] ) ) {
-				$course_id = intval( $_GET['course_id'] );
+			if (isset($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
 			}
-			if( isset( $_GET['lesson_id'] ) ) {
-				$lesson_id = intval( $_GET['lesson_id'] );
+			if (isset($_GET['lesson_id'])) {
+				$lesson_id = intval($_GET['lesson_id']);
 			}
-			if( isset( $_GET['user_id'] ) ) {
-				$user_id = intval( $_GET['user_id'] );
+			if (isset($_GET['user_id'])) {
+				$user_id = intval($_GET['user_id']);
 			}
-			$type = isset( $_GET['view'] ) ? esc_html( $_GET['view'] ) : false;
+			$type = isset($_GET['view']) ? esc_html($_GET['view']) : false;
 
-			if ( 0 < $lesson_id ) {
+			if (0 < $lesson_id) {
 				// Viewing a specific Lesson and all its Learners
-				$sensei_analysis_report_object = $this->load_report_object( 'Lesson', $lesson_id );
+				$sensei_analysis_report_object = $this->load_report_object('Lesson', $lesson_id);
 			}
-			elseif ( 0 < $course_id && 0 < $user_id ) {
+			elseif (0 < $course_id && 0 < $user_id) {
 				// Viewing a specific User on a specific Course
-				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id, $user_id );
+				$sensei_analysis_report_object = $this->load_report_object('Course', $course_id, $user_id);
 			}
-			elseif( 0 < $course_id ) {
+			elseif (0 < $course_id) {
 				// Viewing a specific Course and all it's Lessons, or it's Learners
-				$sensei_analysis_report_object = $this->load_report_object( 'Course', $course_id );
+				$sensei_analysis_report_object = $this->load_report_object('Course', $course_id);
 			}
-			elseif ( 0 < $user_id ) {
+			elseif (0 < $user_id) {
 				// Viewing a specific Learner, and their Courses
-				$sensei_analysis_report_object = $this->load_report_object( 'User_Profile', $user_id );
+				$sensei_analysis_report_object = $this->load_report_object('User_Profile', $user_id);
 			}
 			else {
 				// Overview of all Learners, all Courses, or all Lessons
-				$sensei_analysis_report_object = $this->load_report_object( 'Overview', $type );
+				$sensei_analysis_report_object = $this->load_report_object('Overview', $type);
 			} // End If Statement
 
 			// Handle the headers
-			$this->report_set_headers( $filename );
+			$this->report_set_headers($filename);
 
 			// Collate the data, there could be many different reports for a single object
-			$report_data_array = $sensei_analysis_report_object->generate_report( $report );
+			$report_data_array = $sensei_analysis_report_object->generate_report($report);
 
 			// Output the data
-			$this->report_write_download( $report_data_array );
+			$this->report_write_download($report_data_array);
 
 			// Cleanly exit
 			exit;
@@ -597,9 +597,9 @@ 
 	 * @param  string $filename name of report file
 	 * @return void
 	 */
-	public function report_set_headers( $filename = '' ) {
-		header( 'Content-Type: text/csv' );
-		header( 'Content-Disposition: attachment;filename=' . $filename . '.csv');
+	public function report_set_headers($filename = '') {
+		header('Content-Type: text/csv');
+		header('Content-Disposition: attachment;filename='.$filename.'.csv');
 	} // End report_set_headers()
 
 	/**
@@ -610,12 +610,12 @@ 
 	 * @param  undefined  $optional_data optional constructor arguments
 	 * @return object                 class instance object
 	 */
-	public function load_report_object( $name = '', $data = 0, $optional_data = null ) {
-		$object_name = 'WooThemes_Sensei_Analysis_' . $name . '_List_Table';
-		if ( is_null($optional_data) ) {
-			$sensei_analysis_report_object = new $object_name( $data );
+	public function load_report_object($name = '', $data = 0, $optional_data = null) {
+		$object_name = 'WooThemes_Sensei_Analysis_'.$name.'_List_Table';
+		if (is_null($optional_data)) {
+			$sensei_analysis_report_object = new $object_name($data);
 		} else {
-			$sensei_analysis_report_object = new $object_name( $data, $optional_data );
+			$sensei_analysis_report_object = new $object_name($data, $optional_data);
 		}
 		return $sensei_analysis_report_object;
 	} // End load_report_object()
@@ -626,7 +626,7 @@ 
 	 * @param  array  $report_data data array
 	 * @return void
 	 */
-	public function report_write_download( $report_data = array() ) {
+	public function report_write_download($report_data = array()) {
 		$fp = fopen('php://output', 'w');
 		foreach ($report_data as $row) {
 			fputcsv($fp, $row);
@@ -642,9 +642,9 @@ 
 	 * @param  object $user_query_object     WP_User_Query Object
 	 * @return array $search_columns         array of user columns to search
 	 */
-	public function user_search_columns_filter( $search_columns, $search, $user_query_object ) {
+	public function user_search_columns_filter($search_columns, $search, $user_query_object) {
 		// Alter $search_columns to include the fields you want to search on
-		array_push( $search_columns, 'display_name' );
+		array_push($search_columns, 'display_name');
 		return $search_columns;
 	}
 

includes/admin/class-sensei-welcome.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
  * @version     1.8.0
 */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -29,8 +29,8 @@ 
 	 */
 	public function __construct() {
 
-        add_action( 'admin_menu', array( $this, 'admin_menus') );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
+        add_action('admin_menu', array($this, 'admin_menus'));
+		add_action('admin_head', array($this, 'admin_head'));
 
 	}
 
@@ -40,23 +40,23 @@ 
      * Hooked into activated_plugin
      * @since 1.8.0
      */
-    public static function redirect( $plugin ) {
+    public static function redirect($plugin) {
 
         // Bail if activating from network, or bulk, or within an iFrame
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi']) || defined('IFRAME_REQUEST')) {
 
             return;
 
         }
         // don't run for upgrades and for pages already on the welcome screen
-        if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
-            || ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
+        if ((isset($_GET['action']) && 'upgrade-plugin' == $_GET['action'])
+            || ( ! empty($_GET['page']) && $_GET['page'] === 'sensei-welcome')) {
 
             return;
 
         }
 
-        wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
+        wp_redirect(admin_url('index.php?page=sensei-welcome'));
         exit;
     }
 
@@ -67,13 +67,13 @@ 
 	 */
 	public function admin_menus() {
 
-		if ( ! isset( $_GET['page'] ) || 'sensei-welcome' != $_GET[ 'page' ] ) {
+		if ( ! isset($_GET['page']) || 'sensei-welcome' != $_GET['page']) {
 			return;
 		}
 
-		$welcome_page_name  = __( 'Sensei Activation', 'woothemes-sensei' );
-		$welcome_page_title = __( 'Welcome to Sensei', 'woothemes-sensei' );
-        add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
+		$welcome_page_name  = __('Sensei Activation', 'woothemes-sensei');
+		$welcome_page_title = __('Welcome to Sensei', 'woothemes-sensei');
+        add_dashboard_page($welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array($this, 'welcome_screen'));
 
 	}
 
@@ -132,7 +132,7 @@ 
             <hr />
 
             <div class="return-to-dashboard">
-                <a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'woothemes-sensei-settings' ), 'admin.php' ) ) ); ?>"><?php _e( 'Go to Sensei Settings', 'woothemes-sensei' ); ?></a>
+                <a href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'woothemes-sensei-settings'), 'admin.php'))); ?>"><?php _e('Go to Sensei Settings', 'woothemes-sensei'); ?></a>
             </div>
         </div>
     <?php
@@ -143,7 +143,7 @@ 
 	 */
 	public function admin_head() {
         // remove the menu page so it is not visible in the admin side bar
-		remove_submenu_page( 'index.php', 'sensei-welcome' );
+		remove_submenu_page('index.php', 'sensei-welcome');
 		?>
 		<style type="text/css">
 			/*<![CDATA[*/
@@ -262,47 +262,47 @@ 
 	private function intro() {
 
 		// Drop minor version if 0
-		$major_version = substr( Sensei()->version, 0, 3 );
+		$major_version = substr(Sensei()->version, 0, 3);
 
 		// Random tweet - must be kept to 102 chars to "fit"
 		$tweets        = array(
             'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
 		);
-		shuffle( $tweets );
+		shuffle($tweets);
 		?>
-		<h1><?php printf( __( 'Welcome to Sensei %s', 'woothemes-sensei' ), $major_version ); ?></h1>
+		<h1><?php printf(__('Welcome to Sensei %s', 'woothemes-sensei'), $major_version); ?></h1>
 
 		<div class="about-text sensei-about-text">
 			<?php
-				if ( ! empty( $_GET['sensei-installed'] ) ) {
-					$message = __( 'Thanks, all done!', 'woothemes-sensei' );
-				} elseif ( ! empty( $_GET['sensei-updated'] ) ) {
-					$message = __( 'Thank you for updating to the latest version!', 'woothemes-sensei' );
+				if ( ! empty($_GET['sensei-installed'])) {
+					$message = __('Thanks, all done!', 'woothemes-sensei');
+				} elseif ( ! empty($_GET['sensei-updated'])) {
+					$message = __('Thank you for updating to the latest version!', 'woothemes-sensei');
 				} else {
-					$message = __( 'Thanks for installing!', 'woothemes-sensei' );
+					$message = __('Thanks for installing!', 'woothemes-sensei');
 				}
 
-				printf( __( '%s We hope you enjoy using Sensei %s.', 'woothemes-sensei' ), $message, $major_version );
+				printf(__('%s We hope you enjoy using Sensei %s.', 'woothemes-sensei'), $message, $major_version);
 			?>
 		</div>
 
 		<div class="sensei-badge">
             <?php
-                _e('Sensei by WooThemes','woothemes-sensei');
+                _e('Sensei by WooThemes', 'woothemes-sensei');
                 echo '<br />';
 
-                printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
+                printf(__('Version %s', 'woothemes-sensei'), Sensei()->version);
             ?>
         </div>
 
 		<p class="sensei-actions">
-			<a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button button-primary"><?php _e( 'Settings', 'woothemes-sensei' ); ?></a>
-			<a href="<?php echo esc_url( apply_filters( 'sensei_docs_url', 'http://docs.woothemes.com/documentation/plugins/sensei/', 'woothemes-sensei' ) ); ?>" class="docs button button-primary"><?php _e( 'Docs', 'woothemes-sensei' ); ?></a>
-			<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/products/sensei" data-text="<?php echo esc_attr( $tweets[0] ); ?>" data-via="WooThemes" data-size="large">Tweet</a>
+			<a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button button-primary"><?php _e('Settings', 'woothemes-sensei'); ?></a>
+			<a href="<?php echo esc_url(apply_filters('sensei_docs_url', 'http://docs.woothemes.com/documentation/plugins/sensei/', 'woothemes-sensei')); ?>" class="docs button button-primary"><?php _e('Docs', 'woothemes-sensei'); ?></a>
+			<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/products/sensei" data-text="<?php echo esc_attr($tweets[0]); ?>" data-via="WooThemes" data-size="large">Tweet</a>
 			<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 		</p>
 
-		<h2 > <?php _e( "What's New", 'woothemes-sensei' ); ?> </h2>
+		<h2 > <?php _e("What's New", 'woothemes-sensei'); ?> </h2>
 
 		<?php
 	}

Indentation +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+	exit; // Exit if accessed directly
 }
 
 /**
@@ -17,45 +17,45 @@ 
 
 	/**
 	 * Hook in tabs.
-     * @since 1.8.0
+	 * @since 1.8.0
 	 */
 	public function __construct() {
 
-        add_action( 'admin_menu', array( $this, 'admin_menus') );
+		add_action( 'admin_menu', array( $this, 'admin_menus') );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
 
 	}
 
-    /**
-     * Sends user to the welcome page on first activation.
-     *
-     * Hooked into activated_plugin
-     * @since 1.8.0
-     */
-    public static function redirect( $plugin ) {
+	/**
+	 * Sends user to the welcome page on first activation.
+	 *
+	 * Hooked into activated_plugin
+	 * @since 1.8.0
+	 */
+	public static function redirect( $plugin ) {
 
-        // Bail if activating from network, or bulk, or within an iFrame
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
+		// Bail if activating from network, or bulk, or within an iFrame
+		if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
 
-            return;
+			return;
 
-        }
-        // don't run for upgrades and for pages already on the welcome screen
-        if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
-            || ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
+		}
+		// don't run for upgrades and for pages already on the welcome screen
+		if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
+			|| ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
-        exit;
-    }
+		wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
+		exit;
+	}
 
 	/**
 	 * Add admin menus/screens.
-     *
-     * @since 1.8.0
+	 *
+	 * @since 1.8.0
 	 */
 	public function admin_menus() {
 
@@ -65,17 +65,17 @@ 
 
 		$welcome_page_name  = __( 'Sensei Activation', 'woothemes-sensei' );
 		$welcome_page_title = __( 'Welcome to Sensei', 'woothemes-sensei' );
-        add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
+		add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
 
 	}
 
-    /**
-     * Output the Welcome  screen.
-     *
-     * @since 1.8.0
-     */
-    public function welcome_screen() {
-        ?>
+	/**
+	 * Output the Welcome  screen.
+	 *
+	 * @since 1.8.0
+	 */
+	public function welcome_screen() {
+		?>
         <div class="wrap about-wrap">
 
             <?php  $this->intro(); ?>
@@ -128,13 +128,13 @@ 
             </div>
         </div>
     <?php
-    }
+	}
 
 	/**
 	 * Add styles just for this page, and remove dashboard page links.
 	 */
 	public function admin_head() {
-        // remove the menu page so it is not visible in the admin side bar
+		// remove the menu page so it is not visible in the admin side bar
 		remove_submenu_page( 'index.php', 'sensei-welcome' );
 		?>
 		<style type="text/css">
@@ -258,7 +258,7 @@ 
 
 		// Random tweet - must be kept to 102 chars to "fit"
 		$tweets        = array(
-            'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
+			'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
 		);
 		shuffle( $tweets );
 		?>
@@ -280,11 +280,11 @@ 
 
 		<div class="sensei-badge">
             <?php
-                _e('Sensei by WooThemes','woothemes-sensei');
-                echo '<br />';
+				_e('Sensei by WooThemes','woothemes-sensei');
+				echo '<br />';
 
-                printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
-            ?>
+				printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
+			?>
         </div>
 
 		<p class="sensei-actions">