woothemes / sensei

includes/class-sensei-learners-main.php

Braces +6 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Learners Overview List Table Class
@@ -409,8 +412,7 @@ 
 		if( $this->lesson_id ) {
 			$post_id = intval( $this->lesson_id );
 			$activity = 'sensei_lesson_status';
-		}
-		elseif( $this->course_id ) {
+		} elseif( $this->course_id ) {
 			$post_id = intval( $this->course_id );
 			$activity = 'sensei_course_status';
 		}
@@ -601,8 +603,7 @@ 
 			$post_type = __( 'Course', 'woothemes-sensei' );
 			$form_post_type = 'course';
 			$form_course_id = $this->course_id;
-		}
-		elseif( $this->course_id && $this->lesson_id ) {
+		} elseif( $this->course_id && $this->lesson_id ) {
 			$post_title = get_the_title( $this->lesson_id );
 			$post_type = __( 'Lesson', 'woothemes-sensei' );
 			$form_post_type = 'lesson';

Indentation +24 added lines, -24 removed lines

@@ -205,13 +205,13 @@ 
 
 	/**
 	 * Generates content for a single row of the table in the user management
-     * screen.
-     *
+	 * screen.
+	 *
 	 * @since  1.7.0
-     *
+	 *
 	 * @param object $item The current item
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	protected function get_row_data( $item ) {
 		global $wp_version;
@@ -219,8 +219,8 @@ 
 		switch ( $this->view ) {
 			case 'learners' :
 
-                // in this case the item passed in is actually the users activity on course of lesson
-                $user_activity = $item;
+				// in this case the item passed in is actually the users activity on course of lesson
+				$user_activity = $item;
 				$post_id = false;
 
 				if( $this->lesson_id ) {
@@ -239,30 +239,30 @@ 
 
 				if( 'complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved ) {
 
-                    $status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
+					$status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
 
 				} else {
 
-                    $status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
+					$status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
 
 				}
 
-                $title = Sensei_Learner::get_full_name( $user_activity->user_id );
+				$title = Sensei_Learner::get_full_name( $user_activity->user_id );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 
-                /**
-                 * sensei_learners_main_column_data filter
-                 *
-                 * This filter runs on the learner management screen for a specific course.
-                 * It provides the learner row column details.
-                 *
-                 * @param array $columns{
-                 *   type string $title
-                 *   type string $date_started
-                 *   type string $course_status (completed, started etc)
-                 *   type html $action_buttons
-                 * }
-                 */
+				/**
+				 * sensei_learners_main_column_data filter
+				 *
+				 * This filter runs on the learner management screen for a specific course.
+				 * It provides the learner row column details.
+				 *
+				 * @param array $columns{
+				 *   type string $title
+				 *   type string $date_started
+				 *   type string $course_status (completed, started etc)
+				 *   type html $action_buttons
+				 * }
+				 */
 				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
 						'title' => '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $user_activity->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
 						'date_started' => get_comment_meta( $user_activity->comment_ID, 'start', true),
@@ -292,7 +292,7 @@ 
 
 			case 'courses' :
 			default:
-                $course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
+				$course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
 				$title = get_the_title( $item );
 				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
 

Spacing +174 added lines, -174 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Learners Overview List Table Class
@@ -22,28 +22,28 @@ 
 	 * Constructor
 	 * @since  1.6.0
 	 */
-	public function __construct ( $course_id = 0, $lesson_id = 0 ) {
-		$this->course_id = intval( $course_id );
-		$this->lesson_id = intval( $lesson_id );
+	public function __construct($course_id = 0, $lesson_id = 0) {
+		$this->course_id = intval($course_id);
+		$this->lesson_id = intval($lesson_id);
 
-		if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'courses', 'lessons', 'learners' ) ) ) {
+		if (isset($_GET['view']) && in_array($_GET['view'], array('courses', 'lessons', 'learners'))) {
 			$this->view = $_GET['view'];
 		}
 
 		// Viewing a single lesson always sets the view to Learners
-		if( $this->lesson_id ) {
+		if ($this->lesson_id) {
 			$this->view = 'learners';
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'learners_main' );
+		parent::__construct('learners_main');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
-		add_action( 'sensei_learners_extra', array( $this, 'add_learners_box' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
+		add_action('sensei_learners_extra', array($this, 'add_learners_box'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -53,38 +53,38 @@ 
 	 */
 	function get_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'date_started' => __( 'Date Started', 'woothemes-sensei' ),
-					'user_status' => __( 'Status', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'date_started' => __('Date Started', 'woothemes-sensei'),
+					'user_status' => __('Status', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => __( 'Lesson', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Lesson', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'courses':
 			default:
 				$columns = array(
-					'title' => __( 'Course', 'woothemes-sensei' ),
-					'num_learners' => __( '# Learners', 'woothemes-sensei' ),
-					'updated' => __( 'Last Updated', 'woothemes-sensei' ),
+					'title' => __('Course', 'woothemes-sensei'),
+					'num_learners' => __('# Learners', 'woothemes-sensei'),
+					'updated' => __('Last Updated', 'woothemes-sensei'),
 				);
 				break;
 		}
 		$columns['actions'] = '';
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -95,32 +95,32 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
 				$columns = array(
-					'title' => array( 'title', false ),
+					'title' => array('title', false),
 				);
 				break;
 
 			case 'lessons':
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 
 			default:
 				$columns = array(
-					'title' => array( 'title', false ),
-					'updated' => array( 'post_modified', false ),
+					'title' => array('title', false),
+					'updated' => array('post_modified', false),
 				);
 				break;
 		}
 		// Backwards compatible
-		if ( 'learners' == $this->view ) {
-			$columns = apply_filters( 'sensei_learners_learners_columns_sortable', $columns, $this );
+		if ('learners' == $this->view) {
+			$columns = apply_filters('sensei_learners_learners_columns_sortable', $columns, $this);
 		}
-		$columns = apply_filters( 'sensei_learners_default_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_learners_default_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -134,72 +134,72 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'DESC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle category selection
 		$category = false;
-		if ( !empty( $_GET['course_cat'] ) ) {
-			$category = intval( $_GET['course_cat'] );
+		if ( ! empty($_GET['course_cat'])) {
+			$category = intval($_GET['course_cat']);
 		} // End If Statement
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = '';
 				}
-				$this->items = $this->get_learners( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_learners(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			case 'lessons':
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_lessons( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) );
+				$this->items = $this->get_lessons(compact('per_page', 'offset', 'orderby', 'order', 'search'));
 
 			break;
 
 			default:
-				if ( empty($orderby) ) {
+				if (empty($orderby)) {
 					$orderby = 'post_modified';
 				}
-				$this->items = $this->get_courses( compact( 'per_page', 'offset', 'orderby', 'order', 'category', 'search' ) );
+				$this->items = $this->get_courses(compact('per_page', 'offset', 'orderby', 'order', 'category', 'search'));
 
 			break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 
 	} // End prepare_items()
 
@@ -213,42 +213,42 @@ 
      *
      * @return void
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 		global $wp_version;
 
-		switch ( $this->view ) {
+		switch ($this->view) {
 			case 'learners' :
 
                 // in this case the item passed in is actually the users activity on course of lesson
                 $user_activity = $item;
 				$post_id = false;
 
-				if( $this->lesson_id ) {
+				if ($this->lesson_id) {
 
-					$post_id = intval( $this->lesson_id );
-					$object_type = __( 'lesson', 'woothemes-sensei' );
+					$post_id = intval($this->lesson_id);
+					$object_type = __('lesson', 'woothemes-sensei');
 					$post_type = 'lesson';
 
-				} elseif( $this->course_id ) {
+				} elseif ($this->course_id) {
 
-					$post_id = intval( $this->course_id );
-					$object_type = __( 'course', 'woothemes-sensei' );
+					$post_id = intval($this->course_id);
+					$object_type = __('course', 'woothemes-sensei');
 					$post_type = 'course';
 
 				}
 
-				if( 'complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved ) {
+				if ('complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved) {
 
-                    $status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>';
+                    $status_html = '<span class="graded">'.__('Completed', 'woothemes-sensei').'</span>';
 
 				} else {
 
-                    $status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>';
+                    $status_html = '<span class="in-progress">'.__('In Progress', 'woothemes-sensei').'</span>';
 
 				}
 
-                $title = Sensei_Learner::get_full_name( $user_activity->user_id );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $title = Sensei_Learner::get_full_name($user_activity->user_id);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
                 /**
                  * sensei_learners_main_column_data filter
@@ -263,50 +263,50 @@ 
                  *   type html $action_buttons
                  * }
                  */
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $user_activity->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
-						'date_started' => get_comment_meta( $user_activity->comment_ID, 'start', true),
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('user-edit.php?user_id='.$user_activity->user_id).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
+						'date_started' => get_comment_meta($user_activity->comment_ID, 'start', true),
 						'user_status' => $status_html,
-						'actions' => '<a class="remove-learner button" data-user_id="' . $user_activity->user_id . '" data-post_id="' . $post_id . '" data-post_type="' . $post_type . '">' . sprintf( __( 'Remove from %1$s', 'woothemes-sensei' ), $object_type ) . '</a>',
-					), $item, $post_id, $post_type );
+						'actions' => '<a class="remove-learner button" data-user_id="'.$user_activity->user_id.'" data-post_id="'.$post_id.'" data-post_type="'.$post_type.'">'.sprintf(__('Remove from %1$s', 'woothemes-sensei'), $object_type).'</a>',
+					), $item, $post_id, $post_type);
 
 				break;
 
 			case 'lessons' :
-				$lesson_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_lesson_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any' ) ) );
-				$title = get_the_title( $item );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+				$lesson_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_lesson_learners', array('post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any')));
+				$title = get_the_title($item);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
 				$grading_action = '';
-				if ( get_post_meta( $item->ID, '_quiz_has_questions', true ) ) {
-					$grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>';
+				if (get_post_meta($item->ID, '_quiz_has_questions', true)) {
+					$grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>';
 				}
 
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
 						'num_learners' => $lesson_learners,
 						'updated' => $item->post_modified,
-						'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action,
-					), $item, $this->course_id );
+						'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action,
+					), $item, $this->course_id);
 				break;
 
 			case 'courses' :
 			default:
-                $course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
-				$title = get_the_title( $item );
-				$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
+                $course_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_course_learners', array('post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any')));
+				$title = get_the_title($item);
+				$a_title = sprintf(__('Edit &#8220;%s&#8221;'), $title);
 
 				$grading_action = '';
-				if ( version_compare($wp_version, '4.1', '>=') ) {
-					$grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $item->ID ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>';
+				if (version_compare($wp_version, '4.1', '>=')) {
+					$grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $item->ID), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>';
 				}
 
-				$column_data = apply_filters( 'sensei_learners_main_column_data', array(
-						'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>',
+				$column_data = apply_filters('sensei_learners_main_column_data', array(
+						'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>',
 						'num_learners' => $course_learners,
 						'updated' => $item->post_modified,
-						'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action,
-					), $item );
+						'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action,
+					), $item);
 
 				break;
 		} // switch
@@ -319,7 +319,7 @@ 
 	 * @since  1.7.0
 	 * @return array courses
 	 */
-	private function get_courses( $args ) {
+	private function get_courses($args) {
 		$course_args = array(
 			'post_type' => 'course',
 			'post_status' => 'publish',
@@ -329,7 +329,7 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $args['category'] ) {
+		if ($args['category']) {
 			$course_args['tax_query'][] = array(
 				'taxonomy' => 'course-category',
 				'field' => 'id',
@@ -337,11 +337,11 @@ 
 			);
 		}
 
-		if( $args['search'] ) {
+		if ($args['search']) {
 			$course_args['s'] = $args['search'];
 		}
 
-		$courses_query = new WP_Query( apply_filters( 'sensei_learners_filter_courses', $course_args ) );
+		$courses_query = new WP_Query(apply_filters('sensei_learners_filter_courses', $course_args));
 
 		$this->total_items = $courses_query->found_posts;
 		return $courses_query->posts;
@@ -352,7 +352,7 @@ 
 	 * @since  1.7.0
 	 * @return array lessons
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 		$lesson_args = array(
 			'post_type' => 'lesson',
 			'post_status' => 'publish',
@@ -362,18 +362,18 @@ 
 			'order' => $args['order'],
 		);
 
-		if( $this->course_id ) {
+		if ($this->course_id) {
 			$lesson_args['meta_query'][] = array(
 				'key' => '_lesson_course',
 				'value' => $this->course_id,
 			);
 		}
 
-		if( $args['search'] ) {
+		if ($args['search']) {
 			$lesson_args['s'] = $args['search'];
 		}
 
-		$lessons_query = new WP_Query( apply_filters( 'sensei_learners_filter_lessons', $lesson_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_learners_filter_lessons', $lesson_args));
 
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
@@ -384,22 +384,22 @@ 
 	 * @since  1.7.0
 	 * @return array learners
 	 */
-	private function get_learners( $args ) {
+	private function get_learners($args) {
 
 		$user_ids = false;
 		$post_id = 0;
 		$activity = '';
 
-		if( $this->lesson_id ) {
-			$post_id = intval( $this->lesson_id );
+		if ($this->lesson_id) {
+			$post_id = intval($this->lesson_id);
 			$activity = 'sensei_lesson_status';
 		}
-		elseif( $this->course_id ) {
-			$post_id = intval( $this->course_id );
+		elseif ($this->course_id) {
+			$post_id = intval($this->course_id);
 			$activity = 'sensei_course_status';
 		}
 
-		if( ! $post_id || ! $activity ) {
+		if ( ! $post_id || ! $activity) {
 			$this->total_items = 0;
 			return array();
 		}
@@ -415,32 +415,32 @@ 
 			);
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $args['search'] ) {
+		if ($args['search']) {
 			$user_args = array(
-				'search' => '*' . $args['search'] . '*',
+				'search' => '*'.$args['search'].'*',
 				'fields' => 'ID'
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_learners_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_learners_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				$activity_args['user_id'] = $learners_search->get_results();
 			}
 		}
 
-		$activity_args = apply_filters( 'sensei_learners_filter_users', $activity_args );
+		$activity_args = apply_filters('sensei_learners_filter_users', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$total_learners = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$total_learners = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $total_learners < $activity_args['offset'] ) {
-			$new_paged = floor( $total_learners / $activity_args['number'] );
+		if ($total_learners < $activity_args['offset']) {
+			$new_paged = floor($total_learners / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$learners = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$learners = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($learners) ) {
-			$learners = array( $learners );
+		if ( ! is_array($learners)) {
+			$learners = array($learners);
 		}
 		$this->total_items = $total_learners;
 		return $learners;
@@ -453,22 +453,22 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners' :
-				$text = __( 'No learners found.', 'woothemes-sensei' );
+				$text = __('No learners found.', 'woothemes-sensei');
 				break;
 
 			case 'lessons' :
-				$text = __( 'No lessons found.', 'woothemes-sensei' );
+				$text = __('No lessons found.', 'woothemes-sensei');
 				break;
 
 			case 'courses':
 			case 'default':
 			default:
-				$text = __( 'No courses found.', 'woothemes-sensei' );
+				$text = __('No courses found.', 'woothemes-sensei');
 				break;
 		}
-		echo apply_filters( 'sensei_learners_no_items_text', $text );
+		echo apply_filters('sensei_learners_no_items_text', $text);
 	} // End no_items()
 
 	/**
@@ -479,40 +479,40 @@ 
 	public function data_table_header() {
 
 		echo '<div class="learners-selects">';
-		do_action( 'sensei_learners_before_dropdown_filters' );
+		do_action('sensei_learners_before_dropdown_filters');
 
 		// Display Course Categories only on default view
-		if( 'courses' == $this->view ) {
+		if ('courses' == $this->view) {
 
 			$selected_cat = 0;
-			if ( isset( $_GET['course_cat'] ) && '' != esc_html( $_GET['course_cat'] ) ) {
-				$selected_cat = intval( $_GET['course_cat'] );
+			if (isset($_GET['course_cat']) && '' != esc_html($_GET['course_cat'])) {
+				$selected_cat = intval($_GET['course_cat']);
 			}
 
-			$cats = get_terms( 'course-category', array( 'hide_empty' => false ) );
+			$cats = get_terms('course-category', array('hide_empty' => false));
 
-			echo '<div class="select-box">' . "\n";
+			echo '<div class="select-box">'."\n";
 
-				echo '<select id="course-category-options" data-placeholder="' . __( 'Course Category', 'woothemes-sensei' ) . '" name="learners_course_cat" class="chosen_select widefat">' . "\n";
+				echo '<select id="course-category-options" data-placeholder="'.__('Course Category', 'woothemes-sensei').'" name="learners_course_cat" class="chosen_select widefat">'."\n";
 
-					echo '<option value="0">' . __( 'All Course Categories', 'woothemes-sensei' ) . '</option>' . "\n";
+					echo '<option value="0">'.__('All Course Categories', 'woothemes-sensei').'</option>'."\n";
 
-					foreach( $cats as $cat ) {
-						echo '<option value="' . $cat->term_id . '"' . selected( $cat->term_id, $selected_cat, false ) . '>' . $cat->name . '</option>' . "\n";
+					foreach ($cats as $cat) {
+						echo '<option value="'.$cat->term_id.'"'.selected($cat->term_id, $selected_cat, false).'>'.$cat->name.'</option>'."\n";
 					}
 
-				echo '</select>' . "\n";
+				echo '</select>'."\n";
 
-			echo '</div>' . "\n";
+			echo '</div>'."\n";
 		}
 		echo '</div><!-- /.learners-selects -->';
 
 		$menu = array();
 		// Have Course no Lesson
-		if( $this->course_id && ! $this->lesson_id ) {
+		if ($this->course_id && ! $this->lesson_id) {
 
 			$learners_class = $lessons_class = '';
-			switch( $this->view ) {
+			switch ($this->view) {
 				case 'learners':
 					$learners_class = 'current';
 				break;
@@ -531,12 +531,12 @@ 
 			$learner_args['view'] = 'learners';
 			$lesson_args['view'] = 'lessons';
 
-			$menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>';
-			$menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>';
+			$menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>';
+			$menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>';
 
 		} 
 		// Have Course and Lesson
-		elseif( $this->course_id && $this->lesson_id ) {
+		elseif ($this->course_id && $this->lesson_id) {
 
 			$query_args = array(
 				'page' => $this->page_slug,
@@ -544,18 +544,18 @@ 
 				'view' => 'lessons'
 			);
 
-			$course = get_the_title( $this->course_id );
+			$course = get_the_title($this->course_id);
 
-			$menu['back'] = '<a href="' . esc_url( add_query_arg( $query_args, admin_url( 'admin.php' ) ) ) . '">' . sprintf( __( '%1$sBack to %2$s%3$s', 'woothemes-sensei' ), '<em>&larr; ', $course, '</em>' ) . '</a>';
+			$menu['back'] = '<a href="'.esc_url(add_query_arg($query_args, admin_url('admin.php'))).'">'.sprintf(__('%1$sBack to %2$s%3$s', 'woothemes-sensei'), '<em>&larr; ', $course, '</em>').'</a>';
 		}
-		$menu = apply_filters( 'sensei_learners_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu = apply_filters('sensei_learners_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 
 	} // End data_table_header()
@@ -580,50 +580,50 @@ 
 		$form_post_type = '';
 		$form_course_id = 0;
 		$form_lesson_id = 0;
-		if( $this->course_id && ! $this->lesson_id ) {
-			$post_title = get_the_title( $this->course_id );
-			$post_type = __( 'Course', 'woothemes-sensei' );
+		if ($this->course_id && ! $this->lesson_id) {
+			$post_title = get_the_title($this->course_id);
+			$post_type = __('Course', 'woothemes-sensei');
 			$form_post_type = 'course';
 			$form_course_id = $this->course_id;
 		}
-		elseif( $this->course_id && $this->lesson_id ) {
-			$post_title = get_the_title( $this->lesson_id );
-			$post_type = __( 'Lesson', 'woothemes-sensei' );
+		elseif ($this->course_id && $this->lesson_id) {
+			$post_title = get_the_title($this->lesson_id);
+			$post_type = __('Lesson', 'woothemes-sensei');
 			$form_post_type = 'lesson';
 			$form_course_id = $this->course_id;
 			$form_lesson_id = $this->lesson_id;
-			$course_title = get_the_title( $this->course_id );
+			$course_title = get_the_title($this->course_id);
 		}
-		if ( empty($form_post_type) ) {
+		if (empty($form_post_type)) {
 			return;
 		}
 		?>
 		<div class="postbox">
-			<h3><span><?php printf( __( 'Add Learner to %1$s', 'woothemes-sensei' ), $post_type ); ?></span></h3>
+			<h3><span><?php printf(__('Add Learner to %1$s', 'woothemes-sensei'), $post_type); ?></span></h3>
 			<div class="inside">
 				<form name="add_learner" action="" method="post">
 					<p>
-						<input name="add_user_id" placeholder="<?php _e( 'Find learner', 'woothemes-sensei' ) ;?>" id="add_learner_search" style="min-width:300px;" />
-						<?php if( 'lesson' == $form_post_type ) { ?>
-							<label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson"  value="yes" /> <?php _e( 'Complete lesson for learner', 'woothemes-sensei' ); ?></label>
-						<?php } elseif( 'course' == $form_post_type ) { ?>
-							<label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course"  value="yes" /> <?php _e( 'Complete course for learner', 'woothemes-sensei' ); ?></label>
+						<input name="add_user_id" placeholder="<?php _e('Find learner', 'woothemes-sensei'); ?>" id="add_learner_search" style="min-width:300px;" />
+						<?php if ('lesson' == $form_post_type) { ?>
+							<label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson"  value="yes" /> <?php _e('Complete lesson for learner', 'woothemes-sensei'); ?></label>
+						<?php } elseif ('course' == $form_post_type) { ?>
+							<label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course"  value="yes" /> <?php _e('Complete course for learner', 'woothemes-sensei'); ?></label>
 						<?php } ?>
 						<br/>
-						<span class="description"><?php _e( 'Search for a user by typing their name or username.', 'woothemes-sensei' ); ?></span>
+						<span class="description"><?php _e('Search for a user by typing their name or username.', 'woothemes-sensei'); ?></span>
 					</p>
-					<p><?php submit_button( sprintf( __( 'Add to \'%1$s\'', 'woothemes-sensei' ), $post_title ), 'primary', 'add_learner_submit', false, array() ); ?></p>
-					<?php if( 'lesson' == $form_post_type ) { ?>
-						<p><span class="description"><?php printf( __( 'Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei' ), $course_title ); ?></span></p>
+					<p><?php submit_button(sprintf(__('Add to \'%1$s\'', 'woothemes-sensei'), $post_title), 'primary', 'add_learner_submit', false, array()); ?></p>
+					<?php if ('lesson' == $form_post_type) { ?>
+						<p><span class="description"><?php printf(__('Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei'), $course_title); ?></span></p>
 					<?php } ?>
 
 					<input type="hidden" name="add_post_type" value="<?php echo $form_post_type; ?>" />
 					<input type="hidden" name="add_course_id" value="<?php echo $form_course_id; ?>" />
 					<input type="hidden" name="add_lesson_id" value="<?php echo $form_lesson_id; ?>" />
 					<?php
-						do_action( 'sensei_learners_add_learner_form' );
+						do_action('sensei_learners_add_learner_form');
 					?>
-					<?php wp_nonce_field( 'add_learner_to_sensei', 'add_learner_nonce' ); ?>
+					<?php wp_nonce_field('add_learner_to_sensei', 'add_learner_nonce'); ?>
 				</form>
 			</div>
 		</div>
@@ -635,19 +635,19 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	public function search_button( $text = '' ) {
+	public function search_button($text = '') {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'learners':
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 
 			case 'lessons':
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 
 			default:
-				$text = __( 'Search Courses', 'woothemes-sensei' );
+				$text = __('Search Courses', 'woothemes-sensei');
 			break;
 		}
 

includes/class-sensei-analysis-course-list-table.php

Braces +12 added lines, -17 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Analysis Course List Table Class
@@ -359,31 +362,26 @@ 
 							$status_class = 'graded';
 
 							$grade = __( 'No Grade', 'woothemes-sensei' );
-						}
-						elseif( 'graded' == $lesson_status->comment_approved ) {
+						} elseif( 'graded' == $lesson_status->comment_approved ) {
 							$status =  __( 'Graded', 'woothemes-sensei' );
 							$status_class = 'graded';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'passed' == $lesson_status->comment_approved ) {
+						} elseif( 'passed' == $lesson_status->comment_approved ) {
 							$status =  __( 'Passed', 'woothemes-sensei' );
 							$status_class = 'graded';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'failed' == $lesson_status->comment_approved ) {
+						} elseif( 'failed' == $lesson_status->comment_approved ) {
 							$status =  __( 'Failed', 'woothemes-sensei' );
 							$status_class = 'failed';
 
 							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
-						}
-						elseif( 'ungraded' == $lesson_status->comment_approved ) {
+						} elseif( 'ungraded' == $lesson_status->comment_approved ) {
 							$status =  __( 'Ungraded', 'woothemes-sensei' );
 							$status_class = 'ungraded';
 
-						}
-						elseif( 'in-progress' == $lesson_status->comment_approved ) {
+						} elseif( 'in-progress' == $lesson_status->comment_approved ) {
 							$status =  __( 'In Progress', 'woothemes-sensei' );
 							$user_end_date = '';
 						}
@@ -392,8 +390,7 @@ 
 					// Output users data
 					if ( $this->csv_output ) {
 						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-					}
-					else {
+					} else {
 						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
 						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
 
@@ -448,8 +445,7 @@ 
 					// Output lesson data
 					if ( $this->csv_output ) {
 						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
-					}
-					else {
+					} else {
 						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
 						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
 
@@ -582,8 +578,7 @@ 
 	public function data_table_header() {
 		if ( $this->user_id ) {
 			$learners_text = __( 'Other Learners taking this Course', 'woothemes-sensei' );
-		}
-		else {
+		} else {
 			$learners_text = __( 'Learners taking this Course', 'woothemes-sensei' );
 		}
 		$lessons_text = __( 'Lessons in this Course', 'woothemes-sensei' );

Indentation +1 added lines, -1 removed lines

@@ -627,7 +627,7 @@
 		$course = get_post( $this->course_id );
 		$report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview';
 		if ( $this->user_id ) {
-            $user_name = Sensei_Learner::get_full_name( $this->user_id );
+			$user_name = Sensei_Learner::get_full_name( $this->user_id );
 			$report = sanitize_title( $user_name  ) . '-' . $report;
 		}
 

Spacing +195 added lines, -195 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Admin Analysis Course Data Table in Sensei.
@@ -20,27 +20,27 @@ 
 	 * Constructor
 	 * @since  1.2.0
 	 */
-	public function __construct ( $course_id = 0, $user_id = 0 ) {
-		$this->course_id = intval( $course_id );
-		$this->user_id = intval( $user_id );
+	public function __construct($course_id = 0, $user_id = 0) {
+		$this->course_id = intval($course_id);
+		$this->user_id = intval($user_id);
 
-		if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'user', 'lesson' ) ) ) {
+		if (isset($_GET['view']) && in_array($_GET['view'], array('user', 'lesson'))) {
 			$this->view = $_GET['view'];
 		}
 
 		// Viewing a single Learner always sets the view to Lessons
-		if( $this->user_id ) {
+		if ($this->user_id) {
 			$this->view = 'lesson';
 		}
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_course' );
+		parent::__construct('analysis_course');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 
 	} // End __construct()
 
@@ -51,45 +51,45 @@ 
 	 */
 	function get_columns() {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$columns = array(
-					'title' => __( 'Learner', 'woothemes-sensei' ),
-					'started' => __( 'Date Started', 'woothemes-sensei' ),
-					'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-					'user_status' => __( 'Status', 'woothemes-sensei' ),
-					'percent' => __( 'Percent Complete', 'woothemes-sensei' ),
+					'title' => __('Learner', 'woothemes-sensei'),
+					'started' => __('Date Started', 'woothemes-sensei'),
+					'completed' => __('Date Completed', 'woothemes-sensei'),
+					'user_status' => __('Status', 'woothemes-sensei'),
+					'percent' => __('Percent Complete', 'woothemes-sensei'),
 				);
 				break;
 
 			case 'lesson' :
 			default:
-				if ( $this->user_id ) {
+				if ($this->user_id) {
 
 					$columns = array(
-						'title' => __( 'Lesson', 'woothemes-sensei' ),
-						'started' => __( 'Date Started', 'woothemes-sensei' ),
-						'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-						'user_status' => __( 'Status', 'woothemes-sensei' ),
-						'grade' => __( 'Grade', 'woothemes-sensei' ),
+						'title' => __('Lesson', 'woothemes-sensei'),
+						'started' => __('Date Started', 'woothemes-sensei'),
+						'completed' => __('Date Completed', 'woothemes-sensei'),
+						'user_status' => __('Status', 'woothemes-sensei'),
+						'grade' => __('Grade', 'woothemes-sensei'),
 					);
 
 				} else {
 
 					$columns = array(
-						'title' => __( 'Lesson', 'woothemes-sensei' ),
-						'num_learners' => __( 'Learners', 'woothemes-sensei' ),
-						'completions' => __( 'Completed', 'woothemes-sensei' ),
-						'average_grade' => __( 'Average Grade', 'woothemes-sensei' ),
+						'title' => __('Lesson', 'woothemes-sensei'),
+						'num_learners' => __('Learners', 'woothemes-sensei'),
+						'completions' => __('Completed', 'woothemes-sensei'),
+						'average_grade' => __('Average Grade', 'woothemes-sensei'),
 					);
 
 				}
 				break;
 		}
 		// Backwards compatible
-		$columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns', $columns, $this);
 		// Moving forward, single filter with args
-		$columns = apply_filters( 'sensei_analysis_course_columns', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_columns', $columns, $this);
 		return $columns;
 	}
 
@@ -100,46 +100,46 @@ 
 	 */
 	function get_sortable_columns() {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$columns = array(
-					'title' => array( 'title', false ),
-					'started' => array( 'started', false ),
-					'completed' => array( 'completed', false ),
-					'user_status' => array( 'user_status', false ),
+					'title' => array('title', false),
+					'started' => array('started', false),
+					'completed' => array('completed', false),
+					'user_status' => array('user_status', false),
 //					'grade' => array( 'grade', false ),
-					'percent' => array( 'percent', false )
+					'percent' => array('percent', false)
 				);
 				break;
 
 			case 'lesson' :
 			default:
-				if ( $this->user_id ) {
+				if ($this->user_id) {
 
 					$columns = array(
-						'title' => array( 'title', false ),
-						'started' => array( 'started', false ),
-						'completed' => array( 'completed', false ),
-						'user_status' => array( 'user_status', false ),
-						'grade' => array( 'grade', false ),
+						'title' => array('title', false),
+						'started' => array('started', false),
+						'completed' => array('completed', false),
+						'user_status' => array('user_status', false),
+						'grade' => array('grade', false),
 					);
 
 				} else {
 
 					$columns = array(
-						'title' => array( 'title', false ),
-						'num_learners' => array( 'num_learners', false ),
-						'completions' => array( 'completions', false ),
-						'average_grade' => array( 'average_grade', false )
+						'title' => array('title', false),
+						'num_learners' => array('num_learners', false),
+						'completions' => array('completions', false),
+						'average_grade' => array('average_grade', false)
 					);
 
 				}
 				break;
 		}
 		// Backwards compatible
-		$columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns_sortable', $columns, $this);
 		// Moving forward, single filter with args
-		$columns = apply_filters( 'sensei_analysis_course_columns_sortable', $columns, $this );
+		$columns = apply_filters('sensei_analysis_course_columns_sortable', $columns, $this);
 		return $columns;
 	}
 
@@ -153,32 +153,32 @@ 
 
 		// Handle orderby (needs work)
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -187,28 +187,28 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$this->items = $this->get_course_statuses( $args );
+				$this->items = $this->get_course_statuses($args);
 				break;
 
 			case 'lesson':
 			default:
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 		}
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -224,22 +224,22 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
@@ -247,32 +247,32 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$this->items = $this->get_course_statuses( $args );
+				$this->items = $this->get_course_statuses($args);
 				break;
 
 			case 'lesson':
 			default:
-				$this->items = $this->get_lessons( $args );
+				$this->items = $this->get_lessons($args);
 				break;
 		}
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -284,37 +284,37 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$user_start_date = get_comment_meta( $item->comment_ID, 'start', true );
+				$user_start_date = get_comment_meta($item->comment_ID, 'start', true);
 				$user_end_date = $item->comment_date;
 
-				if( 'complete' == $item->comment_approved ) {
+				if ('complete' == $item->comment_approved) {
 
-					$status =  __( 'Completed', 'woothemes-sensei' );
+					$status = __('Completed', 'woothemes-sensei');
 					$status_class = 'graded';
 
 				} else {
 
-					$status =  __( 'In Progress', 'woothemes-sensei' );
+					$status = __('In Progress', 'woothemes-sensei');
 					$status_class = 'in-progress';
 					$user_end_date = '';
 
 				}
-				$course_percent = get_comment_meta( $item->comment_ID, 'percent', true );
+				$course_percent = get_comment_meta($item->comment_ID, 'percent', true);
 
 				// Output users data
-				$user_name = Sensei_Learner::get_full_name( $item->user_id );
+				$user_name = Sensei_Learner::get_full_name($item->user_id);
 
-				if ( !$this->csv_output ) {
+				if ( ! $this->csv_output) {
 
-					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) );
+					$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id), admin_url('admin.php'));
 
-					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $user_name . '</a></strong>';
-					$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-					if ( is_numeric($course_percent) ) {
+					$user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$user_name.'</a></strong>';
+					$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+					if (is_numeric($course_percent)) {
 
 						$course_percent .= '%';
 
@@ -322,19 +322,19 @@ 
 
 				} // End If Statement
 
-				$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $user_name,
+				$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $user_name,
 												'started' => $user_start_date,
 												'completed' => $user_end_date,
 												'user_status' => $status,
 												'percent' => $course_percent,
-											), $item, $this );
+											), $item, $this);
 				break;
 
 			case 'lesson':
 			default:
 				// Displaying lessons for this Course for a specific User
-				if ( $this->user_id ) {
-					$status = __( 'Not started', 'woothemes-sensei' );
+				if ($this->user_id) {
+					$status = __('Not started', 'woothemes-sensei');
 					$user_start_date = $user_end_date = $status_class = $grade = '';
 
 					$lesson_args = array(
@@ -343,66 +343,66 @@ 
 							'type' => 'sensei_lesson_status',
 							'status' => 'any',
 						);
-					$lesson_status = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id ), true );
+					$lesson_status = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id), true);
 
-					if ( !empty($lesson_status) ) {
-						$user_start_date = get_comment_meta( $lesson_status->comment_ID, 'start', true );
+					if ( ! empty($lesson_status)) {
+						$user_start_date = get_comment_meta($lesson_status->comment_ID, 'start', true);
 						$user_end_date = $lesson_status->comment_date;
 
-						if( 'complete' == $lesson_status->comment_approved ) {
-							$status = __( 'Completed', 'woothemes-sensei' );
+						if ('complete' == $lesson_status->comment_approved) {
+							$status = __('Completed', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = __( 'No Grade', 'woothemes-sensei' );
+							$grade = __('No Grade', 'woothemes-sensei');
 						}
-						elseif( 'graded' == $lesson_status->comment_approved ) {
-							$status =  __( 'Graded', 'woothemes-sensei' );
+						elseif ('graded' == $lesson_status->comment_approved) {
+							$status = __('Graded', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'passed' == $lesson_status->comment_approved ) {
-							$status =  __( 'Passed', 'woothemes-sensei' );
+						elseif ('passed' == $lesson_status->comment_approved) {
+							$status = __('Passed', 'woothemes-sensei');
 							$status_class = 'graded';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'failed' == $lesson_status->comment_approved ) {
-							$status =  __( 'Failed', 'woothemes-sensei' );
+						elseif ('failed' == $lesson_status->comment_approved) {
+							$status = __('Failed', 'woothemes-sensei');
 							$status_class = 'failed';
 
-							$grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true);
+							$grade = get_comment_meta($lesson_status->comment_ID, 'grade', true);
 						}
-						elseif( 'ungraded' == $lesson_status->comment_approved ) {
-							$status =  __( 'Ungraded', 'woothemes-sensei' );
+						elseif ('ungraded' == $lesson_status->comment_approved) {
+							$status = __('Ungraded', 'woothemes-sensei');
 							$status_class = 'ungraded';
 
 						}
-						elseif( 'in-progress' == $lesson_status->comment_approved ) {
-							$status =  __( 'In Progress', 'woothemes-sensei' );
+						elseif ('in-progress' == $lesson_status->comment_approved) {
+							$status = __('In Progress', 'woothemes-sensei');
 							$user_end_date = '';
 						}
 					} // END lesson_status
 
 					// Output users data
-					if ( $this->csv_output ) {
-						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+					if ($this->csv_output) {
+						$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 					}
 					else {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+						$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+						$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-						$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-						if ( is_numeric($grade) ) {
+						$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+						if (is_numeric($grade)) {
 							$grade .= '%';
 						}
 					} // End If Statement
-					$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title,
+					$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title,
 													'started' => $user_start_date,
 													'completed' => $user_end_date,
 													'user_status' => $status,
 													'grade' => $grade,
-												), $item, $this );
+												), $item, $this);
 				}
 				// Display lessons for this Course regardless of users
 				else {
@@ -412,51 +412,51 @@ 
 							'type' => 'sensei_lesson_status',
 							'status' => 'any',
 						);
-					$lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) );
+					$lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item));
 
 					// Get Course Completions
 					$lesson_args = array(
 							'post_id' => $item->ID,
 							'type' => 'sensei_lesson_status',
-							'status' => array( 'complete', 'graded', 'passed', 'failed' ),
+							'status' => array('complete', 'graded', 'passed', 'failed'),
 							'count' => true,
 						);
-					$lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) );
+					$lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item));
 
 					$lesson_average_grade = __('n/a', 'woothemes-sensei');
-					if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) {
+					if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) {
 						// Get Percent Complete
 						$grade_args = array(
 								'post_id' => $item->ID,
 								'type' => 'sensei_lesson_status',
-								'status' => array( 'graded', 'passed', 'failed' ),
+								'status' => array('graded', 'passed', 'failed'),
 								'meta_key' => 'grade',
 							);
-						add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) );
-						$lesson_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true );
-						remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) );
+						add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter'));
+						$lesson_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true);
+						remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter'));
 
-						$grade_count = !empty( $lesson_grades->total ) ? $lesson_grades->total : 1;
-						$grade_total = !empty( $lesson_grades->meta_sum ) ? doubleval( $lesson_grades->meta_sum ) : 0;
-						$lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) );
+						$grade_count = ! empty($lesson_grades->total) ? $lesson_grades->total : 1;
+						$grade_total = ! empty($lesson_grades->meta_sum) ? doubleval($lesson_grades->meta_sum) : 0;
+						$lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2));
 					}
 					// Output lesson data
