woothemes / sensei

woothemes-sensei.php

Indentation +77 added lines, -77 removed lines

@@ -30,80 +30,80 @@
 

 	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

 

-    require_once( 'includes/class-sensei-autoloader.php' );

-    require_once( 'includes/lib/woo-functions.php' );

-    require_once( 'includes/sensei-functions.php' );

-

-    if ( ! is_admin() ) {

-        require_once( 'includes/template-functions.php' );

-    }

-

-    /**

-     * Returns the global Sensei Instance.

-     *

-     * @since 1.8.0

-     */

-    function Sensei(){

-

-        return Sensei_Main::instance();

-

-    }

-

-    // set the sensei version number

-    Sensei()->version = '1.9-beta';

-

-    //backwards compatibility

-    global $woothemes_sensei;

-    $woothemes_sensei = Sensei();

-

-    /**

-    * Hook in WooCommerce functionality

-    */

-    if( Sensei_WC::is_woocommerce_active() ){

-        add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

-    }

-

-    /**

-     * Load all Template hooks

-    */

-    if(! is_admin() ){

-

-        require_once( 'includes/hooks/template.php' );

-

-    }

-

-    /**

-     * Plugin updates

-     * @since  1.0.1

-     */

-    woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

-

-    /**

-     * Sensei Activation Hook registration

-     * @since 1.8.0

-     */

-    register_activation_hook( __FILE__, 'activate_sensei' );

-

-    /**

-     * Activate_sensei

-     *

-     * All the activation checks needed to ensure Sensei is ready for use

-     * @since 1.8.0

-     */

-    function activate_sensei () {

-

-        // create the teacher role on activation and ensure that it has all the needed capabilities

-        Sensei()->teacher->create_role();

-

-        //Setup all the role capabilities needed

-        Sensei()->updates->add_sensei_caps();

-        Sensei()->updates->add_editor_caps();

-        Sensei()->updates->assign_role_caps();

-

-        //Flush rules

-        add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

-

-        //Load the Welcome Screen

-        add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

-

-    }// end activate_sensei

+	require_once( 'includes/class-sensei-autoloader.php' );

+	require_once( 'includes/lib/woo-functions.php' );

+	require_once( 'includes/sensei-functions.php' );

+

+	if ( ! is_admin() ) {

+		require_once( 'includes/template-functions.php' );

+	}

+

+	/**

+	 * Returns the global Sensei Instance.

+	 *

+	 * @since 1.8.0

+	 */

+	function Sensei(){

+

+		return Sensei_Main::instance();

+

+	}

+

+	// set the sensei version number

+	Sensei()->version = '1.9-beta';

+

+	//backwards compatibility

+	global $woothemes_sensei;

+	$woothemes_sensei = Sensei();

+

+	/**

+	 * Hook in WooCommerce functionality

+	 */

+	if( Sensei_WC::is_woocommerce_active() ){

+		add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

+	}

+

+	/**

+	 * Load all Template hooks

+	 */

+	if(! is_admin() ){

+

+		require_once( 'includes/hooks/template.php' );

+

+	}

+

+	/**

+	 * Plugin updates

+	 * @since  1.0.1

+	 */

+	woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

+

+	/**

+	 * Sensei Activation Hook registration

+	 * @since 1.8.0

+	 */

+	register_activation_hook( __FILE__, 'activate_sensei' );

+

+	/**

+	 * Activate_sensei

+	 *

+	 * All the activation checks needed to ensure Sensei is ready for use

+	 * @since 1.8.0

+	 */

+	function activate_sensei () {

+

+		// create the teacher role on activation and ensure that it has all the needed capabilities

+		Sensei()->teacher->create_role();

+

+		//Setup all the role capabilities needed

+		Sensei()->updates->add_sensei_caps();

+		Sensei()->updates->add_editor_caps();

+		Sensei()->updates->assign_role_caps();

+

+		//Flush rules

+		add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

+

+		//Load the Welcome Screen

+		add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

+

+	}// end activate_sensei

Spacing +16 added lines, -16 removed lines

@@ -28,14 +28,14 @@ 
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

 

-	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+	if ( ! defined('ABSPATH')) exit; // Exit if accessed directly

 

-    require_once( 'includes/class-sensei-autoloader.php' );

-    require_once( 'includes/lib/woo-functions.php' );

