woothemes / sensei

includes/class-sensei-emails.php

Doc Comments +5 added lines, -1 removed lines

@@ -40,6 +40,7 @@ 
 	 * Constructor for the email class hooks in all emails that can be sent.
 	 *
 	 * @access public
+	 * @param string $file
 	 * @return void
 	 */
 	function __construct( $file ) {
@@ -140,7 +141,7 @@ 
 	 * Wraps a message in the sensei mail template.
 	 *
 	 * @access public
-	 * @param mixed $content
+	 * @param null|string $content
 	 * @return string
 	 */
 	function wrap_message( $content ) {
@@ -198,6 +199,9 @@ 
 		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
 	}
 
+	/**
+	 * @param string $email_template
+	 */
 	function get_content( $email_template ) {
 
 		$message = $this->load_template( $email_template );

Spacing +94 added lines, -94 removed lines

@@ -42,22 +42,22 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function __construct( $file ) {
+	function __construct($file) {
 
 		$this->init();
 
 		// Hooks for sending emails during Sensei events
-		add_action( 'sensei_user_quiz_grade', array( $this, 'learner_graded_quiz' ), 10, 4 );
-		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_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 );
+		add_action('sensei_user_quiz_grade', array($this, 'learner_graded_quiz'), 10, 4);
+		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_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);
 
 		// Let 3rd parties unhook the above via this hook
-		do_action( 'sensei_emails', $this );
+		do_action('sensei_emails', $this);
 	}
 
 	/**
@@ -65,15 +65,15 @@ 
 	 */
 	function init() {
 
-		$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-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 );
+		$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-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);
 	}
 
 	/**
@@ -95,15 +95,15 @@ 
 	function get_from_name() {
 
 
-		if ( ! $this->_from_name ) {
-			if( isset( Sensei()->settings->settings['email_from_name'] ) && '' != Sensei()->settings->settings['email_from_name'] ) {
+		if ( ! $this->_from_name) {
+			if (isset(Sensei()->settings->settings['email_from_name']) && '' != Sensei()->settings->settings['email_from_name']) {
 				$this->_from_name = Sensei()->settings->settings['email_from_name'];
 			} else {
-				$this->_from_name = get_bloginfo( 'name' );
+				$this->_from_name = get_bloginfo('name');
 			}
 		}
 
-		return wp_specialchars_decode( $this->_from_name );
+		return wp_specialchars_decode($this->_from_name);
 	}
 
 	/**
@@ -115,11 +115,11 @@ 
 	function get_from_address() {
 
 
-		if ( ! $this->_from_address ) {
-			if( isset( Sensei()->settings->settings['email_from_address'] ) && '' != Sensei()->settings->settings['email_from_address'] ) {
+		if ( ! $this->_from_address) {
+			if (isset(Sensei()->settings->settings['email_from_address']) && '' != Sensei()->settings->settings['email_from_address']) {
 				$this->_from_address = Sensei()->settings->settings['email_from_address'];
 			} else {
-				$this->_from_address = get_bloginfo( 'admin_email' );
+				$this->_from_address = get_bloginfo('admin_email');
 			}
 		}
 
@@ -143,13 +143,13 @@ 
 	 * @param mixed $content
 	 * @return string
 	 */
