woothemes / sensei

includes/class-sensei-updates.php

Spacing +436 added lines, -436 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Updates Class
@@ -31,7 +31,7 @@ 
 
 		// Setup object data
 		$this->parent = $parent;
-		$this->updates_run = get_option( 'woothemes-sensei-upgrades', array() );
+		$this->updates_run = get_option('woothemes-sensei-upgrades', array());
 
         // The list of upgrades to run
         $this->updates = array('1.1.0' => array('auto' => array('assign_role_caps' => array('title' => __('Assign role capabilities', 'woothemes-sensei'), 'desc' => __('Assigns Sensei capabilites to the relevant user roles.', 'woothemes-sensei'), 'product' => 'Sensei')),
@@ -75,8 +75,8 @@ 
             ),
         );
 
-		$this->updates = apply_filters( 'sensei_upgrade_functions', $this->updates, $this->updates );
-		$this->version = get_option( 'woothemes-sensei-version' );
+		$this->updates = apply_filters('sensei_upgrade_functions', $this->updates, $this->updates);
+		$this->version = get_option('woothemes-sensei-version');
 
         // Manual Update Screen
         add_action('admin_menu', array($this, 'add_update_admin_screen'), 50);
@@ -120,10 +120,10 @@ 
         <h2><?php _e('Sensei Updates', 'woothemes-sensei'); ?></h2>
 
         <?php