-					if ( $this->csv_output ) {
-						$lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID );
+					if ($this->csv_output) {
+						$lesson_title = apply_filters('the_title', $item->post_title, $item->ID);
 					}
 					else {
-						$url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) );
-						$lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>';
+						$url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php'));
+						$lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>';
 
-						if ( is_numeric( $lesson_average_grade ) ) {
+						if (is_numeric($lesson_average_grade)) {
 							$lesson_average_grade .= '%';
 						}
 					} // End If Statement
-					$column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title,
+					$column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title,
 													'num_learners' => $lesson_students,
 													'completions' => $lesson_completions,
 													'average_grade' => $lesson_average_grade,
-												), $item, $this );
+												), $item, $this);
 				} // END if
 				break;
 		} // END switch
@@ -469,7 +469,7 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_course_statuses( $args ) {
+	private function get_course_statuses($args) {
 
 		$activity_args = array(
 				'post_id' => $this->course_id,
@@ -482,34 +482,34 @@ 
 			);
 
 		// Searching users on statuses requires sub-selecting the statuses by user_ids
-		if ( $this->search ) {
+		if ($this->search) {
 			$user_args = array(
-				'search' => '*' . $this->search . '*',
+				'search' => '*'.$this->search.'*',
 				'fields' => 'ID',
 			);
 			// Filter for extending
-			$user_args = apply_filters( 'sensei_analysis_course_search_users', $user_args );
-			if ( !empty( $user_args ) ) {
-				$learners_search = new WP_User_Query( $user_args );
+			$user_args = apply_filters('sensei_analysis_course_search_users', $user_args);
+			if ( ! empty($user_args)) {
+				$learners_search = new WP_User_Query($user_args);
 				// Store for reuse on counts
 				$activity_args['user_id'] = (array) $learners_search->get_results();
 			}
 		} // End If Statement
 
-		$activity_args = apply_filters( 'sensei_analysis_course_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_analysis_course_filter_statuses', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $this->total_items < $activity_args['offset'] ) {
-			$new_paged = floor( $this->total_items / $activity_args['number'] );
+		if ($this->total_items < $activity_args['offset']) {
+			$new_paged = floor($this->total_items / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 		}
-		$statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($statuses) ) {
-			$statuses = array( $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = array($statuses);
 		}
 		return $statuses;
 	} // End get_course_statuses()
@@ -519,32 +519,32 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_lessons( $args ) {
+	private function get_lessons($args) {
 
-		$lessons_args = array( 'post_type'         => 'lesson',
+		$lessons_args = array('post_type'         => 'lesson',
 							'posts_per_page'      => $args['number'],
 							'offset'              => $args['offset'],
-							'meta_key'            => '_order_' . $this->course_id,
+							'meta_key'            => '_order_'.$this->course_id,
 //							'orderby'             => $args['orderby'],
 							'order'               => $args['order'],
 							'meta_query'          => array(
 								array(
 									'key' => '_lesson_course',
-									'value' => intval( $this->course_id ),
+									'value' => intval($this->course_id),
 								),
 							),
 							'post_status'         => array('publish', 'private'),
 							'suppress_filters'    => 0
 							);
-		if ( $this->search ) {
+		if ($this->search) {
 			$lessons_args['s'] = $this->search;
 		}
-		if ( $this->csv_output ) {
+		if ($this->csv_output) {
 			$lessons_args['posts_per_page'] = '-1';
 		}
 
 		// Using WP_Query as get_posts() doesn't support 'found_posts'
-		$lessons_query = new WP_Query( apply_filters( 'sensei_analysis_course_filter_lessons', $lessons_args ) );
+		$lessons_query = new WP_Query(apply_filters('sensei_analysis_course_filter_lessons', $lessons_args));
 		$this->total_items = $lessons_query->found_posts;
 		return $lessons_query->posts;
 	} // End get_lessons()
@@ -556,17 +556,17 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
-				$text = __( 'No learners found.', 'woothemes-sensei' );
+				$text = __('No learners found.', 'woothemes-sensei');
 				break;
 
 			case 'lesson':
 			default:
-				$text = __( 'No lessons found.', 'woothemes-sensei' );
+				$text = __('No lessons found.', 'woothemes-sensei');
 				break;
 		}
-		echo apply_filters( 'sensei_analysis_course_no_items_text', $text );
+		echo apply_filters('sensei_analysis_course_no_items_text', $text);
 	} // End no_items()
 
 	/**
@@ -575,25 +575,25 @@ 
 	 * @return void
 	 */
 	public function data_table_header() {
-		if ( $this->user_id ) {
-			$learners_text = __( 'Other Learners taking this Course', 'woothemes-sensei' );
+		if ($this->user_id) {
+			$learners_text = __('Other Learners taking this Course', 'woothemes-sensei');
 		}
 		else {
-			$learners_text = __( 'Learners taking this Course', 'woothemes-sensei' );
+			$learners_text = __('Learners taking this Course', 'woothemes-sensei');
 		}
-		$lessons_text = __( 'Lessons in this Course', 'woothemes-sensei' );
+		$lessons_text = __('Lessons in this Course', 'woothemes-sensei');
 
 		$url_args = array(
 			'page' => $this->page_slug,
 			'course_id' => $this->course_id,
 		);
-		$learners_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'user' ) ), admin_url( 'admin.php' ) ) );
-		$lessons_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'lesson' ) ), admin_url( 'admin.php' ) ) );
+		$learners_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'user')), admin_url('admin.php')));
+		$lessons_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'lesson')), admin_url('admin.php')));
 
 		$learners_class = $lessons_class = '';
 
 		$menu = array();
