woothemes / sensei

includes/class-sensei-learner.php

Indentation +31 added lines, -31 removed lines

@@ -13,46 +13,46 @@
  */
 class Sensei_Student{
 
-    /**
-     * Get the students full name
-     *
-     * This function replaces Sensei_Learner_Managment->get_learner_full_name
-     * @since 1.9.0
-     *
-     * @param $user_id
-     * @return bool|mixed|void
-     */
-    public static function get_full_name( $user_id ){
+	/**
+	 * Get the students full name
+	 *
+	 * This function replaces Sensei_Learner_Managment->get_learner_full_name
+	 * @since 1.9.0
+	 *
+	 * @param $user_id
+	 * @return bool|mixed|void
+	 */
+	public static function get_full_name( $user_id ){
 
-        $full_name = '';
+		$full_name = '';
 
-        if( empty( $user_id ) || ! ( 0 < intval( $user_id ) )
-            || !( get_userdata( $user_id ) ) ){
-            return false;
-        }
+		if( empty( $user_id ) || ! ( 0 < intval( $user_id ) )
+			|| !( get_userdata( $user_id ) ) ){
+			return false;
+		}
 
-        // get the user details
-        $user = get_user_by( 'id', $user_id );
+		// get the user details
+		$user = get_user_by( 'id', $user_id );
 
-        if( ! empty( $user->first_name  ) && ! empty( $user->last_name  )  ){
+		if( ! empty( $user->first_name  ) && ! empty( $user->last_name  )  ){
 
-            $full_name = trim( $user->first_name   ) . ' ' . trim( $user->last_name  );
+			$full_name = trim( $user->first_name   ) . ' ' . trim( $user->last_name  );
 
-        }else{
+		}else{
 
-            $full_name =  $user->display_name;
+			$full_name =  $user->display_name;
 
-        }
+		}
 
-        /**
-         * Filter the user full name from the get_learner_full_name function.
-         *
-         * @since 1.8.0
-         * @param $full_name
-         * @param $user_id
-         */
-        return apply_filters( 'sensei_learner_full_name' , $full_name , $user_id );
+		/**
+		 * Filter the user full name from the get_learner_full_name function.
+		 *
+		 * @since 1.8.0
+		 * @param $full_name
+		 * @param $user_id
+		 */
+		return apply_filters( 'sensei_learner_full_name' , $full_name , $user_id );
 
-    }// end get_full_name
+	}// end get_full_name
 
 }
\ No newline at end of file

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

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;
 		}
 

includes/admin/class-sensei-welcome.php

Indentation +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+	exit; // Exit if accessed directly
 }
 
 /**
@@ -17,45 +17,45 @@ 
 
 	/**
 	 * Hook in tabs.
-     * @since 1.8.0
+	 * @since 1.8.0
 	 */
 	public function __construct() {
 
-        add_action( 'admin_menu', array( $this, 'admin_menus') );
+		add_action( 'admin_menu', array( $this, 'admin_menus') );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
 
 	}
 
-    /**
-     * Sends user to the welcome page on first activation.
-     *
-     * Hooked into activated_plugin
-     * @since 1.8.0
-     */
-    public static function redirect( $plugin ) {
+	/**
+	 * Sends user to the welcome page on first activation.
+	 *
+	 * Hooked into activated_plugin
+	 * @since 1.8.0
+	 */
+	public static function redirect( $plugin ) {
 
-        // Bail if activating from network, or bulk, or within an iFrame
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
+		// Bail if activating from network, or bulk, or within an iFrame
+		if ( is_network_admin() || isset( $_GET['activate-multi'] ) || defined( 'IFRAME_REQUEST' ) ) {
 
-            return;
+			return;
 
-        }
-        // don't run for upgrades and for pages already on the welcome screen
-        if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
-            || ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
+		}
+		// don't run for upgrades and for pages already on the welcome screen
+		if ( ( isset( $_GET['action'] ) && 'upgrade-plugin' == $_GET['action'] )
+			|| ( ! empty( $_GET['page'] ) && $_GET['page'] === 'sensei-welcome' ) ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
-        exit;
-    }
+		wp_redirect( admin_url( 'index.php?page=sensei-welcome' ) );
+		exit;
+	}
 
 	/**
 	 * Add admin menus/screens.
-     *
-     * @since 1.8.0
+	 *
+	 * @since 1.8.0
 	 */
 	public function admin_menus() {
 
@@ -65,17 +65,17 @@ 
 
 		$welcome_page_name  = __( 'Sensei Activation', 'woothemes-sensei' );
 		$welcome_page_title = __( 'Welcome to Sensei', 'woothemes-sensei' );
-        add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
+		add_dashboard_page( $welcome_page_title, $welcome_page_name, 'manage_options', 'sensei-welcome', array( $this, 'welcome_screen' ) );
 
 	}
 
-    /**
-     * Output the Welcome  screen.
-     *
-     * @since 1.8.0
-     */
-    public function welcome_screen() {
-        ?>
+	/**
+	 * Output the Welcome  screen.
+	 *
+	 * @since 1.8.0
+	 */
+	public function welcome_screen() {
+		?>
         <div class="wrap about-wrap">
 
             <?php  $this->intro(); ?>
@@ -128,13 +128,13 @@ 
             </div>
         </div>
     <?php
-    }
+	}
 
 	/**
 	 * Add styles just for this page, and remove dashboard page links.
 	 */
 	public function admin_head() {
-        // remove the menu page so it is not visible in the admin side bar
+		// remove the menu page so it is not visible in the admin side bar
 		remove_submenu_page( 'index.php', 'sensei-welcome' );
 		?>
 		<style type="text/css">
@@ -258,7 +258,7 @@ 
 
 		// Random tweet - must be kept to 102 chars to "fit"
 		$tweets        = array(
-            'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
+			'I\'ve just installed Sensei - A premium Learning Management plugin for #WordPress.'
 		);
 		shuffle( $tweets );
 		?>
@@ -280,11 +280,11 @@ 
 
 		<div class="sensei-badge">
             <?php
-                _e('Sensei by WooThemes','woothemes-sensei');
-                echo '<br />';
+				_e('Sensei by WooThemes','woothemes-sensei');
+				echo '<br />';
 
-                printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
-            ?>
+				printf( __( 'Version %s', 'woothemes-sensei' ), Sensei()->version );
+			?>
         </div>
 
 		<p class="sensei-actions">

includes/class-sensei-learners-main.php

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 );
 

includes/class-sensei-grading.php

Indentation +327 added lines, -327 removed lines

@@ -20,8 +20,8 @@ 
 	/**
 	 * Constructor
 	 * @since  1.3.0
-     *
-     * @param $file
+	 *
+	 * @param $file
 	 */
 	public function __construct ( $file ) {
 		$this->name = __( 'Grading', 'woothemes-sensei' );
@@ -230,7 +230,7 @@ 
 	/**
 	 * Outputs Grading general headers
 	 * @since  1.3.0
-     * @param array $args
+	 * @param array $args
 	 * @return void
 	 */
 	public function grading_headers( $args = array( 'nav' => 'default' ) ) {
@@ -282,7 +282,7 @@ 
 		}
 		if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user_id'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -316,7 +316,7 @@ 
 		}
 		if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) {
 
-            $user_name = Sensei_Learner::get_full_name( $_GET['user'] );
+			$user_name = Sensei_Learner::get_full_name( $_GET['user'] );
 			$title .= '&nbsp;&nbsp;<span class="user-title">&gt;&nbsp;&nbsp;' . $user_name . '</span>';
 
 		} // End If Statement
@@ -365,15 +365,15 @@ 
 	public function count_statuses( $args = array() ) {
 		global  $wpdb;
 
-        /**
-         * Filter fires inside Sensei_Grading::count_statuses
-         *
-         * Alter the the post_in array to determine which posts the
-         * comment query should be limited to.
-         * @since 1.8.0
-         * @param array $args
-         */
-        $args = apply_filters( 'sensei_count_statuses_args', $args );
+		/**
+		 * Filter fires inside Sensei_Grading::count_statuses
+		 *
+		 * Alter the the post_in array to determine which posts the
+		 * comment query should be limited to.
+		 * @since 1.8.0
+		 * @param array $args
+		 */
+		$args = apply_filters( 'sensei_count_statuses_args', $args );
 
 		if ( 'course' == $args['type'] ) {
 			$type = 'sensei_course_status';
@@ -385,7 +385,7 @@ 
 
 		$query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s ";
 
-        // Restrict to specific posts
+		// Restrict to specific posts
 		if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) {
 			$query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')';
 		}
@@ -520,148 +520,148 @@ 
 		return $html;
 	} // End lessons_drop_down_html()
 
