@@ -7,27 +7,27 @@ discard block |
||
| 7 | 7 | * show the WooCommerce course filter links above the courses |
| 8 | 8 | * @since 1.9.0 |
| 9 | 9 | */ |
| 10 | -add_filter( 'sensei_archive_course_filter_by_options', array( 'Sensei_WC', 'add_course_archive_wc_filter_links' ) ); |
|
| 10 | +add_filter('sensei_archive_course_filter_by_options', array('Sensei_WC', 'add_course_archive_wc_filter_links')); |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * filter the queries for paid and free course based on the users selection. |
| 14 | 14 | * @since 1.9.0 |
| 15 | 15 | */ |
| 16 | -add_filter('pre_get_posts', array( 'Sensei_WC', 'course_archive_wc_filter_free')); |
|
| 17 | -add_filter('pre_get_posts', array( 'Sensei_WC', 'course_archive_wc_filter_paid')); |
|
| 16 | +add_filter('pre_get_posts', array('Sensei_WC', 'course_archive_wc_filter_free')); |
|
| 17 | +add_filter('pre_get_posts', array('Sensei_WC', 'course_archive_wc_filter_paid')); |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * Add woocommerce action above single course the action |
| 21 | 21 | * @since 1.9.0 |
| 22 | 22 | */ |
| 23 | -add_action('sensei_before_main_content', array('Sensei_WC', 'do_single_course_wc_single_product_action') ,50) ; |
|
| 23 | +add_action('sensei_before_main_content', array('Sensei_WC', 'do_single_course_wc_single_product_action'), 50); |
|
| 24 | 24 | |
| 25 | 25 | /****************************** |
| 26 | 26 | * |
| 27 | 27 | * Single Lesson Hooks |
| 28 | 28 | * |
| 29 | 29 | ******************************/ |
| 30 | -add_filter( 'sensei_can_user_view_lesson', array( 'Sensei_WC','alter_can_user_view_lesson' ), 20, 3 ); |
|
| 30 | +add_filter('sensei_can_user_view_lesson', array('Sensei_WC', 'alter_can_user_view_lesson'), 20, 3); |
|
| 31 | 31 | |
| 32 | 32 | /****************************** |
| 33 | 33 | * |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * |
| 36 | 36 | ******************************/ |
| 37 | 37 | // add a notice on the checkout page to tell users about the course they've purchase |
| 38 | -add_action( 'template_redirect', array( 'Sensei_WC','course_link_from_order' ) ); |
|
| 38 | +add_action('template_redirect', array('Sensei_WC', 'course_link_from_order')); |
|
| 39 | 39 | |
| 40 | 40 | /****************************** |
| 41 | 41 | * |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | ******************************/ |
| 45 | 45 | //@since 1.9.0 |
| 46 | 46 | //show a notice if the user has already added the current course to their cart |
| 47 | -add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_WC', 'course_in_cart_message' ), 20 ); |
|
| 47 | +add_action('sensei_single_course_content_inside_before', array('Sensei_WC', 'course_in_cart_message'), 20); |
|
| 48 | 48 | |
| 49 | 49 | /****************************** |
| 50 | 50 | * |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | ******************************/ |
| 54 | 54 | //@since 1.9.0 |
| 55 | 55 | // alter the no permissions message to show the woocommerce message instead |
| 56 | -add_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 ); |
|
| 56 | +add_filter('sensei_the_no_permissions_message', array('Sensei_WC', 'alter_no_permissions_message'), 20, 2); |
|
| 57 | 57 | |
| 58 | 58 | //@since 1.9.0 |
| 59 | 59 | // add the add to cart button for a valid purchasable course |
| 60 | -add_action( 'sensei_no_permissions_inside_before_content', array( 'Sensei_WC', 'the_add_to_cart_button_html' ), 20, 1); |
|
| 60 | +add_action('sensei_no_permissions_inside_before_content', array('Sensei_WC', 'the_add_to_cart_button_html'), 20, 1); |
|
| 61 | 61 | |
| 62 | 62 | // @since 1.9.0 |
| 63 | 63 | // add woocommerce class to the the no permission body class to ensure WooCommerce elements are styled |
| 64 | -add_filter( 'body_class', array( 'Sensei_WC', 'add_woocommerce_body_class' ), 20, 1); |
|
| 64 | +add_filter('body_class', array('Sensei_WC', 'add_woocommerce_body_class'), 20, 1); |
|
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | ?> |
| 13 | 13 | |
| 14 | -<?php get_sensei_header(); ?> |
|
| 14 | +<?php get_sensei_header(); ?> |
|
| 15 | 15 | |
| 16 | 16 | <?php |
| 17 | 17 | /** |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | * @since 1.9.0 |
| 22 | 22 | * @param $post_id |
| 23 | 23 | */ |
| 24 | -do_action('sensei_no_permissions_before_content', get_the_ID() ); |
|
| 24 | +do_action('sensei_no_permissions_before_content', get_the_ID()); |
|
| 25 | 25 | ?> |
| 26 | 26 | |
| 27 | -<article <?php post_class( 'no-permission' ) ?> > |
|
| 27 | +<article <?php post_class('no-permission') ?> > |
|
| 28 | 28 | |
| 29 | 29 | <header> |
| 30 | 30 | |
@@ -40,20 +40,20 @@ discard block |
||
| 40 | 40 | * @since 1.9.0 |
| 41 | 41 | * @param $post_id |
| 42 | 42 | */ |
| 43 | - do_action('sensei_no_permissions_inside_before_content', get_the_ID() ); |
|
| 43 | + do_action('sensei_no_permissions_inside_before_content', get_the_ID()); |
|
| 44 | 44 | ?> |
| 45 | 45 | |
| 46 | 46 | <section class="entry fix"> |
| 47 | 47 | |
| 48 | 48 | <div class="sensei-message alert"> |
| 49 | 49 | |
| 50 | - <?php the_no_permissions_message( get_the_ID() ); ?> |
|
| 50 | + <?php the_no_permissions_message(get_the_ID()); ?> |
|
| 51 | 51 | |
| 52 | 52 | </div> |
| 53 | 53 | |
| 54 | 54 | <p class="excerpt"> |
| 55 | 55 | |
| 56 | - <?php sensei_the_excerpt( get_the_ID() ); ?> |
|
| 56 | + <?php sensei_the_excerpt(get_the_ID()); ?> |
|
| 57 | 57 | |
| 58 | 58 | </p> |
| 59 | 59 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @since 1.9.0 |
| 68 | 68 | * @param $post_id |
| 69 | 69 | */ |
| 70 | - do_action('sensei_no_permissions_inside_after_content', get_the_ID() ); |
|
| 70 | + do_action('sensei_no_permissions_inside_after_content', get_the_ID()); |
|
| 71 | 71 | ?> |
| 72 | 72 | |
| 73 | 73 | </article><!-- .no-permissions --> |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * @since 1.9.0 |
| 81 | 81 | * @param $post_id |
| 82 | 82 | */ |
| 83 | -do_action('sensei_no_permissions_after_content', get_the_ID() ); |
|
| 83 | +do_action('sensei_no_permissions_after_content', get_the_ID()); |
|
| 84 | 84 | ?> |
| 85 | 85 | |
| 86 | 86 | <?php get_sensei_footer(); ?> |
| 87 | 87 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
| 2 | +if ( ! defined('ABSPATH')) exit; |
|
| 3 | 3 | /** |
| 4 | 4 | * The Template for displaying all course lessons on the course results page. |
| 5 | 5 | * |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | global $course; |
| 15 | 15 | ?> |
| 16 | 16 | |
| 17 | -<?php if ( is_user_logged_in() ): ?> |
|
| 17 | +<?php if (is_user_logged_in()): ?> |
|
| 18 | 18 | |
| 19 | 19 | <?php |
| 20 | 20 | /** |
@@ -22,53 +22,53 @@ discard block |
||
| 22 | 22 | * is uer logged check, just above the lessons header. |
| 23 | 23 | * @since 1.4.0 |
| 24 | 24 | */ |
| 25 | - do_action( 'sensei_course_results_before_lessons', $course->ID ); |
|
| 25 | + do_action('sensei_course_results_before_lessons', $course->ID); |
|
| 26 | 26 | ?> |
| 27 | 27 | |
| 28 | 28 | <header> |
| 29 | 29 | |
| 30 | - <h2> <?php _e( 'Lessons', 'woothemes-sensei' ); ?> </h2> |
|
| 30 | + <h2> <?php _e('Lessons', 'woothemes-sensei'); ?> </h2> |
|
| 31 | 31 | |
| 32 | 32 | </header> |
| 33 | 33 | |
| 34 | - <article class="<?php esc_attr_e( join( ' ', get_post_class( array( 'course', 'post' ), $course->ID ) ) ); ?> "> |
|
| 34 | + <article class="<?php esc_attr_e(join(' ', get_post_class(array('course', 'post'), $course->ID))); ?> "> |
|
| 35 | 35 | |
| 36 | 36 | <?php |
| 37 | 37 | |
| 38 | 38 | $displayed_lessons = array(); |
| 39 | - $modules = Sensei()->modules->get_course_modules( intval( $course->ID ) ); |
|
| 39 | + $modules = Sensei()->modules->get_course_modules(intval($course->ID)); |
|
| 40 | 40 | |
| 41 | 41 | // List modules with lessons |
| 42 | - foreach( $modules as $module ) { |
|
| 42 | + foreach ($modules as $module) { |
|
| 43 | 43 | |
| 44 | - $lessons_query = Sensei()->modules->get_lessons_query( $course->ID, $module->term_id ); |
|
| 44 | + $lessons_query = Sensei()->modules->get_lessons_query($course->ID, $module->term_id); |
|
| 45 | 45 | $lessons = $lessons_query->get_posts(); |
| 46 | 46 | |
| 47 | - if( count( $lessons ) > 0 ) { ?> |
|
| 47 | + if (count($lessons) > 0) { ?> |
|
| 48 | 48 | |
| 49 | 49 | <h3> <?php echo $module->name; ?></h3> |
| 50 | 50 | |
| 51 | 51 | <?php |
| 52 | 52 | $count = 0; |
| 53 | - foreach( $lessons as $lesson ) { |
|
| 53 | + foreach ($lessons as $lesson) { |
|
| 54 | 54 | |
| 55 | 55 | $lesson_grade = 'n/a'; |
| 56 | - $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true ); |
|
| 57 | - if ( $has_questions ) { |
|
| 58 | - $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id() ); |
|
| 56 | + $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true); |
|
| 57 | + if ($has_questions) { |
|
| 58 | + $lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, get_current_user_id()); |
|
| 59 | 59 | // Get user quiz grade |
| 60 | - $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true ); |
|
| 61 | - if ( $lesson_grade ) { |
|
| 60 | + $lesson_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 61 | + if ($lesson_grade) { |
|
| 62 | 62 | $lesson_grade .= '%'; |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | ?> |
| 66 | 66 | <h2> |
| 67 | 67 | |
| 68 | - <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ); ?>" |
|
| 69 | - title="<?php esc_attr_e( sprintf( __( 'Start %s', 'woothemes-sensei' ), $lesson->post_title ) ); ?>"> |
|
| 68 | + <a href="<?php esc_url_raw(get_permalink($lesson->ID)); ?>" |
|
| 69 | + title="<?php esc_attr_e(sprintf(__('Start %s', 'woothemes-sensei'), $lesson->post_title)); ?>"> |
|
| 70 | 70 | |
| 71 | - <?php esc_html_e( $lesson->post_title ); ?> |
|
| 71 | + <?php esc_html_e($lesson->post_title); ?> |
|
| 72 | 72 | |
| 73 | 73 | </a> |
| 74 | 74 | |
@@ -89,25 +89,25 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | <?php |
| 91 | 91 | |
| 92 | - $lessons = Sensei()->modules->get_none_module_lessons( $course->ID ); |
|
| 93 | - if( 0 < count( $lessons ) ): ?> |
|
| 92 | + $lessons = Sensei()->modules->get_none_module_lessons($course->ID); |
|
| 93 | + if (0 < count($lessons)): ?> |
|
| 94 | 94 | |
| 95 | 95 | <h3> |
| 96 | 96 | |
| 97 | - <?php _e( 'Other Lessons', 'woothemes-sensei' ); ?> |
|
| 97 | + <?php _e('Other Lessons', 'woothemes-sensei'); ?> |
|
| 98 | 98 | |
| 99 | 99 | </h3> |
| 100 | 100 | |
| 101 | - <?php foreach ( $lessons as $lesson ): ?> |
|
| 101 | + <?php foreach ($lessons as $lesson): ?> |
|
| 102 | 102 | |
| 103 | 103 | <?php |
| 104 | 104 | $lesson_grade = 'n/a'; |
| 105 | - $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true ); |
|
| 106 | - if ( $has_questions ) { |
|
| 107 | - $lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, get_current_user_id()); |
|
| 105 | + $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true); |
|
| 106 | + if ($has_questions) { |
|
| 107 | + $lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, get_current_user_id()); |
|
| 108 | 108 | // Get user quiz grade |
| 109 | - $lesson_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true ); |
|
| 110 | - if ( $lesson_grade ) { |
|
| 109 | + $lesson_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 110 | + if ($lesson_grade) { |
|
| 111 | 111 | $lesson_grade .= '%'; |
| 112 | 112 | } |
| 113 | 113 | } |
@@ -115,9 +115,9 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | <h2> |
| 117 | 117 | |
| 118 | - <a href="<?php esc_url_raw( get_permalink( $lesson->ID ) ) ?>" title="<?php esc_attr_e( sprintf( __( 'Start %s', 'woothemes-sensei' ), $lesson->post_title ) ) ?>" > |
|
| 118 | + <a href="<?php esc_url_raw(get_permalink($lesson->ID)) ?>" title="<?php esc_attr_e(sprintf(__('Start %s', 'woothemes-sensei'), $lesson->post_title)) ?>" > |
|
| 119 | 119 | |
| 120 | - <?php esc_html_e( sprintf( __( '%s', 'woothemes-sensei' ), $lesson->post_title ) ); ?> |
|
| 120 | + <?php esc_html_e(sprintf(__('%s', 'woothemes-sensei'), $lesson->post_title)); ?> |
|
| 121 | 121 | |
| 122 | 122 | </a> |
| 123 | 123 | |
@@ -132,13 +132,13 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | <h2 class="total-grade"> |
| 134 | 134 | |
| 135 | - <?php _e( 'Total Grade', 'woothemes-sensei' ); ?> |
|
| 135 | + <?php _e('Total Grade', 'woothemes-sensei'); ?> |
|
| 136 | 136 | <span class="lesson-grade"> |
| 137 | 137 | |
| 138 | 138 | <?php |
| 139 | 139 | |
| 140 | - $course_user_grade = Sensei_Utils::sensei_course_user_grade( $course->ID, get_current_user_id() ); |
|
| 141 | - echo $course_user_grade . '%'; |
|
| 140 | + $course_user_grade = Sensei_Utils::sensei_course_user_grade($course->ID, get_current_user_id()); |
|
| 141 | + echo $course_user_grade.'%'; |
|
| 142 | 142 | |
| 143 | 143 | ?> |
| 144 | 144 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * |
| 156 | 156 | * @since 1.4.0 |
| 157 | 157 | */ |
| 158 | - do_action( 'sensei_course_results_after_lessons', $course->ID ); |
|
| 158 | + do_action('sensei_course_results_after_lessons', $course->ID); |
|
| 159 | 159 | ?> |
| 160 | 160 | |
| 161 | 161 | <?php endif; //user logged in ?> |
| 162 | 162 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
| 2 | +if ( ! defined('ABSPATH')) exit; |
|
| 3 | 3 | /** |
| 4 | 4 | * The Template for displaying Multi Line Questions. |
| 5 | 5 | * |
@@ -18,15 +18,15 @@ discard block |
||
| 18 | 18 | * Get the question data with the current quiz id |
| 19 | 19 | * All data is loaded in this array to keep the template clean. |
| 20 | 20 | */ |
| 21 | - $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() ); |
|
| 21 | + $question_data = WooThemes_Sensei_Question::get_template_data(sensei_get_the_question_id(), get_the_ID()); |
|
| 22 | 22 | |
| 23 | 23 | ?> |
| 24 | 24 | |
| 25 | 25 | <?php |
| 26 | 26 | |
| 27 | - Sensei_Utils::sensei_text_editor( $question_data[ 'user_answer_entry' ] , |
|
| 28 | - 'textquestion' . $question_data[ 'ID' ] , |
|
| 29 | - 'sensei_question[' . $question_data[ 'ID' ] . ']' ); |
|
| 27 | + Sensei_Utils::sensei_text_editor($question_data['user_answer_entry'], |
|
| 28 | + 'textquestion'.$question_data['ID'], |
|
| 29 | + 'sensei_question['.$question_data['ID'].']'); |
|
| 30 | 30 | |
| 31 | 31 | ?> |
| 32 | 32 | |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 3 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 4 | 4 | |
| 5 | -if ( ! class_exists( 'WooThemes_Sensei_Email_Teacher_Completed_Course' ) ) : |
|
| 5 | +if ( ! class_exists('WooThemes_Sensei_Email_Teacher_Completed_Course')) : |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Teacher Completed Course |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function __construct() { |
| 33 | 33 | $this->template = 'teacher-completed-course'; |
| 34 | - $this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] Your student has completed a course', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template ); |
|
| 35 | - $this->heading = apply_filters( 'sensei_email_heading', __( 'Your student has completed a course', 'woothemes-sensei' ), $this->template ); |
|
| 34 | + $this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] Your student has completed a course', 'woothemes-sensei'), get_bloginfo('name')), $this->template); |
|
| 35 | + $this->heading = apply_filters('sensei_email_heading', __('Your student has completed a course', 'woothemes-sensei'), $this->template); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -41,24 +41,24 @@ discard block |
||
| 41 | 41 | * @access public |
| 42 | 42 | * @return void |
| 43 | 43 | */ |
| 44 | - function trigger( $learner_id = 0, $course_id = 0 ) { |
|
| 44 | + function trigger($learner_id = 0, $course_id = 0) { |
|
| 45 | 45 | global $sensei_email_data; |
| 46 | 46 | |
| 47 | 47 | // Get learner user object |
| 48 | - $this->learner = new WP_User( $learner_id ); |
|
| 48 | + $this->learner = new WP_User($learner_id); |
|
| 49 | 49 | |
| 50 | 50 | // Get teacher ID and user object |
| 51 | - $teacher_id = get_post_field( 'post_author', $course_id, 'raw' ); |
|
| 52 | - $this->teacher = new WP_User( $teacher_id ); |
|
| 51 | + $teacher_id = get_post_field('post_author', $course_id, 'raw'); |
|
| 52 | + $this->teacher = new WP_User($teacher_id); |
|
| 53 | 53 | |
| 54 | 54 | // Get passed status |
| 55 | - $passed = __( 'passed', 'woothemes-sensei' ); |
|
| 56 | - if( ! Sensei_Utils::sensei_user_passed_course( $course_id, $learner_id ) ) { |
|
| 57 | - $passed = __( 'failed', 'woothemes-sensei' ); |
|
| 55 | + $passed = __('passed', 'woothemes-sensei'); |
|
| 56 | + if ( ! Sensei_Utils::sensei_user_passed_course($course_id, $learner_id)) { |
|
| 57 | + $passed = __('failed', 'woothemes-sensei'); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | // Construct data array |
| 61 | - $sensei_email_data = apply_filters( 'sensei_email_data', array( |
|
| 61 | + $sensei_email_data = apply_filters('sensei_email_data', array( |
|
| 62 | 62 | 'template' => $this->template, |
| 63 | 63 | 'heading' => $this->heading, |
| 64 | 64 | 'teacher_id' => $teacher_id, |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | 'learner_name' => $this->learner->display_name, |
| 67 | 67 | 'course_id' => $course_id, |
| 68 | 68 | 'passed' => $passed, |
| 69 | - ), $this->template ); |
|
| 69 | + ), $this->template); |
|
| 70 | 70 | |
| 71 | 71 | // Set recipient (learner) |
| 72 | - $this->recipient = stripslashes( $this->teacher->user_email ); |
|
| 72 | + $this->recipient = stripslashes($this->teacher->user_email); |
|
| 73 | 73 | |
| 74 | 74 | // Send mail |
| 75 | - Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) ); |
|
| 75 | + Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template)); |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 3 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 4 | 4 | |
| 5 | -if ( ! class_exists( 'WooThemes_Sensei_Email_Learner_Completed_Course' ) ) : |
|
| 5 | +if ( ! class_exists('WooThemes_Sensei_Email_Learner_Completed_Course')) : |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Learner Completed Course |
@@ -30,8 +30,8 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | function __construct() { |
| 32 | 32 | $this->template = 'learner-completed-course'; |
| 33 | - $this->subject = apply_filters( 'sensei_email_subject', sprintf( __( '[%1$s] You have completed a course', 'woothemes-sensei' ), get_bloginfo( 'name' ) ), $this->template ); |
|
| 34 | - $this->heading = apply_filters( 'sensei_email_heading', __( 'You have completed a course', 'woothemes-sensei' ), $this->template ); |
|
| 33 | + $this->subject = apply_filters('sensei_email_subject', sprintf(__('[%1$s] You have completed a course', 'woothemes-sensei'), get_bloginfo('name')), $this->template); |
|
| 34 | + $this->heading = apply_filters('sensei_email_heading', __('You have completed a course', 'woothemes-sensei'), $this->template); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -40,32 +40,32 @@ discard block |
||
| 40 | 40 | * @access public |
| 41 | 41 | * @return void |
| 42 | 42 | */ |
| 43 | - function trigger( $user_id = 0, $course_id = 0 ) { |
|
| 43 | + function trigger($user_id = 0, $course_id = 0) { |
|
| 44 | 44 | global $sensei_email_data; |
| 45 | 45 | |
| 46 | 46 | // Get learner user object |
| 47 | - $this->user = new WP_User( $user_id ); |
|
| 47 | + $this->user = new WP_User($user_id); |
|
| 48 | 48 | |
| 49 | 49 | // Get passed status |
| 50 | - $passed = __( 'passed', 'woothemes-sensei' ); |
|
| 51 | - if( ! Sensei_Utils::sensei_user_passed_course( $course_id, $user_id ) ) { |
|
| 52 | - $passed = __( 'failed', 'woothemes-sensei' ); |
|
| 50 | + $passed = __('passed', 'woothemes-sensei'); |
|
| 51 | + if ( ! Sensei_Utils::sensei_user_passed_course($course_id, $user_id)) { |
|
| 52 | + $passed = __('failed', 'woothemes-sensei'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // Construct data array |
| 56 | - $sensei_email_data = apply_filters( 'sensei_email_data', array( |
|
| 56 | + $sensei_email_data = apply_filters('sensei_email_data', array( |
|
| 57 | 57 | 'template' => $this->template, |
| 58 | 58 | 'heading' => $this->heading, |
| 59 | 59 | 'user_id' => $user_id, |
| 60 | 60 | 'course_id' => $course_id, |
| 61 | 61 | 'passed' => $passed, |
| 62 | - ), $this->template ); |
|
| 62 | + ), $this->template); |
|
| 63 | 63 | |
| 64 | 64 | // Set recipient (learner) |
| 65 | - $this->recipient = stripslashes( $this->user->user_email ); |
|
| 65 | + $this->recipient = stripslashes($this->user->user_email); |
|
| 66 | 66 | |
| 67 | 67 | // Send mail |
| 68 | - Sensei()->emails->send( $this->recipient, $this->subject, Sensei()->emails->get_content( $this->template ) ); |
|
| 68 | + Sensei()->emails->send($this->recipient, $this->subject, Sensei()->emails->get_content($this->template)); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
@@ -3,11 +3,11 @@ discard block |
||
| 3 | 3 | /** |
| 4 | 4 | * Queue updates for the WooUpdater |
| 5 | 5 | */ |
| 6 | -if ( ! function_exists( 'woothemes_queue_update' ) ) { |
|
| 7 | - function woothemes_queue_update( $file, $file_id, $product_id ) { |
|
| 6 | +if ( ! function_exists('woothemes_queue_update')) { |
|
| 7 | + function woothemes_queue_update($file, $file_id, $product_id) { |
|
| 8 | 8 | global $woothemes_queued_updates; |
| 9 | 9 | |
| 10 | - if ( ! isset( $woothemes_queued_updates ) ) |
|
| 10 | + if ( ! isset($woothemes_queued_updates)) |
|
| 11 | 11 | $woothemes_queued_updates = array(); |
| 12 | 12 | |
| 13 | 13 | $plugin = new stdClass(); |
@@ -23,56 +23,56 @@ discard block |
||
| 23 | 23 | * Load installer for the WooThemes Updater. |
| 24 | 24 | * @return $api Object |
| 25 | 25 | */ |
| 26 | -if ( ! class_exists( 'WooThemes_Updater' ) && ! function_exists( 'woothemes_updater_install' ) ) { |
|
| 27 | - function woothemes_updater_install( $api, $action, $args ) { |
|
| 26 | +if ( ! class_exists('WooThemes_Updater') && ! function_exists('woothemes_updater_install')) { |
|
| 27 | + function woothemes_updater_install($api, $action, $args) { |
|
| 28 | 28 | $download_url = 'http://woodojo.s3.amazonaws.com/downloads/woothemes-updater/woothemes-updater.zip'; |
| 29 | 29 | |
| 30 | - if ( 'plugin_information' != $action || |
|
| 30 | + if ('plugin_information' != $action || |
|
| 31 | 31 | false !== $api || |
| 32 | - ! isset( $args->slug ) || |
|
| 32 | + ! isset($args->slug) || |
|
| 33 | 33 | 'woothemes-updater' != $args->slug |
| 34 | 34 | ) return $api; |
| 35 | 35 | |
| 36 | 36 | $api = new stdClass(); |
| 37 | 37 | $api->name = 'WooThemes Updater'; |
| 38 | 38 | $api->version = ''; |
| 39 | - $api->download_link = esc_url( $download_url ); |
|
| 39 | + $api->download_link = esc_url($download_url); |
|
| 40 | 40 | return $api; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - add_filter( 'plugins_api', 'woothemes_updater_install', 10, 3 ); |
|
| 43 | + add_filter('plugins_api', 'woothemes_updater_install', 10, 3); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * WooUpdater Installation Prompts |
| 48 | 48 | */ |
| 49 | -if ( ! class_exists( 'WooThemes_Updater' ) && ! function_exists( 'woothemes_updater_notice' ) ) { |
|
| 49 | +if ( ! class_exists('WooThemes_Updater') && ! function_exists('woothemes_updater_notice')) { |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Display a notice if the "WooThemes Updater" plugin hasn't been installed. |
| 53 | 53 | * @return void |
| 54 | 54 | */ |
| 55 | 55 | function woothemes_updater_notice() { |
| 56 | - $active_plugins = apply_filters( 'active_plugins', get_option('active_plugins' ) ); |
|
| 57 | - if ( in_array( 'woothemes-updater/woothemes-updater.php', $active_plugins ) ) return; |
|
| 56 | + $active_plugins = apply_filters('active_plugins', get_option('active_plugins')); |
|
| 57 | + if (in_array('woothemes-updater/woothemes-updater.php', $active_plugins)) return; |
|
| 58 | 58 | |
| 59 | 59 | $slug = 'woothemes-updater'; |
| 60 | - $install_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $slug ), 'install-plugin_' . $slug ); |
|
| 61 | - $activate_url = 'plugins.php?action=activate&plugin=' . urlencode( 'woothemes-updater/woothemes-updater.php' ) . '&plugin_status=all&paged=1&s&_wpnonce=' . urlencode( wp_create_nonce( 'activate-plugin_woothemes-updater/woothemes-updater.php' ) ); |
|
| 60 | + $install_url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$slug), 'install-plugin_'.$slug); |
|
| 61 | + $activate_url = 'plugins.php?action=activate&plugin='.urlencode('woothemes-updater/woothemes-updater.php').'&plugin_status=all&paged=1&s&_wpnonce='.urlencode(wp_create_nonce('activate-plugin_woothemes-updater/woothemes-updater.php')); |
|
| 62 | 62 | |
| 63 | - $message = '<a href="' . esc_url( $install_url ) . '">Install the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.'; |
|
| 63 | + $message = '<a href="'.esc_url($install_url).'">Install the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.'; |
|
| 64 | 64 | $is_downloaded = false; |
| 65 | - $plugins = array_keys( get_plugins() ); |
|
| 66 | - foreach ( $plugins as $plugin ) { |
|
| 67 | - if ( strpos( $plugin, 'woothemes-updater.php' ) !== false ) { |
|
| 65 | + $plugins = array_keys(get_plugins()); |
|
| 66 | + foreach ($plugins as $plugin) { |
|
| 67 | + if (strpos($plugin, 'woothemes-updater.php') !== false) { |
|
| 68 | 68 | $is_downloaded = true; |
| 69 | - $message = '<a href="' . esc_url( admin_url( $activate_url ) ) . '">Activate the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.'; |
|
| 69 | + $message = '<a href="'.esc_url(admin_url($activate_url)).'">Activate the WooThemes Updater plugin</a> to get updates for your WooThemes plugins.'; |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | - echo '<div class="updated fade"><p>' . $message . '</p></div>' . "\n"; |
|
| 72 | + echo '<div class="updated fade"><p>'.$message.'</p></div>'."\n"; |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - add_action( 'admin_notices', 'woothemes_updater_notice' ); |
|
| 75 | + add_action('admin_notices', 'woothemes_updater_notice'); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -81,11 +81,11 @@ discard block |
||
| 81 | 81 | * @param $version Version to check against |
| 82 | 82 | * @return @boolean |
| 83 | 83 | */ |
| 84 | -if( ! function_exists( 'sensei_check_woocommerce_version' ) ) { |
|
| 85 | - function sensei_check_woocommerce_version( $version = '2.1' ) { |
|
| 86 | - if ( Sensei_WC::is_woocommerce_active() ) { |
|
| 84 | +if ( ! function_exists('sensei_check_woocommerce_version')) { |
|
| 85 | + function sensei_check_woocommerce_version($version = '2.1') { |
|
| 86 | + if (Sensei_WC::is_woocommerce_active()) { |
|
| 87 | 87 | global $woocommerce; |
| 88 | - if( version_compare( $woocommerce->version, $version, ">=" ) ) { |
|
| 88 | + if (version_compare($woocommerce->version, $version, ">=")) { |
|
| 89 | 89 | return true; |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Sensei Grading User Quiz Class |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | * @since 1.3.0 |
| 23 | 23 | * @return void |
| 24 | 24 | */ |
| 25 | - public function __construct ( $user_id = 0, $quiz_id = 0 ) { |
|
| 26 | - $this->user_id = intval( $user_id ); |
|
| 27 | - $this->quiz_id = intval( $quiz_id ); |
|
| 28 | - $this->lesson_id = get_post_meta( $this->quiz_id, '_quiz_lesson', true ); |
|
| 25 | + public function __construct($user_id = 0, $quiz_id = 0) { |
|
| 26 | + $this->user_id = intval($user_id); |
|
| 27 | + $this->quiz_id = intval($quiz_id); |
|
| 28 | + $this->lesson_id = get_post_meta($this->quiz_id, '_quiz_lesson', true); |
|
| 29 | 29 | } // End __construct() |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * @return array |
| 36 | 36 | */ |
| 37 | 37 | public function build_data_array() { |
| 38 | - $data_array = Sensei_Utils::sensei_get_quiz_questions( $this->quiz_id ); |
|
| 38 | + $data_array = Sensei_Utils::sensei_get_quiz_questions($this->quiz_id); |
|
| 39 | 39 | return $data_array; |
| 40 | 40 | } // End build_data_array() |
| 41 | 41 | |
@@ -60,94 +60,94 @@ discard block |
||
| 60 | 60 | $lesson_id = $this->lesson_id; |
| 61 | 61 | $user_id = $this->user_id; |
| 62 | 62 | |
| 63 | - ?><form name="<?php esc_attr_e( 'quiz_' . $this->quiz_id ); ?>" action="" method="post"> |
|
| 64 | - <?php wp_nonce_field( 'sensei_manual_grading', '_wp_sensei_manual_grading_nonce' ); ?> |
|
| 65 | - <input type="hidden" name="sensei_manual_grade" value="<?php esc_attr_e( $this->quiz_id ); ?>" /> |
|
| 66 | - <input type="hidden" name="sensei_grade_next_learner" value="<?php esc_attr_e( $this->user_id ); ?>" /> |
|
| 63 | + ?><form name="<?php esc_attr_e('quiz_'.$this->quiz_id); ?>" action="" method="post"> |
|
| 64 | + <?php wp_nonce_field('sensei_manual_grading', '_wp_sensei_manual_grading_nonce'); ?> |
|
| 65 | + <input type="hidden" name="sensei_manual_grade" value="<?php esc_attr_e($this->quiz_id); ?>" /> |
|
| 66 | + <input type="hidden" name="sensei_grade_next_learner" value="<?php esc_attr_e($this->user_id); ?>" /> |
|
| 67 | 67 | <div class="total_grade_display"> |
| 68 | - <span><?php esc_attr_e( __( 'Grade:', 'woothemes-sensei' ) ); ?></span> |
|
| 68 | + <span><?php esc_attr_e(__('Grade:', 'woothemes-sensei')); ?></span> |
|
| 69 | 69 | <span class="total_grade_total"><?php echo $user_quiz_grade_total; ?></span> / <span class="quiz_grade_total"><?php echo $quiz_grade_total; ?></span> (<span class="total_grade_percent"><?php echo $quiz_grade; ?></span>%) |
| 70 | 70 | </div> |
| 71 | 71 | <div class="buttons"> |
| 72 | - <input type="submit" value="<?php esc_attr_e( __( 'Save', 'woothemes-sensei' ) ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" /> |
|
| 73 | - <input type="button" value="<?php esc_attr_e( __( 'Auto grade', 'woothemes-sensei' ) ); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" /> |
|
| 74 | - <input type="reset" value="<?php esc_attr_e( __( 'Reset', 'woothemes-sensei' ) ); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" /> |
|
| 72 | + <input type="submit" value="<?php esc_attr_e(__('Save', 'woothemes-sensei')); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" /> |
|
| 73 | + <input type="button" value="<?php esc_attr_e(__('Auto grade', 'woothemes-sensei')); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" /> |
|
| 74 | + <input type="reset" value="<?php esc_attr_e(__('Reset', 'woothemes-sensei')); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" /> |
|
| 75 | 75 | </div> |
| 76 | 76 | <div class="clear"></div><br/><?php |
| 77 | 77 | |
| 78 | - $lesson_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $this->lesson_id, 'user_id' => $this->user_id, 'type' => 'sensei_lesson_status', 'field' => 'comment_ID' ) ); |
|
| 79 | - $user_quiz_grade = get_comment_meta( $lesson_status_id, 'grade', true ); |
|
| 78 | + $lesson_status_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $this->lesson_id, 'user_id' => $this->user_id, 'type' => 'sensei_lesson_status', 'field' => 'comment_ID')); |
|
| 79 | + $user_quiz_grade = get_comment_meta($lesson_status_id, 'grade', true); |
|
| 80 | 80 | $correct_answers = 0; |
| 81 | 81 | |
| 82 | - foreach( $questions as $question ) { |
|
| 82 | + foreach ($questions as $question) { |
|
| 83 | 83 | $question_id = $question->ID; |
| 84 | 84 | ++$count; |
| 85 | 85 | |
| 86 | 86 | $type = false; |
| 87 | 87 | $type_name = ''; |
| 88 | 88 | |
| 89 | - $type = Sensei()->question->get_question_type( $question_id ); |
|
| 89 | + $type = Sensei()->question->get_question_type($question_id); |
|
| 90 | 90 | |
| 91 | - $question_answer_notes = Sensei()->quiz->get_user_question_feedback( $lesson_id, $question_id, $user_id ); |
|
| 91 | + $question_answer_notes = Sensei()->quiz->get_user_question_feedback($lesson_id, $question_id, $user_id); |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | - $question_grade_total = Sensei()->question->get_question_grade( $question_id ); |
|
| 94 | + $question_grade_total = Sensei()->question->get_question_grade($question_id); |
|
| 95 | 95 | $quiz_grade_total += $question_grade_total; |
| 96 | 96 | |
| 97 | - $right_answer = get_post_meta( $question_id, '_question_right_answer', true ); |
|
| 98 | - $user_answer_content = Sensei()->quiz->get_user_question_answer( $lesson_id, $question_id, $user_id ); |
|
| 99 | - $type_name = __( 'Multiple Choice', 'woothemes-sensei' ); |
|
| 97 | + $right_answer = get_post_meta($question_id, '_question_right_answer', true); |
|
| 98 | + $user_answer_content = Sensei()->quiz->get_user_question_answer($lesson_id, $question_id, $user_id); |
|
| 99 | + $type_name = __('Multiple Choice', 'woothemes-sensei'); |
|
| 100 | 100 | $grade_type = 'manual-grade'; |
| 101 | 101 | |
| 102 | - switch( $type ) { |
|
| 102 | + switch ($type) { |
|
| 103 | 103 | case 'boolean': |
| 104 | - $type_name = __( 'True/False', 'woothemes-sensei' ); |
|
| 105 | - $right_answer = ucfirst( $right_answer ); |
|
| 106 | - $user_answer_content = ucfirst( $user_answer_content ); |
|
| 104 | + $type_name = __('True/False', 'woothemes-sensei'); |
|
| 105 | + $right_answer = ucfirst($right_answer); |
|
| 106 | + $user_answer_content = ucfirst($user_answer_content); |
|
| 107 | 107 | $grade_type = 'auto-grade'; |
| 108 | 108 | break; |
| 109 | 109 | case 'multiple-choice': |
| 110 | - $type_name = __( 'Multiple Choice', 'woothemes-sensei' ); |
|
| 110 | + $type_name = __('Multiple Choice', 'woothemes-sensei'); |
|
| 111 | 111 | $grade_type = 'auto-grade'; |
| 112 | 112 | break; |
| 113 | 113 | case 'gap-fill': |
| 114 | - $type_name = __( 'Gap Fill', 'woothemes-sensei' ); |
|
| 114 | + $type_name = __('Gap Fill', 'woothemes-sensei'); |
|
| 115 | 115 | |
| 116 | - $right_answer_array = explode( '||', $right_answer ); |
|
| 117 | - if ( isset( $right_answer_array[0] ) ) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; } |
|
| 118 | - if ( isset( $right_answer_array[1] ) ) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; } |
|
| 119 | - if ( isset( $right_answer_array[2] ) ) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; } |
|
| 116 | + $right_answer_array = explode('||', $right_answer); |
|
| 117 | + if (isset($right_answer_array[0])) { $gapfill_pre = $right_answer_array[0]; } else { $gapfill_pre = ''; } |
|
| 118 | + if (isset($right_answer_array[1])) { $gapfill_gap = $right_answer_array[1]; } else { $gapfill_gap = ''; } |
|
| 119 | + if (isset($right_answer_array[2])) { $gapfill_post = $right_answer_array[2]; } else { $gapfill_post = ''; } |
|
| 120 | 120 | |
| 121 | - if( ! $user_answer_content ) { |
|
| 121 | + if ( ! $user_answer_content) { |
|
| 122 | 122 | $user_answer_content = '______'; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - $right_answer = $gapfill_pre . ' <span class="highlight">' . $gapfill_gap . '</span> ' . $gapfill_post; |
|
| 126 | - $user_answer_content = $gapfill_pre . ' <span class="highlight">' . $user_answer_content . '</span> ' . $gapfill_post; |
|
| 125 | + $right_answer = $gapfill_pre.' <span class="highlight">'.$gapfill_gap.'</span> '.$gapfill_post; |
|
| 126 | + $user_answer_content = $gapfill_pre.' <span class="highlight">'.$user_answer_content.'</span> '.$gapfill_post; |
|
| 127 | 127 | $grade_type = 'auto-grade'; |
| 128 | 128 | |
| 129 | 129 | break; |
| 130 | 130 | case 'multi-line': |
| 131 | - $type_name = __( 'Multi Line', 'woothemes-sensei' ); |
|
| 131 | + $type_name = __('Multi Line', 'woothemes-sensei'); |
|
| 132 | 132 | $grade_type = 'manual-grade'; |
| 133 | 133 | break; |
| 134 | 134 | case 'single-line': |
| 135 | - $type_name = __( 'Single Line', 'woothemes-sensei' ); |
|
| 135 | + $type_name = __('Single Line', 'woothemes-sensei'); |
|
| 136 | 136 | $grade_type = 'manual-grade'; |
| 137 | 137 | break; |
| 138 | 138 | case 'file-upload': |
| 139 | - $type_name = __( 'File Upload', 'woothemes-sensei' ); |
|
| 139 | + $type_name = __('File Upload', 'woothemes-sensei'); |
|
| 140 | 140 | $grade_type = 'manual-grade'; |
| 141 | 141 | |
| 142 | 142 | // Get uploaded file |
| 143 | - if( $user_answer_content ) { |
|
| 143 | + if ($user_answer_content) { |
|
| 144 | 144 | $attachment_id = $user_answer_content; |
| 145 | 145 | $answer_media_url = $answer_media_filename = ''; |
| 146 | - if( 0 < intval( $attachment_id ) ) { |
|
| 147 | - $answer_media_url = wp_get_attachment_url( $attachment_id ); |
|
| 148 | - $answer_media_filename = basename( $answer_media_url ); |
|
| 149 | - if( $answer_media_url && $answer_media_filename ) { |
|
| 150 | - $user_answer_content = sprintf( __( 'Submitted file: %1$s', 'woothemes-sensei' ), '<a href="' . esc_url( $answer_media_url ) . '" target="_blank">' . esc_html( $answer_media_filename ) . '</a>' ); |
|
| 146 | + if (0 < intval($attachment_id)) { |
|
| 147 | + $answer_media_url = wp_get_attachment_url($attachment_id); |
|
| 148 | + $answer_media_filename = basename($answer_media_url); |
|
| 149 | + if ($answer_media_url && $answer_media_filename) { |
|
| 150 | + $user_answer_content = sprintf(__('Submitted file: %1$s', 'woothemes-sensei'), '<a href="'.esc_url($answer_media_url).'" target="_blank">'.esc_html($answer_media_filename).'</a>'); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | } else { |
@@ -160,12 +160,12 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | $user_answer_content = (array) $user_answer_content; |
| 162 | 162 | $right_answer = (array) $right_answer; |
| 163 | - $question_title = sprintf( __( 'Question %d: ', 'woothemes-sensei' ), $count ) . $type_name; |
|
| 163 | + $question_title = sprintf(__('Question %d: ', 'woothemes-sensei'), $count).$type_name; |
|
| 164 | 164 | |
| 165 | 165 | $graded_class = ''; |
| 166 | - $user_question_grade = Sensei()->quiz->get_user_question_grade( $lesson_id, $question_id, $user_id ); |
|
| 166 | + $user_question_grade = Sensei()->quiz->get_user_question_grade($lesson_id, $question_id, $user_id); |
|
| 167 | 167 | $graded_class = 'ungraded'; |
| 168 | - if ( 0 == $question_grade_total && 0 == intval( $user_question_grade ) ) { |
|
| 168 | + if (0 == $question_grade_total && 0 == intval($user_question_grade)) { |
|
| 169 | 169 | // Question skips grading |
| 170 | 170 | $grade_type = 'zero-graded'; |
| 171 | 171 | $graded_class = ''; |
@@ -173,86 +173,86 @@ discard block |
||
| 173 | 173 | ++$graded_count; |
| 174 | 174 | $user_question_grade = 0; |
| 175 | 175 | } |
| 176 | - elseif( intval( $user_question_grade ) > 0 ) { |
|
| 176 | + elseif (intval($user_question_grade) > 0) { |
|
| 177 | 177 | $graded_class = 'user_right'; |
| 178 | 178 | ++$correct_answers; |
| 179 | 179 | $user_quiz_grade_total += $user_question_grade; |
| 180 | 180 | ++$graded_count; |
| 181 | 181 | } else { |
| 182 | - if( ! is_string( $user_question_grade ) && intval( $user_question_grade ) == 0 ) { |
|
| 182 | + if ( ! is_string($user_question_grade) && intval($user_question_grade) == 0) { |
|
| 183 | 183 | $graded_class = 'user_wrong'; |
| 184 | 184 | ++$graded_count; |
| 185 | 185 | } |
| 186 | 186 | $user_question_grade = 0; |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - ?><div class="postbox question_box <?php esc_attr_e( $type ); ?> <?php esc_attr_e( $grade_type ); ?> <?php esc_attr_e( $graded_class ); ?>" id="<?php esc_attr_e( 'question_' . $question_id . '_box' ); ?>"> |
|
| 189 | + ?><div class="postbox question_box <?php esc_attr_e($type); ?> <?php esc_attr_e($grade_type); ?> <?php esc_attr_e($graded_class); ?>" id="<?php esc_attr_e('question_'.$question_id.'_box'); ?>"> |
|
| 190 | 190 | <div class="handlediv" title="Click to toggle"><br></div> |
| 191 | 191 | <h3 class="hndle"><span><?php echo $question_title; ?></span></h3> |
| 192 | 192 | <div class="inside"> |
| 193 | 193 | <div class="sensei-grading-actions"> |
| 194 | 194 | <div class="actions"> |
| 195 | - <input type="hidden" class="question_id" value="<?php esc_attr_e( $question_id ); ?>" /> |
|
| 196 | - <input type="hidden" class="question_total_grade" name="question_total_grade" value="<?php echo esc_attr( $question_grade_total ); ?>" /> |
|
| 197 | - <span class="grading-mark icon_right"><input type="radio" class="<?php esc_attr_e( 'question_' . $question_id . '_right_option' ); ?>" name="<?php esc_attr_e( 'question_' . $question_id ); ?>" value="right" <?php checked( $graded_class, 'user_right', true ); ?> /></span> |
|
| 198 | - <span class="grading-mark icon_wrong"><input type="radio" class="<?php esc_attr_e( 'question_' . $question_id . '_wrong_option' ); ?>" name="<?php esc_attr_e( 'question_' . $question_id ); ?>" value="wrong" <?php checked( $graded_class, 'user_wrong', true ); ?> /></span> |
|
| 199 | - <input type="number" class="question-grade" name="<?php esc_attr_e( 'question_' . $question_id . '_grade' ); ?>" id="<?php esc_attr_e( 'question_' . $question_id . '_grade' ); ?>" value="<?php echo esc_attr( $user_question_grade ); ?>" min="0" max="<?php echo esc_attr( $question_grade_total ); ?>" /> |
|
| 195 | + <input type="hidden" class="question_id" value="<?php esc_attr_e($question_id); ?>" /> |
|
| 196 | + <input type="hidden" class="question_total_grade" name="question_total_grade" value="<?php echo esc_attr($question_grade_total); ?>" /> |
|
| 197 | + <span class="grading-mark icon_right"><input type="radio" class="<?php esc_attr_e('question_'.$question_id.'_right_option'); ?>" name="<?php esc_attr_e('question_'.$question_id); ?>" value="right" <?php checked($graded_class, 'user_right', true); ?> /></span> |
|
| 198 | + <span class="grading-mark icon_wrong"><input type="radio" class="<?php esc_attr_e('question_'.$question_id.'_wrong_option'); ?>" name="<?php esc_attr_e('question_'.$question_id); ?>" value="wrong" <?php checked($graded_class, 'user_wrong', true); ?> /></span> |
|
| 199 | + <input type="number" class="question-grade" name="<?php esc_attr_e('question_'.$question_id.'_grade'); ?>" id="<?php esc_attr_e('question_'.$question_id.'_grade'); ?>" value="<?php echo esc_attr($user_question_grade); ?>" min="0" max="<?php echo esc_attr($question_grade_total); ?>" /> |
|
| 200 | 200 | <span class="question-grade-total"><?php echo $question_grade_total; ?></span> |
| 201 | 201 | </div> |
| 202 | 202 | </div> |
| 203 | 203 | <div class="sensei-grading-answer"> |
| 204 | - <h4><?php echo apply_filters( 'sensei_question_title', $question->post_title ); ?></h4> |
|
| 205 | - <?php echo apply_filters( 'the_content', $question->post_content );?> |
|
| 204 | + <h4><?php echo apply_filters('sensei_question_title', $question->post_title); ?></h4> |
|
| 205 | + <?php echo apply_filters('the_content', $question->post_content); ?> |
|
| 206 | 206 | <p class="user-answer"><?php |
| 207 | - foreach ( $user_answer_content as $_user_answer ) { |
|
| 207 | + foreach ($user_answer_content as $_user_answer) { |
|
| 208 | 208 | |
| 209 | - if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){ |
|
| 209 | + if ('multi-line' == Sensei()->question->get_question_type($question->ID)) { |
|
| 210 | 210 | |
| 211 | - $_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) ); |
|
| 211 | + $_user_answer = htmlspecialchars_decode(nl2br(esc_html($_user_answer))); |
|
| 212 | 212 | |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - echo apply_filters( 'sensei_answer_text', $_user_answer ) . "<br>"; |
|
| 215 | + echo apply_filters('sensei_answer_text', $_user_answer)."<br>"; |
|
| 216 | 216 | } |
| 217 | 217 | ?></p> |
| 218 | 218 | <div class="right-answer"> |
| 219 | - <h5><?php _e( 'Correct answer', 'woothemes-sensei' ) ?></h5> |
|
| 219 | + <h5><?php _e('Correct answer', 'woothemes-sensei') ?></h5> |
|
| 220 | 220 | <span class="correct-answer"><?php |
| 221 | - foreach ( $right_answer as $_right_answer ) { |
|
| 221 | + foreach ($right_answer as $_right_answer) { |
|
| 222 | 222 | |
| 223 | - echo apply_filters( 'sensei_answer_text', $_right_answer ) . "<br>"; |
|
| 223 | + echo apply_filters('sensei_answer_text', $_right_answer)."<br>"; |
|
| 224 | 224 | |
| 225 | 225 | } |
| 226 | 226 | ?></span> |
| 227 | 227 | </div> |
| 228 | 228 | <div class="answer-notes"> |
| 229 | - <h5><?php _e( 'Grading Notes', 'woothemes-sensei' ) ?></h5> |
|
| 230 | - <textarea class="correct-answer" name="questions_feedback[<?php esc_attr_e( $question_id ); ?>]" placeholder="<?php _e( 'Add notes here...', 'woothemes-sensei' ) ?>"><?php echo $question_answer_notes; ?></textarea> |
|
| 229 | + <h5><?php _e('Grading Notes', 'woothemes-sensei') ?></h5> |
|
| 230 | + <textarea class="correct-answer" name="questions_feedback[<?php esc_attr_e($question_id); ?>]" placeholder="<?php _e('Add notes here...', 'woothemes-sensei') ?>"><?php echo $question_answer_notes; ?></textarea> |
|
| 231 | 231 | </div> |
| 232 | 232 | </div> |
| 233 | 233 | </div> |
| 234 | 234 | </div><?php |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - $quiz_grade = intval( $user_quiz_grade ); |
|
| 237 | + $quiz_grade = intval($user_quiz_grade); |
|
| 238 | 238 | $all_graded = 'no'; |
| 239 | - if( intval( $count ) == intval( $graded_count ) ) { |
|
| 239 | + if (intval($count) == intval($graded_count)) { |
|
| 240 | 240 | $all_graded = 'yes'; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - ?> <input type="hidden" name="total_grade" id="total_grade" value="<?php esc_attr_e( $user_quiz_grade_total ); ?>" /> |
|
| 244 | - <input type="hidden" name="total_questions" id="total_questions" value="<?php esc_attr_e( $count ); ?>" /> |
|
| 245 | - <input type="hidden" name="quiz_grade_total" id="quiz_grade_total" value="<?php esc_attr_e( $quiz_grade_total ); ?>" /> |
|
| 246 | - <input type="hidden" name="total_graded_questions" id="total_graded_questions" value="<?php esc_attr_e( $graded_count ); ?>" /> |
|
| 247 | - <input type="hidden" name="all_questions_graded" id="all_questions_graded" value="<?php esc_attr_e( $all_graded ); ?>" /> |
|
| 243 | + ?> <input type="hidden" name="total_grade" id="total_grade" value="<?php esc_attr_e($user_quiz_grade_total); ?>" /> |
|
| 244 | + <input type="hidden" name="total_questions" id="total_questions" value="<?php esc_attr_e($count); ?>" /> |
|
| 245 | + <input type="hidden" name="quiz_grade_total" id="quiz_grade_total" value="<?php esc_attr_e($quiz_grade_total); ?>" /> |
|
| 246 | + <input type="hidden" name="total_graded_questions" id="total_graded_questions" value="<?php esc_attr_e($graded_count); ?>" /> |
|
| 247 | + <input type="hidden" name="all_questions_graded" id="all_questions_graded" value="<?php esc_attr_e($all_graded); ?>" /> |
|
| 248 | 248 | <div class="total_grade_display"> |
| 249 | - <span><?php esc_attr_e( __( 'Grade:', 'woothemes-sensei' ) ); ?></span> |
|
| 249 | + <span><?php esc_attr_e(__('Grade:', 'woothemes-sensei')); ?></span> |
|
| 250 | 250 | <span class="total_grade_total"><?php echo $user_quiz_grade_total; ?></span> / <span class="quiz_grade_total"><?php echo $quiz_grade_total; ?></span> (<span class="total_grade_percent"><?php echo $quiz_grade; ?></span>%) |
| 251 | 251 | </div> |
| 252 | 252 | <div class="buttons"> |
| 253 | - <input type="submit" value="<?php esc_attr_e( 'Save' ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" /> |
|
| 254 | - <input type="button" value="<?php esc_attr_e( __( 'Auto grade', 'woothemes-sensei' ) ); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" /> |
|
| 255 | - <input type="reset" value="<?php esc_attr_e( __( 'Reset', 'woothemes-sensei' ) ); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" /> |
|
| 253 | + <input type="submit" value="<?php esc_attr_e('Save'); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" /> |
|
| 254 | + <input type="button" value="<?php esc_attr_e(__('Auto grade', 'woothemes-sensei')); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" /> |
|
| 255 | + <input type="reset" value="<?php esc_attr_e(__('Reset', 'woothemes-sensei')); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" /> |
|
| 256 | 256 | </div> |
| 257 | 257 | <div class="clear"></div> |
| 258 | 258 | <script type="text/javascript"> |
@@ -271,4 +271,4 @@ discard block |
||
| 271 | 271 | * for backward compatibility |
| 272 | 272 | * @since 1.9.0 |
| 273 | 273 | */ |
| 274 | -class WooThemes_Sensei_Grading_User_Quiz extends Sensei_Grading_User_Quiz{} |
|
| 274 | +class WooThemes_Sensei_Grading_User_Quiz extends Sensei_Grading_User_Quiz {} |
|
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Sensei Quiz Class |
@@ -23,24 +23,24 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * @param $file |
| 25 | 25 | */ |
| 26 | - public function __construct ( $file = __FILE__ ) { |
|
| 26 | + public function __construct($file = __FILE__) { |
|
| 27 | 27 | $this->file = $file; |
| 28 | - $this->meta_fields = array( 'quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required','enable_quiz_reset' ); |
|
| 29 | - add_action( 'save_post', array( $this, 'update_author' )); |
|
| 28 | + $this->meta_fields = array('quiz_passmark', 'quiz_lesson', 'quiz_type', 'quiz_grade_type', 'pass_required', 'enable_quiz_reset'); |
|
| 29 | + add_action('save_post', array($this, 'update_author')); |
|
| 30 | 30 | |
| 31 | 31 | // listen to the reset button click |
| 32 | - add_action( 'template_redirect', array( $this, 'reset_button_click_listener' ) ); |
|
| 32 | + add_action('template_redirect', array($this, 'reset_button_click_listener')); |
|
| 33 | 33 | |
| 34 | 34 | // fire the complete quiz button submit for grading action |
| 35 | - add_action( 'sensei_complete_quiz', array( $this, 'user_quiz_submit_listener' ) ); |
|
| 35 | + add_action('sensei_complete_quiz', array($this, 'user_quiz_submit_listener')); |
|
| 36 | 36 | |
| 37 | 37 | // fire the save user answers quiz button click responder |
| 38 | - add_action( 'sensei_complete_quiz', array( $this, 'user_save_quiz_answers_listener' ) ); |
|
| 38 | + add_action('sensei_complete_quiz', array($this, 'user_save_quiz_answers_listener')); |
|
| 39 | 39 | |
| 40 | 40 | // fire the load global data function |
| 41 | - add_action( 'sensei_complete_quiz', array( $this, 'load_global_quiz_data' ), 80 ); |
|
| 41 | + add_action('sensei_complete_quiz', array($this, 'load_global_quiz_data'), 80); |
|
| 42 | 42 | |
| 43 | - add_action( 'template_redirect', array ( $this, 'quiz_has_no_questions') ); |
|
| 43 | + add_action('template_redirect', array($this, 'quiz_has_no_questions')); |
|
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | } // End __construct() |
@@ -51,26 +51,26 @@ discard block |
||
| 51 | 51 | * @param int $post_id |
| 52 | 52 | * @return void |
| 53 | 53 | */ |
| 54 | - public function update_author( $post_id ){ |
|
| 54 | + public function update_author($post_id) { |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | // If this isn't a 'lesson' post, don't update it. |
| 58 | 58 | // if this is a revision don't save it |
| 59 | - if ( isset( $_POST['post_type'] ) && 'lesson' != $_POST['post_type'] |
|
| 60 | - || wp_is_post_revision( $post_id ) ) { |
|
| 59 | + if (isset($_POST['post_type']) && 'lesson' != $_POST['post_type'] |
|
| 60 | + || wp_is_post_revision($post_id)) { |
|
| 61 | 61 | |
| 62 | 62 | return; |
| 63 | 63 | |
| 64 | 64 | } |
| 65 | 65 | // get the lesson author id to be use late |
| 66 | - $saved_post = get_post( $post_id ); |
|
| 67 | - $new_lesson_author_id = $saved_post->post_author; |
|
| 66 | + $saved_post = get_post($post_id); |
|
| 67 | + $new_lesson_author_id = $saved_post->post_author; |
|
| 68 | 68 | |
| 69 | 69 | //get the lessons quiz |
| 70 | - $lesson_quizzes = Sensei()->lesson->lesson_quizzes( $post_id ); |
|
| 71 | - foreach ( (array) $lesson_quizzes as $quiz_item ) { |
|
| 70 | + $lesson_quizzes = Sensei()->lesson->lesson_quizzes($post_id); |
|
| 71 | + foreach ((array) $lesson_quizzes as $quiz_item) { |
|
| 72 | 72 | |
| 73 | - if( ! $quiz_item ) { |
|
| 73 | + if ( ! $quiz_item) { |
|
| 74 | 74 | continue; |
| 75 | 75 | } |
| 76 | 76 | |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | 83 | // remove the action so that it doesn't fire again |
| 84 | - remove_action( 'save_post', array( $this, 'update_author' )); |
|
| 84 | + remove_action('save_post', array($this, 'update_author')); |
|
| 85 | 85 | |
| 86 | 86 | // Update the post into the database |
| 87 | - wp_update_post( $my_post ); |
|
| 87 | + wp_update_post($my_post); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | return; |
@@ -98,19 +98,19 @@ discard block |
||
| 98 | 98 | * @param int $quiz_id |
| 99 | 99 | * @return int @lesson_id |
| 100 | 100 | */ |
| 101 | - public function get_lesson_id( $quiz_id ){ |
|
| 101 | + public function get_lesson_id($quiz_id) { |
|
| 102 | 102 | |
| 103 | - if( empty( $quiz_id ) || ! intval( $quiz_id ) > 0 ){ |
|
| 103 | + if (empty($quiz_id) || ! intval($quiz_id) > 0) { |
|
| 104 | 104 | global $post; |
| 105 | - if( 'quiz' == get_post_type( $post ) ){ |
|
| 105 | + if ('quiz' == get_post_type($post)) { |
|
| 106 | 106 | $quiz_id = $post->ID; |
| 107 | - }else{ |
|
| 107 | + } else { |
|
| 108 | 108 | return false; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - $quiz = get_post( $quiz_id ); |
|
| 113 | + $quiz = get_post($quiz_id); |
|
| 114 | 114 | $lesson_id = $quiz->post_parent; |
| 115 | 115 | |
| 116 | 116 | return $lesson_id; |
@@ -125,23 +125,23 @@ discard block |
||
| 125 | 125 | * @since 1.7.3 |
| 126 | 126 | * @return bool $saved; |
| 127 | 127 | */ |
| 128 | - public function user_save_quiz_answers_listener(){ |
|
| 128 | + public function user_save_quiz_answers_listener() { |
|
| 129 | 129 | |
| 130 | - if( ! isset( $_POST[ 'quiz_save' ]) |
|
| 131 | - || !isset( $_POST[ 'sensei_question' ] ) |
|
| 132 | - || empty( $_POST[ 'sensei_question' ] ) |
|
| 133 | - || ! wp_verify_nonce( $_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce' ) > 1 ) { |
|
| 130 | + if ( ! isset($_POST['quiz_save']) |
|
| 131 | + || ! isset($_POST['sensei_question']) |
|
| 132 | + || empty($_POST['sensei_question']) |
|
| 133 | + || ! wp_verify_nonce($_POST['woothemes_sensei_save_quiz_nonce'], 'woothemes_sensei_save_quiz_nonce') > 1) { |
|
| 134 | 134 | return; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | global $post; |
| 138 | - $lesson_id = $this->get_lesson_id( $post->ID ); |
|
| 139 | - $quiz_answers = $_POST[ 'sensei_question' ]; |
|
| 138 | + $lesson_id = $this->get_lesson_id($post->ID); |
|
| 139 | + $quiz_answers = $_POST['sensei_question']; |
|
| 140 | 140 | // call the save function |
| 141 | - self::save_user_answers( $quiz_answers, $_FILES , $lesson_id , get_current_user_id() ); |
|
| 141 | + self::save_user_answers($quiz_answers, $_FILES, $lesson_id, get_current_user_id()); |
|
| 142 | 142 | |
| 143 | 143 | // remove the hook as it should only fire once per click |
| 144 | - remove_action( 'sensei_complete_quiz', 'user_save_quiz_answers_listener' ); |
|
| 144 | + remove_action('sensei_complete_quiz', 'user_save_quiz_answers_listener'); |
|
| 145 | 145 | |
| 146 | 146 | } // end user_save_quiz_answers_listener |
| 147 | 147 | |
@@ -160,17 +160,17 @@ discard block |
||
| 160 | 160 | * |
| 161 | 161 | * @return false or int $answers_saved |
| 162 | 162 | */ |
| 163 | - public static function save_user_answers( $quiz_answers, $files = array(), $lesson_id , $user_id = 0 ){ |
|
| 163 | + public static function save_user_answers($quiz_answers, $files = array(), $lesson_id, $user_id = 0) { |
|
| 164 | 164 | |
| 165 | - if( ! ( $user_id > 0 ) ){ |
|
| 165 | + if ( ! ($user_id > 0)) { |
|
| 166 | 166 | $user_id = get_current_user_id(); |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | // make sure the parameters are valid before continuing |
| 170 | - if( empty( $lesson_id ) || empty( $user_id ) |
|
| 171 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 172 | - ||!get_userdata( $user_id ) |
|
| 173 | - || !is_array( $quiz_answers ) ){ |
|
| 170 | + if (empty($lesson_id) || empty($user_id) |
|
| 171 | + || 'lesson' != get_post_type($lesson_id) |
|
| 172 | + ||! get_userdata($user_id) |
|
| 173 | + || ! is_array($quiz_answers)) { |
|
| 174 | 174 | |
| 175 | 175 | return false; |
| 176 | 176 | |
@@ -178,23 +178,23 @@ discard block |
||
| 178 | 178 | |
| 179 | 179 | |
| 180 | 180 | // start the lesson before saving the data in case the user has not started the lesson |
| 181 | - $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id ); |
|
| 181 | + $activity_logged = Sensei_Utils::sensei_start_lesson($lesson_id, $user_id); |
|
| 182 | 182 | |
| 183 | 183 | //prepare the answers |
| 184 | - $prepared_answers = self::prepare_form_submitted_answers( $quiz_answers , $files ); |
|
| 184 | + $prepared_answers = self::prepare_form_submitted_answers($quiz_answers, $files); |
|
| 185 | 185 | |
| 186 | 186 | // save the user data |
| 187 | - $answers_saved = Sensei_Utils::add_user_data( 'quiz_answers', $lesson_id, $prepared_answers, $user_id ) ; |
|
| 187 | + $answers_saved = Sensei_Utils::add_user_data('quiz_answers', $lesson_id, $prepared_answers, $user_id); |
|
| 188 | 188 | |
| 189 | 189 | // were the answers saved correctly? |
| 190 | - if( intval( $answers_saved ) > 0){ |
|
| 190 | + if (intval($answers_saved) > 0) { |
|
| 191 | 191 | |
| 192 | 192 | // save transient to make retrieval faster |
| 193 | 193 | $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id; |
| 194 | - set_transient( $transient_key, $prepared_answers, 10 * DAY_IN_SECONDS ); |
|
| 194 | + set_transient($transient_key, $prepared_answers, 10 * DAY_IN_SECONDS); |
|
| 195 | 195 | |
| 196 | 196 | // update the message showed to user |
| 197 | - Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Saved Successfully.', 'woothemes-sensei' ) . '</div>'; |
|
| 197 | + Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Saved Successfully.', 'woothemes-sensei').'</div>'; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | return $answers_saved; |
@@ -216,41 +216,41 @@ discard block |
||
| 216 | 216 | * |
| 217 | 217 | * @return array $answers or false |
| 218 | 218 | */ |
| 219 | - public function get_user_answers( $lesson_id, $user_id ){ |
|
| 219 | + public function get_user_answers($lesson_id, $user_id) { |
|
| 220 | 220 | |
| 221 | 221 | $answers = false; |
| 222 | 222 | |
| 223 | - if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id ) |
|
| 224 | - || ! intval( $user_id ) > 0 || !get_userdata( $user_id ) ) { |
|
| 223 | + if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id) |
|
| 224 | + || ! intval($user_id) > 0 || ! get_userdata($user_id)) { |
|
| 225 | 225 | return false; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | // save some time and get the transient cached data |
| 229 | 229 | $transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id; |
| 230 | - $transient_cached_answers = get_transient( $transient_key ); |
|
| 230 | + $transient_cached_answers = get_transient($transient_key); |
|
| 231 | 231 | |
| 232 | 232 | // return the transient or get the values get the values from the comment meta |
| 233 | - if( !empty( $transient_cached_answers ) && false != $transient_cached_answers ){ |
|
| 233 | + if ( ! empty($transient_cached_answers) && false != $transient_cached_answers) { |
|
| 234 | 234 | |
| 235 | 235 | $encoded_user_answers = $transient_cached_answers; |
| 236 | 236 | |
| 237 | - }else{ |
|
| 237 | + } else { |
|
| 238 | 238 | |
| 239 | - $encoded_user_answers = Sensei_Utils::get_user_data( 'quiz_answers', $lesson_id , $user_id ); |
|
| 239 | + $encoded_user_answers = Sensei_Utils::get_user_data('quiz_answers', $lesson_id, $user_id); |
|
| 240 | 240 | |
| 241 | 241 | } // end if transient check |
| 242 | 242 | |
| 243 | - if( ! is_array( $encoded_user_answers ) ){ |
|
| 243 | + if ( ! is_array($encoded_user_answers)) { |
|
| 244 | 244 | return false; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | //set the transient with the new valid data for faster retrieval in future |
| 248 | - set_transient( $transient_key, $encoded_user_answers, 10 * DAY_IN_SECONDS); |
|
| 248 | + set_transient($transient_key, $encoded_user_answers, 10 * DAY_IN_SECONDS); |
|
| 249 | 249 | |
| 250 | 250 | // decode an unserialize all answers |
| 251 | - foreach( $encoded_user_answers as $question_id => $encoded_answer ) { |
|
| 252 | - $decoded_answer = base64_decode( $encoded_answer ); |
|
| 253 | - $answers[$question_id] = maybe_unserialize( $decoded_answer ); |
|
| 251 | + foreach ($encoded_user_answers as $question_id => $encoded_answer) { |
|
| 252 | + $decoded_answer = base64_decode($encoded_answer); |
|
| 253 | + $answers[$question_id] = maybe_unserialize($decoded_answer); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | return $answers; |
@@ -267,23 +267,23 @@ discard block |
||
| 267 | 267 | * |
| 268 | 268 | * @return void; |
| 269 | 269 | */ |
| 270 | - public function reset_button_click_listener( ){ |
|
| 270 | + public function reset_button_click_listener( ) { |
|
| 271 | 271 | |
| 272 | - if( ! isset( $_POST[ 'quiz_reset' ]) |
|
| 273 | - || ! wp_verify_nonce( $_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce' ) > 1 ) { |
|
| 272 | + if ( ! isset($_POST['quiz_reset']) |
|
| 273 | + || ! wp_verify_nonce($_POST['woothemes_sensei_reset_quiz_nonce'], 'woothemes_sensei_reset_quiz_nonce') > 1) { |
|
| 274 | 274 | |
| 275 | 275 | return; // exit |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | global $post; |
| 279 | 279 | $current_quiz_id = $post->ID; |
| 280 | - $lesson_id = $this->get_lesson_id( $current_quiz_id ); |
|
| 280 | + $lesson_id = $this->get_lesson_id($current_quiz_id); |
|
| 281 | 281 | |
| 282 | 282 | // reset all user data |
| 283 | - $this->reset_user_lesson_data( $lesson_id, get_current_user_id() ); |
|
| 283 | + $this->reset_user_lesson_data($lesson_id, get_current_user_id()); |
|
| 284 | 284 | |
| 285 | 285 | //this function should only run once |
| 286 | - remove_action( 'template_redirect', array( $this, 'reset_button_click_listener' ) ); |
|
| 286 | + remove_action('template_redirect', array($this, 'reset_button_click_listener')); |
|
| 287 | 287 | |
| 288 | 288 | } // end reset_button_click_listener |
| 289 | 289 | |
@@ -302,18 +302,18 @@ discard block |
||
| 302 | 302 | public function user_quiz_submit_listener() { |
| 303 | 303 | |
| 304 | 304 | // only respond to valid quiz completion submissions |
| 305 | - if( ! isset( $_POST[ 'quiz_complete' ]) |
|
| 306 | - || !isset( $_POST[ 'sensei_question' ] ) |
|
| 307 | - || empty( $_POST[ 'sensei_question' ] ) |
|
| 308 | - || ! wp_verify_nonce( $_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce' ) > 1 ) { |
|
| 305 | + if ( ! isset($_POST['quiz_complete']) |
|
| 306 | + || ! isset($_POST['sensei_question']) |
|
| 307 | + || empty($_POST['sensei_question']) |
|
| 308 | + || ! wp_verify_nonce($_POST['woothemes_sensei_complete_quiz_nonce'], 'woothemes_sensei_complete_quiz_nonce') > 1) { |
|
| 309 | 309 | return; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | global $post, $current_user; |
| 313 | - $lesson_id = $this->get_lesson_id( $post->ID ); |
|
| 314 | - $quiz_answers = $_POST[ 'sensei_question' ]; |
|
| 313 | + $lesson_id = $this->get_lesson_id($post->ID); |
|
| 314 | + $quiz_answers = $_POST['sensei_question']; |
|
| 315 | 315 | |
| 316 | - self::submit_answers_for_grading( $quiz_answers, $_FILES , $lesson_id , $current_user->ID ); |
|
| 316 | + self::submit_answers_for_grading($quiz_answers, $_FILES, $lesson_id, $current_user->ID); |
|
| 317 | 317 | |
| 318 | 318 | } // End sensei_complete_quiz() |
| 319 | 319 | |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | * @access public |
| 328 | 328 | * |
| 329 | 329 | */ |
| 330 | - public function load_global_quiz_data(){ |
|
| 330 | + public function load_global_quiz_data() { |
|
| 331 | 331 | |
| 332 | 332 | global $post, $current_user; |
| 333 | 333 | $this->data = new stdClass(); |
@@ -336,46 +336,46 @@ discard block |
||
| 336 | 336 | $grade = 0; |
| 337 | 337 | |
| 338 | 338 | // Get Quiz Questions |
| 339 | - $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $post->ID ); |
|
| 339 | + $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($post->ID); |
|
| 340 | 340 | |
| 341 | - $quiz_lesson_id = absint( get_post_meta( $post->ID, '_quiz_lesson', true ) ); |
|
| 341 | + $quiz_lesson_id = absint(get_post_meta($post->ID, '_quiz_lesson', true)); |
|
| 342 | 342 | |
| 343 | 343 | // Get quiz grade type |
| 344 | - $quiz_grade_type = get_post_meta( $post->ID, '_quiz_grade_type', true ); |
|
| 344 | + $quiz_grade_type = get_post_meta($post->ID, '_quiz_grade_type', true); |
|
| 345 | 345 | |
| 346 | 346 | // Get quiz pass setting |
| 347 | - $pass_required = get_post_meta( $post->ID, '_pass_required', true ); |
|
| 347 | + $pass_required = get_post_meta($post->ID, '_pass_required', true); |
|
| 348 | 348 | |
| 349 | 349 | // Get quiz pass mark |
| 350 | - $quiz_passmark = abs( round( doubleval( get_post_meta( $post->ID, '_quiz_passmark', true ) ), 2 ) ); |
|
| 350 | + $quiz_passmark = abs(round(doubleval(get_post_meta($post->ID, '_quiz_passmark', true)), 2)); |
|
| 351 | 351 | |
| 352 | 352 | // Get latest quiz answers and grades |
| 353 | - $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID ); |
|
| 354 | - $user_quizzes = Sensei()->quiz->get_user_answers( $lesson_id, get_current_user_id() ); |
|
| 355 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $current_user->ID ); |
|
| 353 | + $lesson_id = Sensei()->quiz->get_lesson_id($post->ID); |
|
| 354 | + $user_quizzes = Sensei()->quiz->get_user_answers($lesson_id, get_current_user_id()); |
|
| 355 | + $user_lesson_status = Sensei_Utils::user_lesson_status($quiz_lesson_id, $current_user->ID); |
|
| 356 | 356 | $user_quiz_grade = 0; |
| 357 | - if( isset( $user_lesson_status->comment_ID ) ) { |
|
| 358 | - $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); |
|
| 357 | + if (isset($user_lesson_status->comment_ID)) { |
|
| 358 | + $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | - if ( ! is_array($user_quizzes) ) { $user_quizzes = array(); } |
|
| 361 | + if ( ! is_array($user_quizzes)) { $user_quizzes = array(); } |
|
| 362 | 362 | |
| 363 | 363 | // Check again that the lesson is complete |
| 364 | - $user_lesson_end = Sensei_Utils::user_completed_lesson( $user_lesson_status ); |
|
| 364 | + $user_lesson_end = Sensei_Utils::user_completed_lesson($user_lesson_status); |
|
| 365 | 365 | $user_lesson_complete = false; |
| 366 | - if ( $user_lesson_end ) { |
|
| 366 | + if ($user_lesson_end) { |
|
| 367 | 367 | $user_lesson_complete = true; |
| 368 | 368 | } // End If Statement |
| 369 | 369 | |
| 370 | - $reset_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); |
|
| 370 | + $reset_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true); |
|
| 371 | 371 | //backwards compatibility |
| 372 | - if( 'on' == $reset_allowed ) { |
|
| 372 | + if ('on' == $reset_allowed) { |
|
| 373 | 373 | $reset_allowed = 1; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | // Build frontend data object for backwards compatibility |
| 377 | 377 | // using this is no longer recommended |
| 378 | - $this->data->user_quiz_grade = $user_quiz_grade;// Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() ); |
|
| 378 | + $this->data->user_quiz_grade = $user_quiz_grade; // Sensei_Quiz::get_user_quiz_grade( $lesson_id, get_current_user_id() ); |
|
| 379 | 379 | $this->data->quiz_passmark = $quiz_passmark; |
| 380 | 380 | $this->data->quiz_lesson = $quiz_lesson_id; |
| 381 | 381 | $this->data->quiz_grade_type = $quiz_grade_type; // get_post_meta( $quiz_id, '_quiz_grade_type', true ); |
@@ -400,41 +400,41 @@ discard block |
||
| 400 | 400 | * @param $files |
| 401 | 401 | * @return array |
| 402 | 402 | */ |
| 403 | - public static function prepare_form_submitted_answers( $unprepared_answers, $files ){ |
|
| 403 | + public static function prepare_form_submitted_answers($unprepared_answers, $files) { |
|
| 404 | 404 | |
| 405 | 405 | |
| 406 | 406 | $prepared_answers = array(); |
| 407 | 407 | |
| 408 | 408 | // validate incoming answers |
| 409 | - if( empty( $unprepared_answers ) || ! is_array( $unprepared_answers ) ){ |
|
| 409 | + if (empty($unprepared_answers) || ! is_array($unprepared_answers)) { |
|
| 410 | 410 | return false; |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | // Loop through submitted quiz answers and save them appropriately |
| 414 | - foreach( $unprepared_answers as $question_id => $answer ) { |
|
| 414 | + foreach ($unprepared_answers as $question_id => $answer) { |
|
| 415 | 415 | |
| 416 | 416 | //get the current questions question type |
| 417 | - $question_type = Sensei()->question->get_question_type( $question_id ); |
|
| 417 | + $question_type = Sensei()->question->get_question_type($question_id); |
|
| 418 | 418 | |
| 419 | 419 | // Sanitise answer |
| 420 | - if( 0 == get_magic_quotes_gpc() ) { |
|
| 421 | - $answer = wp_unslash( $answer ); |
|
| 420 | + if (0 == get_magic_quotes_gpc()) { |
|
| 421 | + $answer = wp_unslash($answer); |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | // compress the answer for saving |
| 425 | - if( 'multi-line' == $question_type ) { |
|
| 426 | - $answer = esc_html( $answer ); |
|
| 427 | - }elseif( 'file-upload' == $question_type ){ |
|
| 428 | - $file_key = 'file_upload_' . $question_id; |
|
| 429 | - if( isset( $files[ $file_key ] ) ) { |
|
| 430 | - $attachment_id = Sensei_Utils::upload_file( $files[ $file_key ] ); |
|
| 431 | - if( $attachment_id ) { |
|
| 425 | + if ('multi-line' == $question_type) { |
|
| 426 | + $answer = esc_html($answer); |
|
| 427 | + }elseif ('file-upload' == $question_type) { |
|
| 428 | + $file_key = 'file_upload_'.$question_id; |
|
| 429 | + if (isset($files[$file_key])) { |
|
| 430 | + $attachment_id = Sensei_Utils::upload_file($files[$file_key]); |
|
| 431 | + if ($attachment_id) { |
|
| 432 | 432 | $answer = $attachment_id; |
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 | } // end if |
| 436 | 436 | |
| 437 | - $prepared_answers[ $question_id ] = base64_encode( maybe_serialize( $answer ) ); |
|
| 437 | + $prepared_answers[$question_id] = base64_encode(maybe_serialize($answer)); |
|
| 438 | 438 | |
| 439 | 439 | }// end for each $quiz_answers |
| 440 | 440 | |
@@ -454,54 +454,54 @@ discard block |
||
| 454 | 454 | * @param int $user_id |
| 455 | 455 | * @param int $lesson_id |
| 456 | 456 | */ |
| 457 | - public function reset_user_lesson_data( $lesson_id , $user_id = 0 ){ |
|
| 457 | + public function reset_user_lesson_data($lesson_id, $user_id = 0) { |
|
| 458 | 458 | |
| 459 | 459 | //make sure the parameters are valid |
| 460 | - if( empty( $lesson_id ) || empty( $user_id ) |
|
| 461 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 462 | - || ! get_userdata( $user_id ) ){ |
|
| 460 | + if (empty($lesson_id) || empty($user_id) |
|
| 461 | + || 'lesson' != get_post_type($lesson_id) |
|
| 462 | + || ! get_userdata($user_id)) { |
|
| 463 | 463 | return false; |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | |
| 467 | 467 | |
| 468 | 468 | //get the users lesson status to make |
| 469 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 470 | - if( ! isset( $user_lesson_status->comment_ID ) ) { |
|
| 469 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 470 | + if ( ! isset($user_lesson_status->comment_ID)) { |
|
| 471 | 471 | // this user is not taking this lesson so this process is not needed |
| 472 | 472 | return false; |
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | //get the lesson quiz and course |
| 476 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 477 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); |
|
| 476 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 477 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); |
|
| 478 | 478 | |
| 479 | 479 | // reset the transients |
| 480 | 480 | $answers_transient_key = 'sensei_answers_'.$user_id.'_'.$lesson_id; |
| 481 | 481 | $grades_transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id; |
| 482 | 482 | $answers_feedback_transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id; |
| 483 | - delete_transient( $answers_transient_key ); |
|
| 484 | - delete_transient( $grades_transient_key ); |
|
| 485 | - delete_transient( $answers_feedback_transient_key ); |
|
| 483 | + delete_transient($answers_transient_key); |
|
| 484 | + delete_transient($grades_transient_key); |
|
| 485 | + delete_transient($answers_feedback_transient_key); |
|
| 486 | 486 | |
| 487 | 487 | // reset the quiz answers and feedback notes |
| 488 | - $deleted_answers = Sensei_Utils::delete_user_data( 'quiz_answers', $lesson_id, $user_id ); |
|
| 489 | - $deleted_grades = Sensei_Utils::delete_user_data( 'quiz_grades', $lesson_id, $user_id ); |
|
| 490 | - $deleted_user_feedback = Sensei_Utils::delete_user_data( 'quiz_answers_feedback', $lesson_id, $user_id ); |
|
| 488 | + $deleted_answers = Sensei_Utils::delete_user_data('quiz_answers', $lesson_id, $user_id); |
|
| 489 | + $deleted_grades = Sensei_Utils::delete_user_data('quiz_grades', $lesson_id, $user_id); |
|
| 490 | + $deleted_user_feedback = Sensei_Utils::delete_user_data('quiz_answers_feedback', $lesson_id, $user_id); |
|
| 491 | 491 | |
| 492 | 492 | // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade |
| 493 | - Sensei_Utils::sensei_delete_quiz_answers( $quiz_id, $user_id ); |
|
| 493 | + Sensei_Utils::sensei_delete_quiz_answers($quiz_id, $user_id); |
|
| 494 | 494 | |
| 495 | - Sensei_Utils::update_lesson_status( $user_id , $lesson_id, 'in-progress', array( 'questions_asked' => '', 'grade' => '' ) ); |
|
| 495 | + Sensei_Utils::update_lesson_status($user_id, $lesson_id, 'in-progress', array('questions_asked' => '', 'grade' => '')); |
|
| 496 | 496 | |
| 497 | 497 | // Update course completion |
| 498 | - Sensei_Utils::update_course_status( $user_id, $course_id ); |
|
| 498 | + Sensei_Utils::update_course_status($user_id, $course_id); |
|
| 499 | 499 | |
| 500 | 500 | // Run any action on quiz/lesson reset (previously this didn't occur on resetting a quiz, see resetting a lesson in sensei_complete_lesson() |
| 501 | - do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id ); |
|
| 502 | - Sensei()->frontend->messages = '<div class="sensei-message note">' . __( 'Quiz Reset Successfully.', 'woothemes-sensei' ) . '</div>'; |
|
| 501 | + do_action('sensei_user_lesson_reset', $user_id, $lesson_id); |
|
| 502 | + Sensei()->frontend->messages = '<div class="sensei-message note">'.__('Quiz Reset Successfully.', 'woothemes-sensei').'</div>'; |
|
| 503 | 503 | |
| 504 | - return ( $deleted_answers && $deleted_grades ) ; |
|
| 504 | + return ($deleted_answers && $deleted_grades); |
|
| 505 | 505 | |
| 506 | 506 | } // end reset_user_lesson_data |
| 507 | 507 | |
@@ -521,20 +521,20 @@ discard block |
||
| 521 | 521 | * |
| 522 | 522 | * @return bool $answers_submitted |
| 523 | 523 | */ |
| 524 | - public static function submit_answers_for_grading( $quiz_answers , $files = array() , $lesson_id , $user_id = 0 ){ |
|
| 524 | + public static function submit_answers_for_grading($quiz_answers, $files = array(), $lesson_id, $user_id = 0) { |
|
| 525 | 525 | |
| 526 | 526 | $answers_submitted = false; |
| 527 | 527 | |
| 528 | 528 | // get the user_id if none was passed in use the current logged in user |
| 529 | - if( ! intval( $user_id ) > 0 ) { |
|
| 529 | + if ( ! intval($user_id) > 0) { |
|
| 530 | 530 | $user_id = get_current_user_id(); |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | // make sure the parameters are valid before continuing |
| 534 | - if( empty( $lesson_id ) || empty( $user_id ) |
|
| 535 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 536 | - ||!get_userdata( $user_id ) |
|
| 537 | - || !is_array( $quiz_answers ) ){ |
|
| 534 | + if (empty($lesson_id) || empty($user_id) |
|
| 535 | + || 'lesson' != get_post_type($lesson_id) |
|
| 536 | + ||! get_userdata($user_id) |
|
| 537 | + || ! is_array($quiz_answers)) { |
|
| 538 | 538 | |
| 539 | 539 | return false; |
| 540 | 540 | |
@@ -544,38 +544,38 @@ discard block |
||
| 544 | 544 | $grade = 0; |
| 545 | 545 | |
| 546 | 546 | // Get Quiz ID |
| 547 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 547 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 548 | 548 | |
| 549 | 549 | // Get quiz grade type |
| 550 | - $quiz_grade_type = get_post_meta( $quiz_id, '_quiz_grade_type', true ); |
|
| 550 | + $quiz_grade_type = get_post_meta($quiz_id, '_quiz_grade_type', true); |
|
| 551 | 551 | |
| 552 | 552 | // Get quiz pass setting |
| 553 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); |
|
| 553 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); |
|
| 554 | 554 | |
| 555 | 555 | // Get the minimum percentage need to pass this quiz |
| 556 | - $quiz_pass_percentage = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) ); |
|
| 556 | + $quiz_pass_percentage = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2)); |
|
| 557 | 557 | |
| 558 | 558 | // Handle Quiz Questions asked |
| 559 | 559 | // This is to ensure we save the questions that we've asked this user and that this can't be change unless |
| 560 | 560 | // the quiz is reset by admin or user( user: only if the setting is enabled ). |
| 561 | 561 | // get the questions asked when when the quiz questions were generated for the user : Sensei_Lesson::lesson_quiz_questions |
| 562 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 563 | - $questions_asked = get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true ); |
|
| 564 | - if( empty( $questions_asked ) ){ |
|
| 562 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 563 | + $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true); |
|
| 564 | + if (empty($questions_asked)) { |
|
| 565 | 565 | |
| 566 | - $questions_asked = array_keys( $quiz_answers ); |
|
| 567 | - $questions_asked_string = implode( ',', $questions_asked ); |
|
| 566 | + $questions_asked = array_keys($quiz_answers); |
|
| 567 | + $questions_asked_string = implode(',', $questions_asked); |
|
| 568 | 568 | |
| 569 | 569 | // Save questions that were asked in this quiz |
| 570 | - update_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string ); |
|
| 570 | + update_comment_meta($user_lesson_status->comment_ID, 'questions_asked', $questions_asked_string); |
|
| 571 | 571 | |
| 572 | 572 | } |
| 573 | 573 | |
| 574 | 574 | // Save Quiz Answers for grading, the save function also calls the sensei_start_lesson |
| 575 | - self::save_user_answers( $quiz_answers , $files , $lesson_id , $user_id ); |
|
| 575 | + self::save_user_answers($quiz_answers, $files, $lesson_id, $user_id); |
|
| 576 | 576 | |
| 577 | 577 | // Grade quiz |
| 578 | - $grade = Sensei_Grading::grade_quiz_auto( $quiz_id, $quiz_answers, 0 , $quiz_grade_type ); |
|
| 578 | + $grade = Sensei_Grading::grade_quiz_auto($quiz_id, $quiz_answers, 0, $quiz_grade_type); |
|
| 579 | 579 | |
| 580 | 580 | // Get Lesson Grading Setting |
| 581 | 581 | $lesson_metadata = array(); |
@@ -585,13 +585,13 @@ discard block |
||
| 585 | 585 | $answers_submitted = true; |
| 586 | 586 | |
| 587 | 587 | // if this condition is false the quiz should manually be graded by admin |
| 588 | - if ('auto' == $quiz_grade_type && ! is_wp_error( $grade ) ) { |
|
| 588 | + if ('auto' == $quiz_grade_type && ! is_wp_error($grade)) { |
|
| 589 | 589 | |
| 590 | 590 | // Quiz has been automatically Graded |
| 591 | - if ( 'on' == $pass_required ) { |
|
| 591 | + if ('on' == $pass_required) { |
|
| 592 | 592 | |
| 593 | 593 | // Student has reached the pass mark and lesson is complete |
| 594 | - if ( $quiz_pass_percentage <= $grade ) { |
|
| 594 | + if ($quiz_pass_percentage <= $grade) { |
|
| 595 | 595 | |
| 596 | 596 | $lesson_status = 'passed'; |
| 597 | 597 | |
@@ -612,9 +612,9 @@ discard block |
||
| 612 | 612 | |
| 613 | 613 | } // end if ! is_wp_error( $grade ... |
| 614 | 614 | |
| 615 | - Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $lesson_status, $lesson_metadata ); |
|
| 615 | + Sensei_Utils::update_lesson_status($user_id, $lesson_id, $lesson_status, $lesson_metadata); |
|
| 616 | 616 | |
| 617 | - if( 'passed' == $lesson_status || 'graded' == $lesson_status ){ |
|
| 617 | + if ('passed' == $lesson_status || 'graded' == $lesson_status) { |
|
| 618 | 618 | |
| 619 | 619 | /** |
| 620 | 620 | * Lesson end action hook |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | * @param int $user_id |
| 625 | 625 | * @param int $lesson_id |
| 626 | 626 | */ |
| 627 | - do_action( 'sensei_user_lesson_end', $user_id, $lesson_id ); |
|
| 627 | + do_action('sensei_user_lesson_end', $user_id, $lesson_id); |
|
| 628 | 628 | |
| 629 | 629 | } |
| 630 | 630 | |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | * @param string $quiz_pass_percentage |
| 641 | 641 | * @param string $quiz_grade_type |
| 642 | 642 | */ |
| 643 | - do_action( 'sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type ); |
|
| 643 | + do_action('sensei_user_quiz_submitted', $user_id, $quiz_id, $grade, $quiz_pass_percentage, $quiz_grade_type); |
|
| 644 | 644 | |
| 645 | 645 | return $answers_submitted; |
| 646 | 646 | |
@@ -660,38 +660,38 @@ discard block |
||
| 660 | 660 | * |
| 661 | 661 | * @return bool $answers_submitted |
| 662 | 662 | */ |
| 663 | - public function get_user_question_answer( $lesson_id, $question_id, $user_id = 0 ){ |
|
| 663 | + public function get_user_question_answer($lesson_id, $question_id, $user_id = 0) { |
|
| 664 | 664 | |
| 665 | 665 | // parameter validation |
| 666 | - if( empty( $lesson_id ) || empty( $question_id ) |
|
| 667 | - || ! ( intval( $lesson_id ) > 0 ) |
|
| 668 | - || ! ( intval( $question_id ) > 0 ) |
|
| 669 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 670 | - || 'question' != get_post_type( $question_id )) { |
|
| 666 | + if (empty($lesson_id) || empty($question_id) |
|
| 667 | + || ! (intval($lesson_id) > 0) |
|
| 668 | + || ! (intval($question_id) > 0) |
|
| 669 | + || 'lesson' != get_post_type($lesson_id) |
|
| 670 | + || 'question' != get_post_type($question_id)) { |
|
| 671 | 671 | |
| 672 | 672 | return false; |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | - if( ! ( intval( $user_id ) > 0 ) ){ |
|
| 675 | + if ( ! (intval($user_id) > 0)) { |
|
| 676 | 676 | $user_id = get_current_user_id(); |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | - $users_answers = $this->get_user_answers( $lesson_id, $user_id ); |
|
| 679 | + $users_answers = $this->get_user_answers($lesson_id, $user_id); |
|
| 680 | 680 | |
| 681 | - if( !$users_answers || empty( $users_answers ) |
|
| 682 | - || ! is_array( $users_answers ) || ! isset( $users_answers[ $question_id ] ) ){ |
|
| 681 | + if ( ! $users_answers || empty($users_answers) |
|
| 682 | + || ! is_array($users_answers) || ! isset($users_answers[$question_id])) { |
|
| 683 | 683 | |
| 684 | 684 | //Fallback for pre 1.7.4 data |
| 685 | - $comment = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ), true ); |
|
| 685 | + $comment = Sensei_Utils::sensei_check_for_activity(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer'), true); |
|
| 686 | 686 | |
| 687 | - if( ! isset( $comment->comment_content ) ){ |
|
| 687 | + if ( ! isset($comment->comment_content)) { |
|
| 688 | 688 | return false; |
| 689 | 689 | } |
| 690 | 690 | |
| 691 | - return maybe_unserialize( base64_decode( $comment->comment_content ) ); |
|
| 691 | + return maybe_unserialize(base64_decode($comment->comment_content)); |
|
| 692 | 692 | } |
| 693 | 693 | |
| 694 | - return $users_answers[ $question_id ]; |
|
| 694 | + return $users_answers[$question_id]; |
|
| 695 | 695 | |
| 696 | 696 | }// end get_user_question_answer |
| 697 | 697 | |
@@ -712,18 +712,18 @@ discard block |
||
| 712 | 712 | * |
| 713 | 713 | * @return bool |
| 714 | 714 | */ |
| 715 | - public function set_user_grades( $quiz_grades, $lesson_id, $user_id = 0 ){ |
|
| 715 | + public function set_user_grades($quiz_grades, $lesson_id, $user_id = 0) { |
|
| 716 | 716 | |
| 717 | 717 | // get the user_id if none was passed in use the current logged in user |
| 718 | - if( ! intval( $user_id ) > 0 ) { |
|
| 718 | + if ( ! intval($user_id) > 0) { |
|
| 719 | 719 | $user_id = get_current_user_id(); |
| 720 | 720 | } |
| 721 | 721 | |
| 722 | 722 | // make sure the parameters are valid before continuing |
| 723 | - if( empty( $lesson_id ) || empty( $user_id ) |
|
| 724 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 725 | - ||!get_userdata( $user_id ) |
|
| 726 | - || !is_array( $quiz_grades ) ){ |
|
| 723 | + if (empty($lesson_id) || empty($user_id) |
|
| 724 | + || 'lesson' != get_post_type($lesson_id) |
|
| 725 | + ||! get_userdata($user_id) |
|
| 726 | + || ! is_array($quiz_grades)) { |
|
| 727 | 727 | |
| 728 | 728 | return false; |
| 729 | 729 | |
@@ -732,15 +732,15 @@ discard block |
||
| 732 | 732 | $success = false; |
| 733 | 733 | |
| 734 | 734 | // save that data for the user on the lesson comment meta |
| 735 | - $comment_meta_id = Sensei_Utils::add_user_data( 'quiz_grades', $lesson_id, $quiz_grades, $user_id ); |
|
| 735 | + $comment_meta_id = Sensei_Utils::add_user_data('quiz_grades', $lesson_id, $quiz_grades, $user_id); |
|
| 736 | 736 | |
| 737 | 737 | // were the grades save successfully ? |
| 738 | - if( intval( $comment_meta_id ) > 0 ) { |
|
| 738 | + if (intval($comment_meta_id) > 0) { |
|
| 739 | 739 | |
| 740 | 740 | $success = true; |
| 741 | 741 | // save transient |
| 742 | - $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id; |
|
| 743 | - set_transient( $transient_key, $quiz_grades, 10 * DAY_IN_SECONDS ); |
|
| 742 | + $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id; |
|
| 743 | + set_transient($transient_key, $quiz_grades, 10 * DAY_IN_SECONDS); |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | return $success; |
@@ -759,36 +759,36 @@ discard block |
||
| 759 | 759 | * |
| 760 | 760 | * @return array $user_quiz_grades or false if none exists for this users |
| 761 | 761 | */ |
| 762 | - public function get_user_grades( $lesson_id, $user_id = 0 ){ |
|
| 762 | + public function get_user_grades($lesson_id, $user_id = 0) { |
|
| 763 | 763 | |
| 764 | 764 | $user_grades = array(); |
| 765 | 765 | |
| 766 | 766 | // get the user_id if none was passed in use the current logged in user |
| 767 | - if( ! intval( $user_id ) > 0 ) { |
|
| 767 | + if ( ! intval($user_id) > 0) { |
|
| 768 | 768 | $user_id = get_current_user_id(); |
| 769 | 769 | } |
| 770 | 770 | |
| 771 | - if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id ) |
|
| 772 | - || ! intval( $user_id ) > 0 || !get_userdata( $user_id ) ) { |
|
| 771 | + if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id) |
|
| 772 | + || ! intval($user_id) > 0 || ! get_userdata($user_id)) { |
|
| 773 | 773 | return false; |
| 774 | 774 | } |
| 775 | 775 | |
| 776 | 776 | // save some time and get the transient cached data |
| 777 | - $transient_key = 'quiz_grades_'. $user_id . '_' . $lesson_id; |
|
| 778 | - $user_grades = get_transient( $transient_key ); |
|
| 777 | + $transient_key = 'quiz_grades_'.$user_id.'_'.$lesson_id; |
|
| 778 | + $user_grades = get_transient($transient_key); |
|
| 779 | 779 | |
| 780 | 780 | // get the data if nothing was stored in the transient |
| 781 | - if( empty( $user_grades ) || false != $user_grades ){ |
|
| 781 | + if (empty($user_grades) || false != $user_grades) { |
|
| 782 | 782 | |
| 783 | - $user_grades = Sensei_Utils::get_user_data( 'quiz_grades', $lesson_id, $user_id ); |
|
| 783 | + $user_grades = Sensei_Utils::get_user_data('quiz_grades', $lesson_id, $user_id); |
|
| 784 | 784 | |
| 785 | 785 | //set the transient with the new valid data for faster retrieval in future |
| 786 | - set_transient( $transient_key, $user_grades, 10 * DAY_IN_SECONDS ); |
|
| 786 | + set_transient($transient_key, $user_grades, 10 * DAY_IN_SECONDS); |
|
| 787 | 787 | |
| 788 | 788 | } // end if transient check |
| 789 | 789 | |
| 790 | 790 | // if there is no data for this user |
| 791 | - if( ! is_array( $user_grades ) ){ |
|
| 791 | + if ( ! is_array($user_grades)) { |
|
| 792 | 792 | return false; |
| 793 | 793 | } |
| 794 | 794 | |
@@ -811,21 +811,21 @@ discard block |
||
| 811 | 811 | * |
| 812 | 812 | * @return bool $question_grade |
| 813 | 813 | */ |
| 814 | - public function get_user_question_grade( $lesson_id, $question_id, $user_id = 0 ){ |
|
| 814 | + public function get_user_question_grade($lesson_id, $question_id, $user_id = 0) { |
|
| 815 | 815 | |
| 816 | 816 | // parameter validation |
| 817 | - if( empty( $lesson_id ) || empty( $question_id ) |
|
| 818 | - || ! ( intval( $lesson_id ) > 0 ) |
|
| 819 | - || ! ( intval( $question_id ) > 0 ) |
|
| 820 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 821 | - || 'question' != get_post_type( $question_id )) { |
|
| 817 | + if (empty($lesson_id) || empty($question_id) |
|
| 818 | + || ! (intval($lesson_id) > 0) |
|
| 819 | + || ! (intval($question_id) > 0) |
|
| 820 | + || 'lesson' != get_post_type($lesson_id) |
|
| 821 | + || 'question' != get_post_type($question_id)) { |
|
| 822 | 822 | |
| 823 | 823 | return false; |
| 824 | 824 | } |
| 825 | 825 | |
| 826 | - $all_user_grades = self::get_user_grades( $lesson_id,$user_id ); |
|
| 826 | + $all_user_grades = self::get_user_grades($lesson_id, $user_id); |
|
| 827 | 827 | |
| 828 | - if( ! $all_user_grades || ! isset( $all_user_grades[ $question_id ] ) ){ |
|
| 828 | + if ( ! $all_user_grades || ! isset($all_user_grades[$question_id])) { |
|
| 829 | 829 | |
| 830 | 830 | //fallback to data pre 1.7.4 |
| 831 | 831 | $args = array( |
@@ -834,17 +834,17 @@ discard block |
||
| 834 | 834 | 'type' => 'sensei_user_answer' |
| 835 | 835 | ); |
| 836 | 836 | |
| 837 | - $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true ); |
|
| 837 | + $question_activity = Sensei_Utils::sensei_check_for_activity($args, true); |
|
| 838 | 838 | $fall_back_grade = false; |
| 839 | - if( isset( $question_activity->comment_ID ) ){ |
|
| 840 | - $fall_back_grade = get_comment_meta( $question_activity->comment_ID , 'user_grade', true ); |
|
| 839 | + if (isset($question_activity->comment_ID)) { |
|
| 840 | + $fall_back_grade = get_comment_meta($question_activity->comment_ID, 'user_grade', true); |
|
| 841 | 841 | } |
| 842 | 842 | |
| 843 | 843 | return $fall_back_grade; |
| 844 | 844 | |
| 845 | 845 | } // end if $all_user_grades... |
| 846 | 846 | |
| 847 | - return $all_user_grades[ $question_id ]; |
|
| 847 | + return $all_user_grades[$question_id]; |
|
| 848 | 848 | |
| 849 | 849 | }// end get_user_question_grade |
| 850 | 850 | |
@@ -866,13 +866,13 @@ discard block |
||
| 866 | 866 | * |
| 867 | 867 | * @return false or int $feedback_saved |
| 868 | 868 | */ |
| 869 | - public function save_user_answers_feedback( $answers_feedback, $lesson_id , $user_id = 0 ){ |
|
| 869 | + public function save_user_answers_feedback($answers_feedback, $lesson_id, $user_id = 0) { |
|
| 870 | 870 | |
| 871 | 871 | // make sure the parameters are valid before continuing |
| 872 | - if( empty( $lesson_id ) || empty( $user_id ) |
|
| 873 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 874 | - ||!get_userdata( $user_id ) |
|
| 875 | - || !is_array( $answers_feedback ) ){ |
|
| 872 | + if (empty($lesson_id) || empty($user_id) |
|
| 873 | + || 'lesson' != get_post_type($lesson_id) |
|
| 874 | + ||! get_userdata($user_id) |
|
| 875 | + || ! is_array($answers_feedback)) { |
|
| 876 | 876 | |
| 877 | 877 | return false; |
| 878 | 878 | |
@@ -880,25 +880,25 @@ discard block |
||
| 880 | 880 | |
| 881 | 881 | |
| 882 | 882 | // check if the lesson is started before saving, if not start the lesson for the user |
| 883 | - if ( !( 0 < intval( Sensei_Utils::user_started_lesson( $lesson_id, $user_id) ) ) ) { |
|
| 884 | - Sensei_Utils::sensei_start_lesson( $lesson_id, $user_id ); |
|
| 883 | + if ( ! (0 < intval(Sensei_Utils::user_started_lesson($lesson_id, $user_id)))) { |
|
| 884 | + Sensei_Utils::sensei_start_lesson($lesson_id, $user_id); |
|
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | // encode the feedback |
| 888 | - $encoded_answers_feedback = array(); |
|
| 889 | - foreach( $answers_feedback as $question_id => $feedback ){ |
|
| 890 | - $encoded_answers_feedback[ $question_id ] = base64_encode( $feedback ); |
|
| 888 | + $encoded_answers_feedback = array(); |
|
| 889 | + foreach ($answers_feedback as $question_id => $feedback) { |
|
| 890 | + $encoded_answers_feedback[$question_id] = base64_encode($feedback); |
|
| 891 | 891 | } |
| 892 | 892 | |
| 893 | 893 | // save the user data |
| 894 | - $feedback_saved = Sensei_Utils::add_user_data( 'quiz_answers_feedback', $lesson_id , $encoded_answers_feedback, $user_id ) ; |
|
| 894 | + $feedback_saved = Sensei_Utils::add_user_data('quiz_answers_feedback', $lesson_id, $encoded_answers_feedback, $user_id); |
|
| 895 | 895 | |
| 896 | 896 | //Were the the question feedback save correctly? |
| 897 | - if( intval( $feedback_saved ) > 0){ |
|
| 897 | + if (intval($feedback_saved) > 0) { |
|
| 898 | 898 | |
| 899 | 899 | // save transient to make retrieval faster in future |
| 900 | 900 | $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id; |
| 901 | - set_transient( $transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS ); |
|
| 901 | + set_transient($transient_key, $encoded_answers_feedback, 10 * DAY_IN_SECONDS); |
|
| 902 | 902 | |
| 903 | 903 | } |
| 904 | 904 | |
@@ -923,42 +923,42 @@ discard block |
||
| 923 | 923 | * $type string $question_feedback |
| 924 | 924 | * } |
| 925 | 925 | */ |
| 926 | - public function get_user_answers_feedback( $lesson_id , $user_id = 0 ){ |
|
| 926 | + public function get_user_answers_feedback($lesson_id, $user_id = 0) { |
|
| 927 | 927 | |
| 928 | 928 | $answers_feedback = array(); |
| 929 | 929 | |
| 930 | 930 | // get the user_id if none was passed in use the current logged in user |
| 931 | - if( ! intval( $user_id ) > 0 ) { |
|
| 931 | + if ( ! intval($user_id) > 0) { |
|
| 932 | 932 | $user_id = get_current_user_id(); |
| 933 | 933 | } |
| 934 | 934 | |
| 935 | - if ( ! intval( $lesson_id ) > 0 || 'lesson' != get_post_type( $lesson_id ) |
|
| 936 | - || ! intval( $user_id ) > 0 || !get_userdata( $user_id ) ) { |
|
| 935 | + if ( ! intval($lesson_id) > 0 || 'lesson' != get_post_type($lesson_id) |
|
| 936 | + || ! intval($user_id) > 0 || ! get_userdata($user_id)) { |
|
| 937 | 937 | return false; |
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | // first check the transient to save a few split seconds |
| 941 | 941 | $transient_key = 'sensei_answers_feedback_'.$user_id.'_'.$lesson_id; |
| 942 | - $encoded_feedback = get_transient( $transient_key ); |
|
| 942 | + $encoded_feedback = get_transient($transient_key); |
|
| 943 | 943 | |
| 944 | 944 | // get the data if nothing was stored in the transient |
| 945 | - if( empty( $encoded_feedback ) || !$encoded_feedback ){ |
|
| 945 | + if (empty($encoded_feedback) || ! $encoded_feedback) { |
|
| 946 | 946 | |
| 947 | - $encoded_feedback = Sensei_Utils::get_user_data( 'quiz_answers_feedback', $lesson_id, $user_id ); |
|
| 947 | + $encoded_feedback = Sensei_Utils::get_user_data('quiz_answers_feedback', $lesson_id, $user_id); |
|
| 948 | 948 | |
| 949 | 949 | //set the transient with the new valid data for faster retrieval in future |
| 950 | - set_transient( $transient_key, $encoded_feedback, 10 * DAY_IN_SECONDS); |
|
| 950 | + set_transient($transient_key, $encoded_feedback, 10 * DAY_IN_SECONDS); |
|
| 951 | 951 | |
| 952 | 952 | } // end if transient check |
| 953 | 953 | |
| 954 | 954 | // if there is no data for this user |
| 955 | - if( ! is_array( $encoded_feedback ) ){ |
|
| 955 | + if ( ! is_array($encoded_feedback)) { |
|
| 956 | 956 | return false; |
| 957 | 957 | } |
| 958 | 958 | |
| 959 | - foreach( $encoded_feedback as $question_id => $feedback ){ |
|
| 959 | + foreach ($encoded_feedback as $question_id => $feedback) { |
|
| 960 | 960 | |
| 961 | - $answers_feedback[ $question_id ] = base64_decode( $feedback ); |
|
| 961 | + $answers_feedback[$question_id] = base64_decode($feedback); |
|
| 962 | 962 | |
| 963 | 963 | } |
| 964 | 964 | |
@@ -981,25 +981,25 @@ discard block |
||
| 981 | 981 | * |
| 982 | 982 | * @return string $feedback or bool if false |
| 983 | 983 | */ |
| 984 | - public function get_user_question_feedback( $lesson_id, $question_id, $user_id = 0 ){ |
|
| 984 | + public function get_user_question_feedback($lesson_id, $question_id, $user_id = 0) { |
|
| 985 | 985 | |
| 986 | 986 | $feedback = false; |
| 987 | 987 | |
| 988 | 988 | // parameter validation |
| 989 | - if( empty( $lesson_id ) || empty( $question_id ) |
|
| 990 | - || ! ( intval( $lesson_id ) > 0 ) |
|
| 991 | - || ! ( intval( $question_id ) > 0 ) |
|
| 992 | - || 'lesson' != get_post_type( $lesson_id ) |
|
| 993 | - || 'question' != get_post_type( $question_id )) { |
|
| 989 | + if (empty($lesson_id) || empty($question_id) |
|
| 990 | + || ! (intval($lesson_id) > 0) |
|
| 991 | + || ! (intval($question_id) > 0) |
|
| 992 | + || 'lesson' != get_post_type($lesson_id) |
|
| 993 | + || 'question' != get_post_type($question_id)) { |
|
| 994 | 994 | |
| 995 | 995 | return false; |
| 996 | 996 | } |
| 997 | 997 | |
| 998 | 998 | // get all the feedback for the user on the given lesson |
| 999 | - $all_feedback = $this->get_user_answers_feedback( $lesson_id, $user_id ); |
|
| 999 | + $all_feedback = $this->get_user_answers_feedback($lesson_id, $user_id); |
|
| 1000 | 1000 | |
| 1001 | - if( !$all_feedback || empty( $all_feedback ) |
|
| 1002 | - || ! is_array( $all_feedback ) || ! isset( $all_feedback[ $question_id ] ) ){ |
|
| 1001 | + if ( ! $all_feedback || empty($all_feedback) |
|
| 1002 | + || ! is_array($all_feedback) || ! isset($all_feedback[$question_id])) { |
|
| 1003 | 1003 | |
| 1004 | 1004 | //fallback to data pre 1.7.4 |
| 1005 | 1005 | |
@@ -1009,23 +1009,23 @@ discard block |
||
| 1009 | 1009 | 'user_id' => $user_id, |
| 1010 | 1010 | 'type' => 'sensei_user_answer' |
| 1011 | 1011 | ); |
| 1012 | - $question_activity = Sensei_Utils::sensei_check_for_activity( $args , true ); |
|
| 1012 | + $question_activity = Sensei_Utils::sensei_check_for_activity($args, true); |
|
| 1013 | 1013 | |
| 1014 | 1014 | // set the default to false and return that if no old data is available. |
| 1015 | - if( isset( $question_activity->comment_ID ) ){ |
|
| 1016 | - $feedback = base64_decode( get_comment_meta( $question_activity->comment_ID , 'answer_note', true ) ); |
|
| 1015 | + if (isset($question_activity->comment_ID)) { |
|
| 1016 | + $feedback = base64_decode(get_comment_meta($question_activity->comment_ID, 'answer_note', true)); |
|
| 1017 | 1017 | } |
| 1018 | 1018 | |
| 1019 | 1019 | // finally use the default question feedback |
| 1020 | - if( empty( $feedback ) ){ |
|
| 1021 | - $feedback = get_post_meta( $question_id, '_answer_feedback', true ); |
|
| 1020 | + if (empty($feedback)) { |
|
| 1021 | + $feedback = get_post_meta($question_id, '_answer_feedback', true); |
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | return $feedback; |
| 1025 | 1025 | |
| 1026 | 1026 | } |
| 1027 | 1027 | |
| 1028 | - return $all_feedback[ $question_id ]; |
|
| 1028 | + return $all_feedback[$question_id]; |
|
| 1029 | 1029 | |
| 1030 | 1030 | } // end get_user_question_feedback |
| 1031 | 1031 | |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | public function quiz_has_no_questions() { |
| 1045 | 1045 | |
| 1046 | 1046 | |
| 1047 | - if( ! is_singular( 'quiz' ) ) { |
|
| 1047 | + if ( ! is_singular('quiz')) { |
|
| 1048 | 1048 | return; |
| 1049 | 1049 | } |
| 1050 | 1050 | |
@@ -1052,11 +1052,11 @@ discard block |
||
| 1052 | 1052 | |
| 1053 | 1053 | $lesson_id = $this->get_lesson_id($post->ID); |
| 1054 | 1054 | |
| 1055 | - $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); |
|
| 1055 | + $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); |
|
| 1056 | 1056 | |
| 1057 | 1057 | $lesson = get_post($lesson_id); |
| 1058 | 1058 | |
| 1059 | - if ( is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name" ) { |
|
| 1059 | + if (is_singular('quiz') && ! $has_questions && $_SERVER['REQUEST_URI'] != "/lesson/$lesson->post_name") { |
|
| 1060 | 1060 | |
| 1061 | 1061 | wp_redirect(get_permalink($lesson->ID), 301); |
| 1062 | 1062 | exit; |
@@ -1070,7 +1070,7 @@ discard block |
||
| 1070 | 1070 | * |
| 1071 | 1071 | * @deprecated since 1.9.0 |
| 1072 | 1072 | */ |
| 1073 | - public static function deprecate_quiz_sensei_single_main_content_hook(){ |
|
| 1073 | + public static function deprecate_quiz_sensei_single_main_content_hook() { |
|
| 1074 | 1074 | |
| 1075 | 1075 | sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_quiz_content_inside_before or sensei_single_quiz_content_inside_after'); |
| 1076 | 1076 | |
@@ -1080,7 +1080,7 @@ discard block |
||
| 1080 | 1080 | * |
| 1081 | 1081 | * @deprecated since 1.9.0 |
| 1082 | 1082 | */ |
| 1083 | - public static function deprecate_quiz_sensei_quiz_single_title_hook(){ |
|
| 1083 | + public static function deprecate_quiz_sensei_quiz_single_title_hook() { |
|
| 1084 | 1084 | |
| 1085 | 1085 | sensei_do_deprecated_action('sensei_quiz_single_title', '1.9.0', 'sensei_single_quiz_content_inside_before '); |
| 1086 | 1086 | |
@@ -1093,29 +1093,29 @@ discard block |
||
| 1093 | 1093 | * @param int $id title post id |
| 1094 | 1094 | * @return string $quiz_title |
| 1095 | 1095 | */ |
| 1096 | - public static function single_quiz_title( $title, $post_id ){ |
|
| 1096 | + public static function single_quiz_title($title, $post_id) { |
|
| 1097 | 1097 | |
| 1098 | - if( 'quiz' == get_post_type( $post_id ) ){ |
|
| 1098 | + if ('quiz' == get_post_type($post_id)) { |
|
| 1099 | 1099 | |
| 1100 | 1100 | $title_with_no_quizzes = $title; |
| 1101 | 1101 | |
| 1102 | 1102 | // if the title has quiz, remove it: legacy titles have the word quiz stored. |
| 1103 | - if( 1 < substr_count( strtoupper( $title_with_no_quizzes ), 'QUIZ' ) ){ |
|
| 1103 | + if (1 < substr_count(strtoupper($title_with_no_quizzes), 'QUIZ')) { |
|
| 1104 | 1104 | |
| 1105 | 1105 | // remove all possible appearances of quiz |
| 1106 | - $title_with_no_quizzes = str_replace( 'quiz', '', $title ); |
|
| 1107 | - $title_with_no_quizzes = str_replace( 'Quiz', '', $title_with_no_quizzes ); |
|
| 1108 | - $title_with_no_quizzes = str_replace( 'QUIZ', '', $title_with_no_quizzes ); |
|
| 1106 | + $title_with_no_quizzes = str_replace('quiz', '', $title); |
|
| 1107 | + $title_with_no_quizzes = str_replace('Quiz', '', $title_with_no_quizzes); |
|
| 1108 | + $title_with_no_quizzes = str_replace('QUIZ', '', $title_with_no_quizzes); |
|
| 1109 | 1109 | |
| 1110 | 1110 | } |
| 1111 | 1111 | |
| 1112 | - $title = $title_with_no_quizzes . ' ' . __( 'Quiz', 'woothemes-sensei' ); |
|
| 1112 | + $title = $title_with_no_quizzes.' '.__('Quiz', 'woothemes-sensei'); |
|
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | 1115 | /** |
| 1116 | 1116 | * hook document in class-woothemes-sensei-message.php |
| 1117 | 1117 | */ |
| 1118 | - return apply_filters( 'sensei_single_title', $title, get_post_type( ) ); |
|
| 1118 | + return apply_filters('sensei_single_title', $title, get_post_type( )); |
|
| 1119 | 1119 | |
| 1120 | 1120 | } |
| 1121 | 1121 | |
@@ -1127,21 +1127,21 @@ discard block |
||
| 1127 | 1127 | * @since 1.9.0 |
| 1128 | 1128 | * |
| 1129 | 1129 | */ |
| 1130 | - public static function start_quiz_questions_loop(){ |
|
| 1130 | + public static function start_quiz_questions_loop() { |
|
| 1131 | 1131 | |
| 1132 | 1132 | global $sensei_question_loop; |
| 1133 | 1133 | |
| 1134 | 1134 | //intialize the questions loop object |
| 1135 | 1135 | $sensei_question_loop['current'] = -1; |
| 1136 | - $sensei_question_loop['total'] = 0; |
|
| 1136 | + $sensei_question_loop['total'] = 0; |
|
| 1137 | 1137 | $sensei_question_loop['questions'] = array(); |
| 1138 | 1138 | |
| 1139 | 1139 | |
| 1140 | - $questions = Sensei()->lesson->lesson_quiz_questions( get_the_ID() ); |
|
| 1140 | + $questions = Sensei()->lesson->lesson_quiz_questions(get_the_ID()); |
|
| 1141 | 1141 | |
| 1142 | - if( count( $questions ) > 0 ){ |
|
| 1142 | + if (count($questions) > 0) { |
|
| 1143 | 1143 | |
| 1144 | - $sensei_question_loop['total'] = count( $questions ); |
|
| 1144 | + $sensei_question_loop['total'] = count($questions); |
|
| 1145 | 1145 | $sensei_question_loop['questions'] = $questions; |
| 1146 | 1146 | $sensei_question_loop['quiz_id'] = get_the_ID(); |
| 1147 | 1147 | |
@@ -1157,9 +1157,9 @@ discard block |
||
| 1157 | 1157 | * @since 1.9.0 |
| 1158 | 1158 | * |
| 1159 | 1159 | */ |
| 1160 | - public static function stop_quiz_questions_loop(){ |
|
| 1160 | + public static function stop_quiz_questions_loop() { |
|
| 1161 | 1161 | |
| 1162 | - $sensei_question_loop['total'] = 0; |
|
| 1162 | + $sensei_question_loop['total'] = 0; |
|
| 1163 | 1163 | $sensei_question_loop['questions'] = array(); |
| 1164 | 1164 | $sensei_question_loop['quiz_id'] = ''; |
| 1165 | 1165 | |
@@ -1170,7 +1170,7 @@ discard block |
||
| 1170 | 1170 | * |
| 1171 | 1171 | * @since 1.9.0 |
| 1172 | 1172 | */ |
| 1173 | - public static function the_title(){ |
|
| 1173 | + public static function the_title() { |
|
| 1174 | 1174 | ?> |
| 1175 | 1175 | <header> |
| 1176 | 1176 | |
@@ -1180,7 +1180,7 @@ discard block |
||
| 1180 | 1180 | /** |
| 1181 | 1181 | * Filter documented in class-sensei-messages.php the_title |
| 1182 | 1182 | */ |
| 1183 | - echo apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) ); |
|
| 1183 | + echo apply_filters('sensei_single_title', get_the_title(get_post()), get_post_type(get_the_ID())); |
|
| 1184 | 1184 | ?> |
| 1185 | 1185 | |
| 1186 | 1186 | </h1> |
@@ -1195,11 +1195,11 @@ discard block |
||
| 1195 | 1195 | * |
| 1196 | 1196 | * @param $quiz_id |
| 1197 | 1197 | */ |
| 1198 | - public static function the_user_status_message( $quiz_id ){ |
|
| 1198 | + public static function the_user_status_message($quiz_id) { |
|
| 1199 | 1199 | |
| 1200 | - $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id ); |
|
| 1201 | - $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id , get_current_user_id() ); |
|
| 1202 | - echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>'; |
|
| 1200 | + $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id); |
|
| 1201 | + $status = Sensei_Utils::sensei_user_quiz_status_message($lesson_id, get_current_user_id()); |
|
| 1202 | + echo '<div class="sensei-message '.$status['box_class'].'">'.$status['message'].'</div>'; |
|
| 1203 | 1203 | |
| 1204 | 1204 | } |
| 1205 | 1205 | |
@@ -1210,9 +1210,9 @@ discard block |
||
| 1210 | 1210 | * @since 1.9.0 |
| 1211 | 1211 | * @deprecated |
| 1212 | 1212 | */ |
| 1213 | - public static function deprecate_sensei_quiz_action_buttons_hook(){ |
|
| 1213 | + public static function deprecate_sensei_quiz_action_buttons_hook() { |
|
| 1214 | 1214 | |
| 1215 | - sensei_do_deprecated_action( 'sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after'); |
|
| 1215 | + sensei_do_deprecated_action('sensei_quiz_action_buttons', '1.9.0', 'sensei_single_quiz_questions_after'); |
|
| 1216 | 1216 | |
| 1217 | 1217 | } |
| 1218 | 1218 | |
@@ -1226,50 +1226,50 @@ discard block |
||
| 1226 | 1226 | |
| 1227 | 1227 | global $post, $current_user; |
| 1228 | 1228 | |
| 1229 | - $lesson_id = (int) get_post_meta( $post->ID, '_quiz_lesson', true ); |
|
| 1230 | - $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true ); |
|
| 1231 | - $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true ); |
|
| 1229 | + $lesson_id = (int) get_post_meta($post->ID, '_quiz_lesson', true); |
|
| 1230 | + $lesson_course_id = (int) get_post_meta($lesson_id, '_lesson_course', true); |
|
| 1231 | + $lesson_prerequisite = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true); |
|
| 1232 | 1232 | $show_actions = true; |
| 1233 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $current_user->ID ); |
|
| 1233 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $current_user->ID); |
|
| 1234 | 1234 | |
| 1235 | 1235 | //setup quiz grade |
| 1236 | 1236 | $user_quiz_grade = ''; |
| 1237 | - if( ! empty( $user_lesson_status ) ){ |
|
| 1238 | - $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); |
|
| 1237 | + if ( ! empty($user_lesson_status)) { |
|
| 1238 | + $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | |
| 1242 | - if( intval( $lesson_prerequisite ) > 0 ) { |
|
| 1242 | + if (intval($lesson_prerequisite) > 0) { |
|
| 1243 | 1243 | |
| 1244 | 1244 | // If the user hasn't completed the prereq then hide the current actions |
| 1245 | - $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $current_user->ID ); |
|
| 1245 | + $show_actions = Sensei_Utils::user_completed_lesson($lesson_prerequisite, $current_user->ID); |
|
| 1246 | 1246 | |
| 1247 | 1247 | } |
| 1248 | - if ( $show_actions && is_user_logged_in() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) { |
|
| 1248 | + if ($show_actions && is_user_logged_in() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) { |
|
| 1249 | 1249 | |
| 1250 | 1250 | // Get Reset Settings |
| 1251 | - $reset_quiz_allowed = get_post_meta( $post->ID, '_enable_quiz_reset', true ); ?> |
|
| 1251 | + $reset_quiz_allowed = get_post_meta($post->ID, '_enable_quiz_reset', true); ?> |
|
| 1252 | 1252 | |
| 1253 | 1253 | <!-- Action Nonce's --> |
| 1254 | 1254 | <input type="hidden" name="woothemes_sensei_complete_quiz_nonce" id="woothemes_sensei_complete_quiz_nonce" |
| 1255 | - value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_quiz_nonce' ) ); ?>" /> |
|
| 1255 | + value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_quiz_nonce')); ?>" /> |
|
| 1256 | 1256 | <input type="hidden" name="woothemes_sensei_reset_quiz_nonce" id="woothemes_sensei_reset_quiz_nonce" |
| 1257 | - value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_reset_quiz_nonce' ) ); ?>" /> |
|
| 1257 | + value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_reset_quiz_nonce')); ?>" /> |
|
| 1258 | 1258 | <input type="hidden" name="woothemes_sensei_save_quiz_nonce" id="woothemes_sensei_save_quiz_nonce" |
| 1259 | - value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_save_quiz_nonce' ) ); ?>" /> |
|
| 1259 | + value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_save_quiz_nonce')); ?>" /> |
|
| 1260 | 1260 | <!--#end Action Nonce's --> |
| 1261 | 1261 | |
| 1262 | - <?php if ( '' == $user_quiz_grade) { ?> |
|
| 1262 | + <?php if ('' == $user_quiz_grade) { ?> |
|
| 1263 | 1263 | |
| 1264 | - <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php _e( 'Complete Quiz', 'woothemes-sensei' ); ?>"/></span> |
|
| 1264 | + <span><input type="submit" name="quiz_complete" class="quiz-submit complete" value="<?php _e('Complete Quiz', 'woothemes-sensei'); ?>"/></span> |
|
| 1265 | 1265 | |
| 1266 | - <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e( 'Save Quiz', 'woothemes-sensei' ); ?>"/></span> |
|
| 1266 | + <span><input type="submit" name="quiz_save" class="quiz-submit save" value="<?php _e('Save Quiz', 'woothemes-sensei'); ?>"/></span> |
|
| 1267 | 1267 | |
| 1268 | 1268 | <?php } // End If Statement ?> |
| 1269 | 1269 | |
| 1270 | - <?php if ( isset( $reset_quiz_allowed ) && $reset_quiz_allowed ) { ?> |
|
| 1270 | + <?php if (isset($reset_quiz_allowed) && $reset_quiz_allowed) { ?> |
|
| 1271 | 1271 | |
| 1272 | - <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e( 'Reset Quiz', 'woothemes-sensei' ); ?>"/></span> |
|
| 1272 | + <span><input type="submit" name="quiz_reset" class="quiz-submit reset" value="<?php _e('Reset Quiz', 'woothemes-sensei'); ?>"/></span> |
|
| 1273 | 1273 | |
| 1274 | 1274 | <?php } ?> |
| 1275 | 1275 | |
@@ -1287,13 +1287,13 @@ discard block |
||
| 1287 | 1287 | * |
| 1288 | 1288 | * @return double $user_quiz_grade |
| 1289 | 1289 | */ |
| 1290 | - public static function get_user_quiz_grade( $lesson_id, $user_id ){ |
|
| 1290 | + public static function get_user_quiz_grade($lesson_id, $user_id) { |
|
| 1291 | 1291 | |
| 1292 | 1292 | // get the quiz grade |
| 1293 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 1293 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 1294 | 1294 | $user_quiz_grade = 0; |
| 1295 | - if( isset( $user_lesson_status->comment_ID ) ) { |
|
| 1296 | - $user_quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); |
|
| 1295 | + if (isset($user_lesson_status->comment_ID)) { |
|
| 1296 | + $user_quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); |
|
| 1297 | 1297 | } |
| 1298 | 1298 | |
| 1299 | 1299 | return (double) $user_quiz_grade; |
@@ -1311,13 +1311,13 @@ discard block |
||
| 1311 | 1311 | * @param int $lesson_id |
| 1312 | 1312 | * @return bool |
| 1313 | 1313 | */ |
| 1314 | - public static function is_reset_allowed( $lesson_id ){ |
|
| 1314 | + public static function is_reset_allowed($lesson_id) { |
|
| 1315 | 1315 | |
| 1316 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 1316 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 1317 | 1317 | |
| 1318 | - $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true ); |
|
| 1318 | + $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true); |
|
| 1319 | 1319 | //backwards compatibility |
| 1320 | - if( 'on' == $reset_allowed ) { |
|
| 1320 | + if ('on' == $reset_allowed) { |
|
| 1321 | 1321 | $reset_allowed = 1; |
| 1322 | 1322 | } |
| 1323 | 1323 | |
@@ -1334,4 +1334,4 @@ discard block |
||
| 1334 | 1334 | * for backward compatibility |
| 1335 | 1335 | * @since 1.9.0 |
| 1336 | 1336 | */ |
| 1337 | -class WooThemes_Sensei_Quiz extends Sensei_Quiz{} |
|
| 1337 | +class WooThemes_Sensei_Quiz extends Sensei_Quiz {} |
|