-	function wrap_message( $content ) {
+	function wrap_message($content) {
 
 		$html = '';
 
-		$html .= $this->load_template( 'header' );
-		$html .= wpautop( wptexturize( $content ) );
-		$html .= $this->load_template( 'footer' );
+		$html .= $this->load_template('header');
+		$html .= wpautop(wptexturize($content));
+		$html .= $this->load_template('footer');
 
 		return $html;
 	}
@@ -166,16 +166,16 @@ 
 	 * @param string $content_type (default: "text/html")
 	 * @return void
 	 */
-	function send( $to, $subject, $message, $headers = "Content-Type: text/html\r\n", $attachments = "", $content_type = 'text/html' ) {
+	function send($to, $subject, $message, $headers = "Content-Type: text/html\r\n", $attachments = "", $content_type = 'text/html') {
 		global $email_template;
 
 		// Set content type
 		$this->_content_type = $content_type;
 
 		// Filters for the email
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		add_filter('wp_mail_from', array($this, 'get_from_address'));
+		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;
@@ -186,40 +186,40 @@ 
          * @since 1.8.0
          * @param bool $send_email default true
          */
-        if( apply_filters('sensei_send_emails', $send_email,$to, $subject, $message )  ){
+        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' ) );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		remove_filter('wp_mail_from', array($this, 'get_from_address'));
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'));
 	}
 
-	function get_content( $email_template ) {
+	function get_content($email_template) {
 
-		$message = $this->load_template( $email_template );
+		$message = $this->load_template($email_template);
 
-		$html = $this->wrap_message( $message );
+		$html = $this->wrap_message($message);
 
-		return apply_filters( 'sensei_email', $html, $email_template );
+		return apply_filters('sensei_email', $html, $email_template);
 	}
 
-	function load_template( $template = '' ) {
+	function load_template($template = '') {
 		global  $email_template;
 
-		if( ! $template ) return;
+		if ( ! $template) return;
 
-		$email_template = $template . '.php';
-		$template = Sensei_Templates::template_loader( '' );
+		$email_template = $template.'.php';
+		$template = Sensei_Templates::template_loader('');
 
 		ob_start();
 
-		do_action( 'sensei_before_email_template', $email_template );
-		include( $template );
-		do_action( 'sensei_after_email_template', $email_template );
+		do_action('sensei_before_email_template', $email_template);
+		include($template);
+		do_action('sensei_after_email_template', $email_template);
 
 		return ob_get_clean();
 	}
@@ -230,22 +230,22 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function learner_graded_quiz( $user_id, $quiz_id, $grade, $passmark ) {
+	function learner_graded_quiz($user_id, $quiz_id, $grade, $passmark) {
 
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_learners'] ) ) {
-			if( in_array( 'learner-graded-quiz', (array) Sensei()->settings->settings['email_learners'] ) ) {
+		if (isset(Sensei()->settings->settings['email_learners'])) {
+			if (in_array('learner-graded-quiz', (array) Sensei()->settings->settings['email_learners'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['learner-graded-quiz'];
-			$email->trigger( $user_id, $quiz_id, $grade, $passmark );
+			$email->trigger($user_id, $quiz_id, $grade, $passmark);
 		}
 	}
 
@@ -255,26 +255,26 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function learner_completed_course( $status = 'in-progress', $user_id = 0, $course_id = 0, $comment_id = 0 ) {
+	function learner_completed_course($status = 'in-progress', $user_id = 0, $course_id = 0, $comment_id = 0) {
 
 
-		if( 'complete' != $status ) {
+		if ('complete' != $status) {
 			return;
 		}
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_learners'] ) ) {
-			if( in_array( 'learner-completed-course', (array) Sensei()->settings->settings['email_learners'] ) ) {
+		if (isset(Sensei()->settings->settings['email_learners'])) {
+			if (in_array('learner-completed-course', (array) Sensei()->settings->settings['email_learners'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['learner-completed-course'];
-			$email->trigger( $user_id, $course_id );
+			$email->trigger($user_id, $course_id);
 		}
 	}
 
@@ -284,26 +284,26 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function teacher_completed_course( $status = 'in-progress', $learner_id = 0, $course_id = 0, $comment_id = 0 ) {
+	function teacher_completed_course($status = 'in-progress', $learner_id = 0, $course_id = 0, $comment_id = 0) {
 
 
-		if( 'complete' != $status ) {
+		if ('complete' != $status) {
 			return;
 		}
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_teachers'] ) ) {
-			if( in_array( 'teacher-completed-course', (array) Sensei()->settings->settings['email_teachers'] ) ) {
+		if (isset(Sensei()->settings->settings['email_teachers'])) {
+			if (in_array('teacher-completed-course', (array) Sensei()->settings->settings['email_teachers'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['teacher-completed-course'];
-			$email->trigger( $learner_id, $course_id );
+			$email->trigger($learner_id, $course_id);
 		}
 	}
 
@@ -313,22 +313,22 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function teacher_started_course( $learner_id = 0, $course_id = 0 ) {
+	function teacher_started_course($learner_id = 0, $course_id = 0) {
 
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_teachers'] ) ) {
-			if( in_array( 'teacher-started-course', (array) Sensei()->settings->settings['email_teachers'] ) ) {
+		if (isset(Sensei()->settings->settings['email_teachers'])) {
+			if (in_array('teacher-started-course', (array) Sensei()->settings->settings['email_teachers'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['teacher-started-course'];
-			$email->trigger( $learner_id, $course_id );
+			$email->trigger($learner_id, $course_id);
 		}
 	}
 
@@ -341,22 +341,22 @@ 
      * @return void
      * @since 1.9.0
      */
-    function teacher_completed_lesson( $learner_id = 0, $lesson_id = 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' ]) ) {
+        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 ) {
+        if ($send) {
             $email = $this->emails['teacher-completed-lesson'];
-            $email->trigger( $learner_id, $lesson_id );
+            $email->trigger($learner_id, $lesson_id);
         }
     }
 
@@ -366,25 +366,25 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function teacher_quiz_submitted( $learner_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0, $quiz_grade_type = 'manual' ) {
+	function teacher_quiz_submitted($learner_id = 0, $quiz_id = 0, $grade = 0, $passmark = 0, $quiz_grade_type = 'manual') {
 
 
 
 		$send = false;
 
 		// Only trigger if the quiz was marked as manual grading, or auto grading didn't complete
-		if( 'manual' == $quiz_grade_type || is_wp_error( $grade ) ) {
-			if( isset( Sensei()->settings->settings['email_teachers'] ) ) {
-				if( in_array( 'teacher-quiz-submitted', (array) Sensei()->settings->settings['email_teachers'] ) ) {
+		if ('manual' == $quiz_grade_type || is_wp_error($grade)) {
+			if (isset(Sensei()->settings->settings['email_teachers'])) {
+				if (in_array('teacher-quiz-submitted', (array) Sensei()->settings->settings['email_teachers'])) {
 					$send = true;
 				}
 			} else {
 				$send = true;
 			}
 
-			if( $send ) {
+			if ($send) {
 				$email = $this->emails['teacher-quiz-submitted'];
-				$email->trigger( $learner_id, $quiz_id );
+				$email->trigger($learner_id, $quiz_id);
 			}
 
 		}
@@ -396,22 +396,22 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function teacher_new_message( $message_id = 0 ) {
+	function teacher_new_message($message_id = 0) {
 
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_teachers'] ) ) {
-			if( in_array( 'teacher-new-message', (array) Sensei()->settings->settings['email_teachers'] ) ) {
+		if (isset(Sensei()->settings->settings['email_teachers'])) {
+			if (in_array('teacher-new-message', (array) Sensei()->settings->settings['email_teachers'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['teacher-new-message'];
-			$email->trigger( $message_id );
+			$email->trigger($message_id);
 		}
 	}
 
@@ -421,22 +421,22 @@ 
 	 * @access public
 	 * @return void
 	 */
-	function new_message_reply( $comment, $message ) {
+	function new_message_reply($comment, $message) {
 
 
 		$send = false;
 
-		if( isset( Sensei()->settings->settings['email_global'] ) ) {
-			if( in_array( 'new-message-reply', (array) Sensei()->settings->settings['email_global'] ) ) {
+		if (isset(Sensei()->settings->settings['email_global'])) {
+			if (in_array('new-message-reply', (array) Sensei()->settings->settings['email_global'])) {
 				$send = true;
 			}
 		} else {
 			$send = true;
 		}
 
-		if( $send ) {
+		if ($send) {
 			$email = $this->emails['new-message-reply'];
-			$email->trigger( $comment, $message );
+			$email->trigger($comment, $message);
 		}
 	}
 
@@ -447,4 +447,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Emails extends Sensei_Emails{}
+class WooThemes_Sensei_Emails extends Sensei_Emails {}

Braces +3 added lines, -1 removed lines

@@ -210,7 +210,9 @@
 	function load_template( $template = '' ) {
 		global  $email_template;
 
-		if( ! $template ) return;
+		if( ! $template ) {
+			return;
+		}
 
 		$email_template = $template . '.php';
 		$template = Sensei_Templates::template_loader( '' );

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;

includes/class-sensei-list-table.php

Doc Comments +1 added lines

@@ -44,6 +44,7 @@
 	/**
 	 * Constructor
 	 * @since  1.2.0
+	 * @param string $token
 	 * @return  void
 	 */
 	public function __construct ( $token ) {

Braces +16 added lines, -9 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Generic List Table Class
@@ -131,8 +134,9 @@ 
 	 * @return array
 	 */
 	function get_column_info() {
-		if ( isset( $this->_column_headers ) )
-			return $this->_column_headers;
+		if ( isset( $this->_column_headers ) ) {
+					return $this->_column_headers;
+		}
 
 		$columns = $this->get_columns();
 		$hidden = get_hidden_columns( $this->screen );
@@ -152,12 +156,14 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
-				$data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$data[1] = false;
+			}
 
 			$sortable[$id] = $data;
 		}
@@ -188,8 +194,9 @@ 
 			$class = "class='$column_name column-$column_name'";
 
 			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+			if ( in_array( $column_name, $hidden ) ) {
+							$style = ' style="display:none;"';
+			}
 
 			$attributes = "$class$style";
 

Indentation +11 added lines, -11 removed lines

@@ -40,16 +40,16 @@ 
 	public $total_items = 0;
 
 
-    /**
-     * @var array $sortable_columns
-     *
-     */
-    public $sortable_columns = array();
+	/**
+	 * @var array $sortable_columns
+	 *
+	 */
+	public $sortable_columns = array();
 
-    /**
-     * @var array columns
-     */
-    public $columns = array();
+	/**
+	 * @var array columns
+	 */
+	public $columns = array();
 
 	/**
 	 * Constructor
@@ -175,8 +175,8 @@ 
 			$sortable[$id] = $data;
 		}
 
-        $primary = $this->get_primary_column_name();
-        $this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$primary = $this->get_primary_column_name();
+		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
 
 		return $this->_column_headers;
 	}

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Generic Data Table parent Class in Sensei.
@@ -56,18 +56,18 @@ 
 	 * @since  1.2.0
 	 * @return  void
 	 */
-	public function __construct ( $token ) {
+	public function __construct($token) {
 		// Class Variables
 		$this->token = $token;
 
-		parent::__construct( array(
-								'singular' => 'wp_list_table_' . $this->token, // Singular label
-								'plural'   => 'wp_list_table_' . $this->token . 's', // Plural label
+		parent::__construct(array(
+								'singular' => 'wp_list_table_'.$this->token, // Singular label
+								'plural'   => 'wp_list_table_'.$this->token.'s', // Plural label
 								'ajax'     => false // No Ajax for this table
-		) );
+		));
 
 		// Actions
-		add_action( 'sensei_before_list_table', array( $this, 'table_search_form' ), 5 );
+		add_action('sensei_before_list_table', array($this, 'table_search_form'), 5);
 
 	} // End __construct()
 
@@ -76,7 +76,7 @@ 
 	 * @param  array $columns Existing columns
 	 * @return array          Modified columns
 	 */
-	public function remove_sortable_columns( $columns ) {
+	public function remove_sortable_columns($columns) {
 		return array();
 	}
 
@@ -85,14 +85,14 @@ 
 	 * @since  1.2.0
 	 * @param string $which, helps you decide if you add the markup after (bottom) or before (top) the list
 	 */
-	public function extra_tablenav( $which ) {
-		if ( $which == "top" ){
+	public function extra_tablenav($which) {
+		if ($which == "top") {
 			//The code that goes before the table is here
-			do_action( 'sensei_before_list_table' );
+			do_action('sensei_before_list_table');
 		} // End If Statement
-		if ( $which == "bottom" ){
+		if ($which == "bottom") {
 			//The code that goes after the table is there
-			do_action( 'sensei_after_list_table' );
+			do_action('sensei_after_list_table');
 		} // End If Statement
 	} // End extra_tablenav()
 
@@ -102,22 +102,22 @@ 
 	 * @return void
 	 */
 	public function table_search_form() {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) {
+		if (empty($_REQUEST['s']) && ! $this->has_items()) {
 			return;
 		}
 		?><form method="get">
 			<?php
-			if( isset( $_GET ) && count( $_GET ) > 0 ) {
-				foreach( $_GET as $k => $v ) {
-					if( 's' != $k ) { ?>
+			if (isset($_GET) && count($_GET) > 0) {
+				foreach ($_GET as $k => $v) {
+					if ('s' != $k) { ?>
 
-                        <input type="hidden" name="<?php echo esc_attr( $k ); ?>" value="<?php echo esc_attr( $v ); ?>" />
+                        <input type="hidden" name="<?php echo esc_attr($k); ?>" value="<?php echo esc_attr($v); ?>" />
 
                     <?php  }
 				}
 			}
 			?>
-			<?php $this->search_box( __( 'Search Users' ,'woothemes-sensei' ), 'search_id'); ?>
+			<?php $this->search_box(__('Search Users', 'woothemes-sensei'), 'search_id'); ?>
 		</form><?php
 	} // End table_search_form()
 
@@ -145,11 +145,11 @@ 
 	 * @return array
 	 */
 	function get_column_info() {
-		if ( isset( $this->_column_headers ) )
+		if (isset($this->_column_headers))
 			return $this->_column_headers;
 
 		$columns = $this->get_columns();
-		$hidden = get_hidden_columns( $this->screen );
+		$hidden = get_hidden_columns($this->screen);
 
 		/**
 		 * Filter the list table sortable columns for a specific screen.
@@ -161,22 +161,22 @@ 
 		 *
 		 * @param array $sortable_columns An array of sortable columns.
 		 */
-		$_sortable = apply_filters( "manage_{$this->screen->id}_sortable_columns", $this->get_sortable_columns() );
+		$_sortable = apply_filters("manage_{$this->screen->id}_sortable_columns", $this->get_sortable_columns());
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$data[1] = false;
 
 			$sortable[$id] = $data;
 		}
 
         $primary = $this->get_primary_column_name();
-        $this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+        $this->_column_headers = array($columns, $hidden, $sortable, $primary);
 
 		return $this->_column_headers;
 	}
@@ -187,27 +187,27 @@ 
 	 * @since  1.7.0
 	 * @param object $item The current item
 	 */
-	function single_row( $item ) {
+	function single_row($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? ' class="alternate"' : '' );
+		$row_class = ($row_class == '' ? ' class="alternate"' : '');
 
-		echo '<tr' . $row_class . '>';
+		echo '<tr'.$row_class.'>';
 
-		$column_data = $this->get_row_data( $item );
+		$column_data = $this->get_row_data($item);
 
-		list( $columns, $hidden ) = $this->get_column_info();
+		list($columns, $hidden) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$class = "class='$column_name column-$column_name'";
 
 			$style = '';
-			if ( in_array( $column_name, $hidden ) )
+			if (in_array($column_name, $hidden))
 				$style = ' style="display:none;"';
 
 			$attributes = "$class$style";
 
 			echo "<td $attributes>";
-			if ( isset($column_data[$column_name]) ) {
+			if (isset($column_data[$column_name])) {
 				echo $column_data[$column_name];
 			}
 			echo "</td>";
@@ -221,8 +221,8 @@ 
 	 * @access public
 	 * @abstract
 	 */
-	protected function get_row_data( $item ) {
-		die( 'either function WooThemes_Sensei_List_Table::get_row_data() must be over-ridden in a sub-class or WooThemes_Sensei_List_Table::single_row() should be.' );
+	protected function get_row_data($item) {
+		die('either function WooThemes_Sensei_List_Table::get_row_data() must be over-ridden in a sub-class or WooThemes_Sensei_List_Table::single_row() should be.');
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	function no_items() {
 
-		 _e( 'No items found.', 'woothemes-sensei' );
+		 _e('No items found.', 'woothemes-sensei');
 
 	} // End no_items()
 
@@ -251,9 +251,9 @@ 
 	 * @since  1.2.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		// This will be output Above the table headers on the left
-		echo apply_filters( 'sensei_list_bulk_actions', '' );
+		echo apply_filters('sensei_list_bulk_actions', '');
 	} // End bulk_actions()
 
 } // End Class

includes/class-sensei-messages.php

Doc Comments +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
      * @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
+     * @param  integer  $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 ) {

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Messages Class
@@ -21,61 +21,61 @@ 
 	 * Constructor.
 	 * @since  1.6.0
 	 */
-	public function __construct () {
+	public function __construct() {
 		$this->post_type = 'sensei_message';
-		$this->meta_fields = array( 'sender', 'receiver' );
+		$this->meta_fields = array('sender', 'receiver');
 
 		// Add Messages page to admin menu
-		add_action( 'admin_menu', array( $this, 'add_menu_item' ), 40 );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_box' ), 10, 2 );
-		add_action( 'admin_menu', array( $this, 'remove_meta_box' ) );
+		add_action('admin_menu', array($this, 'add_menu_item'), 40);
+		add_action('add_meta_boxes', array($this, 'add_meta_box'), 10, 2);
+		add_action('admin_menu', array($this, 'remove_meta_box'));
 
 		// Save new private message
-		add_action( 'init', array( $this, 'save_new_message' ), 1 );
+		add_action('init', array($this, 'save_new_message'), 1);
 
 		// Monitor when new reply is posted
-		add_action( 'comment_post', array( $this, 'message_reply_received' ), 10, 1 );
+		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  );
+        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  );
+        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' ) );
+		add_action('save_post', array($this, 'save_message'));
 
 		// Add message links to courses & lessons
-		add_action( 'sensei_single_course_content_inside_before', array( $this, 'send_message_link' ), 35 );
+		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_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_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() {
 
-		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
-			add_submenu_page( 'sensei', __( 'Messages', 'woothemes-sensei'),  __( 'Messages', 'woothemes-sensei') , 'edit_courses', 'edit.php?post_type=sensei_message' );
+		if ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable']) {
+			add_submenu_page('sensei', __('Messages', 'woothemes-sensei'), __('Messages', 'woothemes-sensei'), 'edit_courses', 'edit.php?post_type=sensei_message');
 		}
 	}
 
-	public function add_meta_box( $post_type, $post ) {
+	public function add_meta_box($post_type, $post) {
 
-		if( ! $post_type == $this->post_type ) return;
+		if ( ! $post_type == $this->post_type) return;
 
-		add_meta_box( $this->post_type . '-data', __( 'Message Information', 'woothemes-sensei' ), array( $this, 'meta_box_content' ), $this->post_type, 'normal', 'default' );
+		add_meta_box($this->post_type.'-data', __('Message Information', 'woothemes-sensei'), array($this, 'meta_box_content'), $this->post_type, 'normal', 'default');
 
 	}
 
@@ -85,25 +85,25 @@ 
 		$settings = array(
 			array(
 				'id' 			=> 'sender',
-				'label'			=> __( 'Message sent by:', 'woothemes-sensei' ),
-				'description'	=> __( 'The username of the learner who sent this message.', 'woothemes-sensei' ),
+				'label'			=> __('Message sent by:', 'woothemes-sensei'),
+				'description'	=> __('The username of the learner who sent this message.', 'woothemes-sensei'),
 				'type'			=> 'text',
 				'default'		=> '',
-				'placeholder'	=> __( 'Learner username', 'woothemes-sensei' ),
+				'placeholder'	=> __('Learner username', 'woothemes-sensei'),
 			),
 			array(
 				'id' 			=> 'receiver',
-				'label'			=> __( 'Message received by:', 'woothemes-sensei' ),
-				'description'	=> __( 'The username of the teacher who received this message.', 'woothemes-sensei' ),
+				'label'			=> __('Message received by:', 'woothemes-sensei'),
+				'description'	=> __('The username of the teacher who received this message.', 'woothemes-sensei'),
 				'type'			=> 'text',
 				'default'		=> '',
-				'placeholder'	=> __( 'Teacher username', 'woothemes-sensei' ),
+				'placeholder'	=> __('Teacher username', 'woothemes-sensei'),
 			),
 		);
 
-		$message_posttype = get_post_meta( $post->ID, '_posttype', true );
+		$message_posttype = get_post_meta($post->ID, '_posttype', true);
 
-		if( isset( $message_posttype ) && $message_posttype ) {
+		if (isset($message_posttype) && $message_posttype) {
 
 			$args = array(
 				'post_type' => $message_posttype,
@@ -113,58 +113,58 @@ 
 				'post_status' => 'publish',
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			$post_options[0] = sprintf( __( 'Select %1$s', 'woothemes-sensei' ), $message_posttype );
-			foreach( $posts as $post_item ) {
-				$post_options[ $post_item->ID ] = $post_item->post_title;
+			$post_options[0] = sprintf(__('Select %1$s', 'woothemes-sensei'), $message_posttype);
+			foreach ($posts as $post_item) {
+				$post_options[$post_item->ID] = $post_item->post_title;
 			}
 
 			$settings[] = array(
 				'id' 			=> 'post',
-				'label'			=> sprintf( __( 'Message from %1$s:', 'woothemes-sensei' ), $message_posttype ),
-				'description'	=> sprintf( __( 'The %1$s to which this message relates.', 'woothemes-sensei' ), $message_posttype ),
+				'label'			=> sprintf(__('Message from %1$s:', 'woothemes-sensei'), $message_posttype),
+				'description'	=> sprintf(__('The %1$s to which this message relates.', 'woothemes-sensei'), $message_posttype),
 				'type'			=> 'select',
 				'default'		=> 0,
 				'options'		=> $post_options,
 			);
 		}
 
-		$html = Sensei()->admin->render_settings( $settings, $post->ID, 'message-info' );
+		$html = Sensei()->admin->render_settings($settings, $post->ID, 'message-info');
 
 		echo $html;
 	}
 
-	public function save_message( $post_id = 0 ) {
+	public function save_message($post_id = 0) {
 		global $post;
 
-		if( $this->post_type != get_post_type() ) return;
+		if ($this->post_type != get_post_type()) return;
 
-		if( isset( $_POST['sender'] ) && $_POST['sender'] ) {
-			update_post_meta( $post_id, '_sender', $_POST['sender'] );
+		if (isset($_POST['sender']) && $_POST['sender']) {
+			update_post_meta($post_id, '_sender', $_POST['sender']);
 		}
 
-		if( isset( $_POST['receiver'] ) && $_POST['receiver'] ) {
-			update_post_meta( $post_id, '_receiver', $_POST['receiver'] );
+		if (isset($_POST['receiver']) && $_POST['receiver']) {
+			update_post_meta($post_id, '_receiver', $_POST['receiver']);
 		}
 
-		if( isset( $_POST['post'] ) && $_POST['post'] ) {
-			update_post_meta( $post_id, '_post', $_POST['post'] );
+		if (isset($_POST['post']) && $_POST['post']) {
+			update_post_meta($post_id, '_post', $_POST['post']);
 		}
 
-		remove_action( 'save_post', array( $this, 'save_message' ) );
+		remove_action('save_post', array($this, 'save_message'));
 
-		wp_update_post( array( 'ID' => $post_id, 'comment_status' => 'open' ) );
+		wp_update_post(array('ID' => $post_id, 'comment_status' => 'open'));
 
-		add_action( 'save_post', array( $this, 'save_message' ) );
+		add_action('save_post', array($this, 'save_message'));
 	}
 
-	public function send_message_link( $post_id = 0, $user_id = 0 ) {
+	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');
-		if ( ! in_array( get_post_type() , $allowed_post_types ) ) {
+		if ( ! in_array(get_post_type(), $allowed_post_types)) {
 
 			return;
 
@@ -172,28 +172,28 @@ 
 
 		$html = '';
 
-		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
+		if ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable']) {
 
-			if( ! is_user_logged_in() ) return;
+			if ( ! is_user_logged_in()) return;
 
-			if( isset( $_GET['contact'] ) ) {
-				$html .= $this->teacher_contact_form( $post );
+			if (isset($_GET['contact'])) {
+				$html .= $this->teacher_contact_form($post);
 			} else {
-				$href = add_query_arg( array( 'contact' => $post->post_type ) );
-
-				if( 'lesson' == $post->post_type ) {
-					$contact_button_text = __( 'Contact Lesson Teacher', 'woothemes-sensei' );
-				} elseif( 'course' == $post->post_type ) {
-					$contact_button_text = __( 'Contact Course Teacher', 'woothemes-sensei' );
-				}else{
-                    $contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
+				$href = add_query_arg(array('contact' => $post->post_type));
+
+				if ('lesson' == $post->post_type) {
+					$contact_button_text = __('Contact Lesson Teacher', 'woothemes-sensei');
+				} elseif ('course' == $post->post_type) {
+					$contact_button_text = __('Contact Course Teacher', 'woothemes-sensei');
+				} else {
+                    $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>';
+				$html .= '<p><a class="button send-message-button" href="'.esc_url($href).'#private_message">'.$contact_button_text.'</a></p>';
 			}
 
-			if( isset( $this->message_notice ) && isset( $this->message_notice['type'] ) && isset( $this->message_notice['notice'] ) ) {
-				$html .= '<div class="sensei-message ' . $this->message_notice['type'] . '">' . $this->message_notice['notice'] . '</div>';
+			if (isset($this->message_notice) && isset($this->message_notice['type']) && isset($this->message_notice['notice'])) {
+				$html .= '<div class="sensei-message '.$this->message_notice['type'].'">'.$this->message_notice['notice'].'</div>';
 			}
 
 		}
@@ -201,40 +201,40 @@ 
 		echo $html;
 	}
 
-	public function teacher_contact_form( $post ) {
+	public function teacher_contact_form($post) {
 
-		if( ! is_user_logged_in() ) return;
+		if ( ! is_user_logged_in()) return;
 
 		global $current_user;
 		wp_get_current_user();
 
 		$html = '';
 
-		if( ! isset( $post->ID ) ) return $html;
+		if ( ! isset($post->ID)) return $html;
 
         //confirm private message
         $confirmation = '';
-        if( isset( $_GET[ 'send' ] ) && 'complete' == $_GET[ 'send' ] ) {
+        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 = '<div class="sensei-message tick">'.$confirmation_message.'</div>';
 
         }
 
-		$html .= '<h3 id="private_message">' . __( 'Send Private Message', 'woothemes-sensei' ) . '</h3>';
+		$html .= '<h3 id="private_message">'.__('Send Private Message', 'woothemes-sensei').'</h3>';
         $html .= '<p>';
-        $html .=  $confirmation;
+        $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>';
+				$html .= '<textarea name="contact_message" placeholder="'.__('Enter your private message.', 'woothemes-sensei').'"></textarea>';
 			$html .= '</p>';
 			$html .= '<p class="form-row">';
-				$html .= '<input type="hidden" name="post_id" value="' . $post->ID . '" />';
-				$html .= '<input type="hidden" name="sender_id" value="' . $current_user->ID . '" />';
-				$html .= '<input type="hidden" name="receiver_id" value="' . $post->post_author . '" />';
-				$html .= wp_nonce_field( 'message_teacher', 'sensei_message_teacher_nonce', true, false );
-				$html .= '<input type="submit" class="send_message" value="' . __( 'Send Message', 'woothemes-sensei' ) . '" />';
+				$html .= '<input type="hidden" name="post_id" value="'.$post->ID.'" />';
+				$html .= '<input type="hidden" name="sender_id" value="'.$current_user->ID.'" />';
+				$html .= '<input type="hidden" name="receiver_id" value="'.$post->post_author.'" />';
+				$html .= wp_nonce_field('message_teacher', 'sensei_message_teacher_nonce', true, false);
+				$html .= '<input type="submit" class="send_message" value="'.__('Send Message', 'woothemes-sensei').'" />';
 			$html .= '</p>';
 			$html .= '<div class="fix"></div>';
 		$html .= '</form>';
@@ -244,30 +244,30 @@ 
 
 	public function save_new_message() {
 
-		if( ! isset( $_POST['sensei_message_teacher_nonce'] ) ) return;
+		if ( ! isset($_POST['sensei_message_teacher_nonce'])) return;
 
-		if( ! wp_verify_nonce( $_POST['sensei_message_teacher_nonce'], 'message_teacher' ) ) return;
+		if ( ! wp_verify_nonce($_POST['sensei_message_teacher_nonce'], 'message_teacher')) return;
 
-		$message_id = $this->save_new_message_post( $_POST['sender_id'], $_POST['receiver_id'], $_POST['contact_message'], $_POST['post_id'] );
+		$message_id = $this->save_new_message_post($_POST['sender_id'], $_POST['receiver_id'], $_POST['contact_message'], $_POST['post_id']);
 
 	}
 
-	public function message_reply_received( $comment_id = 0 ) {
+	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;
+		if (is_null($comment)) return;
 
 		// Get message post object
-		$message = get_post( $comment->comment_post_ID );
+		$message = get_post($comment->comment_post_ID);
 
-		if( $message->post_type != $this->post_type ) return;
+		if ($message->post_type != $this->post_type) return;
 
 		// Force comment to be approved
-		wp_set_comment_status( $comment_id, 'approve' );
+		wp_set_comment_status($comment_id, 'approve');
 
-		do_action( 'sensei_private_message_reply', $comment, $message );
+		do_action('sensei_private_message_reply', $comment, $message);
 	}
 
     /**
@@ -280,11 +280,11 @@ 
      * @param int $comment_id
      * @return array;
      */
-    public function stop_wp_comment_emails( $emails , $comment_id ){
+    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();
@@ -302,45 +302,45 @@ 
      * @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 ) {
+    private function save_new_message_post($sender_id = 0, $receiver_id = 0, $message = '', $post_id = 0) {
 
     	$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_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 )
+	            'post_author'	 => intval($sender_id)
 	        );
 
 	    	// Insert post
-	        $message_id = wp_insert_post( $message_data );
+	        $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 );
+	        	$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 );
+	        	$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 );
+		        $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 {
 
@@ -358,22 +358,22 @@ 
 	 * @param  integer $user_id    ID of user
 	 * @return boolean             True if user has access to this message
 	 */
-	private function view_message( $message_id, $user_id = 0) {
+	private function view_message($message_id, $user_id = 0) {
 
-		if( ! is_user_logged_in() ) return false;
+		if ( ! is_user_logged_in()) return false;
 
-		if( $user_id == 0 ) {
+		if ($user_id == 0) {
 			global $current_user;
 			wp_get_current_user();
 			$user_login = $current_user->user_login;
 		}
 
 		// Get allowed users
-		$receiver = get_post_meta( $message_id, '_receiver', true );
-		$sender = get_post_meta( $message_id, '_sender', true );
+		$receiver = get_post_meta($message_id, '_receiver', true);
+		$sender = get_post_meta($message_id, '_sender', true);
 
 		// Check if user is allowed to view the message
-		if( in_array( $user_login, array( $receiver, $sender ) ) ) {
+		if (in_array($user_login, array($receiver, $sender))) {
 			return true;
 		}
 
@@ -400,27 +400,27 @@ 
      * @return void
      */
 
-    public function message_login () {
+    public function message_login() {
 
-        if ( is_user_logged_in() ) {
+        if (is_user_logged_in()) {
 
             return;
         }
 
         $settings = Sensei()->settings->get_settings();
-        if( isset( $settings[ 'my_course_page' ] )
-            && 0 < intval( $settings[ 'my_course_page' ] ) ){
+        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);
 
         }
 
-        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;
@@ -439,12 +439,12 @@ 
      * @param  array $query Original query
      * @return void
      */
-	public function message_list( $query ) {
+	public function message_list($query) {
 		global $current_user;
 
-		if( is_admin() ) return;
+		if (is_admin()) return;
 
-		if( is_post_type_archive( $this->post_type ) && $query->is_main_query() ) {
+		if (is_post_type_archive($this->post_type) && $query->is_main_query()) {
 			wp_get_current_user();
 			$username = $current_user->user_login;
 
@@ -462,7 +462,7 @@ 
 				'compare' => '='
 			);
 
-			$query->set( 'meta_query', $meta_query );
+			$query->set('meta_query', $meta_query);
 
 			return;
 		}
@@ -474,11 +474,11 @@ 
 	 * @param  integer $post_id ID of post
 	 * @return string           Modified string if user does not have access to this message
 	 */
-	public function message_title( $title = '', $post_id = null ) {
+	public function message_title($title = '', $post_id = null) {
 
-		if( is_single() && is_singular( $this->post_type ) && in_the_loop() && get_post_type( $post_id ) == $this->post_type ) {
-			if( ! is_user_logged_in() || ! $this->view_message( $post_id ) ) {
-				$title = __( 'You are not allowed to view this message.', 'woothemes-sensei' );
+		if (is_single() && is_singular($this->post_type) && in_the_loop() && get_post_type($post_id) == $this->post_type) {
+			if ( ! is_user_logged_in() || ! $this->view_message($post_id)) {
+				$title = __('You are not allowed to view this message.', 'woothemes-sensei');
 			}
 		}
 
@@ -490,12 +490,12 @@ 
 	 * @param  string $content Original message content
 	 * @return string          Empty string if user does not have access to this message
 	 */
-	public function message_content( $content ) {
+	public function message_content($content) {
 		global $post;
 
-		if( is_single() && is_singular( $this->post_type ) && in_the_loop() ) {
-			if( ! is_user_logged_in() || ! $this->view_message( $post->ID ) ) {
-				$content = __( 'Please log in to view your messages.', 'woothemes-sensei' );
+		if (is_single() && is_singular($this->post_type) && in_the_loop()) {
+			if ( ! is_user_logged_in() || ! $this->view_message($post->ID)) {
+				$content = __('Please log in to view your messages.', 'woothemes-sensei');
 			}
 		}
 
@@ -507,11 +507,11 @@ 
 	 * @param  array $comments Array of replies
 	 * @return array           Empty array if user does not have access to this message
 	 */
-	public function message_replies( $comments ) {
+	public function message_replies($comments) {
 		global $post;
 
-		if( is_single() && is_singular( $this->post_type ) && in_the_loop() ) {
-			if( ! is_user_logged_in() || ! $this->view_message( $post->ID ) ) {
+		if (is_single() && is_singular($this->post_type) && in_the_loop()) {
+			if ( ! is_user_logged_in() || ! $this->view_message($post->ID)) {
 				$comments = array();
 			}
 		}
@@ -525,11 +525,11 @@ 
 	 * @param  integer $post_id ID of post
 	 * @return integer          0 if user does not have access to this message
 	 */
-	public function message_reply_count( $count, $post_id ) {
+	public function message_reply_count($count, $post_id) {
 		global $post;
 
-		if( is_single() && is_singular( $this->post_type ) && in_the_loop() ) {
-			if( ! is_user_logged_in() || ! $this->view_message( $post->ID ) ) {
+		if (is_single() && is_singular($this->post_type) && in_the_loop()) {
+			if ( ! is_user_logged_in() || ! $this->view_message($post->ID)) {
 				$count = 0;
 			}
 		}
@@ -543,11 +543,11 @@ 
 	 * @param  integer $post_id ID of post
 	 * @return boolean          False if user does not have access to this message
 	 */
-	public function message_replies_open( $open, $post_id ) {
+	public function message_replies_open($open, $post_id) {
 		global $post;
 
-		if( is_single() && is_singular( $this->post_type ) && in_the_loop() ) {
-			if( ! is_user_logged_in() || ! $this->view_message( $post->ID ) ) {
+		if (is_single() && is_singular($this->post_type) && in_the_loop()) {
+			if ( ! is_user_logged_in() || ! $this->view_message($post->ID)) {
 				$open = false;
 			}
 		}
@@ -560,17 +560,17 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_message_sent_by_title(){
+    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>
                     <em>
-                        <?php printf( __( 'Sent by %1$s on %2$s.', 'woothemes-sensei' ), $sender->display_name, get_the_date() ); ?>
+                        <?php printf(__('Sent by %1$s on %2$s.', 'woothemes-sensei'), $sender->display_name, get_the_date()); ?>
                     </em>
                 </small>
             </p>
@@ -589,11 +589,11 @@ 
 
         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>' );
+        $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 );
+            $title = get_the_title($post->ID);
         }
 
         ?>
@@ -610,7 +610,7 @@ 
                  * @param string $template
                  * @param string $post_type
                  */
-                echo apply_filters( 'sensei_single_title', $title, $post->post_type );
+                echo apply_filters('sensei_single_title', $title, $post->post_type);
                 ?>
 
             </h1>
@@ -629,18 +629,18 @@ 
      *
      * @return string
      */
-    public static function the_archive_header( ){
+    public static function the_archive_header( ) {
 
         $html = '';
         $html .= '<header class="archive-header"><h1>';
-        $html .= __( 'My Messages', 'woothemes-sensei' );
+        $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 );
+        echo apply_filters('sensei_message_archive_title', $html);
 
     } // get_archive_header()
 
@@ -650,23 +650,23 @@ 
      * @since 1.9.0
      * @param $post_id
      */
-    public static function the_message_title( $message_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 {
 
-            $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 ) );?>">
+            <a href="<?php esc_url(get_permalink($message_post_id)); ?>">
                 <?php echo  $title; ?>
             </a>
 
@@ -680,13 +680,13 @@ 
      *
      * @param $message_post_id
      */
-    public  static function the_message_sender( $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>
@@ -704,13 +704,13 @@ 
      *
      * @since 1.9.0
      */
-    public static function the_my_messages_link(){
-        if( ! Sensei()->settings->get('messages_disable')  ) {
+    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' ); ?>">
-                    <?php _e( 'My Messages', 'woothemes-sensei' ); ?>
+                <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'); ?>">
+                    <?php _e('My Messages', 'woothemes-sensei'); ?>
                 </a>
             </p>
             <?php
@@ -724,4 +724,4 @@ 
  * for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Messages extends Sensei_Messages{}
+class WooThemes_Sensei_Messages extends Sensei_Messages {}

Braces +39 added lines, -16 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Messages Class
@@ -73,7 +76,9 @@ 
 
 	public function add_meta_box( $post_type, $post ) {
 
-		if( ! $post_type == $this->post_type ) return;
+		if( ! $post_type == $this->post_type ) {
+			return;
+		}
 
 		add_meta_box( $this->post_type . '-data', __( 'Message Information', 'woothemes-sensei' ), array( $this, 'meta_box_content' ), $this->post_type, 'normal', 'default' );
 
@@ -138,7 +143,9 @@ 
 	public function save_message( $post_id = 0 ) {
 		global $post;
 
-		if( $this->post_type != get_post_type() ) return;
+		if( $this->post_type != get_post_type() ) {
+			return;
+		}
 
 		if( isset( $_POST['sender'] ) && $_POST['sender'] ) {
 			update_post_meta( $post_id, '_sender', $_POST['sender'] );
@@ -174,7 +181,9 @@ 
 
 		if( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) {
 
-			if( ! is_user_logged_in() ) return;
+			if( ! is_user_logged_in() ) {
+				return;
+			}
 
 			if( isset( $_GET['contact'] ) ) {
 				$html .= $this->teacher_contact_form( $post );
@@ -185,7 +194,7 @@ 
 					$contact_button_text = __( 'Contact Lesson Teacher', 'woothemes-sensei' );
 				} elseif( 'course' == $post->post_type ) {
 					$contact_button_text = __( 'Contact Course Teacher', 'woothemes-sensei' );
-				}else{
+				} else{
                     $contact_button_text = __( 'Contact Teacher', 'woothemes-sensei' );
                 }
 
@@ -203,14 +212,18 @@ 
 
 	public function teacher_contact_form( $post ) {
 
-		if( ! is_user_logged_in() ) return;
+		if( ! is_user_logged_in() ) {
+			return;
+		}
 
 		global $current_user;
 		wp_get_current_user();
 
 		$html = '';
 
-		if( ! isset( $post->ID ) ) return $html;
+		if( ! isset( $post->ID ) ) {
+			return $html;
+		}
 
         //confirm private message
         $confirmation = '';
@@ -244,9 +257,13 @@ 
 
 	public function save_new_message() {
 
-		if( ! isset( $_POST['sensei_message_teacher_nonce'] ) ) return;
+		if( ! isset( $_POST['sensei_message_teacher_nonce'] ) ) {
+			return;
+		}
 
-		if( ! wp_verify_nonce( $_POST['sensei_message_teacher_nonce'], 'message_teacher' ) ) return;
+		if( ! wp_verify_nonce( $_POST['sensei_message_teacher_nonce'], 'message_teacher' ) ) {
+			return;
+		}
 
 		$message_id = $this->save_new_message_post( $_POST['sender_id'], $_POST['receiver_id'], $_POST['contact_message'], $_POST['post_id'] );
 
@@ -257,12 +274,16 @@ 
 		// Get comment object
     	$comment = get_comment( $comment_id );
 
-		if( is_null( $comment ) ) return;
+		if( is_null( $comment ) ) {
+			return;
+		}
 
 		// Get message post object
 		$message = get_post( $comment->comment_post_ID );
 
-		if( $message->post_type != $this->post_type ) return;
+		if( $message->post_type != $this->post_type ) {
+			return;
+		}
 
 		// Force comment to be approved
 		wp_set_comment_status( $comment_id, 'approve' );
@@ -360,7 +381,9 @@ 
 	 */
 	private function view_message( $message_id, $user_id = 0) {
 
-		if( ! is_user_logged_in() ) return false;
+		if( ! is_user_logged_in() ) {
+			return false;
+		}
 
 		if( $user_id == 0 ) {
 			global $current_user;
@@ -424,9 +447,7 @@ 
 
                 wp_redirect($my_courses_url, 303);
                 exit;
-            }
-
-            else {
+            } else {
 
                 wp_redirect(home_url('/wp-login.php'), 303);
                 exit;
@@ -442,7 +463,9 @@ 
 	public function message_list( $query ) {
 		global $current_user;
 
-		if( is_admin() ) return;
+		if( is_admin() ) {
+			return;
+		}
 
 		if( is_post_type_archive( $this->post_type ) && $query->is_main_query() ) {
 			wp_get_current_user();

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-question.php

Doc Comments +2 added lines, -2 removed lines

@@ -402,7 +402,7 @@ 
      * This function simply loads the question type template
      *
      * @since 1.9.0
-     * @param $question_type
+     * @param string $question_type
      */
     public static function load_question_template( $question_type ){
 
@@ -487,7 +487,7 @@ 
      * Get the questions media markup
      *
      * @since 1.9.0
-     * @param $question_id
+     * @param string $question_id
      * @return string
      */
     public static function get_the_question_media( $question_id ){

Braces +15 added lines, -10 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Question Class
@@ -211,7 +214,9 @@ 
 
 			$lesson_id = get_post_meta( $quiz, '_quiz_lesson', true );
 
-			if( ! $lesson_id ) continue;
+			if( ! $lesson_id ) {
+				continue;
+			}
 
 			$lessons[ $lesson_id ]['title'] = get_the_title( $lesson_id );
 			$lessons[ $lesson_id ]['link'] = admin_url( 'post.php?post=' . $lesson_id . '&action=edit' );
@@ -880,7 +885,7 @@ 
 
                 $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
 
-            }  else {
+            } else {
 
                 array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
                 $merged_options = $question_data[ 'question_wrong_answers' ];
@@ -908,7 +913,7 @@ 
 
                         $user_correct = true;
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+                    } else if( $question_data[ 'user_question_grade' ] > 0 ) {
 
                         $user_correct = true;
 
@@ -923,7 +928,7 @@ 
 
                         $answer_class .= ' right_answer';
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+                    } elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
 
                         $answer_class .= ' right_answer';
 
@@ -1006,13 +1011,13 @@ 
                             }
                         }
 
-                    }else{
+                    } else{
 
                         $answer_options_sorted = $question_answers_options;
 
                     }
 
-                }else{
+                } else{
 
                     $answer_options_sorted = $question_answers_options;
 
@@ -1075,12 +1080,12 @@ 
 
             $right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+        } elseif( 'multiple-choice' == $type ) {
 
             $right_answer = (array) $right_answer;
             $right_answer = implode( ', ', $right_answer );
 
-        }elseif( 'gap-fill' == $type ) {
+        } elseif( 'gap-fill' == $type ) {
 
             $right_answer_array = explode( '||', $right_answer );
             if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
@@ -1089,7 +1094,7 @@ 
 
             $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
 
-        }else{
+        } else{
 
             // for non auto gradable question types no answer should be returned.
             $right_answer = '';

Indentation +567 added lines, -567 removed lines

@@ -20,7 +20,7 @@ 
 	 * @since  1.0.0
 	 */
 	public function __construct () {
-        $this->token = 'question';
+		$this->token = 'question';
 		$this->question_types = $this->question_types();
 		$this->meta_fields = array( 'question_right_answer', 'question_wrong_answers' );
 		if ( is_admin() ) {
@@ -117,7 +117,7 @@ 
 
 			if( isset( $post->ID ) ) {
 
-                $question_type = Sensei()->question->get_question_type( $post->ID );
+				$question_type = Sensei()->question->get_question_type( $post->ID );
 
 				if( $question_type ) {
 					$type = $this->question_types[ $question_type ];
@@ -237,15 +237,15 @@ 
 	public function save_question( $post_id = 0 ) {
 
 		if( ! isset( $_POST['post_type']
-            ) || 'question' != $_POST['post_type'] ) {
-            return;
-        }
+			) || 'question' != $_POST['post_type'] ) {
+			return;
+		}
 
 
 
-        //setup the data for saving
+		//setup the data for saving
 		$data = $_POST ;
-        $data['quiz_id'] = 0;
+		$data['quiz_id'] = 0;
 		$data['question_id'] = $post_id;
 
 		if ( ! wp_is_post_revision( $post_id ) ){
@@ -339,34 +339,34 @@ 
 		return $request;
 	}
 
-    /**
-     * Get the type of question by id
-     *
-     * This function uses the post terms to determine which question type
-     * the passed question id belongs to.
-     *
-     * @since 1.7.4
-     *
-     * @param int $question_id
-     *
-     * @return string $question_type | bool
-     */
-    public function get_question_type( $question_id ){
-
-        if( empty( $question_id ) || ! intval( $question_id ) > 0
-            || 'question' != get_post_type( $question_id )   ){
-            return false;
-        }
-
-        $question_type = 'multiple-choice';
-        $question_types = wp_get_post_terms( $question_id, 'question-type' );
-        foreach( $question_types as $type ) {
-            $question_type = $type->slug;
-        }
-
-        return $question_type;
-
-    }// end get_question_type
+	/**
+	 * Get the type of question by id
+	 *
+	 * This function uses the post terms to determine which question type
+	 * the passed question id belongs to.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @param int $question_id
+	 *
+	 * @return string $question_type | bool
+	 */
+	public function get_question_type( $question_id ){
+
+		if( empty( $question_id ) || ! intval( $question_id ) > 0
+			|| 'question' != get_post_type( $question_id )   ){
+			return false;
+		}
+
+		$question_type = 'multiple-choice';
+		$question_types = wp_get_post_terms( $question_id, 'question-type' );
+		foreach( $question_types as $type ) {
+			$question_type = $type->slug;
+		}
+
+		return $question_type;
+
+	}// end get_question_type
 
 	/**
 	 * Given a question ID, return the grade that can be achieved.
@@ -398,317 +398,317 @@ 
 	} // end get_question_grade
 
 
-    /**
-     * This function simply loads the question type template
-     *
-     * @since 1.9.0
-     * @param $question_type
-     */
-    public static function load_question_template( $question_type ){
-
-        Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
-    }
-
-    /**
-     * Echo the sensei question title.
-     *
-     * @uses WooThemes_Sensei_Question::get_the_question_title
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function the_question_title( $question_id ){
-
-        echo self::get_the_question_title( $question_id );
-
-    }// end the_question_title
-
-    /**
-     * Generate the question title with it's grade.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_title( $question_id ){
-
-        /**
-         * Filter the sensei question title
-         *
-         * @since 1.3.0
-         * @param $question_title
-         */
-        $title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
-
-        /**
-         * hook document in class-woothemes-sensei-message.php the_title()
-         */
-        $title = apply_filters( 'sensei_single_title', $title, 'question');
-
-        $title_html  = '<span class="question question-title">';
-        $title_html .= $title;
-        $title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
-        $title_html .='</span>';
-
-        return $title_html;
-    }
-
-    /**
-     * Tech the question description
-     *
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_description( $question_id ){
-
-        $question = get_post( $question_id );
-
-        /**
-         * Already documented within WordPress Core
-         */
-        return apply_filters( 'the_content', $question->post_content );
-
-    }
-
-    /**
-     * Output the question description
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function the_question_description( $question_id  ){
-
-        echo self::get_the_question_description( $question_id );
-
-    }
-
-    /**
-     * Get the questions media markup
-     *
-     * @since 1.9.0
-     * @param $question_id
-     * @return string
-     */
-    public static function get_the_question_media( $question_id ){
-
-        $question_media = get_post_meta( $question_id, '_question_media', true );
-        $question_media_link = '';
-        if( 0 < intval( $question_media ) ) {
-            $mimetype = get_post_mime_type( $question_media );
-            if( $mimetype ) {
-                $mimetype_array = explode( '/', $mimetype);
-                if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
-                    $question_media_type = $mimetype_array[0];
-                    $question_media_url = wp_get_attachment_url( $question_media );
-                    $attachment = get_post( $question_media );
-                    $question_media_title = $attachment->post_title;
-                    $question_media_description = $attachment->post_content;
-                    switch( $question_media_type ) {
-                        case 'image':
-                            $image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
-                            $attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
-                            break;
-
-                        case 'audio':
-                            $question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
-                            break;
-
-                        case 'video':
-                            $question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
-                            break;
-
-                        default:
-                            $question_media_filename = basename( $question_media_url );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
-                            break;
-                    }
-                }
-            }
-        }
-
-        $output = '';
-        if( $question_media_link ) {
-
-                $output .= '<div class="question_media_display">';
-                $output .=      $question_media_link;
-                $output .= '<dl>';
-
-                if( $question_media_title ) {
-
-                   $output .= '<dt>'. $question_media_title. '</dt>';
-
-                 }
-
-                if( $question_media_description ) {
-
-                    $output .= '<dd>' . $question_media_description . '</dd>';
-
-                }
-
-                $output .= '</dl>';
-                $output .= '</div>';
+	/**
+	 * This function simply loads the question type template
+	 *
+	 * @since 1.9.0
+	 * @param $question_type
+	 */
+	public static function load_question_template( $question_type ){
+
+		Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
+	}
+
+	/**
+	 * Echo the sensei question title.
+	 *
+	 * @uses WooThemes_Sensei_Question::get_the_question_title
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function the_question_title( $question_id ){
+
+		echo self::get_the_question_title( $question_id );
+
+	}// end the_question_title
+
+	/**
+	 * Generate the question title with it's grade.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_title( $question_id ){
+
+		/**
+		 * Filter the sensei question title
+		 *
+		 * @since 1.3.0
+		 * @param $question_title
+		 */
+		$title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
+
+		/**
+		 * hook document in class-woothemes-sensei-message.php the_title()
+		 */
+		$title = apply_filters( 'sensei_single_title', $title, 'question');
+
+		$title_html  = '<span class="question question-title">';
+		$title_html .= $title;
+		$title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
+		$title_html .='</span>';
+
+		return $title_html;
+	}
+
+	/**
+	 * Tech the question description
+	 *
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_description( $question_id ){
+
+		$question = get_post( $question_id );
+
+		/**
+		 * Already documented within WordPress Core
+		 */
+		return apply_filters( 'the_content', $question->post_content );
+
+	}
+
+	/**
+	 * Output the question description
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function the_question_description( $question_id  ){
+
+		echo self::get_the_question_description( $question_id );
+
+	}
+
+	/**
+	 * Get the questions media markup
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 * @return string
+	 */
+	public static function get_the_question_media( $question_id ){
+
+		$question_media = get_post_meta( $question_id, '_question_media', true );
+		$question_media_link = '';
+		if( 0 < intval( $question_media ) ) {
+			$mimetype = get_post_mime_type( $question_media );
+			if( $mimetype ) {
+				$mimetype_array = explode( '/', $mimetype);
+				if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
+					$question_media_type = $mimetype_array[0];
+					$question_media_url = wp_get_attachment_url( $question_media );
+					$attachment = get_post( $question_media );
+					$question_media_title = $attachment->post_title;
+					$question_media_description = $attachment->post_content;
+					switch( $question_media_type ) {
+						case 'image':
+							$image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
+							$attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
+							$question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
+							break;
+
+						case 'audio':
+							$question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
+							break;
+
+						case 'video':
+							$question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
+							break;
+
+						default:
+							$question_media_filename = basename( $question_media_url );
+							$question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
+							break;
+					}
+				}
+			}
+		}
+
+		$output = '';
+		if( $question_media_link ) {
 
+				$output .= '<div class="question_media_display">';
+				$output .=      $question_media_link;
+				$output .= '<dl>';
 
-         }
-
-        return $output;
-
-    } // end get_the_question_media
-
+				if( $question_media_title ) {
 
-    /**
-     * Output the question media
-     *
-     * @since 1.9.0
-     * @param string $question_id
-     */
-    public static function the_question_media( $question_id ){
+				   $output .= '<dt>'. $question_media_title. '</dt>';
 
-        echo self::get_the_question_media( $question_id );
+				 }
 
-    }
+				if( $question_media_description ) {
 
-    /**
-     * Output a special field for the question needed for question submission.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_id
-     */
-    public static function the_question_hidden_fields( $question_id ){
-        ?>
+					$output .= '<dd>' . $question_media_description . '</dd>';
+
+				}
+
+				$output .= '</dl>';
+				$output .= '</div>';
+
+
+		 }
+
+		return $output;
+
+	} // end get_the_question_media
+
+
+	/**
+	 * Output the question media
+	 *
+	 * @since 1.9.0
+	 * @param string $question_id
+	 */
+	public static function the_question_media( $question_id ){
+
+		echo self::get_the_question_media( $question_id );
+
+	}
+
+	/**
+	 * Output a special field for the question needed for question submission.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_id
+	 */
+	public static function the_question_hidden_fields( $question_id ){
+		?>
 
             <input type="hidden" name="question_id_<?php $question_id;?>" value="<?php $question_id;?>" />
             <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e( $question_id ); ?>" />
 
         <?php
-    }
+	}
 
-    /**
-     * This function can only be run withing the single quiz question loop
-     *
-     * @since 1.9.0
-     * @param $question_id
-     */
-    public static function answer_feedback_notes( $question_id ){
+	/**
+	 * This function can only be run withing the single quiz question loop
+	 *
+	 * @since 1.9.0
+	 * @param $question_id
+	 */
+	public static function answer_feedback_notes( $question_id ){
 
-        //IDS
-        $quiz_id = get_the_ID();
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+		//IDS
+		$quiz_id = get_the_ID();
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
 
-        // Data to check before showing feedback
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $not_empty_user_quiz_grade = !empty( $user_quiz_grade );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+		// Data to check before showing feedback
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
+		$user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$not_empty_user_quiz_grade = !empty( $user_quiz_grade );
+		$reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
+		$lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
+		$quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
 
-        if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
-            ||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
-            || ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
+		if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
+			||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
+			|| ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
 
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
+			$answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
 
-            if( $answer_notes ) { ?>
+			if( $answer_notes ) { ?>
 
                 <div class="sensei-message info info-special answer-feedback">
 
                     <?php
 
-                        /**
-                         * Filter the answer feedback
-                         * Since 1.9.0
-                         *
-                         * @param string $answer_notes
-                         * @param string $question_id
-                         * @param string $lesson_id
-                         */
-                        echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
+						/**
+						 * Filter the answer feedback
+						 * Since 1.9.0
+						 *
+						 * @param string $answer_notes
+						 * @param string $question_id
+						 * @param string $lesson_id
+						 */
+						echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
 
-                    ?>
+					?>
 
                 </div>
 
             <?php }
 
-        }// end if we can show answer feedback
+		}// end if we can show answer feedback
 
-    }// end answer_feedback_notes
+	}// end answer_feedback_notes
 
-    /**
-     * This function has to be run inside the quiz question loop on the single quiz page.
-     *
-     *
-     * @since 1.9.0
-     * @param string $question_id
-     */
-    public static function the_answer_result_indication( $question_id ){
+	/**
+	 * This function has to be run inside the quiz question loop on the single quiz page.
+	 *
+	 *
+	 * @since 1.9.0
+	 * @param string $question_id
+	 */
+	public static function the_answer_result_indication( $question_id ){
 
-        global $post,  $current_user, $sensei_question_loop;
+		global $post,  $current_user, $sensei_question_loop;
 
-        // Post Data
-        $quiz_id = $sensei_question_loop['quiz_id'];
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $question_item = $sensei_question_loop['current_question'];
+		// Post Data
+		$quiz_id = $sensei_question_loop['quiz_id'];
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+		$question_item = $sensei_question_loop['current_question'];
 
-        // Setup variable needed to determine if the message should show and what it should show
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		// Setup variable needed to determine if the message should show and what it should show
+		$user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
+		$quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-        // retrieve the question total grade
-        $question_grade = Sensei()->question->get_question_grade( $question_id );
+		// retrieve the question total grade
+		$question_grade = Sensei()->question->get_question_grade( $question_id );
 
-        // retrieve grade the user achieved
-        $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
+		// retrieve grade the user achieved
+		$user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
 
-        // Question ID
-        $question_id = $question_item->ID;
+		// Question ID
+		$question_id = $question_item->ID;
 
-        // conditions to check
-        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
-        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
-        $grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
+		// conditions to check
+		$completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
+		$completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
+		$grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
 
-        if (  $completed_with_valid_grade
-            || $completed_with_valid_grade_and_reset_not_allowed
-            || $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
+		if (  $completed_with_valid_grade
+			|| $completed_with_valid_grade_and_reset_not_allowed
+			|| $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
 
-            $user_correct = false;
-            $answer_message = __( 'Incorrect', 'woothemes-sensei' );
-            $answer_message_class = 'user_wrong';
-            // For zero grade mark as 'correct' but add no classes
-            if ( 0 == $question_grade ) {
+			$user_correct = false;
+			$answer_message = __( 'Incorrect', 'woothemes-sensei' );
+			$answer_message_class = 'user_wrong';
+			// For zero grade mark as 'correct' but add no classes
+			if ( 0 == $question_grade ) {
 
-                $user_correct = true;
-                $answer_message = '';
-                $answer_message_class = '';
+				$user_correct = true;
+				$answer_message = '';
+				$answer_message_class = '';
 
-            } else if( $user_question_grade > 0 ) {
+			} else if( $user_question_grade > 0 ) {
 
-                $user_correct = true;
-                $answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
-                $answer_message_class = 'user_right';
+				$user_correct = true;
+				$answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
+				$answer_message_class = 'user_right';
 
-            }
+			}
 
-            // attach the correct answer if the question is auto gradable and user got it wrong
-            if( !$reset_quiz_allowed && !$user_correct ){
+			// attach the correct answer if the question is auto gradable and user got it wrong
+			if( !$reset_quiz_allowed && !$user_correct ){
 
-                $answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
+				$answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
 
-            }
+			}
 
-            // answer feedback
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
-            if( $answer_notes ) {
-                $answer_message_class .= ' has_notes';
-            }
-            ?>
+			// answer feedback
+			$answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
+			if( $answer_notes ) {
+				$answer_message_class .= ' has_notes';
+			}
+			?>
 
             <div class="answer_message <?php esc_attr_e( $answer_message_class ); ?>">
 
@@ -718,387 +718,387 @@ 
 
             <?php
 
-        } // end if user can see all the goodies
-
-    }// end the_answer_result_indication
-
-    /**
-     * Generate the question template data and return it as an array.
-     *
-     * @since 1.9.0
-     *
-     * @param string $question_id
-     * @param $quiz_id
-     * @return array $question_data
-     */
-    public static function get_template_data( $question_id, $quiz_id ){
-
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
-
-        $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
-
-        // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
-        $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        }
-
-        //setup the question data
-        $data[ 'ID' ]                     = $question_id;
-        $data[ 'title' ]                  = get_the_title( $question_id );
-        $data[ 'content' ]                = get_post( $question_id )->post_content;
-        $data[ 'quiz_id' ]                = $quiz_id;
-        $data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
-        $data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
-        $data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
-        $data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
-        $data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
-        $data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
-        $data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
-        $data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
-        $data[ 'reset_quiz_allowed' ]     = $reset_allowed;
-        $data[ 'lesson_complete' ]        = $user_lesson_complete;
-
-        /**
-         * Filter the question template data. This filter fires  in
-         * the get_template_data function
-         *
-         * @hooked self::boolean_load_question_data
-         *
-         * @since 1.9.0
-         *
-         * @param array $data
-         * @param string $question_id
-         * @param string $quiz_id
-         */
-        return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
+		} // end if user can see all the goodies
 
-    }
+	}// end the_answer_result_indication
 
-    /**
-     * Load multiple choice question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
+	/**
+	 * Generate the question template data and return it as an array.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param string $question_id
+	 * @param $quiz_id
+	 * @return array $question_data
+	 */
+	public static function get_template_data( $question_id, $quiz_id ){
 
+		$lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
 
-        if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
+		$reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		//backwards compatibility
+		if( 'on' == $reset_allowed ) {
+			$reset_allowed = 1;
+		}
 
-            // Get uploaded file
-            $attachment_id = $question_data[ 'user_answer_entry' ];
-            $answer_media_url = $answer_media_filename = '';
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		}
 
+		//setup the question data
+		$data[ 'ID' ]                     = $question_id;
+		$data[ 'title' ]                  = get_the_title( $question_id );
+		$data[ 'content' ]                = get_post( $question_id )->post_content;
+		$data[ 'quiz_id' ]                = $quiz_id;
+		$data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
+		$data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
+		$data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
+		$data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
+		$data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
+		$data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
+		$data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
+		$data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
+		$data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+		$data[ 'reset_quiz_allowed' ]     = $reset_allowed;
+		$data[ 'lesson_complete' ]        = $user_lesson_complete;
+
+		/**
+		 * Filter the question template data. This filter fires  in
+		 * the get_template_data function
+		 *
+		 * @hooked self::boolean_load_question_data
+		 *
+		 * @since 1.9.0
+		 *
+		 * @param array $data
+		 * @param string $question_id
+		 * @param string $quiz_id
+		 */
+		return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
 
-            $question_helptext = '';
-            if( isset( $question_data['question_wrong_answers'][0] ) ) {
+	}
 
-                $question_helptext =  $question_data['question_wrong_answers'][0];
+	/**
+	 * Load multiple choice question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
 
-            }
 
+		if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            if( 0 < intval( $attachment_id ) ) {
+			// Get uploaded file
+			$attachment_id = $question_data[ 'user_answer_entry' ];
+			$answer_media_url = $answer_media_filename = '';
 
-                $answer_media_url = wp_get_attachment_url( $attachment_id );
-                $answer_media_filename = basename( $answer_media_url );
 
-            }
+			$question_helptext = '';
+			if( isset( $question_data['question_wrong_answers'][0] ) ) {
 
+				$question_helptext =  $question_data['question_wrong_answers'][0];
 
-            // Get max upload file size, formatted for display
-            // Code copied from wp-admin/includes/media.php:1515
-            $upload_size_unit = $max_upload_size = wp_max_upload_size();
-            $sizes = array( 'KB', 'MB', 'GB' );
-            for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
-                $upload_size_unit /= 1024;
-            }
-            if ( $u < 0 ) {
+			}
 
-                $upload_size_unit = 0;
-                $u = 0;
 
-            } else {
+			if( 0 < intval( $attachment_id ) ) {
 
-                $upload_size_unit = (int) $upload_size_unit;
+				$answer_media_url = wp_get_attachment_url( $attachment_id );
+				$answer_media_filename = basename( $answer_media_url );
 
-            }
-            $max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
+			}
 
-            // Assemble all the data needed by the file upload template
-            $question_data[ 'answer_media_url' ]      = $answer_media_url;
-            $question_data[ 'answer_media_filename' ] = $answer_media_filename;
-            $question_data[ 'max_upload_size' ]       = $max_upload_size;
 
-            $question_data[ 'question_helptext' ]     = $question_helptext;
+			// Get max upload file size, formatted for display
+			// Code copied from wp-admin/includes/media.php:1515
+			$upload_size_unit = $max_upload_size = wp_max_upload_size();
+			$sizes = array( 'KB', 'MB', 'GB' );
+			for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+				$upload_size_unit /= 1024;
+			}
+			if ( $u < 0 ) {
 
-        }// end if is file upload type
+				$upload_size_unit = 0;
+				$u = 0;
 
-        return $question_data;
+			} else {
 
-    }// end file_upload_load_question_data
+				$upload_size_unit = (int) $upload_size_unit;
 
-    /**
-     * Load multiple choice question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
+			}
+			$max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
 
-        if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
+			// Assemble all the data needed by the file upload template
+			$question_data[ 'answer_media_url' ]      = $answer_media_url;
+			$question_data[ 'answer_media_filename' ] = $answer_media_filename;
+			$question_data[ 'max_upload_size' ]       = $max_upload_size;
 
+			$question_data[ 'question_helptext' ]     = $question_helptext;
 
-            $answer_type = 'radio';
-            if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
+		}// end if is file upload type
 
-                $answer_type = 'checkbox';
+		return $question_data;
 
-            }
+	}// end file_upload_load_question_data
 
-            // Merge right and wrong answers
-            if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
+	/**
+	 * Load multiple choice question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
 
-                $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+		if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            }  else {
 
-                array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
-                $merged_options = $question_data[ 'question_wrong_answers' ];
+			$answer_type = 'radio';
+			if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
 
-            }
+				$answer_type = 'checkbox';
 
-            // Setup answer options array.
-            $question_answers_options = array();
-            $count = 0;
+			}
 
-            foreach( $merged_options as $answer ) {
+			// Merge right and wrong answers
+			if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
 
-                $count++;
-                $question_option = array();
+				$merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
 
-                if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
+			}  else {
 
-                    $user_correct = false;
+				array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+				$merged_options = $question_data[ 'question_wrong_answers' ];
 
+			}
 
-                    // For zero grade mark as 'correct' but add no classes
-                    if ( 0 == $question_data[ 'question_grade' ] ) {
+			// Setup answer options array.
+			$question_answers_options = array();
+			$count = 0;
 
-                        $user_correct = true;
+			foreach( $merged_options as $answer ) {
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+				$count++;
+				$question_option = array();
 
-                        $user_correct = true;
+				if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
+					|| ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
+					|| ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
 
-                    }
+					$user_correct = false;
 
-                }
 
-                // setup the option specific classes
-                $answer_class = '';
-                if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
-                    if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
+					// For zero grade mark as 'correct' but add no classes
+					if ( 0 == $question_data[ 'question_grade' ] ) {
 
-                        $answer_class .= ' right_answer';
+						$user_correct = true;
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+					}  else if( $question_data[ 'user_question_grade' ] > 0 ) {
 
-                        $answer_class .= ' right_answer';
+						$user_correct = true;
 
-                    } elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
-                        ||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
+					}
 
-                        $answer_class = 'user_wrong';
-                        if( $user_correct ) {
+				}
 
-                            $answer_class = 'user_right';
+				// setup the option specific classes
+				$answer_class = '';
+				if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
+					if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
 
-                        }
+						$answer_class .= ' right_answer';
 
-                    }
+					}  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
 
-                }
+						$answer_class .= ' right_answer';
 
-                // determine if the current option must be checked
-                $checked = '';
-                if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
-                    if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
+					} elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
+						||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
 
-                        $checked = 'checked="checked"';
+						$answer_class = 'user_wrong';
+						if( $user_correct ) {
 
-                    } elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
+							$answer_class = 'user_right';
 
-                        $checked = checked( $answer, $question_data['user_answer_entry'] , false );
+						}
 
-                    }
+					}
 
-                } // End If Statement
+				}
 
-                //Load the answer option data
-                $question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
-                $question_option[ 'answer' ]      = $answer;
-                $question_option[ 'option_class'] = $answer_class;
-                $question_option[ 'checked']      = $checked;
-                $question_option[ 'count' ]       = $count;
-                $question_option[ 'type' ] = $answer_type;
+				// determine if the current option must be checked
+				$checked = '';
+				if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
+					if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
 
-                // add the speci  fic option to the list of options for this question
-                $question_answers_options[$question_option[ 'ID' ]] = $question_option;
+						$checked = 'checked="checked"';
 
-            } // end for each option
+					} elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
 
+						$checked = checked( $answer, $question_data['user_answer_entry'] , false );
 
-            // Shuffle the array depending on the settings
-            $answer_options_sorted = array();
-            $random_order = get_post_meta( $question_data['ID'], '_random_order', true );
-            if(  $random_order && $random_order == 'yes' ) {
+					}
 
-                $answer_options_sorted = $question_answers_options;
-                shuffle( $answer_options_sorted );
+				} // End If Statement
 
-            } else {
+				//Load the answer option data
+				$question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
+				$question_option[ 'answer' ]      = $answer;
+				$question_option[ 'option_class'] = $answer_class;
+				$question_option[ 'checked']      = $checked;
+				$question_option[ 'count' ]       = $count;
+				$question_option[ 'type' ] = $answer_type;
 
-                $answer_order = array();
-                $answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
-                if( $answer_order_string ) {
+				// add the speci  fic option to the list of options for this question
+				$question_answers_options[$question_option[ 'ID' ]] = $question_option;
 
-                    $answer_order = array_filter( explode( ',', $answer_order_string ) );
-                    if( count( $answer_order ) > 0 ) {
+			} // end for each option
 
-                        foreach( $answer_order as $answer_id ) {
 
-                            if( isset( $question_answers_options[ $answer_id ] ) ) {
+			// Shuffle the array depending on the settings
+			$answer_options_sorted = array();
+			$random_order = get_post_meta( $question_data['ID'], '_random_order', true );
+			if(  $random_order && $random_order == 'yes' ) {
 
-                                $answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
-                                unset( $question_answers_options[ $answer_id ] );
+				$answer_options_sorted = $question_answers_options;
+				shuffle( $answer_options_sorted );
 
-                            }
+			} else {
 
-                        }
+				$answer_order = array();
+				$answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
+				if( $answer_order_string ) {
 
-                        if( count( $question_answers_options ) > 0 ) {
-                            foreach( $question_answers_options as $id => $answer ) {
+					$answer_order = array_filter( explode( ',', $answer_order_string ) );
+					if( count( $answer_order ) > 0 ) {
 
-                                $answer_options_sorted[ $id ] = $answer;
+						foreach( $answer_order as $answer_id ) {
 
-                            }
-                        }
+							if( isset( $question_answers_options[ $answer_id ] ) ) {
 
-                    }else{
+								$answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
+								unset( $question_answers_options[ $answer_id ] );
 
-                        $answer_options_sorted = $question_answers_options;
+							}
 
-                    }
+						}
 
-                }else{
+						if( count( $question_answers_options ) > 0 ) {
+							foreach( $question_answers_options as $id => $answer ) {
 
-                    $answer_options_sorted = $question_answers_options;
+								$answer_options_sorted[ $id ] = $answer;
 
-                } // end if $answer_order_string
+							}
+						}
 
-            } // end if random order
+					}else{
 
+						$answer_options_sorted = $question_answers_options;
 
-            // assemble and setup the data for the templates data array
-            $question_data[ 'answer_options' ]    =  $answer_options_sorted;
+					}
 
-        }
+				}else{
 
-        return $question_data;
+					$answer_options_sorted = $question_answers_options;
 
-    }//  end multiple_choice_load_question_data
+				} // end if $answer_order_string
 
-    /**
-     * Load the gap fill question data on the sensei_get_question_template_data
-     * filter.
-     *
-     * @since 1.9.0
-     *
-     * @param $question_data
-     * @param $question_id
-     * @param $quiz_id
-     *
-     * @return array()
-     */
-    public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+			} // end if random order
 
-        if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
 
-            $gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
-            $question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
-            $question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
-            $question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+			// assemble and setup the data for the templates data array
+			$question_data[ 'answer_options' ]    =  $answer_options_sorted;
 
-        }
+		}
 
-        return $question_data;
+		return $question_data;
 
-    }//  end gap_fill_load_question_data
+	}//  end multiple_choice_load_question_data
+
+	/**
+	 * Load the gap fill question data on the sensei_get_question_template_data
+	 * filter.
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param $question_data
+	 * @param $question_id
+	 * @param $quiz_id
+	 *
+	 * @return array()
+	 */
+	public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+
+		if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
+
+			$gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
+			$question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
+			$question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
+			$question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+
+		}
+
+		return $question_data;
+
+	}//  end gap_fill_load_question_data
 
 
-    /**
-     * Get the correct answer for a question
-     *
-     * @param $question_id
-     * @return string $correct_answer or empty
-     */
-    public static function get_correct_answer( $question_id ){
+	/**
+	 * Get the correct answer for a question
+	 *
+	 * @param $question_id
+	 * @return string $correct_answer or empty
+	 */
+	public static function get_correct_answer( $question_id ){
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $type = Sensei()->question->get_question_type( $question_id );
-        $type_name = __( 'Multiple Choice', 'woothemes-sensei' );
-        $grade_type = 'manual-grade';
+		$right_answer = get_post_meta( $question_id, '_question_right_answer', true );
+		$type = Sensei()->question->get_question_type( $question_id );
+		$type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+		$grade_type = 'manual-grade';
 
-        if ('boolean'== $type ) {
+		if ('boolean'== $type ) {
 
-            $right_answer = ucfirst($right_answer);
+			$right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+		}elseif( 'multiple-choice' == $type ) {
 
-            $right_answer = (array) $right_answer;
-            $right_answer = implode( ', ', $right_answer );
+			$right_answer = (array) $right_answer;
+			$right_answer = implode( ', ', $right_answer );
 
-        }elseif( 'gap-fill' == $type ) {
+		}elseif( 'gap-fill' == $type ) {
 
-            $right_answer_array = explode( '||', $right_answer );
-            if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-            if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-            if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+			$right_answer_array = explode( '||', $right_answer );
+			if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+			if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+			if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-            $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
+			$right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
 
-        }else{
+		}else{
 
-            // for non auto gradable question types no answer should be returned.
-            $right_answer = '';
+			// for non auto gradable question types no answer should be returned.
+			$right_answer = '';
 
-        }
+		}
 
-        return $right_answer;
+		return $right_answer;
 
-    } // get_correct_answer
+	} // get_correct_answer
 
 } // End Class
 

Spacing +287 added lines, -287 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Sensei Question Class
@@ -19,35 +19,35 @@ 
 	 * Constructor.
 	 * @since  1.0.0
 	 */
-	public function __construct () {
+	public function __construct() {
         $this->token = 'question';
 		$this->question_types = $this->question_types();
-		$this->meta_fields = array( 'question_right_answer', 'question_wrong_answers' );
-		if ( is_admin() ) {
+		$this->meta_fields = array('question_right_answer', 'question_wrong_answers');
+		if (is_admin()) {
 			// Custom Write Panel Columns
-			add_filter( 'manage_edit-question_columns', array( $this, 'add_column_headings' ), 10, 1 );
-			add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 );
-			add_action( 'add_meta_boxes', array( $this, 'question_edit_panel_metabox' ), 10, 2 );
+			add_filter('manage_edit-question_columns', array($this, 'add_column_headings'), 10, 1);
+			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2);
+			add_action('add_meta_boxes', array($this, 'question_edit_panel_metabox'), 10, 2);
 
 			// Quesitno list table filters
-			add_action( 'restrict_manage_posts', array( $this, 'filter_options' ) );
-			add_filter( 'request', array( $this, 'filter_actions' ) );
+			add_action('restrict_manage_posts', array($this, 'filter_options'));
+			add_filter('request', array($this, 'filter_actions'));
 
-			add_action( 'save_post', array( $this, 'save_question' ), 10, 1 );
+			add_action('save_post', array($this, 'save_question'), 10, 1);
 		} // End If Statement
 	} // End __construct()
 
 	public function question_types() {
 		$types = array(
-			'multiple-choice' => __( 'Multiple Choice', 'woothemes-sensei' ),
-			'boolean' => __( 'True/False', 'woothemes-sensei' ),
-			'gap-fill' => __( 'Gap Fill', 'woothemes-sensei' ),
-			'single-line' => __( 'Single Line', 'woothemes-sensei' ),
-			'multi-line' => __( 'Multi Line', 'woothemes-sensei' ),
-			'file-upload' => __( 'File Upload', 'woothemes-sensei' ),
+			'multiple-choice' => __('Multiple Choice', 'woothemes-sensei'),
+			'boolean' => __('True/False', 'woothemes-sensei'),
+			'gap-fill' => __('Gap Fill', 'woothemes-sensei'),
+			'single-line' => __('Single Line', 'woothemes-sensei'),
+			'multi-line' => __('Multi Line', 'woothemes-sensei'),
+			'file-upload' => __('File Upload', 'woothemes-sensei'),
 		);
 
-		return apply_filters( 'sensei_question_types', $types );
+		return apply_filters('sensei_question_types', $types);
 	}
 
 	/**
@@ -57,12 +57,12 @@ 
 	 * @param  array $defaults
 	 * @return array $new_columns
 	 */
-	public function add_column_headings ( $defaults ) {
+	public function add_column_headings($defaults) {
 		$new_columns['cb'] = '<input type="checkbox" />';
-		$new_columns['title'] = _x( 'Question', 'column name', 'woothemes-sensei' );
-		$new_columns['question-type'] = _x( 'Type', 'column name', 'woothemes-sensei' );
-		$new_columns['question-category'] = _x( 'Categories', 'column name', 'woothemes-sensei' );
-		if ( isset( $defaults['date'] ) ) {
+		$new_columns['title'] = _x('Question', 'column name', 'woothemes-sensei');
+		$new_columns['question-type'] = _x('Type', 'column name', 'woothemes-sensei');
+		$new_columns['question-category'] = _x('Categories', 'column name', 'woothemes-sensei');
+		if (isset($defaults['date'])) {
 			$new_columns['date'] = $defaults['date'];
 		}
 
@@ -77,27 +77,27 @@ 
 	 * @param  int $id
 	 * @return void
 	 */
-	public function add_column_data ( $column_name, $id ) {
+	public function add_column_data($column_name, $id) {
 		global $wpdb, $post;
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'id':
 				echo $id;
 			break;
 
 			case 'question-type':
-				$question_type = strip_tags( get_the_term_list( $id, 'question-type', '', ', ', '' ) );
+				$question_type = strip_tags(get_the_term_list($id, 'question-type', '', ', ', ''));
 				$output = '&mdash;';
-				if( isset( $this->question_types[ $question_type ] ) ) {
-					$output = $this->question_types[ $question_type ];
+				if (isset($this->question_types[$question_type])) {
+					$output = $this->question_types[$question_type];
 				}
 				echo $output;
 			break;
 
 			case 'question-category':
-				$output = strip_tags( get_the_term_list( $id, 'question-category', '', ', ', '' ) );
-				if( ! $output ) {
+				$output = strip_tags(get_the_term_list($id, 'question-category', '', ', ', ''));
+				if ( ! $output) {
 					$output = '&mdash;';
 				}
 				echo $output;
@@ -110,49 +110,49 @@ 
 
 	} // End add_column_data()
 
-	public function question_edit_panel_metabox( $post_type, $post ) {
-		if( in_array( $post_type, array( 'question', 'multiple_question' ) ) ) {
+	public function question_edit_panel_metabox($post_type, $post) {
+		if (in_array($post_type, array('question', 'multiple_question'))) {
 
-			$metabox_title = __( 'Question', 'woothemes-sensei' );
+			$metabox_title = __('Question', 'woothemes-sensei');
 
-			if( isset( $post->ID ) ) {
+			if (isset($post->ID)) {
 
-                $question_type = Sensei()->question->get_question_type( $post->ID );
+                $question_type = Sensei()->question->get_question_type($post->ID);
 
-				if( $question_type ) {
-					$type = $this->question_types[ $question_type ];
-					if( $type ) {
+				if ($question_type) {
+					$type = $this->question_types[$question_type];
+					if ($type) {
 						$metabox_title = $type;
 					}
 				}
 			}
-			add_meta_box( 'question-edit-panel', $metabox_title, array( $this, 'question_edit_panel' ), 'question', 'normal', 'high' );
-			add_meta_box( 'question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'question', 'side', 'default' );
-			add_meta_box( 'multiple-question-lessons-panel', __( 'Quizzes', 'woothemes-sensei' ), array( $this, 'question_lessons_panel' ), 'multiple_question', 'side', 'default' );
+			add_meta_box('question-edit-panel', $metabox_title, array($this, 'question_edit_panel'), 'question', 'normal', 'high');
+			add_meta_box('question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'question', 'side', 'default');
+			add_meta_box('multiple-question-lessons-panel', __('Quizzes', 'woothemes-sensei'), array($this, 'question_lessons_panel'), 'multiple_question', 'side', 'default');
 		}
 	}
 
 	public function question_edit_panel() {
 		global  $post, $pagenow;
 
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( Sensei()->lesson, 'enqueue_styles' ) );
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_scripts'));
+		add_action('admin_enqueue_scripts', array(Sensei()->lesson, 'enqueue_styles'));
 
 		$html = '<div id="lesson-quiz" class="single-question"><div id="add-question-main">';
 
-		if( 'post-new.php' == $pagenow ) {
+		if ('post-new.php' == $pagenow) {
 
 			$html .= '<div id="add-question-actions">';
-				$html .= Sensei()->lesson->quiz_panel_add( 'question' );
+				$html .= Sensei()->lesson->quiz_panel_add('question');
 			$html .= '</div>';
 
 		} else {
 			$question_id = $post->ID;
 
-			$question_type =  Sensei()->question->get_question_type( $post->ID );
+			$question_type = Sensei()->question->get_question_type($post->ID);
 
 			$html .= '<div id="add-question-metadata"><table class="widefat">';
-				$html .= Sensei()->lesson->quiz_panel_question( $question_type, 0, $question_id, 'question' );
+				$html .= Sensei()->lesson->quiz_panel_question($question_type, 0, $question_id, 'question');
 			$html .= '</table></div>';
 		}
 
@@ -164,20 +164,20 @@ 
 	public function question_lessons_panel() {
 		global $post;
 
-		$no_lessons = sprintf( __( '%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei' ), '<em>', '</em>' );
+		$no_lessons = sprintf(__('%1$sThis question does not appear in any quizzes yet.%2$s', 'woothemes-sensei'), '<em>', '</em>');
 
-		if( ! isset( $post->ID ) ) {
+		if ( ! isset($post->ID)) {
 			echo $no_lessons;
 			return;
 		}
 
 		// This retrieves those quizzes the question is directly connected to.
-		$quizzes = get_post_meta( $post->ID, '_quiz_id', false );
+		$quizzes = get_post_meta($post->ID, '_quiz_id', false);
 
 		// Collate all 'multiple_question' quizzes the question is part of.
-		$categories_of_question = wp_get_post_terms( $post->ID, 'question-category', array( 'fields' => 'ids' ) );
-		if ( ! empty( $categories_of_question ) ) {
-			foreach ( $categories_of_question as $term_id ) {
+		$categories_of_question = wp_get_post_terms($post->ID, 'question-category', array('fields' => 'ids'));
+		if ( ! empty($categories_of_question)) {
+			foreach ($categories_of_question as $term_id) {
 				$qargs = array(
 					'fields'           => 'ids',
 					'post_type'        => 'multiple_question',
@@ -191,41 +191,41 @@ 
 					'post_status'      => 'any',
 					'suppress_filters' => 0,
 				);
-				$cat_question_ids = get_posts( $qargs );
-				foreach( $cat_question_ids as $cat_question_id ) {
-					$cat_quizzes = get_post_meta( $cat_question_id, '_quiz_id', false );
-					$quizzes = array_merge( $quizzes, $cat_quizzes );
+				$cat_question_ids = get_posts($qargs);
+				foreach ($cat_question_ids as $cat_question_id) {
+					$cat_quizzes = get_post_meta($cat_question_id, '_quiz_id', false);
+					$quizzes = array_merge($quizzes, $cat_quizzes);
 				}
 			}
-			$quizzes = array_unique( array_filter( $quizzes ) );
+			$quizzes = array_unique(array_filter($quizzes));
 		}
 
-		if( 0 == count( $quizzes ) ) {
+		if (0 == count($quizzes)) {
 			echo $no_lessons;
 			return;
 		}
 
 		$lessons = false;
 
-		foreach( $quizzes as $quiz ) {
+		foreach ($quizzes as $quiz) {
 
-			$lesson_id = get_post_meta( $quiz, '_quiz_lesson', true );
+			$lesson_id = get_post_meta($quiz, '_quiz_lesson', true);
 
-			if( ! $lesson_id ) continue;
+			if ( ! $lesson_id) continue;
 
-			$lessons[ $lesson_id ]['title'] = get_the_title( $lesson_id );
-			$lessons[ $lesson_id ]['link'] = admin_url( 'post.php?post=' . $lesson_id . '&action=edit' );
+			$lessons[$lesson_id]['title'] = get_the_title($lesson_id);
+			$lessons[$lesson_id]['link'] = admin_url('post.php?post='.$lesson_id.'&action=edit');
 		}
 
-		if( ! $lessons ) {
+		if ( ! $lessons) {
 			echo $no_lessons;
 			return;
 		}
 
 		$html = '<ul>';
 
-		foreach( $lessons as $id => $lesson ) {
-			$html .= '<li><a href="' . esc_url( $lesson['link'] ) . '">' . esc_html( $lesson['title'] ) . '</a></li>';
+		foreach ($lessons as $id => $lesson) {
+			$html .= '<li><a href="'.esc_url($lesson['link']).'">'.esc_html($lesson['title']).'</a></li>';
 		}
 
 		$html .= '</ul>';
@@ -234,30 +234,30 @@ 
 
 	}
 
-	public function save_question( $post_id = 0 ) {
+	public function save_question($post_id = 0) {
 
-		if( ! isset( $_POST['post_type']
-            ) || 'question' != $_POST['post_type'] ) {
+		if ( ! isset($_POST['post_type']
+            ) || 'question' != $_POST['post_type']) {
             return;
         }
 
 
 
         //setup the data for saving
-		$data = $_POST ;
+		$data = $_POST;
         $data['quiz_id'] = 0;
 		$data['question_id'] = $post_id;
 
-		if ( ! wp_is_post_revision( $post_id ) ){
+		if ( ! wp_is_post_revision($post_id)) {
 
 			// Unhook function to prevent infinite loops
-			remove_action( 'save_post', array( $this, 'save_question' ) );
+			remove_action('save_post', array($this, 'save_question'));
 
 			// Update question data
-			$question_id = Sensei()->lesson->lesson_save_question( $data, 'question' );
+			$question_id = Sensei()->lesson->lesson_save_question($data, 'question');
 
 			// Re-hook same function
-			add_action( 'save_post', array( $this, 'save_question' ) );
+			add_action('save_post', array($this, 'save_question'));
 		}
 
 		return;
@@ -270,15 +270,15 @@ 
 	public function filter_options() {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			$output = '';
 
 			// Question type
-			$selected = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			$type_options = '<option value="">' . __( 'All types', 'woothemes-sensei' ) . '</option>';
-			foreach( $this->question_types as $label => $type ) {
-				$type_options .= '<option value="' . esc_attr( $label ) . '" ' . selected( $selected, $label, false ) . '>' . esc_html( $type ) . '</option>';
+			$selected = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			$type_options = '<option value="">'.__('All types', 'woothemes-sensei').'</option>';
+			foreach ($this->question_types as $label => $type) {
+				$type_options .= '<option value="'.esc_attr($label).'" '.selected($selected, $label, false).'>'.esc_html($type).'</option>';
 			}
 
 			$output .= '<select name="question_type" id="dropdown_question_type">';
@@ -286,12 +286,12 @@ 
 			$output .= '</select>';
 
 			// Question category
-			$cats = get_terms( 'question-category', array( 'hide_empty' => false ) );
-			if ( ! empty( $cats ) && ! is_wp_error( $cats ) ) {
-				$selected = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-				$cat_options = '<option value="">' . __( 'All categories', 'woothemes-sensei' ) . '</option>';
-				foreach( $cats as $cat ) {
-					$cat_options .= '<option value="' . esc_attr( $cat->slug ) . '" ' . selected( $selected, $cat->slug, false ) . '>' . esc_html( $cat->name ) . '</option>';
+			$cats = get_terms('question-category', array('hide_empty' => false));
+			if ( ! empty($cats) && ! is_wp_error($cats)) {
+				$selected = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+				$cat_options = '<option value="">'.__('All categories', 'woothemes-sensei').'</option>';
+				foreach ($cats as $cat) {
+					$cat_options .= '<option value="'.esc_attr($cat->slug).'" '.selected($selected, $cat->slug, false).'>'.esc_html($cat->name).'</option>';
 				}
 
 				$output .= '<select name="question_cat" id="dropdown_question_cat">';
@@ -308,14 +308,14 @@ 
 	 * @param  array $request Current request
 	 * @return array          Modified request
 	 */
-	public function filter_actions( $request ) {
+	public function filter_actions($request) {
 		global $typenow;
 
-		if( is_admin() && 'question' == $typenow ) {
+		if (is_admin() && 'question' == $typenow) {
 
 			// Question type
-			$question_type = isset( $_GET['question_type'] ) ? $_GET['question_type'] : '';
-			if( $question_type ) {
+			$question_type = isset($_GET['question_type']) ? $_GET['question_type'] : '';
+			if ($question_type) {
 				$type_query = array(
 					'taxonomy' => 'question-type',
 					'terms' => $question_type,
@@ -325,8 +325,8 @@ 
 			}
 
 			// Question category
-			$question_cat = isset( $_GET['question_cat'] ) ? $_GET['question_cat'] : '';
-			if( $question_cat ) {
+			$question_cat = isset($_GET['question_cat']) ? $_GET['question_cat'] : '';
+			if ($question_cat) {
 				$cat_query = array(
 					'taxonomy' => 'question-category',
 					'terms' => $question_cat,
@@ -351,16 +351,16 @@ 
      *
      * @return string $question_type | bool
      */
-    public function get_question_type( $question_id ){
+    public function get_question_type($question_id) {
 
-        if( empty( $question_id ) || ! intval( $question_id ) > 0
-            || 'question' != get_post_type( $question_id )   ){
+        if (empty($question_id) || ! intval($question_id) > 0
+            || 'question' != get_post_type($question_id)) {
             return false;
         }
 
         $question_type = 'multiple-choice';
-        $question_types = wp_get_post_terms( $question_id, 'question-type' );
-        foreach( $question_types as $type ) {
+        $question_types = wp_get_post_terms($question_id, 'question-type');
+        foreach ($question_types as $type) {
             $question_type = $type->slug;
         }
 
@@ -377,21 +377,21 @@ 
 	 *
 	 * @return int $question_grade | bool
 	 */
-	public function get_question_grade( $question_id ) {
+	public function get_question_grade($question_id) {
 
-		if ( empty( $question_id ) || ! intval( $question_id ) > 0
-			|| 'question' != get_post_type( $question_id ) ) {
+		if (empty($question_id) || ! intval($question_id) > 0
+			|| 'question' != get_post_type($question_id)) {
 			return false;
 		}
 
-		$question_grade_raw = get_post_meta( $question_id, '_question_grade', true );
+		$question_grade_raw = get_post_meta($question_id, '_question_grade', true);
 		// If not set then default to 1...
-		if ( false === $question_grade_raw || $question_grade_raw == '' ) {
+		if (false === $question_grade_raw || $question_grade_raw == '') {
 			$question_grade = 1;
 		}
 		// ...but allow a grade of 0 for non-marked questions
 		else {
-			$question_grade = intval( $question_grade_raw );
+			$question_grade = intval($question_grade_raw);
 		}
 		return $question_grade;
 
@@ -404,9 +404,9 @@ 
      * @since 1.9.0
      * @param $question_type
      */
-    public static function load_question_template( $question_type ){
+    public static function load_question_template($question_type) {
 
-        Sensei_Templates::get_template  ( 'single-quiz/question_type-' . $question_type . '.php' );
+        Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php');
     }
 
     /**
@@ -417,9 +417,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_title( $question_id ){
+    public static function the_question_title($question_id) {
 
-        echo self::get_the_question_title( $question_id );
+        echo self::get_the_question_title($question_id);
 
     }// end the_question_title
 
@@ -431,7 +431,7 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_title( $question_id ){
+    public static function get_the_question_title($question_id) {
 
         /**
          * Filter the sensei question title
@@ -439,17 +439,17 @@ 
          * @since 1.3.0
          * @param $question_title
          */
-        $title = apply_filters( 'sensei_question_title', get_the_title( $question_id ) );
+        $title = apply_filters('sensei_question_title', get_the_title($question_id));
 
         /**
          * hook document in class-woothemes-sensei-message.php the_title()
          */
-        $title = apply_filters( 'sensei_single_title', $title, 'question');
+        $title = apply_filters('sensei_single_title', $title, 'question');
 
         $title_html  = '<span class="question question-title">';
         $title_html .= $title;
         $title_html .= '<span class="grade"><?php sensi_the_question_grade()?></span>';
-        $title_html .='</span>';
+        $title_html .= '</span>';
 
         return $title_html;
     }
@@ -460,14 +460,14 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_description( $question_id ){
+    public static function get_the_question_description($question_id) {
 
-        $question = get_post( $question_id );
+        $question = get_post($question_id);
 
         /**
          * Already documented within WordPress Core
          */
-        return apply_filters( 'the_content', $question->post_content );
+        return apply_filters('the_content', $question->post_content);
 
     }
 
@@ -477,9 +477,9 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function the_question_description( $question_id  ){
+    public static function the_question_description($question_id) {
 
-        echo self::get_the_question_description( $question_id );
+        echo self::get_the_question_description($question_id);
 
     }
 
@@ -490,38 +490,38 @@ 
      * @param $question_id
      * @return string
      */
-    public static function get_the_question_media( $question_id ){
+    public static function get_the_question_media($question_id) {
 
-        $question_media = get_post_meta( $question_id, '_question_media', true );
+        $question_media = get_post_meta($question_id, '_question_media', true);
         $question_media_link = '';
-        if( 0 < intval( $question_media ) ) {
-            $mimetype = get_post_mime_type( $question_media );
-            if( $mimetype ) {
-                $mimetype_array = explode( '/', $mimetype);
-                if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) {
+        if (0 < intval($question_media)) {
+            $mimetype = get_post_mime_type($question_media);
+            if ($mimetype) {
+                $mimetype_array = explode('/', $mimetype);
+                if (isset($mimetype_array[0]) && $mimetype_array[0]) {
                     $question_media_type = $mimetype_array[0];
-                    $question_media_url = wp_get_attachment_url( $question_media );
-                    $attachment = get_post( $question_media );
+                    $question_media_url = wp_get_attachment_url($question_media);
+                    $attachment = get_post($question_media);
                     $question_media_title = $attachment->post_title;
                     $question_media_description = $attachment->post_content;
-                    switch( $question_media_type ) {
+                    switch ($question_media_type) {
                         case 'image':
-                            $image_size = apply_filters( 'sensei_question_image_size', 'medium', $question_id );
-                            $attachment_src = wp_get_attachment_image_src( $question_media, $image_size );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank"><img src="' . $attachment_src[0] . '" width="' . $attachment_src[1] . '" height="' . $attachment_src[2] . '" /></a>';
+                            $image_size = apply_filters('sensei_question_image_size', 'medium', $question_id);
+                            $attachment_src = wp_get_attachment_image_src($question_media, $image_size);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank"><img src="'.$attachment_src[0].'" width="'.$attachment_src[1].'" height="'.$attachment_src[2].'" /></a>';
                             break;
 
                         case 'audio':
-                            $question_media_link = wp_audio_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_audio_shortcode(array('src' => $question_media_url));
                             break;
 
                         case 'video':
-                            $question_media_link = wp_video_shortcode( array( 'src' => $question_media_url ) );
+                            $question_media_link = wp_video_shortcode(array('src' => $question_media_url));
                             break;
 
                         default:
-                            $question_media_filename = basename( $question_media_url );
-                            $question_media_link = '<a class="' . esc_attr( $question_media_type ) . '" title="' . esc_attr( $question_media_title ) . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_filename . '</a>';
+                            $question_media_filename = basename($question_media_url);
+                            $question_media_link = '<a class="'.esc_attr($question_media_type).'" title="'.esc_attr($question_media_title).'" href="'.esc_url($question_media_url).'" target="_blank">'.$question_media_filename.'</a>';
                             break;
                     }
                 }
@@ -529,21 +529,21 @@ 
         }
 
         $output = '';
-        if( $question_media_link ) {
+        if ($question_media_link) {
 
                 $output .= '<div class="question_media_display">';
-                $output .=      $question_media_link;
+                $output .= $question_media_link;
                 $output .= '<dl>';
 
-                if( $question_media_title ) {
+                if ($question_media_title) {
 
-                   $output .= '<dt>'. $question_media_title. '</dt>';
+                   $output .= '<dt>'.$question_media_title.'</dt>';
 
                  }
 
-                if( $question_media_description ) {
+                if ($question_media_description) {
 
-                    $output .= '<dd>' . $question_media_description . '</dd>';
+                    $output .= '<dd>'.$question_media_description.'</dd>';
 
                 }
 
@@ -564,9 +564,9 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_question_media( $question_id ){
+    public static function the_question_media($question_id) {
 
-        echo self::get_the_question_media( $question_id );
+        echo self::get_the_question_media($question_id);
 
     }
 
@@ -577,11 +577,11 @@ 
      *
      * @param $question_id
      */
-    public static function the_question_hidden_fields( $question_id ){
+    public static function the_question_hidden_fields($question_id) {
         ?>
 
-            <input type="hidden" name="question_id_<?php $question_id;?>" value="<?php $question_id;?>" />
-            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e( $question_id ); ?>" />
+            <input type="hidden" name="question_id_<?php $question_id; ?>" value="<?php $question_id; ?>" />
+            <input type="hidden" name="questions_asked[]" value="<?php esc_attr_e($question_id); ?>" />
 
         <?php
     }
@@ -592,27 +592,27 @@ 
      * @since 1.9.0
      * @param $question_id
      */
-    public static function answer_feedback_notes( $question_id ){
+    public static function answer_feedback_notes($question_id) {
 
         //IDS
         $quiz_id = get_the_ID();
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
         // Data to check before showing feedback
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, get_current_user_id() );
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $not_empty_user_quiz_grade = !empty( $user_quiz_grade );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $lesson_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id , '_quiz_grade_type', true );
+        $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, get_current_user_id());
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $not_empty_user_quiz_grade = ! empty($user_quiz_grade);
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $lesson_completed = Sensei_Utils::user_completed_lesson($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
-        if( ( $lesson_completed  && $not_empty_user_quiz_grade  )
-            ||  ( $lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type )
-            || ( 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade ) ) {
+        if (($lesson_completed && $not_empty_user_quiz_grade)
+            ||  ($lesson_completed && ! $reset_quiz_allowed && 'auto' == $quiz_grade_type)
+            || ('auto' == $quiz_grade_type && ! $reset_quiz_allowed && $not_empty_user_quiz_grade)) {
 
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, get_current_user_id() );
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, get_current_user_id());
 
-            if( $answer_notes ) { ?>
+            if ($answer_notes) { ?>
 
                 <div class="sensei-message info info-special answer-feedback">
 
@@ -626,7 +626,7 @@ 
                          * @param string $question_id
                          * @param string $lesson_id
                          */
-                        echo apply_filters( 'sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id );
+                        echo apply_filters('sensei_question_answer_notes', $answer_notes, $question_id, $lesson_id);
 
                     ?>
 
@@ -645,72 +645,72 @@ 
      * @since 1.9.0
      * @param string $question_id
      */
-    public static function the_answer_result_indication( $question_id ){
+    public static function the_answer_result_indication($question_id) {
 
-        global $post,  $current_user, $sensei_question_loop;
+        global $post, $current_user, $sensei_question_loop;
 
         // Post Data
         $quiz_id = $sensei_question_loop['quiz_id'];
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
         $question_item = $sensei_question_loop['current_question'];
 
         // Setup variable needed to determine if the message should show and what it should show
-        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $lesson_complete = Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed( $lesson_id );
-        $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+        $user_quiz_grade = Sensei_Quiz::get_user_quiz_grade($lesson_id, get_current_user_id());
+        $lesson_complete = Sensei_Utils::user_completed_lesson($lesson_id, get_current_user_id());
+        $reset_quiz_allowed = Sensei_Quiz::is_reset_allowed($lesson_id);
+        $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true);
 
         // retrieve the question total grade
-        $question_grade = Sensei()->question->get_question_grade( $question_id );
+        $question_grade = Sensei()->question->get_question_grade($question_id);
 
         // retrieve grade the user achieved
-        $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, get_current_user_id() );
+        $user_question_grade = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
 
         // Question ID
         $question_id = $question_item->ID;
 
         // conditions to check
-        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '' ;
-        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete &&  $user_quiz_grade != '' && ! $reset_quiz_allowed ;
-        $grade_type_auto_a_valid_grade_and_reset_not_allowed =  'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '' ;
+        $completed_with_valid_grade = $lesson_complete && $user_quiz_grade != '';
+        $completed_with_valid_grade_and_reset_not_allowed = $lesson_complete && $user_quiz_grade != '' && ! $reset_quiz_allowed;
+        $grade_type_auto_a_valid_grade_and_reset_not_allowed = 'auto' == $quiz_grade_type && ! $reset_quiz_allowed && $user_quiz_grade != '';
 
-        if (  $completed_with_valid_grade
+        if ($completed_with_valid_grade
             || $completed_with_valid_grade_and_reset_not_allowed
-            || $grade_type_auto_a_valid_grade_and_reset_not_allowed  ) {
+            || $grade_type_auto_a_valid_grade_and_reset_not_allowed) {
 
             $user_correct = false;
-            $answer_message = __( 'Incorrect', 'woothemes-sensei' );
+            $answer_message = __('Incorrect', 'woothemes-sensei');
             $answer_message_class = 'user_wrong';
             // For zero grade mark as 'correct' but add no classes
-            if ( 0 == $question_grade ) {
+            if (0 == $question_grade) {
 
                 $user_correct = true;
                 $answer_message = '';
                 $answer_message_class = '';
 
-            } else if( $user_question_grade > 0 ) {
+            } else if ($user_question_grade > 0) {
 
                 $user_correct = true;
-                $answer_message = sprintf( __( 'Grade: %d', 'woothemes-sensei' ), $user_question_grade );
+                $answer_message = sprintf(__('Grade: %d', 'woothemes-sensei'), $user_question_grade);
                 $answer_message_class = 'user_right';
 
             }
 
             // attach the correct answer if the question is auto gradable and user got it wrong
-            if( !$reset_quiz_allowed && !$user_correct ){
+            if ( ! $reset_quiz_allowed && ! $user_correct) {
 
-                $answer_message .=  ' - '. __('Right Answer:','woothemes-sensei') . ' ' . self::get_correct_answer( $question_item->ID );
+                $answer_message .= ' - '.__('Right Answer:', 'woothemes-sensei').' '.self::get_correct_answer($question_item->ID);
 
             }
 
             // answer feedback
-            $answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $current_user->ID );
-            if( $answer_notes ) {
+            $answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, $current_user->ID);
+            if ($answer_notes) {
                 $answer_message_class .= ' has_notes';
             }
             ?>
 
-            <div class="answer_message <?php esc_attr_e( $answer_message_class ); ?>">
+            <div class="answer_message <?php esc_attr_e($answer_message_class); ?>">
 
                 <span><?php echo $answer_message; ?></span>
 
@@ -731,39 +731,39 @@ 
      * @param $quiz_id
      * @return array $question_data
      */
-    public static function get_template_data( $question_id, $quiz_id ){
+    public static function get_template_data($question_id, $quiz_id) {
 
-        $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id  );
+        $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id);
 
-        $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+        $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true);
         //backwards compatibility
-        if( 'on' == $reset_allowed ) {
+        if ('on' == $reset_allowed) {
             $reset_allowed = 1;
         }
 
         // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( Sensei()->quiz->get_lesson_id( $quiz_id), get_current_user_id() );
+        $user_lesson_end = Sensei_Utils::user_completed_lesson(Sensei()->quiz->get_lesson_id($quiz_id), get_current_user_id());
         $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
+        if ($user_lesson_end) {
             $user_lesson_complete = true;
         }
 
         //setup the question data
-        $data[ 'ID' ]                     = $question_id;
-        $data[ 'title' ]                  = get_the_title( $question_id );
-        $data[ 'content' ]                = get_post( $question_id )->post_content;
-        $data[ 'quiz_id' ]                = $quiz_id;
-        $data[ 'lesson_id' ]              = Sensei()->quiz->get_lesson_id( $quiz_id );
-        $data[ 'type' ]                   = Sensei()->question->get_question_type( $question_id );
-        $data[ 'question_grade' ]         = Sensei()->question->get_question_grade(  $question_id  );
-        $data[ 'user_question_grade' ]    = Sensei()->quiz->get_user_question_grade( $lesson_id,  $question_id , get_current_user_id());
-        $data[ 'question_right_answer' ]  = get_post_meta( $question_id , '_question_right_answer', true );
-        $data[ 'question_wrong_answers' ] = get_post_meta( $question_id , '_question_wrong_answers', true );
-        $data[ 'user_answer_entry' ]      = Sensei()->quiz->get_user_question_answer( $lesson_id,  $question_id , get_current_user_id() );
-        $data[ 'lesson_completed' ]       = Sensei_Utils::user_completed_course( $lesson_id, get_current_user_id( ) );
-        $data[ 'quiz_grade_type' ]        = get_post_meta( $quiz_id , '_quiz_grade_type', true );
-        $data[ 'reset_quiz_allowed' ]     = $reset_allowed;
-        $data[ 'lesson_complete' ]        = $user_lesson_complete;
+        $data['ID']                     = $question_id;
+        $data['title']                  = get_the_title($question_id);
+        $data['content']                = get_post($question_id)->post_content;
+        $data['quiz_id']                = $quiz_id;
+        $data['lesson_id']              = Sensei()->quiz->get_lesson_id($quiz_id);
+        $data['type']                   = Sensei()->question->get_question_type($question_id);
+        $data['question_grade']         = Sensei()->question->get_question_grade($question_id);
+        $data['user_question_grade']    = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, get_current_user_id());
+        $data['question_right_answer']  = get_post_meta($question_id, '_question_right_answer', true);
+        $data['question_wrong_answers'] = get_post_meta($question_id, '_question_wrong_answers', true);
+        $data['user_answer_entry']      = Sensei()->quiz->get_user_question_answer($lesson_id, $question_id, get_current_user_id());
+        $data['lesson_completed']       = Sensei_Utils::user_completed_course($lesson_id, get_current_user_id( ));
+        $data['quiz_grade_type']        = get_post_meta($quiz_id, '_quiz_grade_type', true);
+        $data['reset_quiz_allowed']     = $reset_allowed;
+        $data['lesson_complete']        = $user_lesson_complete;
 
         /**
          * Filter the question template data. This filter fires  in
@@ -777,7 +777,7 @@ 
          * @param string $question_id
          * @param string $quiz_id
          */
-        return apply_filters( 'sensei_get_question_template_data', $data, $question_id, $quiz_id );
+        return apply_filters('sensei_get_question_template_data', $data, $question_id, $quiz_id);
 
     }
 
@@ -793,28 +793,28 @@ 
      *
      * @return array()
      */
-    public static function file_upload_load_question_data ( $question_data, $question_id, $quiz_id ){
+    public static function file_upload_load_question_data($question_data, $question_id, $quiz_id) {
 
 
-        if( 'file-upload' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('file-upload' == Sensei()->question->get_question_type($question_id)) {
 
             // Get uploaded file
-            $attachment_id = $question_data[ 'user_answer_entry' ];
+            $attachment_id = $question_data['user_answer_entry'];
             $answer_media_url = $answer_media_filename = '';
 
 
             $question_helptext = '';
-            if( isset( $question_data['question_wrong_answers'][0] ) ) {
+            if (isset($question_data['question_wrong_answers'][0])) {
 
-                $question_helptext =  $question_data['question_wrong_answers'][0];
+                $question_helptext = $question_data['question_wrong_answers'][0];
 
             }
 
 
-            if( 0 < intval( $attachment_id ) ) {
+            if (0 < intval($attachment_id)) {
 
-                $answer_media_url = wp_get_attachment_url( $attachment_id );
-                $answer_media_filename = basename( $answer_media_url );
+                $answer_media_url = wp_get_attachment_url($attachment_id);
+                $answer_media_filename = basename($answer_media_url);
 
             }
 
@@ -822,11 +822,11 @@ 
             // Get max upload file size, formatted for display
             // Code copied from wp-admin/includes/media.php:1515
             $upload_size_unit = $max_upload_size = wp_max_upload_size();
-            $sizes = array( 'KB', 'MB', 'GB' );
-            for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+            $sizes = array('KB', 'MB', 'GB');
+            for ($u = -1; $upload_size_unit > 1024 && $u < count($sizes) - 1; $u++) {
                 $upload_size_unit /= 1024;
             }
-            if ( $u < 0 ) {
+            if ($u < 0) {
 
                 $upload_size_unit = 0;
                 $u = 0;
@@ -836,14 +836,14 @@ 
                 $upload_size_unit = (int) $upload_size_unit;
 
             }
-            $max_upload_size = sprintf( __( 'Maximum upload file size: %d%s' ), esc_html( $upload_size_unit ), esc_html( $sizes[ $u ] ) );
+            $max_upload_size = sprintf(__('Maximum upload file size: %d%s'), esc_html($upload_size_unit), esc_html($sizes[$u]));
 
             // Assemble all the data needed by the file upload template
-            $question_data[ 'answer_media_url' ]      = $answer_media_url;
-            $question_data[ 'answer_media_filename' ] = $answer_media_filename;
-            $question_data[ 'max_upload_size' ]       = $max_upload_size;
+            $question_data['answer_media_url']      = $answer_media_url;
+            $question_data['answer_media_filename'] = $answer_media_filename;
+            $question_data['max_upload_size']       = $max_upload_size;
 
-            $question_data[ 'question_helptext' ]     = $question_helptext;
+            $question_data['question_helptext']     = $question_helptext;
 
         }// end if is file upload type
 
@@ -863,27 +863,27 @@ 
      *
      * @return array()
      */
-    public static function multiple_choice_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function multiple_choice_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'multiple-choice' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('multiple-choice' == Sensei()->question->get_question_type($question_id)) {
 
 
             $answer_type = 'radio';
-            if ( is_array( $question_data[ 'question_right_answer' ] ) && ( 1 < count( $question_data[ 'question_right_answer' ] ) ) ) {
+            if (is_array($question_data['question_right_answer']) && (1 < count($question_data['question_right_answer']))) {
 
                 $answer_type = 'checkbox';
 
             }
 
             // Merge right and wrong answers
-            if ( is_array( $question_data[ 'question_right_answer' ] ) ) {
+            if (is_array($question_data['question_right_answer'])) {
 
-                $merged_options = array_merge( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
+                $merged_options = array_merge($question_data['question_wrong_answers'], $question_data['question_right_answer']);
 
-            }  else {
+            } else {
 
-                array_push( $question_data[ 'question_wrong_answers' ], $question_data[ 'question_right_answer' ] );
-                $merged_options = $question_data[ 'question_wrong_answers' ];
+                array_push($question_data['question_wrong_answers'], $question_data['question_right_answer']);
+                $merged_options = $question_data['question_wrong_answers'];
 
             }
 
@@ -891,24 +891,24 @@ 
             $question_answers_options = array();
             $count = 0;
 
-            foreach( $merged_options as $answer ) {
+            foreach ($merged_options as $answer) {
 
                 $count++;
                 $question_option = array();
 
-                if( ( $question_data[ 'lesson_completed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( $question_data[ 'lesson_completed' ] && ! $question_data[ 'reset_quiz_allowed' ] && $question_data[ 'user_quiz_grade' ] != '' )
-                    || ( 'auto' == $question_data[ 'quiz_grade_type' ] && ! $question_data[ 'reset_quiz_allowed' ]  && ! empty( $question_data[ 'user_quiz_grade' ] ) ) ) {
+                if (($question_data['lesson_completed'] && $question_data['user_quiz_grade'] != '')
+                    || ($question_data['lesson_completed'] && ! $question_data['reset_quiz_allowed'] && $question_data['user_quiz_grade'] != '')
+                    || ('auto' == $question_data['quiz_grade_type'] && ! $question_data['reset_quiz_allowed'] && ! empty($question_data['user_quiz_grade']))) {
 
                     $user_correct = false;
 
 
                     // For zero grade mark as 'correct' but add no classes
-                    if ( 0 == $question_data[ 'question_grade' ] ) {
+                    if (0 == $question_data['question_grade']) {
 
                         $user_correct = true;
 
-                    }  else if( $question_data[ 'user_question_grade' ] > 0 ) {
+                    } else if ($question_data['user_question_grade'] > 0) {
 
                         $user_correct = true;
 
@@ -918,20 +918,20 @@ 
 
                 // setup the option specific classes
                 $answer_class = '';
-                if( isset( $user_correct ) && 0 < $question_data[ 'question_grade' ] ) {
-                    if ( is_array( $question_data['question_right_answer'] ) && in_array($answer, $question_data['question_right_answer']) ) {
+                if (isset($user_correct) && 0 < $question_data['question_grade']) {
+                    if (is_array($question_data['question_right_answer']) && in_array($answer, $question_data['question_right_answer'])) {
 
                         $answer_class .= ' right_answer';
 
-                    }  elseif( !is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer ) {
+                    }  elseif ( ! is_array($question_data['question_right_answer']) && $question_data['question_right_answer'] == $answer) {
 
                         $answer_class .= ' right_answer';
 
-                    } elseif( ( is_array( $question_data['user_answer_entry']  ) && in_array($answer, $question_data['user_answer_entry'] ) )
-                        ||  ( !  $question_data['user_answer_entry'] &&  $question_data['user_answer_entry'] == $answer ) ) {
+                    } elseif ((is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry']))
+                        ||  ( ! $question_data['user_answer_entry'] && $question_data['user_answer_entry'] == $answer)) {
 
                         $answer_class = 'user_wrong';
-                        if( $user_correct ) {
+                        if ($user_correct) {
 
                             $answer_class = 'user_right';
 
@@ -943,76 +943,76 @@ 
 
                 // determine if the current option must be checked
                 $checked = '';
-                if ( isset( $question_data['user_answer_entry'] ) && 0 < count( $question_data['user_answer_entry'] ) ) {
-                    if ( is_array( $question_data['user_answer_entry'] ) && in_array( $answer, $question_data['user_answer_entry'] ) ) {
+                if (isset($question_data['user_answer_entry']) && 0 < count($question_data['user_answer_entry'])) {
+                    if (is_array($question_data['user_answer_entry']) && in_array($answer, $question_data['user_answer_entry'])) {
 
                         $checked = 'checked="checked"';
 
-                    } elseif ( !is_array( $question_data['user_answer_entry'] ) ) {
+                    } elseif ( ! is_array($question_data['user_answer_entry'])) {
 
-                        $checked = checked( $answer, $question_data['user_answer_entry'] , false );
+                        $checked = checked($answer, $question_data['user_answer_entry'], false);
 
                     }
 
                 } // End If Statement
 
                 //Load the answer option data
-                $question_option[ 'ID' ]          = Sensei()->lesson->get_answer_id( $answer );
-                $question_option[ 'answer' ]      = $answer;
-                $question_option[ 'option_class'] = $answer_class;
-                $question_option[ 'checked']      = $checked;
-                $question_option[ 'count' ]       = $count;
-                $question_option[ 'type' ] = $answer_type;
+                $question_option['ID']          = Sensei()->lesson->get_answer_id($answer);
+                $question_option['answer']      = $answer;
+                $question_option['option_class'] = $answer_class;
+                $question_option['checked']      = $checked;
+                $question_option['count']       = $count;
+                $question_option['type'] = $answer_type;
 
                 // add the speci  fic option to the list of options for this question
-                $question_answers_options[$question_option[ 'ID' ]] = $question_option;
+                $question_answers_options[$question_option['ID']] = $question_option;
 
             } // end for each option
 
 
             // Shuffle the array depending on the settings
             $answer_options_sorted = array();
-            $random_order = get_post_meta( $question_data['ID'], '_random_order', true );
-            if(  $random_order && $random_order == 'yes' ) {
+            $random_order = get_post_meta($question_data['ID'], '_random_order', true);
+            if ($random_order && $random_order == 'yes') {
 
                 $answer_options_sorted = $question_answers_options;
-                shuffle( $answer_options_sorted );
+                shuffle($answer_options_sorted);
 
             } else {
 
                 $answer_order = array();
-                $answer_order_string = get_post_meta( $question_data['ID'], '_answer_order', true );
-                if( $answer_order_string ) {
+                $answer_order_string = get_post_meta($question_data['ID'], '_answer_order', true);
+                if ($answer_order_string) {
 
-                    $answer_order = array_filter( explode( ',', $answer_order_string ) );
-                    if( count( $answer_order ) > 0 ) {
+                    $answer_order = array_filter(explode(',', $answer_order_string));
+                    if (count($answer_order) > 0) {
 
-                        foreach( $answer_order as $answer_id ) {
+                        foreach ($answer_order as $answer_id) {
 
-                            if( isset( $question_answers_options[ $answer_id ] ) ) {
+                            if (isset($question_answers_options[$answer_id])) {
 
-                                $answer_options_sorted[ $answer_id ] = $question_answers_options[ $answer_id ];
-                                unset( $question_answers_options[ $answer_id ] );
+                                $answer_options_sorted[$answer_id] = $question_answers_options[$answer_id];
+                                unset($question_answers_options[$answer_id]);
 
                             }
 
                         }
 
-                        if( count( $question_answers_options ) > 0 ) {
-                            foreach( $question_answers_options as $id => $answer ) {
+                        if (count($question_answers_options) > 0) {
+                            foreach ($question_answers_options as $id => $answer) {
 
-                                $answer_options_sorted[ $id ] = $answer;
+                                $answer_options_sorted[$id] = $answer;
 
                             }
                         }
 
-                    }else{
+                    } else {
 
                         $answer_options_sorted = $question_answers_options;
 
                     }
 
-                }else{
+                } else {
 
                     $answer_options_sorted = $question_answers_options;
 
@@ -1022,7 +1022,7 @@ 
 
 
             // assemble and setup the data for the templates data array
-            $question_data[ 'answer_options' ]    =  $answer_options_sorted;
+            $question_data['answer_options'] = $answer_options_sorted;
 
         }
 
@@ -1042,14 +1042,14 @@ 
      *
      * @return array()
      */
-    public static function gap_fill_load_question_data( $question_data, $question_id, $quiz_id ){
+    public static function gap_fill_load_question_data($question_data, $question_id, $quiz_id) {
 
-        if( 'gap-fill' == Sensei()->question->get_question_type( $question_id ) ) {
+        if ('gap-fill' == Sensei()->question->get_question_type($question_id)) {
 
-            $gapfill_array = explode( '||', $question_data[ 'question_right_answer' ] );
-            $question_data[ 'gapfill_pre' ]  = isset( $gapfill_array[0] ) ? $gapfill_array[0] : '';
-            $question_data[ 'gapfill_gap' ]  = isset( $gapfill_array[1] ) ? $gapfill_array[1] : '';
-            $question_data[ 'gapfill_post' ] = isset( $gapfill_array[2] ) ? $gapfill_array[2] : '';
+            $gapfill_array = explode('||', $question_data['question_right_answer']);
+            $question_data['gapfill_pre']  = isset($gapfill_array[0]) ? $gapfill_array[0] : '';
+            $question_data['gapfill_gap']  = isset($gapfill_array[1]) ? $gapfill_array[1] : '';
+            $question_data['gapfill_post'] = isset($gapfill_array[2]) ? $gapfill_array[2] : '';
 
         }
 
@@ -1064,32 +1064,32 @@ 
      * @param $question_id
      * @return string $correct_answer or empty
      */
-    public static function get_correct_answer( $question_id ){
+    public static function get_correct_answer($question_id) {
 
-        $right_answer = get_post_meta( $question_id, '_question_right_answer', true );
-        $type = Sensei()->question->get_question_type( $question_id );
-        $type_name = __( 'Multiple Choice', 'woothemes-sensei' );
+        $right_answer = get_post_meta($question_id, '_question_right_answer', true);
+        $type = Sensei()->question->get_question_type($question_id);
+        $type_name = __('Multiple Choice', 'woothemes-sensei');
         $grade_type = 'manual-grade';
 
-        if ('boolean'== $type ) {
+        if ('boolean' == $type) {
 
             $right_answer = ucfirst($right_answer);
 
-        }elseif( 'multiple-choice' == $type ) {
+        }elseif ('multiple-choice' == $type) {
 
             $right_answer = (array) $right_answer;
-            $right_answer = implode( ', ', $right_answer );
+            $right_answer = implode(', ', $right_answer);
 
-        }elseif( 'gap-fill' == $type ) {
+        }elseif ('gap-fill' == $type) {
 
-            $right_answer_array = explode( '||', $right_answer );
-            if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
-            if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
-            if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
+            $right_answer_array = explode('||', $right_answer);
+            if (isset($right_answer_array[0])) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; }
+            if (isset($right_answer_array[1])) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; }
+            if (isset($right_answer_array[2])) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; }
 
-            $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post;
+            $right_answer = $gapfill_pre.' <span class="highlight">'.$gapfill_gap.'</span> '.$gapfill_post;
 
-        }else{
+        } else {
 
             // for non auto gradable question types no answer should be returned.
             $right_answer = '';
@@ -1107,4 +1107,4 @@ 
  * @ignore only for backward compatibility
  * @since 1.9.0
  */
-class WooThemes_Sensei_Question extends Sensei_Question{}
+class WooThemes_Sensei_Question extends Sensei_Question {}

includes/class-sensei-quiz.php

Doc Comments +4 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
      *
      * This function hooks into the quiz page and accepts the answer form save post.
      * @since 1.7.3
-     * @return bool $saved;
+     * @return boolean|null $saved;
      */
     public function user_save_quiz_answers_listener(){
 
@@ -214,7 +214,7 @@ 
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
-	 * @return array $answers or false
+	 * @return boolean $answers or false
 	 */
 	public function get_user_answers( $lesson_id, $user_id ){
 
@@ -707,7 +707,7 @@ 
       *      @type int $question_id
       *      @type int $question_grade
       * }
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return bool
@@ -754,7 +754,7 @@ 
       *
       * @since 1.7.4
       *
-      * @param $lesson_id
+      * @param integer $lesson_id
       * @param $user_id (Optional) will use the current user if not supplied
       *
       * @return array $user_quiz_grades or false if none exists for this users
@@ -1090,7 +1090,6 @@ 
       * Filter the single title and add the Quiz to it.
       *
       * @param string $title
-      * @param int $id title post id
       * @return string $quiz_title
       */
      public static function single_quiz_title( $title, $post_id ){

Braces +7 added lines, -4 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly
 
 /**
  * Sensei Quiz Class
@@ -104,7 +107,7 @@ 
 			global $post;
 			if( 'quiz' == get_post_type( $post ) ){
 				$quiz_id = $post->ID;
-			}else{
+			} else{
 				return false;
 			}
 
@@ -234,7 +237,7 @@ 
 
             $encoded_user_answers = $transient_cached_answers;
 
-        }else{
+        } else{
 
             $encoded_user_answers = WooThemes_Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
 
@@ -424,7 +427,7 @@ 
             // compress the answer for saving
 			if( 'multi-line' == $question_type ) {
                 $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
+            } elseif( 'file-upload' == $question_type  ){
                 $file_key = 'file_upload_' . $question_id;
                 if( isset( $files[ $file_key ] ) ) {
                         $attachment_id = WooThemes_Sensei_Utils::upload_file(  $files[ $file_key ] );

Indentation +884 added lines, -884 removed lines

@@ -24,69 +24,69 @@ 
 	 */
 	public function __construct ( $file = __FILE__ ) {
 		$this->file = $file;
-        $this->token = 'quiz';
+		$this->token = 'quiz';
 		$this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' );
 		add_action( 'save_post', array( $this, 'update_author' ));
 
 		// listen to the reset button click
 		add_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
 
-        // fire the complete quiz button submit for grading action
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
+		// fire the complete quiz button submit for grading action
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_quiz_submit_listener' ) );
 
 		// fire the save user answers quiz button click responder
 		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'user_save_quiz_answers_listener' ) );
 
-        // fire the load global data function
-        add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
+		// fire the load global data function
+		add_action( 'sensei_single_quiz_content_inside_before', array( $this, 'load_global_quiz_data' ), 80 );
 
-        add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
+		add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') );
 
 
-    } // End __construct()
+	} // End __construct()
 
 	/**
-	* Update the quiz author when the lesson post type is save
-	*
-	* @param int $post_id
-	* @return void
-	*/
+	 * Update the quiz author when the lesson post type is save
+	 *
+	 * @param int $post_id
+	 * @return void
+	 */
 	public function update_author( $post_id ){
 
 		// If this isn't a 'lesson' post, don't update it.
-        // if this is a revision don't save it
-	    if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
-            || wp_is_post_revision( $post_id ) ) {
+		// if this is a revision don't save it
+		if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type']
+			|| wp_is_post_revision( $post_id ) ) {
 
-                return;
+				return;
 
-        }
-	    // get the lesson author id to be use late
-	    $saved_post = get_post( $post_id );
-	    $new_lesson_author_id =  $saved_post->post_author;
+		}
+		// get the lesson author id to be use late
+		$saved_post = get_post( $post_id );
+		$new_lesson_author_id =  $saved_post->post_author;
 
-	    //get the lessons quiz
+		//get the lessons quiz
 		$lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id );
-	    foreach ( (array) $lesson_quizzes as $quiz_item ) {
+		foreach ( (array) $lesson_quizzes as $quiz_item ) {
 
-	    	if( ! $quiz_item ) {
-	    		continue;
-	    	}
+			if( ! $quiz_item ) {
+				continue;
+			}
 
-		    // setup the quiz items new author value
+			// setup the quiz items new author value
 			$my_post = array(
-			      'ID'           => $quiz_item,
-			      'post_author' =>  $new_lesson_author_id
+				  'ID'           => $quiz_item,
+				  'post_author' =>  $new_lesson_author_id
 			);
 
-            // remove the action so that it doesn't fire again
-            remove_action( 'save_post', array( $this, 'update_author' ));
+			// remove the action so that it doesn't fire again
+			remove_action( 'save_post', array( $this, 'update_author' ));
 
 			// Update the post into the database
 		  	wp_update_post( $my_post );
-	    }
+		}
 
-	    return;
+		return;
 	}// end update_author
 
 
@@ -117,32 +117,32 @@ 
 	} // end lesson
 
 
-    /**
-     * user_save_quiz_answers_listener
-     *
-     * This function hooks into the quiz page and accepts the answer form save post.
-     * @since 1.7.3
-     * @return bool $saved;
-     */
-    public function user_save_quiz_answers_listener(){
+	/**
+	 * user_save_quiz_answers_listener
+	 *
+	 * This function hooks into the quiz page and accepts the answer form save post.
+	 * @since 1.7.3
+	 * @return bool $saved;
+	 */
+	public function user_save_quiz_answers_listener(){
 
-        if( ! isset( $_POST[ 'quiz_save' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		if( ! isset( $_POST[ 'quiz_save' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
-        // call the save function
-        self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
+		global $post;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
+		// call the save function
+		self::save_user_answers( $quiz_answers, $_FILES , $lesson_id  , get_current_user_id() );
 
-        // remove the hook as it should only fire once per click
-        remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
+		// remove the hook as it should only fire once per click
+		remove_action( 'sensei_single_quiz_content_inside_before', 'user_save_quiz_answers_listener' );
 
-    } // end user_save_quiz_answers_listener
+	} // end user_save_quiz_answers_listener
 
 	/**
 	 * Save the user answers for the given lesson's quiz
@@ -153,7 +153,7 @@ 
 	 * @access public
 	 *
 	 * @param array $quiz_answers
-     * @param array $files from global $_FILES
+	 * @param array $files from global $_FILES
 	 * @param int $lesson_id
 	 * @param int $user_id
 	 *
@@ -161,11 +161,11 @@ 
 	 */
 	public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){
 
-        if( ! ( $user_id > 0 ) ){
-            $user_id = get_current_user_id();
-        }
+		if( ! ( $user_id > 0 ) ){
+			$user_id = get_current_user_id();
+		}
 
-        // make sure the parameters are valid before continuing
+		// make sure the parameters are valid before continuing
 		if( empty( $lesson_id ) || empty( $user_id )
 			|| 'lesson' != get_post_type( $lesson_id )
 			||!get_userdata( $user_id )
@@ -176,25 +176,25 @@ 
 		}
 
 
-        // start the lesson before saving the data in case the user has not started the lesson
-        $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		// start the lesson before saving the data in case the user has not started the lesson
+		$activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
 
 		//prepare the answers
 		$prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files );
 
 		// save the user data
-        $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
+		$answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ;
 
 		// were the answers saved correctly?
 		if( intval( $answers_saved ) > 0){
 
-            // save transient to make retrieval faster
-            $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-            set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
+			// save transient to make retrieval faster
+			$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+			set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS );
 
-            // update the message showed to user
-            Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
-        }
+			// update the message showed to user
+			Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' )  . '</div>';
+		}
 
 		return $answers_saved;
 
@@ -202,9 +202,9 @@ 
 
 	/**
 	 * Get the user answers for the given lesson's quiz.
-     *
-     * This function returns the data that is stored on the lesson as meta and is not compatible with
-     * retrieving data for quiz answer before sensei 1.7.4
+	 *
+	 * This function returns the data that is stored on the lesson as meta and is not compatible with
+	 * retrieving data for quiz answer before sensei 1.7.4
 	 *
 	 *
 	 * @since 1.7.4
@@ -224,27 +224,27 @@ 
 			return false;
 		}
 
-        // save some time and get the transient cached data
-        $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $transient_cached_answers = get_transient( $transient_key );
+		// save some time and get the transient cached data
+		$transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$transient_cached_answers = get_transient( $transient_key );
 
-        // return the transient or get the values get the values from the comment meta
-        if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
+		// return the transient or get the values get the values from the comment meta
+		if( !empty( $transient_cached_answers  ) && false != $transient_cached_answers ){
 
-            $encoded_user_answers = $transient_cached_answers;
+			$encoded_user_answers = $transient_cached_answers;
 
-        }else{
+		}else{
 
-            $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
+			$encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id  , $user_id );
 
-        } // end if transient check
+		} // end if transient check
 
 		if( ! is_array( $encoded_user_answers ) ){
 			return false;
 		}
 
-        //set the transient with the new valid data for faster retrieval in future
-        set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
+		//set the transient with the new valid data for faster retrieval in future
+		set_transient( $transient_key,  $encoded_user_answers, 10 * DAY_IN_SECONDS);
 
 		// decode an unserialize all answers
 		foreach( $encoded_user_answers as $question_id => $encoded_answer ) {
@@ -278,8 +278,8 @@ 
 		$current_quiz_id = $post->ID;
 		$lesson_id = $this->get_lesson_id( $current_quiz_id );
 
-        // reset all user data
-        $this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
+		// reset all user data
+		$this->reset_user_lesson_data( $lesson_id, get_current_user_id() );
 
 		//this function should only run once
 		remove_action( 'template_redirect', array( $this, 'reset_button_click_listener'  ) );
@@ -290,7 +290,7 @@ 
 	 * Complete/ submit  quiz hooked function
 	 *
 	 * This function listens to the complete button submit action and processes the users submitted answers
-     * not that this function submits the given users quiz answers for grading.
+	 * not that this function submits the given users quiz answers for grading.
 	 *
 	 * @since  1.7.4
 	 * @access public
@@ -300,90 +300,90 @@ 
 	 */
 	public function user_quiz_submit_listener() {
 
-        // only respond to valid quiz completion submissions
-        if( ! isset( $_POST[ 'quiz_complete' ])
-            || !isset( $_POST[ 'sensei_question' ] )
-            || empty( $_POST[ 'sensei_question' ] )
-            ||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
-            return;
-        }
+		// only respond to valid quiz completion submissions
+		if( ! isset( $_POST[ 'quiz_complete' ])
+			|| !isset( $_POST[ 'sensei_question' ] )
+			|| empty( $_POST[ 'sensei_question' ] )
+			||  ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce'  ) > 1 ) {
+			return;
+		}
 
-        global $post, $current_user;
-        $lesson_id = $this->get_lesson_id( $post->ID );
-        $quiz_answers = $_POST[ 'sensei_question' ];
+		global $post, $current_user;
+		$lesson_id = $this->get_lesson_id( $post->ID );
+		$quiz_answers = $_POST[ 'sensei_question' ];
 
-        self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
+		self::submit_answers_for_grading( $quiz_answers, $_FILES ,  $lesson_id  , $current_user->ID );
 
 	} // End sensei_complete_quiz()
 
-    /**
-     * This function set's up the data need for the quiz page
-     *
-     * This function hooks into sensei_complete_quiz and load the global data for the
-     * current quiz.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     */
-    public function load_global_quiz_data(){
+	/**
+	 * This function set's up the data need for the quiz page
+	 *
+	 * This function hooks into sensei_complete_quiz and load the global data for the
+	 * current quiz.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 */
+	public function load_global_quiz_data(){
 
-        global  $post, $current_user;
-        $this->data = new stdClass();
+		global  $post, $current_user;
+		$this->data = new stdClass();
 
-        // Default grade
-        $grade = 0;
+		// Default grade
+		$grade = 0;
 
-        // Get Quiz Questions
-        $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
+		// Get Quiz Questions
+		$lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID );
 
-        $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
+		$quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) );
 
-        // Get quiz grade type
-        $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
+		// Get quiz grade type
+		$quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true );
 
-        // Get quiz pass setting
-        $pass_required = get_post_meta( $post->ID, '_pass_required', true );
+		// Get quiz pass setting
+		$pass_required = get_post_meta( $post->ID, '_pass_required', true );
 
-        // Get quiz pass mark
-        $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
+		// Get quiz pass mark
+		$quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) );
 
-        // Get latest quiz answers and grades
-        $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
-        $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
-        $user_quiz_grade = 0;
-        if( isset( $user_lesson_status->comment_ID ) ) {
-            $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-        }
+		// Get latest quiz answers and grades
+		$lesson_id = Sensei()->quiz->get_lesson_id( $post->ID );
+		$user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() );
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID );
+		$user_quiz_grade = 0;
+		if( isset( $user_lesson_status->comment_ID ) ) {
+			$user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		}
 
-        if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
+		if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); }
 
-        // Check again that the lesson is complete
-        $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
-        $user_lesson_complete = false;
-        if ( $user_lesson_end ) {
-            $user_lesson_complete = true;
-        } // End If Statement
+		// Check again that the lesson is complete
+		$user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status );
+		$user_lesson_complete = false;
+		if ( $user_lesson_end ) {
+			$user_lesson_complete = true;
+		} // End If Statement
 
-        $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
-        //backwards compatibility
-        if( 'on' == $reset_allowed ) {
-            $reset_allowed = 1;
-        }
+		$reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true );
+		//backwards compatibility
+		if( 'on' == $reset_allowed ) {
+			$reset_allowed = 1;
+		}
 
-        // Build frontend data object for backwards compatibility
-        // using this is no longer recommended
-        $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
-        $this->data->quiz_passmark = $quiz_passmark;
-        $this->data->quiz_lesson = $quiz_lesson_id;
-        $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
-        $this->data->user_lesson_end = $user_lesson_end;
-        $this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
-        $this->data->lesson_quiz_questions = $lesson_quiz_questions;
-        $this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
+		// Build frontend data object for backwards compatibility
+		// using this is no longer recommended
+		$this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() );
+		$this->data->quiz_passmark = $quiz_passmark;
+		$this->data->quiz_lesson = $quiz_lesson_id;
+		$this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		$this->data->user_lesson_end = $user_lesson_end;
+		$this->data->user_lesson_complete = $user_lesson_complete; //Sensei_Utils::user_completed_lesson( $lesson_id, get_current_user_id() );
+		$this->data->lesson_quiz_questions = $lesson_quiz_questions;
+		$this->data->reset_quiz_allowed = $reset_allowed; // Sensei_Quiz::is_reset_allowed( $lesson_id );
 
-    } // end load_global_quiz_data
+	} // end load_global_quiz_data
 
 
 	/**
@@ -413,25 +413,25 @@ 
 		foreach( $unprepared_answers as $question_id => $answer ) {
 
 			//get the current questions question type
-            $question_type = Sensei()->question->get_question_type( $question_id );
+			$question_type = Sensei()->question->get_question_type( $question_id );
 
 			// Sanitise answer
 			if( 0 == get_magic_quotes_gpc() ) {
 				$answer = wp_unslash( $answer );
 			}
 
-            // compress the answer for saving
+			// compress the answer for saving
 			if( 'multi-line' == $question_type ) {
-                $answer = esc_html( $answer );
-            }elseif( 'file-upload' == $question_type  ){
-                $file_key = 'file_upload_' . $question_id;
-                if( isset( $files[ $file_key ] ) ) {
-                        $attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
-                        if( $attachment_id ) {
-                            $answer = $attachment_id;
-                        }
-                    }
-            } // end if
+				$answer = esc_html( $answer );
+			}elseif( 'file-upload' == $question_type  ){
+				$file_key = 'file_upload_' . $question_id;
+				if( isset( $files[ $file_key ] ) ) {
+						$attachment_id = Sensei_Utils::upload_file(  $files[ $file_key ] );
+						if( $attachment_id ) {
+							$answer = $attachment_id;
+						}
+					}
+			} // end if
 
 			$prepared_answers[ $question_id ] =  base64_encode( maybe_serialize( $answer ) );
 
@@ -440,813 +440,813 @@ 
 		return $prepared_answers;
 	} // prepare_form_submitted_answers
 
-    /**
-     * Reset user submitted questions
-     *
-     * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
-     * the save_user_answers as currently the saved and submitted answers are stored differently.
-     *
-     * @since 1.7.4
-     * @access public
-     *
-     * @return bool $reset_success
-     * @param int $user_id
-     * @param int $lesson_id
-     */
-    public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+	/**
+	 * Reset user submitted questions
+	 *
+	 * This function resets the quiz data for a user that has been submitted fro grading already. It is different to
+	 * the save_user_answers as currently the saved and submitted answers are stored differently.
+	 *
+	 * @since 1.7.4
+	 * @access public
+	 *
+	 * @return bool $reset_success
+	 * @param int $user_id
+	 * @param int $lesson_id
+	 */
+	public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){
+
+		//make sure the parameters are valid
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			|| ! get_userdata( $user_id ) ){
+			return false;
+		}
+
+
+
+		//get the users lesson status to make
+		$user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		if( ! isset( $user_lesson_status->comment_ID ) ) {
+			// this user is not taking this lesson so this process is not needed
+			return false;
+		}
+
+		//get the lesson quiz and course
+		$quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		$course_id = Sensei()->lesson->get_course_id( $lesson_id );
+
+		// reset the transients
+		$answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
+		$grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
+		$answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		delete_transient( $answers_transient_key );
+		delete_transient( $grades_transient_key );
+		delete_transient( $answers_feedback_transient_key );
+
+		// reset the quiz answers and feedback notes
+		$deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
+		$deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
+		$deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+		// Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
+		Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+
+		Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+
+		// Update course completion
+		Sensei_Utils::update_course_status( $user_id, $course_id );
 
-        //make sure the parameters are valid
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            || ! get_userdata( $user_id ) ){
-            return false;
-        }
-
-
-
-        //get the users lesson status to make
-        $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-        if( ! isset( $user_lesson_status->comment_ID ) ) {
-            // this user is not taking this lesson so this process is not needed
-            return false;
-        }
+		// Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
+		do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
+		Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
 
-        //get the lesson quiz and course
-        $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-        $course_id = Sensei()->lesson->get_course_id( $lesson_id );
+		return ( $deleted_answers && $deleted_grades ) ;
 
-        // reset the transients
-        $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id;
-        $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id;
-        $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-        delete_transient( $answers_transient_key );
-        delete_transient( $grades_transient_key );
-        delete_transient( $answers_feedback_transient_key );
+	} // end reset_user_lesson_data
 
-        // reset the quiz answers and feedback notes
-        $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id );
-        $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id );
-        $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+	 /**
+	  * Submit the users quiz answers for grading
+	  *
+	  * This function accepts users answers and stores it but also initiates the grading
+	  * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
+	  *
+	  * @since 1.7.4
+	  * @access public
+	  *
+	  * @param array $quiz_answers
+	  * @param array $files from $_FILES
+	  * @param int $user_id
+	  * @param int $lesson_id
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
 
-        // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade
-        Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id );
+		 $answers_submitted = false;
 
-        Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) );
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-        // Update course completion
-        Sensei_Utils::update_course_status( $user_id, $course_id );
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_answers ) ){
 
-        // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson()
-        do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id );
-        Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>';
+			 return false;
 
-        return ( $deleted_answers && $deleted_grades ) ;
+		 }
 
-    } // end reset_user_lesson_data
+		 // Default grade
+		 $grade = 0;
 
-     /**
-      * Submit the users quiz answers for grading
-      *
-      * This function accepts users answers and stores it but also initiates the grading
-      * if a quiz can be graded automatically it will, if not the answers can be graded by the teacher.
-      *
-      * @since 1.7.4
-      * @access public
-      *
-      * @param array $quiz_answers
-      * @param array $files from $_FILES
-      * @param int $user_id
-      * @param int $lesson_id
-      *
-      * @return bool $answers_submitted
-      */
-     public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){
+		 // Get Quiz ID
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
 
-         $answers_submitted = false;
+		 // Get quiz grade type
+		 $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
 
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
+		 // Get quiz pass setting
+		 $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
 
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_answers ) ){
+		 // Get the minimum percentage need to pass this quiz
+		 $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
 
-             return false;
+		 // Handle Quiz Questions asked
+		 // This is to ensure we save the questions that we've asked this user and that this can't be change unless
+		 // the quiz is reset by admin or user( user: only if the setting is enabled ).
+		 // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
+		 if( empty( $questions_asked ) ){
 
-         }
+			 $questions_asked = array_keys( $quiz_answers );
+			 $questions_asked_string = implode( ',', $questions_asked );
 
-         // Default grade
-         $grade = 0;
+			 // Save questions that were asked in this quiz
+			 update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
 
-         // Get Quiz ID
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+		 }
 
-         // Get quiz grade type
-         $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true );
+		 // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
+		 self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
 
-         // Get quiz pass setting
-         $pass_required = get_post_meta( $quiz_id, '_pass_required', true );
+		 // Grade quiz
+		 $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
 
-         // Get the minimum percentage need to pass this quiz
-         $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) );
+		 // Get Lesson Grading Setting
+		 $lesson_metadata = array();
+		 $lesson_status = 'ungraded'; // Default when completing a quiz
 
-         // Handle Quiz Questions asked
-         // This is to ensure we save the questions that we've asked this user and that this can't be change unless
-         // the quiz is reset by admin or user( user: only if the setting is enabled ).
-         // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true );
-         if( empty( $questions_asked ) ){
+		 // At this point the answers have been submitted
+		 $answers_submitted = true;
 
-             $questions_asked = array_keys( $quiz_answers );
-             $questions_asked_string = implode( ',', $questions_asked );
-
-             // Save questions that were asked in this quiz
-             update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string );
+		 // if this condition is false the quiz should manually be graded by admin
+		 if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
 
-         }
+			 // Quiz has been automatically Graded
+			 if ( 'on' == $pass_required ) {
 
-         // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson
-         self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id );
+				 // Student has reached the pass mark and lesson is complete
+				 if ( $quiz_pass_percentage <= $grade ) {
 
-         // Grade quiz
-         $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type );
+					 $lesson_status = 'passed';
 
-         // Get Lesson Grading Setting
-         $lesson_metadata = array();
-         $lesson_status = 'ungraded'; // Default when completing a quiz
+				 } else {
 
-         // At this point the answers have been submitted
-         $answers_submitted = true;
+					 $lesson_status = 'failed';
 
-         // if this condition is false the quiz should manually be graded by admin
-         if ('auto' == $quiz_grade_type && ! is_wp_error( $grade )  ) {
+				 } // End If Statement
 
-             // Quiz has been automatically Graded
-             if ( 'on' == $pass_required ) {
+			 } else {
 
-                 // Student has reached the pass mark and lesson is complete
-                 if ( $quiz_pass_percentage <= $grade ) {
+				 // Student only has to partake the quiz
+				 $lesson_status = 'graded';
+
+			 }
+
+			 $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
+
+		 } // end if ! is_wp_error( $grade ...
+
+		 Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
 
-                     $lesson_status = 'passed';
+		 if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
 
-                 } else {
+			 /**
+			  * Lesson end action hook
+			  *
+			  * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
+			  *
+			  * @param int $user_id
+			  * @param int $lesson_id
+			  */
+			 do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
 
-                     $lesson_status = 'failed';
+		 }
 
-                 } // End If Statement
+		 /**
+		  * User quiz has been submitted
+		  *
+		  * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
+		  * results.
+		  *
+		  * @param int $user_id
+		  * @param int $quiz_id
+		  * @param string $grade
+		  * @param string $quiz_pass_percentage
+		  * @param string $quiz_grade_type
+		  */
+		 do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
 
-             } else {
+		 return $answers_submitted;
 
-                 // Student only has to partake the quiz
-                 $lesson_status = 'graded';
-
-             }
-
-             $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz_auto()" above
-
-         } // end if ! is_wp_error( $grade ...
-
-         Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata );
+	 }// end submit_answers_for_grading
 
-         if( 'passed' == $lesson_status || 'graded' == $lesson_status ){
+	 /**
+	  * Get the user question answer
+	  *
+	  * This function gets the the users saved answer on given quiz for the given question parameter
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $answers_submitted
+	  */
+	 public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
 
-             /**
-              * Lesson end action hook
-              *
-              * This hook is fired after a lesson quiz has been graded and the lesson status is 'passed' OR 'graded'
-              *
-              * @param int $user_id
-              * @param int $lesson_id
-              */
-             do_action( 'sensei_user_lesson_end', $user_id, $lesson_id );
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-         }
+			 return false;
+		 }
+
+		 if( ! ( intval( $user_id ) > 0 )   ){
+			 $user_id = get_current_user_id();
+		 }
+
+		 $users_answers = $this->get_user_answers( $lesson_id, $user_id );
+
+		 if( !$users_answers || empty( $users_answers )
+		 ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
+
+			 //Fallback for pre 1.7.4 data
+			 $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
+
+			 if( ! isset( $comment->comment_content ) ){
+				 return false;
+			 }
+
+			 return maybe_unserialize( base64_decode( $comment->comment_content ) );
+		 }
+
+		 return $users_answers[ $question_id ];
+
+	 }// end get_user_question_answer
+
+	 /**
+	  * Saving the users quiz question grades
+	  *
+	  * This function save all the grades for all the question in a given quiz on the lesson
+	  * comment meta. It makes use of transients to save the grades for easier access at a later stage
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param array $quiz_grades{
+	  *      @type int $question_id
+	  *      @type int $question_grade
+	  * }
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return bool
+	  */
+	 public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 // make sure the parameters are valid before continuing
+		 if( empty( $lesson_id ) || empty( $user_id )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 ||!get_userdata( $user_id )
+			 || !is_array( $quiz_grades ) ){
+
+			 return false;
+
+		 }
+
+		 $success = false;
+
+		 // save that data for the user on the lesson comment meta
+		 $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
+
+		 // were the grades save successfully ?
+		 if( intval( $comment_meta_id ) > 0 ) {
+
+			 $success = true;
+			 // save transient
+			 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+			 set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
+		 }
+
+		 return $success;
+
+	 }// end set_user_grades
+
+	 /**
+	  * Retrieve the users quiz question grades
+	  *
+	  * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param $lesson_id
+	  * @param $user_id (Optional) will use the current user if not supplied
+	  *
+	  * @return array $user_quiz_grades or false if none exists for this users
+	  */
+	 public function get_user_grades( $lesson_id, $user_id = 0 ){
+
+		 $user_grades = array();
+
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
+
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // save some time and get the transient cached data
+		 $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
+		 $user_grades = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $user_grades  ) || false != $user_grades ){
+
+			 $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
+
+		 } // end if transient check
+
+		 // if there is no data for this user
+		 if( ! is_array( $user_grades ) ){
+			 return false;
+		 }
+
+		 return $user_grades;
+
+	 }// end  get_user_grades
+
+	 /**
+	  * Get the user question grade
+	  *
+	  * This function gets the grade on a quiz for the given question parameter
+	  * It does NOT do any grading. It simply retrieves the data that was stored during grading.
+	  * this function allows for a fallback to users still using the question saved data from before 1.7.4
+	  *
+	  * @since 1.7.4
+	  *
+	  * @param int  $lesson_id
+	  * @param int $question_id
+	  * @param int  $user_id ( optional )
+	  *
+	  * @return bool $question_grade
+	  */
+	 public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
+
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
+
+			 return false;
+		 }
+
+		 $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
+
+		 if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
+
+			 //fallback to data pre 1.7.4
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 $fall_back_grade = false;
+			 if( isset( $question_activity->comment_ID ) ){
+				 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
+			 }
+
+			 return $fall_back_grade;
+
+		 } // end if $all_user_grades...
+
+		 return $all_user_grades[ $question_id ];
+
+	 }// end get_user_question_grade
+
+	 /**
+	  * Save the user's answers feedback
+	  *
+	  * For this function you must supply all three parameters. If will return false one is left out.
+	  * The data will be saved on the lesson ID supplied.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false or int $feedback_saved
+	  */
+	public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
+
+		// make sure the parameters are valid before continuing
+		if( empty( $lesson_id ) || empty( $user_id )
+			|| 'lesson' != get_post_type( $lesson_id )
+			||!get_userdata( $user_id )
+			|| !is_array( $answers_feedback ) ){
+
+			return false;
+
+		}
+
+
+		// check if the lesson is started before saving, if not start the lesson for the user
+		if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
+			Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
+		}
 
-         /**
-          * User quiz has been submitted
-          *
-          * Fires the end of the submit_answers_for_grading function. It will fire irrespective of the submission
-          * results.
-          *
-          * @param int $user_id
-          * @param int $quiz_id
-          * @param string $grade
-          * @param string $quiz_pass_percentage
-          * @param string $quiz_grade_type
-          */
-         do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type );
+		// encode the feedback
+		$encoded_answers_feedback =  array();
+		foreach( $answers_feedback as $question_id => $feedback ){
+			$encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
+		}
+
+		// save the user data
+		$feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
+
+		//Were the the question feedback save correctly?
+		if( intval( $feedback_saved ) > 0){
+
+			// save transient to make retrieval faster in future
+			 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+			 set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
 
-         return $answers_submitted;
+		}
+
+		return $feedback_saved;
+
+	} // end save_user_answers_feedback
+
+	 /**
+	  * Get the user's answers feedback.
+	  *
+	  * This function returns the feedback submitted by the teacher/admin
+	  * during grading. Grading occurs manually or automatically.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return false | array $answers_feedback{
+	  *  $type int $question_id
+	  *  $type string $question_feedback
+	  * }
+	  */
+	 public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
+
+		 $answers_feedback = array();
 
-     }// end submit_answers_for_grading
+		 // get the user_id if none was passed in use the current logged in user
+		 if( ! intval( $user_id ) > 0 ) {
+			 $user_id = get_current_user_id();
+		 }
 
-     /**
-      * Get the user question answer
-      *
-      * This function gets the the users saved answer on given quiz for the given question parameter
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $answers_submitted
-      */
-     public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){
+		 if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
+			 || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
+			 return false;
+		 }
+
+		 // first check the transient to save a few split seconds
+		 $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
+		 $encoded_feedback = get_transient( $transient_key );
+
+		 // get the data if nothing was stored in the transient
+		 if( empty( $encoded_feedback  ) || !$encoded_feedback ){
+
+			 $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
+
+			 //set the transient with the new valid data for faster retrieval in future
+			 set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
+
+		 } // end if transient check
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // if there is no data for this user
+		 if( ! is_array( $encoded_feedback ) ){
+			 return false;
+		 }
 
-             return false;
-         }
-
-         if( ! ( intval( $user_id ) > 0 )   ){
-             $user_id = get_current_user_id();
-         }
-
-         $users_answers = $this->get_user_answers( $lesson_id, $user_id );
-
-         if( !$users_answers || empty( $users_answers )
-         ||  ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){
-
-             //Fallback for pre 1.7.4 data
-             $comment =  Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true );
-
-             if( ! isset( $comment->comment_content ) ){
-                 return false;
-             }
-
-             return maybe_unserialize( base64_decode( $comment->comment_content ) );
-         }
-
-         return $users_answers[ $question_id ];
-
-     }// end get_user_question_answer
-
-     /**
-      * Saving the users quiz question grades
-      *
-      * This function save all the grades for all the question in a given quiz on the lesson
-      * comment meta. It makes use of transients to save the grades for easier access at a later stage
-      *
-      * @since 1.7.4
-      *
-      * @param array $quiz_grades{
-      *      @type int $question_id
-      *      @type int $question_grade
-      * }
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return bool
-      */
-     public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         // make sure the parameters are valid before continuing
-         if( empty( $lesson_id ) || empty( $user_id )
-             || 'lesson' != get_post_type( $lesson_id )
-             ||!get_userdata( $user_id )
-             || !is_array( $quiz_grades ) ){
-
-             return false;
-
-         }
-
-         $success = false;
-
-         // save that data for the user on the lesson comment meta
-         $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id   );
-
-         // were the grades save successfully ?
-         if( intval( $comment_meta_id ) > 0 ) {
-
-             $success = true;
-             // save transient
-             $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-             set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS );
-         }
-
-         return $success;
-
-     }// end set_user_grades
-
-     /**
-      * Retrieve the users quiz question grades
-      *
-      * This function gets all the grades for all the questions in the given lesson quiz for a specific user.
-      *
-      * @since 1.7.4
-      *
-      * @param $lesson_id
-      * @param $user_id (Optional) will use the current user if not supplied
-      *
-      * @return array $user_quiz_grades or false if none exists for this users
-      */
-     public function get_user_grades( $lesson_id, $user_id = 0 ){
-
-         $user_grades = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // save some time and get the transient cached data
-         $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id;
-         $user_grades = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $user_grades  ) || false != $user_grades ){
-
-             $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $user_grades, 10 * DAY_IN_SECONDS );
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $user_grades ) ){
-             return false;
-         }
-
-         return $user_grades;
-
-     }// end  get_user_grades
-
-     /**
-      * Get the user question grade
-      *
-      * This function gets the grade on a quiz for the given question parameter
-      * It does NOT do any grading. It simply retrieves the data that was stored during grading.
-      * this function allows for a fallback to users still using the question saved data from before 1.7.4
-      *
-      * @since 1.7.4
-      *
-      * @param int  $lesson_id
-      * @param int $question_id
-      * @param int  $user_id ( optional )
-      *
-      * @return bool $question_grade
-      */
-     public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){
-
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
-
-             return false;
-         }
-
-         $all_user_grades = self::get_user_grades( $lesson_id,$user_id );
-
-         if( ! $all_user_grades || ! isset(  $all_user_grades[ $question_id ] ) ){
-
-             //fallback to data pre 1.7.4
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
-             $fall_back_grade = false;
-             if( isset( $question_activity->comment_ID ) ){
-                 $fall_back_grade = get_comment_meta(  $question_activity->comment_ID , 'user_grade', true );
-             }
-
-             return $fall_back_grade;
-
-         } // end if $all_user_grades...
-
-         return $all_user_grades[ $question_id ];
-
-     }// end get_user_question_grade
-
-     /**
-      * Save the user's answers feedback
-      *
-      * For this function you must supply all three parameters. If will return false one is left out.
-      * The data will be saved on the lesson ID supplied.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false or int $feedback_saved
-      */
-    public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){
-
-        // make sure the parameters are valid before continuing
-        if( empty( $lesson_id ) || empty( $user_id )
-            || 'lesson' != get_post_type( $lesson_id )
-            ||!get_userdata( $user_id )
-            || !is_array( $answers_feedback ) ){
-
-            return false;
-
-        }
-
-
-        // check if the lesson is started before saving, if not start the lesson for the user
-        if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) {
-            Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id );
-        }
-
-        // encode the feedback
-        $encoded_answers_feedback =  array();
-        foreach( $answers_feedback as $question_id => $feedback ){
-            $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback );
-        }
-
-        // save the user data
-        $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ;
-
-        //Were the the question feedback save correctly?
-        if( intval( $feedback_saved ) > 0){
-
-            // save transient to make retrieval faster in future
-             $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-             set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS );
-
-        }
-
-        return $feedback_saved;
-
-    } // end save_user_answers_feedback
-
-     /**
-      * Get the user's answers feedback.
-      *
-      * This function returns the feedback submitted by the teacher/admin
-      * during grading. Grading occurs manually or automatically.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return false | array $answers_feedback{
-      *  $type int $question_id
-      *  $type string $question_feedback
-      * }
-      */
-     public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){
-
-         $answers_feedback = array();
-
-         // get the user_id if none was passed in use the current logged in user
-         if( ! intval( $user_id ) > 0 ) {
-             $user_id = get_current_user_id();
-         }
-
-         if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id )
-             || ! intval( $user_id )  > 0 || !get_userdata( $user_id )  ) {
-             return false;
-         }
-
-         // first check the transient to save a few split seconds
-         $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id;
-         $encoded_feedback = get_transient( $transient_key );
-
-         // get the data if nothing was stored in the transient
-         if( empty( $encoded_feedback  ) || !$encoded_feedback ){
-
-             $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id );
-
-             //set the transient with the new valid data for faster retrieval in future
-             set_transient( $transient_key,  $encoded_feedback, 10 * DAY_IN_SECONDS);
-
-         } // end if transient check
-
-         // if there is no data for this user
-         if( ! is_array( $encoded_feedback ) ){
-             return false;
-         }
-
-         foreach( $encoded_feedback as $question_id => $feedback ){
+		 foreach( $encoded_feedback as $question_id => $feedback ){
 
-             $answers_feedback[ $question_id ] = base64_decode( $feedback );
+			 $answers_feedback[ $question_id ] = base64_decode( $feedback );
 
-         }
+		 }
 
-         return $answers_feedback;
+		 return $answers_feedback;
 
-     } // end get_user_answers_feedback
+	 } // end get_user_answers_feedback
 
-     /**
-      * Get the user's answer feedback for a specific question.
-      *
-      * This function gives you a single answer note/feedback string
-      * for the user on the given question.
-      *
-      * @since 1.7.5
-      * @access public
-      *
-      * @param int $lesson_id
-      * @param int $question_id
-      * @param int $user_id
-      *
-      * @return string $feedback or bool if false
-      */
-     public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
+	 /**
+	  * Get the user's answer feedback for a specific question.
+	  *
+	  * This function gives you a single answer note/feedback string
+	  * for the user on the given question.
+	  *
+	  * @since 1.7.5
+	  * @access public
+	  *
+	  * @param int $lesson_id
+	  * @param int $question_id
+	  * @param int $user_id
+	  *
+	  * @return string $feedback or bool if false
+	  */
+	 public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){
 
-         $feedback = false;
+		 $feedback = false;
 
-         // parameter validation
-         if( empty( $lesson_id ) || empty( $question_id )
-             || ! ( intval( $lesson_id  ) > 0 )
-             || ! ( intval( $question_id  ) > 0 )
-             || 'lesson' != get_post_type( $lesson_id )
-             || 'question' != get_post_type( $question_id )) {
+		 // parameter validation
+		 if( empty( $lesson_id ) || empty( $question_id )
+			 || ! ( intval( $lesson_id  ) > 0 )
+			 || ! ( intval( $question_id  ) > 0 )
+			 || 'lesson' != get_post_type( $lesson_id )
+			 || 'question' != get_post_type( $question_id )) {
 
-             return false;
-         }
+			 return false;
+		 }
 
-         // get all the feedback for the user on the given lesson
-         $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
+		 // get all the feedback for the user on the given lesson
+		 $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id );
 
-         if( !$all_feedback || empty( $all_feedback )
-             || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
+		 if( !$all_feedback || empty( $all_feedback )
+			 || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){
 
-             //fallback to data pre 1.7.4
+			 //fallback to data pre 1.7.4
 
-             // setup the sensei data query
-             $args = array(
-                 'post_id' => $question_id,
-                 'user_id' => $user_id,
-                 'type'    => 'sensei_user_answer'
-             );
-             $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
+			 // setup the sensei data query
+			 $args = array(
+				 'post_id' => $question_id,
+				 'user_id' => $user_id,
+				 'type'    => 'sensei_user_answer'
+			 );
+			 $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true );
 
-             // set the default to false and return that if no old data is available.
-             if( isset( $question_activity->comment_ID ) ){
-                 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
-             }
+			 // set the default to false and return that if no old data is available.
+			 if( isset( $question_activity->comment_ID ) ){
+				 $feedback = base64_decode( get_comment_meta(  $question_activity->comment_ID , 'answer_note', true ) );
+			 }
 
-             // finally use the default question feedback
-             if( empty( $feedback ) ){
-                 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
-             }
+			 // finally use the default question feedback
+			 if( empty( $feedback ) ){
+				 $feedback = get_post_meta( $question_id, '_answer_feedback', true );
+			 }
 
-             return $feedback;
+			 return $feedback;
 
-         }
+		 }
 
-         return $all_feedback[ $question_id ];
+		 return $all_feedback[ $question_id ];
 
-     } // end get_user_question_feedback
+	 } // end get_user_question_feedback
 
-     /**
-      * Check if a quiz has no questions, and redirect back to lesson.
-      *
-      * Though a quiz is created for each lesson, it should not be visible
-      * unless it has questions.
-      *
-      * @since 1.9.0
-      * @access public
-      * @param none
-      * @return void
-      */
+	 /**
+	  * Check if a quiz has no questions, and redirect back to lesson.
+	  *
+	  * Though a quiz is created for each lesson, it should not be visible
+	  * unless it has questions.
+	  *
+	  * @since 1.9.0
+	  * @access public
+	  * @param none
+	  * @return void
+	  */
 
-     public function quiz_has_no_questions() {
+	 public function quiz_has_no_questions() {
 
-         if( ! is_singular( 'quiz' ) )  {
-             return;
-         }
+		 if( ! is_singular( 'quiz' ) )  {
+			 return;
+		 }
 
-         global $post;
+		 global $post;
 
-         $lesson_id = $this->get_lesson_id($post->ID);
+		 $lesson_id = $this->get_lesson_id($post->ID);
 
-         $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
+		 $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true );
 
-         $lesson = get_post($lesson_id);
+		 $lesson = get_post($lesson_id);
 
-         if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
+		 if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) {
 
-             wp_redirect(get_permalink($lesson->ID), 301);
-             exit;
+			 wp_redirect(get_permalink($lesson->ID), 301);
+			 exit;
 
-         }
+		 }
 
-     } // end quiz_has_no_questions
+	 } // end quiz_has_no_questions
 
 /**
-  * Deprecate the sensei_single_main_content on the single-quiz template.
-  *
-  * @deprecated since 1.9.0
-  */
+ * Deprecate the sensei_single_main_content on the single-quiz template.
+ *
+ * @deprecated since 1.9.0
+ */
  public static function deprecate_quiz_sensei_single_main_content_hook(){
 
-     sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
+	 sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after');
 
  }
-    /*
+	/*
      * Deprecate the sensei_quiz_single_title on the single-quiz template.
      *
      * @deprecated since 1.9.0
      */
-     public static function deprecate_quiz_sensei_quiz_single_title_hook(){
+	 public static function deprecate_quiz_sensei_quiz_single_title_hook(){
 
-         sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
+		 sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before ');
 
-     }
+	 }
 
-     /**
-      * Filter the single title and add the Quiz to it.
-      *
-      * @param string $title
-      * @param int $id title post id
-      * @return string $quiz_title
-      */
-     public static function single_quiz_title( $title, $post_id ){
+	 /**
+	  * Filter the single title and add the Quiz to it.
+	  *
+	  * @param string $title
+	  * @param int $id title post id
+	  * @return string $quiz_title
+	  */
+	 public static function single_quiz_title( $title, $post_id ){
 
-         if( 'quiz' == get_post_type( $post_id ) ){
+		 if( 'quiz' == get_post_type( $post_id ) ){
 
-             $title_with_no_quizzes = $title;
+			 $title_with_no_quizzes = $title;
 
-             // if the title has quiz, remove it: legacy titles have the word quiz stored.
-             if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
+			 // if the title has quiz, remove it: legacy titles have the word quiz stored.
+			 if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){
 
-                 // remove all possible appearances of quiz
-                 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
-                 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
-                 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
+				 // remove all possible appearances of quiz
+				 $title_with_no_quizzes = str_replace( 'quiz', '', $title  );
+				 $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes  );
+				 $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes  );
 
-             }
+			 }
 
-             $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
-         }
+			 $title = $title_with_no_quizzes .  ' ' . __( 'Quiz', 'woothemes-sensei' );
+		 }
 
-         /**
-          * hook document in class-woothemes-sensei-message.php
-          */
-         return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
+		 /**
+		  * hook document in class-woothemes-sensei-message.php
+		  */
+		 return apply_filters( 'sensei_single_title', $title, get_post_type( ) );
 
-     }
+	 }
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function start_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function start_quiz_questions_loop(){
 
-         global $sensei_question_loop;
+		 global $sensei_question_loop;
 
-         //intialize the questions loop object
-         $sensei_question_loop['current'] = -1;
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
+		 //intialize the questions loop object
+		 $sensei_question_loop['current'] = -1;
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
 
 
-         $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
+		 $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() );
 
-         if( count( $questions  ) > 0  ){
+		 if( count( $questions  ) > 0  ){
 
-             $sensei_question_loop['total']   =  count( $questions );
-             $sensei_question_loop['questions'] = $questions;
-             $sensei_question_loop['quiz_id'] = get_the_ID();
+			 $sensei_question_loop['total']   =  count( $questions );
+			 $sensei_question_loop['questions'] = $questions;
+			 $sensei_question_loop['quiz_id'] = get_the_ID();
 
-         }
+		 }
 
-     }// static function
+	 }// static function
 
-     /**
-      * Initialize the quiz question loop on the single quiz template
-      *
-      * The function will create a global quiz loop varialbe.
-      *
-      * @since 1.9.0
-      *
-      */
-     public static function stop_quiz_questions_loop(){
+	 /**
+	  * Initialize the quiz question loop on the single quiz template
+	  *
+	  * The function will create a global quiz loop varialbe.
+	  *
+	  * @since 1.9.0
+	  *
+	  */
+	 public static function stop_quiz_questions_loop(){
 
-         $sensei_question_loop['total']   =  0;
-         $sensei_question_loop['questions'] = array();
-         $sensei_question_loop['quiz_id'] = '';
+		 $sensei_question_loop['total']   =  0;
+		 $sensei_question_loop['questions'] = array();
+		 $sensei_question_loop['quiz_id'] = '';
 
-     }
+	 }
 
-     /**
-      * Output the title for the single quiz page
-      *
-      * @since 1.9.0
-      */
-     public static function the_title(){
-         ?>
+	 /**
+	  * Output the title for the single quiz page
+	  *
+	  * @since 1.9.0
+	  */
+	 public static function the_title(){
+		 ?>
          <header>
 
              <h1>
 
                  <?php
-                 /**
-                  * Filter documented in class-sensei-messages.php the_title
-                  */
-                 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
-                 ?>
+				 /**
+				  * Filter documented in class-sensei-messages.php the_title
+				  */
+				 echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) );
+				 ?>
 
              </h1>
 
          </header>
 
          <?php
-     }//the_title
+	 }//the_title
 
-     /**
-      * Output the sensei quiz status message.
-      *
-      * @param $quiz_id
-      */
-    public static function  the_user_status_message( $quiz_id ){
+	 /**
+	  * Output the sensei quiz status message.
+	  *
+	  * @param $quiz_id
+	  */
+	public static function  the_user_status_message( $quiz_id ){
 
-        $lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
-        $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
-        echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+		$lesson_id =  Sensei()->quiz->get_lesson_id( $quiz_id );
+		$status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() );
+		echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>';
 
-    }
+	}
 
-     /**
-      * This functions runs the old sensei_quiz_action_buttons action
-      * for backwards compatiblity sake.
-      *
-      * @since 1.9.0
-      * @deprecated
-      */
-     public static function deprecate_sensei_quiz_action_buttons_hook(){
+	 /**
+	  * This functions runs the old sensei_quiz_action_buttons action
+	  * for backwards compatiblity sake.
+	  *
+	  * @since 1.9.0
+	  * @deprecated
+	  */
+	 public static function deprecate_sensei_quiz_action_buttons_hook(){
 
-         sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
+		 sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after');
 
-     }
+	 }
 
-     /**
-      * The quiz action buttons needed to ouput quiz
-      * action such as reset complete and save.
-      *
-      * @since 1.3.0
-      */
-     public static function action_buttons() {
+	 /**
+	  * The quiz action buttons needed to ouput quiz
+	  * action such as reset complete and save.
+	  *
+	  * @since 1.3.0
+	  */
+	 public static function action_buttons() {
 
-         global $post, $current_user;
+		 global $post, $current_user;
 
-         $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
-         $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
-         $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
-         $show_actions = true;
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
+		 $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true );
+		 $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true );
+		 $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
+		 $show_actions = true;
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID );
 
-         //setup quiz grade
-         $user_quiz_grade = '';
-         if( ! empty( $user_lesson_status  ) ){
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
+		 //setup quiz grade
+		 $user_quiz_grade = '';
+		 if( ! empty( $user_lesson_status  ) ){
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
 
 
-         if( intval( $lesson_prerequisite ) > 0 ) {
+		 if( intval( $lesson_prerequisite ) > 0 ) {
 
-             // If the user hasn't completed the prereq then hide the current actions
-             $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
+			 // If the user hasn't completed the prereq then hide the current actions
+			 $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID );
 
-         }
-         if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
+		 }
+		 if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) {
 
-             // Get Reset Settings
-             $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
+			 // Get Reset Settings
+			 $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?>
 
              <!-- Action Nonce's -->
              <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce"
@@ -1273,55 +1273,55 @@ 
 
          <?php }
 
-     } // End sensei_quiz_action_buttons()
-
-     /**
-      * Fetch the quiz grade
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @param int $user_id
-      *
-      * @return double $user_quiz_grade
-      */
-     public static function get_user_quiz_grade( $lesson_id, $user_id ){
-
-         // get the quiz grade
-         $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
-         $user_quiz_grade = 0;
-         if( isset( $user_lesson_status->comment_ID ) ) {
-             $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
-         }
-
-         return (double) $user_quiz_grade;
-
-     }
-
-     /**
-      * Check the quiz reset property for a given lesson's quiz.
-      *
-      * The data is stored on the quiz but going forward the quiz post
-      * type will be retired, hence the lesson_id is a require parameter.
-      *
-      * @since 1.9.0
-      *
-      * @param int $lesson_id
-      * @return bool
-      */
-     public static function is_reset_allowed( $lesson_id ){
-
-         $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
-
-         $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
-         //backwards compatibility
-         if( 'on' == $reset_allowed ) {
-             $reset_allowed = 1;
-         }
-
-         return (bool) $reset_allowed;
-
-     }
+	 } // End sensei_quiz_action_buttons()
+
+	 /**
+	  * Fetch the quiz grade
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @param int $user_id
+	  *
+	  * @return double $user_quiz_grade
+	  */
+	 public static function get_user_quiz_grade( $lesson_id, $user_id ){
+
+		 // get the quiz grade
+		 $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id );
+		 $user_quiz_grade = 0;
+		 if( isset( $user_lesson_status->comment_ID ) ) {
+			 $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true );
+		 }
+
+		 return (double) $user_quiz_grade;
+
+	 }
+
+	 /**
+	  * Check the quiz reset property for a given lesson's quiz.
+	  *
+	  * The data is stored on the quiz but going forward the quiz post
+	  * type will be retired, hence the lesson_id is a require parameter.
+	  *
+	  * @since 1.9.0
+	  *
+	  * @param int $lesson_id
+	  * @return bool
+	  */
+	 public static function is_reset_allowed( $lesson_id ){
+
+		 $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id );
+
+		 $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true );
+		 //backwards compatibility
+		 if( 'on' == $reset_allowed ) {
+			 $reset_allowed = 1;
+		 }
+
+		 return (bool) $reset_allowed;
+
+	 }
 
  } // End Class WooThemes_Sensei_Quiz
 

Spacing +286 added lines, -286 removed lines

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

includes/sensei-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
  *
  * @since 1.9.0
  *
- * @param $hook_tag
- * @param $version
+ * @param string $hook_tag
+ * @param string $version
  * @param $alternative
  * @param array $args
  */

Braces +4 added lines, -1 removed lines

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

Indentation +56 added lines, -56 removed lines

@@ -45,16 +45,16 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
-
-    /**
-     * Filter sensei_all_access function result
-     * which determinse if the current user
-     * can access all of Sensei without restrictions
-     *
-     * @since 1.4.0
-     * @param bool $access
-     */
+	$access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+
+	/**
+	 * Filter sensei_all_access function result
+	 * which determinse if the current user
+	 * can access all of Sensei without restrictions
+	 *
+	 * @since 1.4.0
+	 * @param bool $access
+	 */
 	return apply_filters( 'sensei_all_access', $access );
 
 } // End sensei_all_access()
@@ -72,7 +72,7 @@ 
 	 */
 	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
 
-	    $hex = str_replace( '#', '', $color );
+		$hex = str_replace( '#', '', $color );
 
 		$c_r = hexdec( substr( $hex, 0, 2 ) );
 		$c_g = hexdec( substr( $hex, 2, 2 ) );
@@ -119,15 +119,15 @@ 
 		$color = '#';
 
 		foreach ($base as $k => $v) :
-	        $amount = $v / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v - $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+			$amount = $v / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v - $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 		endforeach;
 
 		return $color;
@@ -148,17 +148,17 @@ 
 		$base = sensei_rgb_from_hex( $color );
 		$color = '#';
 
-	    foreach ($base as $k => $v) :
-	        $amount = 255 - $v;
-	        $amount = $amount / 100;
-	        $amount = round($amount * $factor);
-	        $new_decimal = $v + $amount;
-
-	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
-	        	$new_hex_component = "0".$new_hex_component;
-	        endif;
-	        $color .= $new_hex_component;
+		foreach ($base as $k => $v) :
+			$amount = 255 - $v;
+			$amount = $amount / 100;
+			$amount = round($amount * $factor);
+			$new_decimal = $v + $amount;
+
+			$new_hex_component = dechex($new_decimal);
+			if(strlen($new_hex_component) < 2) :
+				$new_hex_component = "0".$new_hex_component;
+			endif;
+			$color .= $new_hex_component;
 	   	endforeach;
 
 	   	return $color;
@@ -172,14 +172,14 @@ 
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
 if ( ! function_exists( 'is_woocommerce_active' ) ) {
-    function is_woocommerce_active() {
-        // calling is present instead of is active here
-        // as this function can override other is_woocommerce_active
-        // function in other woo plugins and Sensei_WC::is_woocommerce_active
-        // also check the sensei settings for enable WooCommerce support, which
-        // other plugins should not check against.
-        return Sensei_WC::is_woocommerce_present();
-    }
+	function is_woocommerce_active() {
+		// calling is present instead of is active here
+		// as this function can override other is_woocommerce_active
+		// function in other woo plugins and Sensei_WC::is_woocommerce_active
+		// also check the sensei settings for enable WooCommerce support, which
+		// other plugins should not check against.
+		return Sensei_WC::is_woocommerce_present();
+	}
 }
 
 /**
@@ -195,20 +195,20 @@ 
  */
 function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
 
-    if( has_action( $hook_tag ) ){
+	if( has_action( $hook_tag ) ){
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+		$error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
 
-        if( !empty( $alternative ) ){
+		if( !empty( $alternative ) ){
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+			$error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
 
-        }
+		}
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+		trigger_error( $error_message );
+		do_action( $hook_tag , $args );
 
-    }
+	}
 
 }// end sensei_do_deprecated_action
 
@@ -238,18 +238,18 @@ 
  */
 function sensei_user_login_url(){
 
-    $my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
-    $page = get_post( $my_courses_page_id );
+	$my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
+	$page = get_post( $my_courses_page_id );
 
-    if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
+	if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
 
-        return get_permalink( $page->ID );
+		return get_permalink( $page->ID );
 
-    } else {
+	} else {
 
-        return wp_login_url();
+		return wp_login_url();
 
-    }
+	}
 
 }// end sensei_user_login_link
 
@@ -262,8 +262,8 @@ 
  */
 function sensei_is_login_required(){
 
-    $login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
+	$login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
 
-    return $login_required;
+	return $login_required;
 
 }
\ No newline at end of file

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 
 /**
  * Global Sensei functions
@@ -11,21 +11,21 @@ 
 
 	$is_sensei = false;
 
-	$post_types = array( 'lesson', 'course', 'quiz', 'question' );
-	$taxonomies = array( 'course-category', 'quiz-type', 'question-type', 'lesson-tag' );
+	$post_types = array('lesson', 'course', 'quiz', 'question');
+	$taxonomies = array('course-category', 'quiz-type', 'question-type', 'lesson-tag');
 
-	if( is_post_type_archive( $post_types ) || is_singular( $post_types ) || is_tax( $taxonomies ) ) {
+	if (is_post_type_archive($post_types) || is_singular($post_types) || is_tax($taxonomies)) {
 
 		$is_sensei = true;
 
 	}
 
-	if( is_object( $post ) && ! is_wp_error( $post ) ) {
+	if (is_object($post) && ! is_wp_error($post)) {
 
-		$course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] );
-		$my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] );
+		$course_page_id = intval(Sensei()->settings->settings['course_page']);
+		$my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']);
 
-		if( in_array( $post->ID, array( $course_page_id, $my_courses_page_id ) ) ) {
+		if (in_array($post->ID, array($course_page_id, $my_courses_page_id))) {
 
 			$is_sensei = true;
 
@@ -33,7 +33,7 @@ 
 
 	}
 
-	return apply_filters( 'is_sensei', $is_sensei, $post );
+	return apply_filters('is_sensei', $is_sensei, $post);
 }
 
 /**
@@ -45,7 +45,7 @@ 
  */
 function sensei_all_access() {
 
-    $access = current_user_can( 'manage_sensei' ) || current_user_can( 'manage_sensei_grades' );
+    $access = current_user_can('manage_sensei') || current_user_can('manage_sensei_grades');
 
     /**
      * Filter sensei_all_access function result
@@ -55,11 +55,11 @@ 
      * @since 1.4.0
      * @param bool $access
      */
-	return apply_filters( 'sensei_all_access', $access );
+	return apply_filters('sensei_all_access', $access);
 
 } // End sensei_all_access()
 
-if ( ! function_exists( 'sensei_light_or_dark' ) ) {
+if ( ! function_exists('sensei_light_or_dark')) {
 
 	/**
 	 * Detect if we should use a light or dark colour on a background colour
@@ -70,20 +70,20 @@ 
 	 * @param string $light (default: '#FFFFFF')
 	 * @return string
 	 */
-	function sensei_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
+	function sensei_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
 
-	    $hex = str_replace( '#', '', $color );
+	    $hex = str_replace('#', '', $color);
 
-		$c_r = hexdec( substr( $hex, 0, 2 ) );
-		$c_g = hexdec( substr( $hex, 2, 2 ) );
-		$c_b = hexdec( substr( $hex, 4, 2 ) );
-		$brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+		$c_r = hexdec(substr($hex, 0, 2));
+		$c_g = hexdec(substr($hex, 2, 2));
+		$c_b = hexdec(substr($hex, 4, 2));
+		$brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
 		return $brightness > 155 ? $dark : $light;
 	}
 }
 
-if ( ! function_exists( 'sensei_rgb_from_hex' ) ) {
+if ( ! function_exists('sensei_rgb_from_hex')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -92,19 +92,19 @@ 
 	 * @param mixed $color
 	 * @return string
 	 */
-	function sensei_rgb_from_hex( $color ) {
-		$color = str_replace( '#', '', $color );
+	function sensei_rgb_from_hex($color) {
+		$color = str_replace('#', '', $color);
 		// Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-		$color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+		$color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
-		$rgb['R'] = hexdec( $color{0}.$color{1} );
-		$rgb['G'] = hexdec( $color{2}.$color{3} );
-		$rgb['B'] = hexdec( $color{4}.$color{5} );
+		$rgb['R'] = hexdec($color{0}.$color{1} );
+		$rgb['G'] = hexdec($color{2}.$color{3} );
+		$rgb['B'] = hexdec($color{4}.$color{5} );
 		return $rgb;
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_darker' ) ) {
+if ( ! function_exists('sensei_hex_darker')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -114,8 +114,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_darker( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_darker($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 		foreach ($base as $k => $v) :
@@ -124,7 +124,7 @@ 
 	        $new_decimal = $v - $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -134,7 +134,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'sensei_hex_lighter' ) ) {
+if ( ! function_exists('sensei_hex_lighter')) {
 
 	/**
 	 * Hex darker/lighter/contrast functions for colours
@@ -144,8 +144,8 @@ 
 	 * @param int $factor (default: 30)
 	 * @return string
 	 */
-	function sensei_hex_lighter( $color, $factor = 30 ) {
-		$base = sensei_rgb_from_hex( $color );
+	function sensei_hex_lighter($color, $factor = 30) {
+		$base = sensei_rgb_from_hex($color);
 		$color = '#';
 
 	    foreach ($base as $k => $v) :
@@ -155,7 +155,7 @@ 
 	        $new_decimal = $v + $amount;
 
 	        $new_hex_component = dechex($new_decimal);
-	        if(strlen($new_hex_component) < 2) :
+	        if (strlen($new_hex_component) < 2) :
 	        	$new_hex_component = "0".$new_hex_component;
 	        endif;
 	        $color .= $new_hex_component;
@@ -171,7 +171,7 @@ 
  * @since 1.9.0
  * @deprecated since 1.9.0 use  Sensei_WC::is_woocommerce_active()
  */
-if ( ! function_exists( 'is_woocommerce_active' ) ) {
+if ( ! function_exists('is_woocommerce_active')) {
     function is_woocommerce_active() {
         // calling is present instead of is active here
         // as this function can override other is_woocommerce_active
@@ -193,20 +193,20 @@ 
  * @param $alternative
  * @param array $args
  */
-function sensei_do_deprecated_action( $hook_tag, $version, $alternative="" , $args = array()  ){
+function sensei_do_deprecated_action($hook_tag, $version, $alternative = "", $args = array()) {
 
-    if( has_action( $hook_tag ) ){
+    if (has_action($hook_tag)) {
 
-        $error_message = sprintf( __( "SENSEI: The hook '%s', has been deprecated since '%s'." , 'woothemes-sensei'), $hook_tag ,$version );
+        $error_message = sprintf(__("SENSEI: The hook '%s', has been deprecated since '%s'.", 'woothemes-sensei'), $hook_tag, $version);
 
-        if( !empty( $alternative ) ){
+        if ( ! empty($alternative)) {
 
-            $error_message .= sprintf( __("Please use '%s' instead.", 'woothemes-sensei'), $alternative ) ;
+            $error_message .= sprintf(__("Please use '%s' instead.", 'woothemes-sensei'), $alternative);
 
         }
 
-        trigger_error( $error_message );
-        do_action( $hook_tag , $args );
+        trigger_error($error_message);
+        do_action($hook_tag, $args);
 
     }
 
@@ -221,9 +221,9 @@ 
  * @param $post_id
  * @return bool
  */
-function sensei_is_a_course( $post ){
+function sensei_is_a_course($post) {
 
-	return "course" == get_post_type( $post );
+	return "course" == get_post_type($post);
 
 }
 
@@ -236,14 +236,14 @@ 
  *
  * @since 1.9.0
  */
-function sensei_user_login_url(){
+function sensei_user_login_url() {
 
-    $my_courses_page_id = intval( Sensei()->settings->get( 'my_course_page' ) );
-    $page = get_post( $my_courses_page_id );
+    $my_courses_page_id = intval(Sensei()->settings->get('my_course_page'));
+    $page = get_post($my_courses_page_id);
 
-    if ( $my_courses_page_id && isset( $page->ID ) && 'page' == get_post_type( $page->ID )  ){
+    if ($my_courses_page_id && isset($page->ID) && 'page' == get_post_type($page->ID)) {
 
-        return get_permalink( $page->ID );
+        return get_permalink($page->ID);
 
     } else {
 
@@ -260,9 +260,9 @@ 
  * @since 1.9.0
  * @return bool
  */
-function sensei_is_login_required(){
+function sensei_is_login_required() {
 
-    $login_required = isset( Sensei()->settings->settings['access_permission'] ) && ( true == Sensei()->settings->settings['access_permission'] );
+    $login_required = isset(Sensei()->settings->settings['access_permission']) && (true == Sensei()->settings->settings['access_permission']);
 
     return $login_required;
 

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

Doc Comments +2 added lines, -2 removed lines

@@ -103,8 +103,8 @@
      *
      * @since 1.9.0
      *
-     * @param $title
-     * @param $shortcode_specific_override
+     * @param string $title
+     * @param string $shortcode_specific_override
      * @return string
      */
     public static function generate_shortcode_courses( $title , $shortcode_specific_override  ){

Braces +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
             Sensei_Templates::get_template( 'user/my-courses.php' );
 
-        }else{
+        } else{
 
             Sensei()->frontend->sensei_login_form();
 

Indentation +249 added lines, -249 removed lines

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

Spacing +79 added lines, -79 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
      *
      * @since 1.9.0
      *
-     * @param array $category_ids
+     * @param array $categories
      * @return array
      */
     public function generate_term_ids( $categories = array() ){

Indentation +92 added lines, -92 removed lines

@@ -24,135 +24,135 @@
  */
 class Sensei_Shortcode_Course_Categories implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var array list of taxonomy terms.
-     */
-    protected $sensei_course_taxonomy_terms;
+	/**
+	 * @var array list of taxonomy terms.
+	 */
+	protected $sensei_course_taxonomy_terms;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
-        $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
-        $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
+		$this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
+		$this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
 
-        $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
-        $this->include = $this->generate_term_ids( $include );
+		$include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
+		$this->include = $this->generate_term_ids( $include );
 
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
-        $this->exclude = $this->generate_term_ids( $exclude );
+		$exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
+		$this->exclude = $this->generate_term_ids( $exclude );
 
-        // make sure we handle string true/false values correctly with respective defaults
-        $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
-        $this->hide_empty = 'true' == $hide_empty ? true: false;
+		// make sure we handle string true/false values correctly with respective defaults
+		$hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
+		$this->hide_empty = 'true' == $hide_empty ? true: false;
 
-        $this->setup_course_categories();
+		$this->setup_course_categories();
 
-    }
+	}
 
-    /**
-     * create the messages query .
-     *
-     * @return mixed
-     */
-    public function setup_course_categories(){
+	/**
+	 * create the messages query .
+	 *
+	 * @return mixed
+	 */
+	public function setup_course_categories(){
 
-        $args = array(
-            'orderby'       => $this->orderby,
-            'order'         => $this->order,
-            'exclude'       => $this->exclude,
-            'include'       => $this->include,
-            'number'        => $this->number,
-            'parent'        => $this->parent,
-            'hide_empty'    => $this->hide_empty,
-            'fields'        => 'all',
-        );
+		$args = array(
+			'orderby'       => $this->orderby,
+			'order'         => $this->order,
+			'exclude'       => $this->exclude,
+			'include'       => $this->include,
+			'number'        => $this->number,
+			'parent'        => $this->parent,
+			'hide_empty'    => $this->hide_empty,
+			'fields'        => 'all',
+		);
 
-        $this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
+		$this->sensei_course_taxonomy_terms = get_terms('course-category', $args);
 
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        if( empty(  $this->sensei_course_taxonomy_terms  ) ){
+		if( empty(  $this->sensei_course_taxonomy_terms  ) ){
 
-            return __( 'No course categories found.', 'woothemes-sensei' );
+			return __( 'No course categories found.', 'woothemes-sensei' );
 
-        }
+		}
 
-        $terms_html = '';
+		$terms_html = '';
 
-        //set the wp_query to the current messages query
-        $terms_html .= '<ul class="sensei course-categories">';
-        foreach( $this->sensei_course_taxonomy_terms as $category ){
+		//set the wp_query to the current messages query
+		$terms_html .= '<ul class="sensei course-categories">';
+		foreach( $this->sensei_course_taxonomy_terms as $category ){
 
-            $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
-            $terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
+			$category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
+			$terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
 
-        }
-        $terms_html .= '<ul>';
+		}
+		$terms_html .= '<ul>';
 
-        return $terms_html;
+		return $terms_html;
 
-    }// end render
+	}// end render
 
-    /**
-     * Convert an array of mixed ids, slugs or names to only the id's of those terms
-     *
-     * @since 1.9.0
-     *
-     * @param array $category_ids
-     * @return array
-     */
-    public function generate_term_ids( $categories = array() ){
+	/**
+	 * Convert an array of mixed ids, slugs or names to only the id's of those terms
+	 *
+	 * @since 1.9.0
+	 *
+	 * @param array $category_ids
+	 * @return array
+	 */
+	public function generate_term_ids( $categories = array() ){
 
-        $cat_ids = array();
+		$cat_ids = array();
 
-        if ( is_array($categories) ) {
-            foreach ($categories as $cat) {
+		if ( is_array($categories) ) {
+			foreach ($categories as $cat) {
 
-                if (!is_numeric($cat)) {
+				if (!is_numeric($cat)) {
 
-                    // try the slug
-                    $term = get_term_by('slug', $cat, 'course-category');
+					// try the slug
+					$term = get_term_by('slug', $cat, 'course-category');
 
-                    // if the slug didn't work try the name
-                    if (!$term) {
+					// if the slug didn't work try the name
+					if (!$term) {
 
-                        $term = get_term_by('name', $cat, 'course-category');
+						$term = get_term_by('name', $cat, 'course-category');
 
-                    }
+					}
 
-                    if ($term) {
-                        $cat_ids[] = $term->term_id;
-                    }
+					if ($term) {
+						$cat_ids[] = $term->term_id;
+					}
 
-                } else {
+				} else {
 
-                    $cat_ids[] = $cat;
+					$cat_ids[] = $cat;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        return $cat_ids;
+		return $cat_ids;
 
-    }// end generate_term_ids
+	}// end generate_term_ids
 
 }// end class
 

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
 /**
  *
  * Renders the [sensei_course_categories] shortcode. Show the list or course categories as links to their archive
@@ -37,22 +37,22 @@ 
      * @param string $content
      * @param string $shortcode the shortcode that was called for this instance
      */
-    public function __construct( $attributes, $content, $shortcode ){
+    public function __construct($attributes, $content, $shortcode) {
 
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name';
-        $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC';
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100';
-        $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : '';
+        $this->orderby = isset($attributes['orderby']) ? $attributes['orderby'] : 'name';
+        $this->order = isset($attributes['order']) ? $attributes['order'] : 'ASC';
+        $this->number = isset($attributes['number']) ? $attributes['number'] : '100';
+        $this->parent = isset($attributes['parent']) ? $attributes['parent'] : '';
 
-        $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : '';
-        $this->include = $this->generate_term_ids( $include );
+        $include = isset($attributes['include']) ? explode(',', $attributes['include']) : '';
+        $this->include = $this->generate_term_ids($include);
 
-        $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : '';
-        $this->exclude = $this->generate_term_ids( $exclude );
+        $exclude = isset($attributes['exclude']) ? explode(',', $attributes['exclude']) : '';
+        $this->exclude = $this->generate_term_ids($exclude);
 
         // make sure we handle string true/false values correctly with respective defaults
-        $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false';
-        $this->hide_empty = 'true' == $hide_empty ? true: false;
+        $hide_empty = isset($attributes['hide_empty']) ? $attributes['hide_empty'] : 'false';
+        $this->hide_empty = 'true' == $hide_empty ? true : false;
 
         $this->setup_course_categories();
 
@@ -63,7 +63,7 @@ 
      *
      * @return mixed
      */
-    public function setup_course_categories(){
+    public function setup_course_categories() {
 
         $args = array(
             'orderby'       => $this->orderby,
@@ -85,11 +85,11 @@ 
      *
      * @return string $content
      */
-    public function render(){
+    public function render() {
 
-        if( empty(  $this->sensei_course_taxonomy_terms  ) ){
+        if (empty($this->sensei_course_taxonomy_terms)) {
 
-            return __( 'No course categories found.', 'woothemes-sensei' );
+            return __('No course categories found.', 'woothemes-sensei');
 
         }
 
@@ -97,10 +97,10 @@ 
 
         //set the wp_query to the current messages query
         $terms_html .= '<ul class="sensei course-categories">';
-        foreach( $this->sensei_course_taxonomy_terms as $category ){
+        foreach ($this->sensei_course_taxonomy_terms as $category) {
 
-            $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name  . '</a>';
-            $terms_html .=  '<li class="sensei course-category" >' . $category_link . '</li>';
+            $category_link = '<a href="'.get_term_link($category).'">'.$category->name.'</a>';
+            $terms_html .= '<li class="sensei course-category" >'.$category_link.'</li>';
 
         }
         $terms_html .= '<ul>';
@@ -117,20 +117,20 @@ 
      * @param array $category_ids
      * @return array
      */
-    public function generate_term_ids( $categories = array() ){
+    public function generate_term_ids($categories = array()) {
 
         $cat_ids = array();
 
-        if ( is_array($categories) ) {
+        if (is_array($categories)) {
             foreach ($categories as $cat) {
 
-                if (!is_numeric($cat)) {
+                if ( ! is_numeric($cat)) {
 
                     // try the slug
                     $term = get_term_by('slug', $cat, 'course-category');
 
                     // if the slug didn't work try the name
-                    if (!$term) {
+                    if ( ! $term) {
 
                         $term = get_term_by('name', $cat, 'course-category');
 

Braces +4 added lines, -1 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
      *
      * @param array $classes
      * @param WP_Post $course
-     * @return array $classes
+     * @return string[] $classes
      */
     public function course_status_class_tagging($classes, $course){
 

Braces +8 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
 /**
  * This class is loaded int WP by the shortcode loader class.
  *
@@ -75,7 +78,7 @@ 
 
             $this->order =  'ASC';
 
-        }else{
+        } else{
 
             // for everything else use the value passed or the default DESC
             $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
@@ -121,11 +124,11 @@ 
             $included_courses =  $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+        } elseif( 'active'==$this->status ){
 
             $included_courses =  $active_ids;
 
-        }else{ // all courses
+        } else{ // all courses
 
             if( empty( $completed_ids ) ){
 
@@ -142,7 +145,7 @@ 
 
                 $included_courses = array('-1000'); // don't show any courses
 
-            }else{
+            } else{
                 $included_courses = Sensei_Utils::array_zip_merge( $active_ids, $completed_ids );
             }
 

Spacing +61 added lines, -61 removed lines

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

Indentation +235 added lines, -235 removed lines

@@ -25,167 +25,167 @@ 
  */
 class Sensei_Shortcode_User_Courses implements Sensei_Shortcode_Interface {
 
-    /**
-     * @var WP_Query to help setup the query needed by the render method.
-     */
-    protected $query;
+	/**
+	 * @var WP_Query to help setup the query needed by the render method.
+	 */
+	protected $query;
 
-    /**
-     * @var string number of items to show on the current page
-     * Default: -1.
-     */
-    protected $number;
+	/**
+	 * @var string number of items to show on the current page
+	 * Default: -1.
+	 */
+	protected $number;
 
-    /**
-     * @var string ordery by course field
-     * Default: date
-     */
-    protected $orderby;
+	/**
+	 * @var string ordery by course field
+	 * Default: date
+	 */
+	protected $orderby;
 
-    /**
-     * @var string ASC or DESC
-     * Default: 'DESC'
-     */
-    protected  $order;
+	/**
+	 * @var string ASC or DESC
+	 * Default: 'DESC'
+	 */
+	protected  $order;
 
-    /**
-     * @var status can be completed or active. If none is specified all will be shown
-     */
-    protected $status;
+	/**
+	 * @var status can be completed or active. If none is specified all will be shown
+	 */
+	protected $status;
 
-    /**
-     * Setup the shortcode object
-     *
-     * @since 1.9.0
-     * @param array $attributes
-     * @param string $content
-     * @param string $shortcode the shortcode that was called for this instance
-     */
-    public function __construct( $attributes, $content, $shortcode ){
+	/**
+	 * Setup the shortcode object
+	 *
+	 * @since 1.9.0
+	 * @param array $attributes
+	 * @param string $content
+	 * @param string $shortcode the shortcode that was called for this instance
+	 */
+	public function __construct( $attributes, $content, $shortcode ){
 
-        if(!  is_user_logged_in() ) {
-            // show the login form
-            Sensei()->frontend->sensei_login_form();
-            return;
-        }
+		if(!  is_user_logged_in() ) {
+			// show the login form
+			Sensei()->frontend->sensei_login_form();
+			return;
+		}
 
-        // set up all argument need for constructing the course query
-        $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
-        $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
-        $this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
+		// set up all argument need for constructing the course query
+		$this->number = isset( $attributes['number'] ) ? $attributes['number'] : '10';
+		$this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'title';
+		$this->status = isset( $attributes['status'] ) ? $attributes['status'] : 'all';
 
-        // set the default for menu_order to be ASC
-        if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
+		// set the default for menu_order to be ASC
+		if( 'menu_order' == $this->orderby && !isset( $attributes['order']  ) ){
 
-            $this->order =  'ASC';
+			$this->order =  'ASC';
 
-        }else{
+		}else{
 
-            // for everything else use the value passed or the default DESC
-            $this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
+			// for everything else use the value passed or the default DESC
+			$this->order = isset( $attributes['order']  ) ? $attributes['order'] : 'ASC';
 
-        }
+		}
 
-        // setup the course query that will be used when rendering
-        $this->setup_course_query();
-    }
+		// setup the course query that will be used when rendering
+		$this->setup_course_query();
+	}
 
-    /**
-     * Sets up the object course query
-     * that will be used in the render method.
-     *
-     * @since 1.9.0
-     */
-    protected function setup_course_query(){
+	/**
+	 * Sets up the object course query
+	 * that will be used in the render method.
+	 *
+	 * @since 1.9.0
+	 */
+	protected function setup_course_query(){
 
-        $status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
-        $user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
-        if ( !is_array($user_courses_logs) ) {
+		$status_query = array( 'user_id' => get_current_user_id(), 'type' => 'sensei_course_status' );
+		$user_courses_logs = Sensei_Utils::sensei_check_for_activity( $status_query , true );
+		if ( !is_array($user_courses_logs) ) {
 
-            $user_courses_logs = array( $user_courses_logs );
+			$user_courses_logs = array( $user_courses_logs );
 
-        }
+		}
 
-        $completed_ids = $active_ids = array();
-        foreach( $user_courses_logs as $course_status ) {
+		$completed_ids = $active_ids = array();
+		foreach( $user_courses_logs as $course_status ) {
 
-            if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
+			if ( Sensei_Utils::user_completed_course( $course_status, get_current_user_id() ) ) {
 
-                $completed_ids[] = $course_status->comment_post_ID;
+				$completed_ids[] = $course_status->comment_post_ID;
 
-            } else {
+			} else {
 
-                $active_ids[] = $course_status->comment_post_ID;
+				$active_ids[] = $course_status->comment_post_ID;
 
-            }
-        }
+			}
+		}
 
-        if( 'completed' == $this->status ){
+		if( 'completed' == $this->status ){
 
-            $included_courses =  $completed_ids;
+			$included_courses =  $completed_ids;
 
 
-        }elseif( 'active'==$this->status ){
+		}elseif( 'active'==$this->status ){
 
-            $included_courses =  $active_ids;
+			$included_courses =  $active_ids;
 
-        }else{ // all courses
+		}else{ // all courses
 
-            if( empty( $completed_ids ) ){
+			if( empty( $completed_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
-            }
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'completed_no_course_message_output' ) );
+			}
 
-            if( empty( $active_ids ) ){
+			if( empty( $active_ids ) ){
 
-                add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
+				add_action( 'sensei_loop_course_inside_before', array( $this, 'active_no_course_message_output' ) );
 
-            }
+			}
 
-            if( empty( $completed_ids ) &&  empty( $active_ids )  ){
+			if( empty( $completed_ids ) &&  empty( $active_ids )  ){
 
-                $included_courses = array('-1000'); // don't show any courses
+				$included_courses = array('-1000'); // don't show any courses
 
-            }else{
-                $included_courses = Sensei_Utils::array_zip_merge( (array)$active_ids, (array)$completed_ids );
-            }
+			}else{
+				$included_courses = Sensei_Utils::array_zip_merge( (array)$active_ids, (array)$completed_ids );
+			}
+
+
+		}
+
+		// temporary work around to hide pagination on the courses page
+		// this is in place until we can load the course for each tab via ajax
+		// if the shortcode is not active or in active and the active and completed
+		// tabs show up.
+		$number_of_posts = $this->number;
+		if( 'active' != $this->status && 'complete' != $this->status  ){
+			$number_of_posts = 1000;
+		}
+
+		// course query parameters
+		$query_var_paged = get_query_var('paged');
+		$query_args = array(
+			'post_type'        => 'course',
+			'post_status'      => 'publish',
+			'orderby'          => $this->orderby,
+			'order'            => $this->order,
+			'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
+			'posts_per_page'   => $number_of_posts,
+			'post__in'         => $included_courses,
+		);
+
+		$this->query = new WP_Query( $query_args );
 
+	}// end setup _course_query
 
-        }
-
-        // temporary work around to hide pagination on the courses page
-        // this is in place until we can load the course for each tab via ajax
-        // if the shortcode is not active or in active and the active and completed
-        // tabs show up.
-        $number_of_posts = $this->number;
-        if( 'active' != $this->status && 'complete' != $this->status  ){
-            $number_of_posts = 1000;
-        }
-
-        // course query parameters
-        $query_var_paged = get_query_var('paged');
-        $query_args = array(
-            'post_type'        => 'course',
-            'post_status'      => 'publish',
-            'orderby'          => $this->orderby,
-            'order'            => $this->order,
-            'paged' => empty( $query_var_paged )? 1 : $query_var_paged,
-            'posts_per_page'   => $number_of_posts,
-            'post__in'         => $included_courses,
-        );
-
-        $this->query = new WP_Query( $query_args );
-
-    }// end setup _course_query
-
-    /**
-     * Output the message that tells the user they have
-     * no completed courses.
-     *
-     * @since 1.9.0
-     */
-    public function completed_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no completed courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function completed_no_course_message_output(){
+		?>
         <li class="user-completed">
             <div class="sensei-message info">
 
@@ -194,16 +194,16 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Output the message that tells the user they have
-     * no active courses.
-     *
-     * @since 1.9.0
-     */
-    public function active_no_course_message_output(){
-        ?>
+	/**
+	 * Output the message that tells the user they have
+	 * no active courses.
+	 *
+	 * @since 1.9.0
+	 */
+	public function active_no_course_message_output(){
+		?>
 
         <li class="user-active">
             <div class="sensei-message info">
@@ -219,141 +219,141 @@ 
             </div>
         </li>
         <?php
-    }
+	}
 
-    /**
-     * Rendering the shortcode this class is responsible for.
-     *
-     * @return string $content
-     */
-    public function render(){
+	/**
+	 * Rendering the shortcode this class is responsible for.
+	 *
+	 * @return string $content
+	 */
+	public function render(){
 
-        global $wp_query;
+		global $wp_query;
 
-        if(!  is_user_logged_in() ) {
-            return '';
-        }
+		if(!  is_user_logged_in() ) {
+			return '';
+		}
 
-        // keep a reference to old query
-        $current_global_query = $wp_query;
+		// keep a reference to old query
+		$current_global_query = $wp_query;
 
-        // assign the query setup in $this-> setup_course_query
-        $wp_query = $this->query;
+		// assign the query setup in $this-> setup_course_query
+		$wp_query = $this->query;
 
-        $this->attach_shortcode_hooks();
+		$this->attach_shortcode_hooks();
 
-        ob_start();
-        echo '<section id="sensei-user-courses">';
-        Sensei_Messages::the_my_messages_link();
-        Sensei_Templates::get_template('loop-course.php');
-        Sensei_Templates::get_template('globals/pagination.php');
-        echo '</section>';
+		ob_start();
+		echo '<section id="sensei-user-courses">';
+		Sensei_Messages::the_my_messages_link();
+		Sensei_Templates::get_template('loop-course.php');
+		Sensei_Templates::get_template('globals/pagination.php');
+		echo '</section>';
 
-        $shortcode_output =  ob_get_clean();
+		$shortcode_output =  ob_get_clean();
 
-        $this->detach_shortcode_hooks();
+		$this->detach_shortcode_hooks();
 
-        //restore old query
-        $wp_query = $current_global_query;
+		//restore old query
+		$wp_query = $current_global_query;
 
-        return $shortcode_output;
+		return $shortcode_output;
 
-    }// end render
+	}// end render
 
-    /**
-     * Add hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function attach_shortcode_hooks(){
+	/**
+	 * Add hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function attach_shortcode_hooks(){
 
-        // attach the toggle functionality
-        // don't show the toggle action if the user specified complete or active for this shortcode
-        if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
+		// attach the toggle functionality
+		// don't show the toggle action if the user specified complete or active for this shortcode
+		if( ! in_array( $this->status, array( 'active', 'complete' ) ) ){
 
-            add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-            add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
+			add_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+			add_action( 'wp_footer', array( $this, 'print_course_toggle_actions_inline_script' ), 90 );
 
-        }
+		}
 
-        // add extra classes to distinguish the course based on user completed or active
-        add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		// add extra classes to distinguish the course based on user completed or active
+		add_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
 
-        // attach progress meter below course
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		// attach progress meter below course
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		add_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
 
-    }
+	}
 
-    /**
-     * Remove hooks for the shortcode
-     *
-     * @since 1.9.0
-     */
-    public function detach_shortcode_hooks(){
+	/**
+	 * Remove hooks for the shortcode
+	 *
+	 * @since 1.9.0
+	 */
+	public function detach_shortcode_hooks(){
 
-        //remove all hooks after the output is generated
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
-        remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
-        remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
-        remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
-    }
+		//remove all hooks after the output is generated
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_progress' ) );
+		remove_action( 'sensei_course_content_inside_after', array( $this, 'attach_course_buttons' ) );
+		remove_filter( 'sensei_course_loop_content_class', array( $this, 'course_status_class_tagging' ), 20, 2 );
+		remove_action( 'sensei_loop_course_before', array( $this, 'course_toggle_actions' ) );
+	}
 
-    /**
-     * Hooks into sensei_course_content_inside_after
-     *
-     * @param $course
-     */
-    public function attach_course_progress( $course_id ){
+	/**
+	 * Hooks into sensei_course_content_inside_after
+	 *
+	 * @param $course
+	 */
+	public function attach_course_progress( $course_id ){
 
-        $percentage = Sensei()->course->get_completion_percentage( $course_id, get_current_user_id() );
-        echo Sensei()->course->get_progress_meter( $percentage );
+		$percentage = Sensei()->course->get_completion_percentage( $course_id, get_current_user_id() );
+		echo Sensei()->course->get_progress_meter( $percentage );
 
-    }// attach_course_progress
+	}// attach_course_progress
 
 
-    /**
-     * Hooked into sensei_course_content_inside_after
-     *
-     * Prints out the course action buttons
-     *
-     * @param integer $course_id
-     */
-    public function attach_course_buttons( $course_id ){
+	/**
+	 * Hooked into sensei_course_content_inside_after
+	 *
+	 * Prints out the course action buttons
+	 *
+	 * @param integer $course_id
+	 */
+	public function attach_course_buttons( $course_id ){
 
-        Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
+		Sensei()->course->the_course_action_buttons( get_post( $course_id ) );
 
-    }// attach_course_buttons
+	}// attach_course_buttons
 
-    /**
-     * Add a the user status class for the given course.
-     *
-     * @since 1.9
-     *
-     * @param array $classes
-     * @param WP_Post $course
-     * @return array $classes
-     */
-    public function course_status_class_tagging($classes, $course){
+	/**
+	 * Add a the user status class for the given course.
+	 *
+	 * @since 1.9
+	 *
+	 * @param array $classes
+	 * @param WP_Post $course
+	 * @return array $classes
+	 */
+	public function course_status_class_tagging($classes, $course){
 
-        if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
+		if ( Sensei_Utils::user_completed_course( $course, get_current_user_id() ) ) {
 
-            $classes[] = 'user-completed';
+			$classes[] = 'user-completed';
 
-        } else {
+		} else {
 
-            $classes[] = 'user-active';
+			$classes[] = 'user-active';
 
-        }
+		}
 
-        return $classes;
+		return $classes;
 
-    }// end course_status_class_tagging
+	}// end course_status_class_tagging
 
-    /**
-     * Output the course toggle functionality
-     */
-    public function course_toggle_actions(){ ?>
+	/**
+	 * Output the course toggle functionality
+	 */
+	public function course_toggle_actions(){ ?>
 
         <section id="user-course-status-toggle">
             <a id="sensei-user-courses-active-action" href=""><?php _e('Active Courses'); ?></a>
@@ -363,12 +363,12 @@ 
 
     <?php }
 
-    /**
-     * Load the javascript for the toggle functionality
-     *
-     * @since 1.9.0
-     */
-    function print_course_toggle_actions_inline_script() { ?>
+	/**
+	 * Load the javascript for the toggle functionality
+	 *
+	 * @since 1.9.0
+	 */
+	function print_course_toggle_actions_inline_script() { ?>
 
         <script type="text/javascript">
             var buttonContainer = jQuery('#user-course-status-toggle');