-    /**
-     * The process grading function handles admin grading submissions.
-     *
-     * This function is hooked on to admin_init. It simply accepts
-     * the grades as the Grader selected theme and saves the total grade and
-     * individual question grades.
-     *
-     * @return bool
-     */
-    public function admin_process_grading_submission() {
+	/**
+	 * The process grading function handles admin grading submissions.
+	 *
+	 * This function is hooked on to admin_init. It simply accepts
+	 * the grades as the Grader selected theme and saves the total grade and
+	 * individual question grades.
+	 *
+	 * @return bool
+	 */
+	public function admin_process_grading_submission() {
 
-        // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
-        if( ! isset( $_POST['sensei_manual_grade'] )
-            || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
-            || ! isset( $_GET['quiz_id'] )
-            || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
+		// NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry
+		if( ! isset( $_POST['sensei_manual_grade'] )
+			|| ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' )
+			|| ! isset( $_GET['quiz_id'] )
+			|| $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) {
 
-            return false; //exit and do not grade
+			return false; //exit and do not grade
 
-        }
+		}
 
-        $quiz_id = $_GET['quiz_id'];
-        $user_id = $_GET['user'];
+		$quiz_id = $_GET['quiz_id'];
+		$user_id = $_GET['user'];
 
 
-        $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
-        $quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $quiz_grade = 0;
-        $count = 0;
-        $quiz_grade_total = $_POST['quiz_grade_total'];
-        $all_question_grades = array();
-        $all_answers_feedback = array();
+		$questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id );
+		$quiz_lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$quiz_grade = 0;
+		$count = 0;
+		$quiz_grade_total = $_POST['quiz_grade_total'];
+		$all_question_grades = array();
+		$all_answers_feedback = array();
 
-        foreach( $questions as $question ) {
+		foreach( $questions as $question ) {
 
-            ++$count;
-            $question_id = $question->ID;
+			++$count;
+			$question_id = $question->ID;
 
-            if( isset( $_POST[ 'question_' . $question_id ] ) ) {
+			if( isset( $_POST[ 'question_' . $question_id ] ) ) {
 
-                $question_grade = 0;
-                if( $_POST[ 'question_' . $question_id ] == 'right' ) {
+				$question_grade = 0;
+				if( $_POST[ 'question_' . $question_id ] == 'right' ) {
 
-                    $question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
+					$question_grade = $_POST[ 'question_' . $question_id . '_grade' ];
 
-                }
+				}
 
-                // add data to the array that will, after the loop, be stored on the lesson status
-                $all_question_grades[ $question_id ] = $question_grade;
+				// add data to the array that will, after the loop, be stored on the lesson status
+				$all_question_grades[ $question_id ] = $question_grade;
 
-                // tally up the total quiz grade
-                $quiz_grade += $question_grade;
+				// tally up the total quiz grade
+				$quiz_grade += $question_grade;
 
-            } // endif
+			} // endif
 
-            // Question answer feedback / notes
-            $question_feedback = '';
-            if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
+			// Question answer feedback / notes
+			$question_feedback = '';
+			if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){
 
-                $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
+				$question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] );
 
-            }
-            $all_answers_feedback[ $question_id ] = $question_feedback;
+			}
+			$all_answers_feedback[ $question_id ] = $question_feedback;
 
-        } // end for each $questions
+		} // end for each $questions
 
-        //store all question grades on the lesson status
-        Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
+		//store all question grades on the lesson status
+		Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id );
 
-        //store the feedback from grading
-        Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
+		//store the feedback from grading
+		Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id );
 
-        // $_POST['all_questions_graded'] is set when all questions have been graded
-        // in the class sensei grading user quiz -> display()
-        if( $_POST['all_questions_graded'] == 'yes' ) {
+		// $_POST['all_questions_graded'] is set when all questions have been graded
+		// in the class sensei grading user quiz -> display()
+		if( $_POST['all_questions_graded'] == 'yes' ) {
 
-            // set the users total quiz grade
+			// set the users total quiz grade
 			if ( 0 < intval( $quiz_grade_total ) ) {
-            $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
-
-            // Duplicating what Frontend->sensei_complete_quiz() does
-            $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
-            $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
-            $lesson_metadata = array();
-            if ( $pass_required ) {
-                // Student has reached the pass mark and lesson is complete
-                if ( $quiz_passmark <= $grade ) {
-                    $lesson_status = 'passed';
-                }
-                else {
-                    $lesson_status = 'failed';
-                } // End If Statement
-            }
-            // Student only has to partake the quiz
-            else {
-                $lesson_status = 'graded';
-            }
-            $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id );
+
+			// Duplicating what Frontend->sensei_complete_quiz() does
+			$pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+			$quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+			$lesson_metadata = array();
+			if ( $pass_required ) {
+				// Student has reached the pass mark and lesson is complete
+				if ( $quiz_passmark <= $grade ) {
+					$lesson_status = 'passed';
+				}
+				else {
+					$lesson_status = 'failed';
+				} // End If Statement
+			}
+			// Student only has to partake the quiz
+			else {
+				$lesson_status = 'graded';
+			}
+			$lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above
 
-            Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
+			Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata );
 
-            if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
+			if(  in_array( $lesson_status, array( 'passed', 'graded'  ) ) ) {
 
-                /**
-                 * Summary.
-                 *
-                 * Description.
-                 *
-                 * @since 1.7.0
-                 *
-                 * @param int  $user_id
-                 * @param int $quiz_lesson_id
-                 */
-                do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
+				/**
+				 * Summary.
+				 *
+				 * Description.
+				 *
+				 * @since 1.7.0
+				 *
+				 * @param int  $user_id
+				 * @param int $quiz_lesson_id
+				 */
+				do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id );
 
-            } // end if in_array
+			} // end if in_array
 
-        }// end if $_POST['all_que...
+		}// end if $_POST['all_que...
 
-        if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
+		if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        } elseif ( isset( $_POST['_wp_http_referer'] ) ) {
+		} elseif ( isset( $_POST['_wp_http_referer'] ) ) {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
+			$load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] );
 
-        } else {
+		} else {
 
-            $load_url = add_query_arg( array( 'message' => 'graded' ) );
+			$load_url = add_query_arg( array( 'message' => 'graded' ) );
 
-        }
+		}
 
-        wp_safe_redirect( esc_url_raw( $load_url ) );
-        exit;
+		wp_safe_redirect( esc_url_raw( $load_url ) );
+		exit;
 
-    } // end admin_process_grading_submission
+	} // end admin_process_grading_submission
 
 	public function get_redirect_url() {
 		// Parse POST data
@@ -706,283 +706,283 @@ 
 		} // End If Statement
 	} // End sensei_grading_notices()
 
