woothemes / sensei

templates/single-quiz/question_type-multi-line.php

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.
  *

Indentation +8 added lines, -8 removed lines

@@ -14,19 +14,19 @@
 
 <?php
 
-    /**
-     * Get the question data with the current quiz id
-     * All data is loaded in this array to keep the template clean.
-     */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+	/**
+	 * Get the question data with the current quiz id
+	 * All data is loaded in this array to keep the template clean.
+	 */
+	$question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
 
 ?>
 
 <?php
 
-    Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ]  ,
-                                                'textquestion' . $question_data[ 'ID' ] ,
-                                                'sensei_question[' . $question_data[ 'ID' ] . ']' );
+	Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ]  ,
+												'textquestion' . $question_data[ 'ID' ] ,
+												'sensei_question[' . $question_data[ 'ID' ] . ']' );
 
 ?>
 

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * The Template for displaying Multi Line Questions.
  *
@@ -18,15 +18,15 @@ 
      * Get the question data with the current quiz id
      * All data is loaded in this array to keep the template clean.
      */
-    $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() );
+    $question_data = WooThemes_Sensei_Question::get_template_data(sensei_get_the_question_id(), get_the_ID());
 
 ?>
 
 <?php
 
-    Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ]  ,
-                                                'textquestion' . $question_data[ 'ID' ] ,
-                                                'sensei_question[' . $question_data[ 'ID' ] . ']' );
+    Sensei_Utils::sensei_text_editor($question_data['user_answer_entry'],
+                                                'textquestion'.$question_data['ID'],
+                                                'sensei_question['.$question_data['ID'].']');
 
 ?>
 

templates/content-course.php

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.
  *

Indentation +56 added lines, -56 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * Content-course.php template file
- *
- * responsible for content on archive like pages. Only shows the course excerpt.
- *
- * For single course content please see single-course.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * Content-course.php template file
+	 *
+	 * responsible for content on archive like pages. Only shows the course excerpt.
+	 *
+	 * For single course content please see single-course.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
 <li <?php post_class(  WooThemes_Sensei_Course::get_course_loop_content_class() ); ?> >
 
     <?php
-    /**
-     * This action runs before the sensei course content. It runs inside the sensei
-     * content-course.php template.
-     *
-     * @since 1.9
-     *
-     * @param integer $course_id
-     */
-    do_action( 'sensei_course_content_before', get_the_ID() );
-    ?>
+	/**
+	 * This action runs before the sensei course content. It runs inside the sensei
+	 * content-course.php template.
+	 *
+	 * @since 1.9
+	 *
+	 * @param integer $course_id
+	 */
+	do_action( 'sensei_course_content_before', get_the_ID() );
+	?>
 
     <section class="course-content">
 
         <section class="entry">
 
             <?php
-            /**
-             * Fires just before the course content in the content-course.php file.
-             *
-             * @since 1.9
-             *
-             * @param integer $course_id
-             *
-             * @hooked Sensei_Templates::the_title          - 5
-             * @hooked Sensei()->course->course_image       - 10
-             * @hooked  Sensei()->course->the_course_meta   - 20
-             */
-            do_action('sensei_course_content_inside_before', get_the_ID() );
-            ?>
+			/**
+			 * Fires just before the course content in the content-course.php file.
+			 *
+			 * @since 1.9
+			 *
+			 * @param integer $course_id
+			 *
+			 * @hooked Sensei_Templates::the_title          - 5
+			 * @hooked Sensei()->course->course_image       - 10
+			 * @hooked  Sensei()->course->the_course_meta   - 20
+			 */
+			do_action('sensei_course_content_inside_before', get_the_ID() );
+			?>
 
             <p class="course-excerpt">
 
@@ -54,34 +54,34 @@ 
             </p>
 
             <?php
-            /**
-             * Fires just after the course content in the content-course.php file.
-             *
-             * @since 1.9
-             *
-             * @param integer $course_id
-             *
-             * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
-             */
-            do_action('sensei_course_content_inside_after', get_the_ID() );
-            ?>
+			/**
+			 * Fires just after the course content in the content-course.php file.
+			 *
+			 * @since 1.9
+			 *
+			 * @param integer $course_id
+			 *
+			 * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
+			 */
+			do_action('sensei_course_content_inside_after', get_the_ID() );
+			?>
 
         </section> <!-- section .entry -->
 
     </section> <!-- section .course-content -->
 
     <?php
-    /**
-     * Fires after the course block in the content-course.php file.
-     *
-     * @since 1.9
-     *
-     * @param integer $course_id
-     *
-     * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
-     */
-    do_action('sensei_course_content_after', get_the_ID() );
-    ?>
+	/**
+	 * Fires after the course block in the content-course.php file.
+	 *
+	 * @since 1.9
+	 *
+	 * @param integer $course_id
+	 *
+	 * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
+	 */
+	do_action('sensei_course_content_after', get_the_ID() );
+	?>
 
 
 </li> <!-- article .(<?php esc_attr_e( join( ' ', get_post_class( array( 'course', 'post' ) ) ) ); ?>  -->
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * Content-course.php template file
  *
@@ -14,7 +14,7 @@ 
  */
 ?>
 
-<li <?php post_class(  WooThemes_Sensei_Course::get_course_loop_content_class() ); ?> >
+<li <?php post_class(WooThemes_Sensei_Course::get_course_loop_content_class()); ?> >
 
     <?php
     /**
@@ -25,7 +25,7 @@ 
      *
      * @param integer $course_id
      */
-    do_action( 'sensei_course_content_before', get_the_ID() );
+    do_action('sensei_course_content_before', get_the_ID());
     ?>
 
     <section class="course-content">
@@ -44,7 +44,7 @@ 
              * @hooked Sensei()->course->course_image       - 10
              * @hooked  Sensei()->course->the_course_meta   - 20
              */
-            do_action('sensei_course_content_inside_before', get_the_ID() );
+            do_action('sensei_course_content_inside_before', get_the_ID());
             ?>
 
             <p class="course-excerpt">
@@ -63,7 +63,7 @@ 
              *
              * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
              */
-            do_action('sensei_course_content_inside_after', get_the_ID() );
+            do_action('sensei_course_content_inside_after', get_the_ID());
             ?>
 
         </section> <!-- section .entry -->
@@ -80,8 +80,8 @@ 
      *
      * @hooked  Sensei()->course->the_course_free_lesson_preview - 20
      */
-    do_action('sensei_course_content_after', get_the_ID() );
+    do_action('sensei_course_content_after', get_the_ID());
     ?>
 
 
-</li> <!-- article .(<?php esc_attr_e( join( ' ', get_post_class( array( 'course', 'post' ) ) ) ); ?>  -->
\ No newline at end of file
+</li> <!-- article .(<?php esc_attr_e(join(' ', get_post_class(array('course', 'post')))); ?>  -->
\ No newline at end of file

templates/course-results/lessons.php

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.
  *

Spacing +33 added lines, -33 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * The Template for displaying all course lessons on the course results page.
  *
@@ -14,7 +14,7 @@ 
 global $course;
 ?>
 
-<?php if ( is_user_logged_in() ): ?>
+<?php if (is_user_logged_in()): ?>
 
     <?php
     /**
@@ -22,53 +22,53 @@ 
      * is uer logged check, just above the lessons header.
      * @since 1.4.0
      */
-    do_action( 'sensei_course_results_before_lessons', $course->ID );
+    do_action('sensei_course_results_before_lessons', $course->ID);
     ?>
 
     <header>
 
-        <h2>  <?php _e( 'Lessons', 'woothemes-sensei' );  ?> </h2>
+        <h2>  <?php _e('Lessons', 'woothemes-sensei'); ?> </h2>
 
     </header>
 
-    <article class="<?php  esc_attr_e( join( ' ', get_post_class( array( 'course', 'post' ), $course->ID ) ) ); ?> ">
+    <article class="<?php  esc_attr_e(join(' ', get_post_class(array('course', 'post'), $course->ID))); ?> ">
 
         <?php
 
 		$displayed_lessons = array();
-        $modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
+        $modules = Sensei()->modules->get_course_modules(intval($course->ID));
 
         // List modules with lessons
-        foreach( $modules as $module ) {
+        foreach ($modules as $module) {
 
-            $lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
+            $lessons_query = Sensei()->modules->get_lessons_query($course->ID, $module->term_id);
             $lessons = $lessons_query->get_posts();
 
-            if( count( $lessons ) > 0 ) { ?>
+            if (count($lessons) > 0) { ?>
 
                 <h3> <?php echo $module->name; ?></h3>
 
                 <?php
                 $count = 0;
-                foreach( $lessons as $lesson ) {
+                foreach ($lessons as $lesson) {
 
                     $lesson_grade = 'n/a';
-                    $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                    if ( $has_questions ) {
-                        $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
+                    $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true);
+                    if ($has_questions) {
+                        $lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, get_current_user_id());
                         // Get user quiz grade
-                        $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                        if ( $lesson_grade ) {
+                        $lesson_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
+                        if ($lesson_grade) {
                             $lesson_grade .= '%';
                         }
                     }
                     ?>
                     <h2>
 
-                        <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ); ?>"
-                           title="<?php esc_attr_e( sprintf( __( 'Start %s', 'woothemes-sensei' ), $lesson->post_title ) ); ?>">
+                        <a href="<?php esc_url_raw(get_permalink($lesson->ID)); ?>"
+                           title="<?php esc_attr_e(sprintf(__('Start %s', 'woothemes-sensei'), $lesson->post_title)); ?>">
 
-                            <?php esc_html_e( $lesson->post_title ); ?>
+                            <?php esc_html_e($lesson->post_title); ?>
 
                         </a>
 
@@ -89,25 +89,25 @@ 
 
         <?php
 
-        $lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
-        if( 0 < count( $lessons ) ): ?>
+        $lessons = Sensei()->modules->get_none_module_lessons($course->ID);
+        if (0 < count($lessons)): ?>
 
 			<h3>
 
-                <?php _e( 'Other Lessons', 'woothemes-sensei' ); ?>
+                <?php _e('Other Lessons', 'woothemes-sensei'); ?>
 
             </h3>
 
-            <?php foreach ( $lessons as $lesson ): ?>
+            <?php foreach ($lessons as $lesson): ?>
 
                 <?php
                 $lesson_grade = 'n/a';
-                $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                if ( $has_questions ) {
-                    $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
+                $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true);
+                if ($has_questions) {
+                    $lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, get_current_user_id());
                     // Get user quiz grade
-                    $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                    if ( $lesson_grade ) {
+                    $lesson_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
+                    if ($lesson_grade) {
                         $lesson_grade .= '%';
                     }
                 }
@@ -115,9 +115,9 @@ 
 
                 <h2>
 
-                    <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ) ?>" title="<?php esc_attr_e( sprintf( __( 'Start %s', 'woothemes-sensei' ), $lesson->post_title ) ) ?>" >
+                    <a href="<?php esc_url_raw(get_permalink($lesson->ID)) ?>" title="<?php esc_attr_e(sprintf(__('Start %s', 'woothemes-sensei'), $lesson->post_title)) ?>" >
 
-                        <?php esc_html_e( sprintf( __( '%s', 'woothemes-sensei' ), $lesson->post_title ) ); ?>
+                        <?php esc_html_e(sprintf(__('%s', 'woothemes-sensei'), $lesson->post_title)); ?>
 
                     </a>
 
@@ -132,13 +132,13 @@ 
 
         <h2 class="total-grade">
 
-            <?php _e( 'Total Grade', 'woothemes-sensei' ); ?>
+            <?php _e('Total Grade', 'woothemes-sensei'); ?>
             <span class="lesson-grade">
 
                 <?php
 
-                    $course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
-                    echo $course_user_grade . '%';
+                    $course_user_grade = Sensei_Utils::sensei_course_user_grade($course->ID, get_current_user_id());
+                    echo $course_user_grade.'%';
 
                 ?>
 
@@ -155,7 +155,7 @@ 
      *
      * @since 1.4.0
      */
-	do_action( 'sensei_course_results_after_lessons', $course->ID );
+	do_action('sensei_course_results_after_lessons', $course->ID);
     ?>
 
 <?php endif; //user logged in ?>
\ No newline at end of file

Indentation +63 added lines, -63 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * The Template for displaying all course lessons on the course results page.
- *
- * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * The Template for displaying all course lessons on the course results page.
+	 *
+	 * Override this template by copying it to yourtheme/sensei/course-results/course-lessons.php
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 
 global $course;
 ?>
@@ -17,13 +17,13 @@ 
 <?php if ( is_user_logged_in() ): ?>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, just above the lessons header.
-     * @since 1.4.0
-     */
-    do_action( 'sensei_course_results_before_lessons', $course->ID );
-    ?>
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, just above the lessons header.
+	 * @since 1.4.0
+	 */
+	do_action( 'sensei_course_results_before_lessons', $course->ID );
+	?>
 
     <header>
 
@@ -36,33 +36,33 @@ 
         <?php
 
 		$displayed_lessons = array();
-        $modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
+		$modules = Sensei()->modules->get_course_modules( intval( $course->ID ) );
 
-        // List modules with lessons
-        foreach( $modules as $module ) {
+		// List modules with lessons
+		foreach( $modules as $module ) {
 
-            $lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
-            $lessons = $lessons_query->get_posts();
+			$lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id );
+			$lessons = $lessons_query->get_posts();
 
-            if( count( $lessons ) > 0 ) { ?>
+			if( count( $lessons ) > 0 ) { ?>
 
                 <h3> <?php echo $module->name; ?></h3>
 
                 <?php
-                $count = 0;
-                foreach( $lessons as $lesson ) {
-
-                    $lesson_grade = 'n/a';
-                    $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                    if ( $has_questions ) {
-                        $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
-                        // Get user quiz grade
-                        $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                        if ( $lesson_grade ) {
-                            $lesson_grade .= '%';
-                        }
-                    }
-                    ?>
+				$count = 0;
+				foreach( $lessons as $lesson ) {
+
+					$lesson_grade = 'n/a';
+					$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+					if ( $has_questions ) {
+						$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() );
+						// Get user quiz grade
+						$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+						if ( $lesson_grade ) {
+							$lesson_grade .= '%';
+						}
+					}
+					?>
                     <h2>
 
                         <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ); ?>"
@@ -80,17 +80,17 @@ 
 
                 <?php
 
-                }// end for each
+				}// end for each
 
-            }// end if count lesson
+			}// end if count lesson
 
-        } // end for each module
-        ?>
+		} // end for each module
+		?>
 
         <?php
 
-        $lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
-        if( 0 < count( $lessons ) ): ?>
+		$lessons = Sensei()->modules->get_none_module_lessons( $course->ID );
+		if( 0 < count( $lessons ) ): ?>
 
 			<h3>
 
@@ -101,17 +101,17 @@ 
             <?php foreach ( $lessons as $lesson ): ?>
 
                 <?php
-                $lesson_grade = 'n/a';
-                $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
-                if ( $has_questions ) {
-                    $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
-                    // Get user quiz grade
-                    $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
-                    if ( $lesson_grade ) {
-                        $lesson_grade .= '%';
-                    }
-                }
-                ?>
+				$lesson_grade = 'n/a';
+				$has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true );
+				if ( $has_questions ) {
+					$lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id());
+					// Get user quiz grade
+					$lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true );
+					if ( $lesson_grade ) {
+						$lesson_grade .= '%';
+					}
+				}
+				?>
 
                 <h2>
 
@@ -137,10 +137,10 @@ 
 
                 <?php
 
-                    $course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
-                    echo $course_user_grade . '%';
+					$course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() );
+					echo $course_user_grade . '%';
 
-                ?>
+				?>
 
             </span>
 
@@ -149,13 +149,13 @@ 
     </article>
 
     <?php
-    /**
-     * Fires inside course-results/lessons.php after the
-     * is uer logged check, at the bottom of all lessons.
-     *
-     * @since 1.4.0
-     */
+	/**
+	 * Fires inside course-results/lessons.php after the
+	 * is uer logged check, at the bottom of all lessons.
+	 *
+	 * @since 1.4.0
+	 */
 	do_action( 'sensei_course_results_after_lessons', $course->ID );
-    ?>
+	?>
 
 <?php endif; //user logged in ?>
\ No newline at end of file

widgets/widget-woothemes-sensei-lesson-component.php

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 Course Component Widget

Indentation +15 added lines, -15 removed lines

@@ -53,10 +53,10 @@ 
 	 */

 	public function widget( $args, $instance ) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+		$before_widget = $args[ 'before_widget' ];

+		$before_title  = $args[ 'before_title' ];

+		$after_title   = $args[ 'after_title' ];

