woothemes / sensei

templates/user/my-courses.php

Indentation +37 added lines, -37 removed lines

@@ -1,61 +1,61 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying the my course page data.
- *
- * Override this template by copying it to yourtheme/sensei/user/my-courses.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying the my course page data.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/user/my-courses.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <?php
 /**
- * Executes before the Sensei my courses markup begins. This hook
- * only fires whe a user is logged in. If you need to add
- * something here for when users are logged out use `sensei_login_form_before`.
- *
- * @since 1.9.0
- */
+	 * Executes before the Sensei my courses markup begins. This hook
+	 * only fires whe a user is logged in. If you need to add
+	 * something here for when users are logged out use `sensei_login_form_before`.
+	 *
+	 * @since 1.9.0
+	 */
 do_action( 'sensei_my_courses_before' );
 ?>
 
 <section id="main-course" class="course-container">
 
     <?php
-    /**
-     * Executes inside just before the Sensei my courses content. This hook
-     * only fires whe a user is logged in.
-     *
-     * @since 1.9.0
-     */
-    do_action( 'sensei_my_courses_content_inside_before' );
-    ?>
+	/**
+	 * Executes inside just before the Sensei my courses content. This hook
+	 * only fires whe a user is logged in.
+	 *
+	 * @since 1.9.0
+	 */
+	do_action( 'sensei_my_courses_content_inside_before' );
+	?>
 
     <?php sensei_the_my_courses_content(); ?>
 
     <?php
-    /**
-     * Executes inside just after the Sensei my courses content. This hook
-     * only fires whe a user is logged in.
-     *
-     * @since 1.9.0
-     */
-    do_action( 'sensei_my_courses_content_inside_after' );
-    ?>
+	/**
+	 * Executes inside just after the Sensei my courses content. This hook
+	 * only fires whe a user is logged in.
+	 *
+	 * @since 1.9.0
+	 */
+	do_action( 'sensei_my_courses_content_inside_after' );
+	?>
 
 </section>
 
 <?php
 /**
- * Executes after the Sensei my courses template markup ends. This hook
- * only fires whe a user is logged in. If you need to add
- * something here for when users are logged out use `sensei_login_form_after`.
- *
- * @since 1.9.0
- */
+	 * Executes after the Sensei my courses template markup ends. This hook
+	 * only fires whe a user is logged in. If you need to add
+	 * something here for when users are logged out use `sensei_login_form_after`.
+	 *
+	 * @since 1.9.0
+	 */
 do_action( 'sensei_my_courses_after' );
 ?>

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * The Template for displaying the my course page data.
  *
@@ -20,7 +20,7 @@ 
  *
  * @since 1.9.0
  */
-do_action( 'sensei_my_courses_before' );
+do_action('sensei_my_courses_before');
 ?>
 
 <section id="main-course" class="course-container">
@@ -32,7 +32,7 @@ 
      *
      * @since 1.9.0
      */
-    do_action( 'sensei_my_courses_content_inside_before' );
+    do_action('sensei_my_courses_content_inside_before');
     ?>
 
     <?php sensei_the_my_courses_content(); ?>
@@ -44,7 +44,7 @@ 
      *
      * @since 1.9.0
      */
-    do_action( 'sensei_my_courses_content_inside_after' );
+    do_action('sensei_my_courses_content_inside_after');
     ?>
 
 </section>
@@ -57,5 +57,5 @@ 
  *
  * @since 1.9.0
  */
-do_action( 'sensei_my_courses_after' );
+do_action('sensei_my_courses_after');
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * The Template for displaying the my course page data.
  *

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/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-featured-courses.php

Indentation +110 added lines, -110 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +5 added lines, -2 removed lines

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

includes/shortcodes/interface-sensei-shortcode.php

Indentation +13 added lines, -13 removed lines

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

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

Indentation +92 added lines, -92 removed lines

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

Spacing +16 added lines, -16 removed lines

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

Braces +4 added lines, -1 removed lines

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

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

Indentation +191 added lines, -191 removed lines

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

Spacing +41 added lines, -41 removed lines

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

Braces +6 added lines, -5 removed lines

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