-    /**
-     * Grade quiz automatically
-     *
-     * This function grades each question automatically if there all questions are auto gradable. If not
-     * the quiz will not be auto gradable.
-     *
-     * @since 1.7.4
-     *
-     * @param  integer $quiz_id         ID of quiz
-     * @param  array $submitted questions id ans answers {
-     *          @type int $question_id
-     *          @type mixed $answer
-     * }
-     * @param  integer $total_questions Total questions in quiz (not used)
-     * @param string $quiz_grade_type Optional defaults to auto
-     *
-     * @return int $quiz_grade total sum of all question grades
-     */
-    public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
-
-        if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
-            || $quiz_grade_type != 'auto' ) {
-            return false; // exit early
-        }
-
-
-        $user_id = get_current_user_id();
-        $lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
-        $quiz_autogradable = true;
-
-        /**
-         * Filter the types of question types that can be automatically graded.
-         *
-         * This filter fires inside the auto grade quiz function and provides you with the default list.
-         *
-         * @param array {
-         *      'multiple-choice',
-         *      'boolean',
-         *      'gap-fill'.
-         * }
-         */
-        $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
-
-        $grade_total = 0;
-        $all_question_grades = array();
-        foreach( $submitted as $question_id => $answer ) {
-
-            // check if the question is autogradable, either by type, or because the grade is 0
-            $question_type = Sensei()->question->get_question_type( $question_id );
+	/**
+	 * Grade quiz automatically
+	 *
+	 * This function grades each question automatically if there all questions are auto gradable. If not
+	 * the quiz will not be auto gradable.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param  integer $quiz_id         ID of quiz
+	 * @param  array $submitted questions id ans answers {
+	 *          @type int $question_id
+	 *          @type mixed $answer
+	 * }
+	 * @param  integer $total_questions Total questions in quiz (not used)
+	 * @param string $quiz_grade_type Optional defaults to auto
+	 *
+	 * @return int $quiz_grade total sum of all question grades
+	 */
+	public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) {
+
+		if( ! ( intval( $quiz_id ) > 0 )  || ! $submitted
+			|| $quiz_grade_type != 'auto' ) {
+			return false; // exit early
+		}
+
+
+		$user_id = get_current_user_id();
+		$lesson_id =  Sensei()->quiz->get_lesson_id(  $quiz_id ) ;
+		$quiz_autogradable = true;
+
+		/**
+		 * Filter the types of question types that can be automatically graded.
+		 *
+		 * This filter fires inside the auto grade quiz function and provides you with the default list.
+		 *
+		 * @param array {
+		 *      'multiple-choice',
+		 *      'boolean',
+		 *      'gap-fill'.
+		 * }
+		 */
+		$autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) );
+
+		$grade_total = 0;
+		$all_question_grades = array();
+		foreach( $submitted as $question_id => $answer ) {
+
+			// check if the question is autogradable, either by type, or because the grade is 0
+			$question_type = Sensei()->question->get_question_type( $question_id );
 			$achievable_grade = Sensei()->question->get_question_grade( $question_id );
 			// Question has a zero grade, so skip grading
 			if ( 0 == $achievable_grade ) {
 				$all_question_grades[ $question_id ] = $achievable_grade;
 			}
-            elseif ( in_array( $question_type, $autogradable_question_types ) ) {
-                // Get user question grade
-                $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
-                $all_question_grades[ $question_id ] = $question_grade;
-                $grade_total += $question_grade;
+			elseif ( in_array( $question_type, $autogradable_question_types ) ) {
+				// Get user question grade
+				$question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id );
+				$all_question_grades[ $question_id ] = $question_grade;
+				$grade_total += $question_grade;
 
-            } else {
+			} else {
 
-                // There is a question that cannot be autograded
-                $quiz_autogradable = false;
+				// There is a question that cannot be autograded
+				$quiz_autogradable = false;
 
-            } // end if in_array( $question_type...
+			} // end if in_array( $question_type...
 
-        }// end for each question
+		}// end for each question
 
-        // Only if the whole quiz was autogradable do we set a grade
-        if ( $quiz_autogradable ) {
+		// Only if the whole quiz was autogradable do we set a grade
+		if ( $quiz_autogradable ) {
 
-            $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
+			$quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id );
 			// Check for zero total from grades
 			if ( 0 < $quiz_total ) {
-            $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
+			$grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) );
 			}
 			else {
 				$grade = 0;
 			}
-            Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
+			Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type );
 
-        } else {
+		} else {
 
-            $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
+			$grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) );
 
-        }
-
-        // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
-        // when doing manual grading.
-        Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
+		}
 
-        return $grade;
+		// store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default
+		// when doing manual grading.
+		Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id );
 
-    } // End grade_quiz_auto()
+		return $grade;
 
-    /**
-     * Grade question automatically
-     *
-     * This function checks the question typ and then grades it accordingly.
-     *
-     * @since 1.7.4
-     *
-     * @param integer $question_id
-     * @param string $question_type of the standard Sensei question types
-     * @param string $answer
-     * @param int $user_id
-     *
-     * @return int $question_grade
-     */
-    public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
-
-        if( intval( $user_id ) == 0 ) {
-
-            $user_id = get_current_user_id();
-
-        }
-
-        if( ! ( intval( $question_id ) > 0 ) ) {
-
-            return false;
-
-        }
-
-
-        Sensei()->question->get_question_type( $question_id );
-
-        /**
-         * Applying a grade before the auto grading takes place.
-         *
-         * This filter is applied just before the question is auto graded. It fires in the context of a single question
-         * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
-         * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
-         *
-         * @param int $question_grade default false
-         * @param int $question_id
-         * @param string $question_type one of the Sensei question type.
-         * @param string $answer user supplied question answer
-         */
-        $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
+	} // End grade_quiz_auto()
 
-        if ( false !== $question_grade ) {
+	/**
+	 * Grade question automatically
+	 *
+	 * This function checks the question typ and then grades it accordingly.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param integer $question_id
+	 * @param string $question_type of the standard Sensei question types
+	 * @param string $answer
+	 * @param int $user_id
+	 *
+	 * @return int $question_grade
+	 */
+	public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) {
+
+		if( intval( $user_id ) == 0 ) {
+
+			$user_id = get_current_user_id();
+
+		}
+
+		if( ! ( intval( $question_id ) > 0 ) ) {
+
+			return false;
+
+		}
+
+
+		Sensei()->question->get_question_type( $question_id );
+
+		/**
+		 * Applying a grade before the auto grading takes place.
+		 *
+		 * This filter is applied just before the question is auto graded. It fires in the context of a single question
+		 * in the sensei_grade_question_auto function. It fires irrespective of the question type. If you return a value
+		 * other than false the auto grade functionality will be ignored and your supplied grade will be user for this question.
+		 *
+		 * @param int $question_grade default false
+		 * @param int $question_id
+		 * @param string $question_type one of the Sensei question type.
+		 * @param string $answer user supplied question answer
+		 */
+		$question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer );
 
-            return $question_grade;
+		if ( false !== $question_grade ) {
 
-        }
+			return $question_grade;
 
-        // auto grading core
-        if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
+		}
 
-            $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
+		// auto grading core
+		if( in_array( $question_type ,  array( 'multiple-choice'  , 'boolean'  ) )   ){
 
-            if( 0 == get_magic_quotes_gpc() ) {
-                $answer = wp_unslash( $answer );
-            }
-            $answer = (array) $answer;
-            if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
-                // Loop through all answers ensure none are 'missing'
-                $all_correct = true;
-                foreach ( $answer as $check_answer ) {
-                    if ( !in_array( $check_answer, $right_answer ) ) {
-                        $all_correct = false;
-                    }
-                }
-                // If all correct then grade
-                if ( $all_correct ) {
-                    $question_grade = Sensei()->question->get_question_grade( $question_id );
-                }
-            }
+			$right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true );
 
-        } elseif( 'gap-fill' == $question_type ){
+			if( 0 == get_magic_quotes_gpc() ) {
+				$answer = wp_unslash( $answer );
+			}
+			$answer = (array) $answer;
+			if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) {
+				// Loop through all answers ensure none are 'missing'
+				$all_correct = true;
+				foreach ( $answer as $check_answer ) {
+					if ( !in_array( $check_answer, $right_answer ) ) {
+						$all_correct = false;
+					}
+				}
+				// If all correct then grade
+				if ( $all_correct ) {
+					$question_grade = Sensei()->question->get_question_grade( $question_id );
+				}
+			}
 
-            $question_grade = self::grade_gap_fill_question( $question_id ,$answer );
+		} elseif( 'gap-fill' == $question_type ){
 
-        } else{
+			$question_grade = self::grade_gap_fill_question( $question_id ,$answer );
 
-            /**
-             * Grading questions that are not auto gradable.
-             *
-             * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
-             * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
-             *
-             * @param int $question_grade default zero
-             * @param int $question_id
-             * @param string $question_type one of the Sensei question type.
-             * @param string $answer user supplied question answer
-             */
-            $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
+		} else{
 
-        } // end if $question_type
+			/**
+			 * Grading questions that are not auto gradable.
+			 *
+			 * This filter is applied the context of ta single question within the sensei_grade_question_auto function.
+			 * It fires for all other questions types. It does not apply to 'multiple-choice'  , 'boolean' and gap-fill.
+			 *
+			 * @param int $question_grade default zero
+			 * @param int $question_id
+			 * @param string $question_type one of the Sensei question type.
+			 * @param string $answer user supplied question answer
+			 */
+			$question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer );
 