-        $function_name= '';
-        if ( isset($_GET['action']) && $_GET['action'] == 'update'
+        $function_name = '';
+        if (isset($_GET['action']) && $_GET['action'] == 'update'
             && isset($_GET['n']) && intval($_GET['n']) >= 0
-            && ( (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) || (isset($_GET['functions']) && '' != $_GET['functions']))) {
+            && ((isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) || (isset($_GET['functions']) && '' != $_GET['functions']))) {
 
             // Setup the data variables
             $n = intval($_GET['n']);
@@ -135,12 +135,12 @@ 
 
                 foreach ($_POST['checked'] as $key => $function_name) {
 
-                    if( ! isset(  $_POST[ $function_name.'_nonce_field' ] ) 
-                        || ! wp_verify_nonce( $_POST[ $function_name.'_nonce_field' ] , 'run_'.$function_name ) ){
+                    if ( ! isset($_POST[$function_name.'_nonce_field']) 
+                        || ! wp_verify_nonce($_POST[$function_name.'_nonce_field'], 'run_'.$function_name)) {
 
                         wp_die(
-                            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                            '<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+                            '<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+                            '<p>'.__('The nonce supplied in order to run this update function is invalid', 'woothemes-sensei').'</p>',
                             403
                         );
 
@@ -157,7 +157,7 @@ 
 
                     } else {
 
-                        _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+                        _doing_it_wrong(esc_html($function_name), 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
                         return;
 
                     }// End If Statement
@@ -166,7 +166,7 @@ 
                 if ('' == $functions_list) {
                     $functions_list .= $function_name;
                 } else {
-                    $functions_list .= '+' . $function_name;
+                    $functions_list .= '+'.$function_name;
                 } // End If Statement
 
                 // Mark update has having been run
@@ -184,12 +184,12 @@ 
 
             foreach ($functions_array as $key => $function_name) {
 
-                if( ! isset( $_GET[ $function_name.'_nonce' ] )
-                    || ! wp_verify_nonce( $_GET[ $function_name.'_nonce' ] , 'run_'.$function_name ) ){
+                if ( ! isset($_GET[$function_name.'_nonce'])
+                    || ! wp_verify_nonce($_GET[$function_name.'_nonce'], 'run_'.$function_name)) {
 
                     wp_die(
-                        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                        '<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+                        '<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+                        '<p>'.__('The nonce supplied in order to run this update function is invalid', 'woothemes-sensei').'</p>',
                         403
                     );
 
@@ -206,7 +206,7 @@ 
 
                 } else {
 
-                    _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+                    _doing_it_wrong(esc_html($function_name), 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
                     return;
 
                 } // End If Statement
@@ -215,7 +215,7 @@ 
                 if ('' == $functions_list) {
                     $functions_list .= $function_name;
                 } else {
-                    $functions_list .= '+' . $function_name;
+                    $functions_list .= '+'.$function_name;
                 } // End If Statement
 
                 $this->set_update_run($function_name);
@@ -224,27 +224,27 @@ 
 
         } // End If Statement
 
-        if (!$done_processing) { ?>
+        if ( ! $done_processing) { ?>
 
             <h3><?php _e('Processing Updates...', 'woothemes-sensei'); ?></h3>
 
             <p>
 
-                <?php _e( "If your browser doesn't start loading the next page automatically, click this button:", 'woothemes-sensei' ); ?>
+                <?php _e("If your browser doesn't start loading the next page automatically, click this button:", 'woothemes-sensei'); ?>
 
                 <?php
-                $next_action_url = add_query_arg( array(
+                $next_action_url = add_query_arg(array(
                     'page' => 'sensei_updates',
                     'action' => 'update',
                     'n' => $n + 50,
-                    'functions' => array( $functions_list ),
-                    $function_name.'_nonce' => wp_create_nonce( 'run_'. $function_name ),
-                ), admin_url( 'admin.php' ) );
+                    'functions' => array($functions_list),
+                    $function_name.'_nonce' => wp_create_nonce('run_'.$function_name),
+                ), admin_url('admin.php'));
                 ?>
 
-                <a class="button"  href="<?php echo esc_url( $next_action_url ); ?>">
+                <a class="button"  href="<?php echo esc_url($next_action_url); ?>">
 
-                    <?php _e( 'Next', 'woothemes-sensei' ); ?>
+                    <?php _e('Next', 'woothemes-sensei'); ?>
 
                 </a>
 
@@ -252,7 +252,7 @@ 
             <script type='text/javascript'>
                 <!--
                 function js_sensei_nextpage() {
-                    location.href = "<?php echo esc_url_raw(  $next_action_url );?>";
+                    location.href = "<?php echo esc_url_raw($next_action_url); ?>";
                 }
                 setTimeout( "js_sensei_nextpage()", 250 );
                 //-->
@@ -331,17 +331,17 @@ 
                                     <td><p><?php echo $type_label; ?></p></td>
                                     <td>
                                         <p>
-                                            <input onclick="javascript:return confirm('<?php echo addslashes( sprintf( __( 'Are you sure you want to run the \'%s\' update?', 'woothemes-sensei' ), $data['title'] ) ); ?>');"
+                                            <input onclick="javascript:return confirm('<?php echo addslashes(sprintf(__('Are you sure you want to run the \'%s\' update?', 'woothemes-sensei'), $data['title'])); ?>');"
                                                    id="update-sensei"
-                                                   class="button<?php if( ! $update_run ) { echo ' button-primary'; } ?>"
+                                                   class="button<?php if ( ! $update_run) { echo ' button-primary'; } ?>"
                                                    type="submit"
-                                                   value="<?php if( $update_run ) { _e( 'Re-run Update', 'woothemes-sensei' ); } else { _e( 'Run Update', 'woothemes-sensei' ); } ?>"
+                                                   value="<?php if ($update_run) { _e('Re-run Update', 'woothemes-sensei'); } else { _e('Run Update', 'woothemes-sensei'); } ?>"
                                                    name="update">
 
                                             <?php
                                             $nonce_action = 'run_'.$update;
                                             $nonce_field_name = $update.'_nonce_field';
-                                            wp_nonce_field( $nonce_action, $nonce_field_name, false, true );
+                                            wp_nonce_field($nonce_action, $nonce_field_name, false, true);
                                             ?>
                                         </p>
                                     </td>
@@ -375,7 +375,7 @@ 
      *
      * @param string $function_name
      */
-    public function function_in_whitelist( $function_name ){
+    public function function_in_whitelist($function_name) {
 
         $function_whitelist = array(
             'status_changes_convert_questions',
@@ -386,7 +386,7 @@ 
 
         );
 
-        return in_array($function_name, $function_whitelist );
+        return in_array($function_name, $function_whitelist);
 
     }// end function_in_whitelist
 
@@ -397,8 +397,8 @@ 
 	 * @param  string $b Second key
 	 * @return integer
 	 */
-	private function sort_updates( $a, $b ) {
-		return strcmp( $a, $b );
+	private function sort_updates($a, $b) {
+		return strcmp($a, $b);
 	}
 
 	/**
@@ -409,39 +409,39 @@ 
 	 * @access public
 	 * @return boolean
 	 */
-	public function update ( $type = 'auto' ) {
+	public function update($type = 'auto') {
 
 		// Only allow admins to run update functions
-		if( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
             return false;
         }
 
         $this->force_updates();
 
         // Run through all functions
-        foreach ( $this->updates as $version => $value ) {
-            foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
-                if ( $upgrade_type == $type ) {
+        foreach ($this->updates as $version => $value) {
+            foreach ($this->updates[$version] as $upgrade_type => $function_to_run) {
+                if ($upgrade_type == $type) {
                     $updated = false;
                     // Run the update function
-                    foreach ( $function_to_run as $function_name => $update_data ) {
-                        if ( isset( $function_name ) && '' != $function_name ) {
-                            if ( ! in_array( $function_name, $this->updates_run ) ) {
+                    foreach ($function_to_run as $function_name => $update_data) {
+                        if (isset($function_name) && '' != $function_name) {
+                            if ( ! in_array($function_name, $this->updates_run)) {
                                 $updated = false;
-                                if ( method_exists( $this, $function_name ) ) {
+                                if (method_exists($this, $function_name)) {
 
-            $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-			update_option( Sensei()->token . '-upgrades', $this->updates_run );
+            $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+			update_option(Sensei()->token.'-upgrades', $this->updates_run);
 			return true;
 
-                                } elseif( $this->function_in_whitelist( $function_name ) ) {
+                                } elseif ($this->function_in_whitelist($function_name)) {
 
-                                    $updated = call_user_func( $function_name );
+                                    $updated = call_user_func($function_name);
 
                                 }  // End If Statement
 
-                                if ( $updated ) {
-                                    array_push( $this->updates_run, $function_name );
+                                if ($updated) {
+                                    array_push($this->updates_run, $function_name);
                                 } // End If Statement
                             }
                         } // End If Statement
@@ -450,8 +450,8 @@ 
             } // End For Loop
         } // End For Loop
 
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-        update_option( $this->token . '-upgrades', $this->updates_run );
+        $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+        update_option($this->token.'-upgrades', $this->updates_run);
 
         return true;
 
@@ -459,7 +459,7 @@ 
 
 	private function force_updates() {
 
-		if( ! isset( $_GET['page'] ) || 'sensei_updates' != $_GET['page'] ) {
+		if ( ! isset($_GET['page']) || 'sensei_updates' != $_GET['page']) {
 
 			// $skip_forced_updates = false;
 			// if( ! get_option( 'woothemes-sensei-force-updates', false ) ) {
@@ -468,8 +468,8 @@ 
 
 			// Force critical updates if only if lessons already exist
 			$skip_forced_updates = false;
-			$lesson_posts = wp_count_posts( 'lesson' );
-			if( ! isset( $lesson_posts->publish ) || ! $lesson_posts->publish ) {
+			$lesson_posts = wp_count_posts('lesson');
+			if ( ! isset($lesson_posts->publish) || ! $lesson_posts->publish) {
 				$skip_forced_updates = true;
 			}
 
@@ -477,69 +477,69 @@ 
 
 			$updates_to_run = array();
 
-			foreach ( $this->updates as $version => $value ) {
-				foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
-					if ( $upgrade_type == 'forced' ) {
-						foreach ( $function_to_run as $function_name => $update_data ) {
+			foreach ($this->updates as $version => $value) {
+				foreach ($this->updates[$version] as $upgrade_type => $function_to_run) {
+					if ($upgrade_type == 'forced') {
+						foreach ($function_to_run as $function_name => $update_data) {
 
-							if( $skip_forced_updates ) {
-								$this->set_update_run( $function_name );
+							if ($skip_forced_updates) {
+								$this->set_update_run($function_name);
 								continue;
 							}
 
-							$update_run = $this->has_update_run( $function_name );
+							$update_run = $this->has_update_run($function_name);
 
-							if( ! $update_run ) {
+							if ( ! $update_run) {
 								$use_the_force = true;
-								$updates_to_run[ $function_name ] = $update_data;
+								$updates_to_run[$function_name] = $update_data;
 							}
 						}
 					}
 				}
 			}
 
-			if( $skip_forced_updates ) {
+			if ($skip_forced_updates) {
 				return;
 			}
 
-			if( $use_the_force && 0 < count( $updates_to_run ) ) {
+			if ($use_the_force && 0 < count($updates_to_run)) {
 
-				$update_title = __( 'Important Sensei updates required', 'woothemes-sensei' );
+				$update_title = __('Important Sensei updates required', 'woothemes-sensei');
 
-				$update_message = '<h1>' . __( 'Important Sensei upgrades required!', 'woothemes-sensei' ) . '</h1>' . "\n";
+				$update_message = '<h1>'.__('Important Sensei upgrades required!', 'woothemes-sensei').'</h1>'."\n";
 
 				// $update_message .= '<h4>' . sprintf( __( 'These updates are only required if you are updating from a previous version of Sensei. If you are installing Sensei for the first time, %1$syou can dismiss this page by clicking here%2$s.', 'woothemes-sensei' ), '<a href="' . add_query_arg( array( 'sensei_skip_forced_updates' => 'true' ) ) . '">', '</a>' ) . '</h4>' ."\n";
 
-				$update_message .= '<p>' . __( 'The latest version of Sensei requires some important database upgrades. In order to run these upgrades you will need to follow the step by step guide below. Your site will not function correctly unless you run these critical updates.', 'woothemes-sensei' ) . '</p>' . "\n";
+				$update_message .= '<p>'.__('The latest version of Sensei requires some important database upgrades. In order to run these upgrades you will need to follow the step by step guide below. Your site will not function correctly unless you run these critical updates.', 'woothemes-sensei').'</p>'."\n";
 
-				$update_message .= '<p><b>' . __( 'To run the upgrades click on each of the links below in the order that they appear.', 'woothemes-sensei' ) . '</b></p>' . "\n";
+				$update_message .= '<p><b>'.__('To run the upgrades click on each of the links below in the order that they appear.', 'woothemes-sensei').'</b></p>'."\n";
 
-				$update_message .= '<p>' . __( 'Clicking each link will open up a new window/tab - do not close that window/tab until you see the message \'Update completed successfully\'. Once you see that message you can close the window/tab and start the next upgrade by clicking on the next link in the list.', 'woothemes-sensei' ) . '</p>' . "\n";
+				$update_message .= '<p>'.__('Clicking each link will open up a new window/tab - do not close that window/tab until you see the message \'Update completed successfully\'. Once you see that message you can close the window/tab and start the next upgrade by clicking on the next link in the list.', 'woothemes-sensei').'</p>'."\n";
 
-				$update_message .= '<p><b>' . __( 'Once all the upgrades have been completed you will be able to use your WordPress site again.', 'woothemes-sensei' ) . '</b></p>' . "\n";
+				$update_message .= '<p><b>'.__('Once all the upgrades have been completed you will be able to use your WordPress site again.', 'woothemes-sensei').'</b></p>'."\n";
 
-				$update_message .= '<ol>' . "\n";
+				$update_message .= '<ol>'."\n";
 
-					foreach( $updates_to_run as $function => $data ) {
+					foreach ($updates_to_run as $function => $data) {
 
-						if( ! isset( $data['title'] ) ) {
+						if ( ! isset($data['title'])) {
 							break;
 						}
 
-						$update_message .= '<li style="margin:5px 0;"><a href="' . admin_url( 'admin.php?page=sensei_updates&action=update&n=0&functions[]=' . $function ) . '" target="_blank">' . $data['title'] . '</a></li>';
+						$update_message .= '<li style="margin:5px 0;"><a href="'.admin_url('admin.php?page=sensei_updates&action=update&n=0&functions[]='.$function).'" target="_blank">'.$data['title'].'</a></li>';
 					}
 
-				$update_message .= '</ol>' . "\n";
+				$update_message .= '</ol>'."\n";
 
-				switch( $version ) {
+				switch ($version) {
 
 					case '1.7.0':
-						$update_message .= '<p><em>' . sprintf( __( 'Want to know what these upgrades are all about? %1$sFind out more here%2$s.', 'woothemes-sensei' ), '<a href="http://develop.woothemes.com/sensei/2014/12/03/important-information-about-sensei-1-7" target="_blank">', '</a>' ) . '</em></p>' . "\n";
+						$update_message .= '<p><em>'.sprintf(__('Want to know what these upgrades are all about? %1$sFind out more here%2$s.', 'woothemes-sensei'), '<a href="http://develop.woothemes.com/sensei/2014/12/03/important-information-about-sensei-1-7" target="_blank">', '</a>').'</em></p>'."\n";
 					break;
 
 				}
 
-				wp_die( $update_message, $update_title );
+				wp_die($update_message, $update_title);
 			}
 		}
 	}
@@ -551,8 +551,8 @@ 
 	 * @since  1.4.0
 	 * @return boolean
 	 */
-	private function has_update_run( $update ) {
-		if ( in_array( $update, $this->updates_run ) ) {
+	private function has_update_run($update) {
+		if (in_array($update, $this->updates_run)) {
 			return true;
 		}
 		return false;
@@ -564,10 +564,10 @@ 
 	 * @param string $update Update to process
 	 * @since  1.4.0
 	 */
-	private function set_update_run( $update ) {
-		array_push( $this->updates_run, $update );
-        $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
-		update_option( Sensei()->token . '-upgrades', $this->updates_run );
+	private function set_update_run($update) {
+		array_push($this->updates_run, $update);
+        $this->updates_run = array_unique($this->updates_run); // we only need one reference per update
+		update_option(Sensei()->token.'-upgrades', $this->updates_run);
 	}
 
 	/**
@@ -578,15 +578,15 @@ 
 	 * @return void
 	 */
 	public function assign_role_caps() {
-		foreach ( $this->parent->post_types->role_caps as $role_cap_set  ) {
-			foreach ( $role_cap_set as $role_key => $capabilities_array ) {
+		foreach ($this->parent->post_types->role_caps as $role_cap_set) {
+			foreach ($role_cap_set as $role_key => $capabilities_array) {
 				/* Get the role. */
-				$role = get_role( $role_key );
-				foreach ( $capabilities_array as $cap_name  ) {
+				$role = get_role($role_key);
+				foreach ($capabilities_array as $cap_name) {
 					/* If the role exists, add required capabilities for the plugin. */
-					if ( !empty( $role ) ) {
-						if ( !$role->has_cap( $cap_name ) ) {
-							$role->add_cap( $cap_name );
+					if ( ! empty($role)) {
+						if ( ! $role->has_cap($cap_name)) {
+							$role->add_cap($cap_name);
 						} // End If Statement
 					} // End If Statement
 				} // End For Loop
@@ -602,16 +602,16 @@ 
 	 * @return void
 	 */
 	public function set_default_quiz_grade_type() {
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
-			update_post_meta( $quiz->ID, '_quiz_grade_type', 'auto' );
-			update_post_meta( $quiz->ID, '_quiz_grade_type_disabled', '' );
+		foreach ($quizzes as $quiz) {
+			update_post_meta($quiz->ID, '_quiz_grade_type', 'auto');
+			update_post_meta($quiz->ID, '_quiz_grade_type_disabled', '');
 		}
 	} // End set_default_quiz_grade_type
 
@@ -623,23 +623,23 @@ 
 	 * @return void
 	 */
 	public function set_default_question_type() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
 		$already_run = true;
-		foreach( $questions as $question ) {
-			if( $already_run ) {
-				$terms = wp_get_post_terms( $question->ID, 'question-type' );
-				if( is_array( $terms ) && count( $terms ) > 0 ) {
+		foreach ($questions as $question) {
+			if ($already_run) {
+				$terms = wp_get_post_terms($question->ID, 'question-type');
+				if (is_array($terms) && count($terms) > 0) {
 					break;
 				}
 			}
 			$already_run = false;
-			wp_set_post_terms( $question->ID, array( 'multiple-choice' ), 'question-type' );
+			wp_set_post_terms($question->ID, array('multiple-choice'), 'question-type');
 		}
 
 	} // End set_default_question_type
@@ -651,90 +651,90 @@ 
 	 * @access public
 	 * @return boolean
 	 */
-	public function update_question_answer_data( $n = 50, $offset = 0 ) {
+	public function update_question_answer_data($n = 50, $offset = 0) {
 
 		// Get Total Number of Updates to run
-		$quiz_count_object = wp_count_posts( 'quiz' );
+		$quiz_count_object = wp_count_posts('quiz');
 		$quiz_count_published = $quiz_count_object->publish;
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
-		$total_pages = intval( $quiz_count_published / $n );
+		$total_pages = intval($quiz_count_published / $n);
 
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
 		$old_answers = array();
 		$right_answers = array();
 		$old_user_answers = array();
 
-		if( is_array( $quizzes ) ) {
-			foreach( $quizzes as $quiz ) {
+		if (is_array($quizzes)) {
+			foreach ($quizzes as $quiz) {
 				$quiz_id = $quiz->ID;
 
 				// Get current user answers
-				$comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $quiz_id, 'type' => 'sensei_quiz_answers' ), true  );
+				$comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => $quiz_id, 'type' => 'sensei_quiz_answers'), true);
 				// Need to always return an array, even with only 1 item
-				if ( !is_array($comments) ) {
-					$comments = array( $comments );
+				if ( ! is_array($comments)) {
+					$comments = array($comments);
 				}
-				foreach ( $comments as $comment ) {
+				foreach ($comments as $comment) {
 					$user_id = $comment->user_id;
-					$content = maybe_unserialize( base64_decode( $comment->comment_content ) );
-					$old_user_answers[ $quiz_id ][ $user_id ] = $content;
+					$content = maybe_unserialize(base64_decode($comment->comment_content));
+					$old_user_answers[$quiz_id][$user_id] = $content;
 				}
 
 				// Get correct answers
-				$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-				if( is_array( $questions ) ) {
-					foreach( $questions as $question ) {
-						$right_answer = get_post_meta( $question->ID, '_question_right_answer', true );
-						$right_answers[ $quiz_id ][ $question->ID ] = $right_answer;
+				$questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id);
+				if (is_array($questions)) {
+					foreach ($questions as $question) {
+						$right_answer = get_post_meta($question->ID, '_question_right_answer', true);
+						$right_answers[$quiz_id][$question->ID] = $right_answer;
 					}
 				}
 			}
 		}
 
-		if( is_array( $right_answers ) ) {
-			foreach( $right_answers as $quiz_id => $question ) {
+		if (is_array($right_answers)) {
+			foreach ($right_answers as $quiz_id => $question) {
 				$count = 0;
-				if( is_array( $question ) ) {
-					foreach( $question as $question_id => $answer ) {
+				if (is_array($question)) {
+					foreach ($question as $question_id => $answer) {
 						++$count;
-						if( isset( $old_user_answers[ $quiz_id ] ) ) {
-							$answers_linkup[ $quiz_id ][ $count ] = $question_id;
+						if (isset($old_user_answers[$quiz_id])) {
+							$answers_linkup[$quiz_id][$count] = $question_id;
 						}
 					}
 				}
 			}
 		}
 
-		if( is_array( $old_user_answers ) ) {
-			foreach( $old_user_answers as $quiz_id => $user_answers ) {
-				foreach( $user_answers as $user_id => $answers ) {
-					foreach( $answers as $answer_id => $user_answer ) {
-						$question_id = $answers_linkup[ $quiz_id ][ $answer_id ];
-						$new_user_answers[ $question_id ] = $user_answer;
-						Sensei_Utils::sensei_grade_question_auto( $question_id, '', $user_answer, $user_id );
+		if (is_array($old_user_answers)) {
+			foreach ($old_user_answers as $quiz_id => $user_answers) {
+				foreach ($user_answers as $user_id => $answers) {
+					foreach ($answers as $answer_id => $user_answer) {
+						$question_id = $answers_linkup[$quiz_id][$answer_id];
+						$new_user_answers[$question_id] = $user_answer;
+						Sensei_Utils::sensei_grade_question_auto($question_id, '', $user_answer, $user_id);
 					}
-					$lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true );
-					Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
-					Sensei_Utils::sensei_save_quiz_answers( $new_user_answers, $user_id );
+					$lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true);
+					Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
+					Sensei_Utils::sensei_save_quiz_answers($new_user_answers, $user_id);
 				}
 			}
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -749,15 +749,15 @@ 
 	 * @return boolean
 	 */
 	public function update_question_grade_points() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
-			update_post_meta( $question->ID, '_question_grade', '1' );
+		foreach ($questions as $question) {
+			update_post_meta($question->ID, '_question_grade', '1');
 		}
 		return true;
 	} // End update_question_grade_points
@@ -769,7 +769,7 @@ 
 	 * @return boolean
 	 */
 	public function convert_essay_paste_questions() {
-		$args = array(	'post_type' 		=> 'question',
+		$args = array('post_type' 		=> 'question',
 						'posts_per_page' 		=> -1,
 						'post_status'		=> 'publish',
 						'tax_query'			=> array(
@@ -781,14 +781,14 @@ 
 						),
 						'suppress_filters' 	=> 0
 						);
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
-			wp_set_object_terms( $question->ID, 'multi-line', 'question-type', false );
+		foreach ($questions as $question) {
+			wp_set_object_terms($question->ID, 'multi-line', 'question-type', false);
 
-			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
-			if( 0 < intval( $quiz_id ) ) {
-				add_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $quiz_id . '0000', true );
+			$quiz_id = get_post_meta($question->ID, '_quiz_id', true);
+			if (0 < intval($quiz_id)) {
+				add_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $quiz_id.'0000', true);
 			}
 		}
 		return true;
@@ -800,33 +800,33 @@ 
 	 * @since  1.5.0
 	 * @return boolean
 	 */
-	public function set_random_question_order( $n = 50, $offset = 0 ) {
+	public function set_random_question_order($n = 50, $offset = 0) {
 
 		// Get Total Number of Updates to run
-		$quiz_count_object = wp_count_posts( 'quiz' );
+		$quiz_count_object = wp_count_posts('quiz');
 		$quiz_count_published = $quiz_count_object->publish;
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
-		$total_pages = intval( $quiz_count_published / $n );
+		$total_pages = intval($quiz_count_published / $n);
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'post_status'		=> 'any',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
-			update_post_meta( $quiz->ID, '_random_question_order', 'yes' );
+		foreach ($quizzes as $quiz) {
+			update_post_meta($quiz->ID, '_random_question_order', 'yes');
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -840,37 +840,37 @@ 
 	 * @since  1.5.0
 	 * @return boolean
 	 */
-	public function set_default_show_question_count( $n = 50, $offset = 0 ) {
+	public function set_default_show_question_count($n = 50, $offset = 0) {
 
-		$args = array(	'post_type' 		=> 'quiz',
+		$args = array('post_type' 		=> 'quiz',
 						'post_status'		=> 'any',
 						'posts_per_page' 		=> $n,
 						'offset'			=> $offset,
 						'meta_key'			=> '_show_questions',
 						'suppress_filters' 	=> 0
 						);
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		$total_quizzes = count( $quizzes );
+		$total_quizzes = count($quizzes);
 
-		if( 0 == intval( $total_quizzes ) ) {
+		if (0 == intval($total_quizzes)) {
 			return true;
 		}
 
-		foreach( $quizzes as $quiz ) {
-			delete_post_meta( $quiz->ID, '_show_questions' );
+		foreach ($quizzes as $quiz) {
+			delete_post_meta($quiz->ID, '_show_questions');
 		}
 
-		$total_pages = intval( $total_quizzes / $n );
+		$total_pages = intval($total_quizzes / $n);
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -878,14 +878,14 @@ 
 
 	}
 
-	public function remove_deleted_user_activity( $n = 50, $offset = 0 ) {
+	public function remove_deleted_user_activity($n = 50, $offset = 0) {
 
-		$all_activity = get_comments( array( 'status' => 'approve' ) );
+		$all_activity = get_comments(array('status' => 'approve'));
 		$activity_count = array();
-		foreach( $all_activity as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+		foreach ($all_activity as $activity) {
+			if ('' == $activity->comment_type) continue;
+			if (strpos('sensei_', $activity->comment_type) != 0) continue;
+			if (0 == $activity->user_id) continue;
 			$activity_count[] = $activity->comment_ID;
 		}
 
@@ -895,33 +895,33 @@ 
 			'status' => 'approve'
 		);
 
-		$activities = get_comments( $args );
+		$activities = get_comments($args);
 
-		foreach( $activities as $activity ) {
-			if( '' == $activity->comment_type ) continue;
-			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue;
-			if( 0 == $activity->user_id ) continue;
+		foreach ($activities as $activity) {
+			if ('' == $activity->comment_type) continue;
+			if (strpos('sensei_', $activity->comment_type) != 0) continue;
+			if (0 == $activity->user_id) continue;
 
-			$user_exists = get_userdata( $activity->user_id );
+			$user_exists = get_userdata($activity->user_id);
 
-			if( ! $user_exists ) {
-				wp_delete_comment( intval( $activity->comment_ID ), true );
+			if ( ! $user_exists) {
+				wp_delete_comment(intval($activity->comment_ID), true);
 				wp_cache_flush();
 			}
 		}
 
-		$total_activities = count( $activity_count );
+		$total_activities = count($activity_count);
 
-		$total_pages = intval( $total_activities / $n );
+		$total_pages = intval($total_activities / $n);
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		} // End If Statement
 
-		if ( $current_page >= $total_pages ) {
+		if ($current_page >= $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -930,16 +930,16 @@ 
 	}
 
 	public function add_teacher_role() {
-		add_role( 'teacher', __( 'Teacher', 'woothemes-sensei' ), array( 'read' => true, 'manage_sensei_grades' => true ) );
+		add_role('teacher', __('Teacher', 'woothemes-sensei'), array('read' => true, 'manage_sensei_grades' => true));
 		return true;
 	}
 
 	public function add_sensei_caps() {
-		$role = get_role( 'administrator' );
+		$role = get_role('administrator');
 
-		if( ! is_null( $role ) ) {
-			$role->add_cap( 'manage_sensei' );
-			$role->add_cap( 'manage_sensei_grades' );
+		if ( ! is_null($role)) {
+			$role->add_cap('manage_sensei');
+			$role->add_cap('manage_sensei_grades');
 		}
 
 		return true;
@@ -953,16 +953,16 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$questions = get_posts( $args );
+		$questions = get_posts($args);
 
-		foreach( $questions as $question ) {
+		foreach ($questions as $question) {
 
-			if( ! isset( $question->ID ) ) continue;
+			if ( ! isset($question->ID)) continue;
 
-			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
+			$quiz_id = get_post_meta($question->ID, '_quiz_id', true);
 
-			$question_order = get_post_meta( $question->ID, '_quiz_question_order', true );
-			update_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $question_order );
+			$question_order = get_post_meta($question->ID, '_quiz_question_order', true);
+			update_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $question_order);
 
 		}
 
@@ -971,15 +971,15 @@ 
 
 	public function update_quiz_settings() {
 
-		$settings = get_option( 'woothemes-sensei-settings', array() );
+		$settings = get_option('woothemes-sensei-settings', array());
 
 		$lesson_completion = false;
-		if( isset( $settings['lesson_completion'] ) ) {
+		if (isset($settings['lesson_completion'])) {
 			$lesson_completion = $settings['lesson_completion'];
 		}
 
 		$reset_quiz_allowed = false;
-		if( isset( $settings['quiz_reset_allowed'] ) ) {
+		if (isset($settings['quiz_reset_allowed'])) {
 			$reset_quiz_allowed = $settings['quiz_reset_allowed'];
 		}
 
@@ -990,20 +990,20 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			if( ! isset( $quiz->ID ) ) continue;
+			if ( ! isset($quiz->ID)) continue;
 
-			if( isset( $lesson_completion ) && 'passed' == $lesson_completion ) {
-				update_post_meta( $quiz->ID, '_pass_required', 'on' );
+			if (isset($lesson_completion) && 'passed' == $lesson_completion) {
+				update_post_meta($quiz->ID, '_pass_required', 'on');
 			} else {
-				update_post_meta( $quiz->ID, '_quiz_passmark', 0 );
+				update_post_meta($quiz->ID, '_quiz_passmark', 0);
 			}
 
-			if( isset( $reset_quiz_allowed ) && $reset_quiz_allowed ) {
-				update_post_meta( $quiz->ID, '_enable_quiz_reset', 'on' );
+			if (isset($reset_quiz_allowed) && $reset_quiz_allowed) {
+				update_post_meta($quiz->ID, '_enable_quiz_reset', 'on');
 			}
 		}
 
@@ -1018,22 +1018,22 @@ 
 			'suppress_filters' 	=> 0
 		);
 
-		$lessons = get_posts( $args );
+		$lessons = get_posts($args);
 
-		foreach( $lessons as $lesson ) {
+		foreach ($lessons as $lesson) {
 
-			if( ! isset( $lesson->ID ) ) continue;
+			if ( ! isset($lesson->ID)) continue;
 
-			$course_id = get_post_meta( $lesson->ID, '_lesson_course', true);
+			$course_id = get_post_meta($lesson->ID, '_lesson_course', true);
 
-			if( $course_id ) {
-				update_post_meta( $lesson->ID, '_order_' . $course_id, 0 );
+			if ($course_id) {
+				update_post_meta($lesson->ID, '_order_'.$course_id, 0);
 			}
 
-            $module = Sensei()->modules->get_lesson_module( $lesson->ID );
+            $module = Sensei()->modules->get_lesson_module($lesson->ID);
 
-            if( $module ) {
-                update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 );
+            if ($module) {
+                update_post_meta($lesson->ID, '_order_module_'.$module->term_id, 0);
             }
 
 		}
@@ -1042,10 +1042,10 @@ 
 	}
 
 	public function add_editor_caps() {
-		$role = get_role( 'editor' );
+		$role = get_role('editor');
 
-		if( ! is_null( $role ) ) {
-			$role->add_cap( 'manage_sensei_grades' );
+		if ( ! is_null($role)) {
+			$role->add_cap('manage_sensei_grades');
 		}
 
 		return true;
@@ -1064,26 +1064,26 @@ 
 					WHERE m.meta_key = '_question_right_answer' AND m.meta_value LIKE '%|%' AND m.meta_value NOT LIKE '%||%'
 						AND m.post_id = tr.object_id AND tr.term_taxonomy_id = tt.term_taxonomy_id AND tt.term_id = t.term_id
 						AND tt.taxonomy = 'question-type' AND t.slug = 'gap-fill'";
-		$wpdb->query( $sql );
+		$wpdb->query($sql);
 
 		return true;
 	}
 
-	public function update_quiz_lesson_relationship( $n = 50, $offset = 0 ) {
-		$count_object = wp_count_posts( 'quiz' );
+	public function update_quiz_lesson_relationship($n = 50, $offset = 0) {
+		$count_object = wp_count_posts('quiz');
 
 		$count_published = 0;
-		foreach ( $count_object AS $status => $count ) {
+		foreach ($count_object AS $status => $count) {
 			$count_published += $count;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		$args = array(
 			'post_type' => 'quiz',
@@ -1092,52 +1092,52 @@ 
 			'post_status' => 'any'
 		);
 
-		$quizzes = get_posts( $args );
+		$quizzes = get_posts($args);
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			if( ! isset( $quiz->ID ) || 0 != $quiz->post_parent ) continue;
+			if ( ! isset($quiz->ID) || 0 != $quiz->post_parent) continue;
 
-			$lesson_id = get_post_meta( $quiz->ID, '_quiz_lesson', true );
+			$lesson_id = get_post_meta($quiz->ID, '_quiz_lesson', true);
 
-			if( empty( $lesson_id ) ) continue;
+			if (empty($lesson_id)) continue;
 
 			$data = array(
 				'ID' => $quiz->ID,
 				'post_parent' => $lesson_id,
 			);
-			wp_update_post( $data );
+			wp_update_post($data);
 
-			update_post_meta( $lesson_id, '_lesson_quiz', $quiz->ID );
+			update_post_meta($lesson_id, '_lesson_quiz', $quiz->ID);
 		}
 
-		if ( $current_page == $total_pages || 0 == $total_pages ) {
+		if ($current_page == $total_pages || 0 == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_fix_lessons( $n = 50, $offset = 0 ) {
+	function status_changes_fix_lessons($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$count_object = wp_count_posts( 'lesson' );
+		$count_object = wp_count_posts('lesson');
 		$count_published = 0;
-		foreach ( $count_object AS $status => $count ) {
+		foreach ($count_object AS $status => $count) {
 			$count_published += $count;
 		}
 
-		if ( 0 == $count_published ) {
+		if (0 == $count_published) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		// Get all Lessons with (and without) Quizzes...
 		$args = array(
@@ -1147,26 +1147,26 @@ 
 			'offset' => $offset,
 			'fields' => 'ids'
 		);
-		$lesson_ids = get_posts( $args );
+		$lesson_ids = get_posts($args);
 
 		// ...get all Quiz IDs for the above Lessons
-		$id_list = join( ',', $lesson_ids );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', $lesson_ids);
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['meta_value'];
 				$quiz_id = $metarow['post_id'];
-				$lesson_quiz_ids[ $lesson_id ] = $quiz_id;
+				$lesson_quiz_ids[$lesson_id] = $quiz_id;
 			}
 		}
 
 		// ...check all Quiz IDs for questions
-		$id_list = join( ',', array_values($lesson_quiz_ids) );
-		$meta_list = $wpdb->get_results( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_id' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', array_values($lesson_quiz_ids));
+		$meta_list = $wpdb->get_results("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_id' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids_with_questions = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$quiz_id = $metarow['meta_value'];
 				$lesson_quiz_ids_with_questions[] = $quiz_id;
 			}
@@ -1174,49 +1174,49 @@ 
 
 		// For each quiz check there are questions, if not remove the corresponding meta keys from Quizzes and Lessons
 		// if there are questions on the quiz add the corresponding meta keys to Quizzes and Lessons
-		$d_count = $a_count =0;
-		foreach ( $lesson_quiz_ids AS $lesson_id => $quiz_id ) {
-			if ( !in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
+		$d_count = $a_count = 0;
+		foreach ($lesson_quiz_ids AS $lesson_id => $quiz_id) {
+			if ( ! in_array($quiz_id, $lesson_quiz_ids_with_questions)) {
 
 				// Quiz has no questions, drop the corresponding data
-				delete_post_meta( $quiz_id, '_pass_required' );
-				delete_post_meta( $quiz_id, '_quiz_passmark' );
-				delete_post_meta( $lesson_id, '_quiz_has_questions' );
+				delete_post_meta($quiz_id, '_pass_required');
+				delete_post_meta($quiz_id, '_quiz_passmark');
+				delete_post_meta($lesson_id, '_quiz_has_questions');
 				$d_count++;
 			}
-			else if ( in_array( $quiz_id, $lesson_quiz_ids_with_questions ) ) {
+			else if (in_array($quiz_id, $lesson_quiz_ids_with_questions)) {
 
 				// Quiz has no questions, drop the corresponding data
-				update_post_meta( $lesson_id, '_quiz_has_questions', true );
+				update_post_meta($lesson_id, '_quiz_has_questions', true);
 				$a_count++;
 			}
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_lessons( $n = 50, $offset = 0 ) {
+	function status_changes_convert_lessons($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		// Get all Lessons with Quizzes...
 		$args = array(
@@ -1231,34 +1231,34 @@ 
 			),
 			'fields' => 'ids'
 		);
-		$lesson_ids_with_quizzes = get_posts( $args );
+		$lesson_ids_with_quizzes = get_posts($args);
 		// ...get all Quiz IDs for the above Lessons
-		$id_list = join( ',', $lesson_ids_with_quizzes );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A );
+		$id_list = join(',', $lesson_ids_with_quizzes);
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '_quiz_lesson' AND meta_value IN ($id_list)", ARRAY_A);
 		$lesson_quiz_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['meta_value'];
 				$quiz_id = $metarow['post_id'];
-				$lesson_quiz_ids[ $lesson_id ] = $quiz_id;
+				$lesson_quiz_ids[$lesson_id] = $quiz_id;
 			}
 		}
 
 		// ...get all Pass Required & Passmarks for the above Lesson/Quizzes
-		$id_list = join( ',', array_values($lesson_quiz_ids) );
-		$meta_list = $wpdb->get_results( "SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE ( meta_key = '_pass_required' OR meta_key = '_quiz_passmark' ) AND post_id IN ($id_list)", ARRAY_A );
+		$id_list = join(',', array_values($lesson_quiz_ids));
+		$meta_list = $wpdb->get_results("SELECT post_id, meta_key, meta_value FROM $wpdb->postmeta WHERE ( meta_key = '_pass_required' OR meta_key = '_quiz_passmark' ) AND post_id IN ($id_list)", ARRAY_A);
 		$quizzes_pass_required = $quizzes_passmarks = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
-				if ( !empty($metarow['meta_value']) ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
+				if ( ! empty($metarow['meta_value'])) {
 					$quiz_id = $metarow['post_id'];
 					$key = $metarow['meta_key'];
 					$value = $metarow['meta_value'];
-					if ( '_pass_required' == $key ) {
-						$quizzes_pass_required[ $quiz_id ] = $value;
+					if ('_pass_required' == $key) {
+						$quizzes_pass_required[$quiz_id] = $value;
 					}
-					if ( '_quiz_passmark' == $key ) {
-						$quizzes_passmarks[ $quiz_id ] = $value;
+					if ('_quiz_passmark' == $key) {
+						$quizzes_passmarks[$quiz_id] = $value;
 					}
 				}
 			}
@@ -1272,41 +1272,41 @@ 
 		$check_existing_sql = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = 'sensei_lesson_status' ";
 
 		// $per_page users at a time, could be batch run via an admin ajax command, 1 user at a time?
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			$lesson_ends = $lesson_grades = $lesson_answers = array();
 
 			// Pre-process the lesson ends
-			$_lesson_ends = $wpdb->get_results( $wpdb->prepare($end_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_ends as $lesson_end ) {
+			$_lesson_ends = $wpdb->get_results($wpdb->prepare($end_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_ends as $lesson_end) {
 				// This will overwrite existing entries with the newer ones
-				$lesson_ends[ $lesson_end['comment_post_ID'] ] = $lesson_end['comment_date'];
+				$lesson_ends[$lesson_end['comment_post_ID']] = $lesson_end['comment_date'];
 			}
-			unset( $_lesson_ends );
+			unset($_lesson_ends);
 
 			// Pre-process the lesson grades
-			$_lesson_grades = $wpdb->get_results( $wpdb->prepare($grade_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_grades as $lesson_grade ) {
+			$_lesson_grades = $wpdb->get_results($wpdb->prepare($grade_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_grades as $lesson_grade) {
 				// This will overwrite existing entries with the newer ones (assuming the grade is higher)
-				if ( empty($lesson_grades[ $lesson_grade['comment_post_ID'] ]) || $lesson_grades[ $lesson_grade['comment_post_ID'] ] < $lesson_grade['comment_content'] ) {
-					$lesson_grades[ $lesson_grade['comment_post_ID'] ] = $lesson_grade['comment_content'];
+				if (empty($lesson_grades[$lesson_grade['comment_post_ID']]) || $lesson_grades[$lesson_grade['comment_post_ID']] < $lesson_grade['comment_content']) {
+					$lesson_grades[$lesson_grade['comment_post_ID']] = $lesson_grade['comment_content'];
 				}
 			}
-			unset( $_lesson_grades );
+			unset($_lesson_grades);
 
 			// Pre-process the lesson answers
-			$_lesson_answers = $wpdb->get_results( $wpdb->prepare($answers_sql, $user_id), ARRAY_A );
-			foreach ( $_lesson_answers as $lesson_answer ) {
+			$_lesson_answers = $wpdb->get_results($wpdb->prepare($answers_sql, $user_id), ARRAY_A);
+			foreach ($_lesson_answers as $lesson_answer) {
 				// This will overwrite existing entries with the newer ones
-				$lesson_answers[ $lesson_answer['comment_post_ID'] ] = $lesson_answer['comment_content'];
+				$lesson_answers[$lesson_answer['comment_post_ID']] = $lesson_answer['comment_content'];
 			}
-			unset( $_lesson_answers );
+			unset($_lesson_answers);
 
 			// Grab all the lesson starts for the user
-			$lesson_starts = $wpdb->get_results( $wpdb->prepare($start_sql, $user_id), ARRAY_A );
-			foreach ( $lesson_starts as $lesson_log ) {
+			$lesson_starts = $wpdb->get_results($wpdb->prepare($start_sql, $user_id), ARRAY_A);
+			foreach ($lesson_starts as $lesson_log) {
 
 				$lesson_id = $lesson_log['comment_post_ID'];
 
@@ -1319,23 +1319,23 @@ 
 					'start' => $status_date,
 				);
 				// Check if there is a lesson end
-				if ( !empty($lesson_ends[$lesson_id]) ) {
+				if ( ! empty($lesson_ends[$lesson_id])) {
 					$status_date = $lesson_ends[$lesson_id];
 					// Check lesson has quiz
-					if ( !empty( $lesson_quiz_ids[$lesson_id] ) ) {
+					if ( ! empty($lesson_quiz_ids[$lesson_id])) {
 						// Check for the quiz answers
-						if ( !empty($lesson_answers[$quiz_id]) ) {
+						if ( ! empty($lesson_answers[$quiz_id])) {
 							$meta_data['questions_asked'] = $lesson_answers[$quiz_id];
 						}
 						// Check if there is a quiz grade
 						$quiz_id = $lesson_quiz_ids[$lesson_id];
-						if ( !empty($lesson_grades[$quiz_id]) ) {
+						if ( ! empty($lesson_grades[$quiz_id])) {
 							$meta_data['grade'] = $quiz_grade = $lesson_grades[$quiz_id];
 							// Check if the user has to get the passmark and has or not
-							if ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] <= $quiz_grade ) {
+							if ( ! empty($quizzes_pass_required[$quiz_id]) && $quizzes_passmarks[$quiz_id] <= $quiz_grade) {
 								$status = 'passed';
 							}
-							elseif ( !empty( $quizzes_pass_required[$quiz_id] ) && $quizzes_passmarks[$quiz_id] > $quiz_grade ) {
+							elseif ( ! empty($quizzes_pass_required[$quiz_id]) && $quizzes_passmarks[$quiz_id] > $quiz_grade) {
 								$status = 'failed';
 							}
 							else {
@@ -1363,26 +1363,26 @@ 
 						'comment_author' => '',
 					);
 				// Check it doesn't already exist
-				$sql = $wpdb->prepare( $check_existing_sql, $lesson_id, $user_id );
-				$comment_ID = $wpdb->get_var( $sql );
-				if ( !$comment_ID ) {
+				$sql = $wpdb->prepare($check_existing_sql, $lesson_id, $user_id);
+				$comment_ID = $wpdb->get_var($sql);
+				if ( ! $comment_ID) {
 					// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
 					$wpdb->insert($wpdb->comments, $data);
 					$comment_ID = (int) $wpdb->insert_id;
 
-					if ( $comment_ID && !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+					if ($comment_ID && ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP add_comment_meta(() so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1390,40 +1390,40 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_courses( $n = 50, $offset = 0 ) {
+	function status_changes_convert_courses($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		// Get all Lesson => Course relationships
-		$meta_list = $wpdb->get_results( "SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course'", ARRAY_A );
+		$meta_list = $wpdb->get_results("SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course'", ARRAY_A);
 		$course_lesson_ids = array();
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['post_id'];
 				$course_id = $metarow['meta_value'];
-				$course_lesson_ids[ $course_id ][] = $lesson_id;
+				$course_lesson_ids[$course_id][] = $lesson_id;
 			}
 		}
 
@@ -1433,13 +1433,13 @@ 
 		$check_existing_sql = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = 'sensei_course_status' ";
 
 		// $per_page users at a time, could be batch run via an admin ajax command, 1 user at a time?
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			// Grab all the course starts for the user
-			$course_starts = $wpdb->get_results( $wpdb->prepare($start_sql, $user_id), ARRAY_A );
-			foreach ( $course_starts as $course_log ) {
+			$course_starts = $wpdb->get_results($wpdb->prepare($start_sql, $user_id), ARRAY_A);
+			foreach ($course_starts as $course_log) {
 
 				$course_id = $course_log['comment_post_ID'];
 
@@ -1454,23 +1454,23 @@ 
 					'percent' => 0,
 				);
 				// Check if the course has lessons
-				if ( !empty( $course_lesson_ids[$course_id] ) ) {
+				if ( ! empty($course_lesson_ids[$course_id])) {
 
 					$lessons_completed = 0;
-					$total_lessons = count( $course_lesson_ids[ $course_id ] );
+					$total_lessons = count($course_lesson_ids[$course_id]);
 
 					// Don't use prepare as we need to provide the id join
-					$sql = sprintf($lessons_sql, $user_id, join(', ', $course_lesson_ids[ $course_id ]) );
+					$sql = sprintf($lessons_sql, $user_id, join(', ', $course_lesson_ids[$course_id]));
 					// Get all lesson statuses for this Courses' lessons
-					$lesson_statuses = $wpdb->get_results( $sql, ARRAY_A );
+					$lesson_statuses = $wpdb->get_results($sql, ARRAY_A);
 					// Not enough lesson statuses, thus cannot be complete
-					if ( $total_lessons > count($lesson_statuses) ) {
+					if ($total_lessons > count($lesson_statuses)) {
 						$status = 'in-progress';
 					}
 					// Count each lesson to work out the overall percentage
-					foreach ( $lesson_statuses as $lesson_status ) {
+					foreach ($lesson_statuses as $lesson_status) {
 						$status_date = $lesson_status['comment_date'];
-						switch ( $lesson_status['status'] ) {
+						switch ($lesson_status['status']) {
 							case 'complete': // Lesson has no quiz/questions
 							case 'graded': // Lesson has quiz, but it's not important what the grade was
 							case 'passed':
@@ -1485,7 +1485,7 @@ 
 						}
 					}
 					$meta_data['complete'] = $lessons_completed;
-					$meta_data['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
+					$meta_data['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0));
 				}
 				else {
 					// Course has no lessons, therefore cannot be 'complete'
@@ -1502,26 +1502,26 @@ 
 						'comment_author' => '',
 					);
 				// Check it doesn't already exist
-				$sql = $wpdb->prepare( $check_existing_sql, $course_id, $user_id );
-				$comment_ID = $wpdb->get_var( $sql );
-				if ( !$comment_ID ) {
+				$sql = $wpdb->prepare($check_existing_sql, $course_id, $user_id);
+				$comment_ID = $wpdb->get_var($sql);
+				if ( ! $comment_ID) {
 					// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
 					$wpdb->insert($wpdb->comments, $data);
 					$comment_ID = (int) $wpdb->insert_id;
 
-					if ( $comment_ID && !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+					if ($comment_ID && ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1529,7 +1529,7 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -1545,70 +1545,70 @@ 
 	 * @param type $offset
 	 * @return boolean
 	 */
-	function status_changes_repair_course_statuses( $n = 50, $offset = 0 ) {
+	function status_changes_repair_course_statuses($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$count_object = wp_count_posts( 'lesson' );
+		$count_object = wp_count_posts('lesson');
 		$count_published = $count_object->publish;
 
-		if ( 0 == $count_published ) {
+		if (0 == $count_published) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
-		$total_pages = ceil( $count_published / $n );
+		$total_pages = ceil($count_published / $n);
 
 		$course_lesson_ids = $lesson_user_statuses = array();
 
 		// Get all Lesson => Course relationships
-		$meta_list = $wpdb->get_results( "SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course' LIMIT $n OFFSET $offset ", ARRAY_A );
-		if ( !empty($meta_list) ) {
-			foreach ( $meta_list as $metarow ) {
+		$meta_list = $wpdb->get_results("SELECT $wpdb->postmeta.post_id, $wpdb->postmeta.meta_value FROM $wpdb->postmeta INNER JOIN $wpdb->posts ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) WHERE $wpdb->posts.post_type = 'lesson' AND $wpdb->postmeta.meta_key = '_lesson_course' LIMIT $n OFFSET $offset ", ARRAY_A);
+		if ( ! empty($meta_list)) {
+			foreach ($meta_list as $metarow) {
 				$lesson_id = $metarow['post_id'];
 				$course_id = $metarow['meta_value'];
-				$course_lesson_ids[ $course_id ][] = $lesson_id;
+				$course_lesson_ids[$course_id][] = $lesson_id;
 			}
 		}
 
 		// Get all Lesson => Course relationships
-		$status_list = $wpdb->get_results( "SELECT user_id, comment_post_ID, comment_approved FROM $wpdb->comments WHERE comment_type = 'sensei_lesson_status' GROUP BY user_id, comment_post_ID ", ARRAY_A );
-		if ( !empty($status_list) ) {
-			foreach ( $status_list as $status ) {
-				$lesson_user_statuses[ $status['comment_post_ID'] ][ $status['user_id'] ] = $status['comment_approved'];
+		$status_list = $wpdb->get_results("SELECT user_id, comment_post_ID, comment_approved FROM $wpdb->comments WHERE comment_type = 'sensei_lesson_status' GROUP BY user_id, comment_post_ID ", ARRAY_A);
+		if ( ! empty($status_list)) {
+			foreach ($status_list as $status) {
+				$lesson_user_statuses[$status['comment_post_ID']][$status['user_id']] = $status['comment_approved'];
 			}
 		}
 
-		$course_completion = Sensei()->settings->settings[ 'course_completion' ];
+		$course_completion = Sensei()->settings->settings['course_completion'];
 
 		$per_page = 40;
 		$comment_id_offset = $count = 0;
 
 		$course_sql = "SELECT * FROM $wpdb->comments WHERE comment_type = 'sensei_course_status' AND comment_ID > %d LIMIT $per_page";
 		// $per_page users at a time
-		while ( $course_statuses = $wpdb->get_results( $wpdb->prepare($course_sql, $comment_id_offset) ) ) {
+		while ($course_statuses = $wpdb->get_results($wpdb->prepare($course_sql, $comment_id_offset))) {
 
-			foreach ( $course_statuses AS $course_status ) {
+			foreach ($course_statuses AS $course_status) {
 				$user_id = $course_status->user_id;
 				$course_id = $course_status->comment_post_ID;
-				$total_lessons = count( $course_lesson_ids[ $course_id ] );
-				if ( $total_lessons <= 0 ) {
+				$total_lessons = count($course_lesson_ids[$course_id]);
+				if ($total_lessons <= 0) {
 					$total_lessons = 1; // Fix division of zero error, some courses have no lessons
 				}
 				$lessons_completed = 0;
 				$status = 'in-progress';
 
 				// Some Courses have no lessons... (can they ever be complete?)
-				if ( !empty($course_lesson_ids[ $course_id ]) ) {
-					foreach( $course_lesson_ids[ $course_id ] AS $lesson_id ) {
-						$lesson_status = $lesson_user_statuses[ $lesson_id ][ $user_id ];
+				if ( ! empty($course_lesson_ids[$course_id])) {
+					foreach ($course_lesson_ids[$course_id] AS $lesson_id) {
+						$lesson_status = $lesson_user_statuses[$lesson_id][$user_id];
 						// If lessons are complete without needing quizzes to be passed
-						if ( 'passed' != $course_completion ) {
-							switch ( $lesson_status ) {
+						if ('passed' != $course_completion) {
+							switch ($lesson_status) {
 								// A user cannot 'complete' a course if a lesson...
 								case 'in-progress': // ...is still in progress
 								case 'ungraded': // ...hasn't yet been graded
@@ -1620,7 +1620,7 @@ 
 							}
 						}
 						else {
-							switch ( $lesson_status ) {
+							switch ($lesson_status) {
 								case 'complete': // Lesson has no quiz/questions
 								case 'graded': // Lesson has quiz, but it's not important what the grade was
 								case 'passed': // Lesson has quiz and the user passed
@@ -1635,79 +1635,79 @@ 
 						}
 					} // Each lesson
 				} // Check for lessons
-				if ( $lessons_completed == $total_lessons ) {
+				if ($lessons_completed == $total_lessons) {
 					$status = 'complete';
 				}
 				// update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above
 				$metadata = array(
 					'complete' => $lessons_completed,
-					'percent' => abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) ),
+					'percent' => abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0)),
 				);
-				Sensei_Utils::update_course_status( $user_id, $course_id, $status, $metadata );
+				Sensei_Utils::update_course_status($user_id, $course_id, $status, $metadata);
 				$count++;
 
 			} // per course status
 			$comment_id_offset = $course_status->comment_ID;
 		} // all course statuses
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	function status_changes_convert_questions( $n = 50, $offset = 0 ) {
+	function status_changes_convert_questions($n = 50, $offset = 0) {
 		global $wpdb;
 
-		wp_defer_comment_counting( true );
+		wp_defer_comment_counting(true);
 
-		$user_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->users " );
+		$user_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->users ");
 
-		if ( 0 == $user_count_result ) {
+		if (0 == $user_count_result) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $user_count_result / $n );
+		$total_pages = ceil($user_count_result / $n);
 
 		$users_sql = "SELECT ID FROM $wpdb->users ORDER BY ID ASC LIMIT %d OFFSET %d";
 		$answers_sql = "SELECT * FROM $wpdb->comments WHERE comment_type = 'sensei_user_answer' AND user_id = %d GROUP BY comment_post_ID ";
 		$grades_sql = "SELECT comment_post_ID, comment_content FROM $wpdb->comments WHERE comment_type = 'sensei_user_grade' AND user_id = %d GROUP BY comment_post_ID ";
 		$notes_sql = "SELECT comment_post_ID, comment_content FROM $wpdb->comments WHERE comment_type = 'sensei_answer_notes' AND user_id = %d GROUP BY comment_post_ID ";
 
-		$user_ids = $wpdb->get_col( $wpdb->prepare($users_sql, $n, $offset) );
+		$user_ids = $wpdb->get_col($wpdb->prepare($users_sql, $n, $offset));
 
-		foreach ( $user_ids AS $user_id ) {
+		foreach ($user_ids AS $user_id) {
 
 			$answer_grades = $answer_notes = array();
 
 			// Pre-process the answer grades
-			$_answer_grades = $wpdb->get_results( $wpdb->prepare($grades_sql, $user_id), ARRAY_A );
-			foreach ( $_answer_grades as $answer_grade ) {
+			$_answer_grades = $wpdb->get_results($wpdb->prepare($grades_sql, $user_id), ARRAY_A);
+			foreach ($_answer_grades as $answer_grade) {
 				// This will overwrite existing entries with the newer ones
-				$answer_grades[ $answer_grade['comment_post_ID'] ] = $answer_grade['comment_content'];
+				$answer_grades[$answer_grade['comment_post_ID']] = $answer_grade['comment_content'];
 			}
-			unset( $_answer_grades );
+			unset($_answer_grades);
 
 			// Pre-process the answer notes
-			$_answer_notes = $wpdb->get_results( $wpdb->prepare($notes_sql, $user_id), ARRAY_A );
-			foreach ( $_answer_notes as $answer_note ) {
+			$_answer_notes = $wpdb->get_results($wpdb->prepare($notes_sql, $user_id), ARRAY_A);
+			foreach ($_answer_notes as $answer_note) {
 				// This will overwrite existing entries with the newer ones
-				$answer_notes[ $answer_note['comment_post_ID'] ] = $answer_note['comment_content'];
+				$answer_notes[$answer_note['comment_post_ID']] = $answer_note['comment_content'];
 			}
-			unset( $_answer_notes );
+			unset($_answer_notes);
 
 			// Grab all the questions for the user
 			$sql = $wpdb->prepare($answers_sql, $user_id);
-			$answers = $wpdb->get_results( $sql, ARRAY_A );
-			foreach ( $answers as $answer ) {
+			$answers = $wpdb->get_results($sql, ARRAY_A);
+			foreach ($answers as $answer) {
 
 				// Excape data
 				$answer = wp_slash($answer);
@@ -1717,12 +1717,12 @@ 
 				$meta_data = array();
 
 				// Check if the question has been graded, add as meta
-				if ( !empty($answer_grades[ $answer['comment_post_ID'] ]) ) {
-					$meta_data['user_grade'] = $answer_grades[ $answer['comment_post_ID'] ];
+				if ( ! empty($answer_grades[$answer['comment_post_ID']])) {
+					$meta_data['user_grade'] = $answer_grades[$answer['comment_post_ID']];
 				}
 				// Check if there is an answer note, add as meta
-				if ( !empty($answer_notes[ $answer['comment_post_ID'] ]) ) {
-					$meta_data['answer_note'] = $answer_notes[ $answer['comment_post_ID'] ];
+				if ( ! empty($answer_notes[$answer['comment_post_ID']])) {
+					$meta_data['answer_note'] = $answer_notes[$answer['comment_post_ID']];
 				}
 
 				// Wipe the unnessary data from the main comment
@@ -1735,21 +1735,21 @@ 
 					);
 				$data = array_merge($answer, $data);
 
-				$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
-				if ( $rval ) {
-					if ( !empty($meta_data) ) {
-						foreach ( $meta_data as $key => $value ) {
+				$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
+				if ($rval) {
+					if ( ! empty($meta_data)) {
+						foreach ($meta_data as $key => $value) {
 							// Bypassing WP wp_insert_comment( $data ), so no actions/filters are run
-							if ( $wpdb->get_var( $wpdb->prepare(
+							if ($wpdb->get_var($wpdb->prepare(
 									"SELECT COUNT(*) FROM $wpdb->commentmeta WHERE comment_id = %d AND meta_key = %s ",
-									$comment_ID, $key ) ) ) {
+									$comment_ID, $key ))) {
 									continue; // Found the meta data already
 							}
-							$result = $wpdb->insert( $wpdb->commentmeta, array(
+							$result = $wpdb->insert($wpdb->commentmeta, array(
 								'comment_id' => $comment_ID,
 								'meta_key' => $key,
 								'meta_value' => $value
-							) );
+							));
 						}
 					}
 				}
@@ -1757,7 +1757,7 @@ 
 		}
 		$wpdb->flush();
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
@@ -1774,10 +1774,10 @@ 
 		global $wpdb;
 
 		// Update 'sensei_user_answer' entries to use comment_approved = 'log' so they don't appear in counts
-		$wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'log' WHERE comment_type = 'sensei_user_answer' " );
+		$wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'log' WHERE comment_type = 'sensei_user_answer' ");
 
 		// Mark all old Sensei comment types with comment_approved = 'legacy' so they no longer appear in counts, but can be restored if required
-		$wpdb->query( "UPDATE $wpdb->comments SET comment_approved = 'legacy' WHERE comment_type IN ('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_answer_notes', 'sensei_quiz_grade') " );
+		$wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'legacy' WHERE comment_type IN ('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_answer_notes', 'sensei_quiz_grade') ");
 
 		return true;
 	}
@@ -1790,50 +1790,50 @@ 
 	 * @param type $offset
 	 * @return boolean
 	 */
-	public function update_comment_course_lesson_comment_counts( $n = 50, $offset = 0 ) {
+	public function update_comment_course_lesson_comment_counts($n = 50, $offset = 0) {
 		global $wpdb;
 
-		$item_count_result = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') " );
+		$item_count_result = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') ");
 
-		if ( 0 == $item_count_result ) {
+		if (0 == $item_count_result) {
 			return true;
 		}
 
 		// Calculate if this is the last page
-		if ( 0 == $offset ) {
+		if (0 == $offset) {
 			$current_page = 1;
 		} else {
-			$current_page = intval( $offset / $n );
+			$current_page = intval($offset / $n);
 		}
 
-		$total_pages = ceil( $item_count_result / $n );
+		$total_pages = ceil($item_count_result / $n);
 
 		// Recalculate all counts
-		$items = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') LIMIT %d OFFSET %d", $n, $offset ) );
-		foreach ( (array) $items as $post ) {
+		$items = $wpdb->get_results($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type IN ('course', 'lesson') LIMIT %d OFFSET %d", $n, $offset));
+		foreach ((array) $items as $post) {
 			// Code copied from wp_update_comment_count_now()
-			$new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post->ID) );
-			$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post->ID) );
+			$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post->ID));
+			$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post->ID));
 
-			clean_post_cache( $post->ID );
+			clean_post_cache($post->ID);
 		}
 
-		if ( $current_page == $total_pages ) {
+		if ($current_page == $total_pages) {
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	public function remove_legacy_comments () {
+	public function remove_legacy_comments() {
 		global $wpdb;
 
-		$result = $wpdb->delete( $wpdb->comments, array( 'comment_approved' => 'legacy' ) );
+		$result = $wpdb->delete($wpdb->comments, array('comment_approved' => 'legacy'));
 
 		return true;
 	}
 
-	public function index_comment_status_field () {
+	public function index_comment_status_field() {
 		global $wpdb;
 
 		$wpdb->query("ALTER TABLE `$wpdb->comments` ADD INDEX `comment_type` ( `comment_type` )");
@@ -1852,7 +1852,7 @@ 
      * @since 1.8.0
      * @return bool;
      */
-    public  function enhance_teacher_role ( ) {
+    public  function enhance_teacher_role( ) {
 
         require_once('class-sensei-teacher.php');
         $teacher = new Sensei_Teacher();

includes/class-sensei-settings.php

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
@@ -18,18 +18,18 @@ 
 	 * @access public
 	 * @since 1.0.0
 	 */
-	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
@@ -46,11 +46,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];
 
         }
 
@@ -63,17 +63,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()
 
@@ -83,49 +83,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()
 
 	/**
@@ -135,71 +135,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'
@@ -208,8 +208,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',
@@ -218,16 +218,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',
@@ -236,16 +236,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',
@@ -253,8 +253,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',
@@ -262,24 +262,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',
@@ -287,8 +287,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',
@@ -296,16 +296,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',
@@ -314,18 +314,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
 								);
@@ -333,32 +333,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',
@@ -366,8 +366,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',
@@ -375,24 +375,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',
@@ -400,8 +400,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',
@@ -409,8 +409,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'
@@ -418,20 +418,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'
@@ -440,70 +440,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',
@@ -511,17 +511,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',
@@ -529,8 +529,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',
@@ -538,8 +538,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',
@@ -547,35 +547,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_present() ) {
+		if (Sensei_WC::is_woocommerce_present()) {
 			// 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'
@@ -583,18 +583,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()
 
@@ -604,20 +604,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;
 		}
 
@@ -633,25 +633,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
 
@@ -675,10 +675,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();
 
@@ -692,4 +692,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Settings extends Sensei_Settings{}
+class WooThemes_Sensei_Settings extends Sensei_Settings {}

includes/class-sensei-admin.php

Spacing +419 added lines, -419 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Handles all admin views, assets and navigation.
@@ -14,51 +14,51 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
 
         //register admin styles
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_styles_global' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_styles_global'));
 
         //register admin scripts
-        add_action( 'admin_enqueue_scripts', array( $this, 'register_scripts' ) );
+        add_action('admin_enqueue_scripts', array($this, 'register_scripts'));
 
-		add_action( 'admin_print_styles', array( $this, 'admin_notices_styles' ) );
-		add_action( 'settings_before_form', array( $this, 'install_pages_output' ) );
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ) );
-		add_action( 'admin_head', array( $this, 'admin_menu_highlight' ) );
-		add_action( 'admin_init', array( $this, 'page_redirect' ) );
-		add_action( 'admin_init', array( $this, 'sensei_add_custom_menu_items' ) );
-        add_action( 'admin_init', array( __CLASS__, 'install_pages' ));
+		add_action('admin_print_styles', array($this, 'admin_notices_styles'));
+		add_action('settings_before_form', array($this, 'install_pages_output'));
+		add_action('admin_menu', array($this, 'admin_menu'), 10);
+		add_action('menu_order', array($this, 'admin_menu_order'));
+		add_action('admin_head', array($this, 'admin_menu_highlight'));
+		add_action('admin_init', array($this, 'page_redirect'));
+		add_action('admin_init', array($this, 'sensei_add_custom_menu_items'));
+        add_action('admin_init', array(__CLASS__, 'install_pages'));
 
 		// Duplicate lesson & courses
-		add_filter( 'post_row_actions', array( $this, 'duplicate_action_link' ), 10, 2 );
-		add_action( 'admin_action_duplicate_lesson', array( $this, 'duplicate_lesson_action' ) );
-		add_action( 'admin_action_duplicate_course', array( $this, 'duplicate_course_action' ) );
-		add_action( 'admin_action_duplicate_course_with_lessons', array( $this, 'duplicate_course_with_lessons_action' ) );
+		add_filter('post_row_actions', array($this, 'duplicate_action_link'), 10, 2);
+		add_action('admin_action_duplicate_lesson', array($this, 'duplicate_lesson_action'));
+		add_action('admin_action_duplicate_course', array($this, 'duplicate_course_action'));
+		add_action('admin_action_duplicate_course_with_lessons', array($this, 'duplicate_course_with_lessons_action'));
 
 		// Handle lessons list table filtering
-		add_action( 'restrict_manage_posts', array( $this, 'lesson_filter_options' ) );
-		add_filter( 'request', array( $this, 'lesson_filter_actions' ) );
+		add_action('restrict_manage_posts', array($this, 'lesson_filter_options'));
+		add_filter('request', array($this, 'lesson_filter_actions'));
 
 		// Add Sensei items to 'at a glance' widget
-		add_filter( 'dashboard_glance_items', array( $this, 'glance_items' ), 10, 1 );
+		add_filter('dashboard_glance_items', array($this, 'glance_items'), 10, 1);
 
 		// Handle course and lesson deletions
-		add_action( 'trash_course', array( $this, 'delete_content' ), 10, 2 );
-		add_action( 'trash_lesson', array( $this, 'delete_content' ), 10, 2 );
+		add_action('trash_course', array($this, 'delete_content'), 10, 2);
+		add_action('trash_lesson', array($this, 'delete_content'), 10, 2);
 
 		// Delete user activity when user is deleted
-		add_action( 'deleted_user', array( $this, 'delete_user_activity' ), 10, 1 );
+		add_action('deleted_user', array($this, 'delete_user_activity'), 10, 1);
 
 		// Add notices to WP dashboard
-		add_action( 'admin_notices', array( $this, 'theme_compatibility_notices' ) );
+		add_action('admin_notices', array($this, 'theme_compatibility_notices'));
 
 		// Reset theme notices when switching themes
-		add_action( 'switch_theme', array( $this, 'reset_theme_check_notices' ) );
+		add_action('switch_theme', array($this, 'reset_theme_check_notices'));
 
 		// Allow Teacher access the admin area
-		add_filter( 'woocommerce_prevent_admin_access', array( $this, 'admin_access' ) );
+		add_filter('woocommerce_prevent_admin_access', array($this, 'admin_access'));
 
 	} // End __construct()
 
@@ -70,21 +70,21 @@ 
 	public function admin_menu() {
 		global $menu;
 		$menu_cap = '';
-		if( current_user_can( 'manage_sensei' ) ) {
+		if (current_user_can('manage_sensei')) {
 			$menu_cap = 'manage_sensei';
 		} else {
-			if( current_user_can( 'manage_sensei_grades' ) ) {
+			if (current_user_can('manage_sensei_grades')) {
 				$menu_cap = 'manage_sensei_grades';
 			}
 		}
 
-		if( $menu_cap ) {
-			$menu[] = array( '', 'read', 'separator-sensei', '', 'wp-menu-separator sensei' );
-            add_menu_page( 'Sensei', 'Sensei', $menu_cap, 'sensei' , array( Sensei()->analysis, 'analysis_page' ) , '', '50' );
+		if ($menu_cap) {
+			$menu[] = array('', 'read', 'separator-sensei', '', 'wp-menu-separator sensei');
+            add_menu_page('Sensei', 'Sensei', $menu_cap, 'sensei', array(Sensei()->analysis, 'analysis_page'), '', '50');
 		}
 
-		add_submenu_page( 'edit.php?post_type=course', __( 'Order Courses', 'woothemes-sensei' ), __( 'Order Courses', 'woothemes-sensei' ), 'manage_sensei', 'course-order', array( $this, 'course_order_screen' ) );
-		add_submenu_page( 'edit.php?post_type=lesson', __( 'Order Lessons', 'woothemes-sensei' ), __( 'Order Lessons', 'woothemes-sensei' ), 'edit_lessons', 'lesson-order', array( $this, 'lesson_order_screen' ) );
+		add_submenu_page('edit.php?post_type=course', __('Order Courses', 'woothemes-sensei'), __('Order Courses', 'woothemes-sensei'), 'manage_sensei', 'course-order', array($this, 'course_order_screen'));
+		add_submenu_page('edit.php?post_type=lesson', __('Order Lessons', 'woothemes-sensei'), __('Order Lessons', 'woothemes-sensei'), 'edit_lessons', 'lesson-order', array($this, 'lesson_order_screen'));
 	}
 
 	/**
@@ -93,22 +93,22 @@ 
 	 * @param  array $menu_order Existing menu order
 	 * @return array 			 Modified menu order for Sensei
 	 */
-	public function admin_menu_order( $menu_order ) {
+	public function admin_menu_order($menu_order) {
 
 		// Initialize our custom order array
 		$sensei_menu_order = array();
 
 		// Get the index of our custom separator
-		$sensei_separator = array_search( 'separator-sensei', $menu_order );
+		$sensei_separator = array_search('separator-sensei', $menu_order);
 
 		// Loop through menu order and do some rearranging
-		foreach ( $menu_order as $index => $item ) :
+		foreach ($menu_order as $index => $item) :
 
-			if ( ( ( 'sensei' ) == $item ) ) :
+			if ((('sensei') == $item)) :
 				$sensei_menu_order[] = 'separator-sensei';
 				$sensei_menu_order[] = $item;
-				unset( $menu_order[$sensei_separator] );
-			elseif ( !in_array( $item, array( 'separator-sensei' ) ) ) :
+				unset($menu_order[$sensei_separator]);
+			elseif ( ! in_array($item, array('separator-sensei'))) :
 				$sensei_menu_order[] = $item;
 			endif;
 
@@ -128,24 +128,24 @@ 
 
 		$screen = get_current_screen();
 
-		if ( $screen->base == 'post' && $post_type == 'course' ) {
+		if ($screen->base == 'post' && $post_type == 'course') {
 
-			$parent_file  = 'edit.php?post_type=course';
+			$parent_file = 'edit.php?post_type=course';
 
-		} elseif ( $screen->base == 'edit-tags' && $taxonomy == 'course-category' ) {
+		} elseif ($screen->base == 'edit-tags' && $taxonomy == 'course-category') {
 
 			$submenu_file = 'edit-tags.php?taxonomy=course-category&amp;post_type=course';
 			$parent_file  = 'edit.php?post_type=course';
 
-        } elseif ( $screen->base == 'edit-tags' && $taxonomy == 'module' ) {
+        } elseif ($screen->base == 'edit-tags' && $taxonomy == 'module') {
 
             $submenu_file = 'edit-tags.php?taxonomy=module';
             $parent_file  = 'edit.php?post_type=course';
 
-		} elseif ( in_array( $screen->id, array( 'sensei_message', 'edit-sensei_message' ) ) ) {
+		} elseif (in_array($screen->id, array('sensei_message', 'edit-sensei_message'))) {
 
             $submenu_file = 'edit.php?post_type=sensei_message';
-			$parent_file  = 'sensei';
+			$parent_file = 'sensei';
 
 		}
 	}
@@ -156,8 +156,8 @@ 
 	 * @return void
 	 */
 	public function page_redirect() {
-		if( isset( $_GET['page'] ) && $_GET['page'] == 'sensei' ) {
-			wp_safe_redirect( 'admin.php?page=sensei_analysis' );
+		if (isset($_GET['page']) && $_GET['page'] == 'sensei') {
+			wp_safe_redirect('admin.php?page=sensei_analysis');
 			exit;
 		}
 	}
@@ -172,11 +172,11 @@ 
 	 */
 	function install_pages_output() {
 
-        if( isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
+        if (isset($_GET['sensei_install_complete']) && 'true' == $_GET['sensei_install_complete']) {
 
             ?>
             <div id="message" class="updated sensei-message sensei-connect">
-                <p><?php _e( '<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei' ); ?></p>
+                <p><?php _e('<strong>Congratulations!</strong> &#8211; Sensei has been installed and set up.', 'woothemes-sensei'); ?></p>
                 <p><a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.woothemes.com/sensei/" data-text="A premium Learning Management plugin for #WordPress that helps you create courses. Beautifully." data-via="WooThemes" data-size="large" data-hashtags="Sensei">Tweet</a>
                 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></p>
             </div>
@@ -198,18 +198,18 @@ 
 	 * @param int $post_parent (default: 0)
 	 * @return void
 	 */
-	function create_page( $slug, $option, $page_title = '', $page_content = '', $post_parent = 0 ) {
+	function create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0) {
 		global $wpdb;
 
-		$option_value = get_option( $option );
+		$option_value = get_option($option);
 
-		if ( $option_value > 0 && get_post( $option_value ) )
+		if ($option_value > 0 && get_post($option_value))
 			return;
 
-		$page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", $slug ) );
-		if ( $page_found ) :
-			if ( ! $option_value )
-				update_option( $option, $page_found );
+		$page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", $slug));
+		if ($page_found) :
+			if ( ! $option_value)
+				update_option($option, $page_found);
 			return;
 		endif;
 
@@ -223,9 +223,9 @@ 
 	        'post_parent' 		=> $post_parent,
 	        'comment_status' 	=> 'closed'
 	    );
-	    $page_id = wp_insert_post( $page_data );
+	    $page_id = wp_insert_post($page_data);
 
-	    update_option( $option, $page_id );
+	    update_option($option, $page_id);
 	} // End create_page()
 
 
@@ -238,10 +238,10 @@ 
 	function create_pages() {
 
 		// Courses page
-	    $this->create_page( esc_sql( _x('courses-overview', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_courses_page_id', __('Courses', 'woothemes-sensei'), '[newcourses][featuredcourses][freecourses][paidcourses]' );
+	    $this->create_page(esc_sql(_x('courses-overview', 'page_slug', 'woothemes-sensei')), 'woothemes-sensei_courses_page_id', __('Courses', 'woothemes-sensei'), '[newcourses][featuredcourses][freecourses][paidcourses]');
 
 		// User Dashboard page
-	    $this->create_page( esc_sql( _x('my-courses', 'page_slug', 'woothemes-sensei') ), 'woothemes-sensei_user_dashboard_page_id', __('My Courses', 'woothemes-sensei'), '[usercourses]' );
+	    $this->create_page(esc_sql(_x('my-courses', 'page_slug', 'woothemes-sensei')), 'woothemes-sensei_user_dashboard_page_id', __('My Courses', 'woothemes-sensei'), '[usercourses]');
 
 	} // End create_pages()
 
@@ -251,25 +251,25 @@ 
 	 * @since 1.0.0
 	 * @return void
 	 */
-	public function admin_styles_global ( $hook ) {
+	public function admin_styles_global($hook) {
 		global $post_type;
 
-		$allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question' ) );
-		$allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) );
-		$allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order' ) );
+		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question'));
+		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php'));
+		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order', 'course-order'));
 
 		// Global Styles for icons and menu items
-		wp_register_style( 'woothemes-sensei-global', Sensei()->plugin_url . 'assets/css/global.css', '', Sensei()->version, 'screen' );
-		wp_enqueue_style( 'woothemes-sensei-global' );
+		wp_register_style('woothemes-sensei-global', Sensei()->plugin_url.'assets/css/global.css', '', Sensei()->version, 'screen');
+		wp_enqueue_style('woothemes-sensei-global');
 
         // Select 2 styles
-        wp_enqueue_style( 'sensei-core-select2', Sensei()->plugin_url . 'assets/css/select2/select2.css', '', Sensei()->version, 'screen' );
+        wp_enqueue_style('sensei-core-select2', Sensei()->plugin_url.'assets/css/select2/select2.css', '', Sensei()->version, 'screen');
 
 		// Test for Write Panel Pages
-		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) {
+		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) {
 
-			wp_register_style( 'woothemes-sensei-admin-custom', Sensei()->plugin_url . 'assets/css/admin-custom.css', '', Sensei()->version, 'screen' );
-			wp_enqueue_style( 'woothemes-sensei-admin-custom' );
+			wp_register_style('woothemes-sensei-admin-custom', Sensei()->plugin_url.'assets/css/admin-custom.css', '', Sensei()->version, 'screen');
+			wp_enqueue_style('woothemes-sensei-admin-custom');
 
 		}
 
@@ -284,20 +284,20 @@ 
      * @since 1.8.2
      * @access public
      */
-    public function register_scripts( $hook ){
+    public function register_scripts($hook) {
 
         $screen = get_current_screen();
 
         // Allow developers to load non-minified versions of scripts
-        $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
         // Select2 script used to enhance all select boxes
-        wp_register_script( 'sensei-core-select2', Sensei()->plugin_url . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), Sensei()->version );
+        wp_register_script('sensei-core-select2', Sensei()->plugin_url.'/assets/js/select2/select2'.$suffix.'.js', array('jquery'), Sensei()->version);
 
         // load edit module scripts
-        if( 'edit-module' ==  $screen->id ){
+        if ('edit-module' == $screen->id) {
 
-            wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'sensei-chosen' ), Sensei()->version, true );
+            wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery.min.js', array('jquery', 'sensei-chosen'), Sensei()->version, true);
 
         }
 
@@ -315,19 +315,19 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
             <p>
-                <?php _e( '<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Welcome to Sensei</strong> &#8211; You\'re almost ready to create some courses!', 'woothemes-sensei'); ?>
             </p>
 
             <p class="submit">
 
-                <a href="<?php echo esc_url( add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings') ) ); ?>"
+                <a href="<?php echo esc_url(add_query_arg('install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>"
                    class="button-primary">
 
-                    <?php _e( 'Install Sensei Pages', 'woothemes-sensei' ); ?>
+                    <?php _e('Install Sensei Pages', 'woothemes-sensei'); ?>
 
                 </a>
 
-                <a class="skip button" href="<?php echo esc_url( add_query_arg( 'skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings' ) ) ); ?>">
+                <a class="skip button" href="<?php echo esc_url(add_query_arg('skip_install_sensei_pages', 'true', admin_url('admin.php?page=woothemes-sensei-settings'))); ?>">
 
                     <?php _e('Skip setup', 'woothemes-sensei'); ?>
 
@@ -350,11 +350,11 @@ 
 	    <div id="message" class="updated sensei-message sensei-connect">
 
 	    	<p>
-                <?php _e( '<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei' ); ?>
+                <?php _e('<strong>Sensei has been installed</strong> &#8211; You\'re ready to start creating courses!', 'woothemes-sensei'); ?>
             </p>
 
 			<p class="submit">
-                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e( 'Settings', 'woothemes-sensei' ); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
+                <a href="<?php echo admin_url('admin.php?page=woothemes-sensei-settings'); ?>" class="button-primary"><?php _e('Settings', 'woothemes-sensei'); ?></a> <a class="docs button" href="http://www.woothemes.com/sensei-docs/">
                     <?php _e('Documentation', 'woothemes-sensei'); ?>
                 </a>
             </p>
@@ -387,11 +387,11 @@ 
 	public function language_pack_install_notice() {
 		?>
 		<div id="message" class="updated sensei-message sensei-connect">
-				<p><?php _e( '<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei' ); ?><p>
+				<p><?php _e('<strong>Sensei in your language</strong> &#8211; There is a translation available for your language.', 'woothemes-sensei'); ?><p>
 
 				<p class="submit">
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_install_uri() ); ?>" class="button-primary"><?php _e( 'Install', 'woothemes-sensei' ); ?></a>
-					<a href="<?php echo esc_url( Sensei_Language_Pack_Manager::get_dismiss_uri() ) ?>" class="docs button"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_install_uri()); ?>" class="button-primary"><?php _e('Install', 'woothemes-sensei'); ?></a>
+					<a href="<?php echo esc_url(Sensei_Language_Pack_Manager::get_dismiss_uri()) ?>" class="docs button"><?php _e('Hide this notice', 'woothemes-sensei'); ?></a>
 				</p>
 		</div>
 		<?php
@@ -407,20 +407,20 @@ 
 	function admin_notices_styles() {
 
 		// Installed notices
-	    if ( 1 == get_option( 'sensei_installed' ) ) {
+	    if (1 == get_option('sensei_installed')) {
 
-	    	wp_enqueue_style( 'sensei-activation', plugins_url(  '/assets/css/activation.css', dirname( __FILE__ ) ), '', Sensei()->version );
+	    	wp_enqueue_style('sensei-activation', plugins_url('/assets/css/activation.css', dirname(__FILE__)), '', Sensei()->version);
 
-	    	if (get_option('skip_install_sensei_pages')!=1 && Sensei()->get_page_id('course')<1 && !isset($_GET['install_sensei_pages']) && !isset($_GET['skip_install_sensei_pages'])) {
-	    		add_action( 'admin_notices', array( $this, 'admin_install_notice' ) );
-	    	} elseif ( !isset($_GET['page']) || $_GET['page']!='woothemes-sensei-settings' ) {
-	    		add_action( 'admin_notices', array( $this, 'admin_installed_notice' ) );
+	    	if (get_option('skip_install_sensei_pages') != 1 && Sensei()->get_page_id('course') < 1 && ! isset($_GET['install_sensei_pages']) && ! isset($_GET['skip_install_sensei_pages'])) {
+	    		add_action('admin_notices', array($this, 'admin_install_notice'));
+	    	} elseif ( ! isset($_GET['page']) || $_GET['page'] != 'woothemes-sensei-settings') {
+	    		add_action('admin_notices', array($this, 'admin_installed_notice'));
 	    	} // End If Statement
 
 	    } // End If Statement
 
-	    if ( Sensei_Language_Pack_Manager::has_language_pack_available() ) {
-	    	add_action( 'admin_notices', array( $this, 'language_pack_install_notice' ) );
+	    if (Sensei_Language_Pack_Manager::has_language_pack_available()) {
+	    	add_action('admin_notices', array($this, 'language_pack_install_notice'));
 	    }
 
 	} // End admin_notices_styles()
@@ -431,17 +431,17 @@ 
 	 * @param  object $post    Current post
 	 * @return array           Modified actions
 	 */
-	public function duplicate_action_link( $actions, $post ) {
-		switch( $post->post_type ) {
+	public function duplicate_action_link($actions, $post) {
+		switch ($post->post_type) {
 			case 'lesson':
-				$confirm = __( 'This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = "<a onclick='return confirm(\"" . $confirm . "\");' href='" . $this->get_duplicate_link( $post->ID ) . "' title='" . esc_attr(__( 'Duplicate this lesson', 'woothemes-sensei' ) ) . "'>" .  __('Duplicate', 'woothemes-sensei' ) . "</a>";
+				$confirm = __('This will duplicate the lesson quiz and all of its questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = "<a onclick='return confirm(\"".$confirm."\");' href='".$this->get_duplicate_link($post->ID)."' title='".esc_attr(__('Duplicate this lesson', 'woothemes-sensei'))."'>".__('Duplicate', 'woothemes-sensei')."</a>";
 			break;
 
 			case 'course':
-				$confirm = __( 'This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei' );
-				$actions['duplicate'] = '<a href="' . $this->get_duplicate_link( $post->ID ) . '" title="' . esc_attr(__( 'Duplicate this course', 'woothemes-sensei' ) ) . '">' .  __('Duplicate', 'woothemes-sensei' ) . '</a>';
-				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\'' . $confirm . '\');" href="' . $this->get_duplicate_link( $post->ID, true ) . '" title="' . esc_attr(__( 'Duplicate this course with its lessons', 'woothemes-sensei' ) ) . '">' .  __('Duplicate (with lessons)', 'woothemes-sensei' ) . '</a>';
+				$confirm = __('This will duplicate the course lessons along with all of their quizzes and questions. Are you sure you want to do this?', 'woothemes-sensei');
+				$actions['duplicate'] = '<a href="'.$this->get_duplicate_link($post->ID).'" title="'.esc_attr(__('Duplicate this course', 'woothemes-sensei')).'">'.__('Duplicate', 'woothemes-sensei').'</a>';
+				$actions['duplicate_with_lessons'] = '<a onclick="return confirm(\''.$confirm.'\');" href="'.$this->get_duplicate_link($post->ID, true).'" title="'.esc_attr(__('Duplicate this course with its lessons', 'woothemes-sensei')).'">'.__('Duplicate (with lessons)', 'woothemes-sensei').'</a>';
 			break;
 		}
 
@@ -454,17 +454,17 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return string                Duplication link
 	 */
-	private function get_duplicate_link( $post_id = 0, $with_lessons = false ) {
+	private function get_duplicate_link($post_id = 0, $with_lessons = false) {
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		$action = 'duplicate_' . $post->post_type;
+		$action = 'duplicate_'.$post->post_type;
 
-		if( 'course' == $post->post_type && $with_lessons ) {
+		if ('course' == $post->post_type && $with_lessons) {
 			$action .= '_with_lessons';
 		}
 
-		return apply_filters( $action . '_link', admin_url( 'admin.php?action=' . $action . '&post=' . $post_id ), $post_id );
+		return apply_filters($action.'_link', admin_url('admin.php?action='.$action.'&post='.$post_id), $post_id);
 	}
 
 	/**
@@ -472,7 +472,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_lesson_action() {
-		$this->duplicate_content( 'lesson' );
+		$this->duplicate_content('lesson');
 	}
 
 	/**
@@ -480,7 +480,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_action() {
-		$this->duplicate_content( 'course' );
+		$this->duplicate_content('course');
 	}
 
 	/**
@@ -488,7 +488,7 @@ 
 	 * @return void
 	 */
 	public function duplicate_course_with_lessons_action() {
-		$this->duplicate_content( 'course', true );
+		$this->duplicate_content('course', true);
 	}
 
 	/**
@@ -497,34 +497,34 @@ 
 	 * @param  boolean $with_lessons Include lessons or not
 	 * @return void
 	 */
-	private function duplicate_content( $post_type = 'lesson', $with_lessons = false ) {
-		if ( ! isset( $_GET['post'] ) ) {
-			wp_die( sprintf( __( 'Please supply a %1$s ID.', 'woothemes-sensei' ) ), $post_type );
+	private function duplicate_content($post_type = 'lesson', $with_lessons = false) {
+		if ( ! isset($_GET['post'])) {
+			wp_die(sprintf(__('Please supply a %1$s ID.', 'woothemes-sensei')), $post_type);
 		}
 
 		$post_id = $_GET['post'];
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		if( ! is_wp_error( $post ) ) {
+		if ( ! is_wp_error($post)) {
 
-			$new_post = $this->duplicate_post( $post );
+			$new_post = $this->duplicate_post($post);
 
-			if( $new_post && ! is_wp_error( $new_post ) ) {
+			if ($new_post && ! is_wp_error($new_post)) {
 
-				if( 'lesson' == $new_post->post_type ) {
-					$this->duplicate_lesson_quizzes( $post_id, $new_post->ID );
+				if ('lesson' == $new_post->post_type) {
+					$this->duplicate_lesson_quizzes($post_id, $new_post->ID);
 				}
 
-				if( 'course' == $new_post->post_type && $with_lessons ) {
-					$this->duplicate_course_lessons( $post_id, $new_post->ID );
+				if ('course' == $new_post->post_type && $with_lessons) {
+					$this->duplicate_course_lessons($post_id, $new_post->ID);
 				}
 
-				$redirect_url = admin_url( 'post.php?post=' . $new_post->ID . '&action=edit' );
+				$redirect_url = admin_url('post.php?post='.$new_post->ID.'&action=edit');
 			} else {
-				$redirect_url = admin_url( 'edit.php?post_type=' . $post->post_type . '&message=duplicate_failed' );
+				$redirect_url = admin_url('edit.php?post_type='.$post->post_type.'&message=duplicate_failed');
 			}
 
-			wp_safe_redirect( esc_url_raw( $redirect_url ) );
+			wp_safe_redirect(esc_url_raw($redirect_url));
 			exit;
 		}
 	}
@@ -535,19 +535,19 @@ 
 	 * @param  integer $new_lesson_id ID of duplicate lesson
 	 * @return void
 	 */
-	private function duplicate_lesson_quizzes( $old_lesson_id, $new_lesson_id ) {
+	private function duplicate_lesson_quizzes($old_lesson_id, $new_lesson_id) {
 
-        $old_quiz_id = Sensei()->lesson->lesson_quizzes( $old_lesson_id );
-        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $old_quiz_id );
+        $old_quiz_id = Sensei()->lesson->lesson_quizzes($old_lesson_id);
+        $old_quiz_questions = Sensei()->lesson->lesson_quiz_questions($old_quiz_id);
 
         // duplicate the generic wp post information
-		$new_quiz = $this->duplicate_post( get_post( $old_quiz_id ), '' );
+		$new_quiz = $this->duplicate_post(get_post($old_quiz_id), '');
 
 		//update the new lesson data
-        add_post_meta( $new_lesson_id, '_lesson_quiz', $new_quiz->ID );
+        add_post_meta($new_lesson_id, '_lesson_quiz', $new_quiz->ID);
 
 		//update the new quiz data
-        add_post_meta( $new_quiz->ID, '_quiz_lesson', $new_lesson_id );
+        add_post_meta($new_quiz->ID, '_quiz_lesson', $new_lesson_id);
         wp_update_post(
             array(
                 'ID' => $new_quiz->ID,
@@ -555,15 +555,15 @@ 
             )
         );
 
-		foreach( $old_quiz_questions as $question ) {
+		foreach ($old_quiz_questions as $question) {
 
 			// copy the question order over to the new quiz
-			$old_question_order = get_post_meta( $question->ID, '_quiz_question_order'. $old_quiz_id, true );
-            $new_question_order = str_ireplace( $old_quiz_id, $new_quiz->ID , $old_question_order );
-            add_post_meta( $question->ID, '_quiz_question_order' . $new_quiz->ID, $new_question_order );
+			$old_question_order = get_post_meta($question->ID, '_quiz_question_order'.$old_quiz_id, true);
+            $new_question_order = str_ireplace($old_quiz_id, $new_quiz->ID, $old_question_order);
+            add_post_meta($question->ID, '_quiz_question_order'.$new_quiz->ID, $new_question_order);
 
 			// Add question to quiz
-			add_post_meta( $question->ID, '_quiz_id', $new_quiz->ID, false );
+			add_post_meta($question->ID, '_quiz_id', $new_quiz->ID, false);
 
 		}
 	}
@@ -574,7 +574,7 @@ 
 	 * @param  integer $new_course_id ID of duplicated course
 	 * @return void
 	 */
-	private function duplicate_course_lessons( $old_course_id, $new_course_id ) {
+	private function duplicate_course_lessons($old_course_id, $new_course_id) {
 		$lesson_args = array(
 			'post_type' => 'lesson',
 			'posts_per_page' => -1,
@@ -582,13 +582,13 @@ 
 			'meta_value' => $old_course_id,
 			'suppress_filters' 	=> 0
 		);
-		$lessons = get_posts( $lesson_args );
+		$lessons = get_posts($lesson_args);
 
-		foreach( $lessons as $lesson ) {
-			$new_lesson = $this->duplicate_post( $lesson, '', true );
-			add_post_meta( $new_lesson->ID, '_lesson_course', $new_course_id );
+		foreach ($lessons as $lesson) {
+			$new_lesson = $this->duplicate_post($lesson, '', true);
+			add_post_meta($new_lesson->ID, '_lesson_course', $new_course_id);
 
-			$this->duplicate_lesson_quizzes( $lesson->ID, $new_lesson->ID );
+			$this->duplicate_lesson_quizzes($lesson->ID, $new_lesson->ID);
 		}
 	}
 
@@ -599,24 +599,24 @@ 
 	 * @param  boolean $ignore_course Ignore lesson course when dulicating
 	 * @return object                 Duplicate post object
 	 */
-	private function duplicate_post( $post, $suffix = ' (Duplicate)', $ignore_course = false ) {
+	private function duplicate_post($post, $suffix = ' (Duplicate)', $ignore_course = false) {
 
 		$new_post = array();
 
-		foreach( $post as $k => $v ) {
-			if( ! in_array( $k, array( 'ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count' ) ) ) {
-				$new_post[ $k ] = $v;
+		foreach ($post as $k => $v) {
+			if ( ! in_array($k, array('ID', 'post_status', 'post_date', 'post_date_gmt', 'post_name', 'post_modified', 'post_modified_gmt', 'guid', 'comment_count'))) {
+				$new_post[$k] = $v;
 			}
 		}
 
-		$new_post['post_title'] .= __( $suffix, 'woothemes-sensei' );
+		$new_post['post_title'] .= __($suffix, 'woothemes-sensei');
 
-		$new_post['post_date'] = current_time( 'mysql' );
-		$new_post['post_date_gmt'] = get_gmt_from_date( $new_post['post_date'] );
+		$new_post['post_date'] = current_time('mysql');
+		$new_post['post_date_gmt'] = get_gmt_from_date($new_post['post_date']);
 		$new_post['post_modified'] = $new_post['post_date'];
 		$new_post['post_modified_gmt'] = $new_post['post_date_gmt'];
 
-		switch( $post->post_type ) {
+		switch ($post->post_type) {
 			case 'course': $new_post['post_status'] = 'draft'; break;
 			case 'lesson': $new_post['post_status'] = 'draft'; break;
 			case 'quiz': $new_post['post_status'] = 'publish'; break;
@@ -624,45 +624,45 @@ 
 		}
 
 		// As per wp_update_post() we need to escape the data from the db.
-		$new_post = wp_slash( $new_post );
+		$new_post = wp_slash($new_post);
 
-		$new_post_id = wp_insert_post( $new_post );
+		$new_post_id = wp_insert_post($new_post);
 
-		if( ! is_wp_error( $new_post_id ) ) {
+		if ( ! is_wp_error($new_post_id)) {
 
-			$post_meta = get_post_custom( $post->ID );
-			if( $post_meta && count( $post_meta ) > 0 ) {
+			$post_meta = get_post_custom($post->ID);
+			if ($post_meta && count($post_meta) > 0) {
 
-				$ignore_meta = array( '_quiz_lesson', '_quiz_id', '_lesson_quiz' );
+				$ignore_meta = array('_quiz_lesson', '_quiz_id', '_lesson_quiz');
 
-				if( $ignore_course ) {
+				if ($ignore_course) {
 					$ignore_meta[] = '_lesson_course';
 				}
 
-				foreach( $post_meta as $key => $meta ) {
-					foreach( $meta as $value ) {
-						$value = maybe_unserialize( $value );
-						if( ! in_array( $key, $ignore_meta ) ) {
-							add_post_meta( $new_post_id, $key, $value );
+				foreach ($post_meta as $key => $meta) {
+					foreach ($meta as $value) {
+						$value = maybe_unserialize($value);
+						if ( ! in_array($key, $ignore_meta)) {
+							add_post_meta($new_post_id, $key, $value);
 						}
 					}
 				}
 			}
 
-			add_post_meta( $new_post_id, '_duplicate', $post->ID );
+			add_post_meta($new_post_id, '_duplicate', $post->ID);
 
-			$taxonomies = get_object_taxonomies( $post->post_type, 'objects' );
+			$taxonomies = get_object_taxonomies($post->post_type, 'objects');
 
-			foreach ( $taxonomies as $slug => $tax ) {
-				$terms = get_the_terms( $post->ID, $slug );
-				if( isset( $terms ) && is_array( $terms ) && 0 < count( $terms ) ) {
-					foreach( $terms as $term ) {
-						wp_set_object_terms( $new_post_id, $term->term_id, $slug, true );
+			foreach ($taxonomies as $slug => $tax) {
+				$terms = get_the_terms($post->ID, $slug);
+				if (isset($terms) && is_array($terms) && 0 < count($terms)) {
+					foreach ($terms as $term) {
+						wp_set_object_terms($new_post_id, $term->term_id, $slug, true);
 					}
 				}
 			}
 
-			$new_post = get_post( $new_post_id );
+			$new_post = get_post($new_post_id);
 
 			return $new_post;
 		}
@@ -677,7 +677,7 @@ 
 	public function lesson_filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
+		if (is_admin() && 'lesson' == $typenow) {
 
 			$args = array(
 				'post_type' => 'course',
@@ -687,16 +687,16 @@ 
 				'orderby' => 'menu_order date',
 				'order' => 'ASC',
 			);
-			$courses = get_posts( $args );
+			$courses = get_posts($args);
 
-			$selected = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+			$selected = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 			$course_options = '';
-			foreach( $courses as $course ) {
-				$course_options .= '<option value="' . esc_attr( $course->ID ) . '" ' . selected( $selected, $course->ID, false ) . '>' . get_the_title( $course->ID ) . '</option>';
+			foreach ($courses as $course) {
+				$course_options .= '<option value="'.esc_attr($course->ID).'" '.selected($selected, $course->ID, false).'>'.get_the_title($course->ID).'</option>';
 			}
 
 			$output = '<select name="lesson_course" id="dropdown_lesson_course">';
-			$output .= '<option value="">'.__( 'Show all courses', 'woothemes-sensei' ).'</option>';
+			$output .= '<option value="">'.__('Show all courses', 'woothemes-sensei').'</option>';
 			$output .= $course_options;
 			$output .= '</select>';
 
@@ -709,13 +709,13 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function lesson_filter_actions( $request ) {
+	public function lesson_filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'lesson' == $typenow ) {
-			$lesson_course = isset( $_GET['lesson_course'] ) ? $_GET['lesson_course'] : '';
+		if (is_admin() && 'lesson' == $typenow) {
+			$lesson_course = isset($_GET['lesson_course']) ? $_GET['lesson_course'] : '';
 
-			if( $lesson_course ) {
+			if ($lesson_course) {
 				$request['meta_key'] = '_lesson_course';
 				$request['meta_value'] = $lesson_course;
 				$request['meta_compare'] = '=';
@@ -730,27 +730,27 @@ 
 	 * @param  array $items Existing items
 	 * @return array        Updated items
 	 */
-	public function glance_items( $items = array() ) {
+	public function glance_items($items = array()) {
 
-		$types = array( 'course', 'lesson', 'question' );
+		$types = array('course', 'lesson', 'question');
 
-		foreach( $types as $type ) {
-			if( ! post_type_exists( $type ) ) continue;
+		foreach ($types as $type) {
+			if ( ! post_type_exists($type)) continue;
 
-			$num_posts = wp_count_posts( $type );
+			$num_posts = wp_count_posts($type);
 
-			if( $num_posts ) {
+			if ($num_posts) {
 
-				$published = intval( $num_posts->publish );
-				$post_type = get_post_type_object( $type );
+				$published = intval($num_posts->publish);
+				$post_type = get_post_type_object($type);
 
-				$text = _n( '%s ' . $post_type->labels->singular_name, '%s ' . $post_type->labels->name, $published, 'woothemes-sensei' );
-				$text = sprintf( $text, number_format_i18n( $published ) );
+				$text = _n('%s '.$post_type->labels->singular_name, '%s '.$post_type->labels->name, $published, 'woothemes-sensei');
+				$text = sprintf($text, number_format_i18n($published));
 
-				if ( current_user_can( $post_type->cap->edit_posts ) ) {
-					$items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text ) . "\n";
+				if (current_user_can($post_type->cap->edit_posts)) {
+					$items[] = sprintf('<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $type, $text)."\n";
 				} else {
-					$items[] = sprintf( '<span class="%1$s-count">%2$s</span>', $type, $text ) . "\n";
+					$items[] = sprintf('<span class="%1$s-count">%2$s</span>', $type, $text)."\n";
 				}
 			}
 		}
@@ -764,13 +764,13 @@ 
 	 * @param  object  $post    Post object
 	 * @return void
 	 */
-	public function delete_content( $post_id, $post ) {
+	public function delete_content($post_id, $post) {
 
 		$type = $post->post_type;
 
-		if( in_array( $type, array( 'lesson', 'course' ) ) ) {
+		if (in_array($type, array('lesson', 'course'))) {
 
-			$meta_key = '_' . $type . '_prerequisite';
+			$meta_key = '_'.$type.'_prerequisite';
 
 			$args = array(
 				'post_type' => $type,
@@ -780,10 +780,10 @@ 
 				'meta_value' => $post_id
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			foreach( $posts as $post ) {
-				delete_post_meta( $post->ID, $meta_key );
+			foreach ($posts as $post) {
+				delete_post_meta($post->ID, $meta_key);
 			}
 		}
 	}
@@ -793,181 +793,181 @@ 
 	 * @param  integer $user_id User ID
 	 * @return void
 	 */
-	public function delete_user_activity( $user_id = 0 ) {
-		if( $user_id ) {
-			Sensei_Utils::delete_all_user_activity( $user_id );
+	public function delete_user_activity($user_id = 0) {
+		if ($user_id) {
+			Sensei_Utils::delete_all_user_activity($user_id);
 		}
 	}
 
-	public function render_settings( $settings = array(), $post_id = 0, $group_id = '' ) {
+	public function render_settings($settings = array(), $post_id = 0, $group_id = '') {
 
 		$html = '';
 
-		if( 0 == count( $settings ) ) return $html;
+		if (0 == count($settings)) return $html;
 
-		$html .= '<div class="sensei-options-panel">' . "\n";
+		$html .= '<div class="sensei-options-panel">'."\n";
 
-			$html .= '<div class="options_group" id="' . esc_attr( $group_id ) . '">' . "\n";
+			$html .= '<div class="options_group" id="'.esc_attr($group_id).'">'."\n";
 
-				foreach( $settings as $field ) {
+				foreach ($settings as $field) {
 
 					$data = '';
 
-					if( $post_id ) {
-						$data = get_post_meta( $post_id, '_' . $field['id'], true );
-						if( ! $data && isset( $field['default'] ) ) {
+					if ($post_id) {
+						$data = get_post_meta($post_id, '_'.$field['id'], true);
+						if ( ! $data && isset($field['default'])) {
 							$data = $field['default'];
 						}
 					} else {
-						$option = get_option( $field['id'] );
-						if( isset( $field['default'] ) ) {
+						$option = get_option($field['id']);
+						if (isset($field['default'])) {
 							$data = $field['default'];
-							if( $option ) {
+							if ($option) {
 								$data = $option;
 							}
 						}
 					}
 
 					$disabled = '';
-					if( isset( $field['disabled'] ) && $field['disabled'] ) {
-						$disabled = disabled( $field['disabled'], true, false );
+					if (isset($field['disabled']) && $field['disabled']) {
+						$disabled = disabled($field['disabled'], true, false);
 					}
 
-					if( 'hidden' != $field['type'] ) {
+					if ('hidden' != $field['type']) {
 
 						$class_tail = '';
 
-						if( isset( $field['class'] ) ) {
+						if (isset($field['class'])) {
 							$class_tail .= $field['class'];
 						}
 
-						if( isset( $field['disabled'] ) && $field['disabled'] ) {
+						if (isset($field['disabled']) && $field['disabled']) {
 							$class_tail .= ' disabled';
 						}
 
-						$html .= '<p class="form-field ' . esc_attr( $field['id'] ) . ' ' . esc_attr( $class_tail ) . '">' . "\n";
+						$html .= '<p class="form-field '.esc_attr($field['id']).' '.esc_attr($class_tail).'">'."\n";
 					}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '<label for="' . esc_attr( $field['id'] ) . '">' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '<label for="'.esc_attr($field['id']).'">'."\n";
 						}
 
-							if( $field['label'] ) {
-								$html .= '<span class="label">' . esc_html( $field['label'] ) . '</span>';
+							if ($field['label']) {
+								$html .= '<span class="label">'.esc_html($field['label']).'</span>';
 							}
 
-							switch( $field['type'] ) {
+							switch ($field['type']) {
 								case 'text':
 								case 'password':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$disabled.' />'."\n";
 								break;
 
 								case 'number':
 
 									$min = '';
-									if( isset( $field['min'] ) ) {
-										$min = 'min="' . esc_attr( $field['min'] ) . '"';
+									if (isset($field['min'])) {
+										$min = 'min="'.esc_attr($field['min']).'"';
 									}
 
 									$max = '';
-									if( isset( $field['max'] ) ) {
-										$max = 'max="' . esc_attr( $field['max'] ) . '"';
+									if (isset($field['max'])) {
+										$max = 'max="'.esc_attr($field['max']).'"';
 									}
 
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" value="' . $data . '" ' . $min . '  ' . $max . ' class="small-text" ' . $disabled . ' />' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" value="'.$data.'" '.$min.'  '.$max.' class="small-text" '.$disabled.' />'."\n";
 								break;
 
 								case 'textarea':
-									$html .= '<textarea id="' . esc_attr( $field['id'] ) . '" rows="5" cols="50" name="' . esc_attr( $field['id'] ) . '" placeholder="' . esc_attr( $field['placeholder'] ) . '" ' . $disabled . '>' . $data . '</textarea><br/>'. "\n";
+									$html .= '<textarea id="'.esc_attr($field['id']).'" rows="5" cols="50" name="'.esc_attr($field['id']).'" placeholder="'.esc_attr($field['placeholder']).'" '.$disabled.'>'.$data.'</textarea><br/>'."\n";
 								break;
 
 								case 'checkbox':
                                     //backwards compatibility
-                                    if( empty( $data ) || 'on' == $data ){
+                                    if (empty($data) || 'on' == $data) {
                                         $checked_value = 'on';
-                                    }elseif( 'yes' == $data  ) {
+                                    }elseif ('yes' == $data) {
 
                                         $checked_value = 'yes';
 
-                                    }elseif( 'auto' == $data  ) {
+                                    }elseif ('auto' == $data) {
 
                                         $checked_value = 'auto';
 
                                     } else {
                                         $checked_value = 1;
-                                        $data = intval( $data );
+                                        $data = intval($data);
                                     }
-									$checked = checked( $checked_value, $data, false );
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" ' . $checked . ' ' . $disabled . '/>' . "\n";
+									$checked = checked($checked_value, $data, false);
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" '.$checked.' '.$disabled.'/>'."\n";
 								break;
 
 								case 'checkbox_multi':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="checkbox" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '[]" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="checkbox" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'[]" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'radio':
-									foreach( $field['options'] as $k => $v ) {
+									foreach ($field['options'] as $k => $v) {
 										$checked = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$checked = true;
 										}
-										$html .= '<label for="' . esc_attr( $field['id'] . '_' . $k ) . '"><input type="radio" ' . checked( $checked, true, false ) . ' name="' . esc_attr( $field['id'] ) . '" value="' . esc_attr( $k ) . '" id="' . esc_attr( $field['id'] . '_' . $k ) . '" ' . $disabled . ' /> ' . $v . '</label> ' . "\n";
+										$html .= '<label for="'.esc_attr($field['id'].'_'.$k).'"><input type="radio" '.checked($checked, true, false).' name="'.esc_attr($field['id']).'" value="'.esc_attr($k).'" id="'.esc_attr($field['id'].'_'.$k).'" '.$disabled.' /> '.$v.'</label> '."\n";
 									}
 								break;
 
 								case 'select':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '" id="' . esc_attr( $field['id'] ) . '" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'" id="'.esc_attr($field['id']).'" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( $k == $data ) {
+										if ($k == $data) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '">' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'">'.$v.'</option>'."\n";
 									}
-									$html .= '</select><br/>' . "\n";
+									$html .= '</select><br/>'."\n";
 								break;
 
 								case 'select_multi':
-									$html .= '<select name="' . esc_attr( $field['id'] ) . '[]" id="' . esc_attr( $field['id'] ) . '" multiple="multiple" ' . $disabled . '>' . "\n";
-									foreach( $field['options'] as $k => $v ) {
+									$html .= '<select name="'.esc_attr($field['id']).'[]" id="'.esc_attr($field['id']).'" multiple="multiple" '.$disabled.'>'."\n";
+									foreach ($field['options'] as $k => $v) {
 										$selected = false;
-										if( in_array( $k, $data ) ) {
+										if (in_array($k, $data)) {
 											$selected = true;
 										}
-										$html .= '<option ' . selected( $selected, true, false ) . ' value="' . esc_attr( $k ) . '" />' . $v . '</option>' . "\n";
+										$html .= '<option '.selected($selected, true, false).' value="'.esc_attr($k).'" />'.$v.'</option>'."\n";
 									}
 									$html .= '</select> . "\n"';
 								break;
 
 								case 'hidden':
-									$html .= '<input id="' . esc_attr( $field['id'] ) . '" type="' . $field['type'] . '" name="' . esc_attr( $field['id'] ) . '" value="' . $data . '" ' . $disabled . '/>' . "\n";
+									$html .= '<input id="'.esc_attr($field['id']).'" type="'.$field['type'].'" name="'.esc_attr($field['id']).'" value="'.$data.'" '.$disabled.'/>'."\n";
 								break;
 
 							}
 
-							if( $field['description'] ) {
-								$html .= ' <span class="description">' . esc_html( $field['description'] ) . '</span>' . "\n";
+							if ($field['description']) {
+								$html .= ' <span class="description">'.esc_html($field['description']).'</span>'."\n";
 							}
 
-						if( ! in_array( $field['type'], array( 'hidden', 'checkbox_multi', 'radio' ) ) ) {
-							$html .= '</label>' . "\n";
+						if ( ! in_array($field['type'], array('hidden', 'checkbox_multi', 'radio'))) {
+							$html .= '</label>'."\n";
 						}
 
-					if( 'hidden' != $field['type'] ) {
-						$html .= '</p>' . "\n";
+					if ('hidden' != $field['type']) {
+						$html .= '</p>'."\n";
 					}
 
 				}
 
-			$html .= '</div>' . "\n";
+			$html .= '</div>'."\n";
 
-		$html .= '</div>' . "\n";
+		$html .= '</div>'."\n";
 
 		return $html;
 	}
@@ -978,61 +978,61 @@ 
 	 */
 	public function course_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="course-order" class="wrap course-order">
-		<h2><?php _e( 'Order Courses', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Courses', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['course-order'] ) && 0 < strlen( $_POST['course-order'] ) ) {
-			$ordered = $this->save_course_order( esc_attr( $_POST['course-order'] ) );
+		if (isset($_POST['course-order']) && 0 < strlen($_POST['course-order'])) {
+			$ordered = $this->save_course_order(esc_attr($_POST['course-order']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The course order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The course order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
 		$courses = Sensei()->course->get_all_courses();
 
-		if( 0 < count( $courses ) ) {
+		if (0 < count($courses)) {
 
             // order the courses as set by the users
             $all_course_ids = array();
-            foreach( $courses as $course ){
+            foreach ($courses as $course) {
 
-                $all_course_ids[] = (string)$course->ID;
+                $all_course_ids[] = (string) $course->ID;
 
             }
             $order_string = $this->get_course_order();
 
-            if( !empty( $order_string ) ){
-                $ordered_course_ids = explode(',' , $order_string );
-                $all_course_ids = array_unique( array_merge( $ordered_course_ids , $all_course_ids ) );
+            if ( ! empty($order_string)) {
+                $ordered_course_ids = explode(',', $order_string);
+                $all_course_ids = array_unique(array_merge($ordered_course_ids, $all_course_ids));
             }
 
 
-			$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
-			$html .= '<ul class="sortable-course-list">' . "\n";
+			$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
+			$html .= '<ul class="sortable-course-list">'."\n";
 			$count = 0;
-			foreach ( $all_course_ids as $course_id ) {
-                $course = get_post( $course_id );
+			foreach ($all_course_ids as $course_id) {
+                $course = get_post($course_id);
 				$count++;
 				$class = 'course';
-				if ( $count == 1 ) { $class .= ' first'; }
-				if ( $count == count( $course ) ) { $class .= ' last'; }
-				if ( $count % 2 != 0 ) {
+				if ($count == 1) { $class .= ' first'; }
+				if ($count == count($course)) { $class .= ' last'; }
+				if ($count % 2 != 0) {
 					$class .= ' alternate';
 				}
-				$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $course->ID ) . '" style="width: 100%;"> ' . $course->post_title . '</span></li>' . "\n";
+				$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($course->ID).'" style="width: 100%;"> '.$course->post_title.'</span></li>'."\n";
 			}
-			$html .= '</ul>' . "\n";
+			$html .= '</ul>'."\n";
 
-			$html .= '<input type="hidden" name="course-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-			$html .= '<input type="submit" class="button-primary" value="' . __( 'Save course order', 'woothemes-sensei' ) . '" />' . "\n";
+			$html .= '<input type="hidden" name="course-order" value="'.esc_attr($order_string).'" />'."\n";
+			$html .= '<input type="submit" class="button-primary" value="'.__('Save course order', 'woothemes-sensei').'" />'."\n";
 		}
 
 		echo $html;
@@ -1041,25 +1041,25 @@ 
 	}
 
 	public function get_course_order() {
-		return get_option( 'sensei_course_order', '' );
+		return get_option('sensei_course_order', '');
 	}
 
-	public function save_course_order( $order_string = '' ) {
-		$order = explode( ',', $order_string );
+	public function save_course_order($order_string = '') {
+		$order = explode(',', $order_string);
 
-		update_option( 'sensei_course_order', $order_string );
+		update_option('sensei_course_order', $order_string);
 
 		$i = 1;
-		foreach( $order as $course_id ) {
+		foreach ($order as $course_id) {
 
-			if( $course_id ) {
+			if ($course_id) {
 
 				$update_args = array(
 					'ID' => $course_id,
 					'menu_order' => $i,
 				);
 
-				wp_update_post( $update_args );
+				wp_update_post($update_args);
 
 				++$i;
 			}
@@ -1074,22 +1074,22 @@ 
 	 */
 	public function lesson_order_screen() {
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable' ), Sensei()->version );
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+		wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'jquery-ui-sortable'), Sensei()->version);
 
 		?><div id="lesson-order" class="wrap lesson-order">
-		<h2><?php _e( 'Order Lessons', 'woothemes-sensei' ); ?></h2><?php
+		<h2><?php _e('Order Lessons', 'woothemes-sensei'); ?></h2><?php
 
 		$html = '';
 
-		if( isset( $_POST['lesson-order'] ) ) {
+		if (isset($_POST['lesson-order'])) {
 
-			$ordered = $this->save_lesson_order( esc_attr( $_POST['lesson-order'] ), esc_attr( $_POST['course_id'] ) );
+			$ordered = $this->save_lesson_order(esc_attr($_POST['lesson-order']), esc_attr($_POST['course_id']));
 
-			if( $ordered ) {
-				$html .= '<div class="updated fade">' . "\n";
-				$html .= '<p>' . __( 'The lesson order has been saved.', 'woothemes-sensei' ) . '</p>' . "\n";
-				$html .= '</div>' . "\n";
+			if ($ordered) {
+				$html .= '<div class="updated fade">'."\n";
+				$html .= '<p>'.__('The lesson order has been saved.', 'woothemes-sensei').'</p>'."\n";
+				$html .= '</div>'."\n";
 			}
 		}
 
@@ -1100,43 +1100,43 @@ 
 			'orderby' => 'name',
 			'order' => 'ASC',
 		);
-		$courses = get_posts( $args );
+		$courses = get_posts($args);
 
-		$html .= '<form action="' . admin_url( 'edit.php' ) . '" method="get">' . "\n";
-		$html .= '<input type="hidden" name="post_type" value="lesson" />' . "\n";
-		$html .= '<input type="hidden" name="page" value="lesson-order" />' . "\n";
-		$html .= '<select id="lesson-order-course" name="course_id">' . "\n";
-		$html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>' . "\n";
+		$html .= '<form action="'.admin_url('edit.php').'" method="get">'."\n";
+		$html .= '<input type="hidden" name="post_type" value="lesson" />'."\n";
+		$html .= '<input type="hidden" name="page" value="lesson-order" />'."\n";
+		$html .= '<select id="lesson-order-course" name="course_id">'."\n";
+		$html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'."\n";
 
-		foreach( $courses as $course ) {
+		foreach ($courses as $course) {
 			$course_id = '';
-			if( isset( $_GET['course_id'] ) ) {
-				$course_id = intval( $_GET['course_id'] );
+			if (isset($_GET['course_id'])) {
+				$course_id = intval($_GET['course_id']);
 			}
-			$html .= '<option value="' . esc_attr( intval( $course->ID ) ) . '" ' . selected( $course->ID, $course_id, false ) .'>' . get_the_title( $course->ID ) . '</option>' . "\n";
+			$html .= '<option value="'.esc_attr(intval($course->ID)).'" '.selected($course->ID, $course_id, false).'>'.get_the_title($course->ID).'</option>'."\n";
 		}
 
-		$html .= '</select>' . "\n";
-		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="' . __( 'Select', 'woothemes-sensei' ) . '" />' . "\n";
-		$html .= '</form>' . "\n";
+		$html .= '</select>'."\n";
+		$html .= '<input type="submit" class="button-primary lesson-order-select-course-submit" value="'.__('Select', 'woothemes-sensei').'" />'."\n";
+		$html .= '</form>'."\n";
 
-		$html .= '<script type="text/javascript">' . "\n";
-		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});' . "\n";
-		$html .= '</script>' . "\n";
+		$html .= '<script type="text/javascript">'."\n";
+		$html .= 'jQuery( \'#lesson-order-course\' ).select2({width:"resolve"});'."\n";
+		$html .= '</script>'."\n";
 
-		if( isset( $_GET['course_id'] ) ) {
-			$course_id = intval( $_GET['course_id'] );
-			if( $course_id > 0 ) {
+		if (isset($_GET['course_id'])) {
+			$course_id = intval($_GET['course_id']);
+			if ($course_id > 0) {
 
-				$order_string = $this->get_lesson_order( $course_id );
+				$order_string = $this->get_lesson_order($course_id);
 
-				$html .= '<form id="editgrouping" method="post" action="" class="validate">' . "\n";
+				$html .= '<form id="editgrouping" method="post" action="" class="validate">'."\n";
 
 				$displayed_lessons = array();
 
-                $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+                $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-                foreach( $modules as $module ) {
+                foreach ($modules as $module) {
 
                     $args = array(
                         'post_type' => 'lesson',
@@ -1145,7 +1145,7 @@ 
                         'meta_query' => array(
                             array(
                                 'key' => '_lesson_course',
-                                'value' => intval( $course_id ),
+                                'value' => intval($course_id),
                                 'compare' => '='
                             )
                         ),
@@ -1153,66 +1153,66 @@ 
                             array(
                                 'taxonomy' => Sensei()->modules->taxonomy,
                                 'field' => 'id',
-                                'terms' => intval( $module->term_id )
+                                'terms' => intval($module->term_id)
                             )
                         ),
-                        'meta_key' => '_order_module_' . $module->term_id,
+                        'meta_key' => '_order_module_'.$module->term_id,
                         'orderby' => 'meta_value_num date',
                         'order' => 'ASC',
                         'suppress_filters' => 0
                     );
 
-                    $lessons = get_posts( $args );
+                    $lessons = get_posts($args);
 
-                    if( count( $lessons ) > 0 ) {
-                        $html .= '<h3>' . $module->name . '</h3>' . "\n";
-                        $html .= '<ul class="sortable-lesson-list" data-module_id="' . $module->term_id . '">' . "\n";
+                    if (count($lessons) > 0) {
+                        $html .= '<h3>'.$module->name.'</h3>'."\n";
+                        $html .= '<ul class="sortable-lesson-list" data-module_id="'.$module->term_id.'">'."\n";
 
                         $count = 0;
-                        foreach( $lessons as $lesson ) {
+                        foreach ($lessons as $lesson) {
                             $count++;
                             $class = 'lesson';
-                            if ( $count == 1 ) { $class .= ' first'; }
-                            if ( $count == count( $lesson ) ) { $class .= ' last'; }
-                            if ( $count % 2 != 0 ) {
+                            if ($count == 1) { $class .= ' first'; }
+                            if ($count == count($lesson)) { $class .= ' last'; }
+                            if ($count % 2 != 0) {
                                 $class .= ' alternate';
                             }
 
-                            $html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+                            $html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
                             $displayed_lessons[] = $lesson->ID;
                         }
 
-                        $html .= '</ul>' . "\n";
+                        $html .= '</ul>'."\n";
 
-                        $html .= '<input type="hidden" name="lesson-order-module-' . $module->term_id . '" value="" />' . "\n";
+                        $html .= '<input type="hidden" name="lesson-order-module-'.$module->term_id.'" value="" />'."\n";
                     }
                 }
 
 
-                $lessons = Sensei()->course->course_lessons( $course_id );
+                $lessons = Sensei()->course->course_lessons($course_id);
 
-				if( 0 < count( $lessons ) ) {
+				if (0 < count($lessons)) {
 
                     //get module term ids, will be used to exclude lessons
                     $module_items_ids = array();
-                    if( ! empty( $modules ) ) {
+                    if ( ! empty($modules)) {
                         foreach ($modules as $module) {
                             $module_items_ids[] = $module->term_id;
                         }
                     }
 
-					if( 0 < count( $displayed_lessons ) ) {
-						$html .= '<h3>' . __( 'Other Lessons', 'woothemes-sensei' ) . '</h3>' . "\n";
+					if (0 < count($displayed_lessons)) {
+						$html .= '<h3>'.__('Other Lessons', 'woothemes-sensei').'</h3>'."\n";
 					}
 
-					$html .= '<ul class="sortable-lesson-list" data-module_id="0">' . "\n";
+					$html .= '<ul class="sortable-lesson-list" data-module_id="0">'."\n";
 					$count = 0;
-					foreach ( $lessons as $lesson ) {
+					foreach ($lessons as $lesson) {
 
                         // if lesson belongs to one fo the course modules then exclude it here
                         // as it is listed above
-                        if( has_term( $module_items_ids, 'module', $lesson->ID )  ){
+                        if (has_term($module_items_ids, 'module', $lesson->ID)) {
 
                             continue;
 
@@ -1220,28 +1220,28 @@ 
 
 						$count++;
 						$class = 'lesson';
-						if ( $count == 1 ) { $class .= ' first'; }
-						if ( $count == count( $lesson ) ) { $class .= ' last'; }
-						if ( $count % 2 != 0 ) {
+						if ($count == 1) { $class .= ' first'; }
+						if ($count == count($lesson)) { $class .= ' last'; }
+						if ($count % 2 != 0) {
 
 							$class .= ' alternate';
 
 						}
-						$html .= '<li class="' . esc_attr( $class ) . '"><span rel="' . esc_attr( $lesson->ID ) . '" style="width: 100%;"> ' . $lesson->post_title . '</span></li>' . "\n";
+						$html .= '<li class="'.esc_attr($class).'"><span rel="'.esc_attr($lesson->ID).'" style="width: 100%;"> '.$lesson->post_title.'</span></li>'."\n";
 
 						$displayed_lessons[] = $lesson->ID;
 					}
-					$html .= '</ul>' . "\n";
+					$html .= '</ul>'."\n";
 				} else {
-					if( 0 == count( $displayed_lessons ) ) {
-						$html .= '<p><em>' . __( 'There are no lessons in this course.', 'woothemes-sensei' ) . '</em></p>';
+					if (0 == count($displayed_lessons)) {
+						$html .= '<p><em>'.__('There are no lessons in this course.', 'woothemes-sensei').'</em></p>';
 					}
 				}
 
-				if( 0 < count( $displayed_lessons ) ) {
-					$html .= '<input type="hidden" name="lesson-order" value="' . esc_attr( $order_string ) . '" />' . "\n";
-					$html .= '<input type="hidden" name="course_id" value="' . $course_id . '" />' . "\n";
-					$html .= '<input type="submit" class="button-primary" value="' . __( 'Save lesson order', 'woothemes-sensei' ) . '" />' . "\n";
+				if (0 < count($displayed_lessons)) {
+					$html .= '<input type="hidden" name="lesson-order" value="'.esc_attr($order_string).'" />'."\n";
+					$html .= '<input type="hidden" name="course_id" value="'.$course_id.'" />'."\n";
+					$html .= '<input type="submit" class="button-primary" value="'.__('Save lesson order', 'woothemes-sensei').'" />'."\n";
 				}
 			}
 		}
@@ -1251,29 +1251,29 @@ 
 		?></div><?php
 	}
 
-	public function get_lesson_order( $course_id = 0 ) {
-		$order_string = get_post_meta( $course_id, '_lesson_order', true );
+	public function get_lesson_order($course_id = 0) {
+		$order_string = get_post_meta($course_id, '_lesson_order', true);
 		return $order_string;
 	}
 
-	public function save_lesson_order( $order_string = '', $course_id = 0 ) {
+	public function save_lesson_order($order_string = '', $course_id = 0) {
 
-		if( $course_id ) {
+		if ($course_id) {
 
-            $modules = Sensei()->modules->get_course_modules( intval( $course_id ) );
+            $modules = Sensei()->modules->get_course_modules(intval($course_id));
 
-            foreach( $modules as $module ) {
+            foreach ($modules as $module) {
 
 
-                if( isset( $_POST[ 'lesson-order-module-' . $module->term_id ] )
-                    && $_POST[ 'lesson-order-module-' . $module->term_id ] ) {
+                if (isset($_POST['lesson-order-module-'.$module->term_id])
+                    && $_POST['lesson-order-module-'.$module->term_id]) {
 
-                    $order = explode( ',', $_POST[ 'lesson-order-module-' . $module->term_id ] );
+                    $order = explode(',', $_POST['lesson-order-module-'.$module->term_id]);
                     $i = 1;
-                    foreach( $order as $lesson_id ) {
+                    foreach ($order as $lesson_id) {
 
-                        if( $lesson_id ) {
-                            update_post_meta( $lesson_id, '_order_module_' . $module->term_id, $i );
+                        if ($lesson_id) {
+                            update_post_meta($lesson_id, '_order_module_'.$module->term_id, $i);
                             ++$i;
                         }
 
@@ -1284,15 +1284,15 @@ 
             } // end for each modules
 
 
-			if( $order_string ) {
-				update_post_meta( $course_id, '_lesson_order', $order_string );
+			if ($order_string) {
+				update_post_meta($course_id, '_lesson_order', $order_string);
 
-				$order = explode( ',', $order_string );
+				$order = explode(',', $order_string);
 
 				$i = 1;
-				foreach( $order as $lesson_id ) {
-					if( $lesson_id ) {
-						update_post_meta( $lesson_id, '_order_' . $course_id, $i );
+				foreach ($order as $lesson_id) {
+					if ($lesson_id) {
+						update_post_meta($lesson_id, '_order_'.$course_id, $i);
 						++$i;
 					}
 				}
@@ -1307,54 +1307,54 @@ 
 	function sensei_add_custom_menu_items() {
 		global $pagenow;
 
-		if( 'nav-menus.php' == $pagenow ) {
-			add_meta_box( 'add-sensei-links', 'Sensei', array( $this, 'wp_nav_menu_item_sensei_links_meta_box' ), 'nav-menus', 'side', 'low' );
+		if ('nav-menus.php' == $pagenow) {
+			add_meta_box('add-sensei-links', 'Sensei', array($this, 'wp_nav_menu_item_sensei_links_meta_box'), 'nav-menus', 'side', 'low');
 		}
 	}
 
-	function wp_nav_menu_item_sensei_links_meta_box( $object ) {
+	function wp_nav_menu_item_sensei_links_meta_box($object) {
 		global $nav_menu_selected_id;
 
 		$menu_items = array(
-			'#senseicourses' => __( 'Courses', 'woothemes-sensei' ),
-			'#senseilessons' => __( 'Lessons', 'woothemes-sensei' ),
-			'#senseimycourses' => __( 'My Courses', 'woothemes-sensei' ),
-			'#senseilearnerprofile' => __( 'My Profile', 'woothemes-sensei' ),
-			'#senseimymessages' => __( 'My Messages', 'woothemes-sensei' ),
-			'#senseiloginlogout' => __( 'Login', 'woothemes-sensei' ) . '|' . __( 'Logout', 'woothemes-sensei' )
+			'#senseicourses' => __('Courses', 'woothemes-sensei'),
+			'#senseilessons' => __('Lessons', 'woothemes-sensei'),
+			'#senseimycourses' => __('My Courses', 'woothemes-sensei'),
+			'#senseilearnerprofile' => __('My Profile', 'woothemes-sensei'),
+			'#senseimymessages' => __('My Messages', 'woothemes-sensei'),
+			'#senseiloginlogout' => __('Login', 'woothemes-sensei').'|'.__('Logout', 'woothemes-sensei')
 		);
 
 		$menu_items_obj = array();
-		foreach ( $menu_items as $value => $title ) {
+		foreach ($menu_items as $value => $title) {
 			$menu_items_obj[$title] = new stdClass;
-			$menu_items_obj[$title]->object_id			= esc_attr( $value );
-			$menu_items_obj[$title]->title				= esc_attr( $title );
-			$menu_items_obj[$title]->url				= esc_attr( $value );
-			$menu_items_obj[$title]->description 		= 'description';
+			$menu_items_obj[$title]->object_id = esc_attr($value);
+			$menu_items_obj[$title]->title = esc_attr($title);
+			$menu_items_obj[$title]->url = esc_attr($value);
+			$menu_items_obj[$title]->description = 'description';
 			$menu_items_obj[$title]->db_id 				= 0;
 			$menu_items_obj[$title]->object 			= 'sensei';
-			$menu_items_obj[$title]->menu_item_parent 	= 0;
-			$menu_items_obj[$title]->type 				= 'custom';
+			$menu_items_obj[$title]->menu_item_parent = 0;
+			$menu_items_obj[$title]->type = 'custom';
 			$menu_items_obj[$title]->target 			= '';
-			$menu_items_obj[$title]->attr_title 		= '';
-			$menu_items_obj[$title]->classes 			= array();
-			$menu_items_obj[$title]->xfn 				= '';
+			$menu_items_obj[$title]->attr_title = '';
+			$menu_items_obj[$title]->classes = array();
+			$menu_items_obj[$title]->xfn = '';
 		}
 
-		$walker = new Walker_Nav_Menu_Checklist( array() );
+		$walker = new Walker_Nav_Menu_Checklist(array());
 		?>
 
 		<div id="sensei-links" class="senseidiv taxonomydiv">
 			<div id="tabs-panel-sensei-links-all" class="tabs-panel tabs-panel-view-all tabs-panel-active">
 
 				<ul id="sensei-linkschecklist" class="list:sensei-links categorychecklist form-no-clear">
-					<?php echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items_obj ), 0, (object)array( 'walker' => $walker ) ); ?>
+					<?php echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items_obj), 0, (object) array('walker' => $walker)); ?>
 				</ul>
 
 			</div>
 			<p class="button-controls">
 				<span class="add-to-menu">
-					<input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu', 'woothemes-sensei' ); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
+					<input type="submit"<?php disabled($nav_menu_selected_id, 0); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu', 'woothemes-sensei'); ?>" name="add-sensei-links-menu-item" id="submit-sensei-links" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -1370,17 +1370,17 @@ 
 	 */
 	public function theme_compatibility_notices() {
 
-        if( isset( $_GET['sensei_hide_notice'] ) ) {
-        	switch( esc_attr( $_GET['sensei_hide_notice'] ) ) {
-				case 'menu_settings': add_user_meta( get_current_user_id(), 'sensei_hide_menu_settings_notice', true ); break;
-				case 'theme_check': add_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true ); break;
+        if (isset($_GET['sensei_hide_notice'])) {
+        	switch (esc_attr($_GET['sensei_hide_notice'])) {
+				case 'menu_settings': add_user_meta(get_current_user_id(), 'sensei_hide_menu_settings_notice', true); break;
+				case 'theme_check': add_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true); break;
 			}
         }
 
         // white list templates that are already support by default and do not show notice for them
-        $template = get_option( 'template' );
+        $template = get_option('template');
 
-        $white_list = array(    'twentyeleven',
+        $white_list = array('twentyeleven',
                                 'twentytwelve',
                                 'twentyfourteen',
                                 'twentyfifteen',
@@ -1388,43 +1388,43 @@ 
                                 'storefront',
                                                 );
 
-        if ( in_array( $template, $white_list ) ) {
+        if (in_array($template, $white_list)) {
 
             return;
 
         }
 
         // don't show the notice if the user chose to hide it
-        $hide_theme_check_notice = get_user_meta( get_current_user_id(), 'sensei_hide_theme_check_notice', true );
-        if(  $hide_theme_check_notice ) {
+        $hide_theme_check_notice = get_user_meta(get_current_user_id(), 'sensei_hide_theme_check_notice', true);
+        if ($hide_theme_check_notice) {
 
             return;
 
         }
 
         // show the notice for themes not supporting sensei
-	    if ( ! current_theme_supports( 'sensei' ) ) {
+	    if ( ! current_theme_supports('sensei')) {
             ?>
 
             <div id="message" class="error sensei-message sensei-connect">
                     <p>
                         <strong>
 
-                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei' ); ?>
+                            <?php _e('Your theme does not declare Sensei support', 'woothemes-sensei'); ?>
 
                         </strong> &#8211;
 
-                        <?php _e( 'if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei' ); ?>
+                        <?php _e('if you encounter layout issues please read our integration guide or choose a ', 'woothemes-sensei'); ?>
 
-                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e( 'Sensei theme', 'woothemes-sensei' ) ?> </a>
+                        <a href="http://www.woothemes.com/product-category/themes/sensei-themes/"> <?php  _e('Sensei theme', 'woothemes-sensei') ?> </a>
 
                         :)
 
                     </p>
                     <p class="submit">
-                        <a href="<?php echo esc_url( apply_filters( 'sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility' ) ); ?>" class="button-primary">
+                        <a href="<?php echo esc_url(apply_filters('sensei_docs_url', 'http://docs.woothemes.com/document/sensei-and-theme-compatibility/', 'theme-compatibility')); ?>" class="button-primary">
 
-                            <?php _e( 'Theme Integration Guide', 'woothemes-sensei' ); ?></a> <a class="skip button" href="<?php echo esc_url( add_query_arg( 'sensei_hide_notice', 'theme_check' ) ); ?>"><?php _e( 'Hide this notice', 'woothemes-sensei' ); ?>
+                            <?php _e('Theme Integration Guide', 'woothemes-sensei'); ?></a> <a class="skip button" href="<?php echo esc_url(add_query_arg('sensei_hide_notice', 'theme_check')); ?>"><?php _e('Hide this notice', 'woothemes-sensei'); ?>
 
                         </a>
                     </p>
@@ -1442,7 +1442,7 @@ 
 		wp_get_current_user();
         $user_id = $current_user->ID;
 
-		delete_user_meta( $user_id, 'sensei_hide_theme_check_notice' );
+		delete_user_meta($user_id, 'sensei_hide_theme_check_notice');
 	}
 
 	/**
@@ -1452,8 +1452,8 @@ 
 	 * @param  bool $prevent_access
 	 * @return bool
 	 */
-	public function admin_access( $prevent_access ) {
-		if ( current_user_can( 'manage_sensei_grades' ) ) {
+	public function admin_access($prevent_access) {
+		if (current_user_can('manage_sensei_grades')) {
 			return false;
 		}
 
@@ -1468,12 +1468,12 @@ 
      *
      * @since 1.8.7
      */
-    public  static function install_pages(){
+    public  static function install_pages() {
 
         // only fire on the settings page
-        if( ! isset( $_GET['page'] )
+        if ( ! isset($_GET['page'])
             || 'woothemes-sensei-settings' != $_GET['page']
-            || 1 == get_option('skip_install_sensei_pages') ){
+            || 1 == get_option('skip_install_sensei_pages')) {
 
             return;
 
@@ -1503,13 +1503,13 @@ 
         if ($install_complete) {
 
             // Flush rules after install
-            flush_rewrite_rules( true );
+            flush_rewrite_rules(true);
 
             // Set installed option
             update_option('sensei_installed', 0);
 
-            $complete_url = add_query_arg( 'sensei_install_complete', 'true', $settings_url  );
-            wp_redirect( $complete_url );
+            $complete_url = add_query_arg('sensei_install_complete', 'true', $settings_url);
+            wp_redirect($complete_url);
 
         }
 
@@ -1523,4 +1523,4 @@ 
  * @since 1.9.0
  * @ignore
  */
-class WooThemes_Sensei_Admin extends Sensei_Admin{ }
+class WooThemes_Sensei_Admin extends Sensei_Admin { }

templates/single-course/lessons.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * The Template for displaying all single course meta information.
  *
@@ -22,17 +22,17 @@ 
          * @hooked WooThemes_Sensei_Course::load_single_course_lessons_query
          * @since 1.9.0
          */
-        do_action( 'sensei_single_course_lessons_before' );
+        do_action('sensei_single_course_lessons_before');
 
     ?>
 
     <?php
 
     //lessons loaded into loop in the sensei_single_course_lessons_before hook
-    if( have_posts() ):
+    if (have_posts()):
 
         // start course lessons loop
-        while ( have_posts() ): the_post();  ?>
+        while (have_posts()): the_post(); ?>
 
             <article <?php post_class(); ?> >
 
@@ -50,7 +50,7 @@ 
                      * @hooked WooThemes_Sensei_Lesson::the_lesson_thumbnail - 8
                      *
                      */
-                    do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() );
+                    do_action('sensei_single_course_inside_before_lesson', get_the_ID());
 
                 ?>
 
@@ -75,7 +75,7 @@ 
                      *
                      * @since 1.9.0
                      */
-                    do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() );
+                    do_action('sensei_single_course_inside_after_lesson', get_the_ID());
 
                 ?>
 
@@ -94,7 +94,7 @@ 
          *
          * @since 1.9.0
          */
-        do_action( 'sensei_single_course_lessons_after' );
+        do_action('sensei_single_course_lessons_after');
 
     ?>
 

templates/course-results.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
  */
 ?>
 
-<?php  get_sensei_header();  ?>
+<?php  get_sensei_header(); ?>
 
 <?php
 /**
@@ -21,15 +21,15 @@ 
  *
  * @hooked Sensei_Course_Results::deprecate_sensei_course_results_content_hook() - 20
  */
-do_action( 'sensei_course_results_content_before' );
+do_action('sensei_course_results_content_before');
 ?>
 
 <?php
 global $course;
-$course = get_page_by_path( $wp_query->query_vars['course_results'], OBJECT, 'course' );
+$course = get_page_by_path($wp_query->query_vars['course_results'], OBJECT, 'course');
 ?>
 
-<article <?php post_class( array( 'course', 'post','course-results' ) ); ?> >
+<article <?php post_class(array('course', 'post', 'course-results')); ?> >
 
     <section class="entry fix">
 
@@ -42,7 +42,7 @@ 
          * @param integer $course_id
          *
          */
-        do_action( 'sensei_course_results_content_inside_before', $course->ID );
+        do_action('sensei_course_results_content_inside_before', $course->ID);
         ?>
 
         <header>
@@ -53,7 +53,7 @@ 
 
         </header>
 
-        <?php if ( is_user_logged_in() ):?>
+        <?php if (is_user_logged_in()):?>
 
             <?php
             /**
@@ -65,14 +65,14 @@ 
              *
              * @hooked Sensei_Course_Results::course_info() - 20
              */
-            do_action( 'sensei_course_results_content_inside_before_lessons', $course->ID );
+            do_action('sensei_course_results_content_inside_before_lessons', $course->ID);
             ?>
 
 
             <section class="course-results-lessons">
                 <?php
-                $started_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() );
-                if( $started_course ) {
+                $started_course = Sensei_Utils::user_started_course($course->ID, get_current_user_id());
+                if ($started_course) {
 
                     sensei_the_course_results_lessons();
 
@@ -92,7 +92,7 @@ 
          *
          * @hooked Sensei()->course_results->course_info - 20
          */
-        do_action( 'sensei_course_results_content_inside_after', $course->ID );
+        do_action('sensei_course_results_content_inside_after', $course->ID);
         ?>
 
     </section>
@@ -106,7 +106,7 @@ 
  * @since 1.9.0
  *
  */
-do_action( 'sensei_course_results_content_after' );
+do_action('sensei_course_results_content_after');
 ?>
 
 

includes/hooks/template.php

Spacing +90 added lines, -90 removed lines

@@ -18,10 +18,10 @@ 
  *
  ***************************/
 //This hook allow us to change the template WordPress loads for a given page/post_type @since 1.9.0
-add_filter( 'template_include', array ( 'Sensei_Templates', 'template_loader' ), 10, 1 );
+add_filter('template_include', array('Sensei_Templates', 'template_loader'), 10, 1);
 
 //This hook adds the sensei pagination to the pagination hook
-add_action( 'sensei_pagination', array( 'Sensei_Frontend', 'load_content_pagination' ), 30 );
+add_action('sensei_pagination', array('Sensei_Frontend', 'load_content_pagination'), 30);
 
 
 /***************************
@@ -32,16 +32,16 @@ 
  *
  ***************************/
 // deprecate the archive content hook @since 1.9.0
-add_action( 'sensei_archive_before_course_loop', array ( 'Sensei_Templates', 'deprecated_archive_course_content_hook' ), 10, 1 );
+add_action('sensei_archive_before_course_loop', array('Sensei_Templates', 'deprecated_archive_course_content_hook'), 10, 1);
 
 // Course archive title hook @since 1.9.0
-add_action('sensei_archive_before_course_loop', array( 'Sensei_Course', 'archive_header' ), 10, 0 );
+add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'archive_header'), 10, 0);
 
 // add the course image above the content
-add_action('sensei_course_content_inside_before', array( Sensei()->course, 'course_image' ) ,10, 1 );
+add_action('sensei_course_content_inside_before', array(Sensei()->course, 'course_image'), 10, 1);
 
 // add course content title to the courses on the archive page
-add_action('sensei_course_content_inside_before', array( 'Sensei_Templates', 'the_title' ) ,5, 1 );
+add_action('sensei_course_content_inside_before', array('Sensei_Templates', 'the_title'), 5, 1);
 
 /***************************
  *
@@ -53,33 +53,33 @@ 
 // @1.9.0
 // add deprecated action hooks for backwards compatibility sake
 // hooks on single course page: sensei_course_image , sensei_course_single_title, sensei_course_single_meta
-add_action('sensei_single_course_content_inside_before', array( 'Sensei_Templates', 'deprecated_single_course_inside_before_hooks' ), 80);
+add_action('sensei_single_course_content_inside_before', array('Sensei_Templates', 'deprecated_single_course_inside_before_hooks'), 80);
 
 // @1.9.0
 // hook the single course title on the single course page
-add_action( 'sensei_single_course_content_inside_before',array( 'Sensei_Course', 'the_title'), 10 );
+add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_title'), 10);
 
 // @1.9.0
 // hook the single course title on the single course page
-add_action( 'sensei_single_course_content_inside_before', array( Sensei()->course , 'course_image'), 20 );
+add_action('sensei_single_course_content_inside_before', array(Sensei()->course, 'course_image'), 20);
 
 
 // @1.9.0
 //Add legacy hooks deprecated in 1.9.0
-add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Templates','deprecate_course_single_meta_hooks'), 10 );
+add_action('sensei_single_course_content_inside_before', array('Sensei_Templates', 'deprecate_course_single_meta_hooks'), 10);
 
 // @1.9.0
 // Filter the content and replace it with the excerpt if the user doesn't have full access
-add_filter( 'the_content', array('Sensei_Course', 'single_course_content' ) );
+add_filter('the_content', array('Sensei_Course', 'single_course_content'));
 
 // @1.9.0
 // Deprecate lessons specific single course hooks
-add_action( 'sensei_single_course_content_inside_after', array( 'Sensei_Templates','deprecate_sensei_course_single_lessons_hook' ) );
+add_action('sensei_single_course_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_course_single_lessons_hook'));
 
 // @1.9.0
 // Deprecate single main content hooks
-add_action( 'sensei_single_course_content_inside_after', array( 'Sensei_Templates', 'deprecated_single_main_content_hook') );
-add_action( 'sensei_single_message_content_inside_after', array( 'Sensei_Templates', 'deprecated_single_main_content_hook') );
+add_action('sensei_single_course_content_inside_after', array('Sensei_Templates', 'deprecated_single_main_content_hook'));
+add_action('sensei_single_message_content_inside_after', array('Sensei_Templates', 'deprecated_single_main_content_hook'));
 
 /**
  * Deprecate all the post type single titile hooks in favor of before content and after content hooks
@@ -87,62 +87,62 @@ 
  * @deprecate 1.9.0
  * @1.9.0
  */
-add_action('sensei_single_message_content_inside_before', array( 'Sensei_Templates', 'deprecate_all_post_type_single_title_hooks' ) );
+add_action('sensei_single_message_content_inside_before', array('Sensei_Templates', 'deprecate_all_post_type_single_title_hooks'));
 
 /**
  * Deprecate hooks into the single course modules
  * @deprecated since 1.9.0
  */
-add_action('sensei_single_course_modules_before', array('Sensei_Templates','deprecate_module_before_hook' ) );
-add_action('sensei_single_course_modules_after', array('Sensei_Templates','deprecate_module_after_hook' ) );
+add_action('sensei_single_course_modules_before', array('Sensei_Templates', 'deprecate_module_before_hook'));
+add_action('sensei_single_course_modules_after', array('Sensei_Templates', 'deprecate_module_after_hook'));
 
 // @since 1.9.0
 // add the single course lessons title
-add_action( 'sensei_single_course_content_inside_after' , array( 'Sensei_Course','the_course_lessons_title'), 9 );
+add_action('sensei_single_course_content_inside_after', array('Sensei_Course', 'the_course_lessons_title'), 9);
 
 // @since 1.9.0
 // hooks in the course lessons query and remove it at the end
 // also loading the course lessons template in the middle
-add_action( 'sensei_single_course_lessons_before', array('Sensei_Course','load_single_course_lessons_query' ) );
-add_action( 'sensei_single_course_content_inside_after', 'course_single_lessons', 10 );
-add_action( 'sensei_single_course_lessons_after', array( 'Sensei_Utils','restore_wp_query' ));
+add_action('sensei_single_course_lessons_before', array('Sensei_Course', 'load_single_course_lessons_query'));
+add_action('sensei_single_course_content_inside_after', 'course_single_lessons', 10);
+add_action('sensei_single_course_lessons_after', array('Sensei_Utils', 'restore_wp_query'));
 
 // @since 1.9.0
 // add post classes to the lessons on the single course page
-add_filter( 'post_class', array( 'Sensei_Lesson', 'single_course_lessons_classes' ) );
+add_filter('post_class', array('Sensei_Lesson', 'single_course_lessons_classes'));
 
 // @since 1.9.0
 // lesson meta information on the single course page
-add_action( 'sensei_single_course_inside_before_lesson', array('Sensei_Lesson','the_lesson_meta') , 5);
+add_action('sensei_single_course_inside_before_lesson', array('Sensei_Lesson', 'the_lesson_meta'), 5);
 
 //@since 1.9.0
 // lesson image
-add_action( 'sensei_single_course_inside_before_lesson', array('Sensei_Lesson','the_lesson_thumbnail') , 8);
+add_action('sensei_single_course_inside_before_lesson', array('Sensei_Lesson', 'the_lesson_thumbnail'), 8);
 
 //@since 1.9.0
 // lesson custom excerpts
-add_filter( 'get_the_excerpt', array( 'Sensei_Lesson', 'alter_the_lesson_excerpt' ) );
+add_filter('get_the_excerpt', array('Sensei_Lesson', 'alter_the_lesson_excerpt'));
 
 // @since 1.9.0
 // run a deprecated hook for backwards compatibility sake
-add_action( 'sensei_single_course_modules_before', array( 'Sensei_Core_Modules', 'deprecate_sensei_single_course_modules_content'  ) );
+add_action('sensei_single_course_modules_before', array('Sensei_Core_Modules', 'deprecate_sensei_single_course_modules_content'));
 
 // @since 1.9.0
 // hook in the module loop intialization functionality
-add_action( 'sensei_single_course_modules_before', array( 'Sensei_Core_Modules', 'setup_single_course_module_loop' ) );
+add_action('sensei_single_course_modules_before', array('Sensei_Core_Modules', 'setup_single_course_module_loop'));
 
 // @since 1.9.0
 // hook in the module loop destructor functionality
-add_action( 'sensei_single_course_modules_after', array( 'Sensei_Core_Modules', 'teardown_single_course_module_loop' ) );
+add_action('sensei_single_course_modules_after', array('Sensei_Core_Modules', 'teardown_single_course_module_loop'));
 
 // @since 1.9.0
 // hook in the possible full content override to show instead of excerpt
-add_filter('get_the_excerpt', array( 'Sensei_Course', 'full_content_excerpt_override' ) );
+add_filter('get_the_excerpt', array('Sensei_Course', 'full_content_excerpt_override'));
 
 //@since 1.9.0
 //Course meta
-add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Course', 'the_course_enrolment_actions' ), 30 );
-add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Course' , 'the_course_video' ), 40 );
+add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_course_enrolment_actions'), 30);
+add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_course_video'), 40);
 
 /***************************
  *
@@ -153,54 +153,54 @@ 
  ***************************/
 //@since 1.9.0
 // deprecate hooks no longer needed
-add_action( 'sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_single_main_content_hook' ) );
-add_action( 'sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_quiz_single_title_hook' ) );
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_single_main_content_hook'));
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_quiz_single_title_hook'));
 
 //@since 1.9.0
 // Single quiz title
-add_filter( 'the_title', array( 'Sensei_Quiz' , 'single_quiz_title' ), 20 , 2 ); // append Quiz
-add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'the_title' ), 20 ); //output single quiz
+add_filter('the_title', array('Sensei_Quiz', 'single_quiz_title'), 20, 2); // append Quiz
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'the_title'), 20); //output single quiz
 
 // since 1.9.0
 // initialize the quiz questions loop
-add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'start_quiz_questions_loop') );
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'start_quiz_questions_loop'));
 
 // since 1.9.0
 // hook in the quiz user message
-add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'the_user_status_message' ), 40 );
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'the_user_status_message'), 40);
 
 //@since 1.9.0
 // hook in the question title, description and quesiton media
-add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_title' ), 10 );
-add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_description' ), 20 );
-add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_media' ), 30 );
-add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_hidden_fields' ), 40 );
+add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_title'), 10);
+add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_description'), 20);
+add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_media'), 30);
+add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_hidden_fields'), 40);
 
 //@since 1.9.0
 // hook in incorrect / correct message above questions if the quiz has been graded
-add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question', 'the_answer_result_indication' ), 50 );
+add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_answer_result_indication'), 50);
 
 //@since 1.9.0
 // add answer grading feedback at the bottom of the question
-add_action( 'sensei_quiz_question_inside_after', array( 'Sensei_Question', 'answer_feedback_notes' ) );
+add_action('sensei_quiz_question_inside_after', array('Sensei_Question', 'answer_feedback_notes'));
 
 //@since 1.9.0
 // add extra question data for different quesiton types when get_question_template_data_is_called.
-add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','multiple_choice_load_question_data'), 10, 3);
-add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','gap_fill_load_question_data'), 10, 3);
-add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','file_upload_load_question_data'), 10, 3);
+add_filter('sensei_get_question_template_data', array('Sensei_Question', 'multiple_choice_load_question_data'), 10, 3);
+add_filter('sensei_get_question_template_data', array('Sensei_Question', 'gap_fill_load_question_data'), 10, 3);
+add_filter('sensei_get_question_template_data', array('Sensei_Question', 'file_upload_load_question_data'), 10, 3);
 
 //@since 1.9.0
 // deprecate the quiz button action
-add_action( 'sensei_single_quiz_questions_after', array( 'Sensei_Quiz', 'action_buttons' ), 10, 0 );
+add_action('sensei_single_quiz_questions_after', array('Sensei_Quiz', 'action_buttons'), 10, 0);
 
 //@since 1.9.0
 // deprecate the sensei_complete_quiz hook
-add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_complete_quiz_action' ));
+add_action('sensei_single_quiz_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_complete_quiz_action'));
 
 //@since 1.9.0
 // deprecate the sensei_quiz_question_type hook
-add_action( 'sensei_quiz_question_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_quiz_question_type_action' ));
+add_action('sensei_quiz_question_inside_after', array('Sensei_Templates', 'deprecate_sensei_quiz_question_type_action'));
 
 /***************************
  *
@@ -211,63 +211,63 @@ 
  ***************************/
 //@since 1.9.0
 // deprecate the main content hook on the single lesson page
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates', 'deprecate_lesson_single_main_content_hook' ), 20);
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_lesson_single_main_content_hook'), 20);
 
 //@since 1.9.0
 // hook in the lesson image on the single lesson
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'the_lesson_image' ), 17 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'the_lesson_image'), 17);
 
 //@since 1.9.0
 // hook in the lesson image on the single lesson deprecated hook function
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates','deprecate_lesson_image_hook' ), 10 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_lesson_image_hook'), 10);
 
 //@since 1.9.0
 // hook in the lesson single title deprecated function
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_lesson_single_title' ), 15 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_lesson_single_title'), 15);
 
 // @since 1.9.0
 // hook in the sensei lesson user notices
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'user_not_taking_course_message' ), 15 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'user_not_taking_course_message'), 15);
 
 // @since 1.9.0
 // attach the lesson title
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'the_title' ), 15 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'the_title'), 15);
 
 //@since 1.9.0
 // hook in the lesson image on the single lesson
-add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'user_lesson_quiz_status_message' ), 20 );
+add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'user_lesson_quiz_status_message'), 20);
 
 // @since 1.9.0
 // add the single lesson meta
-add_action( 'sensei_single_lesson_content_inside_after', 'sensei_the_single_lesson_meta', 10 );
+add_action('sensei_single_lesson_content_inside_after', 'sensei_the_single_lesson_meta', 10);
 
 // @since 1.9.0
 // deprecate the sensei_lesson_single_meta hook
-add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_lesson_single_meta_hook' ), 15 );
+add_action('sensei_single_lesson_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_lesson_single_meta_hook'), 15);
 
 // @since 1.9.0
 // deprecate the sensei_lesson_course_signup hook
-add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Templates','deprecate_sensei_lesson_course_signup_hook' ), 20 );
+add_action('sensei_single_lesson_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_lesson_course_signup_hook'), 20);
 
 // @since 1.9.0
 // hook in the lesson prerequisite completion message
-add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Lesson', 'prerequisite_complete_message' ), 20 );
+add_action('sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'prerequisite_complete_message'), 20);
 
 // @since 1.9.0
 // hook the single lesson course_signup_link
-add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Lesson', 'course_signup_link' ), 30 );
+add_action('sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'course_signup_link'), 30);
 
 // @since 1.9.0
 // hook the deprecate breadcrumbs and comments hooks
-add_action( 'sensei_after_main_content', array( 'Sensei_Templates', 'deprecate_single_lesson_breadcrumbs_and_comments_hooks'), 5 );
+add_action('sensei_after_main_content', array('Sensei_Templates', 'deprecate_single_lesson_breadcrumbs_and_comments_hooks'), 5);
 
 // @since 1.9.0
 // Add the quiz specific buttons and notices to the lesson
-add_action( 'sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'footer_quiz_call_to_action' ));
+add_action('sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'footer_quiz_call_to_action'));
 
 // @since 1.9.0
 // hook in the comments on the single lessons page
-add_action( 'sensei_pagination', array( 'Sensei_Lesson', 'output_comments' ), 90 );
+add_action('sensei_pagination', array('Sensei_Lesson', 'output_comments'), 90);
 
 /**********************
  *
@@ -277,9 +277,9 @@ 
  *
  ************************/
 
-add_action( 'sensei_single_message_content_inside_before', array( 'Sensei_Messages', 'the_title' ), 20 );
+add_action('sensei_single_message_content_inside_before', array('Sensei_Messages', 'the_title'), 20);
 
-add_action( 'sensei_single_message_content_inside_before', array( 'Sensei_Messages', 'the_message_sent_by_title' ), 40 );
+add_action('sensei_single_message_content_inside_before', array('Sensei_Messages', 'the_message_sent_by_title'), 40);
 
 /*************************
  *
@@ -291,15 +291,15 @@ 
 
 // deprecate the sensei_lesson_archive_header hook
 // @deprecated since 1.9.0
-add_action( 'sensei_loop_lesson_inside_before', array( 'Sensei_Lesson', 'deprecate_sensei_lesson_archive_header_hook' ), 20 );
+add_action('sensei_loop_lesson_inside_before', array('Sensei_Lesson', 'deprecate_sensei_lesson_archive_header_hook'), 20);
 
 // @1.9.0
 //The archive title header on the lesson archive loop
-add_action( 'sensei_loop_lesson_inside_before', array( Sensei()->lesson, 'the_archive_header' ), 20 );
+add_action('sensei_loop_lesson_inside_before', array(Sensei()->lesson, 'the_archive_header'), 20);
 
 // @since 1.9.0
 //Output the lesson header on the content-lesson.php which runs inside the lessons loop
-add_action( 'sensei_content_lesson_inside_before', array( 'Sensei_Lesson', 'the_lesson_meta' ), 20 );
+add_action('sensei_content_lesson_inside_before', array('Sensei_Lesson', 'the_lesson_meta'), 20);
 
 /**************************
  *
@@ -310,15 +310,15 @@ 
  **************************/
 // @since 1.9.0
 // deprecate the learner profile content hook as the markup code is added in the template directly.
-add_action('sensei_learner_profile_content_before', array( 'Sensei_Learner_Profiles', 'deprecate_sensei_learner_profile_content_hook' ) );
+add_action('sensei_learner_profile_content_before', array('Sensei_Learner_Profiles', 'deprecate_sensei_learner_profile_content_hook'));
 
 // @since 1.9.0
 // do the sensei complete course action on the learner profiles page.
-add_action('sensei_learner_profile_content_before', array( 'Sensei_Templates', 'fire_sensei_complete_course_hook' ) );
+add_action('sensei_learner_profile_content_before', array('Sensei_Templates', 'fire_sensei_complete_course_hook'));
 
 // @since 1.9.0
 // fire the frontend messages hook before the profile content
-add_action('sensei_learner_profile_inside_content_before', array( 'Sensei_Templates', 'fire_frontend_messages_hook' ) );
+add_action('sensei_learner_profile_inside_content_before', array('Sensei_Templates', 'fire_frontend_messages_hook'));
 
 
 /**********************************
@@ -331,26 +331,26 @@ 
 
 // @since 1.9.0
 // fire the deprecated hook function within the course-result.php file
-add_action( 'sensei_course_results_content_before', array('Sensei_Course_Results','deprecate_sensei_course_results_content_hook') );
+add_action('sensei_course_results_content_before', array('Sensei_Course_Results', 'deprecate_sensei_course_results_content_hook'));
 
 // @since 1.9.0
 // fire the sensei message hooke inside the course-result.php file
-add_action( 'sensei_course_results_content_inside_before', array('Sensei_Course_Results','fire_sensei_message_hook') );
+add_action('sensei_course_results_content_inside_before', array('Sensei_Course_Results', 'fire_sensei_message_hook'));
 
 // @since 1.9.0
 // load the course information on the course results page
-add_action( 'sensei_course_results_content_inside_before_lessons', array( Sensei()->course_results,'course_info') );
+add_action('sensei_course_results_content_inside_before_lessons', array(Sensei()->course_results, 'course_info'));
 
 // @since 1.9.0
-add_action( 'sensei_course_results_content_inside_before', array( Sensei()->course,'course_image') );
+add_action('sensei_course_results_content_inside_before', array(Sensei()->course, 'course_image'));
 
 // @since 1.9.0
 // deprecate the course results top hook in favour of a new hook
-add_action( 'sensei_course_results_content_inside_before', array( 'Sensei_Course_Results', 'deprecate_course_results_top_hook') );
+add_action('sensei_course_results_content_inside_before', array('Sensei_Course_Results', 'deprecate_course_results_top_hook'));
 
 // @since 1.9.0
 // Fire the course image hook within the course results page
-add_action( 'sensei_course_results_content_inside_before', array( 'Sensei_Course_Results', 'fire_course_image_hook') );
+add_action('sensei_course_results_content_inside_before', array('Sensei_Course_Results', 'fire_course_image_hook'));
 
 
 /**********************************
@@ -362,19 +362,19 @@ 
  ********************************/
 // @since 1.9.0
 // fire the sensei complete course action on the my courses template
-add_action( 'sensei_my_courses_before', array( 'Sensei_Templates', 'fire_sensei_complete_course_hook' ) );
+add_action('sensei_my_courses_before', array('Sensei_Templates', 'fire_sensei_complete_course_hook'));
 
 // @since 1.9.0
 // fire the sensei frontend messages hook before the my-courses content
-add_action('sensei_my_courses_content_inside_before', array( 'Sensei_Templates', 'fire_frontend_messages_hook' ) );
+add_action('sensei_my_courses_content_inside_before', array('Sensei_Templates', 'fire_frontend_messages_hook'));
 
 // @since 1.9.0
 // deprecate the sensei_before_user_course_content hook
-add_action('sensei_my_courses_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_before_user_course_content_hook' ) );
+add_action('sensei_my_courses_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_before_user_course_content_hook'));
 
 // @since 1.9.0
 // deprecate the sensei_after_user_course_content hook
-add_action('sensei_my_courses_content_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_after_user_course_content_hook' ) );
+add_action('sensei_my_courses_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_after_user_course_content_hook'));
 
 /**********************************
  *
@@ -386,7 +386,7 @@ 
 // @since 1.9.0
 // deprecate the sensei_login_form hok which was use to load the login form.
 // This now loads independent of the my-courses template which helps keep templates free from logic
-add_action( 'sensei_login_form_before', array( 'Sensei_Templates', 'deprecate_sensei_login_form_hook' ) );
+add_action('sensei_login_form_before', array('Sensei_Templates', 'deprecate_sensei_login_form_hook'));
 
 /**********************************
  *
@@ -397,16 +397,16 @@ 
  ********************************/
 // @since 1.9.0
 // Deprecate the archive messages hooks no longer supported
-add_action( 'sensei_archive_before_message_loop', array( 'Sensei_Templates', 'deprecated_archive_message_hooks' ) );
+add_action('sensei_archive_before_message_loop', array('Sensei_Templates', 'deprecated_archive_message_hooks'));
 
 // @since 1.9.0
 // Deprecate the archive messages hooks no longer supported
-add_action( 'sensei_archive_before_message_loop', array( 'Sensei_Messages', 'the_archive_header' ) );
+add_action('sensei_archive_before_message_loop', array('Sensei_Messages', 'the_archive_header'));
 
 // @since 1.9.0
 // output the message title and the message sensei
-add_action( 'sensei_content_message_before', array( 'Sensei_Messages', 'the_message_title' ), 10, 1 );
-add_action( 'sensei_content_message_before', array( 'Sensei_Messages', 'the_message_sender' ), 20 , 1 );
+add_action('sensei_content_message_before', array('Sensei_Messages', 'the_message_title'), 10, 1);
+add_action('sensei_content_message_before', array('Sensei_Messages', 'the_message_sender'), 20, 1);
 
 /**********************************
  *
@@ -415,7 +415,7 @@ 
  *
  *
  **********************************/
-add_action( 'sensei_loop_course_before', array( 'Sensei_Course', 'course_category_title' ), 70 , 1 );
+add_action('sensei_loop_course_before', array('Sensei_Course', 'course_category_title'), 70, 1);
 
 /**********************************
  *
@@ -426,9 +426,9 @@ 
  **********************************/
 //@since 1.9.0
 //add a title to the teacher archive page when viewn siteurl/author/{teacher-username}
-add_action( 'sensei_teacher_archive_course_loop_before', array( 'Sensei_Teacher', 'archive_title' ) );
+add_action('sensei_teacher_archive_course_loop_before', array('Sensei_Teacher', 'archive_title'));
 
 //@since 1.9.0
 // remove course meta from the teacher page until it can be refactored to allow only removing the
 // teacher name and not all lessons
-add_action( 'sensei_teacher_archive_course_loop_before', array( 'Sensei_Teacher', 'remove_course_meta_on_teacher_archive' ) );
+add_action('sensei_teacher_archive_course_loop_before', array('Sensei_Teacher', 'remove_course_meta_on_teacher_archive'));

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

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  * This class is loaded int WP by the shortcode loader class.
  *
@@ -61,28 +61,28 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        if(!  is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             // show the login form
             Sensei_Templates::get_template('user/login-form.php');
             return;
         }
 
         // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-        $this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '10';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'title';
+        $this->status = isset($attributes['status']) ? $attributes['status'] : 'all';
 
         // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+        if ('menu_order' == $this->orderby && ! isset($attributes['order'])) {
 
-            $this->order =  'ASC';
+            $this->order = 'ASC';
 
-        }else{
+        } else {
 
             // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
+            $this->order = isset($attributes['order']) ? $attributes['order'] : 'ASC';
 
         }
 
@@ -96,20 +96,20 @@ 
      *
      * @since 1.9.0
      */
-    protected function setup_course_query(){
+    protected function setup_course_query() {
 
-        $status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
-        $user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
-        if ( !is_array($user_courses_logs) ) {
+        $status_query = array('user_id' => get_current_user_id(), 'type' => 'sensei_course_status');
+        $user_courses_logs = Sensei_Utils::sensei_check_for_activity($status_query, true);
+        if ( ! is_array($user_courses_logs)) {
 
-            $user_courses_logs = array( $user_courses_logs );
+            $user_courses_logs = array($user_courses_logs);
 
         }
 
         $completed_ids = $active_ids = array();
-        foreach( $user_courses_logs as $course_status ) {
+        foreach ($user_courses_logs as $course_status) {
 
-            if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
+            if (Sensei_Utils::user_completed_course($course_status, get_current_user_id())) {
 
                 $completed_ids[] = $course_status->comment_post_ID;
 
@@ -120,34 +120,34 @@ 
             }
         }
 
-        if( 'completed' == $this->status ){
+        if ('completed' == $this->status) {
 
-            $included_courses =  $completed_ids;
+            $included_courses = $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+        }elseif ('active' == $this->status) {
 
-            $included_courses =  $active_ids;
+            $included_courses = $active_ids;
 
-        }else{ // all courses
+        } else { // all courses
 
-            if( empty( $completed_ids ) ){
+            if (empty($completed_ids)) {
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
+                add_action('sensei_loop_course_inside_before', array($this, 'completed_no_course_message_output'));
             }
 
-            if( empty( $active_ids ) ){
+            if (empty($active_ids)) {
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
+                add_action('sensei_loop_course_inside_before', array($this, 'active_no_course_message_output'));
 
             }
 
-            if( empty( $completed_ids ) &&  empty( $active_ids )  ){
+            if (empty($completed_ids) && empty($active_ids)) {
 
                 $included_courses = array('-1000'); // don't show any courses
 
-            }else{
-                $included_courses = Sensei_Utils::array_zip_merge( (array)$active_ids, (array)$completed_ids );
+            } else {
+                $included_courses = Sensei_Utils::array_zip_merge((array) $active_ids, (array) $completed_ids);
             }
 
 
@@ -158,7 +158,7 @@ 
         // if the shortcode is not active or in active and the active and completed
         // tabs show up.
         $number_of_posts = $this->number;
-        if( 'active' != $this->status && 'complete' != $this->status  ){
+        if ('active' != $this->status && 'complete' != $this->status) {
             $number_of_posts = 1000;
         }
 
@@ -169,12 +169,12 @@ 
             'post_status'      => 'publish',
             'orderby'          => $this->orderby,
             'order'            => $this->order,
-            'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
+            'paged' => empty($query_var_paged) ? 1 : $query_var_paged,
             'posts_per_page'   => $number_of_posts,
             'post__in'         => $included_courses,
         );
 
-        $this->query = new WP_Query( $query_args );
+        $this->query = new WP_Query($query_args);
 
     }// end setup _course_query
 
@@ -184,12 +184,12 @@ 
      *
      * @since 1.9.0
      */
-    public function completed_no_course_message_output(){
+    public function completed_no_course_message_output() {
         ?>
         <li class="user-completed">
             <div class="sensei-message info">
 
-                <?php _e( 'You have not completed any courses yet.', 'woothemes-sensei' ); ?>
+                <?php _e('You have not completed any courses yet.', 'woothemes-sensei'); ?>
 
             </div>
         </li>
@@ -202,17 +202,17 @@ 
      *
      * @since 1.9.0
      */
-    public function active_no_course_message_output(){
+    public function active_no_course_message_output() {
         ?>
 
         <li class="user-active">
             <div class="sensei-message info">
 
-                <?php _e( 'You have no active courses.', 'woothemes-sensei' ); ?>
+                <?php _e('You have no active courses.', 'woothemes-sensei'); ?>
 
-                <a href="<?php esc_attr_e( Sensei_Course::get_courses_page_url() ); ?>">
+                <a href="<?php esc_attr_e(Sensei_Course::get_courses_page_url()); ?>">
 
-                    <?php  _e( 'Start a Course!', 'woothemes-sensei' ); ?>
+                    <?php  _e('Start a Course!', 'woothemes-sensei'); ?>
 
                 </a>
 
@@ -226,11 +226,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
         global $wp_query;
 
-        if(!  is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
             return '';
         }
 
@@ -249,7 +249,7 @@ 
         Sensei_Templates::get_template('globals/pagination.php');
         echo '</section>';
 
-        $shortcode_output =  ob_get_clean();
+        $shortcode_output = ob_get_clean();
 
         $this->detach_shortcode_hooks();
 
@@ -265,23 +265,23 @@ 
      *
      * @since 1.9.0
      */
-    public function attach_shortcode_hooks(){
+    public function attach_shortcode_hooks() {
 
         // attach the toggle functionality
         // don't show the toggle action if the user specified complete or active for this shortcode
-        if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
+        if ( ! in_array($this->status, array('active', 'complete'))) {
 
-            add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-            add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
+            add_action('sensei_loop_course_before', array($this, 'course_toggle_actions'));
+            add_action('wp_footer', array($this, 'print_course_toggle_actions_inline_script'), 90);
 
         }
 
         // add extra classes to distinguish the course based on user completed or active
-        add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+        add_filter('sensei_course_loop_content_class', array($this, 'course_status_class_tagging'), 20, 2);
 
         // attach progress meter below course
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+        add_action('sensei_course_content_inside_after', array($this, 'attach_course_progress'));
+        add_action('sensei_course_content_inside_after', array($this, 'attach_course_buttons'));
 
     }
 
@@ -290,13 +290,13 @@ 
      *
      * @since 1.9.0
      */
-    public function detach_shortcode_hooks(){
+    public function detach_shortcode_hooks() {
 
         //remove all hooks after the output is generated
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
-        remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
-        remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+        remove_action('sensei_course_content_inside_after', array($this, 'attach_course_progress'));
+        remove_action('sensei_course_content_inside_after', array($this, 'attach_course_buttons'));
+        remove_filter('sensei_course_loop_content_class', array($this, 'course_status_class_tagging'), 20, 2);
+        remove_action('sensei_loop_course_before', array($this, 'course_toggle_actions'));
     }
 
     /**
@@ -304,10 +304,10 @@ 
      *
      * @param $course
      */
-    public function attach_course_progress( $course_id ){
+    public function attach_course_progress($course_id) {
 
-        $percentage = Sensei()->course->get_completion_percentage( $course_id, get_current_user_id() );
-        echo Sensei()->course->get_progress_meter( $percentage );
+        $percentage = Sensei()->course->get_completion_percentage($course_id, get_current_user_id());
+        echo Sensei()->course->get_progress_meter($percentage);
 
     }// attach_course_progress
 
@@ -319,9 +319,9 @@ 
      *
      * @param integer $course_id
      */
-    public function attach_course_buttons( $course_id ){
+    public function attach_course_buttons($course_id) {
 
-        Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
+        Sensei()->course->the_course_action_buttons(get_post($course_id));
 
     }// attach_course_buttons
 
@@ -334,9 +334,9 @@ 
      * @param WP_Post $course
      * @return array $classes
      */
-    public function course_status_class_tagging($classes, $course){
+    public function course_status_class_tagging($classes, $course) {
 
-        if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
+        if (Sensei_Utils::user_completed_course($course, get_current_user_id())) {
 
             $classes[] = 'user-completed';
 
@@ -353,7 +353,7 @@ 
     /**
      * Output the course toggle functionality
      */
-    public function course_toggle_actions(){ ?>
+    public function course_toggle_actions() { ?>
 
         <section id="user-course-status-toggle">
             <a id="sensei-user-courses-active-action" href=""><?php _e('Active Courses'); ?></a>

includes/shortcodes/class-sensei-legacy-shortcodes.php

Spacing +79 added lines, -79 removed lines

@@ -22,14 +22,14 @@ 
      *
      * @since 1.9.0
      */
-    public static function init(){
+    public static function init() {
 
-        add_shortcode( 'allcourses',      array( __CLASS__, 'all_courses' ) );
-        add_shortcode( 'newcourses',      array( __CLASS__,'new_courses' ) );
-        add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') );
-        add_shortcode( 'freecourses',     array( __CLASS__,'free_courses') );
-        add_shortcode( 'paidcourses',     array( __CLASS__,'paid_courses') );
-        add_shortcode( 'usercourses',     array( __CLASS__,'user_courses' ) );
+        add_shortcode('allcourses', array(__CLASS__, 'all_courses'));
+        add_shortcode('newcourses', array(__CLASS__, 'new_courses'));
+        add_shortcode('featuredcourses', array(__CLASS__, 'featured_courses'));
+        add_shortcode('freecourses', array(__CLASS__, 'free_courses'));
+        add_shortcode('paidcourses', array(__CLASS__, 'paid_courses'));
+        add_shortcode('usercourses', array(__CLASS__, 'user_courses'));
 
     }
     /**
@@ -42,9 +42,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function all_courses( $atts, $content = null ) {
+    public static function all_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title
+        return self::generate_shortcode_courses('', 'allcourses'); // all courses but no title
 
     } // all_courses()
 
@@ -56,9 +56,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function paid_courses( $atts, $content = null ) {
+    public static function paid_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Paid Courses', 'paidcourses' );
+        return self::generate_shortcode_courses('Paid Courses', 'paidcourses');
 
     } // End paid_courses()
 
@@ -71,9 +71,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function featured_courses( $atts, $content = null ) {
+    public static function featured_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Featured Courses', 'featuredcourses' );
+        return self::generate_shortcode_courses('Featured Courses', 'featuredcourses');
 
     } // End featured_courses()
 
@@ -85,9 +85,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function free_courses( $atts, $content = null ) {
+    public static function free_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'Free Courses', 'freecourses' );
+        return self::generate_shortcode_courses('Free Courses', 'freecourses');
 
     } // End free_courses()
 
@@ -99,9 +99,9 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function new_courses( $atts, $content = null ) {
+    public static function new_courses($atts, $content = null) {
 
-        return self::generate_shortcode_courses( 'New Courses', 'newcourses' );
+        return self::generate_shortcode_courses('New Courses', 'newcourses');
 
     } // End new_courses()
 
@@ -114,7 +114,7 @@ 
      * @param $shortcode_specific_override
      * @return string
      */
-    public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){
+    public static function generate_shortcode_courses($title, $shortcode_specific_override) {
 
         global  $shortcode_override, $posts_array;
 
@@ -122,9 +122,9 @@ 
 
         // do not show this short code if there is a shortcode int he url and
         // this specific shortcode is not the one requested in the ur.
-        $specific_shortcode_requested = isset( $_GET['action'] ) ?  sanitize_text_field(  $_GET['action']  ) : '';
-        if( ! empty( $specific_shortcode_requested) &&
-            $specific_shortcode_requested != $shortcode_override ){
+        $specific_shortcode_requested = isset($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+        if ( ! empty($specific_shortcode_requested) &&
+            $specific_shortcode_requested != $shortcode_override) {
 
             return '';
 
@@ -136,15 +136,15 @@ 
         $courses = ob_get_clean();
 
         $content = '';
-        if( count( $posts_array ) > 0 ){
+        if (count($posts_array) > 0) {
 
-            $before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>';
+            $before = empty($title) ? '' : '<header class="archive-header"><h2>'.$title.'</h2></header>';
             $before .= '<section id="main-course" class="course-container">';
 
             $after = '</section>';
 
             //assemble
-            $content = $before . $courses . $after;
+            $content = $before.$courses.$after;
 
         }
 
@@ -161,19 +161,19 @@ 
      * @param mixed $content (default: null)
      * @return string
      */
-    public static function user_courses( $atts, $content = null ) {
+    public static function user_courses($atts, $content = null) {
         global $shortcode_override;
-        extract( shortcode_atts( array(	'amount' => 0 ), $atts ) );
+        extract(shortcode_atts(array('amount' => 0), $atts));
 
         $shortcode_override = 'usercourses';
 
         ob_start();
 
-        if( is_user_logged_in() ){
+        if (is_user_logged_in()) {
 
-            Sensei_Templates::get_template( 'user/my-courses.php' );
+            Sensei_Templates::get_template('user/my-courses.php');
 
-        }else{
+        } else {
 
             Sensei()->frontend->sensei_login_form();
 
@@ -189,54 +189,54 @@ 
      * loop-course.php for the old shortcodes.
      * @since 1.9.0
      */
-    public static function initialise_legacy_course_loop(){
+    public static function initialise_legacy_course_loop() {
 
         global  $post, $wp_query, $shortcode_override, $course_excludes;
 
         // Handle Query Type
         $query_type = '';
 
-        if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) {
-            $query_type = esc_html( $_GET[ 'action' ] );
+        if (isset($_GET['action']) && ('' != esc_html($_GET['action']))) {
+            $query_type = esc_html($_GET['action']);
         } // End If Statement
 
-        if ( '' != $shortcode_override ) {
+        if ('' != $shortcode_override) {
             $query_type = $shortcode_override;
         } // End If Statement
 
-        if ( !is_array( $course_excludes ) ) { $course_excludes = array(); }
+        if ( ! is_array($course_excludes)) { $course_excludes = array(); }
 
         // Check that query returns results
         // Handle Pagination
-        $paged = $wp_query->get( 'paged' );
-        $paged = empty( $paged ) ? 1 : $paged;
+        $paged = $wp_query->get('paged');
+        $paged = empty($paged) ? 1 : $paged;
 
 
         // Check for pagination settings
-        if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) {
+        if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) {
 
-            $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] );
+            $amount = absint(Sensei()->settings->settings['course_archive_amount']);
 
         } else {
 
-            $amount = $wp_query->get( 'posts_per_page' );
+            $amount = $wp_query->get('posts_per_page');
 
         } // End If Statement
 
         // This is not a paginated page (or it's simply the first page of a paginated page/post)
 
         global $posts_array;
-        $course_includes   = array();
+        $course_includes = array();
 
-        $query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes );
-        $course_query = new WP_Query( $query_args );
+        $query_args = Sensei()->course->get_archive_query_args($shortcode_override, $amount, $course_includes, $course_excludes);
+        $course_query = new WP_Query($query_args);
         $posts_array = $course_query->get_posts();
 
         // output the courses
-        if( ! empty( $posts_array ) ) {
+        if ( ! empty($posts_array)) {
 
             //output all courses for current query
-            self::loop_courses( $course_query, $amount );
+            self::loop_courses($course_query, $amount);
 
         }
 
@@ -249,31 +249,31 @@ 
      *
      * @param WP_Query $course_query
      */
-    public static function loop_courses( $course_query, $amount ){
+    public static function loop_courses($course_query, $amount) {
 
         global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes;
 
-        if ( count( $course_query->get_posts() ) > 0 ) {
+        if (count($course_query->get_posts()) > 0) {
 
-            do_action( 'sensei_course_archive_header', $shortcode_override );
+            do_action('sensei_course_archive_header', $shortcode_override);
 
-            foreach ( $course_query->get_posts() as $course){
+            foreach ($course_query->get_posts() as $course) {
 
                 // Make sure the other loops dont include the same post twice!
-                array_push( $course_excludes, $course->ID );
+                array_push($course_excludes, $course->ID);
 
                 // output the course markup
-                self::the_course( $course->ID );
+                self::the_course($course->ID);
 
             } // End For Loop
 
             // More and Prev links
-            $posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) );
+            $posts_array_query = new WP_Query(Sensei()->course->course_query($shortcode_override, $amount, $course_includes, $course_excludes));
             $posts_array       = $posts_array_query->get_posts();
             $max_pages = $course_query->found_posts / $amount;
-            if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) {
+            if ('' != $shortcode_override && ($max_pages > $course_query->get('paged'))) {
 
-                switch( $shortcode_override ){
+                switch ($shortcode_override) {
                     case 'paidcourses':
                         $filter = 'paid';
                         break;
@@ -289,22 +289,22 @@ 
                 }
 
                 $quer_args = array();
-                $quer_args[ 'paged' ] = '2';
-                if( !empty( $filter ) ){
-                    $quer_args[ 'course_filter' ] = $filter;
+                $quer_args['paged'] = '2';
+                if ( ! empty($filter)) {
+                    $quer_args['course_filter'] = $filter;
                 }
 
-                $course_pagination_link = get_post_type_archive_link( 'course' );
-                $more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] );
-                $more_link_url =  esc_url( add_query_arg( $quer_args, $course_pagination_link ) );
+                $course_pagination_link = get_post_type_archive_link('course');
+                $more_link_text = esc_html(Sensei()->settings->settings['course_archive_more_link_text']);
+                $more_link_url = esc_url(add_query_arg($quer_args, $course_pagination_link));
 
                 // next/more
                 $html  = '<div class="navigation"><div class="nav-next">';
-                $html .= '<a href="' . $more_link_url . '">';
+                $html .= '<a href="'.$more_link_url.'">';
                 $html .= $more_link_text;
                 $html .= '<span class="meta-nav"></span></a></div>';
 
-                echo apply_filters( 'course_archive_next_link', $html );
+                echo apply_filters('course_archive_next_link', $html);
 
             } // End If Statement
 
@@ -316,23 +316,23 @@ 
      *
      * @param $course_id
      */
-    public static function the_course( $course_id ){
+    public static function the_course($course_id) {
 
         // Get meta data
-        $course =  get_post( $course_id );
-        $user_info = get_userdata( absint( $course->post_author ) );
-        $author_link = get_author_posts_url( absint( $course->post_author ) );
+        $course = get_post($course_id);
+        $user_info = get_userdata(absint($course->post_author));
+        $author_link = get_author_posts_url(absint($course->post_author));
         $author_display_name = $user_info->display_name;
         $author_id = $course->post_author;
-        $category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' );
-        $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) );
-        $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() );
+        $category_output = get_the_term_list($course_id, 'course-category', '', ', ', '');
+        $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course_id));
+        $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id());
         ?>
 
-        <article class="<?php echo esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_id ) ) ); ?>">
+        <article class="<?php echo esc_attr(join(' ', get_post_class(array('course', 'post'), $course_id))); ?>">
             <?php
             // so that legacy shortcodes work with the party plugins that wants to hook in
-            do_action('sensei_course_content_before',$course->ID );
+            do_action('sensei_course_content_before', $course->ID);
             ?>
             <div class="course-content">
 
@@ -348,19 +348,19 @@ 
 
                     <p class="sensei-course-meta">
 
-                        <?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 $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 $author_link; ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span>
                         <?php } // End If Statement ?>
 
                         <span class="course-lesson-count">
-                                    <?php echo Sensei()->course->course_lesson_count( $course_id ) . '&nbsp;' .  __( 'Lessons', 'woothemes-sensei' ); ?>
+                                    <?php echo Sensei()->course->course_lesson_count($course_id).'&nbsp;'.__('Lessons', 'woothemes-sensei'); ?>
                                 </span>
 
-                        <?php if ( '' != $category_output ) { ?>
-                            <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span>
+                        <?php if ('' != $category_output) { ?>
+                            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span>
                         <?php } // End If Statement ?>
 
-                        <?php sensei_simple_course_price( $course_id ); ?>
+                        <?php sensei_simple_course_price($course_id); ?>
 
                     </p>
 
@@ -368,10 +368,10 @@ 
 
                     </p>
 
-                    <?php if ( 0 < $preview_lesson_count && !$is_user_taking_course ) {
-                        $preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?>
+                    <?php if (0 < $preview_lesson_count && ! $is_user_taking_course) {
+                        $preview_lessons = sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?>
                         <p class="sensei-free-lessons">
-                            <a href="<?php echo get_permalink( $course_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?>
+                            <a href="<?php echo get_permalink($course_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?>
                             </a> - <?php echo $preview_lessons; ?>
                         </p>
                     <?php } ?>

includes/class-sensei-quiz.php

Spacing +286 added lines, -286 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Quiz Class
@@ -22,25 +22,25 @@ 
 	 *
 	 * @param $file
 	 */
-	public function __construct ( $file = __FILE__ ) {
+	public function __construct($file = __FILE__) {
 		$this->file = $file;
         $this->token = 'quiz';
-		$this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' );
-		add_action( 'save_post', array( $this, 'update_author' ));
+		$this->meta_fields = array('quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required', 'enable_quiz_reset');
+		add_action('save_post', array($this, 'update_author'));
 
 		// listen to the reset button click
-		add_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
+		add_action('template_redirect', array($this, 'reset_button_click_listener'));
 
         // fire the complete quiz button submit for grading action
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
+        add_action('sensei_single_quiz_content_inside_before', array($this, 'user_quiz_submit_listener'));
 
 		// fire the save user answers quiz button click responder
-		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_save_quiz_answers_listener' ) );
+		add_action('sensei_single_quiz_content_inside_before', array($this, 'user_save_quiz_answers_listener'));
 
         // fire the load global data function
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
+        add_action('sensei_single_quiz_content_inside_before', array($this, 'load_global_quiz_data'), 80);
 
-        add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
+        add_action('template_redirect', array($this, 'quiz_has_no_questions'));
 
 
     } // End __construct()
@@ -51,25 +51,25 @@ 
 	* @param int $post_id
 	* @return void
 	*/
-	public function update_author( $post_id ){
+	public function update_author($post_id) {
 
 		// If this isn't a 'lesson' post, don't update it.
         // if this is a revision don't save it
-	    if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
-            || wp_is_post_revision( $post_id ) ) {
+	    if (isset($_POST['post_type']) && 'lesson' != $_POST['post_type']
+            || wp_is_post_revision($post_id)) {
 
                 return;
 
         }
 	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+	    $saved_post = get_post($post_id);
+	    $new_lesson_author_id = $saved_post->post_author;
 
 	    //get the lessons quiz
-		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		$lesson_quizzes = Sensei()->lesson->lesson_quizzes($post_id);
+	    foreach ((array) $lesson_quizzes as $quiz_item) {
 
-	    	if( ! $quiz_item ) {
+	    	if ( ! $quiz_item) {
 	    		continue;
 	    	}
 
@@ -80,10 +80,10 @@ 
 			);
 
             // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+            remove_action('save_post', array($this, 'update_author'));
 
 			// Update the post into the database
-		  	wp_update_post( $my_post );
+		  	wp_update_post($my_post);
 	    }
 
 	    return;
@@ -97,19 +97,19 @@ 
 	 * @param int $quiz_id
 	 * @return int @lesson_id
 	 */
-	public function get_lesson_id( $quiz_id ){
+	public function get_lesson_id($quiz_id) {
 
-		if( empty( $quiz_id ) || ! intval( $quiz_id ) > 0 ){
+		if (empty($quiz_id) || ! intval($quiz_id) > 0) {
 			global $post;
-			if( 'quiz' == get_post_type( $post ) ){
+			if ('quiz' == get_post_type($post)) {
 				$quiz_id = $post->ID;
-			}else{
+			} else {
 				return false;
 			}
 
 		}
 
-		$quiz = get_post( $quiz_id );
+		$quiz = get_post($quiz_id);
 		$lesson_id = $quiz->post_parent;
 
 		return $lesson_id;
@@ -124,23 +124,23 @@ 
      * @since 1.7.3
      * @return bool $saved;
      */
-    public function user_save_quiz_answers_listener(){
+    public function user_save_quiz_answers_listener() {
 
-        if( ! isset( $_POST[ 'quiz_save' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
+        if ( ! isset($_POST['quiz_save'])
+            || ! isset($_POST['sensei_question'])
+            || empty($_POST['sensei_question'])
+            ||  ! wp_verify_nonce($_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce') > 1) {
             return;
         }
 
         global $post;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+        $lesson_id = $this->get_lesson_id($post->ID);
+        $quiz_answers = $_POST['sensei_question'];
         // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+        self::save_user_answers($quiz_answers, $_FILES, $lesson_id, get_current_user_id());
 
         // remove the hook as it should only fire once per click
-        remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
+        remove_action('sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener');
 
     } // end user_save_quiz_answers_listener
 
@@ -159,17 +159,17 @@ 
 	 *
 	 * @return false or int $answers_saved
 	 */
-	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
+	public static function save_user_answers($quiz_answers, $files = array(), $lesson_id, $user_id = 0) {
 
-        if( ! ( $user_id > 0 ) ){
+        if ( ! ($user_id > 0)) {
             $user_id = get_current_user_id();
         }
 
         // make sure the parameters are valid before continuing
-		if( empty( $lesson_id ) || empty( $user_id )
-			|| 'lesson' != get_post_type( $lesson_id )
-			||!get_userdata( $user_id )
-			|| !is_array( $quiz_answers ) ){
+		if (empty($lesson_id) || empty($user_id)
+			|| 'lesson' != get_post_type($lesson_id)
+			||! get_userdata($user_id)
+			|| ! is_array($quiz_answers)) {
 
 			return false;
 
@@ -177,23 +177,23 @@ 
 
 
         // start the lesson before saving the data in case the user has not started the lesson
-        $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+        $activity_logged = Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
 
 		//prepare the answers
-		$prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files );
+		$prepared_answers = self::prepare_form_submitted_answers($quiz_answers, $files);
 
 		// save the user data
-        $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
+        $answers_saved = Sensei_Utils::add_user_data('quiz_answers', $lesson_id, $prepared_answers, $user_id);
 
 		// were the answers saved correctly?
-		if( intval( $answers_saved ) > 0){
+		if (intval($answers_saved) > 0) {
 
             // save transient to make retrieval faster
             $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+            set_transient($transient_key, $prepared_answers, 10 * DAY_IN_SECONDS);
 
             // update the message showed to user
-            Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+            Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Saved Successfully.', 'woothemes-sensei').'</div>';
         }
 
 		return $answers_saved;
@@ -215,41 +215,41 @@ 
 	 *
 	 * @return array $answers or false
 	 */
-	public function get_user_answers( $lesson_id, $user_id ){
+	public function get_user_answers($lesson_id, $user_id) {
 
 		$answers = false;
 
-		if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-		|| ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+		if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+		|| ! intval($user_id) > 0 || ! get_userdata($user_id)) {
 			return false;
 		}
 
         // save some time and get the transient cached data
         $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $transient_cached_answers = get_transient( $transient_key );
+        $transient_cached_answers = get_transient($transient_key);
 
         // return the transient or get the values get the values from the comment meta
-        if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
+        if ( ! empty($transient_cached_answers) && false != $transient_cached_answers) {
 
             $encoded_user_answers = $transient_cached_answers;
 
-        }else{
+        } else {
 
-            $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
+            $encoded_user_answers = Sensei_Utils::get_user_data('quiz_answers', $lesson_id, $user_id);
 
         } // end if transient check
 
-		if( ! is_array( $encoded_user_answers ) ){
+		if ( ! is_array($encoded_user_answers)) {
 			return false;
 		}
 
         //set the transient with the new valid data for faster retrieval in future
-        set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
+        set_transient($transient_key, $encoded_user_answers, 10 * DAY_IN_SECONDS);
 
 		// decode an unserialize all answers
-		foreach( $encoded_user_answers as $question_id => $encoded_answer ) {
-			$decoded_answer = base64_decode( $encoded_answer );
-			$answers[$question_id] = maybe_unserialize( $decoded_answer );
+		foreach ($encoded_user_answers as $question_id => $encoded_answer) {
+			$decoded_answer = base64_decode($encoded_answer);
+			$answers[$question_id] = maybe_unserialize($decoded_answer);
 		}
 
 		return $answers;
@@ -266,23 +266,23 @@ 
 	 *
 	 * @return void;
 	 */
-	public function reset_button_click_listener( ){
+	public function reset_button_click_listener( ) {
 
-		if( ! isset( $_POST[ 'quiz_reset' ])
-			||  ! wp_verify_nonce( $_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce'  ) > 1 ) {
+		if ( ! isset($_POST['quiz_reset'])
+			||  ! wp_verify_nonce($_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce') > 1) {
 
 			return; // exit
 		}
 
 		global $post;
 		$current_quiz_id = $post->ID;
-		$lesson_id = $this->get_lesson_id( $current_quiz_id );
+		$lesson_id = $this->get_lesson_id($current_quiz_id);
 
         // reset all user data
-        $this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
+        $this->reset_user_lesson_data($lesson_id, get_current_user_id());
 
 		//this function should only run once
-		remove_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
+		remove_action('template_redirect', array($this, 'reset_button_click_listener'));
 
 	} // end reset_button_click_listener
 
@@ -301,18 +301,18 @@ 
 	public function user_quiz_submit_listener() {
 
         // only respond to valid quiz completion submissions
-        if( ! isset( $_POST[ 'quiz_complete' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
+        if ( ! isset($_POST['quiz_complete'])
+            || ! isset($_POST['sensei_question'])
+            || empty($_POST['sensei_question'])
+            ||  ! wp_verify_nonce($_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce') > 1) {
             return;
         }
 
         global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+        $lesson_id = $this->get_lesson_id($post->ID);
+        $quiz_answers = $_POST['sensei_question'];
 
-        self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
+        self::submit_answers_for_grading($quiz_answers, $_FILES, $lesson_id, $current_user->ID);
 
 	} // End sensei_complete_quiz()
 
@@ -326,7 +326,7 @@ 
      * @access public
      *
      */
-    public function load_global_quiz_data(){
+    public function load_global_quiz_data() {
 
         global  $post, $current_user;
         $this->data = new stdClass();
@@ -335,46 +335,46 @@ 
         $grade = 0;
 
         // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($post->ID);
 
-        $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
+        $quiz_lesson_id = absint(get_post_meta($post->ID, '_quiz_lesson', true));
 
         // Get quiz grade type
-        $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
+        $quiz_grade_type = get_post_meta($post->ID, '_quiz_grade_type', true);
 
         // Get quiz pass setting
-        $pass_required = get_post_meta( $post->ID, '_pass_required', true );
+        $pass_required = get_post_meta($post->ID, '_pass_required', true);
 
         // Get quiz pass mark
-        $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
+        $quiz_passmark = abs(round(doubleval(get_post_meta($post->ID, '_quiz_passmark', true)), 2));
 
         // Get latest quiz answers and grades
-        $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
-        $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
+        $lesson_id = Sensei()->quiz->get_lesson_id($post->ID);
+        $user_quizzes = Sensei()->quiz->get_user_answers($lesson_id, get_current_user_id());
+        $user_lesson_status = Sensei_Utils::user_lesson_status($quiz_lesson_id, $current_user->ID);
         $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+        if (isset($user_lesson_status->comment_ID)) {
+            $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
         }
 
-        if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
+        if ( ! is_array($user_quizzes)) { $user_quizzes = array(); }
 
         // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+        $user_lesson_end = Sensei_Utils::user_completed_lesson($user_lesson_status);
         $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
+        if ($user_lesson_end) {
             $user_lesson_complete = true;
         } // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+        $reset_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true);
         //backwards compatibility
-        if( 'on' == $reset_allowed ) {
+        if ('on' == $reset_allowed) {
             $reset_allowed = 1;
         }
 
         // Build frontend data object for backwards compatibility
         // using this is no longer recommended
-        $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+        $this->data->user_quiz_grade = $user_quiz_grade; // Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
         $this->data->quiz_passmark = $quiz_passmark;
         $this->data->quiz_lesson = $quiz_lesson_id;
         $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
@@ -399,41 +399,41 @@ 
 	 * @param $files
 	 * @return array
 	 */
-	public static function prepare_form_submitted_answers( $unprepared_answers,  $files ){
+	public static function prepare_form_submitted_answers($unprepared_answers, $files) {
 
 
 		$prepared_answers = array();
 
 		// validate incoming answers
-		if( empty( $unprepared_answers  ) || ! is_array( $unprepared_answers ) ){
+		if (empty($unprepared_answers) || ! is_array($unprepared_answers)) {
 			return false;
 		}
 
 		// Loop through submitted quiz answers and save them appropriately
-		foreach( $unprepared_answers as $question_id => $answer ) {
+		foreach ($unprepared_answers as $question_id => $answer) {
 
 			//get the current questions question type
-            $question_type = Sensei()->question->get_question_type( $question_id );
+            $question_type = Sensei()->question->get_question_type($question_id);
 
 			// Sanitise answer
-			if( 0 == get_magic_quotes_gpc() ) {
-				$answer = wp_unslash( $answer );
+			if (0 == get_magic_quotes_gpc()) {
+				$answer = wp_unslash($answer);
 			}
 
             // compress the answer for saving
-			if( 'multi-line' == $question_type ) {
-                $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
-                $file_key = 'file_upload_' . $question_id;
-                if( isset( $files[ $file_key ] ) ) {
-                        $attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
-                        if( $attachment_id ) {
+			if ('multi-line' == $question_type) {
+                $answer = esc_html($answer);
+            }elseif ('file-upload' == $question_type) {
+                $file_key = 'file_upload_'.$question_id;
+                if (isset($files[$file_key])) {
+                        $attachment_id = Sensei_Utils::upload_file($files[$file_key]);
+                        if ($attachment_id) {
                             $answer = $attachment_id;
                         }
                     }
             } // end if
 
-			$prepared_answers[ $question_id ] =  base64_encode( maybe_serialize( $answer ) );
+			$prepared_answers[$question_id] = base64_encode(maybe_serialize($answer));
 
 		}// end for each $quiz_answers
 
@@ -453,54 +453,54 @@ 
      * @param int $user_id
      * @param int $lesson_id
      */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+    public function reset_user_lesson_data($lesson_id, $user_id = 0) {
 
         //make sure the parameters are valid
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            || ! get_userdata( $user_id ) ){
+        if (empty($lesson_id) || empty($user_id)
+            || 'lesson' != get_post_type($lesson_id)
+            || ! get_userdata($user_id)) {
             return false;
         }
 
 
 
         //get the users lesson status to make
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-        if( ! isset( $user_lesson_status->comment_ID ) ) {
+        $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+        if ( ! isset($user_lesson_status->comment_ID)) {
             // this user is not taking this lesson so this process is not needed
             return false;
         }
 
         //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+        $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
+        $course_id = Sensei()->lesson->get_course_id($lesson_id);
 
         // reset the transients
         $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
         $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
         $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-        delete_transient( $answers_transient_key );
-        delete_transient( $grades_transient_key );
-        delete_transient( $answers_feedback_transient_key );
+        delete_transient($answers_transient_key);
+        delete_transient($grades_transient_key);
+        delete_transient($answers_feedback_transient_key);
 
         // reset the quiz answers and feedback notes
-        $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
-        $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
-        $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+        $deleted_answers = Sensei_Utils::delete_user_data('quiz_answers', $lesson_id, $user_id);
+        $deleted_grades = Sensei_Utils::delete_user_data('quiz_grades', $lesson_id, $user_id);
+        $deleted_user_feedback = Sensei_Utils::delete_user_data('quiz_answers_feedback', $lesson_id, $user_id);
 
         // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-        Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+        Sensei_Utils::sensei_delete_quiz_answers($quiz_id, $user_id);
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+        Sensei_Utils::update_lesson_status($user_id, $lesson_id, 'in-progress', array('questions_asked' => '', 'grade' => ''));
 
         // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_id );
+        Sensei_Utils::update_course_status($user_id, $course_id);
 
         // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
-        do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
-        Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+        do_action('sensei_user_lesson_reset', $user_id, $lesson_id);
+        Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Reset Successfully.', 'woothemes-sensei').'</div>';
 
-        return ( $deleted_answers && $deleted_grades ) ;
+        return ($deleted_answers && $deleted_grades);
 
     } // end reset_user_lesson_data
 
@@ -520,20 +520,20 @@ 
       *
       * @return bool $answers_submitted
       */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+     public static function submit_answers_for_grading($quiz_answers, $files = array(), $lesson_id, $user_id = 0) {
 
          $answers_submitted = false;
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
          // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_answers ) ){
+         if (empty($lesson_id) || empty($user_id)
+             || 'lesson' != get_post_type($lesson_id)
+             ||! get_userdata($user_id)
+             || ! is_array($quiz_answers)) {
 
              return false;
 
@@ -543,38 +543,38 @@ 
          $grade = 0;
 
          // Get Quiz ID
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+         $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
          // Get quiz grade type
-         $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+         $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
          // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+         $pass_required = get_post_meta($quiz_id, '_pass_required', true);
 
          // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+         $quiz_pass_percentage = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2));
 
          // Handle Quiz Questions asked
          // This is to ensure we save the questions that we've asked this user and that this can't be change unless
          // the quiz is reset by admin or user( user: only if the setting is enabled ).
          // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
-         if( empty( $questions_asked ) ){
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
+         $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true);
+         if (empty($questions_asked)) {
 
-             $questions_asked = array_keys( $quiz_answers );
-             $questions_asked_string = implode( ',', $questions_asked );
+             $questions_asked = array_keys($quiz_answers);
+             $questions_asked_string = implode(',', $questions_asked);
 
              // Save questions that were asked in this quiz
-             update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
+             update_comment_meta($user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string);
 
          }
 
          // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
-         self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
+         self::save_user_answers($quiz_answers, $files, $lesson_id, $user_id);
 
          // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+         $grade = Sensei_Grading::grade_quiz_auto($quiz_id, $quiz_answers, 0, $quiz_grade_type);
 
          // Get Lesson Grading Setting
          $lesson_metadata = array();
@@ -584,13 +584,13 @@ 
          $answers_submitted = true;
 
          // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+         if ('auto' == $quiz_grade_type && ! is_wp_error($grade)) {
 
              // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+             if ('on' == $pass_required) {
 
                  // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+                 if ($quiz_pass_percentage <= $grade) {
 
                      $lesson_status = 'passed';
 
@@ -611,9 +611,9 @@ 
 
          } // end if ! is_wp_error( $grade ...
 
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+         Sensei_Utils::update_lesson_status($user_id, $lesson_id, $lesson_status, $lesson_metadata);
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+         if ('passed' == $lesson_status || 'graded' == $lesson_status) {
 
              /**
               * Lesson end action hook
@@ -623,7 +623,7 @@ 
               * @param int $user_id
               * @param int $lesson_id
               */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+             do_action('sensei_user_lesson_end', $user_id, $lesson_id);
 
          }
 
@@ -639,7 +639,7 @@ 
           * @param string $quiz_pass_percentage
           * @param string $quiz_grade_type
           */
-         do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
+         do_action('sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type);
 
          return $answers_submitted;
 
@@ -659,38 +659,38 @@ 
       *
       * @return bool $answers_submitted
       */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_answer($lesson_id, $question_id, $user_id = 0) {
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
-         if( ! ( intval( $user_id ) > 0 )   ){
+         if ( ! (intval($user_id) > 0)) {
              $user_id = get_current_user_id();
          }
 
-         $users_answers = $this->get_user_answers( $lesson_id, $user_id );
+         $users_answers = $this->get_user_answers($lesson_id, $user_id);
 
-         if( !$users_answers || empty( $users_answers )
-         ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
+         if ( ! $users_answers || empty($users_answers)
+         ||  ! is_array($users_answers) || ! isset($users_answers[$question_id])) {
 
              //Fallback for pre 1.7.4 data
-             $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
+             $comment = Sensei_Utils::sensei_check_for_activity(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer'), true);
 
-             if( ! isset( $comment->comment_content ) ){
+             if ( ! isset($comment->comment_content)) {
                  return false;
              }
 
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
+             return maybe_unserialize(base64_decode($comment->comment_content));
          }
 
-         return $users_answers[ $question_id ];
+         return $users_answers[$question_id];
 
      }// end get_user_question_answer
 
@@ -711,18 +711,18 @@ 
       *
       * @return bool
       */
-     public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
+     public function set_user_grades($quiz_grades, $lesson_id, $user_id = 0) {
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
          // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_grades ) ){
+         if (empty($lesson_id) || empty($user_id)
+             || 'lesson' != get_post_type($lesson_id)
+             ||! get_userdata($user_id)
+             || ! is_array($quiz_grades)) {
 
              return false;
 
@@ -731,15 +731,15 @@ 
          $success = false;
 
          // save that data for the user on the lesson comment meta
-         $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
+         $comment_meta_id = Sensei_Utils::add_user_data('quiz_grades', $lesson_id, $quiz_grades, $user_id);
 
          // were the grades save successfully ?
-         if( intval( $comment_meta_id ) > 0 ) {
+         if (intval($comment_meta_id) > 0) {
 
              $success = true;
              // save transient
-             $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-             set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
+             $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+             set_transient($transient_key, $quiz_grades, 10 * DAY_IN_SECONDS);
          }
 
          return $success;
@@ -758,36 +758,36 @@ 
       *
       * @return array $user_quiz_grades or false if none exists for this users
       */
-     public function get_user_grades( $lesson_id, $user_id = 0 ){
+     public function get_user_grades($lesson_id, $user_id = 0) {
 
          $user_grades = array();
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+         if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+             || ! intval($user_id) > 0 || ! get_userdata($user_id)) {
              return false;
          }
 
          // save some time and get the transient cached data
-         $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-         $user_grades = get_transient( $transient_key );
+         $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+         $user_grades = get_transient($transient_key);
 
          // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
+         if (empty($user_grades) || false != $user_grades) {
 
-             $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
+             $user_grades = Sensei_Utils::get_user_data('quiz_grades', $lesson_id, $user_id);
 
              //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
+             set_transient($transient_key, $user_grades, 10 * DAY_IN_SECONDS);
 
          } // end if transient check
 
          // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
+         if ( ! is_array($user_grades)) {
              return false;
          }
 
@@ -810,21 +810,21 @@ 
       *
       * @return bool $question_grade
       */
-     public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_grade($lesson_id, $question_id, $user_id = 0) {
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+         $all_user_grades = self::get_user_grades($lesson_id, $user_id);
 
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+         if ( ! $all_user_grades || ! isset($all_user_grades[$question_id])) {
 
              //fallback to data pre 1.7.4
              $args = array(
@@ -833,17 +833,17 @@ 
                  'type'    => 'sensei_user_answer'
              );
 
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+             $question_activity = Sensei_Utils::sensei_check_for_activity($args, true);
              $fall_back_grade = false;
-             if( isset( $question_activity->comment_ID ) ){
-                 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
+             if (isset($question_activity->comment_ID)) {
+                 $fall_back_grade = get_comment_meta($question_activity->comment_ID, 'user_grade', true);
              }
 
              return $fall_back_grade;
 
          } // end if $all_user_grades...
 
-         return $all_user_grades[ $question_id ];
+         return $all_user_grades[$question_id];
 
      }// end get_user_question_grade
 
@@ -865,13 +865,13 @@ 
       *
       * @return false or int $feedback_saved
       */
-    public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
+    public function save_user_answers_feedback($answers_feedback, $lesson_id, $user_id = 0) {
 
         // make sure the parameters are valid before continuing
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            ||!get_userdata( $user_id )
-            || !is_array( $answers_feedback ) ){
+        if (empty($lesson_id) || empty($user_id)
+            || 'lesson' != get_post_type($lesson_id)
+            ||! get_userdata($user_id)
+            || ! is_array($answers_feedback)) {
 
             return false;
 
@@ -879,25 +879,25 @@ 
 
 
         // check if the lesson is started before saving, if not start the lesson for the user
-        if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
-            Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+        if ( ! (0 < intval(Sensei_Utils::user_started_lesson($lesson_id, $user_id)))) {
+            Sensei_Utils::sensei_start_lesson($lesson_id, $user_id);
         }
 
         // encode the feedback
-        $encoded_answers_feedback =  array();
-        foreach( $answers_feedback as $question_id => $feedback ){
-            $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
+        $encoded_answers_feedback = array();
+        foreach ($answers_feedback as $question_id => $feedback) {
+            $encoded_answers_feedback[$question_id] = base64_encode($feedback);
         }
 
         // save the user data
-        $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
+        $feedback_saved = Sensei_Utils::add_user_data('quiz_answers_feedback', $lesson_id, $encoded_answers_feedback, $user_id);
 
         //Were the the question feedback save correctly?
-        if( intval( $feedback_saved ) > 0){
+        if (intval($feedback_saved) > 0) {
 
             // save transient to make retrieval faster in future
              $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-             set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
+             set_transient($transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS);
 
         }
 
@@ -922,42 +922,42 @@ 
       *  $type string $question_feedback
       * }
       */
-     public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+     public function get_user_answers_feedback($lesson_id, $user_id = 0) {
 
          $answers_feedback = array();
 
          // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
+         if ( ! intval($user_id) > 0) {
              $user_id = get_current_user_id();
          }
 
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+         if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id)
+             || ! intval($user_id) > 0 || ! get_userdata($user_id)) {
              return false;
          }
 
          // first check the transient to save a few split seconds
          $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-         $encoded_feedback = get_transient( $transient_key );
+         $encoded_feedback = get_transient($transient_key);
 
          // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
+         if (empty($encoded_feedback) || ! $encoded_feedback) {
 
-             $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+             $encoded_feedback = Sensei_Utils::get_user_data('quiz_answers_feedback', $lesson_id, $user_id);
 
              //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
+             set_transient($transient_key, $encoded_feedback, 10 * DAY_IN_SECONDS);
 
          } // end if transient check
 
          // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
+         if ( ! is_array($encoded_feedback)) {
              return false;
          }
 
-         foreach( $encoded_feedback as $question_id => $feedback ){
+         foreach ($encoded_feedback as $question_id => $feedback) {
 
-             $answers_feedback[ $question_id ] = base64_decode( $feedback );
+             $answers_feedback[$question_id] = base64_decode($feedback);
 
          }
 
@@ -980,25 +980,25 @@ 
       *
       * @return string $feedback or bool if false
       */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+     public function get_user_question_feedback($lesson_id, $question_id, $user_id = 0) {
 
          $feedback = false;
 
          // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+         if (empty($lesson_id) || empty($question_id)
+             || ! (intval($lesson_id) > 0)
+             || ! (intval($question_id) > 0)
+             || 'lesson' != get_post_type($lesson_id)
+             || 'question' != get_post_type($question_id)) {
 
              return false;
          }
 
          // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+         $all_feedback = $this->get_user_answers_feedback($lesson_id, $user_id);
 
-         if( !$all_feedback || empty( $all_feedback )
-             || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
+         if ( ! $all_feedback || empty($all_feedback)
+             || ! is_array($all_feedback) || ! isset($all_feedback[$question_id])) {
 
              //fallback to data pre 1.7.4
 
@@ -1008,23 +1008,23 @@ 
                  'user_id' => $user_id,
                  'type'    => 'sensei_user_answer'
              );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+             $question_activity = Sensei_Utils::sensei_check_for_activity($args, true);
 
              // set the default to false and return that if no old data is available.
-             if( isset( $question_activity->comment_ID ) ){
-                 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
+             if (isset($question_activity->comment_ID)) {
+                 $feedback = base64_decode(get_comment_meta($question_activity->comment_ID, 'answer_note', true));
              }
 
              // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+             if (empty($feedback)) {
+                 $feedback = get_post_meta($question_id, '_answer_feedback', true);
              }
 
              return $feedback;
 
          }
 
-         return $all_feedback[ $question_id ];
+         return $all_feedback[$question_id];
 
      } // end get_user_question_feedback
 
@@ -1042,7 +1042,7 @@ 
 
      public function quiz_has_no_questions() {
 
-         if( ! is_singular( 'quiz' ) )  {
+         if ( ! is_singular('quiz')) {
              return;
          }
 
@@ -1050,11 +1050,11 @@ 
 
          $lesson_id = $this->get_lesson_id($post->ID);
 
-         $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+         $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true);
 
          $lesson = get_post($lesson_id);
 
-         if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
+         if (is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name") {
 
              wp_redirect(get_permalink($lesson->ID), 301);
              exit;
@@ -1068,7 +1068,7 @@ 
   *
   * @deprecated since 1.9.0
   */
- public static function deprecate_quiz_sensei_single_main_content_hook(){
+ public static function deprecate_quiz_sensei_single_main_content_hook() {
 
      sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
@@ -1078,7 +1078,7 @@ 
      *
      * @deprecated since 1.9.0
      */
-     public static function deprecate_quiz_sensei_quiz_single_title_hook(){
+     public static function deprecate_quiz_sensei_quiz_single_title_hook() {
 
          sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
@@ -1091,29 +1091,29 @@ 
       * @param int $id title post id
       * @return string $quiz_title
       */
-     public static function single_quiz_title( $title, $post_id ){
+     public static function single_quiz_title($title, $post_id) {
 
-         if( 'quiz' == get_post_type( $post_id ) ){
+         if ('quiz' == get_post_type($post_id)) {
 
              $title_with_no_quizzes = $title;
 
              // if the title has quiz, remove it: legacy titles have the word quiz stored.
-             if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
+             if (1 < substr_count(strtoupper($title_with_no_quizzes), 'QUIZ')) {
 
                  // remove all possible appearances of quiz
-                 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
-                 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
-                 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
+                 $title_with_no_quizzes = str_replace('quiz', '', $title);
+                 $title_with_no_quizzes = str_replace('Quiz', '', $title_with_no_quizzes);
+                 $title_with_no_quizzes = str_replace('QUIZ', '', $title_with_no_quizzes);
 
              }
 
-             $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
+             $title = $title_with_no_quizzes.' '.__('Quiz', 'woothemes-sensei');
          }
 
          /**
           * hook document in class-woothemes-sensei-message.php
           */
-         return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
+         return apply_filters('sensei_single_title', $title, get_post_type( ));
 
      }
 
@@ -1125,21 +1125,21 @@ 
       * @since 1.9.0
       *
       */
-     public static function start_quiz_questions_loop(){
+     public static function start_quiz_questions_loop() {
 
          global $sensei_question_loop;
 
          //intialize the questions loop object
          $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
+         $sensei_question_loop['total']   = 0;
          $sensei_question_loop['questions'] = array();
 
 
-         $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
+         $questions = Sensei()->lesson->lesson_quiz_questions(get_the_ID());
 
-         if( count( $questions  ) > 0  ){
+         if (count($questions) > 0) {
 
-             $sensei_question_loop['total']   =  count( $questions );
+             $sensei_question_loop['total']   = count($questions);
              $sensei_question_loop['questions'] = $questions;
              $sensei_question_loop['quiz_id'] = get_the_ID();
 
@@ -1155,9 +1155,9 @@ 
       * @since 1.9.0
       *
       */
-     public static function stop_quiz_questions_loop(){
+     public static function stop_quiz_questions_loop() {
 
-         $sensei_question_loop['total']   =  0;
+         $sensei_question_loop['total']   = 0;
          $sensei_question_loop['questions'] = array();
          $sensei_question_loop['quiz_id'] = '';
 
@@ -1168,7 +1168,7 @@ 
       *
       * @since 1.9.0
       */
-     public static function the_title(){
+     public static function the_title() {
          ?>
          <header>
 
@@ -1178,7 +1178,7 @@ 
                  /**
                   * Filter documented in class-sensei-messages.php the_title
                   */
-                 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
+                 echo apply_filters('sensei_single_title', get_the_title(get_post()), get_post_type(get_the_ID()));
                  ?>
 
              </h1>
@@ -1193,11 +1193,11 @@ 
       *
       * @param $quiz_id
       */
-    public static function  the_user_status_message( $quiz_id ){
+    public static function  the_user_status_message($quiz_id) {
 
-        $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
-        echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
+        $status = Sensei_Utils::sensei_user_quiz_status_message($lesson_id, get_current_user_id());
+        echo '<div class="sensei-message '.$status['box_class'].'">'.$status['message'].'</div>';
 
     }
 
@@ -1208,9 +1208,9 @@ 
       * @since 1.9.0
       * @deprecated
       */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+     public static function deprecate_sensei_quiz_action_buttons_hook() {
 
-         sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
+         sensei_do_deprecated_action('sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
 
      }
 
@@ -1224,50 +1224,50 @@ 
 
          global $post, $current_user;
 
-         $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
-         $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-         $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+         $lesson_id = (int) get_post_meta($post->ID, '_quiz_lesson', true);
+         $lesson_course_id = (int) get_post_meta($lesson_id, '_lesson_course', true);
+         $lesson_prerequisite = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true);
          $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $current_user->ID);
 
          //setup quiz grade
          $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+         if ( ! empty($user_lesson_status)) {
+             $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
          }
 
 
-         if( intval( $lesson_prerequisite ) > 0 ) {
+         if (intval($lesson_prerequisite) > 0) {
 
              // If the user hasn't completed the prereq then hide the current actions
-             $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
+             $show_actions = Sensei_Utils::user_completed_lesson($lesson_prerequisite, $current_user->ID);
 
          }
-         if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+         if ($show_actions && is_user_logged_in() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) {
 
              // Get Reset Settings
-             $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
+             $reset_quiz_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true); ?>
 
              <!-- Action Nonce's -->
              <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_complete_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_quiz_nonce')); ?>" />
              <input type="hidden" name="woothemes_sensei_reset_quiz_nonce" id="woothemes_sensei_reset_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_reset_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_reset_quiz_nonce')); ?>" />
              <input type="hidden" name="woothemes_sensei_save_quiz_nonce" id="woothemes_sensei_save_quiz_nonce"
-                    value="<?php echo esc_attr(  wp_create_nonce( 'woothemes_sensei_save_quiz_nonce' ) ); ?>" />
+                    value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_save_quiz_nonce')); ?>" />
              <!--#end Action Nonce's -->
 
-             <?php if ( '' == $user_quiz_grade) { ?>
+             <?php if ('' == $user_quiz_grade) { ?>
 
-                 <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php  _e( 'Complete Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php  _e('Complete Quiz', 'woothemes-sensei'); ?>"/></span>
 
-                 <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e( 'Save Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e('Save Quiz', 'woothemes-sensei'); ?>"/></span>
 
              <?php } // End If Statement ?>
 
-             <?php if ( isset( $reset_quiz_allowed ) && $reset_quiz_allowed ) { ?>
+             <?php if (isset($reset_quiz_allowed) && $reset_quiz_allowed) { ?>
 
-                 <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e( 'Reset Quiz', 'woothemes-sensei' ); ?>"/></span>
+                 <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e('Reset Quiz', 'woothemes-sensei'); ?>"/></span>
 
              <?php } ?>
 
@@ -1285,13 +1285,13 @@ 
       *
       * @return double $user_quiz_grade
       */
-     public static function get_user_quiz_grade( $lesson_id, $user_id ){
+     public static function get_user_quiz_grade($lesson_id, $user_id) {
 
          // get the quiz grade
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+         $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id);
          $user_quiz_grade = 0;
-         if( isset( $user_lesson_status->comment_ID ) ) {
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+         if (isset($user_lesson_status->comment_ID)) {
+             $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true);
          }
 
          return (double) $user_quiz_grade;
@@ -1309,13 +1309,13 @@ 
       * @param int $lesson_id
       * @return bool
       */
-     public static function is_reset_allowed( $lesson_id ){
+     public static function is_reset_allowed($lesson_id) {
 
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+         $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id);
 
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+         $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
          //backwards compatibility
-         if( 'on' == $reset_allowed ) {
+         if ('on' == $reset_allowed) {
              $reset_allowed = 1;
          }
 
@@ -1332,4 +1332,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Quiz extends Sensei_Quiz{}
+class WooThemes_Sensei_Quiz extends Sensei_Quiz {}