-		switch( $this->view ) {
+		switch ($this->view) {
 			case 'user' :
 				$learners_class = 'current';
 				break;
@@ -603,17 +603,17 @@ 
 				$lessons_class = 'current';
 				break;
 		}
-		$menu['lesson'] = sprintf( '<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text );
-		$menu['user'] = sprintf( '<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text );
-
-		$menu = apply_filters( 'sensei_analysis_course_sub_menu', $menu );
-		if ( !empty($menu) ) {
-			echo '<ul class="subsubsub">' . "\n";
-			foreach ( $menu as $class => $item ) {
-				$menu[ $class ] = "\t<li class='$class'>$item";
+		$menu['lesson'] = sprintf('<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text);
+		$menu['user'] = sprintf('<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text);
+
+		$menu = apply_filters('sensei_analysis_course_sub_menu', $menu);
+		if ( ! empty($menu)) {
+			echo '<ul class="subsubsub">'."\n";
+			foreach ($menu as $class => $item) {
+				$menu[$class] = "\t<li class='$class'>$item";
 			}
-			echo implode( " |</li>\n", $menu ) . "</li>\n";
-			echo '</ul>' . "\n";
+			echo implode(" |</li>\n", $menu)."</li>\n";
+			echo '</ul>'."\n";
 		}
 	} // End data_table_header()
 
@@ -624,19 +624,19 @@ 
 	 */
 	public function data_table_footer() {
 
-		$course = get_post( $this->course_id );
-		$report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview';
-		if ( $this->user_id ) {
-            $user_name = Sensei_Learner::get_full_name( $this->user_id );
-			$report = sanitize_title( $user_name  ) . '-' . $report;
+		$course = get_post($this->course_id);
+		$report = sanitize_title($course->post_title).'-'.$this->view.'s-overview';
+		if ($this->user_id) {
+            $user_name = Sensei_Learner::get_full_name($this->user_id);
+			$report = sanitize_title($user_name).'-'.$report;
 		}
 
-		$url_args = array( 'page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report );
-		if ( $this->user_id ) {
+		$url_args = array('page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report);
+		if ($this->user_id) {
 			$url_args['user_id'] = $this->user_id;
 		}
-		$url =  add_query_arg( $url_args, admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$url = add_query_arg($url_args, admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	} // End data_table_footer()
 
 	/**
@@ -644,15 +644,15 @@ 
 	 * @since  1.7.0
 	 * @return string $text
 	 */
-	public function search_button( $text = '' ) {
-		switch( $this->view ) {
+	public function search_button($text = '') {
+		switch ($this->view) {
 			case 'user':
-				$text = __( 'Search Learners', 'woothemes-sensei' );
+				$text = __('Search Learners', 'woothemes-sensei');
 			break;
 
 			case 'lesson':
 			default:
-				$text = __( 'Search Lessons', 'woothemes-sensei' );
+				$text = __('Search Lessons', 'woothemes-sensei');
 			break;
 		} // End Switch Statement
 

includes/class-sensei-updates.php

Braces +44 added lines, -26 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Updates Class
@@ -769,9 +772,15 @@ 
 		$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;
+			if( '' == $activity->comment_type ) {
+				continue;
+			}
+			if( strpos( 'sensei_', $activity->comment_type ) != 0 ) {
+				continue;
+			}
+			if( 0 == $activity->user_id ) {
+				continue;
+			}
 			$activity_count[] = $activity->comment_ID;
 		}
 
@@ -784,9 +793,15 @@ 
 		$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;
+			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 );
 
@@ -845,7 +860,9 @@ 
 
 		foreach( $questions as $question ) {
 
-			if( ! isset( $question->ID ) ) continue;
+			if( ! isset( $question->ID ) ) {
+				continue;
+			}
 
 			$quiz_id = get_post_meta( $question->ID, '_quiz_id', true );
 
@@ -882,7 +899,9 @@ 
 
 		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' );
@@ -910,7 +929,9 @@ 
 
 		foreach( $lessons as $lesson ) {
 
-			if( ! isset( $lesson->ID ) ) continue;
+			if( ! isset( $lesson->ID ) ) {
+				continue;
+			}
 
 			$course_id = get_post_meta( $lesson->ID, '_lesson_course', true);
 
@@ -984,11 +1005,15 @@ 
 
 		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 );
 
-			if( empty( $lesson_id ) ) continue;
+			if( empty( $lesson_id ) ) {
+				continue;
+			}
 
 			$data = array(
 				'ID' => $quiz->ID,
@@ -1071,8 +1096,7 @@ 
 				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 );
@@ -1222,20 +1246,16 @@ 
 							// 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 ) {
 								$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 {
+							} else {
 								$status = 'graded';
 							}
-						}
-						else {
+						} else {
 							// If the lesson has a quiz, but the user doesn't have a grade, it's not yet been graded
 							$status = 'ungraded';
 						}
-					}
-					else {
+					} else {
 						// Lesson has no quiz, so it can only ever be this status
 						$status = 'complete';
 					}
@@ -1374,8 +1394,7 @@ 
 					}
 					$meta_data['complete'] = $lessons_completed;
 					$meta_data['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) );
-				}
-				else {
+				} else {
 					// Course has no lessons, therefore cannot be 'complete'
 					$status = 'in-progress';
 				}
@@ -1506,8 +1525,7 @@ 
 									$lessons_completed++;
 									break;
 							}
-						}
-						else {
+						} else {
 							switch ( $lesson_status ) {
 								case 'complete': // Lesson has no quiz/questions
 								case 'graded': // Lesson has quiz, but it's not important what the grade was

Doc Comments +4 added lines, -4 removed lines

@@ -1424,8 +1424,8 @@ 
 	 *
 	 * @global type $woothemes_sensei
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	function status_changes_repair_course_statuses( $n = 50, $offset = 0 ) {
@@ -1669,8 +1669,8 @@ 
 	 * Update the comment counts for all Courses and Lessons now that sensei comments will no longer be counted.
 	 *
 	 * @global type $wpdb
-	 * @param type $n
-	 * @param type $offset
+	 * @param integer $n
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	public function update_comment_course_lesson_comment_counts( $n = 50, $offset = 0 ) {

Indentation +276 added lines, -276 removed lines

@@ -12,107 +12,107 @@ 
  */
 class Sensei_Updates
 {
-    public $token = 'woothemes-sensei';
-    public $version;
-    public $updates_run;
-    public $updates;
-    private $parent;
-
-    /**
-     * Constructor.
-     *
-     * @access  public
-     * @since   1.1.0
-     * @param   string $parent The main Sensei object by Ref.
-     * @return  void
-     */
-    public function __construct($parent)
-    {
+	public $token = 'woothemes-sensei';
+	public $version;
+	public $updates_run;
+	public $updates;
+	private $parent;
+
+	/**
+	 * Constructor.
+	 *
+	 * @access  public
+	 * @since   1.1.0
+	 * @param   string $parent The main Sensei object by Ref.
+	 * @return  void
+	 */
+	public function __construct($parent)
+	{
 
 		// Setup object data
 		$this->parent = $parent;
 		$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')),
-            'manual' => array()
-        ),
-            '1.3.0' => array('auto' => array('set_default_quiz_grade_type' => array('title' => __('Set default quiz grade type', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei')),
-                'set_default_question_type' => array('title' => __('Set default question type', 'woothemes-sensei'), 'desc' => __('Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei'))
-            ),
-                'manual' => array('update_question_answer_data' => array('title' => __('Update question answer data', 'woothemes-sensei'), 'desc' => __('Updates questions to use the new question types structure.', 'woothemes-sensei')))
-            ),
-            '1.4.0' => array('auto' => array('update_question_grade_points' => array('title' => __('Update question grade points', 'woothemes-sensei'), 'desc' => __('Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei'))),
-                'manual' => array()
-            ),
-            '1.5.0' => array('auto' => array('convert_essay_paste_questions' => array('title' => __('Convert essay paste questions into multi-line questions', 'woothemes-sensei'), 'desc' => __('Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei'))),
-                'manual' => array('set_random_question_order' => array('title' => __('Set all quizzes to have a random question order', 'woothemes-sensei'), 'desc' => __('Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei')),
-                    'set_default_show_question_count' => array('title' => __('Set all quizzes to show all questions', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei')),
-                    'remove_deleted_user_activity' => array('title' => __('Remove Sensei activity for deleted users', 'woothemes-sensei'), 'desc' => __('Removes all course, lesson & quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei')))
-            ),
-            '1.6.0' => array('auto' => array('add_teacher_role' => array('title' => __('Add \'Teacher\' role', 'woothemes-sensei'), 'desc' => __('Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei')),
-                'add_sensei_caps' => array('title' => __('Add administrator capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei')),
-                'restructure_question_meta' => array('title' => __('Restructure question meta data', 'woothemes-sensei'), 'desc' => __('Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei')),
-                'update_quiz_settings' => array('title' => __('Add new quiz settings', 'woothemes-sensei'), 'desc' => __('Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei')),
-                'reset_lesson_order_meta' => array('title' => __('Set default order of lessons', 'woothemes-sensei'), 'desc' => __('Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei')),),
-                'manual' => array()
-            ),
-            '1.7.0' => array('auto' => array('add_editor_caps' => array('title' => __('Add Editor capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei')),),
-                'forced' => array('update_question_gap_fill_separators' => array('title' => __('Update Gap Fill questions', 'woothemes-sensei'), 'desc' => __('Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei')),
-                    'update_quiz_lesson_relationship' => array('title' => __('Restructure quiz lesson relationship', 'woothemes-sensei'), 'desc' => __('Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei')),
-                    'status_changes_fix_lessons' => array('title' => __('Update lesson statuses', 'woothemes-sensei'), 'desc' => __('Update existing lesson statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_lessons' => array('title' => __('Convert lesson statuses', 'woothemes-sensei'), 'desc' => __('Convert to new lesson statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_courses' => array('title' => __('Convert course statuses', 'woothemes-sensei'), 'desc' => __('Convert to new course statuses.', 'woothemes-sensei')),
-                    'status_changes_convert_questions' => array('title' => __('Convert question statuses', 'woothemes-sensei'), 'desc' => __('Convert to new question statuses.', 'woothemes-sensei')),
-                    'update_legacy_sensei_comments_status' => array('title' => __('Convert legacy Sensei activity types', 'woothemes-sensei'), 'desc' => __('Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei')),
-                    'update_comment_course_lesson_comment_counts' => array('title' => __('Update comment counts', 'woothemes-sensei'), 'desc' => __('Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei')),),
-            ),
-            '1.7.2' => array('auto' => array('index_comment_status_field' => array('title' => __('Add database index to comment statuses', 'woothemes-sensei'), 'desc' => __('This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei')),),
-                /*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
-            ),
-            '1.8.0' => array('auto' => array('enhance_teacher_role' => array('title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.'),),
-                'manual' => 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')),
+			'manual' => array()
+		),
+			'1.3.0' => array('auto' => array('set_default_quiz_grade_type' => array('title' => __('Set default quiz grade type', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to the default \'auto\' grade type.', 'woothemes-sensei')),
+				'set_default_question_type' => array('title' => __('Set default question type', 'woothemes-sensei'), 'desc' => __('Sets all questions to the default \'multiple choice\' type.', 'woothemes-sensei'))
+			),
+				'manual' => array('update_question_answer_data' => array('title' => __('Update question answer data', 'woothemes-sensei'), 'desc' => __('Updates questions to use the new question types structure.', 'woothemes-sensei')))
+			),
+			'1.4.0' => array('auto' => array('update_question_grade_points' => array('title' => __('Update question grade points', 'woothemes-sensei'), 'desc' => __('Sets all question grade points to the default value of \'1\'.', 'woothemes-sensei'))),
+				'manual' => array()
+			),
+			'1.5.0' => array('auto' => array('convert_essay_paste_questions' => array('title' => __('Convert essay paste questions into multi-line questions', 'woothemes-sensei'), 'desc' => __('Converts all essay paste questions into multi-line questions as the essay paste question type was removed in v1.5.0.', 'woothemes-sensei'))),
+				'manual' => array('set_random_question_order' => array('title' => __('Set all quizzes to have a random question order', 'woothemes-sensei'), 'desc' => __('Sets the order all of questions in all quizzes to a random order, which can be switched off per quiz.', 'woothemes-sensei')),
+					'set_default_show_question_count' => array('title' => __('Set all quizzes to show all questions', 'woothemes-sensei'), 'desc' => __('Sets all quizzes to show all questions - this can be changed per quiz.', 'woothemes-sensei')),
+					'remove_deleted_user_activity' => array('title' => __('Remove Sensei activity for deleted users', 'woothemes-sensei'), 'desc' => __('Removes all course, lesson & quiz activity for users that have already been deleted from the database. This will fix incorrect learner counts in the Analysis section.', 'woothemes-sensei')))
+			),
+			'1.6.0' => array('auto' => array('add_teacher_role' => array('title' => __('Add \'Teacher\' role', 'woothemes-sensei'), 'desc' => __('Adds a \'Teacher\' role to your WordPress site that will allow users to mange the Grading and Analysis pages.', 'woothemes-sensei')),
+				'add_sensei_caps' => array('title' => __('Add administrator capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei\' and \'manage_sensei_grades\' capabilities to the Administrator role.', 'woothemes-sensei')),
+				'restructure_question_meta' => array('title' => __('Restructure question meta data', 'woothemes-sensei'), 'desc' => __('Restructures the question meta data as it relates to quizzes - this accounts for changes in the data structure in v1.6+.', 'woothemes-sensei')),
+				'update_quiz_settings' => array('title' => __('Add new quiz settings', 'woothemes-sensei'), 'desc' => __('Adds new settings to quizzes that were previously registered as global settings.', 'woothemes-sensei')),
+				'reset_lesson_order_meta' => array('title' => __('Set default order of lessons', 'woothemes-sensei'), 'desc' => __('Adds data to lessons to ensure that they show up on the \'Order Lessons\' screen - if this update has been run once before then it will reset all lessons to the default order.', 'woothemes-sensei')),),
+				'manual' => array()
+			),
+			'1.7.0' => array('auto' => array('add_editor_caps' => array('title' => __('Add Editor capabilities', 'woothemes-sensei'), 'desc' => __('Adds the \'manage_sensei_grades\' capability to the Editor role.', 'woothemes-sensei')),),
+				'forced' => array('update_question_gap_fill_separators' => array('title' => __('Update Gap Fill questions', 'woothemes-sensei'), 'desc' => __('Updates the format of gap fill questions to allow auto grading and greater flexibility in matching.', 'woothemes-sensei')),
+					'update_quiz_lesson_relationship' => array('title' => __('Restructure quiz lesson relationship', 'woothemes-sensei'), 'desc' => __('Adds data to quizzes and lessons to ensure that they maintain their 1 to 1 relationship.', 'woothemes-sensei')),
+					'status_changes_fix_lessons' => array('title' => __('Update lesson statuses', 'woothemes-sensei'), 'desc' => __('Update existing lesson statuses.', 'woothemes-sensei')),
+					'status_changes_convert_lessons' => array('title' => __('Convert lesson statuses', 'woothemes-sensei'), 'desc' => __('Convert to new lesson statuses.', 'woothemes-sensei')),
+					'status_changes_convert_courses' => array('title' => __('Convert course statuses', 'woothemes-sensei'), 'desc' => __('Convert to new course statuses.', 'woothemes-sensei')),
+					'status_changes_convert_questions' => array('title' => __('Convert question statuses', 'woothemes-sensei'), 'desc' => __('Convert to new question statuses.', 'woothemes-sensei')),
+					'update_legacy_sensei_comments_status' => array('title' => __('Convert legacy Sensei activity types', 'woothemes-sensei'), 'desc' => __('Convert all legacy Sensei activity types such as \'sensei_lesson_start\' and \'sensei_user_answer\' to new status format.', 'woothemes-sensei')),
+					'update_comment_course_lesson_comment_counts' => array('title' => __('Update comment counts', 'woothemes-sensei'), 'desc' => __('Update comment counts on Courses and Lessons due to status changes.', 'woothemes-sensei')),),
+			),
+			'1.7.2' => array('auto' => array('index_comment_status_field' => array('title' => __('Add database index to comment statuses', 'woothemes-sensei'), 'desc' => __('This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei')),),
+				/*'manual' 		=> array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/
+			),
+			'1.8.0' => array('auto' => array('enhance_teacher_role' => array('title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.'),),
+				'manual' => array()
+			),
+		);
 
 		$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);
-
-    } // End __construct()
-
-    /**
-     * add_update_admin_screen Adds admin screen to run manual udpates
-     *
-     * @access public
-     * @since  1.3.7
-     * @return void
-     */
-    public function add_update_admin_screen()
-    {
-        if (current_user_can('manage_options')) {
-            add_submenu_page('sensei', __('Sensei Updates', 'woothemes-sensei'), __('Data Updates', 'woothemes-sensei'), 'manage_options', 'sensei_updates', array($this, 'sensei_updates_page'));
-        }
-    } // End add_update_admin_screen()
-
-    /**
-     * sensei_updates_page HTML output for manual update screen
-     *
-     * @access public
-     * @since  1.3.7
-     * @return void
-     */
-    public function sensei_updates_page() {
-
-        // Only allow admins to load this page and run the update functions
-        if ( ! current_user_can('manage_options')) {
-
-            return;
-
-        }
-        ?>
+		// Manual Update Screen
+		add_action('admin_menu', array($this, 'add_update_admin_screen'), 50);
+
+	} // End __construct()
+
+	/**
+	 * add_update_admin_screen Adds admin screen to run manual udpates
+	 *
+	 * @access public
+	 * @since  1.3.7
+	 * @return void
+	 */
+	public function add_update_admin_screen()
+	{
+		if (current_user_can('manage_options')) {
+			add_submenu_page('sensei', __('Sensei Updates', 'woothemes-sensei'), __('Data Updates', 'woothemes-sensei'), 'manage_options', 'sensei_updates', array($this, 'sensei_updates_page'));
+		}
+	} // End add_update_admin_screen()
+
+	/**
+	 * sensei_updates_page HTML output for manual update screen
+	 *
+	 * @access public
+	 * @since  1.3.7
+	 * @return void
+	 */
+	public function sensei_updates_page() {
+
+		// Only allow admins to load this page and run the update functions
+		if ( ! current_user_can('manage_options')) {
+
+			return;
+
+		}
+		?>
 
         <div class="wrap">
 
@@ -120,111 +120,111 @@ 
         <h2><?php _e('Sensei Updates', 'woothemes-sensei'); ?></h2>
 
         <?php
-        $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']))) {
+		$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']))) {
 
-            // Setup the data variables
-            $n = intval($_GET['n']);
-            $functions_list = '';
-            $done_processing = false;
+			// Setup the data variables
+			$n = intval($_GET['n']);
+			$functions_list = '';
+			$done_processing = false;
 
-            // Check for updates to run
-            if (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) {
+			// Check for updates to run
+			if (isset($_POST['checked'][0]) && '' != $_POST['checked'][0]) {
 
-                foreach ($_POST['checked'] as $key => $function_name) {
+				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>',
-                            403
-                        );
+						wp_die(
+							'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+							'<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+							403
+						);
 
-                    }
+					}
 
-                    // Dynamic function call
-                    if (method_exists($this, $function_name)) {
+					// Dynamic function call
+					if (method_exists($this, $function_name)) {
 
-                        $done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
+						$done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
 
-                    } elseif ($this->function_in_whitelist($function_name)) {
+					} elseif ($this->function_in_whitelist($function_name)) {
 
-                        $done_processing = call_user_func_array($function_name, array(50, $n));
+						$done_processing = call_user_func_array($function_name, array(50, $n));
 
-                    } else {
+					} else {
 
-                        _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
-                        return;
+						_doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+						return;
 
-                    }// End If Statement
+					}// End If Statement
 
-                // Add to functions list get args
-                if ('' == $functions_list) {
-                    $functions_list .= $function_name;
-                } else {
-                    $functions_list .= '+' . $function_name;
-                } // End If Statement
+				// Add to functions list get args
+				if ('' == $functions_list) {
+					$functions_list .= $function_name;
+				} else {
+					$functions_list .= '+' . $function_name;
+				} // End If Statement
 
-                // Mark update has having been run
-                $this->set_update_run($function_name);
+				// Mark update has having been run
+				$this->set_update_run($function_name);
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-        // Check for updates to run
-        if (isset($_GET['functions']) && '' != $_GET['functions']) {
+		// Check for updates to run
+		if (isset($_GET['functions']) && '' != $_GET['functions']) {
 
-            // Existing functions from GET variables instead of POST
-            $functions_array = $_GET['functions'];
+			// Existing functions from GET variables instead of POST
+			$functions_array = $_GET['functions'];
 
-            foreach ($functions_array as $key => $function_name) {
+			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>',
-                        403
-                    );
+					wp_die(
+						'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+						'<p>' . __( 'The nonce supplied in order to run this update function is invalid','woothemes-sensei') . '</p>',
+						403
+					);
 
-                }
+				}
 
-                // Dynamic function call
-                if (method_exists($this, $function_name)) {
+				// Dynamic function call
+				if (method_exists($this, $function_name)) {
 
-                    $done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
+					$done_processing = call_user_func_array(array($this, $function_name), array(50, $n));
 
-                } elseif ($this->function_in_whitelist($function_name)) {
+				} elseif ($this->function_in_whitelist($function_name)) {
 
-                    $done_processing = call_user_func_array($function_name, array(50, $n));
+					$done_processing = call_user_func_array($function_name, array(50, $n));
 
-                } else {
+				} else {
 
-                    _doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
-                    return;
+					_doing_it_wrong( esc_html( $function_name) , 'Is not a valid Sensei updater function', 'Sensei 1.9.0');
+					return;
 
-                } // End If Statement
+				} // End If Statement
 
-                // Add to functions list get args
-                if ('' == $functions_list) {
-                    $functions_list .= $function_name;
-                } else {
-                    $functions_list .= '+' . $function_name;
-                } // End If Statement
+				// Add to functions list get args
+				if ('' == $functions_list) {
+					$functions_list .= $function_name;
+				} else {
+					$functions_list .= '+' . $function_name;
+				} // End If Statement
 
-                $this->set_update_run($function_name);
+				$this->set_update_run($function_name);
 
-            } // End For Loop
+			} // End For Loop
 
-        } // End If Statement
+		} // End If Statement
 
-        if (!$done_processing) { ?>
+		if (!$done_processing) { ?>
 
             <h3><?php _e('Processing Updates...', 'woothemes-sensei'); ?></h3>
 
@@ -233,14 +233,14 @@ 
                 <?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(
-                    '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' ) );
-                ?>
+				$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' ) );
+				?>
 
                 <a class="button"  href="<?php echo esc_url( $next_action_url ); ?>">
 
@@ -269,7 +269,7 @@ 
 
         <?php } // End If Statement
 
-        } else { ?>
+		} else { ?>
 
             <h3><?php _e('Updates', 'woothemes-sensei'); ?></h3>
             <p><?php printf(__('These are updates that have been made available as new Sensei versions have been released. Updates of type %1$sAuto%2$s will run as you update Sensei to the relevant version - other updates need to be run manually and you can do that here.', 'woothemes-sensei'), '<code>', '</code>'); ?></p>
@@ -298,19 +298,19 @@ 
 
                 <tbody class="updates">
                 <?php
-                // Sort updates with the latest at the top
-                uksort($this->updates, array($this, 'sort_updates'));
-                $this->updates = array_reverse($this->updates, true);
-                $class = 'alternate';
-                foreach ($this->updates as $version => $version_updates) {
-                    foreach ($version_updates as $type => $updates) {
-                        foreach ($updates as $update => $data) {
-                            $update_run = $this->has_update_run($update);
-                            $product = 'Sensei';
-                            if (isset($data['product']) && '' != $data['product']) {
-                                $product = $data['product'];
-                            } // End If Statement
-                            ?>
+				// Sort updates with the latest at the top
+				uksort($this->updates, array($this, 'sort_updates'));
+				$this->updates = array_reverse($this->updates, true);
+				$class = 'alternate';
+				foreach ($this->updates as $version => $version_updates) {
+					foreach ($version_updates as $type => $updates) {
+						foreach ($updates as $update => $data) {
+							$update_run = $this->has_update_run($update);
+							$product = 'Sensei';
+							if (isset($data['product']) && '' != $data['product']) {
+								$product = $data['product'];
+							} // End If Statement
+							?>
                             <form method="post" action="admin.php?page=sensei_updates&action=update&n=0"
                                   name="update-sensei" class="upgrade">
                                 <tr class="<?php echo $class; ?>">
@@ -323,11 +323,11 @@ 
                                         </p>
                                     </td>
                                     <?php
-                                    $type_label = __('Auto', 'woothemes-sensei');
-                                    if ($type != 'auto') {
-                                        $type_label = __('Manual', 'woothemes-sensei');
-                                    }
-                                    ?>
+									$type_label = __('Auto', 'woothemes-sensei');
+									if ($type != 'auto') {
+										$type_label = __('Manual', 'woothemes-sensei');
+									}
+									?>
                                     <td><p><?php echo $type_label; ?></p></td>
                                     <td>
                                         <p>
@@ -339,24 +339,24 @@ 
                                                    name="update">
 
                                             <?php
-                                            $nonce_action = 'run_'.$update;
-                                            $nonce_field_name = $update.'_nonce_field';
-                                            wp_nonce_field( $nonce_action, $nonce_field_name, false, true );
-                                            ?>
+											$nonce_action = 'run_'.$update;
+											$nonce_field_name = $update.'_nonce_field';
+											wp_nonce_field( $nonce_action, $nonce_field_name, false, true );
+											?>
                                         </p>
                                     </td>
                                 </tr>
                             </form>
                             <?php
-                            if ('alternate' == $class) {
-                                $class = '';
-                            } else {
-                                $class = 'alternate';
-                            }
-                        }
-                    }
-                }
-                ?>
+							if ('alternate' == $class) {
+								$class = '';
+							} else {
+								$class = 'alternate';
+							}
+						}
+					}
+				}
+				?>
                 </tbody>
 
             </table>
@@ -364,31 +364,31 @@ 
             </div>
 
             <?php
-        } // End If Statement
-    } // End sensei_updates_page()
+		} // End If Statement
+	} // End sensei_updates_page()
 
-    /**
-     * Since 1.9.0
-     *
-     * A list of safe to execute functions withing the
-     * updater context.
-     *
-     * @param string $function_name
-     */
-    public function function_in_whitelist( $function_name ){
+	/**
+	 * Since 1.9.0
+	 *
+	 * A list of safe to execute functions withing the
+	 * updater context.
+	 *
+	 * @param string $function_name
+	 */
+	public function function_in_whitelist( $function_name ){
 
-        $function_whitelist = array(
-            'status_changes_convert_questions',
-            'status_changes_fix_lessons',
-            'status_changes_convert_courses',
-            'status_changes_convert_lessons',
-            'status_changes_repair_course_statuses',
+		$function_whitelist = array(
+			'status_changes_convert_questions',
+			'status_changes_fix_lessons',
+			'status_changes_convert_courses',
+			'status_changes_convert_lessons',
+			'status_changes_repair_course_statuses',
 
-        );
+		);
 
-        return in_array($function_name, $function_whitelist );
+		return in_array($function_name, $function_whitelist );
 
-    }// end function_in_whitelist
+	}// end function_in_whitelist
 
 	/**
 	 * Sort updates list by version number
@@ -413,47 +413,47 @@ 
 
 		// Only allow admins to run update functions
 		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 ) {
-                    $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 ) ) {
-                                $updated = false;
-                                if ( method_exists( $this, $function_name ) ) {
-
-            $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
+			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 ) {
+					$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 ) ) {
+								$updated = false;
+								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 );
 			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
+								}  // End If Statement
 
-                                if ( $updated ) {
-                                    array_push( $this->updates_run, $function_name );
-                                } // End If Statement
-                            }
-                        } // End If Statement
-                    } // End For Loop
-                } // End If Statement
-            } // End For Loop
-        } // End For Loop
+								if ( $updated ) {
+									array_push( $this->updates_run, $function_name );
+								} // End If Statement
+							}
+						} // End If Statement
+					} // End For Loop
+				} // End If Statement
+			} // 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;
+		return true;
 
 	} // End update()
 
@@ -566,7 +566,7 @@ 
 	 */
 	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
+		$this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update
 		update_option( Sensei()->token . '-upgrades', $this->updates_run );
 	}
 
@@ -1030,11 +1030,11 @@ 
 				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 );
+			}
 
 		}
 
@@ -1844,22 +1844,22 @@ 
 
 	}
 
-     /**
-     * WooThemes_Sensei_Updates::enhance_teacher_role
-     *
-     * This runs the update to create the teacher role
-     * @access public
-     * @since 1.8.0
-     * @return bool;
-     */
-    public  function enhance_teacher_role ( ) {
-
-        require_once('class-sensei-teacher.php');
-        $teacher = new Sensei_Teacher();
-        $teacher->create_role();
-        return true;
-
-    }// end enhance_teacher_role
+	 /**
+	  * WooThemes_Sensei_Updates::enhance_teacher_role
+	  *
+	  * This runs the update to create the teacher role
+	  * @access public
+	  * @since 1.8.0
+	  * @return bool;
+	  */
+	public  function enhance_teacher_role ( ) {
+
+		require_once('class-sensei-teacher.php');
+		$teacher = new Sensei_Teacher();
+		$teacher->create_role();
+		return true;
+
+	}// end enhance_teacher_role
 
 } // End Class
 

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-analysis-user-profile-list-table.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 
 		if( 'complete' == $item->comment_approved ) {
 
-            $status =  __( 'Completed', 'woothemes-sensei' );
+			$status =  __( 'Completed', 'woothemes-sensei' );
 			$status_class = 'graded';
 
 			$course_end_date = $item->comment_date;

Braces +4 added lines, -1 removed lines

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

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Analysis User Profile Data Table in Sensei.
@@ -18,17 +18,17 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $user_id = 0 ) {
-		$this->user_id = intval( $user_id );
+	public function __construct($user_id = 0) {
+		$this->user_id = intval($user_id);
 
 		// Load Parent token into constructor
-		parent::__construct( 'analysis_user_profile' );
+		parent::__construct('analysis_user_profile');
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) );
-		add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) );
+		add_action('sensei_before_list_table', array($this, 'data_table_header'));
+		add_action('sensei_after_list_table', array($this, 'data_table_footer'));
 
-		add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) );
+		add_filter('sensei_list_table_search_button_text', array($this, 'search_button'));
 	} // End __construct()
 
 	/**
@@ -38,14 +38,14 @@ 
 	 */
 	function get_columns() {
 		$columns = array(
-			'title' => __( 'Course', 'woothemes-sensei' ),
-			'started' => __( 'Date Started', 'woothemes-sensei' ),
-			'completed' => __( 'Date Completed', 'woothemes-sensei' ),
-			'status' => __( 'Status', 'woothemes-sensei' ),
+			'title' => __('Course', 'woothemes-sensei'),
+			'started' => __('Date Started', 'woothemes-sensei'),
+			'completed' => __('Date Completed', 'woothemes-sensei'),
+			'status' => __('Status', 'woothemes-sensei'),
 //			'grade' => __( 'Grade', 'woothemes-sensei' ),
-			'percent' => __( 'Percent Complete', 'woothemes-sensei' ),
+			'percent' => __('Percent Complete', 'woothemes-sensei'),
 		);
-		$columns = apply_filters( 'sensei_analysis_user_profile_columns', $columns );
+		$columns = apply_filters('sensei_analysis_user_profile_columns', $columns);
 		return $columns;
 	}
 
@@ -56,14 +56,14 @@ 
 	 */
 	function get_sortable_columns() {
 		$columns = array(
-			'title' => array( 'title', false ),
-			'started' => array( 'started', false ),
-			'completed' => array( 'completed', false ),
-			'status' => array( 'status', false ),
+			'title' => array('title', false),
+			'started' => array('started', false),
+			'completed' => array('completed', false),
+			'status' => array('status', false),
 //			'grade' => array( 'grade', false ),
-			'percent' => array( 'percent', false )
+			'percent' => array('percent', false)
 		);
-		$columns = apply_filters( 'sensei_analysis_user_profile_columns_sortable', $columns );
+		$columns = apply_filters('sensei_analysis_user_profile_columns_sortable', $columns);
 		return $columns;
 	}
 
@@ -77,32 +77,32 @@ 
 
 		// Handle orderby (needs work)
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
-		$per_page = $this->get_items_per_page( 'sensei_comments_per_page' );
-		$per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' );
+		$per_page = $this->get_items_per_page('sensei_comments_per_page');
+		$per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments');
 
 		$paged = $this->get_pagenum();
 		$offset = 0;
-		if ( !empty($paged) ) {
-			$offset = $per_page * ( $paged - 1 );
+		if ( ! empty($paged)) {
+			$offset = $per_page * ($paged - 1);
 		} // End If Statement
 
 		$args = array(
@@ -111,19 +111,19 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
-		$this->items = $this->get_course_statuses( $args );
+		$this->items = $this->get_course_statuses($args);
 
 		$total_items = $this->total_items;
-		$total_pages = ceil( $total_items / $per_page );
-		$this->set_pagination_args( array(
+		$total_pages = ceil($total_items / $per_page);
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'total_pages' => $total_pages,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @since  1.7.0
 	 * @return data
 	 */
-	public function generate_report( $report ) {
+	public function generate_report($report) {
 
 		$data = array();
 
@@ -139,22 +139,22 @@ 
 
 		// Handle orderby
 		$orderby = '';
-		if ( !empty( $_GET['orderby'] ) ) {
-			if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) {
-				$orderby = esc_html( $_GET['orderby'] );
+		if ( ! empty($_GET['orderby'])) {
+			if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) {
+				$orderby = esc_html($_GET['orderby']);
 			} // End If Statement
 		}
 
 		// Handle order
 		$order = 'ASC';
-		if ( !empty( $_GET['order'] ) ) {
-			$order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC';
+		if ( ! empty($_GET['order'])) {
+			$order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC';
 		}
 
 		// Handle search
 		$search = false;
-		if ( !empty( $_GET['s'] ) ) {
-			$search = esc_html( $_GET['s'] );
+		if ( ! empty($_GET['s'])) {
+			$search = esc_html($_GET['s']);
 		} // End If Statement
 		$this->search = $search;
 
@@ -162,23 +162,23 @@ 
 			'orderby' => $orderby,
 			'order' => $order,
 		);
-		if ( $this->search ) {
+		if ($this->search) {
 			$args['search'] = $this->search;
 		} // End If Statement
 
 		// Start the csv with the column headings
 		$column_headers = array();
 		$columns = $this->get_columns();
-		foreach( $columns AS $key => $title ) {
+		foreach ($columns AS $key => $title) {
 			$column_headers[] = $title;
 		}
 		$data[] = $column_headers;
 
-		$this->items = $this->get_course_statuses( $args );
+		$this->items = $this->get_course_statuses($args);
 
 		// Process each row
-		foreach( $this->items AS $item) {
-			$data[] = $this->get_row_data( $item );
+		foreach ($this->items AS $item) {
+			$data[] = $this->get_row_data($item);
 		}
 
 		return $data;
@@ -189,43 +189,43 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	protected function get_row_data( $item ) {
+	protected function get_row_data($item) {
 
-		$course_title =  get_the_title( $item->comment_post_ID );
-		$course_percent = get_comment_meta( $item->comment_ID, 'percent', true );
-		$course_start_date = get_comment_meta( $item->comment_ID, 'start', true );
+		$course_title = get_the_title($item->comment_post_ID);
+		$course_percent = get_comment_meta($item->comment_ID, 'percent', true);
+		$course_start_date = get_comment_meta($item->comment_ID, 'start', true);
 		$course_end_date = '';
 
-		if( 'complete' == $item->comment_approved ) {
+		if ('complete' == $item->comment_approved) {
 
-            $status =  __( 'Completed', 'woothemes-sensei' );
+            $status = __('Completed', 'woothemes-sensei');
 			$status_class = 'graded';
 
 			$course_end_date = $item->comment_date;
 
 		} else {
 
-			$status =  __( 'In Progress', 'woothemes-sensei' );
+			$status = __('In Progress', 'woothemes-sensei');
 			$status_class = 'in-progress';
 
 		}
 
 		// Output users data
-		if ( !$this->csv_output ) {
-			$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID ), admin_url( 'admin.php' ) );
+		if ( ! $this->csv_output) {
+			$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID), admin_url('admin.php'));
 
-			$course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $course_title . '</a></strong>';
-			$status = sprintf( '<span class="%s">%s</span>', $status_class, $status );
-			if ( is_numeric($course_percent) ) {
+			$course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.$course_title.'</a></strong>';
+			$status = sprintf('<span class="%s">%s</span>', $status_class, $status);
+			if (is_numeric($course_percent)) {
 				$course_percent .= '%';
 			}
 		} // End If Statement
-		$column_data = apply_filters( 'sensei_analysis_user_profile_column_data', array( 'title' => $course_title,
+		$column_data = apply_filters('sensei_analysis_user_profile_column_data', array('title' => $course_title,
 										'started' => $course_start_date,
 										'completed' => $course_end_date,
 										'status' => $status,
 										'percent' => $course_percent,
-									), $item );
+									), $item);
 
 		return $column_data;
 	}
@@ -235,7 +235,7 @@ 
 	 * @since  1.7.0
 	 * @return array statuses
 	 */
-	private function get_course_statuses( $args ) {
+	private function get_course_statuses($args) {
 
 		$activity_args = array( 
 				'user_id' => $this->user_id,
@@ -247,23 +247,23 @@ 
 				'status' => 'any',
 			);
 
-		$activity_args = apply_filters( 'sensei_analysis_user_profile_filter_statuses', $activity_args );
+		$activity_args = apply_filters('sensei_analysis_user_profile_filter_statuses', $activity_args);
 
 		// WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice
-		$this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
+		$this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0)));
 
 		// Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views?
-		if ( $this->total_items < $activity_args['offset'] ) {
+		if ($this->total_items < $activity_args['offset']) {
 
-			$new_paged = floor( $this->total_items / $activity_args['number'] );
+			$new_paged = floor($this->total_items / $activity_args['number']);
 			$activity_args['offset'] = $new_paged * $activity_args['number'];
 
 		}
-		$statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true );
+		$statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true);
 
 		// Need to always return an array, even with only 1 item
-		if ( !is_array($statuses) ) {
-			$statuses = array( $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = array($statuses);
 		}
 
 		return $statuses;
@@ -276,7 +276,7 @@ 
 	 * @return void
 	 */
 	public function no_items() {
-		echo  __( 'No courses found.', 'woothemes-sensei' );
+		echo  __('No courses found.', 'woothemes-sensei');
 	} // End no_items()
 
 	/**
@@ -285,7 +285,7 @@ 
 	 * @return void
 	 */
 	public function data_table_header() {
-		echo '<strong>' . __( 'Courses', 'woothemes-sensei' ) . '</strong>';
+		echo '<strong>'.__('Courses', 'woothemes-sensei').'</strong>';
 	}
 
 	/**
@@ -294,10 +294,10 @@ 
 	 * @return void
 	 */
 	public function data_table_footer() {
-		$user = get_user_by( 'id', $this->user_id );
-		$report = sanitize_title( $user->display_name ) . '-course-overview';
-		$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_id, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) );
-		echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>';
+		$user = get_user_by('id', $this->user_id);
+		$report = sanitize_title($user->display_name).'-course-overview';
+		$url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_id, 'sensei_report_download' => $report), admin_url('admin.php'));
+		echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>';
 	}
 
 	/**
@@ -305,8 +305,8 @@ 
 	 * @since  1.7.0
 	 * @return string
 	 */
-	public function search_button( $text = '' ) {
-		return __( 'Search Courses', 'woothemes-sensei' );
+	public function search_button($text = '') {
+		return __('Search Courses', 'woothemes-sensei');
 	}
 
 } // End Class

templates/globals/wrapper-end.php

Braces +3 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 /**
  * Content wrappers
  *

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
- * Content wrappers
- *
- * All support theme wrappers can be found in includes/theme-integrations
- *
- * @author 		Automattic
- * @package 	Sensei
- * @category    Templates
- * @version     1.9.0
- */
+	 * Content wrappers
+	 *
+	 * All support theme wrappers can be found in includes/theme-integrations
+	 *
+	 * @author 		Automattic
+	 * @package 	Sensei
+	 * @category    Templates
+	 * @version     1.9.0
+	 */
 ?>
 
     </main>

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

Braces +3 added lines, -1 removed lines

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

Indentation +8 added lines, -8 removed lines

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

Spacing +5 added lines, -5 removed lines

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

templates/content-course.php

Braces +3 added lines, -1 removed lines

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

Indentation +56 added lines, -56 removed lines

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

Spacing +7 added lines, -7 removed lines

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

templates/course-results/lessons.php

Braces +3 added lines, -1 removed lines

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

Indentation +74 added lines, -74 removed lines

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

Spacing +35 added lines, -35 removed lines

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

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

Braces +4 added lines, -1 removed lines

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

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

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

 

 /**

  * Sensei Course Component Widget

Indentation +15 added lines, -15 removed lines

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

 	public function widget( $args, $instance ) {

 

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

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

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

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

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

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

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

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

 

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

 			// No Output

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

 	 * @return void

 	 */

-    public function form( $instance ) {

+	public function form( $instance ) {

 

 		/* Set up some default widget settings. */

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

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

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

 							'orderby'         	=> 'menu_order date',

-    						'order'           	=> 'DESC',

-    						'post_status'       => 'publish',

+							'order'           	=> 'DESC',

+							'post_status'       => 'publish',

 							'suppress_filters' 	=> 0

 							);

 		$posts_array = get_posts( $post_args );

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

 			<ul>

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

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

-		    	$post_title = $post_item->post_title;

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

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

-		    	$author_display_name = $user_info->display_name;

-		    	$author_id = $post_item->post_author;

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

-		    ?>

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

+				$post_title = $post_item->post_title;

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

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

+				$author_display_name = $user_info->display_name;

+				$author_id = $post_item->post_author;

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

+			?>

 		    	<li class="fix">

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

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

Spacing +50 added lines, -50 removed lines

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

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

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

 

 /**

  * Sensei Lesson Component Widget

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

 		/* Widget variable settings. */

 		$this->woo_widget_cssclass = 'widget_sensei_lesson_component';

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

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

 		$this->woo_widget_idbase = 'sensei_lesson_component';

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

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

 

 		$this->woo_widget_componentslist = array(

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

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

 												);

 

 		/* Widget settings. */

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

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

 

 		/* Widget control settings. */

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

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

 

 		/* Create the widget. */

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

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

 	} // End __construct()

 

 	/**

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

 	 * @return void

 	 */

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

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

 

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

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

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

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

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

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

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

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

 

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

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

 			// No Output

 		} else {

 			/* Our variables from the widget settings. */

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

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

 

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

 			echo $before_widget;

 

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

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

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

 

 			/* Widget content. */

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

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

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

 

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

-				$this->load_component( $instance );

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

+				$this->load_component($instance);

 			}

 

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

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

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

 

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

 			echo $after_widget;

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

 	 * @return array               Updated settings.

 	 */

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

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

 		$instance = $old_instance;

 

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

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

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

 

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

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

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

 

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

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

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

 

 

 		return $instance;

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

 	 * @return void

 	 */

-    public function form( $instance ) {

+    public function form($instance) {

 

 		/* Set up some default widget settings. */

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

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

 					);

 

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

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

 ?>

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

 		<p>

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

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

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

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

 		</p>

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

 		<p>

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

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

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

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

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

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

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

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

 			<?php } ?>

 			</select>

 		</p>

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

 		<p>

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

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

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

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

 		</p>

 

 <?php

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

 	 * @return void

 	 */

-	protected function load_component ( $instance ) {

+	protected function load_component($instance) {

 

 		global  $current_user;

 		// Get User Meta

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

 		$posts_array = array();

 

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

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

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

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

 							'orderby'         	=> 'menu_order date',

     						'order'           	=> 'DESC',

     						'post_status'       => 'publish',

 							'suppress_filters' 	=> 0

 							);

-		$posts_array = get_posts( $post_args );

+		$posts_array = get_posts($post_args);

 

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

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

 			<ul>

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

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

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

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

 		    	$post_title = $post_item->post_title;

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

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

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

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

 		    	$author_display_name = $user_info->display_name;

 		    	$author_id = $post_item->post_author;

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

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

 		    ?>

 		    	<li class="fix">

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

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

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

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

 		    		<br />

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

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

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

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

     					<br />

     				<?php } // End If Statement ?>

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

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

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

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

                     <?php } ?>

     				<br />

 		    	</li>

 		    <?php } // End For Loop ?>

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

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

 		</ul>

 		<?php } // End If Statement

 	} // End load_component()