-        return $question_grade;
-    } // end grade_question_auto
+		} // end if $question_type
 
-    /**
-     * Grading logic specifically for the gap fill questions
-     *
-     * @since 1.9.0
-     * @param $question_id
-     * @param $user_answer
-     *
-     * @return bool | int false or the grade given to the user answer
-     */
-    public static function grade_gap_fill_question( $question_id, $user_answer ){
+		return $question_grade;
+	} // end grade_question_auto
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $gapfill_array = explode( '||', $right_answer );
+	/**
+	 * Grading logic specifically for the gap fill questions
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 * @param $user_answer
+	 *
+	 * @return bool | int false or the grade given to the user answer
+	 */
+	public static function grade_gap_fill_question( $question_id, $user_answer ){
 
-        if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
-            $user_answer = wp_unslash( $user_answer );
-        }
+		$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
+		$gapfill_array = explode( '||', $right_answer );
 
-        /**
-         * case sensitive grading filter
-         *
-         * alter the value simply use this code in your plugin or the themes functions.php
-         * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
-         *
-         * @param bool $do_case_sensitive_comparison default false.
-         *
-         * @since 1.9.0
-         */
-        $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
+		if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2
+			$user_answer = wp_unslash( $user_answer );
+		}
+
+		/**
+		 * case sensitive grading filter
+		 *
+		 * alter the value simply use this code in your plugin or the themes functions.php
+		 * add_filter( 'sensei_gap_fill_case_sensitive_grading','__return_true' );
+		 *
+		 * @param bool $do_case_sensitive_comparison default false.
+		 *
+		 * @since 1.9.0
+		 */
+		$do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false );
 
-        if( $do_case_sensitive_comparison ){
+		if( $do_case_sensitive_comparison ){
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) {
 
-                return Sensei()->question->get_question_grade( $question_id );
+				return Sensei()->question->get_question_grade( $question_id );
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
 
-                    return Sensei()->question->get_question_grade($question_id);
+					return Sensei()->question->get_question_grade($question_id);
 
-                }else{
+				}else{
 
-                    return false;
+					return false;
 
-                }
+				}
 
-            }else{
+			}else{
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }else{
+		}else{
 
-            // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
-            if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
+			// Case Sensitive Check that the 'gap' is "exactly" equal to the given answer
+			if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) {
 
-               return Sensei()->question->get_question_grade( $question_id );
+			   return Sensei()->question->get_question_grade( $question_id );
 
-            } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
+			} else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) {
 
-                if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
+				if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) {
 
-                    return  Sensei()->question->get_question_grade( $question_id );
+					return  Sensei()->question->get_question_grade( $question_id );
 
-                }else{
+				}else{
 
-                    return false;
+					return false;
 
-                }
+				}
 
-            }else{
+			}else{
 
-                return false;
+				return false;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 } // End Class
 

includes/class-sensei-messages.php

Indentation +222 added lines, -222 removed lines