+		$after_widget  = $args[ 'after_widget' ];

 

 		if ( in_array( $instance['component'], array_keys( $this->woo_widget_componentslist ) ) && ( 'activecourses' == $instance['component'] || 'completedcourses' == $instance['component'] ) && !is_user_logged_in() ) {

 			// No Output

@@ -117,7 +117,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+	public function form( $instance ) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -172,8 +172,8 @@ 
 		$post_args = array(	'post_type' 		=> 'lesson',

 							'posts_per_page' 		=> intval( $instance[ 'limit' ] ),

 							'orderby'         	=> 'menu_order date',

-    						'order'           	=> 'DESC',

-    						'post_status'       => 'publish',

+							'order'           	=> 'DESC',

+							'post_status'       => 'publish',

 							'suppress_filters' 	=> 0

 							);

 		$posts_array = get_posts( $post_args );

@@ -181,14 +181,14 @@ 
 		if ( count( $posts_array ) > 0 ) { ?>

 			<ul>

 			<?php foreach ($posts_array as $post_item){

-		    	$post_id = absint( $post_item->ID );

-		    	$post_title = $post_item->post_title;

-		    	$user_info = get_userdata( absint( $post_item->post_author ) );

-		    	$author_link = get_author_posts_url( absint( $post_item->post_author ) );

-		    	$author_display_name = $user_info->display_name;

-		    	$author_id = $post_item->post_author;

-		    	$lesson_course_id = get_post_meta( $post_id, '_lesson_course', true );

-		    ?>

+				$post_id = absint( $post_item->ID );

+				$post_title = $post_item->post_title;

+				$user_info = get_userdata( absint( $post_item->post_author ) );

+				$author_link = get_author_posts_url( absint( $post_item->post_author ) );

+				$author_display_name = $user_info->display_name;

+				$author_id = $post_item->post_author;

+				$lesson_course_id = get_post_meta( $post_id, '_lesson_course', true );

+			?>

 		    	<li class="fix">

 		    		<?php do_action( 'sensei_lesson_image', $post_id, '100', '100', false, true ); ?>

 		    		<a href="<?php echo esc_url( get_permalink( $post_id ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a>

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php

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

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

 

 /**

  * Sensei Lesson Component Widget

@@ -26,22 +26,22 @@ 
 	public function __construct() {

 		/* Widget variable settings. */

 		$this->woo_widget_cssclass = 'widget_sensei_lesson_component';

-		$this->woo_widget_description = __( 'This widget will output a list of the latest Lessons.', 'woothemes-sensei' );

+		$this->woo_widget_description = __('This widget will output a list of the latest Lessons.', 'woothemes-sensei');

 		$this->woo_widget_idbase = 'sensei_lesson_component';

-		$this->woo_widget_title = __( 'Sensei - Lesson Component', 'woothemes-sensei' );

+		$this->woo_widget_title = __('Sensei - Lesson Component', 'woothemes-sensei');

 

 		$this->woo_widget_componentslist = array(

-												'newlessons' => __( 'New Lessons', 'woothemes-sensei' ),

+												'newlessons' => __('New Lessons', 'woothemes-sensei'),

 												);

 

 		/* Widget settings. */

-		$widget_ops = array( 'classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description );

+		$widget_ops = array('classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description);

 

 		/* Widget control settings. */

-		$control_ops = array( 'width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase );

+		$control_ops = array('width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase);

 

 		/* Create the widget. */

-		parent::__construct( $this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops );

+		parent::__construct($this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops);

 	} // End __construct()

 

 	/**

@@ -51,35 +51,35 @@ 
 	 * @param  array $instance Widget settings for this instance.

 	 * @return void

 	 */

-	public function widget( $args, $instance ) {

+	public function widget($args, $instance) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+        $before_widget = $args['before_widget'];

+        $before_title  = $args['before_title'];

+        $after_title   = $args['after_title'];

+        $after_widget  = $args['after_widget'];

 

-		if ( in_array( $instance['component'], array_keys( $this->woo_widget_componentslist ) ) && ( 'activecourses' == $instance['component'] || 'completedcourses' == $instance['component'] ) && !is_user_logged_in() ) {

+		if (in_array($instance['component'], array_keys($this->woo_widget_componentslist)) && ('activecourses' == $instance['component'] || 'completedcourses' == $instance['component']) && ! is_user_logged_in()) {

 			// No Output

 		} else {

 			/* Our variables from the widget settings. */

-			$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

+			$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);

 

 			/* Before widget (defined by themes). */

 			echo $before_widget;

 

 			/* Display the widget title if one was input (before and after defined by themes). */

-			if ( $title ) { echo $before_title . $title . $after_title; }

+			if ($title) { echo $before_title.$title.$after_title; }

 

 			/* Widget content. */

 			// Add actions for plugins/themes to hook onto.

-			do_action( $this->woo_widget_cssclass . '_top' );

+			do_action($this->woo_widget_cssclass.'_top');

 

-			if ( in_array( $instance['component'], array_keys( $this->woo_widget_componentslist ) ) ) {

-				$this->load_component( $instance );

+			if (in_array($instance['component'], array_keys($this->woo_widget_componentslist))) {

+				$this->load_component($instance);

 			}

 

 			// Add actions for plugins/themes to hook onto.

-			do_action( $this->woo_widget_cssclass . '_bottom' );

+			do_action($this->woo_widget_cssclass.'_bottom');

 

 			/* After widget (defined by themes). */

 			echo $after_widget;

@@ -94,17 +94,17 @@ 
 	 * @param  array $old_instance Previous settings.

 	 * @return array               Updated settings.

 	 */

-	public function update ( $new_instance, $old_instance ) {

+	public function update($new_instance, $old_instance) {

 		$instance = $old_instance;

 

 		/* Strip tags for title and name to remove HTML (important for text inputs). */

-		$instance['title'] = strip_tags( $new_instance['title'] );

+		$instance['title'] = strip_tags($new_instance['title']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['component'] = esc_attr( $new_instance['component'] );

+		$instance['component'] = esc_attr($new_instance['component']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['limit'] = esc_attr( $new_instance['limit'] );

+		$instance['limit'] = esc_attr($new_instance['limit']);

 

 

 		return $instance;

@@ -117,7 +117,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+    public function form($instance) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -127,26 +127,26 @@ 
 						'limit' => 3

 					);

 

-		$instance = wp_parse_args( (array) $instance, $defaults );

+		$instance = wp_parse_args((array) $instance, $defaults);

 ?>

 		<!-- Widget Title: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"  value="<?php echo esc_attr( $instance['title'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>"  value="<?php echo esc_attr($instance['title']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" />

 		</p>

 		<!-- Widget Component: Select Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'component' ) ); ?>"><?php _e( 'Component:', 'woothemes-sensei' ); ?></label>

-			<select name="<?php echo esc_attr( $this->get_field_name( 'component' ) ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'component' ) ); ?>">

-			<?php foreach ( $this->woo_widget_componentslist as $k => $v ) { ?>

-				<option value="<?php echo esc_attr( $k ); ?>"<?php selected( $instance['component'], $k ); ?>><?php echo $v; ?></option>

+			<label for="<?php echo esc_attr($this->get_field_id('component')); ?>"><?php _e('Component:', 'woothemes-sensei'); ?></label>

+			<select name="<?php echo esc_attr($this->get_field_name('component')); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('component')); ?>">

+			<?php foreach ($this->woo_widget_componentslist as $k => $v) { ?>

+				<option value="<?php echo esc_attr($k); ?>"<?php selected($instance['component'], $k); ?>><?php echo $v; ?></option>

 			<?php } ?>

 			</select>

 		</p>

 		<!-- Widget Limit: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>"><?php _e( 'Number of Lessons (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'limit' ) ); ?>"  value="<?php echo esc_attr( $instance['limit'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('limit')); ?>"><?php _e('Number of Lessons (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('limit')); ?>"  value="<?php echo esc_attr($instance['limit']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('limit')); ?>" />

 		</p>

 

 <?php

@@ -158,7 +158,7 @@ 
 	 * @since  5.0.8

 	 * @return void

 	 */

-	protected function load_component ( $instance ) {

+	protected function load_component($instance) {

 

 		global  $current_user;

 		// Get User Meta

@@ -169,41 +169,41 @@ 
 

 		$posts_array = array();

 

-		$post_args = array(	'post_type' 		=> 'lesson',

-							'posts_per_page' 		=> intval( $instance[ 'limit' ] ),

+		$post_args = array('post_type' 		=> 'lesson',

+							'posts_per_page' 		=> intval($instance['limit']),

 							'orderby'         	=> 'menu_order date',

     						'order'           	=> 'DESC',

     						'post_status'       => 'publish',

 							'suppress_filters' 	=> 0

 							);

-		$posts_array = get_posts( $post_args );

+		$posts_array = get_posts($post_args);

 

-		if ( count( $posts_array ) > 0 ) { ?>

+		if (count($posts_array) > 0) { ?>

 			<ul>

-			<?php foreach ($posts_array as $post_item){

-		    	$post_id = absint( $post_item->ID );

+			<?php foreach ($posts_array as $post_item) {

+		    	$post_id = absint($post_item->ID);

 		    	$post_title = $post_item->post_title;

-		    	$user_info = get_userdata( absint( $post_item->post_author ) );

-		    	$author_link = get_author_posts_url( absint( $post_item->post_author ) );

+		    	$user_info = get_userdata(absint($post_item->post_author));

+		    	$author_link = get_author_posts_url(absint($post_item->post_author));

 		    	$author_display_name = $user_info->display_name;

 		    	$author_id = $post_item->post_author;

-		    	$lesson_course_id = get_post_meta( $post_id, '_lesson_course', true );

+		    	$lesson_course_id = get_post_meta($post_id, '_lesson_course', true);

 		    ?>

 		    	<li class="fix">

-		    		<?php do_action( 'sensei_lesson_image', $post_id, '100', '100', false, true ); ?>

-		    		<a href="<?php echo esc_url( get_permalink( $post_id ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a>

+		    		<?php do_action('sensei_lesson_image', $post_id, '100', '100', false, true); ?>

+		    		<a href="<?php echo esc_url(get_permalink($post_id)); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a>

 		    		<br />

-		    		<?php if ( isset( Sensei()->settings->settings[ 'lesson_author' ] ) && ( Sensei()->settings->settings[ 'lesson_author' ] ) ) { ?>

-    					<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><a href="<?php echo esc_url( $author_link ); ?>" title="<?php echo esc_attr( $author_display_name ); ?>"><?php echo esc_html( $author_display_name ); ?></a></span>

+		    		<?php if (isset(Sensei()->settings->settings['lesson_author']) && (Sensei()->settings->settings['lesson_author'])) { ?>

+    					<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><a href="<?php echo esc_url($author_link); ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span>

     					<br />

     				<?php } // End If Statement ?>

-    				<?php if ( 0 < $lesson_course_id ) { ?>

-                        <span class="lesson-course"><?php echo ' ' . sprintf( __( 'Part of: %s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '" title="' . esc_attr( __( 'View course', 'woothemes-sensei' ) ) . '"><em>' . get_the_title( $lesson_course_id ) . '</em></a>' ); ?></span>

+    				<?php if (0 < $lesson_course_id) { ?>

+                        <span class="lesson-course"><?php echo ' '.sprintf(__('Part of: %s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($lesson_course_id)).'" title="'.esc_attr(__('View course', 'woothemes-sensei')).'"><em>'.get_the_title($lesson_course_id).'</em></a>'); ?></span>

                     <?php } ?>

     				<br />

 		    	</li>

 		    <?php } // End For Loop ?>

-		    <?php echo '<li class="my-account fix"><a class="button" href="'. esc_url( get_post_type_archive_link( 'lesson' ) ) .'">'.__('More Lessons', 'woothemes-sensei').'</a></li>'; ?>

+		    <?php echo '<li class="my-account fix"><a class="button" href="'.esc_url(get_post_type_archive_link('lesson')).'">'.__('More Lessons', 'woothemes-sensei').'</a></li>'; ?>

 		</ul>

 		<?php } // End If Statement

 	} // End load_component()

widgets/widget-woothemes-sensei-course-categories.php

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 Course Component Widget

Indentation +19 added lines, -19 removed lines

@@ -49,31 +49,31 @@ 
 	 */

 	public function widget( $args, $instance ) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+		$before_widget = $args[ 'before_widget' ];

+		$before_title  = $args[ 'before_title' ];

+		$after_title   = $args[ 'after_title' ];

+		$after_widget  = $args[ 'after_widget' ];

 

-        /* Our variables from the widget settings. */

-        $title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

+		/* Our variables from the widget settings. */

+		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

 

-        /* Before widget (defined by themes). */

-        echo $before_widget;

+		/* Before widget (defined by themes). */

+		echo $before_widget;

 

-        /* Display the widget title if one was input (before and after defined by themes). */

-        if ( $title ) { echo $before_title . $title . $after_title; }

+		/* Display the widget title if one was input (before and after defined by themes). */

+		if ( $title ) { echo $before_title . $title . $after_title; }

 

-        /* Widget content. */

-        // Add actions for plugins/themes to hook onto.

-        do_action( $this->woo_widget_cssclass . '_top' );

+		/* Widget content. */

+		// Add actions for plugins/themes to hook onto.

+		do_action( $this->woo_widget_cssclass . '_top' );

 

-        $this->load_component( $instance );

+		$this->load_component( $instance );

 

-        // Add actions for plugins/themes to hook onto.

-        do_action( $this->woo_widget_cssclass . '_bottom' );

+		// Add actions for plugins/themes to hook onto.

+		do_action( $this->woo_widget_cssclass . '_bottom' );

 

-        /* After widget (defined by themes). */

-        echo $after_widget;

+		/* After widget (defined by themes). */

+		echo $after_widget;

 

 	} // End widget()

 

@@ -107,7 +107,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+	public function form( $instance ) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

Spacing +37 added lines, -37 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 Categories Widget

@@ -26,18 +26,18 @@ 
 	public function __construct() {

 		/* Widget variable settings. */

 		$this->woo_widget_cssclass = 'widget_sensei_course_categories';

-		$this->woo_widget_description = __( 'This widget will output a list of Course Categories.', 'woothemes-sensei' );

+		$this->woo_widget_description = __('This widget will output a list of Course Categories.', 'woothemes-sensei');

 		$this->woo_widget_idbase = 'sensei_course_categories';

-		$this->woo_widget_title = __( 'Sensei - Course Categories', 'woothemes-sensei' );

+		$this->woo_widget_title = __('Sensei - Course Categories', 'woothemes-sensei');

 

 		/* Widget settings. */

-		$widget_ops = array( 'classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description );

+		$widget_ops = array('classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description);

 

 		/* Widget control settings. */

-		$control_ops = array( 'width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase );

+		$control_ops = array('width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase);

 

 		/* Create the widget. */

-		parent::__construct( $this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops );

+		parent::__construct($this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops);

 	} // End __construct()

 

 	/**

@@ -47,30 +47,30 @@ 
 	 * @param  array $instance Widget settings for this instance.

 	 * @return void

 	 */

-	public function widget( $args, $instance ) {

+	public function widget($args, $instance) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+        $before_widget = $args['before_widget'];

+        $before_title  = $args['before_title'];

+        $after_title   = $args['after_title'];

+        $after_widget  = $args['after_widget'];

 

         /* Our variables from the widget settings. */

-        $title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

+        $title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);

 

         /* Before widget (defined by themes). */

         echo $before_widget;

 

         /* Display the widget title if one was input (before and after defined by themes). */

-        if ( $title ) { echo $before_title . $title . $after_title; }

+        if ($title) { echo $before_title.$title.$after_title; }

 

         /* Widget content. */

         // Add actions for plugins/themes to hook onto.

-        do_action( $this->woo_widget_cssclass . '_top' );

+        do_action($this->woo_widget_cssclass.'_top');

 

-        $this->load_component( $instance );

+        $this->load_component($instance);

 

         // Add actions for plugins/themes to hook onto.

-        do_action( $this->woo_widget_cssclass . '_bottom' );

+        do_action($this->woo_widget_cssclass.'_bottom');

 

         /* After widget (defined by themes). */

         echo $after_widget;

@@ -84,14 +84,14 @@ 
 	 * @param  array $old_instance Previous settings.

 	 * @return array               Updated settings.

 	 */

-	public function update ( $new_instance, $old_instance ) {

+	public function update($new_instance, $old_instance) {

 		$instance = $old_instance;

 

 		/* Strip tags for title and name to remove HTML (important for text inputs). */

-		$instance['title'] = strip_tags( $new_instance['title'] );

+		$instance['title'] = strip_tags($new_instance['title']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['limit'] = esc_attr( $new_instance['limit'] );

+		$instance['limit'] = esc_attr($new_instance['limit']);

 

 		/* The check box is returning a boolean value. */

 		$instance['count'] = $new_instance['count'];

@@ -107,7 +107,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+    public function form($instance) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -118,27 +118,27 @@ 
 						'hierarchical' => false

 					);

 

-		$instance = wp_parse_args( (array) $instance, $defaults );

+		$instance = wp_parse_args((array) $instance, $defaults);

 ?>

 		<!-- Widget Title: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"  value="<?php echo esc_attr( $instance['title'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>"  value="<?php echo esc_attr($instance['title']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" />

 		</p>

 		<!-- Widget Limit: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>"><?php _e( 'Number of Categories (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'limit' ) ); ?>"  value="<?php echo esc_attr( $instance['limit'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('limit')); ?>"><?php _e('Number of Categories (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('limit')); ?>"  value="<?php echo esc_attr($instance['limit']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('limit')); ?>" />

 		</p>

 		<!-- Widget Show Count: Checkbox Input -->

 		<p>

-			<input type="checkbox" class="checkbox" id="<?php echo esc_attr( $this->get_field_id('count') ); ?>" name="<?php echo esc_attr( $this->get_field_name('count') ); ?>"<?php checked( $instance['count'], 'on' ); ?> />

-			<label for="<?php echo esc_attr( $this->get_field_id('count') ); ?>"><?php _e( 'Show post counts', 'woothemes-sensei' ); ?></label><br />

+			<input type="checkbox" class="checkbox" id="<?php echo esc_attr($this->get_field_id('count')); ?>" name="<?php echo esc_attr($this->get_field_name('count')); ?>"<?php checked($instance['count'], 'on'); ?> />

+			<label for="<?php echo esc_attr($this->get_field_id('count')); ?>"><?php _e('Show post counts', 'woothemes-sensei'); ?></label><br />

 		</p>

 		<!-- Widget Show Hierarchy: Checkbox Input -->

 		<p>

-			<input type="checkbox" class="checkbox" id="<?php echo esc_attr( $this->get_field_id('hierarchical') ); ?>" name="<?php echo esc_attr( $this->get_field_name('hierarchical') ); ?>"<?php checked( $instance['hierarchical'], 'on' ); ?> />

-			<label for="<?php echo esc_attr( $this->get_field_id('hierarchical') ); ?>"><?php _e( 'Show hierarchy', 'woothemes-sensei' ); ?></label></p>

+			<input type="checkbox" class="checkbox" id="<?php echo esc_attr($this->get_field_id('hierarchical')); ?>" name="<?php echo esc_attr($this->get_field_name('hierarchical')); ?>"<?php checked($instance['hierarchical'], 'on'); ?> />

+			<label for="<?php echo esc_attr($this->get_field_id('hierarchical')); ?>"><?php _e('Show hierarchy', 'woothemes-sensei'); ?></label></p>

 		</p>

 <?php

 	} // End form()

@@ -149,18 +149,18 @@ 
 	 * @since  1.1.0

 	 * @return void

 	 */

-	protected function load_component ( $instance ) {

+	protected function load_component($instance) {

 

-		$limit = intval( $instance['limit'] );

-		$count = isset($instance['count']) ? (bool) $instance['count'] :false;

-		$hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;

+		$limit = intval($instance['limit']);

+		$count = isset($instance['count']) ? (bool) $instance['count'] : false;

+		$hierarchical = isset($instance['hierarchical']) ? (bool) $instance['hierarchical'] : false;

 

-		$cat_args = array( 'title_li' => '', 'taxonomy' => 'course-category', 'orderby' => 'name', 'show_count' => $count, 'hierarchical' => $hierarchical);

-		if ( 0 < $limit ) {

-			$cat_args[ 'number' ] = $limit;

+		$cat_args = array('title_li' => '', 'taxonomy' => 'course-category', 'orderby' => 'name', 'show_count' => $count, 'hierarchical' => $hierarchical);

+		if (0 < $limit) {

+			$cat_args['number'] = $limit;

 		} // End If Statement

 		echo '<ul>';

-			wp_list_categories( apply_filters('widget_course_categories_args', $cat_args) );

+			wp_list_categories(apply_filters('widget_course_categories_args', $cat_args));

 		echo '</ul>';

 	} // End load_component()

 } // End Class
\ No newline at end of file

widgets/widget-woothemes-sensei-category-courses.php

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 Course Component Widget

Indentation +14 added lines, -14 removed lines

@@ -50,10 +50,10 @@ 
 	 */

 	public function widget( $args, $instance ) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+		$before_widget = $args[ 'before_widget' ];

+		$before_title  = $args[ 'before_title' ];

+		$after_title   = $args[ 'after_title' ];

+		$after_widget  = $args[ 'after_widget' ];

 

 		/* Our variables from the widget settings. */

 		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

@@ -110,7 +110,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+	public function form( $instance ) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -157,8 +157,8 @@ 
 		$post_args = array(	'post_type' 		=> 'course',

 							'posts_per_page' 		=> intval( $instance[ 'limit' ] ),

 							'orderby'         	=> 'menu_order date',

-    						'order'           	=> 'ASC',

-    						'post_status'       => 'publish',

+							'order'           	=> 'ASC',

+							'post_status'       => 'publish',

 							'suppress_filters' 	=> 0,

 							);

 

@@ -175,13 +175,13 @@ 
 		if ( count( $posts_array ) > 0 ) { ?>

 			<ul>

 			<?php foreach ($posts_array as $post_item){

-		    	$post_id = absint( $post_item->ID );

-		    	$post_title = $post_item->post_title;

-		    	$user_info = get_userdata( absint( $post_item->post_author ) );

-		    	$author_link = get_author_posts_url( absint( $post_item->post_author ) );

-		    	$author_display_name = $user_info->display_name;

-		    	$author_id = $post_item->post_author;

-		    ?>

+				$post_id = absint( $post_item->ID );

+				$post_title = $post_item->post_title;

+				$user_info = get_userdata( absint( $post_item->post_author ) );

+				$author_link = get_author_posts_url( absint( $post_item->post_author ) );

+				$author_display_name = $user_info->display_name;

+				$author_id = $post_item->post_author;

+			?>

 		    	<li class="fix">

 		    		<?php do_action( 'sensei_course_image', $post_id ); ?>

 		    		<a href="<?php echo esc_url( get_permalink( $post_id ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a>

Spacing +46 added lines, -46 removed lines

@@ -1,5 +1,5 @@ 
 <?php

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

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

 

 /**

  * Sensei Category Courses Widget

@@ -26,18 +26,18 @@ 
 	public function __construct() {

 		/* Widget variable settings. */

 		$this->woo_widget_cssclass = 'widget_sensei_category_courses';

-		$this->woo_widget_description = __( 'This widget will output a list of Courses for a specific category.', 'woothemes-sensei' );

+		$this->woo_widget_description = __('This widget will output a list of Courses for a specific category.', 'woothemes-sensei');

 		$this->woo_widget_idbase = 'sensei_category_courses';

-		$this->woo_widget_title = __( 'Sensei - Category Courses', 'woothemes-sensei' );

+		$this->woo_widget_title = __('Sensei - Category Courses', 'woothemes-sensei');

 

 		/* Widget settings. */

-		$widget_ops = array( 'classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description );

+		$widget_ops = array('classname' => $this->woo_widget_cssclass, 'description' => $this->woo_widget_description);

 

 		/* Widget control settings. */

-		$control_ops = array( 'width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase );

+		$control_ops = array('width' => 250, 'height' => 350, 'id_base' => $this->woo_widget_idbase);

 

 		/* Create the widget. */

-		parent::__construct( $this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops );

+		parent::__construct($this->woo_widget_idbase, $this->woo_widget_title, $widget_ops, $control_ops);

 

 	} // End __construct()

 

@@ -48,32 +48,32 @@ 
 	 * @param  array $instance Widget settings for this instance.

 	 * @return void

 	 */

-	public function widget( $args, $instance ) {

+	public function widget($args, $instance) {

 

-        $before_widget = $args[ 'before_widget' ];

-        $before_title  = $args[ 'before_title' ];

-        $after_title   = $args[ 'after_title' ];

-        $after_widget  = $args[ 'after_widget' ];

+        $before_widget = $args['before_widget'];

+        $before_title  = $args['before_title'];

+        $after_title   = $args['after_title'];

+        $after_widget  = $args['after_widget'];

 

 		/* Our variables from the widget settings. */

-		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base );

+		$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);

 

 		/* Before widget (defined by themes). */

 		echo $before_widget;

 

 		/* Display the widget title if one was input (before and after defined by themes). */

-		if ( $title ) { echo $before_title . $title . $after_title; }

+		if ($title) { echo $before_title.$title.$after_title; }

 

 		/* Widget content. */

 		// Add actions for plugins/themes to hook onto.

-		do_action( $this->woo_widget_cssclass . '_top' );

+		do_action($this->woo_widget_cssclass.'_top');

 

-		if ( 0 < intval( $instance['course_category'] ) ) {

-			$this->load_component( $instance );

+		if (0 < intval($instance['course_category'])) {

+			$this->load_component($instance);

 		} // End If Statement

 

 		// Add actions for plugins/themes to hook onto.

-		do_action( $this->woo_widget_cssclass . '_bottom' );

+		do_action($this->woo_widget_cssclass.'_bottom');

 

 		/* After widget (defined by themes). */

 		echo $after_widget;

@@ -87,17 +87,17 @@ 
 	 * @param  array $old_instance Previous settings.

 	 * @return array               Updated settings.

 	 */

-	public function update ( $new_instance, $old_instance ) {

+	public function update($new_instance, $old_instance) {

 		$instance = $old_instance;

 

 		/* Strip tags for title and name to remove HTML (important for text inputs). */

-		$instance['title'] = strip_tags( $new_instance['title'] );

+		$instance['title'] = strip_tags($new_instance['title']);

 

 		/* The select box is returning a text value, so we escape it. */

-		$instance['course_category'] = esc_attr( $new_instance['course_category'] );

+		$instance['course_category'] = esc_attr($new_instance['course_category']);

 

 		/* Strip tags for limit to remove HTML (important for text inputs). */

-		$instance['limit'] = strip_tags( $new_instance['limit'] );

+		$instance['limit'] = strip_tags($new_instance['limit']);

 

 

 		return $instance;

@@ -110,7 +110,7 @@ 
 	 * @param  array $instance The settings for this instance.

 	 * @return void

 	 */

-    public function form( $instance ) {

+    public function form($instance) {

 

 		/* Set up some default widget settings. */

 		/* Make sure all keys are added here, even with empty string values. */

@@ -120,25 +120,25 @@ 
 						'limit' => 3

 					);

 

-		$instance = wp_parse_args( (array) $instance, $defaults );

+		$instance = wp_parse_args((array) $instance, $defaults);

 ?>

 		<!-- Widget Title: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"  value="<?php echo esc_attr( $instance['title'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('title')); ?>"  value="<?php echo esc_attr($instance['title']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" />

 		</p>

 		<!-- Widget Course Category: Select Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'course_category' ) ); ?>"><?php _e( 'Course Category:', 'woothemes-sensei' ); ?></label>

+			<label for="<?php echo esc_attr($this->get_field_id('course_category')); ?>"><?php _e('Course Category:', 'woothemes-sensei'); ?></label>

 			<?php

-			$cat_args = array( 'hierarchical' => true, 'show_option_none' => __( 'Select Category:', 'woothemes-sensei' ), 'taxonomy' => 'course-category', 'orderby' => 'name', 'selected' => intval( $instance['course_category'] ), 'id' => $this->get_field_id( 'course_category' ), 'name' => $this->get_field_name( 'course_category' ), 'class' => 'widefat' );

+			$cat_args = array('hierarchical' => true, 'show_option_none' => __('Select Category:', 'woothemes-sensei'), 'taxonomy' => 'course-category', 'orderby' => 'name', 'selected' => intval($instance['course_category']), 'id' => $this->get_field_id('course_category'), 'name' => $this->get_field_name('course_category'), 'class' => 'widefat');

 			wp_dropdown_categories(apply_filters('widget_course_categories_dropdown_args', $cat_args));

 			?>

 		</p>

 		<!-- Widget Limit: Text Input -->

 		<p>

-			<label for="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>"><?php _e( 'Number of Courses (optional):', 'woothemes-sensei' ); ?></label>

-			<input type="text" name="<?php echo esc_attr( $this->get_field_name( 'limit' ) ); ?>"  value="<?php echo esc_attr( $instance['limit'] ); ?>" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'limit' ) ); ?>" />

+			<label for="<?php echo esc_attr($this->get_field_id('limit')); ?>"><?php _e('Number of Courses (optional):', 'woothemes-sensei'); ?></label>

+			<input type="text" name="<?php echo esc_attr($this->get_field_name('limit')); ?>"  value="<?php echo esc_attr($instance['limit']); ?>" class="widefat" id="<?php echo esc_attr($this->get_field_id('limit')); ?>" />

 		</p>

 

 <?php

@@ -150,49 +150,49 @@ 
 	 * @since  1.1.0

 	 * @return void

 	 */

-	protected function load_component ( $instance ) {

+	protected function load_component($instance) {

 

 

 		$posts_array = array();

-		$post_args = array(	'post_type' 		=> 'course',

-							'posts_per_page' 		=> intval( $instance[ 'limit' ] ),

+		$post_args = array('post_type' 		=> 'course',

+							'posts_per_page' 		=> intval($instance['limit']),

 							'orderby'         	=> 'menu_order date',

     						'order'           	=> 'ASC',

     						'post_status'       => 'publish',

 							'suppress_filters' 	=> 0,

 							);

 

-		$post_args[ 'tax_query' ] = array(

+		$post_args['tax_query'] = array(

 											array(

 												'taxonomy' => 'course-category',

 												'field' => 'id',

-												'terms' => intval( $instance['course_category'] )

+												'terms' => intval($instance['course_category'])

 											)

 										);

 

-		$posts_array = get_posts( $post_args );

+		$posts_array = get_posts($post_args);

 

-		if ( count( $posts_array ) > 0 ) { ?>

+		if (count($posts_array) > 0) { ?>

 			<ul>

-			<?php foreach ($posts_array as $post_item){

-		    	$post_id = absint( $post_item->ID );

+			<?php foreach ($posts_array as $post_item) {

+		    	$post_id = absint($post_item->ID);

 		    	$post_title = $post_item->post_title;

-		    	$user_info = get_userdata( absint( $post_item->post_author ) );

-		    	$author_link = get_author_posts_url( absint( $post_item->post_author ) );

+		    	$user_info = get_userdata(absint($post_item->post_author));

+		    	$author_link = get_author_posts_url(absint($post_item->post_author));

 		    	$author_display_name = $user_info->display_name;

 		    	$author_id = $post_item->post_author;

 		    ?>

 		    	<li class="fix">

-		    		<?php do_action( 'sensei_course_image', $post_id ); ?>

-		    		<a href="<?php echo esc_url( get_permalink( $post_id ) ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a>

+		    		<?php do_action('sensei_course_image', $post_id); ?>

+		    		<a href="<?php echo esc_url(get_permalink($post_id)); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a>

 		    		<br />

-		    		<?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?>

-    					<span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><a href="<?php echo esc_url( $author_link ); ?>" title="<?php echo esc_attr( $author_display_name ); ?>"><?php echo esc_html( $author_display_name ); ?></a></span>

+		    		<?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?>

+    					<span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><a href="<?php echo esc_url($author_link); ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span>

     					<br />

     				<?php } // End If Statement ?>

-    				<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?></span>

+    				<span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?></span>

     				<br />

-    				<?php sensei_simple_course_price( $post_id ); ?>

+    				<?php sensei_simple_course_price($post_id); ?>

 		    	</li>

 		    <?php } // End For Loop ?>

 			</ul>

includes/class-sensei-wc.php

Braces +4 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -817,7 +817,7 @@
      * @param  int $user_id
      * @param  int $product_id
      *
-     * @return bool
+     * @return boolean|null
      */
     public static function has_customer_bought_product ( $user_id, $product_id ){
 

Indentation +748 added lines, -748 removed lines

@@ -12,735 +12,735 @@ 
  */
 
 Class Sensei_WC{
-    /**
-     * Load the files needed for the woocommerce integration.
-     *
-     * @since 1.9.0
-     */
-    public static function load_woocommerce_integration_hooks(){
+	/**
+	 * Load the files needed for the woocommerce integration.
+	 *
+	 * @since 1.9.0
+	 */
+	public static function load_woocommerce_integration_hooks(){
 
-        require_once( __DIR__ . '/hooks/woocommerce.php' );
+		require_once( __DIR__ . '/hooks/woocommerce.php' );
 
-    }
-    /**
-     * check if WooCommerce plugin is loaded and allowed by Sensei
-     *
-     * @since 1.9.0
-     * @return bool
-     */
-    public static function is_woocommerce_active(){
+	}
+	/**
+	 * check if WooCommerce plugin is loaded and allowed by Sensei
+	 *
+	 * @since 1.9.0
+	 * @return bool
+	 */
+	public static function is_woocommerce_active(){
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
-        return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
+		$is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+		return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
-    } // end is_woocommerce_active
+	} // end is_woocommerce_active
 
-    /**
-     * Checks if the WooCommerce plugin is installed and activation.
-     *
-     * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
-     * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
-     *
-     * @since 1.9.0
-     *
-     * @return bool
-     */
-    public static function is_woocommerce_present(){
+	/**
+	 * Checks if the WooCommerce plugin is installed and activation.
+	 *
+	 * If you need to check if WooCommerce is activated use Sensei_Utils::is_woocommerce_active().
+	 * This function does nott check to see if the Sensei setting for WooCommerce is enabled.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return bool
+	 */
+	public static function is_woocommerce_present(){
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+		$active_plugins = (array) get_option( 'active_plugins', array() );
 
-        if ( is_multisite() ){
+		if ( is_multisite() ){
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
 
-        }
+		}
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+		$is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+		return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
 
-    }// end is_woocommerce_present
+	}// end is_woocommerce_present
 
-    /**
-     * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
-     *
-     * If multiple exist we will return the latest order.
-     *
-     * @param $user_id
-     * @param $course_id
-     * @return array $user_course_orders
-     */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+	/**
+	 * Find the order active number (completed or processing ) for a given user on a course. It will return the latest order.
+	 *
+	 * If multiple exist we will return the latest order.
+	 *
+	 * @param $user_id
+	 * @param $course_id
+	 * @return array $user_course_orders
+	 */
+	public static function get_learner_course_active_order_id( $user_id, $course_id ){
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-        $orders_query = new WP_Query( array(
-            'post_type'   => 'shop_order',
-            'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
-            'meta_key'=> '_customer_user',
-            'meta_value'=> $user_id,
-        ) );
+		$orders_query = new WP_Query( array(
+			'post_type'   => 'shop_order',
+			'posts_per_page' => -1,
+			'post_status' => array( 'wc-processing', 'wc-completed' ),
+			'meta_key'=> '_customer_user',
+			'meta_value'=> $user_id,
+		) );
 
-        if( $orders_query->post_count == 0 ){
+		if( $orders_query->post_count == 0 ){
 
-            return false;
+			return false;
 
-        }
+		}
 
-        foreach( $orders_query->get_posts() as $order ){
+		foreach( $orders_query->get_posts() as $order ){
 
-            $order = new WC_Order( $order->ID );
-            $items = $order->get_items();
+			$order = new WC_Order( $order->ID );
+			$items = $order->get_items();
 
-            $user_orders =  array();
+			$user_orders =  array();
 
-            foreach( $items as $item ){
+			foreach( $items as $item ){
 
-                // if the product id on the order and the one given to this function
-                // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+				// if the product id on the order and the one given to this function
+				// this order has been placed by the given user on the given course.
+				$product = wc_get_product( $item['product_id'] );
 
-                if ( $product->is_type( 'variable' )) {
+				if ( $product->is_type( 'variable' )) {
 
-                    $item_product_id = $item['variation_id'];
+					$item_product_id = $item['variation_id'];
 
-                } else {
+				} else {
 
-                    $item_product_id =  $item['product_id'];
+					$item_product_id =  $item['product_id'];
 
-                }
+				}
 
-                if( $course_product_id == $item_product_id ){
+				if( $course_product_id == $item_product_id ){
 
-                    return $order->id;
+					return $order->id;
 
-                }
+				}
 
 
-            }//end for each order item
+			}//end for each order item
 
-        } // end for each order
+		} // end for each order
 
-        // if we reach this place we found no order
-        return false;
+		// if we reach this place we found no order
+		return false;
 
-    } // end get_learner_course_active_order_ids
+	} // end get_learner_course_active_order_ids
 
-    /**
-     * Output WooCommerce specific course filters
-     * Removing the paged argument
-     *
-     * @since 1.9.0
-     * @param $filter_links
-     * @return mixed
-     */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+	/**
+	 * Output WooCommerce specific course filters
+	 * Removing the paged argument
+	 *
+	 * @since 1.9.0
+	 * @param $filter_links
+	 * @return mixed
+	 */
+	public static function add_course_archive_wc_filter_links( $filter_links ){
 
-        $free_courses = self::get_free_courses();
-        $paid_courses = self::get_paid_courses();
+		$free_courses = self::get_free_courses();
+		$paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
-            // do not show any WooCommerce filters if all courses are
-            // free or if all courses are paid
-            return $filter_links;
+		if ( empty( $free_courses ) || empty( $paid_courses )  ){
+			// do not show any WooCommerce filters if all courses are
+			// free or if all courses are paid
+			return $filter_links;
 
-        }
+		}
 
-        $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(
+			'id'=>'paid' ,
+			'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Paid', 'woothemes-sensei' )
+		);
 
-        $filter_links[] = array(
-            'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
-        );
+		$filter_links[] = array(
+			'id'=>'free',
+			'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
+			'title'=>__( 'Free', 'woothemes-sensei' )
+		);
 
-        return $filter_links;
+		return $filter_links;
 
-    }// end add_course_archive_wc_filter_links
+	}// end add_course_archive_wc_filter_links
 
-    /**
-     * Apply the free filter the the course query
-     * getting all course with no products or products with zero price
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_free( $query ){
+	/**
+	 * Apply the free filter the the course query
+	 * getting all course with no products or products with zero price
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_free( $query ){
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+		if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
 
-            // setup the course meta query
-            $meta_query = self::get_free_courses_meta_query_args();
+			// setup the course meta query
+			$meta_query = self::get_free_courses_meta_query_args();
 
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
 
-            // don't show any paid courses
-            $courses = self::get_paid_courses();
-            $ids = array();
-            foreach( $courses as $course ){
-                $ids[] = $course->ID;
-            }
-            $query->set( 'post__not_in', $ids );
+			// don't show any paid courses
+			$courses = self::get_paid_courses();
+			$ids = array();
+			foreach( $courses as $course ){
+				$ids[] = $course->ID;
+			}
+			$query->set( 'post__not_in', $ids );
 
-        }// end if course_filter
+		}// end if course_filter
 
-        return $query;
+		return $query;
 
-    }// course_archive_wc_filter_free
+	}// course_archive_wc_filter_free
 
-    /**
-     * Apply the paid filter to the course query on the courses page
-     * will include all course with a product attached with a price
-     * more than 0
-     *
-     * hooked into pre_get_posts
-     *
-     * @since 1.9.0
-     * @param WP_Query $query
-     * @return WP_Query $query
-     */
-    public static function course_archive_wc_filter_paid( $query ){
+	/**
+	 * Apply the paid filter to the course query on the courses page
+	 * will include all course with a product attached with a price
+	 * more than 0
+	 *
+	 * hooked into pre_get_posts
+	 *
+	 * @since 1.9.0
+	 * @param WP_Query $query
+	 * @return WP_Query $query
+	 */
+	public static function course_archive_wc_filter_paid( $query ){
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
-
-            // setup the course meta query
-            $meta_query = self::get_paid_courses_meta_query_args();
-
-            // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
-
-        }
-
-        return $query;
-
-    }
-
-    /**
-     * Load the WooCommerce single product actions above
-     * single courses if woocommerce is active allowing purchase
-     * information and actions to be hooked from WooCommerce.
-     */
-    public static function do_single_course_wc_single_product_action(){
-
-        /**
-         * this hooks is documented within the WooCommerce plugin.
-         */
-        if ( Sensei_WC::is_woocommerce_active() ) {
-
-            do_action( 'woocommerce_before_single_product' );
-
-        } // End If Statement
-
-    }// end do_single_course_wc_single_product_action
-
-    /**
-     * Hooking into the single lesson page to alter the
-     * user access permissions based on if they have purchased the
-     * course the lesson belongs to.
-     *
-     * This function will only return false or the passed in user_access value.
-     * It doesn't return true in order to avoid altering other options.
-     *
-     * @since 1.9.0
-     *
-     * @param $can_user_view_lesson
-     * @param $lesson_id
-     * @param $user_id
-     * @return bool
-     */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
-
-        // check if the course has a valid product attached to it
-        // which the user should have purchased if they want to access
-        // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
-        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
-
-            // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
-
-            // product has a successful order so this user may access the content
-            // this function may only return false or the default
-            // returning true may override other negatives which we don't want
-            if( ! $order_id ){
-
-                return false;
-
-            }
-
-        }
-
-        // return the passed in value
-        return $can_user_view_lesson;
-
-    }
-
-    /**
-     * Add course link to order thank you and details pages.
-     *
-     * @since  1.4.5
-     * @access public
-     *
-     * @return void
-     */
-    public static function course_link_from_order( ) {
-
-        if( ! is_order_received_page() ){
-            return;
-        }
-
-        $order_id = get_query_var( 'order-received' );
+		if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
+			&& 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+
+			// setup the course meta query
+			$meta_query = self::get_paid_courses_meta_query_args();
+
+			// manipulate the query to return free courses
+			$query->set('meta_query', $meta_query );
+
+		}
+
+		return $query;
+
+	}
+
+	/**
+	 * Load the WooCommerce single product actions above
+	 * single courses if woocommerce is active allowing purchase
+	 * information and actions to be hooked from WooCommerce.
+	 */
+	public static function do_single_course_wc_single_product_action(){
+
+		/**
+		 * this hooks is documented within the WooCommerce plugin.
+		 */
+		if ( Sensei_WC::is_woocommerce_active() ) {
+
+			do_action( 'woocommerce_before_single_product' );
+
+		} // End If Statement
+
+	}// end do_single_course_wc_single_product_action
+
+	/**
+	 * Hooking into the single lesson page to alter the
+	 * user access permissions based on if they have purchased the
+	 * course the lesson belongs to.
+	 *
+	 * This function will only return false or the passed in user_access value.
+	 * It doesn't return true in order to avoid altering other options.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $can_user_view_lesson
+	 * @param $lesson_id
+	 * @param $user_id
+	 * @return bool
+	 */
+	public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+
+		// check if the course has a valid product attached to it
+		// which the user should have purchased if they want to access
+		// the current lesson
+		$course_id = get_post_meta( $lesson_id , '_lesson_course', true);
+		$wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
+		if( isset ($product) && is_object($product) ){
+
+			// valid product found
+			$order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+
+			// product has a successful order so this user may access the content
+			// this function may only return false or the default
+			// returning true may override other negatives which we don't want
+			if( ! $order_id ){
+
+				return false;
+
+			}
+
+		}
+
+		// return the passed in value
+		return $can_user_view_lesson;
+
+	}
+
+	/**
+	 * Add course link to order thank you and details pages.
+	 *
+	 * @since  1.4.5
+	 * @access public
+	 *
+	 * @return void
+	 */
+	public static function course_link_from_order( ) {
+
+		if( ! is_order_received_page() ){
+			return;
+		}
+
+		$order_id = get_query_var( 'order-received' );
 		$order = new WC_Order( $order_id );
 
 		// exit early if not wc-completed or wc-processing
 		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
-            return;
-        }
+			&& 'wc-processing' != $order->post_status  ) {
+			return;
+		}
 
-        $course_links = array(); // store the for links for courses purchased
+		$course_links = array(); // store the for links for courses purchased
 		foreach ( $order->get_items() as $item ) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+			if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
 
-                // If item has variation_id then its a variation of the product
-                $item_id = $item['variation_id'];
+				// If item has variation_id then its a variation of the product
+				$item_id = $item['variation_id'];
 
-            } else {
+			} else {
 
-                //If not its real product set its id to item_id
-                $item_id = $item['product_id'];
+				//If not its real product set its id to item_id
+				$item_id = $item['product_id'];
 
-            } // End If Statement
+			} // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+			$user_id = get_post_meta( $order->id, '_customer_user', true );
 
-            if( $user_id ) {
+			if( $user_id ) {
 
-                // Get all courses for product
-                $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
-                            'key' => '_course_woocommerce_product',
-                            'value' => $item_id
-                        ) );
-                $args['orderby'] = 'menu_order date';
-                $args['order'] = 'ASC';
+				// Get all courses for product
+				$args = Sensei_Course::get_default_query_args();
+				$args['meta_query'] = array( array(
+							'key' => '_course_woocommerce_product',
+							'value' => $item_id
+						) );
+				$args['orderby'] = 'menu_order date';
+				$args['order'] = 'ASC';
 
-                // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+				// loop through courses
+				$courses = get_posts( $args );
+				if( $courses && count( $courses ) > 0 ) {
 
-                    foreach( $courses as $course ) {
+					foreach( $courses as $course ) {
 
-                        $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+						$title = $course->post_title;
+						$permalink = get_permalink( $course->ID );
+						$course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
 
-                    } // end for each
+					} // end for each
 
-                    // close the message div
+					// close the message div
 
-                }// end if $courses check
-            }
-        }// end loop through orders
+				}// end if $courses check
+			}
+		}// end loop through orders
 
-        // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+		// add the courses to the WooCommerce notice
+		if( ! empty( $course_links) ){
 
-            $courses_html = _nx(
-                'You have purchased the following course:',
-                'You have purchased the following courses:',
-                count( $course_links ),
-                'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
-            );
+			$courses_html = _nx(
+				'You have purchased the following course:',
+				'You have purchased the following courses:',
+				count( $course_links ),
+				'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
+			);
 
-            foreach( $course_links as $link ){
+			foreach( $course_links as $link ){
 
-                $courses_html .= '<li>' . $link . '</li>';
+				$courses_html .= '<li>' . $link . '</li>';
 
-            }
+			}
 
-            $courses_html .= ' </ul>';
+			$courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
-        }
+			wc_add_notice( $courses_html, 'success' );
+		}
 
 	} // end course_link_order_form
 
-    /**
-     * Show the message that a user should complete
-     * their purchase if the course is in the cart
-     *
-     * This should be used within the course loop or single course page
-     *
-     * @since 1.9.0
-     */
-    public static function course_in_cart_message(){
+	/**
+	 * Show the message that a user should complete
+	 * their purchase if the course is in the cart
+	 *
+	 * This should be used within the course loop or single course page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function course_in_cart_message(){
 
-        global $post;
+		global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+		if( self::is_course_in_cart( $post->ID ) ){ ?>
 
             <div class="sensei-message info">
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+				$cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
+							  . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
+							  . __('complete the purchase', 'woothemes-sensei') . '</a>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+				echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
 
-                ?>
+				?>
             </div>
         <?php }
 
-    } // End sensei_woocommerce_in_cart_message()
+	} // End sensei_woocommerce_in_cart_message()
 
-    /**
-     * Checks the cart to see if a course is in the cart.
-     *
-     * @param $course_id
-     * @return bool
-     */
-    public static function is_course_in_cart( $course_id ){
-
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
-
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
-
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
-
-                return true;
-
-            }
-
-        }
-
-        return false;
-
-    }// is_course_in_cart
-
-    /**
-     * Check the cart to see if the product is in the cart
-     *
-     * @param $product_id
-     * @return bool
-     */
-    public static function is_product_in_cart( $product_id ){
-
-        if ( 0 < $product_id ) {
-
-            $product = wc_get_product( $product_id );
-
-            $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
-                $wc_product_id = $product->parent->id;
-            }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
-
-                $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
-
-                    return true;
-
-                }
-
-            }
-        } // End If Statement
-
-        return false;
-
-    } // end is_product_in_car
-
-    /**
-     * Get all free WooCommerce products
-     *
-     * @since 1.9.0
-     *
-     * @return array $free_products{
-     *  @type int $wp_post_id
-     * }
-     */
-    public static function get_free_product_ids(){
-
-        return  get_posts( array(
-            'post_type' => 'product',
-            'posts_per_page' => '1000',
-            'fields' => 'ids',
-            'meta_query'=> array(
-                'relation' => 'OR',
-                array(
-                    'key'=> '_regular_price',
-                    'value' => 0,
-                ),
-                array(
-                    'key'=> '_sale_price',
-                    'value' => 0,
-                ),
-            ),
-        ));
-
-    }// end get free product query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_meta_query_param
-     */
-    public static function get_free_courses_meta_query_args(){
-
-        return array(
-            'relation' => 'OR',
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => '-',
-                'compare' => '=',
-            ),
-            array(
-                'key'     => '_course_woocommerce_product',
-                'value' => self::get_free_product_ids(),
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The metat query for courses that are free
-     *
-     * @since 1.9.0
-     * @return array $wp_query_meta_query_args_param
-     */
-    public static function get_paid_courses_meta_query_args(){
-
-        $paid_product_ids = self::get_paid_product_ids();
-
-        return array(
-            array(
-                'key'     => '_course_woocommerce_product',
-                // when empty we give a false post_id to ensure the caller doesn't get any courses for their
-                // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
-                'compare' => 'IN',
-            ),
-        );
-
-    }// get_free_courses_meta_query
-
-    /**
-     * The WordPress Query args
-     * for paid products on sale
-     *
-     * @since 1.9.0
-     * @return array $product_query_args
-     */
-    public static function get_paid_products_on_sale_query_args(){
-
-        $args = array(
-                   'post_type' 		=> 'product',
-                   'posts_per_page' 		=> 1000,
-                   'orderby'         	=> 'date',
-                   'order'           	=> 'DESC',
-                   'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-        );
-
-        return $args;
-
-    } // get_paid_products_on_sale_query_args
-
-
-    /**
-     * Return the WordPress query args for
-     * products not on sale but that is not a free
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_paid_products_not_on_sale_query_args(){
-
-        $args = array(
-            'post_type' 		=> 'product',
-            'posts_per_page' 		=> 1000,
-            'orderby'         	=> 'date',
-            'order'           	=> 'DESC',
-            'suppress_filters' 	=> 0
-        );
-
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
-            'relation' => 'AND',
-            array(
-                'key'=> '_regular_price',
-                'compare' => '>',
-                'value' => 0,
-            ),
-            array(
-                'key'=> '_sale_price',
-                'compare' => '=',
-                'value' => '',
-            ),
-        );
-
-        return $args;
-
-
-    } // get_paid_courses_meta_query
-
-    /**
-     * Get all WooCommerce non-free product id's
-     *
-     * @since 1.9.0
-     *
-     * @return array $woocommerce_paid_product_ids
-     */
-    public static function get_paid_product_ids(){
-
-        // get all the paid WooCommerce products that has regular
-        // and sale price greater than 0
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
-
-        // get all the paid WooCommerce products that has regular price
-        // greater than 0 without a sale price
-        // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
-
-        // combine products ID's with regular and sale price grater than zero and those without
-        // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
-
-        // if
-        if( empty($woocommerce_paid_product_ids) ){
-            return array( );
-        }
-        return $woocommerce_paid_product_ids;
-
-    }
-
-    /**
-     * Get all free courses.
-     *
-     * This course that have a WC product attached
-     * that has a price or sale price of zero and
-     * other courses with no WooCommerce products
-     * attached.
-     *
-     * @since 1.9.0
-     *
-     * @return array
-     */
-    public static function get_free_courses(){
-
-        $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
-
-        // don't show any paid courses
-        $courses = self::get_paid_courses();
-        $ids = array();
-        foreach( $courses as $course ){
-            $ids[] = $course->ID;
-        }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
-
-        return get_posts( $free_course_query_args );
-
-    }
-
-    /**
-     * Return all products that are not free
-     *
-     * @since 1.9.0
-     * @return array
-     */
-    public static function get_paid_courses(){
-
-        $paid_course_query_args = Sensei_Course::get_default_query_args();
-
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
-
-        return get_posts(  $paid_course_query_args );
-    }
-
-    /**
-     * Show the WooCommerce add to cart button for the  current course
-     *
-     * The function will only show the button if
-     * 1- the user can buy the course
-     * 2- if they have completed their pre-requisite
-     * 3- if the course has a valid product attached
-     *
-     * @since 1.9.0
-     * @param int $course_id
-     * @return string $html markup for the button or nothing if user not allowed to buy
-     */
-    public static function the_add_to_cart_button_html( $course_id ){
-
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
-            return '';
-        }
-
-        $wc_post_id = self::get_course_product_id( $course_id );
-
-        // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        // based on simple.php in WC templates/single-product/add-to-cart/
-        // Get the product
-        $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
-
-        // do not show the button for invalid products, non purchasable products, out
-        // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
-            || ! $product->is_purchasable()
-            || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
-
-            return '';
-
-        }
-
-        //
-        // button  output:
-        //
-        ?>
+	/**
+	 * Checks the cart to see if a course is in the cart.
+	 *
+	 * @param $course_id
+	 * @return bool
+	 */
+	public static function is_course_in_cart( $course_id ){
+
+		$wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
+		$user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+
+		if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+
+			if ( self::is_product_in_cart( $wc_post_id ) ) {
+
+				return true;
+
+			}
+
+		}
+
+		return false;
+
+	}// is_course_in_cart
+
+	/**
+	 * Check the cart to see if the product is in the cart
+	 *
+	 * @param $product_id
+	 * @return bool
+	 */
+	public static function is_product_in_cart( $product_id ){
+
+		if ( 0 < $product_id ) {
+
+			$product = wc_get_product( $product_id );
+
+			$parent_id = '';
+			if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+				$wc_product_id = $product->parent->id;
+			}
+			foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+
+				$cart_product = $values['data'];
+				if( $product_id == $cart_product->id ) {
+
+					return true;
+
+				}
+
+			}
+		} // End If Statement
+
+		return false;
+
+	} // end is_product_in_car
+
+	/**
+	 * Get all free WooCommerce products
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $free_products{
+	 *  @type int $wp_post_id
+	 * }
+	 */
+	public static function get_free_product_ids(){
+
+		return  get_posts( array(
+			'post_type' => 'product',
+			'posts_per_page' => '1000',
+			'fields' => 'ids',
+			'meta_query'=> array(
+				'relation' => 'OR',
+				array(
+					'key'=> '_regular_price',
+					'value' => 0,
+				),
+				array(
+					'key'=> '_sale_price',
+					'value' => 0,
+				),
+			),
+		));
+
+	}// end get free product query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_meta_query_param
+	 */
+	public static function get_free_courses_meta_query_args(){
+
+		return array(
+			'relation' => 'OR',
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => '-',
+				'compare' => '=',
+			),
+			array(
+				'key'     => '_course_woocommerce_product',
+				'value' => self::get_free_product_ids(),
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The metat query for courses that are free
+	 *
+	 * @since 1.9.0
+	 * @return array $wp_query_meta_query_args_param
+	 */
+	public static function get_paid_courses_meta_query_args(){
+
+		$paid_product_ids = self::get_paid_product_ids();
+
+		return array(
+			array(
+				'key'     => '_course_woocommerce_product',
+				// when empty we give a false post_id to ensure the caller doesn't get any courses for their
+				// query
+				'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+				'compare' => 'IN',
+			),
+		);
+
+	}// get_free_courses_meta_query
+
+	/**
+	 * The WordPress Query args
+	 * for paid products on sale
+	 *
+	 * @since 1.9.0
+	 * @return array $product_query_args
+	 */
+	public static function get_paid_products_on_sale_query_args(){
+
+		$args = array(
+				   'post_type' 		=> 'product',
+				   'posts_per_page' 		=> 1000,
+				   'orderby'         	=> 'date',
+				   'order'           	=> 'DESC',
+				   'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+		);
+
+		return $args;
+
+	} // get_paid_products_on_sale_query_args
+
+
+	/**
+	 * Return the WordPress query args for
+	 * products not on sale but that is not a free
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_paid_products_not_on_sale_query_args(){
+
+		$args = array(
+			'post_type' 		=> 'product',
+			'posts_per_page' 		=> 1000,
+			'orderby'         	=> 'date',
+			'order'           	=> 'DESC',
+			'suppress_filters' 	=> 0
+		);
+
+		$args[ 'fields' ]     = 'ids';
+		$args[ 'meta_query' ] = array(
+			'relation' => 'AND',
+			array(
+				'key'=> '_regular_price',
+				'compare' => '>',
+				'value' => 0,
+			),
+			array(
+				'key'=> '_sale_price',
+				'compare' => '=',
+				'value' => '',
+			),
+		);
+
+		return $args;
+
+
+	} // get_paid_courses_meta_query
+
+	/**
+	 * Get all WooCommerce non-free product id's
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array $woocommerce_paid_product_ids
+	 */
+	public static function get_paid_product_ids(){
+
+		// get all the paid WooCommerce products that has regular
+		// and sale price greater than 0
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+
+		// get all the paid WooCommerce products that has regular price
+		// greater than 0 without a sale price
+		// will be used later to check for course with the id as meta
+		$paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+
+		// combine products ID's with regular and sale price grater than zero and those without
+		// sale but regular price greater than zero
+		$woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+
+		// if
+		if( empty($woocommerce_paid_product_ids) ){
+			return array( );
+		}
+		return $woocommerce_paid_product_ids;
+
+	}
+
+	/**
+	 * Get all free courses.
+	 *
+	 * This course that have a WC product attached
+	 * that has a price or sale price of zero and
+	 * other courses with no WooCommerce products
+	 * attached.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_free_courses(){
+
+		$free_course_query_args = Sensei_Course::get_default_query_args();
+		$free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+
+		// don't show any paid courses
+		$courses = self::get_paid_courses();
+		$ids = array();
+		foreach( $courses as $course ){
+			$ids[] = $course->ID;
+		}
+		$free_course_query_args[ 'post__not_in' ] =  $ids;
+
+		return get_posts( $free_course_query_args );
+
+	}
+
+	/**
+	 * Return all products that are not free
+	 *
+	 * @since 1.9.0
+	 * @return array
+	 */
+	public static function get_paid_courses(){
+
+		$paid_course_query_args = Sensei_Course::get_default_query_args();
+
+		$paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+
+		return get_posts(  $paid_course_query_args );
+	}
+
+	/**
+	 * Show the WooCommerce add to cart button for the  current course
+	 *
+	 * The function will only show the button if
+	 * 1- the user can buy the course
+	 * 2- if they have completed their pre-requisite
+	 * 3- if the course has a valid product attached
+	 *
+	 * @since 1.9.0
+	 * @param int $course_id
+	 * @return string $html markup for the button or nothing if user not allowed to buy
+	 */
+	public static function the_add_to_cart_button_html( $course_id ){
+
+		if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+			return '';
+		}
+
+		$wc_post_id = self::get_course_product_id( $course_id );
+
+		// Check if customer purchased the product
+		if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
+			|| empty( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		// based on simple.php in WC templates/single-product/add-to-cart/
+		// Get the product
+		$product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+
+		// do not show the button for invalid products, non purchasable products, out
+		// of stock product or if course is already in cart
+		if ( ! isset ( $product )
+			|| ! is_object( $product )
+			|| ! $product->is_purchasable()
+			|| ! $product->is_in_stock()
+			|| self::is_course_in_cart( $wc_post_id ) ) {
+
+			return '';
+
+		}
+
+		//
+		// button  output:
+		//
+		?>
 
         <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
               class="cart"
@@ -773,54 +773,54 @@ 
         </form>
 
         <?php
-    } // end the_add_to_cart_button_html
+	} // end the_add_to_cart_button_html
 
-    /**
-     * Alter the no permissions message on the single course page
-     * Changes the message to a WooCommerce specific message.
-     *
-     * @since 1.9.0
-     *
-     * @param $message
-     * @param $post_id
-     *
-     * @return string $message
-     */
-    public static function alter_no_permissions_message( $message, $post_id ){
+	/**
+	 * Alter the no permissions message on the single course page
+	 * Changes the message to a WooCommerce specific message.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $message
+	 * @param $post_id
+	 *
+	 * @return string $message
+	 */
+	public static function alter_no_permissions_message( $message, $post_id ){
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
-            return  $message;
-        }
+		if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+			return  $message;
+		}
 
-        $product_id = self::get_course_product_id( $post_id );
+		$product_id = self::get_course_product_id( $post_id );
 
-        if( ! $product_id
-            || self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+		if( ! $product_id
+			|| self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
 
-            return $message;
+			return $message;
 
-        }
+		}
 
-        ob_start();
-        self::the_course_no_permissions_message( $post_id );
-        $woocommerce_course_no_permissions_message = ob_get_clean();
+		ob_start();
+		self::the_course_no_permissions_message( $post_id );
+		$woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+		return $woocommerce_course_no_permissions_message ;
 
-    }
-    /**
-     * Show the no permissions message when a user is logged in
-     * and have not yet purchased the current course
-     *
-     * @since 1.9.0
-     */
-    public static function the_course_no_permissions_message( $course_id ){
+	}
+	/**
+	 * Show the no permissions message when a user is logged in
+	 * and have not yet purchased the current course
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_course_no_permissions_message( $course_id ){
 
-        // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-        $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+		// login link
+		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
 
-        ?>
+		?>
 
         <span class="add-to-cart-login">
             <?php echo sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); ?>
@@ -828,110 +828,110 @@ 
 
     <?php }
 
-    /**
-     * Checks if a user has bought a product item.
-     *
-     * @since  1.9.0
-     *
-     * @param  int $user_id
-     * @param  int $product_id
-     *
-     * @return bool
-     */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+	/**
+	 * Checks if a user has bought a product item.
+	 *
+	 * @since  1.9.0
+	 *
+	 * @param  int $user_id
+	 * @param  int $product_id
+	 *
+	 * @return bool
+	 */
+	public static function has_customer_bought_product ( $user_id, $product_id ){
 
-        $orders = get_posts( array(
-            'posts_per_page' => -1,
-            'meta_key'    => '_customer_user',
-            'meta_value'  => intval( $user_id ),
-            'post_type'   => 'shop_order',
-            'post_status' =>  array( 'wc-processing', 'wc-completed' ),
-        ) );
+		$orders = get_posts( array(
+			'posts_per_page' => -1,
+			'meta_key'    => '_customer_user',
+			'meta_value'  => intval( $user_id ),
+			'post_type'   => 'shop_order',
+			'post_status' =>  array( 'wc-processing', 'wc-completed' ),
+		) );
 
-        foreach ( $orders as $order_id ) {
+		foreach ( $orders as $order_id ) {
 
-            $order = new WC_Order( $order_id->ID );
+			$order = new WC_Order( $order_id->ID );
 
-            if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
+			if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
 
-                continue;
-            }
+				continue;
+			}
 
-            if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
+			if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
 
-                continue;
+				continue;
 
-            }
+			}
 
-            foreach( $order->get_items() as $item ) {
+			foreach( $order->get_items() as $item ) {
 
-                // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+				// Check if user has bought product
+				if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
 
-                    // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
-                        if( $sub_key ) {
-                            $sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
-                                    return true;
-                                } else {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
+					// Check if user has an active subscription for product
+					if( class_exists( 'WC_Subscriptions_Manager' ) ) {
+						$sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
+						if( $sub_key ) {
+							$sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
+							if( $sub && isset( $sub['status'] ) ) {
+								if( 'active' == $sub['status'] ) {
+									return true;
+								} else {
+									return false;
+								}
+							}
+						}
+					}
 
-                    // Customer has bought product
-                    return true;
-                } // End If Statement
+					// Customer has bought product
+					return true;
+				} // End If Statement
 
-            } // End For each item
+			} // End For each item
 
-        } // End For each order
+		} // End For each order
 
-    } // end has customer bought product
+	} // end has customer bought product
 
-    /**
-     * Return the product id for the given course
-     *
-     * @since 1.9.0
-     *
-     * @param int $course_id
-     *
-     * @return string $woocommerce_product_id or false if none exist
-     *
-     */
-    public static function get_course_product_id( $course_id ){
+	/**
+	 * Return the product id for the given course
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param int $course_id
+	 *
+	 * @return string $woocommerce_product_id or false if none exist
+	 *
+	 */
+	public static function get_course_product_id( $course_id ){
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+		$product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
-            return false;
-        }
+		if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+			return false;
+		}
 
-        return $product_id;
+		return $product_id;
 
-    }
+	}
 
-    /**
-     * Alter the body classes adding WooCommerce to the body
-     *
-     * @param array $classes
-     * @return array
-     */
-    public static function add_woocommerce_body_class( $classes ){
+	/**
+	 * Alter the body classes adding WooCommerce to the body
+	 *
+	 * @param array $classes
+	 * @return array
+	 */
+	public static function add_woocommerce_body_class( $classes ){
 
-        if( ! in_array( 'woocommerce', $classes ) ){
+		if( ! in_array( 'woocommerce', $classes ) ){
 
-            $classes[] ='woocommerce';
+			$classes[] ='woocommerce';
 
-        }
+		}
 
 
-        return $classes;
+		return $classes;
 
-    }
+	}
 
 }// end Sensei_WC

Spacing +163 added lines, -163 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
+if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP
 
 /**
  * Sensei WooCommerce class
@@ -11,15 +11,15 @@ 
  * @since 1.9.0
  */
 
-Class Sensei_WC{
+Class Sensei_WC {
     /**
      * Load the files needed for the woocommerce integration.
      *
      * @since 1.9.0
      */
-    public static function load_woocommerce_integration_hooks(){
+    public static function load_woocommerce_integration_hooks() {
 
-        require_once( __DIR__ . '/hooks/woocommerce.php' );
+        require_once(__DIR__.'/hooks/woocommerce.php');
 
     }
     /**
@@ -28,9 +28,9 @@ 
      * @since 1.9.0
      * @return bool
      */
-    public static function is_woocommerce_active(){
+    public static function is_woocommerce_active() {
 
-        $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled'];
+        $is_woocommerce_enabled_in_settings = isset(Sensei()->settings->settings['woocommerce_enabled']) && Sensei()->settings->settings['woocommerce_enabled'];
         return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings;
 
     } // end is_woocommerce_active
@@ -45,19 +45,19 @@ 
      *
      * @return bool
      */
-    public static function is_woocommerce_present(){
+    public static function is_woocommerce_present() {
 
-        $active_plugins = (array) get_option( 'active_plugins', array() );
+        $active_plugins = (array) get_option('active_plugins', array());
 
-        if ( is_multisite() ){
+        if (is_multisite()) {
 
-            $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
 
         }
 
-        $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins );
+        $is_woocommerce_plugin_present_and_activated = in_array('woocommerce/woocommerce.php', $active_plugins) || array_key_exists('woocommerce/woocommerce.php', $active_plugins);
 
-        return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated;
+        return class_exists('Woocommerce') || $is_woocommerce_plugin_present_and_activated;
 
     }// end is_woocommerce_present
 
@@ -70,48 +70,48 @@ 
      * @param $course_id
      * @return array $user_course_orders
      */
-    public static function get_learner_course_active_order_id( $user_id, $course_id ){
+    public static function get_learner_course_active_order_id($user_id, $course_id) {
 
-        $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        $orders_query = new WP_Query( array(
+        $orders_query = new WP_Query(array(
             'post_type'   => 'shop_order',
             'posts_per_page' => -1,
-            'post_status' => array( 'wc-processing', 'wc-completed' ),
+            'post_status' => array('wc-processing', 'wc-completed'),
             'meta_key'=> '_customer_user',
             'meta_value'=> $user_id,
-        ) );
+        ));
 
-        if( $orders_query->post_count == 0 ){
+        if ($orders_query->post_count == 0) {
 
             return false;
 
         }
 
-        foreach( $orders_query->get_posts() as $order ){
+        foreach ($orders_query->get_posts() as $order) {
 
-            $order = new WC_Order( $order->ID );
+            $order = new WC_Order($order->ID);
             $items = $order->get_items();
 
-            $user_orders =  array();
+            $user_orders = array();
 
-            foreach( $items as $item ){
+            foreach ($items as $item) {
 
                 // if the product id on the order and the one given to this function
                 // this order has been placed by the given user on the given course.
-                $product = wc_get_product( $item['product_id'] );
+                $product = wc_get_product($item['product_id']);
 
-                if ( $product->is_type( 'variable' )) {
+                if ($product->is_type('variable')) {
 
                     $item_product_id = $item['variation_id'];
 
                 } else {
 
-                    $item_product_id =  $item['product_id'];
+                    $item_product_id = $item['product_id'];
 
                 }
 
-                if( $course_product_id == $item_product_id ){
+                if ($course_product_id == $item_product_id) {
 
                     return $order->id;
 
@@ -135,12 +135,12 @@ 
      * @param $filter_links
      * @return mixed
      */
-    public static function add_course_archive_wc_filter_links( $filter_links ){
+    public static function add_course_archive_wc_filter_links($filter_links) {
 
         $free_courses = self::get_free_courses();
         $paid_courses = self::get_paid_courses();
 
-        if ( empty( $free_courses ) || empty( $paid_courses )  ){
+        if (empty($free_courses) || empty($paid_courses)) {
             // do not show any WooCommerce filters if all courses are
             // free or if all courses are paid
             return $filter_links;
@@ -148,15 +148,15 @@ 
         }
 
         $filter_links[] = array(
-            'id'=>'paid' ,
-            'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Paid', 'woothemes-sensei' )
+            'id'=>'paid',
+            'url'=> add_query_arg(array('course_filter'=>'paid'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Paid', 'woothemes-sensei')
         );
 
         $filter_links[] = array(
             'id'=>'free',
-            'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ),
-            'title'=>__( 'Free', 'woothemes-sensei' )
+            'url'=> add_query_arg(array('course_filter'=>'free'), Sensei_Course::get_courses_page_url()),
+            'title'=>__('Free', 'woothemes-sensei')
         );
 
         return $filter_links;
@@ -173,24 +173,24 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_free( $query ){
+    public static function course_archive_wc_filter_free($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){
+        if (isset($_GET['course_filter']) && 'free' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_free_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
             // don't show any paid courses
             $courses = self::get_paid_courses();
             $ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
                 $ids[] = $course->ID;
             }
-            $query->set( 'post__not_in', $ids );
+            $query->set('post__not_in', $ids);
 
         }// end if course_filter
 
@@ -209,16 +209,16 @@ 
      * @param WP_Query $query
      * @return WP_Query $query
      */
-    public static function course_archive_wc_filter_paid( $query ){
+    public static function course_archive_wc_filter_paid($query) {
 
-        if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter']
-            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){
+        if (isset($_GET['course_filter']) && 'paid' == $_GET['course_filter']
+            && 'course' == $query->get('post_type') && $query->is_main_query()) {
 
             // setup the course meta query
             $meta_query = self::get_paid_courses_meta_query_args();
 
             // manipulate the query to return free courses
-            $query->set('meta_query', $meta_query );
+            $query->set('meta_query', $meta_query);
 
         }
 
@@ -231,14 +231,14 @@ 
      * single courses if woocommerce is active allowing purchase
      * information and actions to be hooked from WooCommerce.
      */
-    public static function do_single_course_wc_single_product_action(){
+    public static function do_single_course_wc_single_product_action() {
 
         /**
          * this hooks is documented within the WooCommerce plugin.
          */
-        if ( Sensei_WC::is_woocommerce_active() ) {
+        if (Sensei_WC::is_woocommerce_active()) {
 
-            do_action( 'woocommerce_before_single_product' );
+            do_action('woocommerce_before_single_product');
 
         } // End If Statement
 
@@ -259,23 +259,23 @@ 
      * @param $user_id
      * @return bool
      */
-    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){
+    public static function alter_can_user_view_lesson($can_user_view_lesson, $lesson_id, $user_id) {
 
         // check if the course has a valid product attached to it
         // which the user should have purchased if they want to access
         // the current lesson
-        $course_id = get_post_meta( $lesson_id , '_lesson_course', true);
-        $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $course_id = get_post_meta($lesson_id, '_lesson_course', true);
+        $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true);
         $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
-        if( isset ($product) && is_object($product) ){
+        if (isset ($product) && is_object($product)) {
 
             // valid product found
-            $order_id = self::get_learner_course_active_order_id( $user_id, $course_id );
+            $order_id = self::get_learner_course_active_order_id($user_id, $course_id);
 
             // product has a successful order so this user may access the content
             // this function may only return false or the default
             // returning true may override other negatives which we don't want
-            if( ! $order_id ){
+            if ( ! $order_id) {
 
                 return false;
 
@@ -298,23 +298,23 @@ 
      */
     public static function course_link_from_order( ) {
 
-        if( ! is_order_received_page() ){
+        if ( ! is_order_received_page()) {
             return;
         }
 
-        $order_id = get_query_var( 'order-received' );
-		$order = new WC_Order( $order_id );
+        $order_id = get_query_var('order-received');
+		$order = new WC_Order($order_id);
 
 		// exit early if not wc-completed or wc-processing
-		if( 'wc-completed' != $order->post_status
-            && 'wc-processing' != $order->post_status  ) {
+		if ('wc-completed' != $order->post_status
+            && 'wc-processing' != $order->post_status) {
             return;
         }
 
         $course_links = array(); // store the for links for courses purchased
-		foreach ( $order->get_items() as $item ) {
+		foreach ($order->get_items() as $item) {
 
-            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) {
+            if (isset($item['variation_id']) && (0 < $item['variation_id'])) {
 
                 // If item has variation_id then its a variation of the product
                 $item_id = $item['variation_id'];
@@ -326,28 +326,28 @@ 
 
             } // End If Statement
 
-            $user_id = get_post_meta( $order->id, '_customer_user', true );
+            $user_id = get_post_meta($order->id, '_customer_user', true);
 
-            if( $user_id ) {
+            if ($user_id) {
 
                 // Get all courses for product
                 $args = Sensei_Course::get_default_query_args();
-                $args['meta_query'] = array( array(
+                $args['meta_query'] = array(array(
                             'key' => '_course_woocommerce_product',
                             'value' => $item_id
-                        ) );
+                        ));
                 $args['orderby'] = 'menu_order date';
                 $args['order'] = 'ASC';
 
                 // loop through courses
-                $courses = get_posts( $args );
-                if( $courses && count( $courses ) > 0 ) {
+                $courses = get_posts($args);
+                if ($courses && count($courses) > 0) {
 
-                    foreach( $courses as $course ) {
+                    foreach ($courses as $course) {
 
                         $title = $course->post_title;
-                        $permalink = get_permalink( $course->ID );
-                        $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> ';
+                        $permalink = get_permalink($course->ID);
+                        $course_links[] .= '<a href="'.esc_url($permalink).'" >'.$title.'</a> ';
 
                     } // end for each
 
@@ -358,24 +358,24 @@ 
         }// end loop through orders
 
         // add the courses to the WooCommerce notice
-        if( ! empty( $course_links) ){
+        if ( ! empty($course_links)) {
 
             $courses_html = _nx(
                 'You have purchased the following course:',
                 'You have purchased the following courses:',
-                count( $course_links ),
+                count($course_links),
                 'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei'
             );
 
-            foreach( $course_links as $link ){
+            foreach ($course_links as $link) {
 
-                $courses_html .= '<li>' . $link . '</li>';
+                $courses_html .= '<li>'.$link.'</li>';
 
             }
 
             $courses_html .= ' </ul>';
 
-            wc_add_notice( $courses_html, 'success' );
+            wc_add_notice($courses_html, 'success');
         }
 
 	} // end course_link_order_form
@@ -388,20 +388,20 @@ 
      *
      * @since 1.9.0
      */
-    public static function course_in_cart_message(){
+    public static function course_in_cart_message() {
 
         global $post;
 
-        if( self::is_course_in_cart( $post->ID ) ){ ?>
+        if (self::is_course_in_cart($post->ID)) { ?>
 
             <div class="sensei-message info">
                 <?php
 
-                $cart_link =  '<a class="cart-complete" href="' . WC()->cart->get_checkout_url()
-                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">'
-                              . __('complete the purchase', 'woothemes-sensei') . '</a>';
+                $cart_link = '<a class="cart-complete" href="'.WC()->cart->get_checkout_url()
+                              . '" title="'.__('complete purchase', 'woothemes-sensei').'">'
+                              . __('complete the purchase', 'woothemes-sensei').'</a>';
 
-                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link );
+                echo sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link);
 
                 ?>
             </div>
@@ -415,14 +415,14 @@ 
      * @param $course_id
      * @return bool
      */
-    public static function is_course_in_cart( $course_id ){
+    public static function is_course_in_cart($course_id) {
 
-        $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) );
-        $user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() );
+        $wc_post_id = absint(get_post_meta($course_id, '_course_woocommerce_product', true));
+        $user_course_status_id = Sensei_Utils::user_started_course($course_id, get_current_user_id());
 
-        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) {
+        if (0 < intval($wc_post_id) && ! $user_course_status_id) {
 
-            if ( self::is_product_in_cart( $wc_post_id ) ) {
+            if (self::is_product_in_cart($wc_post_id)) {
 
                 return true;
 
@@ -440,20 +440,20 @@ 
      * @param $product_id
      * @return bool
      */
-    public static function is_product_in_cart( $product_id ){
+    public static function is_product_in_cart($product_id) {
 
-        if ( 0 < $product_id ) {
+        if (0 < $product_id) {
 
-            $product = wc_get_product( $product_id );
+            $product = wc_get_product($product_id);
 
             $parent_id = '';
-            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) {
+            if (isset($product->variation_id) && 0 < intval($product->variation_id)) {
                 $wc_product_id = $product->parent->id;
             }
-            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) {
+            foreach (WC()->cart->get_cart() as $cart_item_key => $values) {
 
                 $cart_product = $values['data'];
-                if( $product_id == $cart_product->id ) {
+                if ($product_id == $cart_product->id) {
 
                     return true;
 
@@ -475,9 +475,9 @@ 
      *  @type int $wp_post_id
      * }
      */
-    public static function get_free_product_ids(){
+    public static function get_free_product_ids() {
 
-        return  get_posts( array(
+        return  get_posts(array(
             'post_type' => 'product',
             'posts_per_page' => '1000',
             'fields' => 'ids',
@@ -502,7 +502,7 @@ 
      * @since 1.9.0
      * @return array $wp_meta_query_param
      */
-    public static function get_free_courses_meta_query_args(){
+    public static function get_free_courses_meta_query_args() {
 
         return array(
             'relation' => 'OR',
@@ -526,7 +526,7 @@ 
      * @since 1.9.0
      * @return array $wp_query_meta_query_args_param
      */
-    public static function get_paid_courses_meta_query_args(){
+    public static function get_paid_courses_meta_query_args() {
 
         $paid_product_ids = self::get_paid_product_ids();
 
@@ -535,7 +535,7 @@ 
                 'key'     => '_course_woocommerce_product',
                 // when empty we give a false post_id to ensure the caller doesn't get any courses for their
                 // query
-                'value' => empty( $paid_product_ids  )? '-1000' : $paid_product_ids,
+                'value' => empty($paid_product_ids) ? '-1000' : $paid_product_ids,
                 'compare' => 'IN',
             ),
         );
@@ -549,7 +549,7 @@ 
      * @since 1.9.0
      * @return array $product_query_args
      */
-    public static function get_paid_products_on_sale_query_args(){
+    public static function get_paid_products_on_sale_query_args() {
 
         $args = array(
                    'post_type' 		=> 'product',
@@ -559,9 +559,9 @@ 
                    'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
+        $args['fields']     = 'ids';
 
-        $args[ 'meta_query' ] = array(
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -588,7 +588,7 @@ 
      *
      * @return array
      */
-    public static function get_paid_products_not_on_sale_query_args(){
+    public static function get_paid_products_not_on_sale_query_args() {
 
         $args = array(
             'post_type' 		=> 'product',
@@ -598,8 +598,8 @@ 
             'suppress_filters' 	=> 0
         );
 
-        $args[ 'fields' ]     = 'ids';
-        $args[ 'meta_query' ] = array(
+        $args['fields']     = 'ids';
+        $args['meta_query'] = array(
             'relation' => 'AND',
             array(
                 'key'=> '_regular_price',
@@ -625,24 +625,24 @@ 
      *
      * @return array $woocommerce_paid_product_ids
      */
-    public static function get_paid_product_ids(){
+    public static function get_paid_product_ids() {
 
         // get all the paid WooCommerce products that has regular
         // and sale price greater than 0
         // will be used later to check for course with the id as meta
-        $paid_product_ids_with_sale =  get_posts( self::get_paid_products_on_sale_query_args() );
+        $paid_product_ids_with_sale = get_posts(self::get_paid_products_on_sale_query_args());
 
         // get all the paid WooCommerce products that has regular price
         // greater than 0 without a sale price
         // will be used later to check for course with the id as meta
-        $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() );
+        $paid_product_ids_without_sale = get_posts(self::get_paid_products_not_on_sale_query_args());
 
         // combine products ID's with regular and sale price grater than zero and those without
         // sale but regular price greater than zero
-        $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale );
+        $woocommerce_paid_product_ids = array_merge($paid_product_ids_with_sale, $paid_product_ids_without_sale);
 
         // if
-        if( empty($woocommerce_paid_product_ids) ){
+        if (empty($woocommerce_paid_product_ids)) {
             return array( );
         }
         return $woocommerce_paid_product_ids;
@@ -661,20 +661,20 @@ 
      *
      * @return array
      */
-    public static function get_free_courses(){
+    public static function get_free_courses() {
 
         $free_course_query_args = Sensei_Course::get_default_query_args();
-        $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args();
+        $free_course_query_args['meta_query'] = self::get_free_courses_meta_query_args();
 
         // don't show any paid courses
         $courses = self::get_paid_courses();
         $ids = array();
-        foreach( $courses as $course ){
+        foreach ($courses as $course) {
             $ids[] = $course->ID;
         }
-        $free_course_query_args[ 'post__not_in' ] =  $ids;
+        $free_course_query_args['post__not_in'] = $ids;
 
-        return get_posts( $free_course_query_args );
+        return get_posts($free_course_query_args);
 
     }
 
@@ -684,13 +684,13 @@ 
      * @since 1.9.0
      * @return array
      */
-    public static function get_paid_courses(){
+    public static function get_paid_courses() {
 
         $paid_course_query_args = Sensei_Course::get_default_query_args();
 
-        $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args();
+        $paid_course_query_args['meta_query'] = self::get_paid_courses_meta_query_args();
 
-        return get_posts(  $paid_course_query_args );
+        return get_posts($paid_course_query_args);
     }
 
     /**
@@ -705,17 +705,17 @@ 
      * @param int $course_id
      * @return string $html markup for the button or nothing if user not allowed to buy
      */
-    public static function the_add_to_cart_button_html( $course_id ){
+    public static function the_add_to_cart_button_html($course_id) {
 
-        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) {
+        if ( ! Sensei_Course::is_prerequisite_complete($course_id)) {
             return '';
         }
 
-        $wc_post_id = self::get_course_product_id( $course_id );
+        $wc_post_id = self::get_course_product_id($course_id);
 
         // Check if customer purchased the product
-        if ( self::has_customer_bought_product(  get_current_user_id(), $wc_post_id )
-            || empty( $wc_post_id ) ) {
+        if (self::has_customer_bought_product(get_current_user_id(), $wc_post_id)
+            || empty($wc_post_id)) {
 
             return '';
 
@@ -723,15 +723,15 @@ 
 
         // based on simple.php in WC templates/single-product/add-to-cart/
         // Get the product
-        $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id );
+        $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id);
 
         // do not show the button for invalid products, non purchasable products, out
         // of stock product or if course is already in cart
-        if ( ! isset ( $product )
-            || ! is_object( $product )
+        if ( ! isset ($product)
+            || ! is_object($product)
             || ! $product->is_purchasable()
             || ! $product->is_in_stock()
-            || self::is_course_in_cart( $wc_post_id ) ) {
+            || self::is_course_in_cart($wc_post_id)) {
 
             return '';
 
@@ -742,23 +742,23 @@ 
         //
         ?>
 
-        <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>"
+        <form action="<?php echo esc_url($product->add_to_cart_url()); ?>"
               class="cart"
               method="post"
               enctype="multipart/form-data">
 
-            <input type="hidden" name="product_id" value="<?php echo esc_attr( $product->id ); ?>" />
+            <input type="hidden" name="product_id" value="<?php echo esc_attr($product->id); ?>" />
 
             <input type="hidden" name="quantity" value="1" />
 
-            <?php if ( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { ?>
+            <?php if (isset($product->variation_id) && 0 < intval($product->variation_id)) { ?>
 
                 <input type="hidden" name="variation_id" value="<?php echo $product->variation_id; ?>" />
-                <?php if( isset( $product->variation_data ) && is_array( $product->variation_data ) && count( $product->variation_data ) > 0 ) { ?>
+                <?php if (isset($product->variation_data) && is_array($product->variation_data) && count($product->variation_data) > 0) { ?>
 
-                    <?php foreach( $product->variation_data as $att => $val ) { ?>
+                    <?php foreach ($product->variation_data as $att => $val) { ?>
 
-                        <input type="hidden" name="<?php echo esc_attr( $att ); ?>" id="<?php echo esc_attr( str_replace( 'attribute_', '', $att ) ); ?>" value="<?php echo esc_attr( $val ); ?>" />
+                        <input type="hidden" name="<?php echo esc_attr($att); ?>" id="<?php echo esc_attr(str_replace('attribute_', '', $att)); ?>" value="<?php echo esc_attr($val); ?>" />
 
                     <?php } ?>
 
@@ -786,26 +786,26 @@ 
      *
      * @return string $message
      */
-    public static function alter_no_permissions_message( $message, $post_id ){
+    public static function alter_no_permissions_message($message, $post_id) {
 
-        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){
+        if (empty($post_id) || 'course' != get_post_type($post_id)) {
             return  $message;
         }
 
-        $product_id = self::get_course_product_id( $post_id );
+        $product_id = self::get_course_product_id($post_id);
 
-        if( ! $product_id
-            || self::has_customer_bought_product( get_current_user_id(),$product_id ) ){
+        if ( ! $product_id
+            || self::has_customer_bought_product(get_current_user_id(), $product_id)) {
 
             return $message;
 
         }
 
         ob_start();
-        self::the_course_no_permissions_message( $post_id );
+        self::the_course_no_permissions_message($post_id);
         $woocommerce_course_no_permissions_message = ob_get_clean();
 
-        return $woocommerce_course_no_permissions_message ;
+        return $woocommerce_course_no_permissions_message;
 
     }
     /**
@@ -814,16 +814,16 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_course_no_permissions_message( $course_id ){
+    public static function the_course_no_permissions_message($course_id) {
 
         // login link
-        $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
-        $login_link =  '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>';
+        $my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
+        $login_link = '<a href="'.esc_url(get_permalink($my_courses_page_id)).'">'.__('log in', 'woothemes-sensei').'</a>';
 
         ?>
 
         <span class="add-to-cart-login">
-            <?php echo sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); ?>
+            <?php echo sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link); ?>
         </span>
 
     <?php }
@@ -838,43 +838,43 @@ 
      *
      * @return bool
      */
-    public static function has_customer_bought_product ( $user_id, $product_id ){
+    public static function has_customer_bought_product($user_id, $product_id) {
 
-        $orders = get_posts( array(
+        $orders = get_posts(array(
             'posts_per_page' => -1,
             'meta_key'    => '_customer_user',
-            'meta_value'  => intval( $user_id ),
+            'meta_value'  => intval($user_id),
             'post_type'   => 'shop_order',
-            'post_status' =>  array( 'wc-processing', 'wc-completed' ),
-        ) );
+            'post_status' =>  array('wc-processing', 'wc-completed'),
+        ));
 
-        foreach ( $orders as $order_id ) {
+        foreach ($orders as $order_id) {
 
-            $order = new WC_Order( $order_id->ID );
+            $order = new WC_Order($order_id->ID);
 
-            if ( $order->post_status != 'wc-completed' && $order->post_status != 'wc-processing' ) {
+            if ($order->post_status != 'wc-completed' && $order->post_status != 'wc-processing') {
 
                 continue;
             }
 
-            if ( ! ( 0 < sizeof( $order->get_items() ) ) ) {
+            if ( ! (0 < sizeof($order->get_items()))) {
 
                 continue;
 
             }
 
-            foreach( $order->get_items() as $item ) {
+            foreach ($order->get_items() as $item) {
 
                 // Check if user has bought product
-                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) {
+                if ($item['product_id'] == $product_id || $item['variation_id'] == $product_id) {
 
                     // Check if user has an active subscription for product
-                    if( class_exists( 'WC_Subscriptions_Manager' ) ) {
-                        $sub_key = WC_Subscriptions_Manager::get_subscription_key( $order_id->ID, $product_id );
-                        if( $sub_key ) {
-                            $sub = WC_Subscriptions_Manager::get_subscription( $sub_key );
-                            if( $sub && isset( $sub['status'] ) ) {
-                                if( 'active' == $sub['status'] ) {
+                    if (class_exists('WC_Subscriptions_Manager')) {
+                        $sub_key = WC_Subscriptions_Manager::get_subscription_key($order_id->ID, $product_id);
+                        if ($sub_key) {
+                            $sub = WC_Subscriptions_Manager::get_subscription($sub_key);
+                            if ($sub && isset($sub['status'])) {
+                                if ('active' == $sub['status']) {
                                     return true;
                                 } else {
                                     return false;
@@ -903,11 +903,11 @@ 
      * @return string $woocommerce_product_id or false if none exist
      *
      */
-    public static function get_course_product_id( $course_id ){
+    public static function get_course_product_id($course_id) {
 
-        $product_id =  get_post_meta( $course_id, '_course_woocommerce_product', true );
+        $product_id = get_post_meta($course_id, '_course_woocommerce_product', true);
 
-        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){
+        if (empty($product_id) || 'product' != get_post_type($product_id)) {
             return false;
         }
 
@@ -921,11 +921,11 @@ 
      * @param array $classes
      * @return array
      */
-    public static function add_woocommerce_body_class( $classes ){
+    public static function add_woocommerce_body_class($classes) {
 
-        if( ! in_array( 'woocommerce', $classes ) ){
+        if ( ! in_array('woocommerce', $classes)) {
 
-            $classes[] ='woocommerce';
+            $classes[] = 'woocommerce';
 
         }
 

includes/class-sensei-course-results.php

Braces +4 added lines, -1 removed lines

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

Indentation +50 added lines, -50 removed lines

@@ -14,10 +14,10 @@ 
  */
 class Sensei_Course_Results {
 
-    /**
-     * @var string
-     */
-    public  $courses_url_base;
+	/**
+	 * @var string
+	 */
+	public  $courses_url_base;
 
 	/**
 	 * Constructor.
@@ -98,7 +98,7 @@ 
 		global $wp_query,  $current_user;
 
 		if( isset( $wp_query->query_vars['course_results'] ) ) {
-            Sensei_Templates::get_template( 'course-results/course-info.php' );
+			Sensei_Templates::get_template( 'course-results/course-info.php' );
 		}
 
 	}
@@ -117,20 +117,20 @@ 
 
 		sensei_do_deprecated_action( 'sensei_course_results_lessons','1.9.','sensei_course_results_content_inside_after', $course );
 
-        sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID );
+		sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID );
 
 	}
 
 	/**
 	 * Load template for displaying course lessons
-     *
+	 *
 	 * @since  1.4.0
 	 * @return void
 	 */
 	public function course_lessons() {
 
 		global $course;
-        _deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' );
+		_deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' );
 
 	}
 
@@ -147,62 +147,62 @@ 
 		return $classes;
 	}
 
-    /**
-     * Deprecate the sensei_course_results_content hook
-     *
-     * @deprecated since 1.9.0
-     */
-    public static function deprecate_sensei_course_results_content_hook(){
+	/**
+	 * Deprecate the sensei_course_results_content hook
+	 *
+	 * @deprecated since 1.9.0
+	 */
+	public static function deprecate_sensei_course_results_content_hook(){
 
-        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before');
+		sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before');
 
-    }
+	}
 
-    /**
-     * Fire the sensei frontend message hook
-     *
-     * @since 1.9.0
-     */
-    public static function fire_sensei_message_hook(){
+	/**
+	 * Fire the sensei frontend message hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function fire_sensei_message_hook(){
 
-        do_action( 'sensei_frontend_messages' );
+		do_action( 'sensei_frontend_messages' );
 
-    }
+	}
 
-    /**
-     * Deprecate the course_results info hook
-     *
-     * @since 1.9.0
-     */
-    public static function deprecate_course_result_info_hook(){
+	/**
+	 * Deprecate the course_results info hook
+	 *
+	 * @since 1.9.0
+	 */
+	public static function deprecate_course_result_info_hook(){
 
-        sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' );
+		sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' );
 
-    }
+	}
 
-    /**
-     * Deprecate the sensei_course_results_top hook
-     *
-     * @deprecate since 1.9.0
-     */
-    public static function deprecate_course_results_top_hook(){
+	/**
+	 * Deprecate the sensei_course_results_top hook
+	 *
+	 * @deprecate since 1.9.0
+	 */
+	public static function deprecate_course_results_top_hook(){
 
-        global $course;
-        sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID );
+		global $course;
+		sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID );
 
-    }
+	}
 
-    /**
-     * Fire the course image hook
-     *
-     * @since 1.8.0
-     */
-    public static function fire_course_image_hook(){
+	/**
+	 * Fire the course image hook
+	 *
+	 * @since 1.8.0
+	 */
+	public static function fire_course_image_hook(){
 
-        global $course;
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
+		global $course;
+		sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_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
@@ -23,20 +23,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()
 
@@ -46,8 +46,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%', '([^&]+)');
 	}
 
 	/**
@@ -56,11 +56,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;
 	}
@@ -71,18 +71,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;
 			}
 		}
 
@@ -95,10 +95,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');
 		}
 
 	}
@@ -112,12 +112,12 @@ 
 
 		global $course;
 
-		$course_status = 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 = 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);
 
 	}
 
@@ -130,7 +130,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');
 
 	}
 
@@ -139,9 +139,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;
@@ -152,9 +152,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');
 
     }
 
@@ -163,9 +163,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');
 
     }
 
@@ -174,9 +174,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');
 
     }
 
@@ -185,10 +185,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);
 
     }
 
@@ -197,10 +197,10 @@ 
      *
      * @since 1.8.0
      */
-    public static function fire_course_image_hook(){
+    public static function fire_course_image_hook() {
 
         global $course;
-        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) );
+        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', array(get_the_ID()));
 
     }
 
@@ -211,4 +211,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 {}

includes/class-sensei-settings.php

Braces +4 added lines, -1 removed lines

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

Indentation +54 added lines, -54 removed lines

@@ -21,43 +21,43 @@ 
 	 * @return void
 	 */
 	public function __construct () {
-	    parent::__construct(); // Required in extended classes.
+		parent::__construct(); // Required in extended classes.
 
-        $this->token = 'woothemes-sensei-settings';
-        add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
+		$this->token = 'woothemes-sensei-settings';
+		add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
 
-        // Setup Admin Settings data
-        if ( is_admin() ) {
+		// Setup Admin Settings data
+		if ( is_admin() ) {
 
-            $this->has_tabs 	= true;
-            $this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->menu_label	= __( 'Settings', 'woothemes-sensei' );
-            $this->page_slug	= 'woothemes-sensei-settings';
+			$this->has_tabs 	= true;
+			$this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
+			$this->menu_label	= __( 'Settings', 'woothemes-sensei' );
+			$this->page_slug	= 'woothemes-sensei-settings';
 
-        } // End If Statement
+		} // End If Statement
 
-        $this->register_hook_listener();
-        $this->get_settings();
+		$this->register_hook_listener();
+		$this->get_settings();
 
 	} // End __construct()
 
-    /**
-     * Get settings value
-     *
-     * @since 1.9.0
-     * @param string $setting_name
-     * @return mixed
-     */
-    public function get( $setting_name ){
+	/**
+	 * Get settings value
+	 *
+	 * @since 1.9.0
+	 * @param string $setting_name
+	 * @return mixed
+	 */
+	public function get( $setting_name ){
 
-        if( isset( $this->settings[ $setting_name ] ) ){
+		if( isset( $this->settings[ $setting_name ] ) ){
 
-            return $this->settings[ $setting_name ];
+			return $this->settings[ $setting_name ];
 
-        }
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	/**
 	 * Register the settings screen within the WordPress admin.
@@ -145,7 +145,7 @@ 
 		$complete_settings = array( 'passed' => __( 'Once all the course lessons have been completed', 'woothemes-sensei' ), 'complete' => __( 'At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei' ) );
 		$course_display_settings = array( 'excerpt' => __( 'Course Excerpt', 'woothemes-sensei' ), 'full' => __( 'Full Course Content', 'woothemes-sensei' ) );
 
-	    $fields = array();
+		$fields = array();
 
 		$fields['access_permission'] = array(
 								'name' => __( 'Access Permissions', 'woothemes-sensei' ),
@@ -207,9 +207,9 @@ 
 								'section' => 'default-settings'
 								);
 
-    	// Course Settings
+		// Course Settings
 
-    	$fields['course_completion'] = array(
+		$fields['course_completion'] = array(
 								'name' => __( 'Courses are complete:', 'woothemes-sensei' ),
 								'description' => __( 'This will determine when courses are marked as complete.', 'woothemes-sensei' ),
 								'type' => 'select',
@@ -219,7 +219,7 @@ 
 								'options' => $complete_settings
 								);
 
-    	$fields['course_author'] = array(
+		$fields['course_author'] = array(
 								'name' => __( 'Display Course Author', 'woothemes-sensei' ),
 								'description' => __( 'Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei' ),
 								'type' => 'checkbox',
@@ -447,10 +447,10 @@ 
 		);
 
 		$teacher_email_options = array(
-            'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
-            'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
-            'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
-            'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
+			'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
+			'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
+			'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
+			'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
 			'teacher-new-message' => __( 'A learner sends a private message to a teacher', 'woothemes-sensei' ),
 		);
 
@@ -559,7 +559,7 @@ 
 
 		if ( Sensei_WC::is_woocommerce_active() ) {
 			// WooCommerce Settings
-    		$fields['woocommerce_enabled'] = array(
+			$fields['woocommerce_enabled'] = array(
 									'name' => __( 'Enable WooCommerce Courses', 'woothemes-sensei' ),
 									'description' => __( 'Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei' ),
 									'type' => 'checkbox',
@@ -647,14 +647,14 @@ 
 		$page_items[] = __( 'Select a Page:', 'woothemes-sensei' );
 
 		foreach ( $pages_split as $k => $v ) {
-		    $id = '';
-		    // Get the ID value.
-		    preg_match( '/value="(.*?)"/i', $v, $matches );
-
-		    if ( isset( $matches[1] ) ) {
-		        $id = $matches[1];
-		        $page_items[$id] = trim( strip_tags( $v ) );
-		    } // End If Statement
+			$id = '';
+			// Get the ID value.
+			preg_match( '/value="(.*?)"/i', $v, $matches );
+
+			if ( isset( $matches[1] ) ) {
+				$id = $matches[1];
+				$page_items[$id] = trim( strip_tags( $v ) );
+			} // End If Statement
 		} // End For Loop
 
 		$pages_array = $page_items;
@@ -671,22 +671,22 @@ 
 		Sensei_Language_Pack_Manager::messages();
 	}
 
-    /**
-     * Flush the rewrite rules after the settings have been updated.
-     * This is to ensure that the
-     *
-     * @since 1.9.0
-     */
-    public static function flush_rewrite_rules(){
+	/**
+	 * Flush the rewrite rules after the settings have been updated.
+	 * This is to ensure that the
+	 *
+	 * @since 1.9.0
+	 */
+	public static function flush_rewrite_rules(){
 
-        if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
-            && isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
+		if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
+			&& isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
 
-            Sensei()->initiate_rewrite_rules_flush();
+			Sensei()->initiate_rewrite_rules_flush();
 
-        }
+		}
 
-    }//end  flush_cache
+	}//end  flush_cache
 } // End Class
 
 /**

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /*
  * Sensei Settings Class
@@ -20,18 +20,18 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function __construct () {
+	public function __construct() {
 	    parent::__construct(); // Required in extended classes.
 
         $this->token = 'woothemes-sensei-settings';
-        add_action('init', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action('init', array(__CLASS__, 'flush_rewrite_rules'));
 
         // Setup Admin Settings data
-        if ( is_admin() ) {
+        if (is_admin()) {
 
             $this->has_tabs 	= true;
-            $this->name 		= __( 'Sensei Settings', 'woothemes-sensei' );
-            $this->menu_label	= __( 'Settings', 'woothemes-sensei' );
+            $this->name = __('Sensei Settings', 'woothemes-sensei');
+            $this->menu_label = __('Settings', 'woothemes-sensei');
             $this->page_slug	= 'woothemes-sensei-settings';
 
         } // End If Statement
@@ -48,11 +48,11 @@ 
      * @param string $setting_name
      * @return mixed
      */
-    public function get( $setting_name ){
+    public function get($setting_name) {
 
-        if( isset( $this->settings[ $setting_name ] ) ){
+        if (isset($this->settings[$setting_name])) {
 
-            return $this->settings[ $setting_name ];
+            return $this->settings[$setting_name];
 
         }
 
@@ -65,17 +65,17 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function register_settings_screen () {
+	public function register_settings_screen() {
 
 		$this->settings_version = Sensei()->version; // Use the global plugin version on this settings screen.
-		$hook = add_submenu_page( 'sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array( $this, 'settings_screen' ) );
+		$hook = add_submenu_page('sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array($this, 'settings_screen'));
 		$this->hook = $hook;
 
-		if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) {
-			add_action( 'admin_notices', array( $this, 'settings_errors' ) );
-			add_action( 'admin_notices', array( $this, 'language_pack_notices' ) );
-			add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) );
-			add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) );
+		if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) {
+			add_action('admin_notices', array($this, 'settings_errors'));
+			add_action('admin_notices', array($this, 'language_pack_notices'));
+			add_action('admin_print_scripts', array($this, 'enqueue_scripts'));
+			add_action('admin_print_styles', array($this, 'enqueue_styles'));
 		}
 	} // End register_settings_screen()
 
@@ -85,49 +85,49 @@ 
 	 * @since  1.0.0
 	 * @return void
 	 */
-	public function init_sections () {
+	public function init_sections() {
 		$sections = array();
 
 		$sections['default-settings'] = array(
-			'name' 			=> __( 'General', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to the entire plugin.', 'woothemes-sensei' )
+			'name' 			=> __('General', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to the entire plugin.', 'woothemes-sensei')
 		);
 
 		$sections['course-settings'] = array(
-			'name' 			=> __( 'Courses', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Courses.', 'woothemes-sensei' )
+			'name' 			=> __('Courses', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Courses.', 'woothemes-sensei')
 		);
 
 		$sections['lesson-settings'] = array(
-			'name' 			=> __( 'Lessons', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings that apply to all Lessons.', 'woothemes-sensei' )
+			'name' 			=> __('Lessons', 'woothemes-sensei'),
+			'description'	=> __('Settings that apply to all Lessons.', 'woothemes-sensei')
 		);
 
 		$sections['email-notification-settings'] = array(
-			'name' 			=> __( 'Email Notifications', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for email notifications sent from your site.', 'woothemes-sensei' )
+			'name' 			=> __('Email Notifications', 'woothemes-sensei'),
+			'description'	=> __('Settings for email notifications sent from your site.', 'woothemes-sensei')
 		);
 
 		$sections['learner-profile-settings'] = array(
-			'name' 			=> __( 'Learner Profiles', 'woothemes-sensei' ),
-			'description'	=> __( 'Settings for public Learner Profiles.', 'woothemes-sensei' )
+			'name' 			=> __('Learner Profiles', 'woothemes-sensei'),
+			'description'	=> __('Settings for public Learner Profiles.', 'woothemes-sensei')
 		);
 
-		if ( Sensei_WC::is_woocommerce_present() ) {
+		if (Sensei_WC::is_woocommerce_present()) {
 			$sections['woocommerce-settings'] = array(
-				'name' 			=> __( 'WooCommerce', 'woothemes-sensei' ),
-				'description'	=> __( 'Optional settings for WooCommerce functions.', 'woothemes-sensei' )
+				'name' 			=> __('WooCommerce', 'woothemes-sensei'),
+				'description'	=> __('Optional settings for WooCommerce functions.', 'woothemes-sensei')
 			);
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$sections['language-settings'] = array(
-				'name' 			=> __( 'Language', 'woothemes-sensei' ),
-				'description'	=> __( 'Language options.', 'woothemes-sensei' )
+				'name' 			=> __('Language', 'woothemes-sensei'),
+				'description'	=> __('Language options.', 'woothemes-sensei')
 			);
 		}
 
-		$this->sections = apply_filters( 'sensei_settings_tabs', $sections );
+		$this->sections = apply_filters('sensei_settings_tabs', $sections);
 	} // End init_sections()
 
 	/**
@@ -137,71 +137,71 @@ 
 	 * @uses   Sensei_Utils::get_slider_types()
 	 * @return void
 	 */
-	public function init_fields () {
+	public function init_fields() {
 		global $pagenow;
 
 		$pages_array = $this->pages_array();
-		$posts_per_page_array = array( '0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20' );
-		$complete_settings = array( 'passed' => __( 'Once all the course lessons have been completed', 'woothemes-sensei' ), 'complete' => __( 'At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei' ) );
-		$course_display_settings = array( 'excerpt' => __( 'Course Excerpt', 'woothemes-sensei' ), 'full' => __( 'Full Course Content', 'woothemes-sensei' ) );
+		$posts_per_page_array = array('0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20');
+		$complete_settings = array('passed' => __('Once all the course lessons have been completed', 'woothemes-sensei'), 'complete' => __('At any time (by clicking the \'Complete Course\' button)', 'woothemes-sensei'));
+		$course_display_settings = array('excerpt' => __('Course Excerpt', 'woothemes-sensei'), 'full' => __('Full Course Content', 'woothemes-sensei'));
 
 	    $fields = array();
 
 		$fields['access_permission'] = array(
-								'name' => __( 'Access Permissions', 'woothemes-sensei' ),
-								'description' => __( 'Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei' ),
+								'name' => __('Access Permissions', 'woothemes-sensei'),
+								'description' => __('Users must be logged in to view Course and Lesson content.', 'woothemes-sensei', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'default-settings'
 								);
 
 		$fields['messages_disable'] = array(
-								'name' => __( 'Disable Private Messages', 'woothemes-sensei' ),
-								'description' => __( 'Disable the private message functions between learners and teachers.', 'woothemes-sensei' ),
+								'name' => __('Disable Private Messages', 'woothemes-sensei'),
+								'description' => __('Disable the private message functions between learners and teachers.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['course_page'] = array(
-								'name' => __( 'Course Archive Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display courses. If you leave this blank the default custom post type archive will apply.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_courses_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_courses_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['my_course_page'] = array(
-								'name' => __( 'My Courses Page', 'woothemes-sensei' ),
-								'description' => __( 'The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei' ),
+								'name' => __('My Courses Page', 'woothemes-sensei'),
+								'description' => __('The page to use to display the courses that a user is currently taking as well as the courses a user has complete.', 'woothemes-sensei'),
 								'type' => 'select',
-								'default' => get_option( 'woothemes-sensei_user_dashboard_page_id', 0 ),
+								'default' => get_option('woothemes-sensei_user_dashboard_page_id', 0),
 								'section' => 'default-settings',
 								'required' => 0,
 								'options' => $pages_array
 								);
 
 		$fields['placeholder_images_enable'] = array(
-								'name' => __( 'Use placeholder images', 'woothemes-sensei' ),
-								'description' => __( 'Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei' ),
+								'name' => __('Use placeholder images', 'woothemes-sensei'),
+								'description' => __('Output a placeholder image when no featured image has been specified for Courses and Lessons.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['styles_disable'] = array(
-								'name' => __( 'Disable Sensei Styles', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Styles', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend stylesheets from loading. This will remove the default styles for all Sensei elements.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
 								);
 
 		$fields['js_disable'] = array(
-								'name' => __( 'Disable Sensei Javascript', 'woothemes-sensei' ),
-								'description' => __( 'Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei' ),
+								'name' => __('Disable Sensei Javascript', 'woothemes-sensei'),
+								'description' => __('Prevent the frontend javascript from loading. This affects the progress bars and the My Courses tabs.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'default-settings'
@@ -210,8 +210,8 @@ 
     	// Course Settings
 
     	$fields['course_completion'] = array(
-								'name' => __( 'Courses are complete:', 'woothemes-sensei' ),
-								'description' => __( 'This will determine when courses are marked as complete.', 'woothemes-sensei' ),
+								'name' => __('Courses are complete:', 'woothemes-sensei'),
+								'description' => __('This will determine when courses are marked as complete.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'passed',
 								'section' => 'course-settings',
@@ -220,16 +220,16 @@ 
 								);
 
     	$fields['course_author'] = array(
-								'name' => __( 'Display Course Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei' ),
+								'name' => __('Display Course Author', 'woothemes-sensei'),
+								'description' => __('Output the Course Author on Course archive and My Courses page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['my_course_amount'] = array(
-								'name' => __( 'My Courses Pagination', 'woothemes-sensei' ),
-								'description' => __( 'The number of courses to output for the my courses page.', 'woothemes-sensei' ),
+								'name' => __('My Courses Pagination', 'woothemes-sensei'),
+								'description' => __('The number of courses to output for the my courses page.', 'woothemes-sensei'),
 								'type' => 'range',
 								'default' => '0',
 								'section' => 'course-settings',
@@ -238,16 +238,16 @@ 
 								);
 
 		$fields['course_archive_image_enable'] = array(
-								'name' => __( 'Course Archive Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Course Archive Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_image_width'] = array(
-								'name' => __( 'Image Width - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Archive', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -255,8 +255,8 @@ 
 								);
 
 		$fields['course_archive_image_height'] = array(
-								'name' => __( 'Image Height - Archive', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Archive', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course Archive page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -264,24 +264,24 @@ 
 								);
 
 		$fields['course_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Archive', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Archive', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_enable'] = array(
-								'name' => __( 'Single Course Image', 'woothemes-sensei' ),
-								'description' => __( 'Output the Course Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Single Course Image', 'woothemes-sensei'),
+								'description' => __('Output the Course Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -289,8 +289,8 @@ 
 								);
 
 		$fields['course_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Course single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'course-settings',
@@ -298,16 +298,16 @@ 
 								);
 
 		$fields['course_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_single_content_display'] = array(
-								'name' => __( 'Single Course page displays:', 'woothemes-sensei' ),
-								'description' => __( 'Determines what content to display on the single course page.', 'woothemes-sensei' ),
+								'name' => __('Single Course page displays:', 'woothemes-sensei'),
+								'description' => __('Determines what content to display on the single course page.', 'woothemes-sensei'),
 								'type' => 'select',
 								'default' => 'excerpt',
 								'section' => 'course-settings',
@@ -316,18 +316,18 @@ 
 								);
 
 		$fields['course_archive_featured_enable'] = array(
-								'name' => __( 'Featured Courses Panel', 'woothemes-sensei' ),
-								'description' => __( 'Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+								'name' => __('Featured Courses Panel', 'woothemes-sensei'),
+								'description' => __('Output the Featured Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'course-settings'
 								);
 
 		$fields['course_archive_more_link_text'] = array(
-								'name' => __( 'More link text', 'woothemes-sensei' ),
-								'description' => __( 'The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei' ),
+								'name' => __('More link text', 'woothemes-sensei'),
+								'description' => __('The text that will be displayed on the Course Archive for the more courses link.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => __ ( 'More', 'woothemes-sensei' ),
+								'default' => __('More', 'woothemes-sensei'),
 								'section' => 'course-settings',
 								'required' => 0
 								);
@@ -335,32 +335,32 @@ 
 		// Lesson Settings
 
 		$fields['lesson_comments'] = array(
-								'name' => __( 'Allow Comments for Lessons', 'woothemes-sensei' ),
-								'description' => __( 'This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei' ),
+								'name' => __('Allow Comments for Lessons', 'woothemes-sensei'),
+								'description' => __('This will allow learners to post comments on the single Lesson page, only learner who have access to the Lesson will be allowed to comment.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_author'] = array(
-								'name' => __( 'Display Lesson Author', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei' ),
+								'name' => __('Display Lesson Author', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Author on Course single page & Lesson archive page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => true,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['course_lesson_image_enable'] = array(
-								'name' => __( 'Course Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Course Page.', 'woothemes-sensei' ),
+								'name' => __('Course Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Course Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_archive_image_width'] = array(
-								'name' => __( 'Image Width - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -368,8 +368,8 @@ 
 								);
 
 		$fields['lesson_archive_image_height'] = array(
-								'name' => __( 'Image Height - Course Lessons', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Course Lessons', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons on the Course Single page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -377,24 +377,24 @@ 
 								);
 
 		$fields['lesson_archive_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Course Lessons', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Course Lessons', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_enable'] = array(
-								'name' => __( 'Single Lesson Images', 'woothemes-sensei' ),
-								'description' => __( 'Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei' ),
+								'name' => __('Single Lesson Images', 'woothemes-sensei'),
+								'description' => __('Output the Lesson Image on the Single Lesson Page.', 'woothemes-sensei'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
 								);
 
 		$fields['lesson_single_image_width'] = array(
-								'name' => __( 'Image Width - Single', 'woothemes-sensei' ),
-								'description' => __( 'The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Width - Single', 'woothemes-sensei'),
+								'description' => __('The width in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -402,8 +402,8 @@ 
 								);
 
 		$fields['lesson_single_image_height'] = array(
-								'name' => __( 'Image Height - Single', 'woothemes-sensei' ),
-								'description' => __( 'The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei' ),
+								'name' => __('Image Height - Single', 'woothemes-sensei'),
+								'description' => __('The height in pixels of the featured image for the Lessons single post page.', 'woothemes-sensei'),
 								'type' => 'text',
 								'default' => '100',
 								'section' => 'lesson-settings',
@@ -411,8 +411,8 @@ 
 								);
 
 		$fields['lesson_single_image_hard_crop'] = array(
-								'name' => __( 'Image Hard Crop - Single', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei' ), '<a href="' . esc_url( 'http://wordpress.org/extend/plugins/regenerate-thumbnails/' ) . '">', '</a>' ),
+								'name' => __('Image Hard Crop - Single', 'woothemes-sensei'),
+								'description' => sprintf(__('After changing this setting, you may need to %1$sregenerate your thumbnails%2$s.', 'woothemes-sensei'), '<a href="'.esc_url('http://wordpress.org/extend/plugins/regenerate-thumbnails/').'">', '</a>'),
 								'type' => 'checkbox',
 								'default' => false,
 								'section' => 'lesson-settings'
@@ -420,20 +420,20 @@ 
 
 		// Learner Profile settings
 
-		$profile_url_base = apply_filters( 'sensei_learner_profiles_url_base', __( 'learner', 'woothemes-sensei') );
-		$profile_url_example = trailingslashit( get_site_url() ) . $profile_url_base . '/%username%';
+		$profile_url_base = apply_filters('sensei_learner_profiles_url_base', __('learner', 'woothemes-sensei'));
+		$profile_url_example = trailingslashit(get_site_url()).$profile_url_base.'/%username%';
 
 		$fields['learner_profile_enable'] = array(
-							'name' => __( 'Public learner profiles', 'woothemes-sensei' ),
-							'description' => sprintf( __( 'Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei' ), $profile_url_example ),
+							'name' => __('Public learner profiles', 'woothemes-sensei'),
+							'description' => sprintf(__('Enable public learner profiles that will be accessible to everyone. Profile URL format: %s', 'woothemes-sensei'), $profile_url_example),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
 							);
 
 		$fields['learner_profile_show_courses'] = array(
-							'name' => __( 'Show learner\'s courses', 'woothemes-sensei' ),
-							'description' => __( 'Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei' ),
+							'name' => __('Show learner\'s courses', 'woothemes-sensei'),
+							'description' => __('Display the learner\'s active and completed courses on their profile.', 'woothemes-sensei'),
 							'type' => 'checkbox',
 							'default' => true,
 							'section' => 'learner-profile-settings'
@@ -442,70 +442,70 @@ 
 		// Email notifications
 
 		$learner_email_options = array(
-			'learner-graded-quiz' => __( 'Their quiz is graded (auto and manual grading)', 'woothemes-sensei' ),
-			'learner-completed-course' => __( 'They complete a course', 'woothemes-sensei' ),
+			'learner-graded-quiz' => __('Their quiz is graded (auto and manual grading)', 'woothemes-sensei'),
+			'learner-completed-course' => __('They complete a course', 'woothemes-sensei'),
 		);
 
 		$teacher_email_options = array(
-            'teacher-started-course' => __( 'A learner starts their course', 'woothemes-sensei' ),
-            'teacher-completed-course' => __( 'A learner completes their course', 'woothemes-sensei' ),
-            'teacher-completed-lesson' => __( 'A learner completes a lesson', 'woothemes-sensei' ),
-            'teacher-quiz-submitted' => __( 'A learner submits a quiz for grading', 'woothemes-sensei' ),
-			'teacher-new-message' => __( 'A learner sends a private message to a teacher', 'woothemes-sensei' ),
+            'teacher-started-course' => __('A learner starts their course', 'woothemes-sensei'),
+            'teacher-completed-course' => __('A learner completes their course', 'woothemes-sensei'),
+            'teacher-completed-lesson' => __('A learner completes a lesson', 'woothemes-sensei'),
+            'teacher-quiz-submitted' => __('A learner submits a quiz for grading', 'woothemes-sensei'),
+			'teacher-new-message' => __('A learner sends a private message to a teacher', 'woothemes-sensei'),
 		);
 
 		$global_email_options = array(
-			'new-message-reply' => __( 'They receive a reply to their private message', 'woothemes-sensei' ),
+			'new-message-reply' => __('They receive a reply to their private message', 'woothemes-sensei'),
 		);
 
 		$fields['email_learners'] = array(
-								'name' => __( 'Emails Sent to Learners', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to learners.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Learners', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to learners.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $learner_email_options,
-								'defaults' => array( 'learner-graded-quiz', 'learner-completed-course' ),
+								'defaults' => array('learner-graded-quiz', 'learner-completed-course'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_teachers'] = array(
-								'name' => __( 'Emails Sent to Teachers', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to teachers.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to Teachers', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to teachers.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $teacher_email_options,
-								'defaults' => array( 'teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message' ),
+								'defaults' => array('teacher-completed-course', 'teacher-started-course', 'teacher-quiz-submitted', 'teacher-new-message'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_global'] = array(
-								'name' => __( 'Emails Sent to All Users', 'woothemes-sensei' ),
-								'description' => __( 'Select the notifications that will be sent to all users.', 'woothemes-sensei' ),
+								'name' => __('Emails Sent to All Users', 'woothemes-sensei'),
+								'description' => __('Select the notifications that will be sent to all users.', 'woothemes-sensei'),
 								'type' => 'multicheck',
 								'options' => $global_email_options,
-								'defaults' => array( 'new-message-reply' ),
+								'defaults' => array('new-message-reply'),
 								'section' => 'email-notification-settings'
 								);
 
 		$fields['email_from_name'] = array(
-								'name' => __( '"From" Name', 'woothemes-sensei' ),
-								'description' => __( 'The name from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Name', 'woothemes-sensei'),
+								'description' => __('The name from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'name' ),
+								'default' => get_bloginfo('name'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_from_address'] = array(
-								'name' => __( '"From" Address', 'woothemes-sensei' ),
-								'description' => __( 'The address from which all emails will be sent.', 'woothemes-sensei' ),
+								'name' => __('"From" Address', 'woothemes-sensei'),
+								'description' => __('The address from which all emails will be sent.', 'woothemes-sensei'),
 								'type' => 'text',
-								'default' => get_bloginfo( 'admin_email' ),
+								'default' => get_bloginfo('admin_email'),
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
 		$fields['email_header_image'] = array(
-								'name' => __( 'Header Image', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'media-new.php' ) . '">', '</a>' ),
+								'name' => __('Header Image', 'woothemes-sensei'),
+								'description' => sprintf(__('Enter a URL to an image you want to show in the email\'s header. Upload your image using the %1$smedia uploader%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('media-new.php').'">', '</a>'),
 								'type' => 'text',
 								'default' => '',
 								'section' => 'email-notification-settings',
@@ -513,17 +513,17 @@ 
 								);
 
 		$fields['email_footer_text'] = array(
-								'name' => __( 'Email Footer Text', 'woothemes-sensei' ),
-								'description' => __( 'The text to appear in the footer of Sensei emails.', 'woothemes-sensei' ),
+								'name' => __('Email Footer Text', 'woothemes-sensei'),
+								'description' => __('The text to appear in the footer of Sensei emails.', 'woothemes-sensei'),
 								'type' => 'textarea',
-								'default' => sprintf( __( '%1$s - Powered by Sensei', 'woothemes-sensei' ), get_bloginfo( 'name' ) ),
+								'default' => sprintf(__('%1$s - Powered by Sensei', 'woothemes-sensei'), get_bloginfo('name')),
 								'section' => 'email-notification-settings',
 								'required' => 0
 								);
 
 		$fields['email_base_color'] = array(
-								'name' => __( 'Base Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Base Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The base colour for Sensei email templates. Default %1$s#557da1%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#557da1',
 								'section' => 'email-notification-settings',
@@ -531,8 +531,8 @@ 
 								);
 
 		$fields['email_background_color'] = array(
-								'name' => __( 'Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The background colour for Sensei email templates. Default %1$s#f5f5f5%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#f5f5f5',
 								'section' => 'email-notification-settings',
@@ -540,8 +540,8 @@ 
 								);
 
 		$fields['email_body_background_color'] = array(
-								'name' => __( 'Body Background Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Background Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body background colour for Sensei email templates. Default %1$s#fdfdfd%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#fdfdfd',
 								'section' => 'email-notification-settings',
@@ -549,35 +549,35 @@ 
 								);
 
 		$fields['email_text_color'] = array(
-								'name' => __( 'Body Text Colour', 'woothemes-sensei' ),
-								'description' => sprintf( __( 'The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei' ), '<code>', '</code>' ),
+								'name' => __('Body Text Colour', 'woothemes-sensei'),
+								'description' => sprintf(__('The main body text colour for Sensei email templates. Default %1$s#505050%2$s.', 'woothemes-sensei'), '<code>', '</code>'),
 								'type' => 'color',
 								'default' => '#505050',
 								'section' => 'email-notification-settings',
 								'required' => 1
 								);
 
-		if ( Sensei_WC::is_woocommerce_active() ) {
+		if (Sensei_WC::is_woocommerce_active()) {
 			// WooCommerce Settings
     		$fields['woocommerce_enabled'] = array(
-									'name' => __( 'Enable WooCommerce Courses', 'woothemes-sensei' ),
-									'description' => __( 'Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei' ),
+									'name' => __('Enable WooCommerce Courses', 'woothemes-sensei'),
+									'description' => __('Use WooCommerce to sell Courses by linking a Product to a Course.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_free_enable'] = array(
-									'name' => __( 'Free Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Free Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Free Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
 									);
 
 			$fields['course_archive_paid_enable'] = array(
-									'name' => __( 'Paid Courses Panel', 'woothemes-sensei' ),
-									'description' => __( 'Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei' ),
+									'name' => __('Paid Courses Panel', 'woothemes-sensei'),
+									'description' => __('Output the Paid Courses Panel on the Course Archive Page.', 'woothemes-sensei'),
 									'type' => 'checkbox',
 									'default' => true,
 									'section' => 'woocommerce-settings'
@@ -585,18 +585,18 @@ 
 
 		} // End If Statement
 
-		if ( 'en_US' !== get_locale() ) {
+		if ('en_US' !== get_locale()) {
 			$fields['install_language_pack'] = array(
-				'name'        => __( 'Install Language Pack', 'woothemes-sensei' ),
-				'description' => __( 'Use this action to install or re-install translation for your language if available.', 'woothemes-sensei' ),
+				'name'        => __('Install Language Pack', 'woothemes-sensei'),
+				'description' => __('Use this action to install or re-install translation for your language if available.', 'woothemes-sensei'),
 				'type'        => 'button',
 				'section'     => 'language-settings',
 				'target'      => Sensei_Language_Pack_Manager::get_install_uri(),
-				'label'       => __( 'Install', 'woothemes-sensei' )
+				'label'       => __('Install', 'woothemes-sensei')
 			);
 		}
 
-		$this->fields = apply_filters( 'sensei_settings_fields', $fields );
+		$this->fields = apply_filters('sensei_settings_fields', $fields);
 
 	} // End init_fields()
 
@@ -606,20 +606,20 @@ 
 	 * @param  $include_milliseconds (default: true) Whether or not to include milliseconds between 0 and 1.
 	 * @return array Options between 0.1 and 10 seconds.
 	 */
-	private function get_duration_options ( $include_milliseconds = true ) {
-		$numbers = array( '1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0' );
+	private function get_duration_options($include_milliseconds = true) {
+		$numbers = array('1.0', '1.5', '2.0', '2.5', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '6.0', '6.5', '7.0', '7.5', '8.0', '8.5', '9.0', '9.5', '10.0');
 		$options = array();
 
-		if ( true == (bool)$include_milliseconds ) {
-			$milliseconds = array( '0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9' );
-			foreach ( $milliseconds as $k => $v ) {
+		if (true == (bool) $include_milliseconds) {
+			$milliseconds = array('0.1', '0.2', '0.3', '0.4', '0.5', '0.6', '0.7', '0.8', '0.9');
+			foreach ($milliseconds as $k => $v) {
 				$options[$v] = $v;
 			}
 		} else {
 			$options['0.5'] = '0.5';
 		}
 
-		foreach ( $numbers as $k => $v ) {
+		foreach ($numbers as $k => $v) {
 			$options[$v] = $v;
 		}
 
@@ -635,25 +635,25 @@ 
 	private function pages_array() {
 		// REFACTOR - Transform this into a field type instead.
 		// Setup an array of portfolio gallery terms for a dropdown.
-		$args = array( 'echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC' );
-		$pages_dropdown = wp_dropdown_pages( $args );
+		$args = array('echo' => 0, 'hierarchical' => 1, 'sort_column' => 'post_title', 'sort_order' => 'ASC');
+		$pages_dropdown = wp_dropdown_pages($args);
 		$page_items = array();
 
 		// Quick string hack to make sure we get the pages with the indents.
-		$pages_dropdown = str_replace( "<select class='' name='page_id' id='page_id'>", '', $pages_dropdown );
-		$pages_dropdown = str_replace( '</select>', '', $pages_dropdown );
-		$pages_split = explode( '</option>', $pages_dropdown );
+		$pages_dropdown = str_replace("<select class='' name='page_id' id='page_id'>", '', $pages_dropdown);
+		$pages_dropdown = str_replace('</select>', '', $pages_dropdown);
+		$pages_split = explode('</option>', $pages_dropdown);
 
-		$page_items[] = __( 'Select a Page:', 'woothemes-sensei' );
+		$page_items[] = __('Select a Page:', 'woothemes-sensei');
 
-		foreach ( $pages_split as $k => $v ) {
+		foreach ($pages_split as $k => $v) {
 		    $id = '';
 		    // Get the ID value.
-		    preg_match( '/value="(.*?)"/i', $v, $matches );
+		    preg_match('/value="(.*?)"/i', $v, $matches);
 
-		    if ( isset( $matches[1] ) ) {
+		    if (isset($matches[1])) {
 		        $id = $matches[1];
-		        $page_items[$id] = trim( strip_tags( $v ) );
+		        $page_items[$id] = trim(strip_tags($v));
 		    } // End If Statement
 		} // End For Loop
 
@@ -677,10 +677,10 @@ 
      *
      * @since 1.9.0
      */
-    public static function flush_rewrite_rules(){
+    public static function flush_rewrite_rules() {
 
-        if ( isset( $_POST[ 'option_page' ] ) && 'woothemes-sensei-settings' == $_POST[ 'option_page' ]
-            && isset( $_POST[ 'action' ] ) && 'update' == $_POST[ 'action' ] ) {
+        if (isset($_POST['option_page']) && 'woothemes-sensei-settings' == $_POST['option_page']
+            && isset($_POST['action']) && 'update' == $_POST['action']) {
 
             Sensei()->initiate_rewrite_rules_flush();
 
@@ -694,4 +694,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Settings extends Sensei_Settings{}
+class WooThemes_Sensei_Settings extends Sensei_Settings {}