-    require_once( 'includes/sensei-functions.php' );

+    require_once('includes/class-sensei-autoloader.php');

+    require_once('includes/lib/woo-functions.php');

+    require_once('includes/sensei-functions.php');

 

-    if ( ! is_admin() ) {

-        require_once( 'includes/template-functions.php' );

+    if ( ! is_admin()) {

+        require_once('includes/template-functions.php');

     }

 

     /**

@@ -43,7 +43,7 @@ 
      *

      * @since 1.8.0

      */

-    function Sensei(){

+    function Sensei() {

 

         return Sensei_Main::instance();

 

@@ -59,16 +59,16 @@ 
     /**

     * Hook in WooCommerce functionality

     */

-    if( Sensei_WC::is_woocommerce_active() ){

-        add_action('init', array( 'Sensei_WC', 'load_woocommerce_integration_hooks' ) );

+    if (Sensei_WC::is_woocommerce_active()) {

+        add_action('init', array('Sensei_WC', 'load_woocommerce_integration_hooks'));

     }

 

     /**

      * Load all Template hooks

     */

-    if(! is_admin() ){

+    if ( ! is_admin()) {

 

-        require_once( 'includes/hooks/template.php' );

+        require_once('includes/hooks/template.php');

 

     }

 

@@ -76,13 +76,13 @@ 
      * Plugin updates

      * @since  1.0.1

      */

-    woothemes_queue_update( plugin_basename( __FILE__ ), 'bad2a02a063555b7e2bee59924690763', 152116 );

+    woothemes_queue_update(plugin_basename(__FILE__), 'bad2a02a063555b7e2bee59924690763', 152116);

 

     /**

      * Sensei Activation Hook registration

      * @since 1.8.0

      */

-    register_activation_hook( __FILE__, 'activate_sensei' );

+    register_activation_hook(__FILE__, 'activate_sensei');

 

     /**

      * Activate_sensei

@@ -90,7 +90,7 @@ 
      * All the activation checks needed to ensure Sensei is ready for use

      * @since 1.8.0

      */

-    function activate_sensei () {

+    function activate_sensei() {

 

         // create the teacher role on activation and ensure that it has all the needed capabilities

         Sensei()->teacher->create_role();

@@ -101,9 +101,9 @@ 
         Sensei()->updates->assign_role_caps();

 

         //Flush rules

-        add_action( 'activated_plugin' , array( 'Sensei_Main','activation_flush_rules' ), 10 );

+        add_action('activated_plugin', array('Sensei_Main', 'activation_flush_rules'), 10);

 

         //Load the Welcome Screen

-        add_action( 'activated_plugin' , array( 'Sensei_Welcome','redirect' ), 20 );

+        add_action('activated_plugin', array('Sensei_Welcome', 'redirect'), 20);

 

     }// end activate_sensei

Braces +4 added lines, -1 removed lines

@@ -28,7 +28,10 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

 

-	if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+	if ( ! defined( 'ABSPATH' ) ) {
+		exit;
+	}
+	// Exit if accessed directly

 

     require_once( 'includes/class-sensei-autoloader.php' );

     require_once( 'includes/lib/woo-functions.php' );

includes/class-sensei-course-results.php

Indentation +47 added lines, -47 removed lines

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

Spacing +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Course Results Class
@@ -21,20 +21,20 @@ 
 	 * Constructor.
 	 * @since  1.4.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
 		// Setup learner profile URL base
-		$this->courses_url_base = apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url slug', 'woothemes-sensei' ) );
+		$this->courses_url_base = apply_filters('sensei_course_slug', _x('course', 'post type single url slug', 'woothemes-sensei'));
 
 		// Setup permalink structure for course results
-		add_action( 'init', array( $this, 'setup_permastruct' ) );
-		add_filter( 'wp_title', array( $this, 'page_title' ), 10, 2 );
+		add_action('init', array($this, 'setup_permastruct'));
+		add_filter('wp_title', array($this, 'page_title'), 10, 2);
 
 		// Load course results
-		add_action( 'sensei_course_results_content_inside_before', array( $this, 'deprecate_course_result_info_hook' ), 10 );
+		add_action('sensei_course_results_content_inside_before', array($this, 'deprecate_course_result_info_hook'), 10);
 
 		// Add class to body tag
-		add_filter( 'body_class', array( $this, 'body_class' ), 10, 1 );
+		add_filter('body_class', array($this, 'body_class'), 10, 1);
 
 	} // End __construct()
 
@@ -44,8 +44,8 @@ 
 	 * @return void
 	 */
 	public function setup_permastruct() {
-		add_rewrite_rule( '^' . $this->courses_url_base . '/([^/]*)/results/?', 'index.php?course_results=$matches[1]', 'top' );
-		add_rewrite_tag( '%course_results%', '([^&]+)' );
+		add_rewrite_rule('^'.$this->courses_url_base.'/([^/]*)/results/?', 'index.php?course_results=$matches[1]', 'top');
+		add_rewrite_tag('%course_results%', '([^&]+)');
 	}
 
 	/**
@@ -54,11 +54,11 @@ 
 	 * @param  string $sep   Seeparator string
 	 * @return string        Modified title
 	 */
-	public function page_title( $title, $sep = null ) {
+	public function page_title($title, $sep = null) {
 		global $wp_query;
-		if( isset( $wp_query->query_vars['course_results'] ) ) {
-			$course = get_page_by_path( $wp_query->query_vars['course_results'], OBJECT, 'course' );
-			$title = __( 'Course Results: ', 'woothemes-sensei' ) . $course->post_title . ' ' . $sep . ' ';
+		if (isset($wp_query->query_vars['course_results'])) {
+			$course = get_page_by_path($wp_query->query_vars['course_results'], OBJECT, 'course');
+			$title = __('Course Results: ', 'woothemes-sensei').$course->post_title.' '.$sep.' ';
 		}
 		return $title;
 	}
@@ -69,18 +69,18 @@ 
 	 * @param  integer $course_id ID of course
 	 * @return string             The course results page permalink
 	 */
-	public function get_permalink( $course_id = 0 ) {
+	public function get_permalink($course_id = 0) {
 
 		$permalink = '';
 
-		if( $course_id > 0 ) {
+		if ($course_id > 0) {
 
-			$course = get_post( $course_id );
+			$course = get_post($course_id);
 
-			if ( get_option('permalink_structure') ) {
-				$permalink = trailingslashit( get_home_url() ) . $this->courses_url_base . '/' . $course->post_name . '/results/';
+			if (get_option('permalink_structure')) {
+				$permalink = trailingslashit(get_home_url()).$this->courses_url_base.'/'.$course->post_name.'/results/';
 			} else {
-				$permalink = trailingslashit( get_home_url() ) . '?course_results=' . $course->post_name;
+				$permalink = trailingslashit(get_home_url()).'?course_results='.$course->post_name;
 			}
 		}
 
@@ -93,10 +93,10 @@ 
 	 * @return void
 	 */
 	public function content() {
-		global $wp_query,  $current_user;
+		global $wp_query, $current_user;
 
-		if( isset( $wp_query->query_vars['course_results'] ) ) {
-            Sensei_Templates::get_template( 'course-results/course-info.php' );
+		if (isset($wp_query->query_vars['course_results'])) {
+            Sensei_Templates::get_template('course-results/course-info.php');
 		}
 
 	}
@@ -110,12 +110,12 @@ 
 
 		global $course;
 
-		$course_status = WooThemes_Sensei_Utils::sensei_user_course_status_message( $course->ID, get_current_user_id());
-		echo '<div class="sensei-message ' . $course_status['box_class'] . '">' . $course_status['message'] . '</div>';
+		$course_status = WooThemes_Sensei_Utils::sensei_user_course_status_message($course->ID, get_current_user_id());
+		echo '<div class="sensei-message '.$course_status['box_class'].'">'.$course_status['message'].'</div>';
 
-		sensei_do_deprecated_action( 'sensei_course_results_lessons','1.9.','sensei_course_results_content_inside_after', $course );
+		sensei_do_deprecated_action('sensei_course_results_lessons', '1.9.', 'sensei_course_results_content_inside_after', $course);
 
-        sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID );
+        sensei_do_deprecated_action('sensei_course_results_bottom', '1.9.', 'sensei_course_results_content_inside_after', $course->ID);
 
 	}
 
@@ -128,7 +128,7 @@ 
 	public function course_lessons() {
 
 		global $course;
-        _deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' );
+        _deprecated_function('Sensei_modules course_lessons ', '1.9.0');
 
 	}
 
@@ -137,9 +137,9 @@ 
 	 * @param  array $classes Existing classes
 	 * @return array          Modified classes
 	 */
-	public function body_class( $classes ) {
+	public function body_class($classes) {
 		global $wp_query;
-		if( isset( $wp_query->query_vars['course_results'] ) ) {
+		if (isset($wp_query->query_vars['course_results'])) {
 			$classes[] = 'course-results';
 		}
 		return $classes;
@@ -150,9 +150,9 @@ 
      *
      * @deprecated since 1.9.0
      */
-    public static function deprecate_sensei_course_results_content_hook(){
+    public static function deprecate_sensei_course_results_content_hook() {
 
-        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before');
+        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0', 'sensei_course_results_content_before');
 
     }
 
@@ -161,9 +161,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function fire_sensei_message_hook(){
+    public static function fire_sensei_message_hook() {
 
-        do_action( 'sensei_frontend_messages' );
+        do_action('sensei_frontend_messages');
 
     }
 
@@ -172,9 +172,9 @@ 
      *
      * @since 1.9.0
      */
-    public static function deprecate_course_result_info_hook(){
+    public static function deprecate_course_result_info_hook() {
 
-        sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' );
+        sensei_do_deprecated_action('sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before');
 
     }
 
@@ -183,10 +183,10 @@ 
      *
      * @deprecate since 1.9.0
      */
-    public static function deprecate_course_results_top_hook(){
+    public static function deprecate_course_results_top_hook() {
 
         global $course;
-        sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID );
+        sensei_do_deprecated_action('sensei_course_results_top', '1.9.0', 'sensei_course_results_content_inside_before', $course->ID);
 
     }
 
@@ -195,10 +195,10 @@ 
      *
      * @since 1.8.0
      */
-    public static function fire_course_image_hook(){
+    public static function fire_course_image_hook() {
 
         global $course;
-        do_action( 'sensei_course_image', $course->ID );
+        do_action('sensei_course_image', $course->ID);
 
     }
 
@@ -209,4 +209,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Course_Results extends Sensei_Course_Results{}
+class WooThemes_Sensei_Course_Results extends Sensei_Course_Results {}

Braces +4 added lines, -1 removed lines

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

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

Indentation +146 added lines, -146 removed lines

@@ -14,205 +14,205 @@
  */
 class Sensei_Shortcode_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
-
-    /**
-     * @var string number of items to show on the current page
-     * Default: -1.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: -1.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
 
-    /**
-     * @var category can be completed or active or all
-     */
-    protected $category;
-
-    /**
-     * @var string teacher id to limit the courses to
-     */
-    protected $teacher;
+	/**
+	 * @var category can be completed or active or all
+	 */
+	protected $category;
+
+	/**
+	 * @var string teacher id to limit the courses to
+	 */
+	protected $teacher;
 
-    /**
-     * @var string csv of course ids to limit the search to
-     */
-    protected $ids;
+	/**
+	 * @var string csv of course ids to limit the search to
+	 */
+	protected $ids;
 
-    /**
-     * @var exclude courses by id
-     */
-    protected $exclude;
+	/**
+	 * @var exclude courses by id
+	 */
+	protected $exclude;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
 
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
 
-            $this->order =  'ASC';
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
 
-        }
+		}
 
-        $category = isset( $attributes['category'] ) ? $attributes['category'] : '';
-        $this->category = is_numeric( $category ) ? intval( $category ) : $category;
+		$category = isset( $attributes['category'] ) ? $attributes['category'] : '';
+		$this->category = is_numeric( $category ) ? intval( $category ) : $category;
 
-        $ids =  isset( $attributes['ids'] ) ? $attributes['ids'] : '';
-        $this->ids = empty( $ids ) ? '' : explode( ',', $ids );
+		$ids =  isset( $attributes['ids'] ) ? $attributes['ids'] : '';
+		$this->ids = empty( $ids ) ? '' : explode( ',', $ids );
 
-        $exclude =  isset( $attributes['exclude'] ) ? $attributes['exclude'] : '';
-        $this->exclude = empty( $exclude ) ? '' : explode( ',', $exclude );
+		$exclude =  isset( $attributes['exclude'] ) ? $attributes['exclude'] : '';
+		$this->exclude = empty( $exclude ) ? '' : explode( ',', $exclude );
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
-        // query defaults
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            'orderby'          => $this->orderby,
-            'order'            => $this->order,
-            'posts_per_page'   => $this->number,
+		// query defaults
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			'orderby'          => $this->orderby,
+			'order'            => $this->order,
+			'posts_per_page'   => $this->number,
 
-        );
+		);
 
-        // setup the teacher query if any teacher was specified
-        if( !empty( $this->teacher )){
+		// setup the teacher query if any teacher was specified
+		if( !empty( $this->teacher )){
 
-            // when users passed in a csv
-            if( strpos( $this->teacher, ',' ) ){
+			// when users passed in a csv
+			if( strpos( $this->teacher, ',' ) ){
 
-                $teachers = explode( ',', $this->teacher );
+				$teachers = explode( ',', $this->teacher );
 
-                // for all user names given convert them to user ID's
-                foreach( $teachers as $index => $teacher  ){
+				// for all user names given convert them to user ID's
+				foreach( $teachers as $index => $teacher  ){
 
-                    //replace the teacher value with the teachers ID
-                    if( ! is_numeric( $teacher ) ){
+					//replace the teacher value with the teachers ID
+					if( ! is_numeric( $teacher ) ){
 
-                        $user = get_user_by('login', $teacher);
-                        $teachers[$index] = $user->ID;
+						$user = get_user_by('login', $teacher);
+						$teachers[$index] = $user->ID;
 
-                    }
+					}
 
-                } // end for each
+				} // end for each
 
-                $teacher_query_by = 'author__in';
-                $this->teacher = $teachers;
+				$teacher_query_by = 'author__in';
+				$this->teacher = $teachers;
 
-            }else{
-                // when users passed in a single teacher value
-                $teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
+			}else{
+				// when users passed in a single teacher value
+				$teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
 
-            }
+			}
 
-            // attach teacher query by and teacher query value to the course query
-            $query_args[ $teacher_query_by ] = $this->teacher;
+			// attach teacher query by and teacher query value to the course query
+			$query_args[ $teacher_query_by ] = $this->teacher;
 
-        }// end if empty teacher
+		}// end if empty teacher
 
 
-        // add the course category taxonomy query
-        if( ! empty( $this->category ) ) {
+		// add the course category taxonomy query
+		if( ! empty( $this->category ) ) {
 
-            $tax_query = array();
-            $term_id = intval( term_exists($this->category) );
+			$tax_query = array();
+			$term_id = intval( term_exists($this->category) );
 
-            if (! empty( $term_id) ) {
+			if (! empty( $term_id) ) {
 
-                $tax_query = array(
-                    'taxonomy' => 'course-category',
-                    'field' => 'id',
-                    'terms' => $term_id,
-                );
+				$tax_query = array(
+					'taxonomy' => 'course-category',
+					'field' => 'id',
+					'terms' => $term_id,
+				);
 
-            }
+			}
 
-            $query_args['tax_query'] = array($tax_query);
+			$query_args['tax_query'] = array($tax_query);
 
-        }
+		}
 
-        // limit the query if the user supplied ids
-        if( ! empty( $this->ids ) && is_array( $this->ids ) ) {
+		// limit the query if the user supplied ids
+		if( ! empty( $this->ids ) && is_array( $this->ids ) ) {
 
-            $query_args['post__in'] = $this->ids;
+			$query_args['post__in'] = $this->ids;
 
-        }
+		}
 
-        // exclude the course by id fromt he query
-        if( ! empty( $this->exclude ) && is_array( $this->exclude ) ) {
+		// exclude the course by id fromt he query
+		if( ! empty( $this->exclude ) && is_array( $this->exclude ) ) {
 
-            $query_args['post__not_in'] = $this->exclude;
+			$query_args['post__not_in'] = $this->exclude;
 
-        }
+		}
 
-        $this->query = new WP_Query( $query_args );
+		$this->query = new WP_Query( $query_args );
 
-    }// end setup _course_query
+	}// end setup _course_query
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
 
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        ob_start();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+		ob_start();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_courses] shortcode
@@ -65,33 +65,33 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->teacher = isset( $attributes['teacher'] ) ? $attributes['teacher'] : '';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'date';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->teacher = isset($attributes['teacher']) ? $attributes['teacher'] : '';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'date';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'DESC';
 
         }
 
-        $category = isset( $attributes['category'] ) ? $attributes['category'] : '';
-        $this->category = is_numeric( $category ) ? intval( $category ) : $category;
+        $category = isset($attributes['category']) ? $attributes['category'] : '';
+        $this->category = is_numeric($category) ? intval($category) : $category;
 
-        $ids =  isset( $attributes['ids'] ) ? $attributes['ids'] : '';
-        $this->ids = empty( $ids ) ? '' : explode( ',', $ids );
+        $ids = isset($attributes['ids']) ? $attributes['ids'] : '';
+        $this->ids = empty($ids) ? '' : explode(',', $ids);
 
-        $exclude =  isset( $attributes['exclude'] ) ? $attributes['exclude'] : '';
-        $this->exclude = empty( $exclude ) ? '' : explode( ',', $exclude );
+        $exclude = isset($attributes['exclude']) ? $attributes['exclude'] : '';
+        $this->exclude = empty($exclude) ? '' : explode(',', $exclude);
 
         // setup the course query that will be used when rendering
         $this->setup_course_query();
@@ -103,7 +103,7 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
         // query defaults
         $query_args = array(
@@ -116,18 +116,18 @@ 
         );
 
         // setup the teacher query if any teacher was specified
-        if( !empty( $this->teacher )){
+        if ( ! empty($this->teacher)) {
 
             // when users passed in a csv
-            if( strpos( $this->teacher, ',' ) ){
+            if (strpos($this->teacher, ',')) {
 
-                $teachers = explode( ',', $this->teacher );
+                $teachers = explode(',', $this->teacher);
 
                 // for all user names given convert them to user ID's
-                foreach( $teachers as $index => $teacher  ){
+                foreach ($teachers as $index => $teacher) {
 
                     //replace the teacher value with the teachers ID
-                    if( ! is_numeric( $teacher ) ){
+                    if ( ! is_numeric($teacher)) {
 
                         $user = get_user_by('login', $teacher);
                         $teachers[$index] = $user->ID;
@@ -139,25 +139,25 @@ 
                 $teacher_query_by = 'author__in';
                 $this->teacher = $teachers;
 
-            }else{
+            } else {
                 // when users passed in a single teacher value
-                $teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
+                $teacher_query_by = is_numeric($this->teacher) ? 'author' : 'author_name';
 
             }
 
             // attach teacher query by and teacher query value to the course query
-            $query_args[ $teacher_query_by ] = $this->teacher;
+            $query_args[$teacher_query_by] = $this->teacher;
 
         }// end if empty teacher
 
 
         // add the course category taxonomy query
-        if( ! empty( $this->category ) ) {
+        if ( ! empty($this->category)) {
 
             $tax_query = array();
-            $term_id = intval( term_exists($this->category) );
+            $term_id = intval(term_exists($this->category));
 
-            if (! empty( $term_id) ) {
+            if ( ! empty($term_id)) {
 
                 $tax_query = array(
                     'taxonomy' => 'course-category',
@@ -172,20 +172,20 @@ 
         }
 
         // limit the query if the user supplied ids
-        if( ! empty( $this->ids ) && is_array( $this->ids ) ) {
+        if ( ! empty($this->ids) && is_array($this->ids)) {
 
             $query_args['post__in'] = $this->ids;
 
         }
 
         // exclude the course by id fromt he query
-        if( ! empty( $this->exclude ) && is_array( $this->exclude ) ) {
+        if ( ! empty($this->exclude) && is_array($this->exclude)) {
 
             $query_args['post__not_in'] = $this->exclude;
 
         }
 
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
@@ -194,7 +194,7 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
@@ -206,7 +206,7 @@ 
 
         ob_start();
         Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         //restore old query
         $wp_query = $current_global_query;

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 /**
  *
  * Renders the [sensei_courses] shortcode
@@ -77,7 +80,7 @@ 
 
             $this->order =  'ASC';
 
-        }else{
+        } else{
 
             // for everything else use the value passed or the default DESC
             $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
@@ -139,7 +142,7 @@ 
                 $teacher_query_by = 'author__in';
                 $this->teacher = $teachers;
 
-            }else{
+            } else{
                 // when users passed in a single teacher value
                 $teacher_query_by = is_numeric( $this->teacher )? 'author':'author_name';
 

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

Indentation +60 added lines, -60 removed lines

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

Spacing +12 added lines, -12 removed lines

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

Braces +5 added lines, -2 removed lines

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

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

Indentation +121 added lines, -121 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +4 added lines, -1 removed lines

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

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

Indentation +124 added lines, -124 removed lines

@@ -14,138 +14,138 @@
  */
 class Sensei_Shortcode_Unpurchased_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
-
-    /**
-     * @var string number of items to show on the current page
-     * Default: all.
-     */
-    protected $number;
-
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
-
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        if( !is_user_logged_in() ) {
-            return;
-        }
-
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
-
-            $this->order =  'ASC';
-
-        }else{
-
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
-
-        }
-
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
-
-    /**
-     * Sets up the object course query
-     * that will be used int he render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
-
-        // course query parameters to be used for all courses
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            // the number specified by the user will be used later in this function
-            'posts_per_page' => 1000,
-            'orderby'          => $this->orderby,
-            'order'            => $this->order
-        );
-
-        // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
-
-        $paid_courses_not_taken = array();
-        // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
-
-            // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
-                &&
-                ! WooThemes_Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
-
-                    $paid_courses_not_taken[] = $course->ID;
-
-                }
-
-        } // end foreach
-
-
-        // setup the course query again and only use the course the user has not purchased.
-        // this query will be loaded into the global WP_Query in the render function.
-        $query_args['post__in'] = $paid_courses_not_taken;
-        $query_args['posts_per_page'] = $this->number;
-        $this->query = new WP_Query( $query_args );
-
-    }// end setup _course_query
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
+
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: all.
+	 */
+	protected $number;
+
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
+
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		if( !is_user_logged_in() ) {
+			return;
+		}
+
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+
+			$this->order =  'ASC';
+
+		}else{
+
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+
+		}
+
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
+
+	/**
+	 * Sets up the object course query
+	 * that will be used int he render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
+
+		// course query parameters to be used for all courses
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			// the number specified by the user will be used later in this function
+			'posts_per_page' => 1000,
+			'orderby'          => $this->orderby,
+			'order'            => $this->order
+		);
+
+		// get all the courses that has a product attached
+		$all_courses_query = new WP_Query( $query_args );
+
+		$paid_courses_not_taken = array();
+		// look through all course and find the purchasable ones that user has not purchased
+		foreach( $all_courses_query->posts as $course ){
+
+			// only keep the courses with a product including only  courses that the user not taking
+			$course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
+			if( is_numeric( $course_product_id )
+				&&
+				! WooThemes_Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
+			){
+
+					$paid_courses_not_taken[] = $course->ID;
+
+				}
+
+		} // end foreach
+
+
+		// setup the course query again and only use the course the user has not purchased.
+		// this query will be loaded into the global WP_Query in the render function.
+		$query_args['post__in'] = $paid_courses_not_taken;
+		$query_args['posts_per_page'] = $this->number;
+		$this->query = new WP_Query( $query_args );
+
+	}// end setup _course_query
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if( ! is_user_logged_in() ) {
-            return '';
-        }
+		if( ! is_user_logged_in() ) {
+			return '';
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
 
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        ob_start();
-        Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+		ob_start();
+		Sensei_Templates::get_template('loop-course.php');
+		$shortcode_output =  ob_get_clean();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_unpurchased_courses] shortcode when a user is logged in. If the user is not logged in
@@ -45,25 +45,25 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        if( !is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return;
         }
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'title';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'DESC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'DESC';
 
         }
 
@@ -77,7 +77,7 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
         // course query parameters to be used for all courses
         $query_args = array(
@@ -90,18 +90,18 @@ 
         );
 
         // get all the courses that has a product attached
-        $all_courses_query = new WP_Query( $query_args );
+        $all_courses_query = new WP_Query($query_args);
 
         $paid_courses_not_taken = array();
         // look through all course and find the purchasable ones that user has not purchased
-        foreach( $all_courses_query->posts as $course ){
+        foreach ($all_courses_query->posts as $course) {
 
             // only keep the courses with a product including only  courses that the user not taking
-            $course_product_id = get_post_meta( $course->ID, '_course_woocommerce_product',true );
-            if( is_numeric( $course_product_id )
+            $course_product_id = get_post_meta($course->ID, '_course_woocommerce_product', true);
+            if (is_numeric($course_product_id)
                 &&
-                ! WooThemes_Sensei_Utils::user_started_course( $course->ID , get_current_user_id()  )
-            ){
+                ! WooThemes_Sensei_Utils::user_started_course($course->ID, get_current_user_id())
+            ) {
 
                     $paid_courses_not_taken[] = $course->ID;
 
@@ -114,7 +114,7 @@ 
         // this query will be loaded into the global WP_Query in the render function.
         $query_args['post__in'] = $paid_courses_not_taken;
         $query_args['posts_per_page'] = $this->number;
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
@@ -123,11 +123,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
-        if( ! is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return '';
         }
 
@@ -139,7 +139,7 @@ 
 
         ob_start();
         Sensei_Templates::get_template('loop-course.php');
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         //restore old query
         $wp_query = $current_global_query;

Braces +5 added lines, -2 removed lines

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

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

Indentation +83 added lines, -83 removed lines

@@ -15,88 +15,88 @@
  */
 class Sensei_Shortcode_User_Messages implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array $messages{
-     *     @type WP_Post
-     * }
-     * messages for the current user
-     */
-    protected $messages_query;
-
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
-
-        if( is_user_logged_in() ){
-
-            $this->setup_messages_query();
-
-        }
-
-    }
-
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_messages_query(){
-
-        $user = wp_get_current_user();
-
-        $args = array(
-            'post_type' => 'sensei_message',
-            'posts_per_page' => 500,
-            'orderby' => 'date',
-            'order' => 'DESC',
-            'post_status' => 'publish',
-            'meta_query' => array(
-                array(
-                    'key'     => '_sender',
-                    'value'   => $user->user_login,
-                    'compare' => '=',
-                ),
-            ),
-        );
-
-        $this->messages_query  = new WP_Query( $args );
-    }
-
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
-
-        $messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
-                                            || ! Sensei()->settings->settings['messages_disable'] ) ;
-
-        if( empty( $this->messages_query ) || $messages_disabled_in_settings ){
-
-            return '';
-
-        }
-
-        //set the wp_query to the current messages query
-        global $wp_query;
-        $wp_query = $this->messages_query;
-
-        ob_start();
-        Sensei_Templates::get_part('loop', 'message');
-        $messages_html = ob_get_clean();
-
-        // set back the global query
-        wp_reset_query();
-
-        return $messages_html;
-
-    }// end render
+	/**
+	 * @var array $messages{
+	 *     @type WP_Post
+	 * }
+	 * messages for the current user
+	 */
+	protected $messages_query;
+
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
+
+		if( is_user_logged_in() ){
+
+			$this->setup_messages_query();
+
+		}
+
+	}
+
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_messages_query(){
+
+		$user = wp_get_current_user();
+
+		$args = array(
+			'post_type' => 'sensei_message',
+			'posts_per_page' => 500,
+			'orderby' => 'date',
+			'order' => 'DESC',
+			'post_status' => 'publish',
+			'meta_query' => array(
+				array(
+					'key'     => '_sender',
+					'value'   => $user->user_login,
+					'compare' => '=',
+				),
+			),
+		);
+
+		$this->messages_query  = new WP_Query( $args );
+	}
+
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
+
+		$messages_disabled_in_settings =  ! ( ! isset( Sensei()->settings->settings['messages_disable'] )
+											|| ! Sensei()->settings->settings['messages_disable'] ) ;
+
+		if( empty( $this->messages_query ) || $messages_disabled_in_settings ){
+
+			return '';
+
+		}
+
+		//set the wp_query to the current messages query
+		global $wp_query;
+		$wp_query = $this->messages_query;
+
+		ob_start();
+		Sensei_Templates::get_part('loop', 'message');
+		$messages_html = ob_get_clean();
+
+		// set back the global query
+		wp_reset_query();
+
+		return $messages_html;
+
+	}// end render
 
 }// end class
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

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

Braces +4 added lines, -1 removed lines

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

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

Indentation +110 added lines, -110 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +5 added lines, -2 removed lines

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

includes/shortcodes/interface-sensei-shortcode.php

Indentation +13 added lines, -13 removed lines

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