@@ -21,7 +21,7 @@ 
 	 * @since  1.6.0
 	 */
 	public function __construct () {
-        $this->token = 'messages';
+		$this->token = 'messages';
 		$this->post_type = 'sensei_message';
 		$this->meta_fields = array( 'sender', 'receiver' );
 
@@ -36,11 +36,11 @@ 
 		// Monitor when new reply is posted
 		add_action( 'comment_post', array( $this, 'message_reply_received' ), 10, 1 );
 
-        // Block WordPress from sending comment update emails for the messages post type
-        add_filter('comment_notification_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
+		// Block WordPress from sending comment update emails for the messages post type
+		add_filter('comment_notification_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
 
-        // Block WordPress from sending comment moderator emails on the sensei messages post types
-        add_filter('comment_moderation_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
+		// Block WordPress from sending comment moderator emails on the sensei messages post types
+		add_filter('comment_moderation_recipients', array( $this, 'stop_wp_comment_emails' ),  20, 2  );
 
 		// Process saving of message posts
 		add_action( 'save_post', array( $this, 'save_message' ) );
@@ -48,20 +48,20 @@ 
 		// Add message links to courses & lessons
 		add_action( 'sensei_single_course_content_inside_before', array( $this, 'send_message_link' ), 35 );
 
-        // add message link to lesson
-        add_action( 'sensei_single_lesson_content_inside_before', array( $this, 'send_message_link' ), 30, 2 );
+		// add message link to lesson
+		add_action( 'sensei_single_lesson_content_inside_before', array( $this, 'send_message_link' ), 30, 2 );
 
-        // add message link to lesson
-        add_action( 'sensei_single_quiz_questions_before', array( $this, 'send_message_link' ), 10, 2 );
+		// add message link to lesson
+		add_action( 'sensei_single_quiz_questions_before', array( $this, 'send_message_link' ), 10, 2 );
 
 		// Hide messages and replies from users who do not have access
-        add_action( 'template_redirect', array( $this, 'message_login' ), 10, 1 );
-        add_action( 'pre_get_posts', array( $this, 'message_list' ), 10, 1 );
-        add_filter( 'the_title', array( $this, 'message_title' ), 10, 2 );
-        add_filter( 'the_content', array( $this, 'message_content' ), 10, 1 );
-        add_filter( 'comments_array', array( $this, 'message_replies' ), 100, 1 );
-        add_filter( 'get_comments_number', array( $this, 'message_reply_count' ), 100, 2 );
-        add_filter( 'comments_open', array( $this, 'message_replies_open' ), 100, 2 );
+		add_action( 'template_redirect', array( $this, 'message_login' ), 10, 1 );
+		add_action( 'pre_get_posts', array( $this, 'message_list' ), 10, 1 );
+		add_filter( 'the_title', array( $this, 'message_title' ), 10, 2 );
+		add_filter( 'the_content', array( $this, 'message_content' ), 10, 1 );
+		add_filter( 'comments_array', array( $this, 'message_replies' ), 100, 1 );
+		add_filter( 'get_comments_number', array( $this, 'message_reply_count' ), 100, 2 );
+		add_filter( 'comments_open', array( $this, 'message_replies_open' ), 100, 2 );
 	} // End __construct()
 
 	public function add_menu_item() {
@@ -162,8 +162,8 @@ 
 	public function send_message_link( $post_id = 0, $user_id = 0 ) {
 		global  $post;
 
-        // only show the link for the allowed post types:
-        $allowed_post_types = array('lesson', 'course', 'quiz');
+		// only show the link for the allowed post types:
+		$allowed_post_types = array('lesson', 'course', 'quiz');
 		if ( ! in_array( get_post_type() , $allowed_post_types ) ) {
 
 			return;
@@ -186,8 +186,8 @@ 
 				} elseif( 'course' == $post->post_type ) {
 					$contact_button_text = __( 'Contact Course Teacher', 'woothemes-sensei' );
 				}else{
-                    $contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
-                }
+					$contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
+				}
 
 				$html .= '<p><a class="button send-message-button" href="' . esc_url($href) . '#private_message">' . $contact_button_text . '</a></p>';
 			}
@@ -212,19 +212,19 @@ 
 
 		if( ! isset( $post->ID ) ) return $html;
 
-        //confirm private message
-        $confirmation = '';
-        if( isset( $_GET[ 'send' ] ) && 'complete' == $_GET[ 'send' ] ) {
+		//confirm private message
+		$confirmation = '';
+		if( isset( $_GET[ 'send' ] ) && 'complete' == $_GET[ 'send' ] ) {
 
-            $confirmation_message = __('Your private message has been sent.', 'woothemes-sensei');
-            $confirmation = '<div class="sensei-message tick">' . $confirmation_message . '</div>';
+			$confirmation_message = __('Your private message has been sent.', 'woothemes-sensei');
+			$confirmation = '<div class="sensei-message tick">' . $confirmation_message . '</div>';
 
-        }
+		}
 
 		$html .= '<h3 id="private_message">' . __( 'Send Private Message', 'woothemes-sensei' ) . '</h3>';
-        $html .= '<p>';
-        $html .=  $confirmation;
-        $html .= '</p>';
+		$html .= '<p>';
+		$html .=  $confirmation;
+		$html .= '</p>';
 		$html .= '<form name="contact-teacher" action="" method="post" class="contact-teacher">';
 			$html .= '<p class="form-row form-row-wide">';
 				$html .= '<textarea name="contact_message" placeholder="' . __( 'Enter your private message.', 'woothemes-sensei' ) . '"></textarea>';
@@ -255,7 +255,7 @@ 
 	public function message_reply_received( $comment_id = 0 ) {
 
 		// Get comment object
-    	$comment = get_comment( $comment_id );
+		$comment = get_comment( $comment_id );
 
 		if( is_null( $comment ) ) return;
 
@@ -270,87 +270,87 @@ 
 		do_action( 'sensei_private_message_reply', $comment, $message );
 	}
 
-    /**
-     * This function stops WordPress from sending the default comment update emails.
-     *
-     * This function is hooked into comment_notification_recipients. It will simply return
-     * an empty array if the current passed in comment is on a message post type.
-     *
-     * @param array $emails
-     * @param int $comment_id
-     * @return array;
-     */
-    public function stop_wp_comment_emails( $emails , $comment_id ){
+	/**
+	 * This function stops WordPress from sending the default comment update emails.
+	 *
+	 * This function is hooked into comment_notification_recipients. It will simply return
+	 * an empty array if the current passed in comment is on a message post type.
+	 *
+	 * @param array $emails
+	 * @param int $comment_id
+	 * @return array;
+	 */
+	public function stop_wp_comment_emails( $emails , $comment_id ){
 
-        $comment = get_comment( $comment_id );
-        if( isset( $comment->comment_post_ID ) &&
-            'sensei_message' == get_post_type( $comment->comment_post_ID )  ){
+		$comment = get_comment( $comment_id );
+		if( isset( $comment->comment_post_ID ) &&
+			'sensei_message' == get_post_type( $comment->comment_post_ID )  ){
 
-            // empty the emails array to ensure no emails are sent for this comment
-            $emails = array();
+			// empty the emails array to ensure no emails are sent for this comment
+			$emails = array();
 
-        }
-        return $emails;
+		}
+		return $emails;
 
-    }// end stop_wp_comment_emails
+	}// end stop_wp_comment_emails
 
 	/**
-     * Save new message post
-     * @param  integer $sender_id   ID of sender
-     * @param  integer $receiver_id ID of receiver
-     * @param  string  $message     Message content
-     * @param  string  $post_id     ID of post related to message
-     * @return mixed                Message ID on success, boolean false on failure
-     */
-    private function save_new_message_post( $sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0 ) {
+	 * Save new message post
+	 * @param  integer $sender_id   ID of sender
+	 * @param  integer $receiver_id ID of receiver
+	 * @param  string  $message     Message content
+	 * @param  string  $post_id     ID of post related to message
+	 * @return mixed                Message ID on success, boolean false on failure
+	 */
+	private function save_new_message_post( $sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0 ) {
 
-    	$message_id = false;
+		$message_id = false;
 
-    	if( $sender_id && $receiver_id && $message && $post_id ) {
+		if( $sender_id && $receiver_id && $message && $post_id ) {
 
-    		$title = wp_trim_words( $message, 8, '...' );
+			$title = wp_trim_words( $message, 8, '...' );
 
-    		// Set up post data for message
-	    	$message_data = array(
-	            'post_type'      => $this->post_type,
-	            'post_title'     => esc_html( $title ),
-	            'post_content'   => esc_html( $message ),
-	            'post_status'    => 'publish',
-	            'ping_status'    => 'closed',
-	            'comment_status' => 'open',
-	            'post_excerpt'   => '',
-	            'post_author'	 => intval( $sender_id )
-	        );
+			// Set up post data for message
+			$message_data = array(
+				'post_type'      => $this->post_type,
+				'post_title'     => esc_html( $title ),
+				'post_content'   => esc_html( $message ),
+				'post_status'    => 'publish',
+				'ping_status'    => 'closed',
+				'comment_status' => 'open',
+				'post_excerpt'   => '',
+				'post_author'	 => intval( $sender_id )
+			);
 
-	    	// Insert post
-	        $message_id = wp_insert_post( $message_data );
+			// Insert post
+			$message_id = wp_insert_post( $message_data );
 
-	        if( ! is_wp_error( $message_id ) ) {
+			if( ! is_wp_error( $message_id ) ) {
 
-	        	// Add sender to message meta
-	        	$sender = get_userdata( $sender_id );
-	        	add_post_meta( $message_id, '_sender', $sender->user_login );
+				// Add sender to message meta
+				$sender = get_userdata( $sender_id );
+				add_post_meta( $message_id, '_sender', $sender->user_login );
 
-	        	// Add receiver to message meta
-	        	$receiver = get_userdata( $receiver_id );
-		        add_post_meta( $message_id, '_receiver', $receiver->user_login );
+				// Add receiver to message meta
+				$receiver = get_userdata( $receiver_id );
+				add_post_meta( $message_id, '_receiver', $receiver->user_login );
 
-		        // Add lesson/course ID to message meta
-		        $post = get_post( $post_id );
-		        add_post_meta( $message_id, '_posttype', $post->post_type );
-		        add_post_meta( $message_id, '_post', $post->ID );
+				// Add lesson/course ID to message meta
+				$post = get_post( $post_id );
+				add_post_meta( $message_id, '_posttype', $post->post_type );
+				add_post_meta( $message_id, '_post', $post->ID );
 
-		        do_action( 'sensei_new_private_message', $message_id );
+				do_action( 'sensei_new_private_message', $message_id );
 
-		    } else {
+			} else {
 
-		    	$message_id = false;
+				$message_id = false;
 
-		    }
-	    }
+			}
+		}
 
-	    return $message_id;
-    }
+		return $message_id;
+	}
 
 	/**
 	 * Check if user has access to view this message
@@ -389,56 +389,56 @@ 
 		remove_meta_box('commentstatusdiv', $this->post_type, 'normal');
 	}
 
-    /**
-     * Function message_login()
-     *
-     * Only show /messages/* to logged in users, and
-     * redirect logged out users to wp-login.php
-     *
-     * @since 1.9.0
-     * @param  none
-     * @return void
-     */
+	/**
+	 * Function message_login()
+	 *
+	 * Only show /messages/* to logged in users, and
+	 * redirect logged out users to wp-login.php
+	 *
+	 * @since 1.9.0
+	 * @param  none
+	 * @return void
+	 */
 
-    public function message_login () {
+	public function message_login () {
 
-        if ( is_user_logged_in() ) {
+		if ( is_user_logged_in() ) {
 
-            return;
-        }
+			return;
+		}
 
-        $settings = Sensei()->settings->get_settings();
-        if( isset( $settings[ 'my_course_page' ] )
-            && 0 < intval( $settings[ 'my_course_page' ] ) ){
+		$settings = Sensei()->settings->get_settings();
+		if( isset( $settings[ 'my_course_page' ] )
+			&& 0 < intval( $settings[ 'my_course_page' ] ) ){
 
-            $my_courses_page_id = $settings[ 'my_course_page' ];
+			$my_courses_page_id = $settings[ 'my_course_page' ];
 
-            $my_courses_url = get_permalink($my_courses_page_id);
+			$my_courses_url = get_permalink($my_courses_page_id);
 
-        }
+		}
 
-        if ( is_single() && is_singular( $this->post_type )
-            || is_post_type_archive( $this->post_type ) ) {
+		if ( is_single() && is_singular( $this->post_type )
+			|| is_post_type_archive( $this->post_type ) ) {
 
-            if ( isset($my_courses_url) ) {
+			if ( isset($my_courses_url) ) {
 
-                wp_redirect($my_courses_url, 303);
-                exit;
-            }
+				wp_redirect($my_courses_url, 303);
+				exit;
+			}
 
-            else {
+			else {
 
-                wp_redirect(home_url('/wp-login.php'), 303);
-                exit;
-            }
+				wp_redirect(home_url('/wp-login.php'), 303);
+				exit;
+			}
 
-        }
-    }
+		}
+	}
 	/**
-     * Only show allowed messages in messages archive
-     * @param  WP_Query $query Original query
-     * @return void
-     */
+	 * Only show allowed messages in messages archive
+	 * @param  WP_Query $query Original query
+	 * @return void
+	 */
 	public function message_list( $query ) {
 		global $current_user;
 
@@ -555,17 +555,17 @@ 
 		return $open;
 	}
 
-    /**
-     * Print outthe message was sent by $sender_username on the
-     *
-     * @since 1.9.0
-     */
-    public static function the_message_sent_by_title(){
+	/**
+	 * Print outthe message was sent by $sender_username on the
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_message_sent_by_title(){
 
-        $sender_username = get_post_meta( get_the_ID() , '_sender', true );
-        if( $sender_username ) {
+		$sender_username = get_post_meta( get_the_ID() , '_sender', true );
+		if( $sender_username ) {
 
-            $sender = get_user_by( 'login', $sender_username ); ?>
+			$sender = get_user_by( 'login', $sender_username ); ?>
 
             <p class="message-meta">
                 <small>
@@ -577,41 +577,41 @@ 
 
         <?php }
 
-    }
+	}
 
-    /**
-     * sensei_single_title output for single page title
-     * @since  1.1.0
-     * @return void
-     * @deprecate
-     */
-    public static function the_title() {
+	/**
+	 * sensei_single_title output for single page title
+	 * @since  1.1.0
+	 * @return void
+	 * @deprecate
+	 */
+	public static function the_title() {
 
-        global $post;
+		global $post;
 
-        $content_post_id = get_post_meta( $post->ID, '_post', true );
-        if( $content_post_id ) {
-            $title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), '<a href="' . get_permalink( $content_post_id ) . '">' . get_the_title( $content_post_id ) . '</a>' );
-        } else {
-            $title = get_the_title( $post->ID );
-        }
+		$content_post_id = get_post_meta( $post->ID, '_post', true );
+		if( $content_post_id ) {
+			$title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), '<a href="' . get_permalink( $content_post_id ) . '">' . get_the_title( $content_post_id ) . '</a>' );
+		} else {
+			$title = get_the_title( $post->ID );
+		}
 
-        ?>
+		?>
         <header>
 
             <h1>
 
                 <?php
-                /**
-                 * Filter Sensei single title
-                 *
-                 * @since 1.8.0
-                 * @param string $title
-                 * @param string $template
-                 * @param string $post_type
-                 */
-                echo apply_filters( 'sensei_single_title', $title, $post->post_type );
-                ?>
+				/**
+				 * Filter Sensei single title
+				 *
+				 * @since 1.8.0
+				 * @param string $title
+				 * @param string $template
+				 * @param string $post_type
+				 */
+				echo apply_filters( 'sensei_single_title', $title, $post->post_type );
+				?>
 
             </h1>
 
@@ -619,52 +619,52 @@ 
 
         <?php
 
-    } // End sensei_single_title()
+	} // End sensei_single_title()
 
-    /**
-     * Generates the my messages
-     * archive header.
-     *
-     * @since 1.9.0
-     *
-     * @return string
-     */
-    public static function the_archive_header( ){
+	/**
+	 * Generates the my messages
+	 * archive header.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @return string
+	 */
+	public static function the_archive_header( ){
 
-        $html = '';
-        $html .= '<header class="archive-header"><h1>';
-        $html .= __( 'My Messages', 'woothemes-sensei' );
-        $html .= '</h1></header>';
+		$html = '';
+		$html .= '<header class="archive-header"><h1>';
+		$html .= __( 'My Messages', 'woothemes-sensei' );
+		$html .= '</h1></header>';
 
-        /**
-         * Filter the sensei messages archive title.
-         * @since 1.0.0
-         */
-        echo apply_filters( 'sensei_message_archive_title', $html );
+		/**
+		 * Filter the sensei messages archive title.
+		 * @since 1.0.0
+		 */
+		echo apply_filters( 'sensei_message_archive_title', $html );
 
-    } // get_archive_header()
+	} // get_archive_header()
 
-    /**
-     * Output the title for a message given the post_id.
-     *
-     * @since 1.9.0
-     * @param $post_id
-     */
-    public static function the_message_title( $message_post_id ){
+	/**
+	 * Output the title for a message given the post_id.
+	 *
+	 * @since 1.9.0
+	 * @param $post_id
+	 */
+	public static function the_message_title( $message_post_id ){
 
-        $content_post_id = get_post_meta( $message_post_id, '_post', true );
+		$content_post_id = get_post_meta( $message_post_id, '_post', true );
 
-        if( $content_post_id ) {
+		if( $content_post_id ) {
 
-            $title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), get_the_title( $content_post_id ) );
+			$title = sprintf( __( 'Re: %1$s', 'woothemes-sensei' ), get_the_title( $content_post_id ) );
 
-        } else {
+		} else {
 
-            $title = get_the_title( $message_post_id );
+			$title = get_the_title( $message_post_id );
 
-        }
+		}
 
-        ?>
+		?>
         <h2>
             <a href="<?php esc_url( get_permalink( $message_post_id ) );?>">
                 <?php echo  $title; ?>
@@ -673,21 +673,21 @@ 
         </h2>
 
         <?php
-    } //end the_message_header
+	} //end the_message_header
 
-    /**
-     * Output the message sender given the post id.
-     *
-     * @param $message_post_id
-     */
-    public  static function the_message_sender( $message_post_id ){
+	/**
+	 * Output the message sender given the post id.
+	 *
+	 * @param $message_post_id
+	 */
+	public  static function the_message_sender( $message_post_id ){
 
-        $sender_username = get_post_meta( $message_post_id, '_sender', true );
-        $sender = get_user_by( 'login', $sender_username );
+		$sender_username = get_post_meta( $message_post_id, '_sender', true );
+		$sender = get_user_by( 'login', $sender_username );
 
-        if( $sender_username && $sender instanceof WP_User ) {
-            $sender_display_name = sprintf( __( 'Sent by %1$s on %2$s.', 'woothemes-sensei' ), $sender->display_name, get_the_date() );
-            ?>
+		if( $sender_username && $sender instanceof WP_User ) {
+			$sender_display_name = sprintf( __( 'Sent by %1$s on %2$s.', 'woothemes-sensei' ), $sender->display_name, get_the_date() );
+			?>
             <p class="message-meta">
                 <small>
                     <em> <?php echo $sender_display_name; ?> </em>
@@ -695,18 +695,18 @@ 
             </p>
 
             <?php
-        } // end if
-
-    } // end the_message_archive_sender
-
-    /**
-     * Link to the users my messages page
-     *
-     * @since 1.9.0
-     */
-    public static function the_my_messages_link(){
-        if( ! Sensei()->settings->get('messages_disable')  ) {
-            ?>
+		} // end if
+
+	} // end the_message_archive_sender
+
+	/**
+	 * Link to the users my messages page
+	 *
+	 * @since 1.9.0
+	 */
+	public static function the_my_messages_link(){
+		if( ! Sensei()->settings->get('messages_disable')  ) {
+			?>
             <p class="my-messages-link-container">
                 <a class="my-messages-link" href="<?php echo get_post_type_archive_link( 'sensei_message' ); ?>"
                    title="<?php _e( 'View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei' ); ?>">
@@ -714,8 +714,8 @@ 
                 </a>
             </p>
             <?php
-        }
-    }
+		}
+	}
 
 } // End Class
 

includes/class-sensei-autoloader.php

Indentation +139 added lines, -139 removed lines

@@ -1,147 +1,147 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP
 /**
- * Loading all class files within the Sensei/includes directory
- *
- * The auto loader class listens for calls to classes within Sensei and loads
- * the file containing the class.
- *
- * @package Core
- * @since 1.9.0
- */
+	 * Loading all class files within the Sensei/includes directory
+	 *
+	 * The auto loader class listens for calls to classes within Sensei and loads
+	 * the file containing the class.
+	 *
+	 * @package Core
+	 * @since 1.9.0
+	 */
 class Sensei_Autoloader {
 
-    /**
-     * @var path to the includes directory within Sensei.
-     */
-    private $include_path = 'includes';
-
-    /**
-     * @var array $class_file_map. List of classes mapped to their files
-     */
-    private $class_file_map = array();
-
-    /**
-     * Constructor
-     * @since 1.9.0
-     */
-    public function __construct(){
-
-        // make sure we do not override an existing autoload function
-        if( function_exists('__autoload') ){
-           spl_autoload_register( '__autoload' );
-        }
-
-        // setup a relative path for the current autoload instance
-        $this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
-
-        //setup the class file map
-        $this->initialize_class_file_map();
-
-        // add Sensei custom auto loader
-        spl_autoload_register( array( $this, 'autoload' )  );
-
-    }
-
-    /**
-     * Generate a list of Sensei class and map them the their respective
-     * files within the includes directory
-     *
-     * @since 1.9.0
-     */
-    public function initialize_class_file_map(){
-
-        $this->class_file_map = array(
-
-            /**
-             * Main Sensei class
-             */
-            'Sensei_Main' => 'class-sensei.php',
-
-            /**
-             * Admin
-             */
-            'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
-            'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
-
-            /**
-             * Shortcodes
-             */
-            'Sensei_Shortcode_Loader'              => 'shortcodes/class-sensei-shortcode-loader.php',
-            'Sensei_Shortcode_Interface'           => 'shortcodes/interface-sensei-shortcode.php',
-            'Sensei_Shortcode_Featured_Courses'    => 'shortcodes/class-sensei-shortcode-featured-courses.php',
-            'Sensei_Shortcode_User_Courses'        => 'shortcodes/class-sensei-shortcode-user-courses.php',
-            'Sensei_Shortcode_Courses'             => 'shortcodes/class-sensei-shortcode-courses.php',
-            'Sensei_Shortcode_Teachers'            => 'shortcodes/class-sensei-shortcode-teachers.php',
-            'Sensei_Shortcode_User_Messages'       => 'shortcodes/class-sensei-shortcode-user-messages.php',
-            'Sensei_Shortcode_Course_Page'         => 'shortcodes/class-sensei-shortcode-course-page.php',
-            'Sensei_Shortcode_Lesson_Page'         => 'shortcodes/class-sensei-shortcode-lesson-page.php',
-            'Sensei_Shortcode_Course_Categories'   => 'shortcodes/class-sensei-shortcode-course-categories.php',
-            'Sensei_Shortcode_Unpurchased_Courses' => 'shortcodes/class-sensei-shortcode-unpurchased-courses.php',
-            'Sensei_Legacy_Shortcodes'             => 'shortcodes/class-sensei-legacy-shortcodes.php',
-
-            /**
-             * Built in theme integration support
-             */
-            'Sensei_Theme_Integration_Loader' => 'theme-integrations/theme-integration-loader.php',
-            'Sensei__S'                       => 'theme-integrations/_s.php',
-            'Sensei_Twentyeleven'             => 'theme-integrations/twentyeleven.php',
-            'Sensei_Twentytwelve'             => 'theme-integrations/twentytwelve.php',
-            'Sensei_Twentythirteen'           => 'theme-integrations/Twentythirteen.php',
-            'Sensei_Twentyfourteen'           => 'theme-integrations/Twentyfourteen.php',
-            'Sensei_Twentyfifteen'            => 'theme-integrations/Twentyfifteen.php',
-            'Sensei_Twentysixteen'            => 'theme-integrations/Twentysixteen.php',
-            'Sensei_Storefront'               => 'theme-integrations/Storefront.php',
-
-            /**
-             * WooCommerce
-             */
-            'Sensei_WC' => 'class-sensei-wc.php',
-
-        );
-    }
-
-    /**
-     * Autoload all sensei files as the class names are used.
-     */
-    public function autoload( $class ){
-
-        // only handle classes with the word `sensei` in it
-        if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
-
-            return;
-
-        }
-
-        // exit if we didn't provide mapping for this class
-        if( isset( $this->class_file_map[ $class ] ) ){
-
-            $file_location = $this->include_path . $this->class_file_map[ $class ];
-            require_once( $file_location);
-            return;
-
-        }
-
-        // check for file in the main includes directory
-        $class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
-        if( file_exists( $class_file_path ) ){
-
-            require_once( $class_file_path );
-            return;
-        }
-
-        // lastly check legacy types
-        $stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
-        $legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
-        if( file_exists( $legacy_class_file_path ) ){
-
-            require_once( $legacy_class_file_path );
-            return;
-        }
-
-        return;
-
-    }// end autoload
+	/**
+	 * @var path to the includes directory within Sensei.
+	 */
+	private $include_path = 'includes';
+
+	/**
+	 * @var array $class_file_map. List of classes mapped to their files
+	 */
+	private $class_file_map = array();
+
+	/**
+	 * Constructor
+	 * @since 1.9.0
+	 */
+	public function __construct(){
+
+		// make sure we do not override an existing autoload function
+		if( function_exists('__autoload') ){
+		   spl_autoload_register( '__autoload' );
+		}
+
+		// setup a relative path for the current autoload instance
+		$this->include_path = trailingslashit( untrailingslashit( dirname( __FILE__ ) ) );
+
+		//setup the class file map
+		$this->initialize_class_file_map();
+
+		// add Sensei custom auto loader
+		spl_autoload_register( array( $this, 'autoload' )  );
+
+	}
+
+	/**
+	 * Generate a list of Sensei class and map them the their respective
+	 * files within the includes directory
+	 *
+	 * @since 1.9.0
+	 */
+	public function initialize_class_file_map(){
+
+		$this->class_file_map = array(
+
+			/**
+			 * Main Sensei class
+			 */
+			'Sensei_Main' => 'class-sensei.php',
+
+			/**
+			 * Admin
+			 */
+			'Sensei_Welcome'            => 'admin/class-sensei-welcome.php' ,
+			'Sensei_Learner_Management' => 'admin/class-sensei-learner-management.php' ,
+
+			/**
+			 * Shortcodes
+			 */
+			'Sensei_Shortcode_Loader'              => 'shortcodes/class-sensei-shortcode-loader.php',
+			'Sensei_Shortcode_Interface'           => 'shortcodes/interface-sensei-shortcode.php',
+			'Sensei_Shortcode_Featured_Courses'    => 'shortcodes/class-sensei-shortcode-featured-courses.php',
+			'Sensei_Shortcode_User_Courses'        => 'shortcodes/class-sensei-shortcode-user-courses.php',
+			'Sensei_Shortcode_Courses'             => 'shortcodes/class-sensei-shortcode-courses.php',
+			'Sensei_Shortcode_Teachers'            => 'shortcodes/class-sensei-shortcode-teachers.php',
+			'Sensei_Shortcode_User_Messages'       => 'shortcodes/class-sensei-shortcode-user-messages.php',
+			'Sensei_Shortcode_Course_Page'         => 'shortcodes/class-sensei-shortcode-course-page.php',
+			'Sensei_Shortcode_Lesson_Page'         => 'shortcodes/class-sensei-shortcode-lesson-page.php',
+			'Sensei_Shortcode_Course_Categories'   => 'shortcodes/class-sensei-shortcode-course-categories.php',
+			'Sensei_Shortcode_Unpurchased_Courses' => 'shortcodes/class-sensei-shortcode-unpurchased-courses.php',
+			'Sensei_Legacy_Shortcodes'             => 'shortcodes/class-sensei-legacy-shortcodes.php',
+
+			/**
+			 * Built in theme integration support
+			 */
+			'Sensei_Theme_Integration_Loader' => 'theme-integrations/theme-integration-loader.php',
+			'Sensei__S'                       => 'theme-integrations/_s.php',
+			'Sensei_Twentyeleven'             => 'theme-integrations/twentyeleven.php',
+			'Sensei_Twentytwelve'             => 'theme-integrations/twentytwelve.php',
+			'Sensei_Twentythirteen'           => 'theme-integrations/Twentythirteen.php',
+			'Sensei_Twentyfourteen'           => 'theme-integrations/Twentyfourteen.php',
+			'Sensei_Twentyfifteen'            => 'theme-integrations/Twentyfifteen.php',
+			'Sensei_Twentysixteen'            => 'theme-integrations/Twentysixteen.php',
+			'Sensei_Storefront'               => 'theme-integrations/Storefront.php',
+
+			/**
+			 * WooCommerce
+			 */
+			'Sensei_WC' => 'class-sensei-wc.php',
+
+		);
+	}
+
+	/**
+	 * Autoload all sensei files as the class names are used.
+	 */
+	public function autoload( $class ){
+
+		// only handle classes with the word `sensei` in it
+		if( ! is_numeric( strpos ( strtolower( $class ), 'sensei') ) ){
+
+			return;
+
+		}
+
+		// exit if we didn't provide mapping for this class
+		if( isset( $this->class_file_map[ $class ] ) ){
+
+			$file_location = $this->include_path . $this->class_file_map[ $class ];
+			require_once( $file_location);
+			return;
+
+		}
+
+		// check for file in the main includes directory
+		$class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $class ) ) . '.php';
+		if( file_exists( $class_file_path ) ){
+
+			require_once( $class_file_path );
+			return;
+		}
+
+		// lastly check legacy types
+		$stripped_woothemes_from_class = str_replace( 'woothemes_','', strtolower( $class ) ); // remove woothemes
+		$legacy_class_file_path = $this->include_path . 'class-'.str_replace( '_','-', strtolower( $stripped_woothemes_from_class ) ) . '.php';
+		if( file_exists( $legacy_class_file_path ) ){
+
+			require_once( $legacy_class_file_path );
+			return;
+		}
+
+		return;
+
+	}// end autoload
 
 }
 new Sensei_Autoloader();

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

Indentation +19 added lines, -19 removed lines

@@ -159,10 +159,10 @@ 
 			'order' => $order,
 		);
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 		switch ( $this->type ) {
 			case 'courses':
@@ -219,10 +219,10 @@ 
 		);
 
 
-        // Handle search
-        if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
-            $args['search'] = esc_html( $_GET['s'] );
-        }
+		// Handle search
+		if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) {
+			$args['search'] = esc_html( $_GET['s'] );
+		}
 
 
 		// Start the csv with the column headings
@@ -260,7 +260,7 @@ 
 	 * Generates the overall array for a single item in the display
 	 * @since  1.7.0
 	 * @param object $item The current item
-     * @return array $column_data;
+	 * @return array $column_data;
 	 */
 	protected function get_row_data( $item ) {
 
@@ -419,8 +419,8 @@ 
 
 				// Output the users data
 				if ( $this->csv_output ) {
-                    $user_name = Sensei_Learner::get_full_name( $item->ID );
-                }
+					$user_name = Sensei_Learner::get_full_name( $item->ID );
+				}
 				else {
 					$url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) );
 					$user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>';
@@ -514,17 +514,17 @@ 
 		// This stops the full meta data of each user being loaded
 		$args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' );
 
-        /**
-         * Filter the WP_User_Query arguments
-         * @since 1.6.0
-         * @param $args
-         */
-        $args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
+		/**
+		 * Filter the WP_User_Query arguments
+		 * @since 1.6.0
+		 * @param $args
+		 */
+		$args = apply_filters( 'sensei_analysis_overview_filter_users', $args );
 		$wp_user_search = new WP_User_Query( $args );
-        $learners = $wp_user_search->get_results();
+		$learners = $wp_user_search->get_results();
 		$this->total_items = $wp_user_search->get_total();
 
-        return $learners;
+		return $learners;
 
 	} // End get_learners()
 

includes/class-sensei-emails.php

Indentation +48 added lines, -48 removed lines

@@ -45,7 +45,7 @@ 
 		add_action( 'sensei_course_status_updated', array( $this, 'learner_completed_course' ), 10, 4 );
 		add_action( 'sensei_course_status_updated', array( $this, 'teacher_completed_course' ), 10, 4 );
 		add_action( 'sensei_user_course_start', array( $this, 'teacher_started_course' ), 10, 2 );
-        add_action( 'sensei_user_lesson_end', array( $this, 'teacher_completed_lesson' ), 10, 2 );
+		add_action( 'sensei_user_lesson_end', array( $this, 'teacher_completed_lesson' ), 10, 2 );
 		add_action( 'sensei_user_quiz_submitted', array( $this, 'teacher_quiz_submitted' ), 10, 5 );
 		add_action( 'sensei_new_private_message', array( $this, 'teacher_new_message' ), 10, 1 );
 		add_action( 'sensei_private_message_reply', array( $this, 'new_message_reply' ), 10, 2 );
@@ -62,9 +62,9 @@ 
 		$this->emails['learner-graded-quiz'] = include( 'emails/class-woothemes-sensei-email-learner-graded-quiz.php' );
 		$this->emails['learner-completed-course'] = include( 'emails/class-woothemes-sensei-email-learner-completed-course.php' );
 		$this->emails['teacher-completed-course'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-course.php' );
-        $this->emails['teacher-started-course'] = include( 'emails/class-woothemes-sensei-email-teacher-started-course.php' );
-        $this->emails['teacher-completed-lesson'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-lesson.php' );
-        $this->emails['teacher-quiz-submitted'] = include( 'emails/class-woothemes-sensei-email-teacher-quiz-submitted.php' );
+		$this->emails['teacher-started-course'] = include( 'emails/class-woothemes-sensei-email-teacher-started-course.php' );
+		$this->emails['teacher-completed-lesson'] = include( 'emails/class-woothemes-sensei-email-teacher-completed-lesson.php' );
+		$this->emails['teacher-quiz-submitted'] = include( 'emails/class-woothemes-sensei-email-teacher-quiz-submitted.php' );
 		$this->emails['teacher-new-message'] = include( 'emails/class-woothemes-sensei-email-teacher-new-message.php' );
 		$this->emails['new-message-reply'] = include( 'emails/class-woothemes-sensei-email-new-message-reply.php' );
 		$this->emails = apply_filters( 'sensei_email_classes', $this->emails );
@@ -171,20 +171,20 @@ 
 		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
 		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
 
-        // Send
-        $send_email = true;
+		// Send
+		$send_email = true;
 
-        /**
-         * Filter Sensei's ability to send out emails.
-         *
-         * @since 1.8.0
-         * @param bool $send_email default true
-         */
-        if( apply_filters('sensei_send_emails', $send_email,$to, $subject, $message )  ){
+		/**
+		 * Filter Sensei's ability to send out emails.
+		 *
+		 * @since 1.8.0
+		 * @param bool $send_email default true
+		 */
+		if( apply_filters('sensei_send_emails', $send_email,$to, $subject, $message )  ){
 
-            wp_mail( $to, $subject, $message, $headers, $attachments );
+			wp_mail( $to, $subject, $message, $headers, $attachments );
 
-        }
+		}
 
 		// Unhook filters
 		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
@@ -326,44 +326,44 @@ 
 		}
 	}
 
-    /**
-     * teacher_completed_lesson()
-     *
-     * Send email to teacher on student completing lesson
-     *
-     * @access public
-     * @return void
-     * @since 1.9.0
-     */
-    function teacher_completed_lesson( $learner_id = 0, $lesson_id = 0 ) {
-
-
-        $send = false;
-
-        if( isset( Sensei()->settings->settings[ 'email_teachers' ] ) ) {
-            if( in_array( 'teacher-completed-lesson', (array) Sensei()->settings->settings[ 'email_teachers' ]) ) {
-                $send = true;
-            }
-        } else {
-            $send = true;
-        }
-
-        if( $send ) {
-            $email = $this->emails['teacher-completed-lesson'];
-            $email->trigger( $learner_id, $lesson_id );
-        }
-    }
+	/**
+	 * teacher_completed_lesson()
+	 *
+	 * Send email to teacher on student completing lesson
+	 *
+	 * @access public
+	 * @return void
+	 * @since 1.9.0
+	 */
+	function teacher_completed_lesson( $learner_id = 0, $lesson_id = 0 ) {
+
+
+		$send = false;
+
+		if( isset( Sensei()->settings->settings[ 'email_teachers' ] ) ) {
+			if( in_array( 'teacher-completed-lesson', (array) Sensei()->settings->settings[ 'email_teachers' ]) ) {
+				$send = true;
+			}
+		} else {
+			$send = true;
+		}
+
+		if( $send ) {
+			$email = $this->emails['teacher-completed-lesson'];
+			$email->trigger( $learner_id, $lesson_id );
+		}
+	}
 
 	/**
 	 * Send email to teacher on quiz submission
 	 *
 	 *
-     * @param int $learner_id
-     * @param int $quiz_id
-     * @param int $grade
-     * @param int $passmark
-     * @param string $quiz_grade_type
-     */
+	 * @param int $learner_id
+	 * @param int $quiz_id
+	 * @param int $grade
+	 * @param int $passmark
+	 * @param string $quiz_grade_type
+	 */
 	function teacher_quiz_submitted( $learner_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0, $quiz_grade_type = 'manual' ) {
 
 		$send = false;