| @@ -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 | * All functionality pertaining to the course results pages in Sensei. | 
| @@ -20,20 +20,20 @@ discard block | ||
| 20 | 20 | * Constructor. | 
| 21 | 21 | * @since 1.4.0 | 
| 22 | 22 | */ | 
| 23 | -	public function __construct () { | |
| 23 | +	public function __construct() { | |
| 24 | 24 | |
| 25 | 25 | // Setup learner profile URL base | 
| 26 | - $this->courses_url_base = apply_filters( 'sensei_course_slug', _x( 'course', 'post type single url slug', 'woothemes-sensei' ) ); | |
| 26 | +		$this->courses_url_base = apply_filters('sensei_course_slug', _x('course', 'post type single url slug', 'woothemes-sensei')); | |
| 27 | 27 | |
| 28 | 28 | // Setup permalink structure for course results | 
| 29 | - add_action( 'init', array( $this, 'setup_permastruct' ) ); | |
| 30 | - add_filter( 'wp_title', array( $this, 'page_title' ), 10, 2 ); | |
| 29 | +		add_action('init', array($this, 'setup_permastruct')); | |
| 30 | +		add_filter('wp_title', array($this, 'page_title'), 10, 2); | |
| 31 | 31 | |
| 32 | 32 | // Load course results | 
| 33 | - add_action( 'sensei_course_results_content_inside_before', array( $this, 'deprecate_course_result_info_hook' ), 10 ); | |
| 33 | +		add_action('sensei_course_results_content_inside_before', array($this, 'deprecate_course_result_info_hook'), 10); | |
| 34 | 34 | |
| 35 | 35 | // Add class to body tag | 
| 36 | - add_filter( 'body_class', array( $this, 'body_class' ), 10, 1 ); | |
| 36 | +		add_filter('body_class', array($this, 'body_class'), 10, 1); | |
| 37 | 37 | |
| 38 | 38 | } // End __construct() | 
| 39 | 39 | |
| @@ -43,8 +43,8 @@ discard block | ||
| 43 | 43 | * @return void | 
| 44 | 44 | */ | 
| 45 | 45 |  	public function setup_permastruct() { | 
| 46 | - add_rewrite_rule( '^' . $this->courses_url_base . '/([^/]*)/results/?', 'index.php?course_results=$matches[1]', 'top' ); | |
| 47 | - add_rewrite_tag( '%course_results%', '([^&]+)' ); | |
| 46 | +		add_rewrite_rule('^'.$this->courses_url_base.'/([^/]*)/results/?', 'index.php?course_results=$matches[1]', 'top'); | |
| 47 | +		add_rewrite_tag('%course_results%', '([^&]+)'); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | /** | 
| @@ -53,11 +53,11 @@ discard block | ||
| 53 | 53 | * @param string $sep Seeparator string | 
| 54 | 54 | * @return string Modified title | 
| 55 | 55 | */ | 
| 56 | -	public function page_title( $title, $sep = null ) { | |
| 56 | +	public function page_title($title, $sep = null) { | |
| 57 | 57 | global $wp_query; | 
| 58 | -		if( isset( $wp_query->query_vars['course_results'] ) ) { | |
| 59 | - $course = get_page_by_path( $wp_query->query_vars['course_results'], OBJECT, 'course' ); | |
| 60 | - $title = __( 'Course Results: ', 'woothemes-sensei' ) . $course->post_title . ' ' . $sep . ' '; | |
| 58 | +		if (isset($wp_query->query_vars['course_results'])) { | |
| 59 | + $course = get_page_by_path($wp_query->query_vars['course_results'], OBJECT, 'course'); | |
| 60 | +			$title = __('Course Results: ', 'woothemes-sensei').$course->post_title.' '.$sep.' '; | |
| 61 | 61 | } | 
| 62 | 62 | return $title; | 
| 63 | 63 | } | 
| @@ -68,18 +68,18 @@ discard block | ||
| 68 | 68 | * @param integer $course_id ID of course | 
| 69 | 69 | * @return string The course results page permalink | 
| 70 | 70 | */ | 
| 71 | -	public function get_permalink( $course_id = 0 ) { | |
| 71 | +	public function get_permalink($course_id = 0) { | |
| 72 | 72 | |
| 73 | 73 | $permalink = ''; | 
| 74 | 74 | |
| 75 | -		if( $course_id > 0 ) { | |
| 75 | +		if ($course_id > 0) { | |
| 76 | 76 | |
| 77 | - $course = get_post( $course_id ); | |
| 77 | + $course = get_post($course_id); | |
| 78 | 78 | |
| 79 | -			if ( get_option('permalink_structure') ) { | |
| 80 | - $permalink = trailingslashit( get_home_url() ) . $this->courses_url_base . '/' . $course->post_name . '/results/'; | |
| 79 | +			if (get_option('permalink_structure')) { | |
| 80 | + $permalink = trailingslashit(get_home_url()).$this->courses_url_base.'/'.$course->post_name.'/results/'; | |
| 81 | 81 |  			} else { | 
| 82 | - $permalink = trailingslashit( get_home_url() ) . '?course_results=' . $course->post_name; | |
| 82 | + $permalink = trailingslashit(get_home_url()).'?course_results='.$course->post_name; | |
| 83 | 83 | } | 
| 84 | 84 | } | 
| 85 | 85 | |
| @@ -92,10 +92,10 @@ discard block | ||
| 92 | 92 | * @return void | 
| 93 | 93 | */ | 
| 94 | 94 |  	public function content() { | 
| 95 | - global $wp_query, $current_user; | |
| 95 | + global $wp_query, $current_user; | |
| 96 | 96 | |
| 97 | -		if( isset( $wp_query->query_vars['course_results'] ) ) { | |
| 98 | - Sensei_Templates::get_template( 'course-results/course-info.php' ); | |
| 97 | +		if (isset($wp_query->query_vars['course_results'])) { | |
| 98 | +            Sensei_Templates::get_template('course-results/course-info.php'); | |
| 99 | 99 | } | 
| 100 | 100 | |
| 101 | 101 | } | 
| @@ -109,11 +109,11 @@ discard block | ||
| 109 | 109 | |
| 110 | 110 | global $course; | 
| 111 | 111 | |
| 112 | - Sensei_Utils::sensei_user_course_status_message( $course->ID, get_current_user_id()); | |
| 112 | + Sensei_Utils::sensei_user_course_status_message($course->ID, get_current_user_id()); | |
| 113 | 113 | |
| 114 | - sensei_do_deprecated_action( 'sensei_course_results_lessons','1.9.','sensei_course_results_content_inside_after', $course ); | |
| 114 | +		sensei_do_deprecated_action('sensei_course_results_lessons', '1.9.', 'sensei_course_results_content_inside_after', $course); | |
| 115 | 115 | |
| 116 | - sensei_do_deprecated_action( 'sensei_course_results_bottom','1.9.','sensei_course_results_content_inside_after', $course->ID ); | |
| 116 | +        sensei_do_deprecated_action('sensei_course_results_bottom', '1.9.', 'sensei_course_results_content_inside_after', $course->ID); | |
| 117 | 117 | |
| 118 | 118 | } | 
| 119 | 119 | |
| @@ -126,7 +126,7 @@ discard block | ||
| 126 | 126 |  	public function course_lessons() { | 
| 127 | 127 | |
| 128 | 128 | global $course; | 
| 129 | - _deprecated_function( 'Sensei_modules course_lessons ', '1.9.0' ); | |
| 129 | +        _deprecated_function('Sensei_modules course_lessons ', '1.9.0'); | |
| 130 | 130 | |
| 131 | 131 | } | 
| 132 | 132 | |
| @@ -135,9 +135,9 @@ discard block | ||
| 135 | 135 | * @param array $classes Existing classes | 
| 136 | 136 | * @return array Modified classes | 
| 137 | 137 | */ | 
| 138 | -	public function body_class( $classes ) { | |
| 138 | +	public function body_class($classes) { | |
| 139 | 139 | global $wp_query; | 
| 140 | -		if( isset( $wp_query->query_vars['course_results'] ) ) { | |
| 140 | +		if (isset($wp_query->query_vars['course_results'])) { | |
| 141 | 141 | $classes[] = 'course-results'; | 
| 142 | 142 | } | 
| 143 | 143 | return $classes; | 
| @@ -148,9 +148,9 @@ discard block | ||
| 148 | 148 | * | 
| 149 | 149 | * @deprecated since 1.9.0 | 
| 150 | 150 | */ | 
| 151 | -    public static function deprecate_sensei_course_results_content_hook(){ | |
| 151 | +    public static function deprecate_sensei_course_results_content_hook() { | |
| 152 | 152 | |
| 153 | -        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0','sensei_course_results_content_before'); | |
| 153 | +        sensei_do_deprecated_action('sensei_course_results_content', '1.9.0', 'sensei_course_results_content_before'); | |
| 154 | 154 | |
| 155 | 155 | } | 
| 156 | 156 | |
| @@ -159,9 +159,9 @@ discard block | ||
| 159 | 159 | * | 
| 160 | 160 | * @since 1.9.0 | 
| 161 | 161 | */ | 
| 162 | -    public static function fire_sensei_message_hook(){ | |
| 162 | +    public static function fire_sensei_message_hook() { | |
| 163 | 163 | |
| 164 | - do_action( 'sensei_frontend_messages' ); | |
| 164 | +        do_action('sensei_frontend_messages'); | |
| 165 | 165 | |
| 166 | 166 | } | 
| 167 | 167 | |
| @@ -170,9 +170,9 @@ discard block | ||
| 170 | 170 | * | 
| 171 | 171 | * @since 1.9.0 | 
| 172 | 172 | */ | 
| 173 | -    public static function deprecate_course_result_info_hook(){ | |
| 173 | +    public static function deprecate_course_result_info_hook() { | |
| 174 | 174 | |
| 175 | - sensei_do_deprecated_action( 'sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before' ); | |
| 175 | +        sensei_do_deprecated_action('sensei_course_results_info', '1.9.0', 'sensei_course_results_content_inside_before'); | |
| 176 | 176 | |
| 177 | 177 | } | 
| 178 | 178 | |
| @@ -181,10 +181,10 @@ discard block | ||
| 181 | 181 | * | 
| 182 | 182 | * @deprecate since 1.9.0 | 
| 183 | 183 | */ | 
| 184 | -    public static function deprecate_course_results_top_hook(){ | |
| 184 | +    public static function deprecate_course_results_top_hook() { | |
| 185 | 185 | |
| 186 | 186 | global $course; | 
| 187 | - sensei_do_deprecated_action( 'sensei_course_results_top', '1.9.0' ,'sensei_course_results_content_inside_before',$course->ID ); | |
| 187 | +        sensei_do_deprecated_action('sensei_course_results_top', '1.9.0', 'sensei_course_results_content_inside_before', $course->ID); | |
| 188 | 188 | |
| 189 | 189 | } | 
| 190 | 190 | |
| @@ -193,10 +193,10 @@ discard block | ||
| 193 | 193 | * | 
| 194 | 194 | * @since 1.8.0 | 
| 195 | 195 | */ | 
| 196 | -    public static function fire_course_image_hook(){ | |
| 196 | +    public static function fire_course_image_hook() { | |
| 197 | 197 | |
| 198 | 198 | global $course; | 
| 199 | -        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) ); | |
| 199 | +        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', array(get_the_ID())); | |
| 200 | 200 | |
| 201 | 201 | } | 
| 202 | 202 | |
| @@ -207,4 +207,4 @@ discard block | ||
| 207 | 207 | * @ignore only for backward compatibility | 
| 208 | 208 | * @since 1.9.0 | 
| 209 | 209 | */ | 
| 210 | -class WooThemes_Sensei_Course_Results extends Sensei_Course_Results{} | |
| 210 | +class WooThemes_Sensei_Course_Results extends Sensei_Course_Results {} | |
| @@ -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 Course Class | 
| @@ -32,72 +32,72 @@ discard block | ||
| 32 | 32 | * Constructor. | 
| 33 | 33 | * @since 1.0.0 | 
| 34 | 34 | */ | 
| 35 | -	public function __construct () { | |
| 35 | +	public function __construct() { | |
| 36 | 36 | |
| 37 | 37 | $this->token = 'course'; | 
| 38 | 38 | |
| 39 | 39 | // Setup meta fields for this post type | 
| 40 | - $this->meta_fields = array( 'course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product' ); | |
| 40 | +		$this->meta_fields = array('course_prerequisite', 'course_featured', 'course_video_embed', 'course_woocommerce_product'); | |
| 41 | 41 | // Admin actions | 
| 42 | -		if ( is_admin() ) { | |
| 42 | +		if (is_admin()) { | |
| 43 | 43 | // Metabox functions | 
| 44 | - add_action( 'add_meta_boxes', array( $this, 'meta_box_setup' ), 20 ); | |
| 45 | - add_action( 'save_post', array( $this, 'meta_box_save' ) ); | |
| 44 | +            add_action('add_meta_boxes', array($this, 'meta_box_setup'), 20); | |
| 45 | +			add_action('save_post', array($this, 'meta_box_save')); | |
| 46 | 46 | // Custom Write Panel Columns | 
| 47 | - add_filter( 'manage_edit-course_columns', array( $this, 'add_column_headings' ), 10, 1 ); | |
| 48 | - add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 ); | |
| 47 | +			add_filter('manage_edit-course_columns', array($this, 'add_column_headings'), 10, 1); | |
| 48 | +			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2); | |
| 49 | 49 |  		} else { | 
| 50 | 50 | $this->my_courses_page = false; | 
| 51 | 51 | } // End If Statement | 
| 52 | 52 | |
| 53 | 53 | // Update course completion upon completion of a lesson | 
| 54 | - add_action( 'sensei_user_lesson_end', array( $this, 'update_status_after_lesson_change' ), 10, 2 ); | |
| 54 | +		add_action('sensei_user_lesson_end', array($this, 'update_status_after_lesson_change'), 10, 2); | |
| 55 | 55 | // Update course completion upon reset of a lesson | 
| 56 | - add_action( 'sensei_user_lesson_reset', array( $this, 'update_status_after_lesson_change' ), 10, 2 ); | |
| 56 | +		add_action('sensei_user_lesson_reset', array($this, 'update_status_after_lesson_change'), 10, 2); | |
| 57 | 57 | // Update course completion upon grading of a quiz | 
| 58 | - add_action( 'sensei_user_quiz_grade', array( $this, 'update_status_after_quiz_submission' ), 10, 2 ); | |
| 58 | +		add_action('sensei_user_quiz_grade', array($this, 'update_status_after_quiz_submission'), 10, 2); | |
| 59 | 59 | |
| 60 | 60 | // show the progress bar ont he single course page | 
| 61 | - add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_statement' ), 15 ); | |
| 62 | - add_action( 'sensei_single_course_content_inside_before' , array( $this, 'the_progress_meter' ), 16 ); | |
| 61 | +        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_statement'), 15); | |
| 62 | +        add_action('sensei_single_course_content_inside_before', array($this, 'the_progress_meter'), 16); | |
| 63 | 63 | |
| 64 | 64 | // provide an option to block all emails related to a selected course | 
| 65 | - add_filter( 'sensei_send_emails', array( $this, 'block_notification_emails' ) ); | |
| 66 | - add_action( 'save_post', array( $this, 'save_course_notification_meta_box' ) ); | |
| 65 | +        add_filter('sensei_send_emails', array($this, 'block_notification_emails')); | |
| 66 | +        add_action('save_post', array($this, 'save_course_notification_meta_box')); | |
| 67 | 67 | |
| 68 | 68 | // preview lessons on the course content | 
| 69 | - add_action( 'sensei_course_content_inside_after',array( $this, 'the_course_free_lesson_preview' ) ); | |
| 69 | +        add_action('sensei_course_content_inside_after', array($this, 'the_course_free_lesson_preview')); | |
| 70 | 70 | |
| 71 | 71 | // the course meta | 
| 72 | -        add_action('sensei_course_content_inside_before', array( $this, 'the_course_meta' ) ); | |
| 72 | +        add_action('sensei_course_content_inside_before', array($this, 'the_course_meta')); | |
| 73 | 73 | |
| 74 | 74 | // backwards compatible template hooks | 
| 75 | -        add_action('sensei_course_content_inside_before', array( $this, 'content_before_backwards_compatibility_hooks' )); | |
| 76 | -        add_action('sensei_loop_course_before', array( $this,'loop_before_backwards_compatibility_hooks' ) ); | |
| 75 | +        add_action('sensei_course_content_inside_before', array($this, 'content_before_backwards_compatibility_hooks')); | |
| 76 | +        add_action('sensei_loop_course_before', array($this, 'loop_before_backwards_compatibility_hooks')); | |
| 77 | 77 | |
| 78 | 78 | // add the user status on the course to the markup as a class | 
| 79 | -        add_filter('post_class', array( __CLASS__ , 'add_course_user_status_class' ), 20, 3 ); | |
| 79 | +        add_filter('post_class', array(__CLASS__, 'add_course_user_status_class'), 20, 3); | |
| 80 | 80 | |
| 81 | 81 | //filter the course query in Sensei specific instances | 
| 82 | - add_filter( 'pre_get_posts', array( __CLASS__, 'course_query_filter' ) ); | |
| 82 | +        add_filter('pre_get_posts', array(__CLASS__, 'course_query_filter')); | |
| 83 | 83 | |
| 84 | 84 | //attache the sorting to the course archive | 
| 85 | - add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_sorting' ) ); | |
| 85 | +        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_sorting')); | |
| 86 | 86 | |
| 87 | 87 | //attach the filter links to the course archive | 
| 88 | - add_action ( 'sensei_archive_before_course_loop' , array( 'Sensei_Course', 'course_archive_filters' ) ); | |
| 88 | +        add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'course_archive_filters')); | |
| 89 | 89 | |
| 90 | 90 | //filter the course query when featured filter is applied | 
| 91 | - add_filter( 'pre_get_posts', array( __CLASS__, 'course_archive_featured_filter')); | |
| 91 | +        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_featured_filter')); | |
| 92 | 92 | |
| 93 | 93 | // handle the order by title post submission | 
| 94 | - add_filter( 'pre_get_posts', array( __CLASS__, 'course_archive_order_by_title')); | |
| 94 | +        add_filter('pre_get_posts', array(__CLASS__, 'course_archive_order_by_title')); | |
| 95 | 95 | |
| 96 | 96 | // ensure the course category page respects the manual order set for courses | 
| 97 | - add_filter( 'pre_get_posts', array( __CLASS__, 'alter_course_category_order')); | |
| 97 | +        add_filter('pre_get_posts', array(__CLASS__, 'alter_course_category_order')); | |
| 98 | 98 | |
| 99 | 99 | // flush rewrite rules when saving a course | 
| 100 | -        add_action('save_post', array( 'Sensei_Course', 'flush_rewrite_rules' ) ); | |
| 100 | +        add_action('save_post', array('Sensei_Course', 'flush_rewrite_rules')); | |
| 101 | 101 | |
| 102 | 102 | } // End __construct() | 
| 103 | 103 | |
| @@ -107,10 +107,10 @@ discard block | ||
| 107 | 107 | * @param type $user_id | 
| 108 | 108 | * @param type $quiz_id | 
| 109 | 109 | */ | 
| 110 | -	public function update_status_after_quiz_submission( $user_id, $quiz_id ) { | |
| 111 | -		if ( intval( $user_id ) > 0 && intval( $quiz_id ) > 0 ) { | |
| 112 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 113 | - $this->update_status_after_lesson_change( $user_id, $lesson_id ); | |
| 110 | +	public function update_status_after_quiz_submission($user_id, $quiz_id) { | |
| 111 | +		if (intval($user_id) > 0 && intval($quiz_id) > 0) { | |
| 112 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 113 | + $this->update_status_after_lesson_change($user_id, $lesson_id); | |
| 114 | 114 | } | 
| 115 | 115 | } | 
| 116 | 116 | |
| @@ -120,12 +120,12 @@ discard block | ||
| 120 | 120 | * @param int $user_id | 
| 121 | 121 | * @param int $lesson_id | 
| 122 | 122 | */ | 
| 123 | -	public function update_status_after_lesson_change( $user_id, $lesson_id ) { | |
| 124 | -		if ( intval( $user_id ) > 0 && intval( $lesson_id ) > 0 ) { | |
| 125 | - $course_id = get_post_meta( $lesson_id, '_lesson_course', true ); | |
| 126 | -			if ( intval( $course_id ) > 0 ) { | |
| 123 | +	public function update_status_after_lesson_change($user_id, $lesson_id) { | |
| 124 | +		if (intval($user_id) > 0 && intval($lesson_id) > 0) { | |
| 125 | + $course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 126 | +			if (intval($course_id) > 0) { | |
| 127 | 127 | // Updates the Course status and it's meta data | 
| 128 | - Sensei_Utils::user_complete_course( $course_id, $user_id ); | |
| 128 | + Sensei_Utils::user_complete_course($course_id, $user_id); | |
| 129 | 129 | } | 
| 130 | 130 | } | 
| 131 | 131 | } | 
| @@ -136,27 +136,27 @@ discard block | ||
| 136 | 136 | * @access public | 
| 137 | 137 | * @return void | 
| 138 | 138 | */ | 
| 139 | -	public function meta_box_setup () { | |
| 139 | +	public function meta_box_setup() { | |
| 140 | 140 | |
| 141 | -		if ( Sensei_WC::is_woocommerce_active() ) { | |
| 141 | +		if (Sensei_WC::is_woocommerce_active()) { | |
| 142 | 142 | // Add Meta Box for WooCommerce Course | 
| 143 | - add_meta_box( 'course-wc-product', __( 'WooCommerce Product', 'woothemes-sensei' ), array( $this, 'course_woocommerce_product_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 143 | +			add_meta_box('course-wc-product', __('WooCommerce Product', 'woothemes-sensei'), array($this, 'course_woocommerce_product_meta_box_content'), $this->token, 'side', 'default'); | |
| 144 | 144 | } // End If Statement | 
| 145 | 145 | // Add Meta Box for Prerequisite Course | 
| 146 | - add_meta_box( 'course-prerequisite', __( 'Course Prerequisite', 'woothemes-sensei' ), array( $this, 'course_prerequisite_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 146 | +		add_meta_box('course-prerequisite', __('Course Prerequisite', 'woothemes-sensei'), array($this, 'course_prerequisite_meta_box_content'), $this->token, 'side', 'default'); | |
| 147 | 147 | // Add Meta Box for Featured Course | 
| 148 | - add_meta_box( 'course-featured', __( 'Featured Course', 'woothemes-sensei' ), array( $this, 'course_featured_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 148 | +		add_meta_box('course-featured', __('Featured Course', 'woothemes-sensei'), array($this, 'course_featured_meta_box_content'), $this->token, 'side', 'default'); | |
| 149 | 149 | // Add Meta Box for Course Meta | 
| 150 | - add_meta_box( 'course-video', __( 'Course Video', 'woothemes-sensei' ), array( $this, 'course_video_meta_box_content' ), $this->token, 'normal', 'default' ); | |
| 150 | +		add_meta_box('course-video', __('Course Video', 'woothemes-sensei'), array($this, 'course_video_meta_box_content'), $this->token, 'normal', 'default'); | |
| 151 | 151 | // Add Meta Box for Course Lessons | 
| 152 | - add_meta_box( 'course-lessons', __( 'Course Lessons', 'woothemes-sensei' ), array( $this, 'course_lessons_meta_box_content' ), $this->token, 'normal', 'default' ); | |
| 152 | +		add_meta_box('course-lessons', __('Course Lessons', 'woothemes-sensei'), array($this, 'course_lessons_meta_box_content'), $this->token, 'normal', 'default'); | |
| 153 | 153 | // Add Meta Box to link to Manage Learners | 
| 154 | - add_meta_box( 'course-manage', __( 'Course Management', 'woothemes-sensei' ), array( $this, 'course_manage_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 154 | +        add_meta_box('course-manage', __('Course Management', 'woothemes-sensei'), array($this, 'course_manage_meta_box_content'), $this->token, 'side', 'default'); | |
| 155 | 155 | // Remove "Custom Settings" meta box. | 
| 156 | - remove_meta_box( 'woothemes-settings', $this->token, 'normal' ); | |
| 156 | +		remove_meta_box('woothemes-settings', $this->token, 'normal'); | |
| 157 | 157 | |
| 158 | 158 | // add Disable email notification box | 
| 159 | - add_meta_box( 'course-notifications', __( 'Course Notifications', 'woothemes-sensei' ), array( $this, 'course_notification_meta_box_content' ), 'course', 'normal', 'default' ); | |
| 159 | +        add_meta_box('course-notifications', __('Course Notifications', 'woothemes-sensei'), array($this, 'course_notification_meta_box_content'), 'course', 'normal', 'default'); | |
| 160 | 160 | |
| 161 | 161 | } // End meta_box_setup() | 
| 162 | 162 | |
| @@ -166,58 +166,58 @@ discard block | ||
| 166 | 166 | * @access public | 
| 167 | 167 | * @return void | 
| 168 | 168 | */ | 
| 169 | -	public function course_woocommerce_product_meta_box_content () { | |
| 169 | +	public function course_woocommerce_product_meta_box_content() { | |
| 170 | 170 | global $post; | 
| 171 | 171 | |
| 172 | - $select_course_woocommerce_product = get_post_meta( $post->ID, '_course_woocommerce_product', true ); | |
| 172 | + $select_course_woocommerce_product = get_post_meta($post->ID, '_course_woocommerce_product', true); | |
| 173 | 173 | |
| 174 | - $post_args = array( 'post_type' => array( 'product', 'product_variation' ), | |
| 174 | +		$post_args = array('post_type' 		=> array('product', 'product_variation'), | |
| 175 | 175 | 'posts_per_page' => -1, | 
| 176 | 176 | 'orderby' => 'title', | 
| 177 | 177 | 'order' => 'DESC', | 
| 178 | 178 | 'exclude' => $post->ID, | 
| 179 | - 'post_status' => array( 'publish', 'private', 'draft' ), | |
| 179 | +    						'post_status'		=> array('publish', 'private', 'draft'), | |
| 180 | 180 | 'tax_query' => array( | 
| 181 | 181 | array( | 
| 182 | 182 | 'taxonomy' => 'product_type', | 
| 183 | 183 | 'field' => 'slug', | 
| 184 | - 'terms' => array( 'variable', 'grouped' ), | |
| 184 | +									'terms'		=> array('variable', 'grouped'), | |
| 185 | 185 | 'operator' => 'NOT IN' | 
| 186 | 186 | ) | 
| 187 | 187 | ), | 
| 188 | 188 | 'suppress_filters' => 0 | 
| 189 | 189 | ); | 
| 190 | - $posts_array = get_posts( $post_args ); | |
| 190 | + $posts_array = get_posts($post_args); | |
| 191 | 191 | |
| 192 | 192 | $html = ''; | 
| 193 | 193 | |
| 194 | - $html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />'; | |
| 194 | +		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />'; | |
| 195 | 195 | |
| 196 | -		if ( count( $posts_array ) > 0 ) { | |
| 196 | +		if (count($posts_array) > 0) { | |
| 197 | 197 | |
| 198 | - $html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">' . "\n"; | |
| 199 | - $html .= '<option value="-">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 198 | + $html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">'."\n"; | |
| 199 | +			$html .= '<option value="-">'.__('None', 'woothemes-sensei').'</option>'; | |
| 200 | 200 | $prev_parent_id = 0; | 
| 201 | -				foreach ( $posts_array as $post_item ) { | |
| 201 | +				foreach ($posts_array as $post_item) { | |
| 202 | 202 | |
| 203 | -					if ( 'product_variation' == $post_item->post_type ) { | |
| 203 | +					if ('product_variation' == $post_item->post_type) { | |
| 204 | 204 | |
| 205 | - $product_object = get_product( $post_item->ID ); | |
| 206 | - $parent_id = wp_get_post_parent_id( $post_item->ID ); | |
| 205 | + $product_object = get_product($post_item->ID); | |
| 206 | + $parent_id = wp_get_post_parent_id($post_item->ID); | |
| 207 | 207 | |
| 208 | -                        if( sensei_check_woocommerce_version( '2.1' ) ) { | |
| 209 | - $formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true ); | |
| 208 | +                        if (sensei_check_woocommerce_version('2.1')) { | |
| 209 | + $formatted_variation = wc_get_formatted_variation($product_object->variation_data, true); | |
| 210 | 210 | |
| 211 | 211 |  						} else { | 
| 212 | 212 | // fall back to pre wc 2.1 | 
| 213 | - $formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true ); | |
| 213 | + $formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true); | |
| 214 | 214 | |
| 215 | 215 | } | 
| 216 | 216 | |
| 217 | - $product_name = ucwords( $formatted_variation ); | |
| 218 | -                        if( empty( $product_name ) ){ | |
| 217 | + $product_name = ucwords($formatted_variation); | |
| 218 | +                        if (empty($product_name)) { | |
| 219 | 219 | |
| 220 | - $product_name = __( 'Variation #', 'woothemes-sensei' ) . $product_object->variation_id; | |
| 220 | +                            $product_name = __('Variation #', 'woothemes-sensei').$product_object->variation_id; | |
| 221 | 221 | |
| 222 | 222 | } | 
| 223 | 223 | |
| @@ -230,47 +230,47 @@ discard block | ||
| 230 | 230 | } | 
| 231 | 231 | |
| 232 | 232 | // Show variations in groups | 
| 233 | -					if( $parent_id && $parent_id != $prev_parent_id ) { | |
| 233 | +					if ($parent_id && $parent_id != $prev_parent_id) { | |
| 234 | 234 | |
| 235 | -						if( 0 != $prev_parent_id ) { | |
| 235 | +						if (0 != $prev_parent_id) { | |
| 236 | 236 | |
| 237 | 237 | $html .= '</optgroup>'; | 
| 238 | 238 | |
| 239 | 239 | } | 
| 240 | - $html .= '<optgroup label="' . get_the_title( $parent_id ) . '">'; | |
| 240 | + $html .= '<optgroup label="'.get_the_title($parent_id).'">'; | |
| 241 | 241 | $prev_parent_id = $parent_id; | 
| 242 | 242 | |
| 243 | -					} elseif( ! $parent_id && 0 == $prev_parent_id ) { | |
| 243 | +					} elseif ( ! $parent_id && 0 == $prev_parent_id) { | |
| 244 | 244 | |
| 245 | 245 | $html .= '</optgroup>'; | 
| 246 | 246 | |
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | - $html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_woocommerce_product, false ) . '>' . esc_html( $product_name ) . '</option>' . "\n"; | |
| 249 | + $html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_woocommerce_product, false).'>'.esc_html($product_name).'</option>'."\n"; | |
| 250 | 250 | |
| 251 | 251 | } // End For Loop | 
| 252 | 252 | |
| 253 | - $html .= '</select>' . "\n"; | |
| 254 | -			if ( current_user_can( 'publish_product' )) { | |
| 253 | + $html .= '</select>'."\n"; | |
| 254 | +			if (current_user_can('publish_product')) { | |
| 255 | 255 | |
| 256 | - $html .= '<p>' . "\n"; | |
| 257 | - $html .= '<a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Add a Product', 'woothemes-sensei' ) . '</a>' . "\n"; | |
| 256 | + $html .= '<p>'."\n"; | |
| 257 | +					$html .= '<a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Add a Product', 'woothemes-sensei').'</a>'."\n"; | |
| 258 | 258 | $html .= '</p>'."\n"; | 
| 259 | 259 | |
| 260 | 260 | } // End If Statement | 
| 261 | 261 | |
| 262 | 262 |  		} else { | 
| 263 | 263 | |
| 264 | -			if ( current_user_can( 'publish_product' )) { | |
| 264 | +			if (current_user_can('publish_product')) { | |
| 265 | 265 | |
| 266 | - $html .= '<p>' . "\n"; | |
| 267 | - $html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . ' <a href="' . admin_url( 'post-new.php?post_type=product' ) . '" title="' . esc_attr( __( 'Add a Product', 'woothemes-sensei' ) ) . '">' . __( 'Please add some first', 'woothemes-sensei' ) . '</a>' . "\n"; | |
| 266 | + $html .= '<p>'."\n"; | |
| 267 | +					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei')).' <a href="'.admin_url('post-new.php?post_type=product').'" title="'.esc_attr(__('Add a Product', 'woothemes-sensei')).'">'.__('Please add some first', 'woothemes-sensei').'</a>'."\n"; | |
| 268 | 268 | $html .= '</p>'."\n"; | 
| 269 | 269 | |
| 270 | 270 |  			} else { | 
| 271 | 271 | |
| 272 | - $html .= '<p>' . "\n"; | |
| 273 | - $html .= esc_html( __( 'No products exist yet.', 'woothemes-sensei' ) ) . "\n"; | |
| 272 | + $html .= '<p>'."\n"; | |
| 273 | +					$html .= esc_html(__('No products exist yet.', 'woothemes-sensei'))."\n"; | |
| 274 | 274 | $html .= '</p>'."\n"; | 
| 275 | 275 | |
| 276 | 276 | } // End If Statement | 
| @@ -287,33 +287,33 @@ discard block | ||
| 287 | 287 | * @access public | 
| 288 | 288 | * @return void | 
| 289 | 289 | */ | 
| 290 | -	public function course_prerequisite_meta_box_content () { | |
| 290 | +	public function course_prerequisite_meta_box_content() { | |
| 291 | 291 | global $post; | 
| 292 | 292 | |
| 293 | - $select_course_prerequisite = get_post_meta( $post->ID, '_course_prerequisite', true ); | |
| 293 | + $select_course_prerequisite = get_post_meta($post->ID, '_course_prerequisite', true); | |
| 294 | 294 | |
| 295 | - $post_args = array( 'post_type' => 'course', | |
| 295 | +		$post_args = array('post_type' 		=> 'course', | |
| 296 | 296 | 'posts_per_page' => -1, | 
| 297 | 297 | 'orderby' => 'title', | 
| 298 | 298 | 'order' => 'DESC', | 
| 299 | 299 | 'exclude' => $post->ID, | 
| 300 | 300 | 'suppress_filters' => 0 | 
| 301 | 301 | ); | 
| 302 | - $posts_array = get_posts( $post_args ); | |
| 302 | + $posts_array = get_posts($post_args); | |
| 303 | 303 | |
| 304 | 304 | $html = ''; | 
| 305 | 305 | |
| 306 | - $html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />'; | |
| 306 | +		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />'; | |
| 307 | 307 | |
| 308 | -		if ( count( $posts_array ) > 0 ) { | |
| 309 | - $html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">' . "\n"; | |
| 310 | - $html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 311 | -				foreach ($posts_array as $post_item){ | |
| 312 | - $html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_course_prerequisite, false ) . '>' . esc_html( $post_item->post_title ) . '</option>' . "\n"; | |
| 308 | +		if (count($posts_array) > 0) { | |
| 309 | + $html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">'."\n"; | |
| 310 | +			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; | |
| 311 | +				foreach ($posts_array as $post_item) { | |
| 312 | + $html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_course_prerequisite, false).'>'.esc_html($post_item->post_title).'</option>'."\n"; | |
| 313 | 313 | } // End For Loop | 
| 314 | - $html .= '</select>' . "\n"; | |
| 314 | + $html .= '</select>'."\n"; | |
| 315 | 315 |  		} else { | 
| 316 | - $html .= '<p>' . esc_html( __( 'No courses exist yet. Please add some first.', 'woothemes-sensei' ) ) . '</p>'; | |
| 316 | +			$html .= '<p>'.esc_html(__('No courses exist yet. Please add some first.', 'woothemes-sensei')).'</p>'; | |
| 317 | 317 | } // End If Statement | 
| 318 | 318 | |
| 319 | 319 | echo $html; | 
| @@ -326,21 +326,21 @@ discard block | ||
| 326 | 326 | * @access public | 
| 327 | 327 | * @return void | 
| 328 | 328 | */ | 
| 329 | -	public function course_featured_meta_box_content () { | |
| 329 | +	public function course_featured_meta_box_content() { | |
| 330 | 330 | global $post; | 
| 331 | 331 | |
| 332 | - $course_featured = get_post_meta( $post->ID, '_course_featured', true ); | |
| 332 | + $course_featured = get_post_meta($post->ID, '_course_featured', true); | |
| 333 | 333 | |
| 334 | 334 | $html = ''; | 
| 335 | 335 | |
| 336 | - $html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />'; | |
| 336 | +		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="'.esc_attr('woo_'.$this->token.'_noonce').'" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />'; | |
| 337 | 337 | |
| 338 | 338 | $checked = ''; | 
| 339 | -		if ( isset( $course_featured ) && ( '' != $course_featured ) ) { | |
| 340 | - $checked = checked( 'featured', $course_featured, false ); | |
| 339 | +		if (isset($course_featured) && ('' != $course_featured)) { | |
| 340 | +	 	    $checked = checked('featured', $course_featured, false); | |
| 341 | 341 | } // End If Statement | 
| 342 | 342 | |
| 343 | - $html .= '<input type="checkbox" name="course_featured" value="featured" ' . $checked . '> ' . __( 'Feature this course', 'woothemes-sensei' ) . '<br>'; | |
| 343 | +	 	$html .= '<input type="checkbox" name="course_featured" value="featured" '.$checked.'> '.__('Feature this course', 'woothemes-sensei').'<br>'; | |
| 344 | 344 | |
| 345 | 345 | echo $html; | 
| 346 | 346 | |
| @@ -352,16 +352,16 @@ discard block | ||
| 352 | 352 | * @access public | 
| 353 | 353 | * @return void | 
| 354 | 354 | */ | 
| 355 | -	public function course_video_meta_box_content () { | |
| 355 | +	public function course_video_meta_box_content() { | |
| 356 | 356 | global $post; | 
| 357 | 357 | |
| 358 | - $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true ); | |
| 358 | + $course_video_embed = get_post_meta($post->ID, '_course_video_embed', true); | |
| 359 | 359 | |
| 360 | 360 | $html = ''; | 
| 361 | 361 | |
| 362 | - $html .= '<label class="screen-reader-text" for="course_video_embed">' . __( 'Video Embed Code', 'woothemes-sensei' ) . '</label>'; | |
| 363 | - $html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">' . $course_video_embed . '</textarea>'; | |
| 364 | - $html .= '<p>' . __( 'Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei' ) . '</p>'; | |
| 362 | +		$html .= '<label class="screen-reader-text" for="course_video_embed">'.__('Video Embed Code', 'woothemes-sensei').'</label>'; | |
| 363 | + $html .= '<textarea rows="5" cols="50" name="course_video_embed" tabindex="6" id="course-video-embed">'.$course_video_embed.'</textarea>'; | |
| 364 | +		$html .= '<p>'.__('Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei').'</p>'; | |
| 365 | 365 | |
| 366 | 366 | echo $html; | 
| 367 | 367 | |
| @@ -376,36 +376,36 @@ discard block | ||
| 376 | 376 | * @param int $post_id | 
| 377 | 377 | * @return int | 
| 378 | 378 | */ | 
| 379 | -	public function meta_box_save ( $post_id ) { | |
| 379 | +	public function meta_box_save($post_id) { | |
| 380 | 380 | global $post; | 
| 381 | 381 | |
| 382 | 382 | /* Verify the nonce before proceeding. */ | 
| 383 | -		if ( ( get_post_type() != $this->token ) || ! wp_verify_nonce( $_POST['woo_' . $this->token . '_noonce'], plugin_basename(__FILE__) ) ) { | |
| 383 | +		if ((get_post_type() != $this->token) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_noonce'], plugin_basename(__FILE__))) { | |
| 384 | 384 | return $post_id; | 
| 385 | 385 | } | 
| 386 | 386 | |
| 387 | 387 | /* Get the post type object. */ | 
| 388 | - $post_type = get_post_type_object( $post->post_type ); | |
| 388 | + $post_type = get_post_type_object($post->post_type); | |
| 389 | 389 | |
| 390 | 390 | /* Check if the current user has permission to edit the post. */ | 
| 391 | -		if ( !current_user_can( $post_type->cap->edit_post, $post_id ) ) { | |
| 391 | +		if ( ! current_user_can($post_type->cap->edit_post, $post_id)) { | |
| 392 | 392 | return $post_id; | 
| 393 | 393 | } // End If Statement | 
| 394 | 394 | |
| 395 | -		if ( 'page' == $_POST['post_type'] ) { | |
| 396 | -			if ( ! current_user_can( 'edit_page', $post_id ) ) { | |
| 395 | +		if ('page' == $_POST['post_type']) { | |
| 396 | +			if ( ! current_user_can('edit_page', $post_id)) { | |
| 397 | 397 | return $post_id; | 
| 398 | 398 | } // End If Statement | 
| 399 | 399 |  		} else { | 
| 400 | -			if ( ! current_user_can( 'edit_post', $post_id ) ) { | |
| 400 | +			if ( ! current_user_can('edit_post', $post_id)) { | |
| 401 | 401 | return $post_id; | 
| 402 | 402 | } // End If Statement | 
| 403 | 403 | } // End If Statement | 
| 404 | 404 | |
| 405 | 405 | // Save the post meta data fields | 
| 406 | -		if ( isset($this->meta_fields) && is_array($this->meta_fields) ) { | |
| 407 | -			foreach ( $this->meta_fields as $meta_key ) { | |
| 408 | - $this->save_post_meta( $meta_key, $post_id ); | |
| 406 | +		if (isset($this->meta_fields) && is_array($this->meta_fields)) { | |
| 407 | +			foreach ($this->meta_fields as $meta_key) { | |
| 408 | + $this->save_post_meta($meta_key, $post_id); | |
| 409 | 409 | } // End For Loop | 
| 410 | 410 | } // End If Statement | 
| 411 | 411 | |
| @@ -422,18 +422,18 @@ discard block | ||
| 422 | 422 | * @param int $post_id (default: 0) | 
| 423 | 423 | * @return int new meta id | bool meta value saved status | 
| 424 | 424 | */ | 
| 425 | -	private function save_post_meta( $post_key = '', $post_id = 0 ) { | |
| 425 | +	private function save_post_meta($post_key = '', $post_id = 0) { | |
| 426 | 426 | // Get the meta key. | 
| 427 | - $meta_key = '_' . $post_key; | |
| 427 | + $meta_key = '_'.$post_key; | |
| 428 | 428 | // Get the posted data and sanitize it for use as an HTML class. | 
| 429 | -		if ( 'course_video_embed' == $post_key) { | |
| 430 | - $new_meta_value = esc_html( $_POST[$post_key] ); | |
| 429 | +		if ('course_video_embed' == $post_key) { | |
| 430 | + $new_meta_value = esc_html($_POST[$post_key]); | |
| 431 | 431 |  		} else { | 
| 432 | - $new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' ); | |
| 432 | + $new_meta_value = (isset($_POST[$post_key]) ? sanitize_html_class($_POST[$post_key]) : ''); | |
| 433 | 433 | } // End If Statement | 
| 434 | 434 | |
| 435 | 435 | // update field with the new value | 
| 436 | - return update_post_meta( $post_id, $meta_key, $new_meta_value ); | |
| 436 | + return update_post_meta($post_id, $meta_key, $new_meta_value); | |
| 437 | 437 | |
| 438 | 438 | } // End save_post_meta() | 
| 439 | 439 | |
| @@ -443,31 +443,31 @@ discard block | ||
| 443 | 443 | * @access public | 
| 444 | 444 | * @return void | 
| 445 | 445 | */ | 
| 446 | -	public function course_lessons_meta_box_content () { | |
| 446 | +	public function course_lessons_meta_box_content() { | |
| 447 | 447 | |
| 448 | 448 | global $post; | 
| 449 | 449 | |
| 450 | 450 | // Setup Lesson Query | 
| 451 | 451 | $posts_array = array(); | 
| 452 | -		if ( 0 < $post->ID ) { | |
| 452 | +		if (0 < $post->ID) { | |
| 453 | 453 | |
| 454 | - $posts_array = $this->course_lessons( $post->ID, 'any' ); | |
| 454 | + $posts_array = $this->course_lessons($post->ID, 'any'); | |
| 455 | 455 | |
| 456 | 456 | } // End If Statement | 
| 457 | 457 | |
| 458 | 458 | $html = ''; | 
| 459 | - $html .= '<input type="hidden" name="' . esc_attr( 'woo_' . $this->token . '_noonce' ) . '" id="' | |
| 460 | - . esc_attr( 'woo_' . $this->token . '_noonce' ) | |
| 461 | - . '" value="' . esc_attr( wp_create_nonce( plugin_basename(__FILE__) ) ) . '" />'; | |
| 459 | +		$html .= '<input type="hidden" name="'.esc_attr('woo_'.$this->token.'_noonce').'" id="' | |
| 460 | +                 . esc_attr('woo_'.$this->token.'_noonce') | |
| 461 | + . '" value="'.esc_attr(wp_create_nonce(plugin_basename(__FILE__))).'" />'; | |
| 462 | 462 | |
| 463 | -		if ( count( $posts_array ) > 0 ) { | |
| 463 | +		if (count($posts_array) > 0) { | |
| 464 | 464 | |
| 465 | -			foreach ($posts_array as $post_item){ | |
| 465 | +			foreach ($posts_array as $post_item) { | |
| 466 | 466 | |
| 467 | 467 | $html .= '<p>'."\n"; | 
| 468 | 468 | |
| 469 | 469 | $html .= $post_item->post_title."\n"; | 
| 470 | - $html .= '<a href="' . esc_url( get_edit_post_link( $post_item->ID ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $post_item->post_title ) ) . '" class="edit-lesson-action">' . __( 'Edit this lesson', 'woothemes-sensei' ) . '</a>'; | |
| 470 | +					$html .= '<a href="'.esc_url(get_edit_post_link($post_item->ID)).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $post_item->post_title)).'" class="edit-lesson-action">'.__('Edit this lesson', 'woothemes-sensei').'</a>'; | |
| 471 | 471 | |
| 472 | 472 | $html .= '</p>'."\n"; | 
| 473 | 473 | |
| @@ -475,12 +475,12 @@ discard block | ||
| 475 | 475 | |
| 476 | 476 |  		} else { | 
| 477 | 477 | $course_id = ''; | 
| 478 | -			if ( 0 < $post->ID ) { $course_id = '&course_id=' . $post->ID; } | |
| 479 | - $html .= '<p>' . esc_html( __( 'No lessons exist yet for this course.', 'woothemes-sensei' ) ) . "\n"; | |
| 478 | +			if (0 < $post->ID) { $course_id = '&course_id='.$post->ID; } | |
| 479 | +			$html .= '<p>'.esc_html(__('No lessons exist yet for this course.', 'woothemes-sensei'))."\n"; | |
| 480 | 480 | |
| 481 | - $html .= '<a href="' . admin_url( 'post-new.php?post_type=lesson' . $course_id ) | |
| 482 | - . '" title="' . esc_attr( __( 'Add a Lesson', 'woothemes-sensei' ) ) . '">' | |
| 483 | - . __( 'Please add some.', 'woothemes-sensei' ) . '</a>' . "\n"; | |
| 481 | +				$html .= '<a href="'.admin_url('post-new.php?post_type=lesson'.$course_id) | |
| 482 | +                         . '" title="'.esc_attr(__('Add a Lesson', 'woothemes-sensei')).'">' | |
| 483 | +                         . __('Please add some.', 'woothemes-sensei').'</a>'."\n"; | |
| 484 | 484 | |
| 485 | 485 | $html .= '</p>'."\n"; | 
| 486 | 486 | } // End If Statement | 
| @@ -497,12 +497,12 @@ discard block | ||
| 497 | 497 | * @return void | 
| 498 | 498 | */ | 
| 499 | 499 | |
| 500 | -    public function course_manage_meta_box_content () { | |
| 500 | +    public function course_manage_meta_box_content() { | |
| 501 | 501 | global $post; | 
| 502 | 502 | |
| 503 | - $manage_url = esc_url( add_query_arg( array( 'page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) ); | |
| 503 | +        $manage_url = esc_url(add_query_arg(array('page' => 'sensei_learners', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php'))); | |
| 504 | 504 | |
| 505 | - $grading_url = esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners' ), admin_url( 'admin.php') ) ); | |
| 505 | +        $grading_url = esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $post->ID, 'view' => 'learners'), admin_url('admin.php'))); | |
| 506 | 506 | |
| 507 | 507 | |
| 508 | 508 |          echo "<ul><li><a href='$manage_url'>".__("Manage Learners", 'woothemes-sensei')."</a></li>"; | 
| @@ -520,16 +520,16 @@ discard block | ||
| 520 | 520 | * @param array $defaults | 
| 521 | 521 | * @return array $new_columns | 
| 522 | 522 | */ | 
| 523 | -	public function add_column_headings ( $defaults ) { | |
| 523 | +	public function add_column_headings($defaults) { | |
| 524 | 524 | $new_columns['cb'] = '<input type="checkbox" />'; | 
| 525 | 525 | // $new_columns['id'] = __( 'ID' ); | 
| 526 | - $new_columns['title'] = _x( 'Course Title', 'column name', 'woothemes-sensei' ); | |
| 527 | - $new_columns['course-prerequisite'] = _x( 'Pre-requisite Course', 'column name', 'woothemes-sensei' ); | |
| 528 | -		if ( Sensei_WC::is_woocommerce_active() ) { | |
| 529 | - $new_columns['course-woocommerce-product'] = _x( 'WooCommerce Product', 'column name', 'woothemes-sensei' ); | |
| 526 | +		$new_columns['title'] = _x('Course Title', 'column name', 'woothemes-sensei'); | |
| 527 | +		$new_columns['course-prerequisite'] = _x('Pre-requisite Course', 'column name', 'woothemes-sensei'); | |
| 528 | +		if (Sensei_WC::is_woocommerce_active()) { | |
| 529 | +			$new_columns['course-woocommerce-product'] = _x('WooCommerce Product', 'column name', 'woothemes-sensei'); | |
| 530 | 530 | } // End If Statement | 
| 531 | - $new_columns['course-category'] = _x( 'Category', 'column name', 'woothemes-sensei' ); | |
| 532 | -		if ( isset( $defaults['date'] ) ) { | |
| 531 | +		$new_columns['course-category'] = _x('Category', 'column name', 'woothemes-sensei'); | |
| 532 | +		if (isset($defaults['date'])) { | |
| 533 | 533 | $new_columns['date'] = $defaults['date']; | 
| 534 | 534 | } | 
| 535 | 535 | |
| @@ -544,45 +544,45 @@ discard block | ||
| 544 | 544 | * @param int $id | 
| 545 | 545 | * @return void | 
| 546 | 546 | */ | 
| 547 | -	public function add_column_data ( $column_name, $id ) { | |
| 547 | +	public function add_column_data($column_name, $id) { | |
| 548 | 548 | global $wpdb, $post; | 
| 549 | 549 | |
| 550 | -		switch ( $column_name ) { | |
| 550 | +		switch ($column_name) { | |
| 551 | 551 | case 'id': | 
| 552 | 552 | echo $id; | 
| 553 | 553 | break; | 
| 554 | 554 | |
| 555 | 555 | case 'course-prerequisite': | 
| 556 | - $course_prerequisite_id = get_post_meta( $id, '_course_prerequisite', true); | |
| 557 | -				if ( 0 < absint( $course_prerequisite_id ) ) { echo '<a href="' . esc_url( get_edit_post_link( absint( $course_prerequisite_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $course_prerequisite_id ) ) ) ) . '">' . get_the_title( absint( $course_prerequisite_id ) ) . '</a>'; } | |
| 556 | + $course_prerequisite_id = get_post_meta($id, '_course_prerequisite', true); | |
| 557 | +				if (0 < absint($course_prerequisite_id)) { echo '<a href="'.esc_url(get_edit_post_link(absint($course_prerequisite_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($course_prerequisite_id)))).'">'.get_the_title(absint($course_prerequisite_id)).'</a>'; } | |
| 558 | 558 | |
| 559 | 559 | break; | 
| 560 | 560 | |
| 561 | 561 | case 'course-woocommerce-product': | 
| 562 | -				if ( Sensei_WC::is_woocommerce_active() ) { | |
| 563 | - $course_woocommerce_product_id = get_post_meta( $id, '_course_woocommerce_product', true); | |
| 564 | -					if ( 0 < absint( $course_woocommerce_product_id ) ) { | |
| 565 | -						if ( 'product_variation' == get_post_type( $course_woocommerce_product_id ) ) { | |
| 566 | - $product_object = get_product( $course_woocommerce_product_id ); | |
| 567 | -							if( sensei_check_woocommerce_version( '2.1' ) ) { | |
| 568 | - $formatted_variation = wc_get_formatted_variation( $product_object->variation_data, true ); | |
| 562 | +				if (Sensei_WC::is_woocommerce_active()) { | |
| 563 | + $course_woocommerce_product_id = get_post_meta($id, '_course_woocommerce_product', true); | |
| 564 | +					if (0 < absint($course_woocommerce_product_id)) { | |
| 565 | +						if ('product_variation' == get_post_type($course_woocommerce_product_id)) { | |
| 566 | + $product_object = get_product($course_woocommerce_product_id); | |
| 567 | +							if (sensei_check_woocommerce_version('2.1')) { | |
| 568 | + $formatted_variation = wc_get_formatted_variation($product_object->variation_data, true); | |
| 569 | 569 |  							} else { | 
| 570 | - $formatted_variation = woocommerce_get_formatted_variation( $product_object->variation_data, true ); | |
| 570 | + $formatted_variation = woocommerce_get_formatted_variation($product_object->variation_data, true); | |
| 571 | 571 | } | 
| 572 | 572 | $course_woocommerce_product_id = $product_object->parent->post->ID; | 
| 573 | - $product_name = $product_object->parent->post->post_title . '<br/>      ' . ucwords( $formatted_variation ); | |
| 573 | + $product_name = $product_object->parent->post->post_title.'<br/>      '.ucwords($formatted_variation); | |
| 574 | 574 |  						} else { | 
| 575 | - $product_name = get_the_title( absint( $course_woocommerce_product_id ) ); | |
| 575 | + $product_name = get_the_title(absint($course_woocommerce_product_id)); | |
| 576 | 576 | } // End If Statement | 
| 577 | - echo '<a href="' . esc_url( get_edit_post_link( absint( $course_woocommerce_product_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), $product_name ) ) . '">' . $product_name . '</a>'; | |
| 577 | +						echo '<a href="'.esc_url(get_edit_post_link(absint($course_woocommerce_product_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), $product_name)).'">'.$product_name.'</a>'; | |
| 578 | 578 | } // End If Statement | 
| 579 | 579 | } // End If Statement | 
| 580 | 580 | break; | 
| 581 | 581 | |
| 582 | 582 | case 'course-category': | 
| 583 | - $output = get_the_term_list( $id, 'course-category', '', ', ', '' ); | |
| 584 | -				if ( '' == $output ) { | |
| 585 | - $output = __( 'None', 'woothemes-sensei' ); | |
| 583 | + $output = get_the_term_list($id, 'course-category', '', ', ', ''); | |
| 584 | +				if ('' == $output) { | |
| 585 | +					$output = __('None', 'woothemes-sensei'); | |
| 586 | 586 | } // End If Statement | 
| 587 | 587 | echo $output; | 
| 588 | 588 | break; | 
| @@ -602,29 +602,29 @@ discard block | ||
| 602 | 602 | * @param array $includes (default: array()) | 
| 603 | 603 | * @return array | 
| 604 | 604 | */ | 
| 605 | -	public function course_query( $amount = 0, $type = 'default', $includes = array(), $excludes = array() ) { | |
| 606 | - global $my_courses_page ; | |
| 605 | +	public function course_query($amount = 0, $type = 'default', $includes = array(), $excludes = array()) { | |
| 606 | + global $my_courses_page; | |
| 607 | 607 | |
| 608 | 608 | $results_array = array(); | 
| 609 | 609 | |
| 610 | -		if( $my_courses_page ) { add_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); } | |
| 610 | +		if ($my_courses_page) { add_action('pre_get_posts', array($this, 'filter_my_courses')); } | |
| 611 | 611 | |
| 612 | - $post_args = $this->get_archive_query_args( $type, $amount, $includes, $excludes ); | |
| 612 | + $post_args = $this->get_archive_query_args($type, $amount, $includes, $excludes); | |
| 613 | 613 | |
| 614 | 614 | // get the posts | 
| 615 | -		if( empty( $post_args ) ) { | |
| 615 | +		if (empty($post_args)) { | |
| 616 | 616 | |
| 617 | 617 | return $results_array; | 
| 618 | 618 | |
| 619 | -		}else{ | |
| 619 | +		} else { | |
| 620 | 620 | |
| 621 | 621 | //reset the pagination as this widgets do not need it | 
| 622 | 622 | $post_args['paged'] = 1; | 
| 623 | - $results_array = get_posts( $post_args ); | |
| 623 | + $results_array = get_posts($post_args); | |
| 624 | 624 | |
| 625 | 625 | } | 
| 626 | 626 | |
| 627 | -		if( $my_courses_page ) { remove_action( 'pre_get_posts', array( $this, 'filter_my_courses' ) ); } | |
| 627 | +		if ($my_courses_page) { remove_action('pre_get_posts', array($this, 'filter_my_courses')); } | |
| 628 | 628 | |
| 629 | 629 | return $results_array; | 
| 630 | 630 | |
| @@ -640,22 +640,22 @@ discard block | ||
| 640 | 640 | * @param array $includes (default: array()) | 
| 641 | 641 | * @return array | 
| 642 | 642 | */ | 
| 643 | -	public function get_archive_query_args( $type = '', $amount = 0 , $includes = array(), $excludes = array() ) { | |
| 643 | +	public function get_archive_query_args($type = '', $amount = 0, $includes = array(), $excludes = array()) { | |
| 644 | 644 | |
| 645 | 645 | global $wp_query; | 
| 646 | 646 | |
| 647 | -		if ( 0 == $amount && ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && 'usercourses' != $type && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) ) { | |
| 648 | - $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] ); | |
| 647 | +		if (0 == $amount && (isset(Sensei()->settings->settings['course_archive_amount']) && 'usercourses' != $type && (0 < absint(Sensei()->settings->settings['course_archive_amount'])))) { | |
| 648 | + $amount = absint(Sensei()->settings->settings['course_archive_amount']); | |
| 649 | 649 |  		} else { | 
| 650 | -			if ( 0 == $amount) { | |
| 651 | - $amount = $wp_query->get( 'posts_per_page' ); | |
| 650 | +			if (0 == $amount) { | |
| 651 | +				$amount = $wp_query->get('posts_per_page'); | |
| 652 | 652 | } // End If Statement | 
| 653 | 653 | } // End If Statement | 
| 654 | 654 | |
| 655 | - $stored_order = get_option( 'sensei_course_order', '' ); | |
| 655 | +        $stored_order = get_option('sensei_course_order', ''); | |
| 656 | 656 | $order = 'ASC'; | 
| 657 | 657 | $orderby = 'menu_order'; | 
| 658 | -        if( empty( $stored_order ) ){ | |
| 658 | +        if (empty($stored_order)) { | |
| 659 | 659 | |
| 660 | 660 | $order = 'DESC'; | 
| 661 | 661 | $orderby = 'date'; | 
| @@ -665,7 +665,7 @@ discard block | ||
| 665 | 665 |  		switch ($type) { | 
| 666 | 666 | |
| 667 | 667 | case 'usercourses': | 
| 668 | - $post_args = array( 'post_type' => 'course', | |
| 668 | +				$post_args = array('post_type' 		=> 'course', | |
| 669 | 669 | 'orderby' => $orderby, | 
| 670 | 670 | 'order' => $order, | 
| 671 | 671 | 'post_status' => 'publish', | 
| @@ -706,7 +706,7 @@ discard block | ||
| 706 | 706 | break; | 
| 707 | 707 | |
| 708 | 708 | case 'featuredcourses': | 
| 709 | - $post_args = array( 'post_type' => 'course', | |
| 709 | +                $post_args = array('post_type' 		=> 'course', | |
| 710 | 710 | 'orderby' => $orderby, | 
| 711 | 711 | 'order' => $order, | 
| 712 | 712 | 'post_status' => 'publish', | 
| @@ -718,7 +718,7 @@ discard block | ||
| 718 | 718 | ); | 
| 719 | 719 | break; | 
| 720 | 720 | default: | 
| 721 | - $post_args = array( 'post_type' => 'course', | |
| 721 | +				$post_args = array('post_type' 		=> 'course', | |
| 722 | 722 | 'orderby' => $orderby, | 
| 723 | 723 | 'order' => $order, | 
| 724 | 724 | 'post_status' => 'publish', | 
| @@ -730,13 +730,13 @@ discard block | ||
| 730 | 730 | } | 
| 731 | 731 | |
| 732 | 732 | $post_args['posts_per_page'] = $amount; | 
| 733 | - $paged = $wp_query->get( 'paged' ); | |
| 734 | - $post_args['paged'] = empty( $paged) ? 1 : $paged; | |
| 733 | +        $paged = $wp_query->get('paged'); | |
| 734 | + $post_args['paged'] = empty($paged) ? 1 : $paged; | |
| 735 | 735 | |
| 736 | -        if( 'newcourses' == $type ){ | |
| 736 | +        if ('newcourses' == $type) { | |
| 737 | 737 | |
| 738 | - $post_args[ 'orderby' ] = 'date'; | |
| 739 | - $post_args[ 'order' ] = 'DESC'; | |
| 738 | + $post_args['orderby'] = 'date'; | |
| 739 | + $post_args['order'] = 'DESC'; | |
| 740 | 740 | } | 
| 741 | 741 | |
| 742 | 742 | return $post_args; | 
| @@ -758,15 +758,15 @@ discard block | ||
| 758 | 758 | * | 
| 759 | 759 | * @return string | void | 
| 760 | 760 | */ | 
| 761 | -	public function course_image( $course_id = 0, $width = '100', $height = '100', $return = false ) { | |
| 761 | +	public function course_image($course_id = 0, $width = '100', $height = '100', $return = false) { | |
| 762 | 762 | |
| 763 | -        if ( is_a( $course_id, 'WP_Post' ) ) { | |
| 763 | +        if (is_a($course_id, 'WP_Post')) { | |
| 764 | 764 | |
| 765 | 765 | $course_id = $course_id->ID; | 
| 766 | 766 | |
| 767 | 767 | } | 
| 768 | 768 | |
| 769 | -		if ( 'course' !== get_post_type( $course_id )  ){ | |
| 769 | +		if ('course' !== get_post_type($course_id)) { | |
| 770 | 770 | |
| 771 | 771 | return; | 
| 772 | 772 | |
| @@ -775,26 +775,26 @@ discard block | ||
| 775 | 775 | $html = ''; | 
| 776 | 776 | |
| 777 | 777 | // Get Width and Height settings | 
| 778 | -		if ( ( $width == '100' ) && ( $height == '100' ) ) { | |
| 778 | +		if (($width == '100') && ($height == '100')) { | |
| 779 | 779 | |
| 780 | -			if ( is_singular( 'course' ) ) { | |
| 780 | +			if (is_singular('course')) { | |
| 781 | 781 | |
| 782 | -				if ( !Sensei()->settings->settings[ 'course_single_image_enable' ] ) { | |
| 782 | +				if ( ! Sensei()->settings->settings['course_single_image_enable']) { | |
| 783 | 783 | return ''; | 
| 784 | 784 | } // End If Statement | 
| 785 | 785 | $image_thumb_size = 'course_single_image'; | 
| 786 | - $dimensions = Sensei()->get_image_size( $image_thumb_size ); | |
| 786 | + $dimensions = Sensei()->get_image_size($image_thumb_size); | |
| 787 | 787 | $width = $dimensions['width']; | 
| 788 | 788 | $height = $dimensions['height']; | 
| 789 | 789 | |
| 790 | 790 |  			} else { | 
| 791 | 791 | |
| 792 | -				if ( !Sensei()->settings->settings[ 'course_archive_image_enable' ] ) { | |
| 792 | +				if ( ! Sensei()->settings->settings['course_archive_image_enable']) { | |
| 793 | 793 | return ''; | 
| 794 | 794 | } // End If Statement | 
| 795 | 795 | |
| 796 | 796 | $image_thumb_size = 'course_archive_image'; | 
| 797 | - $dimensions = Sensei()->get_image_size( $image_thumb_size ); | |
| 797 | + $dimensions = Sensei()->get_image_size($image_thumb_size); | |
| 798 | 798 | $width = $dimensions['width']; | 
| 799 | 799 | $height = $dimensions['height']; | 
| 800 | 800 | |
| @@ -803,31 +803,31 @@ discard block | ||
| 803 | 803 | } // End If Statement | 
| 804 | 804 | |
| 805 | 805 | $img_url = ''; | 
| 806 | -		if ( has_post_thumbnail( $course_id ) ) { | |
| 806 | +		if (has_post_thumbnail($course_id)) { | |
| 807 | 807 | // Get Featured Image | 
| 808 | - $img_url = get_the_post_thumbnail( $course_id, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') ); | |
| 808 | +   			$img_url = get_the_post_thumbnail($course_id, array($width, $height), array('class' => 'woo-image thumbnail alignleft')); | |
| 809 | 809 |   		} else { | 
| 810 | 810 | |
| 811 | 811 | // Check for a Lesson Image | 
| 812 | - $course_lessons = $this->course_lessons( $course_id ); | |
| 812 | + $course_lessons = $this->course_lessons($course_id); | |
| 813 | 813 | |
| 814 | -			foreach ($course_lessons as $lesson_item){ | |
| 815 | -				if ( has_post_thumbnail( $lesson_item->ID ) ) { | |
| 814 | +			foreach ($course_lessons as $lesson_item) { | |
| 815 | +				if (has_post_thumbnail($lesson_item->ID)) { | |
| 816 | 816 | // Get Featured Image | 
| 817 | - $img_url = get_the_post_thumbnail( $lesson_item->ID, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') ); | |
| 818 | -					if ( '' != $img_url ) { | |
| 817 | +					$img_url = get_the_post_thumbnail($lesson_item->ID, array($width, $height), array('class' => 'woo-image thumbnail alignleft')); | |
| 818 | +					if ('' != $img_url) { | |
| 819 | 819 | break; | 
| 820 | 820 | } // End If Statement | 
| 821 | 821 | |
| 822 | 822 | } // End If Statement | 
| 823 | 823 | } // End For Loop | 
| 824 | 824 | |
| 825 | - 			if ( '' == $img_url ) { | |
| 825 | + 			if ('' == $img_url) { | |
| 826 | 826 | |
| 827 | 827 | // Display Image Placeholder if none | 
| 828 | -				if ( Sensei()->settings->get( 'placeholder_images_enable' ) ) { | |
| 828 | +				if (Sensei()->settings->get('placeholder_images_enable')) { | |
| 829 | 829 | |
| 830 | - $img_url = apply_filters( 'sensei_course_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' ); | |
| 830 | +                    $img_url = apply_filters('sensei_course_placeholder_image_url', '<img src="http://placehold.it/'.$width.'x'.$height.'" class="woo-image thumbnail alignleft" />'); | |
| 831 | 831 | |
| 832 | 832 | } // End If Statement | 
| 833 | 833 | |
| @@ -835,17 +835,17 @@ discard block | ||
| 835 | 835 | |
| 836 | 836 | } // End If Statement | 
| 837 | 837 | |
| 838 | -		if ( '' != $img_url ) { | |
| 838 | +		if ('' != $img_url) { | |
| 839 | 839 | |
| 840 | - $html .= '<a href="' . get_permalink( $course_id ) . '" title="' . esc_attr( get_post_field( 'post_title', $course_id ) ) . '">' . $img_url .'</a>'; | |
| 840 | +			$html .= '<a href="'.get_permalink($course_id).'" title="'.esc_attr(get_post_field('post_title', $course_id)).'">'.$img_url.'</a>'; | |
| 841 | 841 | |
| 842 | 842 | } // End If Statement | 
| 843 | 843 | |
| 844 | -        if( $return ){ | |
| 844 | +        if ($return) { | |
| 845 | 845 | |
| 846 | 846 | return $html; | 
| 847 | 847 | |
| 848 | -        }else{ | |
| 848 | +        } else { | |
| 849 | 849 | |
| 850 | 850 | echo $html; | 
| 851 | 851 | |
| @@ -862,9 +862,9 @@ discard block | ||
| 862 | 862 | * @param string $post_status (default: 'publish') | 
| 863 | 863 | * @return int | 
| 864 | 864 | */ | 
| 865 | -	public function course_count( $post_status = 'publish' ) { | |
| 865 | +	public function course_count($post_status = 'publish') { | |
| 866 | 866 | |
| 867 | - $post_args = array( 'post_type' => 'course', | |
| 867 | +		$post_args = array('post_type'         => 'course', | |
| 868 | 868 | 'posts_per_page' => -1, | 
| 869 | 869 | // 'orderby' => 'menu_order date', | 
| 870 | 870 | // 'order' => 'ASC', | 
| @@ -875,10 +875,10 @@ discard block | ||
| 875 | 875 | |
| 876 | 876 | // Allow WP to generate the complex final query, just shortcut to only do an overall count | 
| 877 | 877 | // add_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) ); | 
| 878 | - $courses_query = new WP_Query( apply_filters( 'sensei_course_count', $post_args ) ); | |
| 878 | +		$courses_query = new WP_Query(apply_filters('sensei_course_count', $post_args)); | |
| 879 | 879 | // remove_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) ); | 
| 880 | 880 | |
| 881 | - return count( $courses_query->posts ); | |
| 881 | + return count($courses_query->posts); | |
| 882 | 882 | } // End course_count() | 
| 883 | 883 | |
| 884 | 884 | |
| @@ -891,42 +891,42 @@ discard block | ||
| 891 | 891 | * @param string $fields (default: 'all'). WP only allows 3 types, but we will limit it to only 'ids' or 'all' | 
| 892 | 892 |  	 * @return array{ type WP_Post }  $posts_array | 
| 893 | 893 | */ | 
| 894 | -	public function course_lessons( $course_id = 0, $post_status = 'publish', $fields = 'all' ) { | |
| 894 | +	public function course_lessons($course_id = 0, $post_status = 'publish', $fields = 'all') { | |
| 895 | 895 | |
| 896 | -        if( is_a( $course_id, 'WP_Post' ) ){ | |
| 896 | +        if (is_a($course_id, 'WP_Post')) { | |
| 897 | 897 | $course_id = $course_id->ID; | 
| 898 | 898 | } | 
| 899 | 899 | |
| 900 | - $post_args = array( 'post_type' => 'lesson', | |
| 900 | +		$post_args = array('post_type'         => 'lesson', | |
| 901 | 901 | 'posts_per_page' => -1, | 
| 902 | 902 | 'orderby' => 'date', | 
| 903 | 903 | 'order' => 'ASC', | 
| 904 | 904 | 'meta_query' => array( | 
| 905 | 905 | array( | 
| 906 | 906 | 'key' => '_lesson_course', | 
| 907 | - 'value' => intval( $course_id ), | |
| 907 | + 'value' => intval($course_id), | |
| 908 | 908 | ), | 
| 909 | 909 | ), | 
| 910 | 910 | 'post_status' => $post_status, | 
| 911 | 911 | 'suppress_filters' => 0, | 
| 912 | 912 | ); | 
| 913 | - $query_results = new WP_Query( $post_args ); | |
| 913 | + $query_results = new WP_Query($post_args); | |
| 914 | 914 | $lessons = $query_results->posts; | 
| 915 | 915 | |
| 916 | 916 | // re order the lessons. This could not be done via the OR meta query as there may be lessons | 
| 917 | 917 | // with the course order for a different course and this should not be included. It could also not | 
| 918 | 918 | // be done via the AND meta query as it excludes lesson that does not have the _order_$course_id but | 
| 919 | 919 | // that have been added to the course. | 
| 920 | -        if( count( $lessons) > 1  ){ | |
| 920 | +        if (count($lessons) > 1) { | |
| 921 | 921 | |
| 922 | -            foreach( $lessons as $lesson ){ | |
| 922 | +            foreach ($lessons as $lesson) { | |
| 923 | 923 | |
| 924 | - $order = intval( get_post_meta( $lesson->ID, '_order_'. $course_id, true ) ); | |
| 924 | + $order = intval(get_post_meta($lesson->ID, '_order_'.$course_id, true)); | |
| 925 | 925 | // for lessons with no order set it to be 10000 so that it show up at the end | 
| 926 | 926 | $lesson->course_order = $order ? $order : 100000; | 
| 927 | 927 | } | 
| 928 | 928 | |
| 929 | - uasort( $lessons, array( $this, '_short_course_lessons_callback' ) ); | |
| 929 | + uasort($lessons, array($this, '_short_course_lessons_callback')); | |
| 930 | 930 | } | 
| 931 | 931 | |
| 932 | 932 | /** | 
| @@ -937,12 +937,12 @@ discard block | ||
| 937 | 937 | * @param array $lessons | 
| 938 | 938 | * @param int $course_id | 
| 939 | 939 | */ | 
| 940 | - $lessons = apply_filters( 'sensei_course_get_lessons', $lessons, $course_id ); | |
| 940 | +        $lessons = apply_filters('sensei_course_get_lessons', $lessons, $course_id); | |
| 941 | 941 | |
| 942 | 942 | //return the requested fields | 
| 943 | 943 | // runs after the sensei_course_get_lessons filter so the filter always give an array of lesson | 
| 944 | 944 | // objects | 
| 945 | -        if( 'ids' == $fields ) { | |
| 945 | +        if ('ids' == $fields) { | |
| 946 | 946 | $lesson_objects = $lessons; | 
| 947 | 947 | $lessons = array(); | 
| 948 | 948 | |
| @@ -964,9 +964,9 @@ discard block | ||
| 964 | 964 | * @param array $lesson_2 | 
| 965 | 965 | * @return int | 
| 966 | 966 | */ | 
| 967 | -    protected function _short_course_lessons_callback( $lesson_1, $lesson_2 ){ | |
| 967 | +    protected function _short_course_lessons_callback($lesson_1, $lesson_2) { | |
| 968 | 968 | |
| 969 | -        if ( $lesson_1->course_order == $lesson_2->course_order ) { | |
| 969 | +        if ($lesson_1->course_order == $lesson_2->course_order) { | |
| 970 | 970 | return 0; | 
| 971 | 971 | } | 
| 972 | 972 | |
| @@ -980,21 +980,21 @@ discard block | ||
| 980 | 980 | * @param boolean $boolean_check True if a simple yes/no is required | 
| 981 | 981 | * @return array Array of quiz post objects | 
| 982 | 982 | */ | 
| 983 | -	public function course_quizzes( $course_id = 0, $boolean_check = false ) { | |
| 983 | +	public function course_quizzes($course_id = 0, $boolean_check = false) { | |
| 984 | 984 | |
| 985 | 985 | |
| 986 | 986 | $course_quizzes = array(); | 
| 987 | 987 | |
| 988 | -		if( $course_id ) { | |
| 989 | - $lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' ); | |
| 988 | +		if ($course_id) { | |
| 989 | + $lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids'); | |
| 990 | 990 | |
| 991 | -			foreach( $lesson_ids as $lesson_id ) { | |
| 992 | - $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); | |
| 993 | -				if ( $has_questions && $boolean_check ) { | |
| 991 | +			foreach ($lesson_ids as $lesson_id) { | |
| 992 | + $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); | |
| 993 | +				if ($has_questions && $boolean_check) { | |
| 994 | 994 | return true; | 
| 995 | 995 | } | 
| 996 | -				elseif ( $has_questions ) { | |
| 997 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 996 | +				elseif ($has_questions) { | |
| 997 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 998 | 998 | // $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id ); | 
| 999 | 999 |  //					if( count( $questions ) > 0 ) { | 
| 1000 | 1000 | $course_quizzes[] = $quiz_id; | 
| @@ -1002,7 +1002,7 @@ discard block | ||
| 1002 | 1002 | } | 
| 1003 | 1003 | } | 
| 1004 | 1004 | } | 
| 1005 | -		if ( $boolean_check && empty($course_quizzes) ) { | |
| 1005 | +		if ($boolean_check && empty($course_quizzes)) { | |
| 1006 | 1006 | $course_quizzes = false; | 
| 1007 | 1007 | } | 
| 1008 | 1008 | return $course_quizzes; | 
| @@ -1017,9 +1017,9 @@ discard block | ||
| 1017 | 1017 | * @param string $post_status (default: 'publish') | 
| 1018 | 1018 | * @return array | 
| 1019 | 1019 | */ | 
| 1020 | -	public function course_lessons_completed( $course_id = 0, $post_status = 'publish' ) { | |
| 1020 | +	public function course_lessons_completed($course_id = 0, $post_status = 'publish') { | |
| 1021 | 1021 | |
| 1022 | - return $this->course_lessons( $course_id, $post_status ); | |
| 1022 | + return $this->course_lessons($course_id, $post_status); | |
| 1023 | 1023 | |
| 1024 | 1024 | } // End course_lessons_completed() | 
| 1025 | 1025 | |
| @@ -1032,9 +1032,9 @@ discard block | ||
| 1032 | 1032 | * @param int $course_id (default: 0) | 
| 1033 | 1033 | * @return int | 
| 1034 | 1034 | */ | 
| 1035 | -	public function course_author_lesson_count( $author_id = 0, $course_id = 0 ) { | |
| 1035 | +	public function course_author_lesson_count($author_id = 0, $course_id = 0) { | |
| 1036 | 1036 | |
| 1037 | - $lesson_args = array( 'post_type' => 'lesson', | |
| 1037 | +        $lesson_args = array('post_type' 		=> 'lesson', | |
| 1038 | 1038 | 'posts_per_page' => -1, | 
| 1039 | 1039 | 'author' => $author_id, | 
| 1040 | 1040 | 'meta_key' => '_lesson_course', | 
| @@ -1043,8 +1043,8 @@ discard block | ||
| 1043 | 1043 | 'suppress_filters' => 0, | 
| 1044 | 1044 | 'fields' => 'ids', // less data to retrieve | 
| 1045 | 1045 | ); | 
| 1046 | - $lessons_array = get_posts( $lesson_args ); | |
| 1047 | - $count = count( $lessons_array ); | |
| 1046 | + $lessons_array = get_posts($lesson_args); | |
| 1047 | + $count = count($lessons_array); | |
| 1048 | 1048 | return $count; | 
| 1049 | 1049 | |
| 1050 | 1050 | } // End course_author_lesson_count() | 
| @@ -1056,9 +1056,9 @@ discard block | ||
| 1056 | 1056 | * @param int $course_id (default: 0) | 
| 1057 | 1057 | * @return int | 
| 1058 | 1058 | */ | 
| 1059 | -	public function course_lesson_count( $course_id = 0 ) { | |
| 1059 | +	public function course_lesson_count($course_id = 0) { | |
| 1060 | 1060 | |
| 1061 | - $lesson_args = array( 'post_type' => 'lesson', | |
| 1061 | +		$lesson_args = array('post_type' 		=> 'lesson', | |
| 1062 | 1062 | 'posts_per_page' => -1, | 
| 1063 | 1063 | 'meta_key' => '_lesson_course', | 
| 1064 | 1064 | 'meta_value' => $course_id, | 
| @@ -1066,9 +1066,9 @@ discard block | ||
| 1066 | 1066 | 'suppress_filters' => 0, | 
| 1067 | 1067 | 'fields' => 'ids', // less data to retrieve | 
| 1068 | 1068 | ); | 
| 1069 | - $lessons_array = get_posts( $lesson_args ); | |
| 1069 | + $lessons_array = get_posts($lesson_args); | |
| 1070 | 1070 | |
| 1071 | - $count = count( $lessons_array ); | |
| 1071 | + $count = count($lessons_array); | |
| 1072 | 1072 | |
| 1073 | 1073 | return $count; | 
| 1074 | 1074 | |
| @@ -1081,9 +1081,9 @@ discard block | ||
| 1081 | 1081 | * @param int $course_id (default: 0) | 
| 1082 | 1082 | * @return int | 
| 1083 | 1083 | */ | 
| 1084 | -	public function course_lesson_preview_count( $course_id = 0 ) { | |
| 1084 | +	public function course_lesson_preview_count($course_id = 0) { | |
| 1085 | 1085 | |
| 1086 | - $lesson_args = array( 'post_type' => 'lesson', | |
| 1086 | +		$lesson_args = array('post_type' 		=> 'lesson', | |
| 1087 | 1087 | 'posts_per_page' => -1, | 
| 1088 | 1088 | 'post_status' => 'publish', | 
| 1089 | 1089 | 'suppress_filters' => 0, | 
| @@ -1099,9 +1099,9 @@ discard block | ||
| 1099 | 1099 | ), | 
| 1100 | 1100 | 'fields' => 'ids', // less data to retrieve | 
| 1101 | 1101 | ); | 
| 1102 | - $lessons_array = get_posts( $lesson_args ); | |
| 1102 | + $lessons_array = get_posts($lesson_args); | |
| 1103 | 1103 | |
| 1104 | - $count = count( $lessons_array ); | |
| 1104 | + $count = count($lessons_array); | |
| 1105 | 1105 | |
| 1106 | 1106 | return $count; | 
| 1107 | 1107 | |
| @@ -1114,12 +1114,12 @@ discard block | ||
| 1114 | 1114 | * @param int $product_id (default: 0) | 
| 1115 | 1115 | * @return array | 
| 1116 | 1116 | */ | 
| 1117 | -	public function get_product_courses( $product_id = 0 ) { | |
| 1117 | +	public function get_product_courses($product_id = 0) { | |
| 1118 | 1118 | |
| 1119 | 1119 | $posts_array = array(); | 
| 1120 | 1120 | // Check for WooCommerce | 
| 1121 | -		if ( Sensei_WC::is_woocommerce_active() && 0 < $product_id ) { | |
| 1122 | - $post_args = array( 'post_type' => 'course', | |
| 1121 | +		if (Sensei_WC::is_woocommerce_active() && 0 < $product_id) { | |
| 1122 | +			$post_args = array('post_type' 		=> 'course', | |
| 1123 | 1123 | 'posts_per_page' => -1, | 
| 1124 | 1124 | 'meta_key' => '_course_woocommerce_product', | 
| 1125 | 1125 | 'meta_value' => $product_id, | 
| @@ -1128,7 +1128,7 @@ discard block | ||
| 1128 | 1128 | 'orderby' => 'menu_order date', | 
| 1129 | 1129 | 'order' => 'ASC', | 
| 1130 | 1130 | ); | 
| 1131 | - $posts_array = get_posts( $post_args ); | |
| 1131 | + $posts_array = get_posts($post_args); | |
| 1132 | 1132 | } // End If Statement | 
| 1133 | 1133 | return $posts_array; | 
| 1134 | 1134 | |
| @@ -1139,17 +1139,17 @@ discard block | ||
| 1139 | 1139 | * @param WP_Query $query | 
| 1140 | 1140 | * @return void | 
| 1141 | 1141 | */ | 
| 1142 | -	public function filter_my_courses( $query ) { | |
| 1142 | +	public function filter_my_courses($query) { | |
| 1143 | 1143 | global $my_courses_section; | 
| 1144 | 1144 | |
| 1145 | -		if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) { | |
| 1146 | - $amount = absint( Sensei()->settings->settings[ 'my_course_amount' ] ); | |
| 1147 | - $query->set( 'posts_per_page', $amount ); | |
| 1145 | +		if (isset(Sensei()->settings->settings['my_course_amount']) && (0 < absint(Sensei()->settings->settings['my_course_amount']))) { | |
| 1146 | + $amount = absint(Sensei()->settings->settings['my_course_amount']); | |
| 1147 | +			$query->set('posts_per_page', $amount); | |
| 1148 | 1148 | } | 
| 1149 | 1149 | |
| 1150 | -		if( isset( $_GET[ $my_courses_section . '_page' ] ) && 0 < intval( $_GET[ $my_courses_section . '_page' ] ) ) { | |
| 1151 | - $page = intval( $_GET[ $my_courses_section . '_page' ] ); | |
| 1152 | - $query->set( 'paged', $page ); | |
| 1150 | +		if (isset($_GET[$my_courses_section.'_page']) && 0 < intval($_GET[$my_courses_section.'_page'])) { | |
| 1151 | + $page = intval($_GET[$my_courses_section.'_page']); | |
| 1152 | +			$query->set('paged', $page); | |
| 1153 | 1153 | } | 
| 1154 | 1154 | } | 
| 1155 | 1155 | |
| @@ -1163,48 +1163,48 @@ discard block | ||
| 1163 | 1163 | * @param boolean $manage Whether the user has permission to manage the courses | 
| 1164 | 1164 | * @return string HTML displayng course data | 
| 1165 | 1165 | */ | 
| 1166 | -	public function load_user_courses_content( $user = false ) { | |
| 1166 | +	public function load_user_courses_content($user = false) { | |
| 1167 | 1167 | global $course, $my_courses_page, $my_courses_section; | 
| 1168 | 1168 | |
| 1169 | - if( ! isset( Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) | |
| 1170 | -            || ! Sensei()->settings->settings[ 'learner_profile_show_courses' ] ) { | |
| 1169 | + if ( ! isset(Sensei()->settings->settings['learner_profile_show_courses']) | |
| 1170 | +            || ! Sensei()->settings->settings['learner_profile_show_courses']) { | |
| 1171 | 1171 | |
| 1172 | 1172 | // do not show the content if the settings doesn't allow for it | 
| 1173 | 1173 | return; | 
| 1174 | 1174 | |
| 1175 | 1175 | } | 
| 1176 | 1176 | |
| 1177 | - $manage = ( $user->ID == get_current_user_id() ) ? true : false; | |
| 1177 | + $manage = ($user->ID == get_current_user_id()) ? true : false; | |
| 1178 | 1178 | |
| 1179 | - do_action( 'sensei_before_learner_course_content', $user ); | |
| 1179 | +        do_action('sensei_before_learner_course_content', $user); | |
| 1180 | 1180 | |
| 1181 | 1181 | // Build Output HTML | 
| 1182 | 1182 | $complete_html = $active_html = ''; | 
| 1183 | 1183 | |
| 1184 | -		if( is_a( $user, 'WP_User' ) ) { | |
| 1184 | +		if (is_a($user, 'WP_User')) { | |
| 1185 | 1185 | |
| 1186 | 1186 | $my_courses_page = true; | 
| 1187 | 1187 | |
| 1188 | 1188 | // Allow action to be run before My Courses content has loaded | 
| 1189 | - do_action( 'sensei_before_my_courses', $user->ID ); | |
| 1189 | +			do_action('sensei_before_my_courses', $user->ID); | |
| 1190 | 1190 | |
| 1191 | 1191 | // Logic for Active and Completed Courses | 
| 1192 | 1192 | $per_page = 20; | 
| 1193 | - if ( isset( Sensei()->settings->settings[ 'my_course_amount' ] ) | |
| 1194 | -                && ( 0 < absint( Sensei()->settings->settings[ 'my_course_amount' ] ) ) ) { | |
| 1193 | + if (isset(Sensei()->settings->settings['my_course_amount']) | |
| 1194 | +                && (0 < absint(Sensei()->settings->settings['my_course_amount']))) { | |
| 1195 | 1195 | |
| 1196 | - $per_page = absint( Sensei()->settings->settings[ 'my_course_amount' ] ); | |
| 1196 | + $per_page = absint(Sensei()->settings->settings['my_course_amount']); | |
| 1197 | 1197 | |
| 1198 | 1198 | } | 
| 1199 | 1199 | |
| 1200 | - $course_statuses = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user->ID, 'type' => 'sensei_course_status' ), true ); | |
| 1200 | +			$course_statuses = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user->ID, 'type' => 'sensei_course_status'), true); | |
| 1201 | 1201 | // User may only be on 1 Course | 
| 1202 | -			if ( !is_array($course_statuses) ) { | |
| 1203 | - $course_statuses = array( $course_statuses ); | |
| 1202 | +			if ( ! is_array($course_statuses)) { | |
| 1203 | + $course_statuses = array($course_statuses); | |
| 1204 | 1204 | } | 
| 1205 | 1205 | $completed_ids = $active_ids = array(); | 
| 1206 | -			foreach( $course_statuses as $course_status ) { | |
| 1207 | -				if ( Sensei_Utils::user_completed_course( $course_status, $user->ID ) ) { | |
| 1206 | +			foreach ($course_statuses as $course_status) { | |
| 1207 | +				if (Sensei_Utils::user_completed_course($course_status, $user->ID)) { | |
| 1208 | 1208 | $completed_ids[] = $course_status->comment_post_ID; | 
| 1209 | 1209 |  				} else { | 
| 1210 | 1210 | $active_ids[] = $course_status->comment_post_ID; | 
| @@ -1214,41 +1214,41 @@ discard block | ||
| 1214 | 1214 | $active_count = $completed_count = 0; | 
| 1215 | 1215 | |
| 1216 | 1216 | $active_courses = array(); | 
| 1217 | -			if ( 0 < intval( count( $active_ids ) ) ) { | |
| 1217 | +			if (0 < intval(count($active_ids))) { | |
| 1218 | 1218 | $my_courses_section = 'active'; | 
| 1219 | - $active_courses = Sensei()->course->course_query( $per_page, 'usercourses', $active_ids ); | |
| 1220 | - $active_count = count( $active_ids ); | |
| 1219 | + $active_courses = Sensei()->course->course_query($per_page, 'usercourses', $active_ids); | |
| 1220 | + $active_count = count($active_ids); | |
| 1221 | 1221 | } // End If Statement | 
| 1222 | 1222 | |
| 1223 | 1223 | $completed_courses = array(); | 
| 1224 | -			if ( 0 < intval( count( $completed_ids ) ) ) { | |
| 1224 | +			if (0 < intval(count($completed_ids))) { | |
| 1225 | 1225 | $my_courses_section = 'completed'; | 
| 1226 | - $completed_courses = Sensei()->course->course_query( $per_page, 'usercourses', $completed_ids ); | |
| 1227 | - $completed_count = count( $completed_ids ); | |
| 1226 | + $completed_courses = Sensei()->course->course_query($per_page, 'usercourses', $completed_ids); | |
| 1227 | + $completed_count = count($completed_ids); | |
| 1228 | 1228 | } // End If Statement | 
| 1229 | 1229 | |
| 1230 | -			foreach ( $active_courses as $course_item ) { | |
| 1230 | +			foreach ($active_courses as $course_item) { | |
| 1231 | 1231 | |
| 1232 | - $course_lessons = Sensei()->course->course_lessons( $course_item->ID ); | |
| 1232 | + $course_lessons = Sensei()->course->course_lessons($course_item->ID); | |
| 1233 | 1233 | $lessons_completed = 0; | 
| 1234 | -				foreach ( $course_lessons as $lesson ) { | |
| 1235 | -					if ( Sensei_Utils::user_completed_lesson( $lesson->ID, $user->ID ) ) { | |
| 1234 | +				foreach ($course_lessons as $lesson) { | |
| 1235 | +					if (Sensei_Utils::user_completed_lesson($lesson->ID, $user->ID)) { | |
| 1236 | 1236 | ++$lessons_completed; | 
| 1237 | 1237 | } | 
| 1238 | 1238 | } | 
| 1239 | 1239 | |
| 1240 | 1240 | // Get Course Categories | 
| 1241 | - $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' ); | |
| 1241 | + $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', ''); | |
| 1242 | 1242 | |
| 1243 | - $active_html .= '<article class="' . esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) ) . '">'; | |
| 1243 | +                $active_html .= '<article class="'.esc_attr(join(' ', get_post_class(array('course', 'post'), $course_item->ID))).'">'; | |
| 1244 | 1244 | |
| 1245 | 1245 | // Image | 
| 1246 | - $active_html .= Sensei()->course->course_image( absint( $course_item->ID ), '100','100', true ); | |
| 1246 | + $active_html .= Sensei()->course->course_image(absint($course_item->ID), '100', '100', true); | |
| 1247 | 1247 | |
| 1248 | 1248 | // Title | 
| 1249 | 1249 | $active_html .= '<header>'; | 
| 1250 | 1250 | |
| 1251 | - $active_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>'; | |
| 1251 | + $active_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>'; | |
| 1252 | 1252 | |
| 1253 | 1253 | $active_html .= '</header>'; | 
| 1254 | 1254 | |
| @@ -1257,74 +1257,74 @@ discard block | ||
| 1257 | 1257 | $active_html .= '<p class="sensei-course-meta">'; | 
| 1258 | 1258 | |
| 1259 | 1259 | // Author | 
| 1260 | - $user_info = get_userdata( absint( $course_item->post_author ) ); | |
| 1261 | - if ( isset( Sensei()->settings->settings[ 'course_author' ] ) | |
| 1262 | -                    && ( Sensei()->settings->settings[ 'course_author' ] ) ) { | |
| 1260 | + $user_info = get_userdata(absint($course_item->post_author)); | |
| 1261 | + if (isset(Sensei()->settings->settings['course_author']) | |
| 1262 | +                    && (Sensei()->settings->settings['course_author'])) { | |
| 1263 | 1263 | |
| 1264 | 1264 | $active_html .= '<span class="course-author">' | 
| 1265 | - . __( 'by ', 'woothemes-sensei' ) | |
| 1266 | - . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) | |
| 1267 | - . '" title="' . esc_attr( $user_info->display_name ) . '">' | |
| 1268 | - . esc_html( $user_info->display_name ) | |
| 1265 | +                        . __('by ', 'woothemes-sensei') | |
| 1266 | + . '<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author))) | |
| 1267 | + . '" title="'.esc_attr($user_info->display_name).'">' | |
| 1268 | + . esc_html($user_info->display_name) | |
| 1269 | 1269 | . '</a></span>'; | 
| 1270 | 1270 | |
| 1271 | 1271 | } // End If Statement | 
| 1272 | 1272 | |
| 1273 | 1273 | // Lesson count for this author | 
| 1274 | - $lesson_count = Sensei()->course->course_lesson_count( absint( $course_item->ID ) ); | |
| 1274 | + $lesson_count = Sensei()->course->course_lesson_count(absint($course_item->ID)); | |
| 1275 | 1275 | // Handle Division by Zero | 
| 1276 | -                if ( 0 == $lesson_count ) { | |
| 1276 | +                if (0 == $lesson_count) { | |
| 1277 | 1277 | |
| 1278 | 1278 | $lesson_count = 1; | 
| 1279 | 1279 | |
| 1280 | 1280 | } // End If Statement | 
| 1281 | - $active_html .= '<span class="course-lesson-count">' . $lesson_count . ' ' . __( 'Lessons', 'woothemes-sensei' ) . '</span>'; | |
| 1281 | +                $active_html .= '<span class="course-lesson-count">'.$lesson_count.' '.__('Lessons', 'woothemes-sensei').'</span>'; | |
| 1282 | 1282 | // Course Categories | 
| 1283 | -                if ( '' != $category_output ) { | |
| 1283 | +                if ('' != $category_output) { | |
| 1284 | 1284 | |
| 1285 | - $active_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>'; | |
| 1285 | +                    $active_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>'; | |
| 1286 | 1286 | |
| 1287 | 1287 | } // End If Statement | 
| 1288 | - $active_html .= '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $lessons_completed, $lesson_count ) . '</span>'; | |
| 1288 | +                $active_html .= '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $lessons_completed, $lesson_count).'</span>'; | |
| 1289 | 1289 | |
| 1290 | 1290 | $active_html .= '</p>'; | 
| 1291 | 1291 | |
| 1292 | - $active_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>'; | |
| 1292 | + $active_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>'; | |
| 1293 | 1293 | |
| 1294 | 1294 | |
| 1295 | 1295 | |
| 1296 | - $progress_percentage = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $lesson_count ), 0 ) ); | |
| 1296 | + $progress_percentage = abs(round((doubleval($lessons_completed) * 100) / ($lesson_count), 0)); | |
| 1297 | 1297 | |
| 1298 | - $active_html .= $this->get_progress_meter( $progress_percentage ); | |
| 1298 | + $active_html .= $this->get_progress_meter($progress_percentage); | |
| 1299 | 1299 | |
| 1300 | 1300 | $active_html .= '</section>'; | 
| 1301 | 1301 | |
| 1302 | -                if( is_user_logged_in() ) { | |
| 1302 | +                if (is_user_logged_in()) { | |
| 1303 | 1303 | |
| 1304 | 1304 | $active_html .= '<section class="entry-actions">'; | 
| 1305 | 1305 | |
| 1306 | - $active_html .= '<form method="POST" action="' . esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ) . '">'; | |
| 1306 | +                    $active_html .= '<form method="POST" action="'.esc_url(remove_query_arg(array('active_page', 'completed_page'))).'">'; | |
| 1307 | 1307 | |
| 1308 | - $active_html .= '<input type="hidden" name="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" id="' . esc_attr( 'woothemes_sensei_complete_course_noonce' ) . '" value="' . esc_attr( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ) . '" />'; | |
| 1308 | +                    $active_html .= '<input type="hidden" name="'.esc_attr('woothemes_sensei_complete_course_noonce').'" id="'.esc_attr('woothemes_sensei_complete_course_noonce').'" value="'.esc_attr(wp_create_nonce('woothemes_sensei_complete_course_noonce')).'" />'; | |
| 1309 | 1309 | |
| 1310 | - $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="' . esc_attr( absint( $course_item->ID ) ) . '" />'; | |
| 1310 | + $active_html .= '<input type="hidden" name="course_complete_id" id="course-complete-id" value="'.esc_attr(absint($course_item->ID)).'" />'; | |
| 1311 | 1311 | |
| 1312 | - if ( 0 < absint( count( $course_lessons ) ) | |
| 1313 | -                        && Sensei()->settings->settings['course_completion'] == 'complete' ){ | |
| 1312 | + if (0 < absint(count($course_lessons)) | |
| 1313 | +                        && Sensei()->settings->settings['course_completion'] == 'complete') { | |
| 1314 | 1314 | |
| 1315 | 1315 | $active_html .= '<span><input name="course_complete" type="submit" class="course-complete" value="' | 
| 1316 | - . __( 'Mark as Complete', 'woothemes-sensei' ) . '"/> </span>'; | |
| 1316 | +                            .  __('Mark as Complete', 'woothemes-sensei').'"/> </span>'; | |
| 1317 | 1317 | |
| 1318 | 1318 | } // End If Statement | 
| 1319 | 1319 | |
| 1320 | 1320 | $course_purchased = false; | 
| 1321 | -                    if ( Sensei_WC::is_woocommerce_active() ) { | |
| 1321 | +                    if (Sensei_WC::is_woocommerce_active()) { | |
| 1322 | 1322 | |
| 1323 | 1323 | // Get the product ID | 
| 1324 | - $wc_post_id = get_post_meta( absint( $course_item->ID ), '_course_woocommerce_product', true ); | |
| 1325 | -                        if ( 0 < $wc_post_id ) { | |
| 1324 | + $wc_post_id = get_post_meta(absint($course_item->ID), '_course_woocommerce_product', true); | |
| 1325 | +                        if (0 < $wc_post_id) { | |
| 1326 | 1326 | |
| 1327 | - $course_purchased = Sensei_WC::has_customer_bought_product( $user->ID, $wc_post_id ); | |
| 1327 | + $course_purchased = Sensei_WC::has_customer_bought_product($user->ID, $wc_post_id); | |
| 1328 | 1328 | |
| 1329 | 1329 | } // End If Statement | 
| 1330 | 1330 | |
| @@ -1333,12 +1333,12 @@ discard block | ||
| 1333 | 1333 | /** | 
| 1334 | 1334 | * documented in class-sensei-course.php the_course_action_buttons function | 
| 1335 | 1335 | */ | 
| 1336 | - $show_delete_course_button = apply_filters( 'sensei_show_delete_course_button', false ); | |
| 1336 | +	                $show_delete_course_button = apply_filters('sensei_show_delete_course_button', false); | |
| 1337 | 1337 | |
| 1338 | -                    if ( false == $course_purchased && $show_delete_course_button ) { | |
| 1338 | +                    if (false == $course_purchased && $show_delete_course_button) { | |
| 1339 | 1339 | |
| 1340 | 1340 | $active_html .= '<span><input name="course_complete" type="submit" class="course-delete" value="' | 
| 1341 | - . __( 'Delete Course', 'woothemes-sensei' ) . '"/></span>'; | |
| 1341 | +                            .  __('Delete Course', 'woothemes-sensei').'"/></span>'; | |
| 1342 | 1342 | |
| 1343 | 1343 | } // End If Statement | 
| 1344 | 1344 | |
| @@ -1351,54 +1351,54 @@ discard block | ||
| 1351 | 1351 | } | 
| 1352 | 1352 | |
| 1353 | 1353 | // Active pagination | 
| 1354 | -			if( $active_count > $per_page ) { | |
| 1354 | +			if ($active_count > $per_page) { | |
| 1355 | 1355 | |
| 1356 | 1356 | $current_page = 1; | 
| 1357 | -				if( isset( $_GET['active_page'] ) && 0 < intval( $_GET['active_page'] ) ) { | |
| 1357 | +				if (isset($_GET['active_page']) && 0 < intval($_GET['active_page'])) { | |
| 1358 | 1358 | $current_page = $_GET['active_page']; | 
| 1359 | 1359 | } | 
| 1360 | 1360 | |
| 1361 | 1361 | $active_html .= '<nav class="pagination woo-pagination">'; | 
| 1362 | - $total_pages = ceil( $active_count / $per_page ); | |
| 1362 | + $total_pages = ceil($active_count / $per_page); | |
| 1363 | 1363 | |
| 1364 | -				if( $current_page > 1 ) { | |
| 1365 | - $prev_link = add_query_arg( 'active_page', $current_page - 1 ); | |
| 1366 | - $active_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> '; | |
| 1364 | +				if ($current_page > 1) { | |
| 1365 | +					$prev_link = add_query_arg('active_page', $current_page - 1); | |
| 1366 | +					$active_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> '; | |
| 1367 | 1367 | } | 
| 1368 | 1368 | |
| 1369 | -				for ( $i = 1; $i <= $total_pages; $i++ ) { | |
| 1370 | - $link = add_query_arg( 'active_page', $i ); | |
| 1369 | +				for ($i = 1; $i <= $total_pages; $i++) { | |
| 1370 | +					$link = add_query_arg('active_page', $i); | |
| 1371 | 1371 | |
| 1372 | -					if( $i == $current_page ) { | |
| 1373 | - $active_html .= '<span class="page-numbers current">' . $i . '</span> '; | |
| 1372 | +					if ($i == $current_page) { | |
| 1373 | + $active_html .= '<span class="page-numbers current">'.$i.'</span> '; | |
| 1374 | 1374 |  					} else { | 
| 1375 | - $active_html .= '<a class="page-numbers" href="' . esc_url( $link ). '">' . $i . '</a> '; | |
| 1375 | + $active_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> '; | |
| 1376 | 1376 | } | 
| 1377 | 1377 | } | 
| 1378 | 1378 | |
| 1379 | -				if( $current_page < $total_pages ) { | |
| 1380 | - $next_link = add_query_arg( 'active_page', $current_page + 1 ); | |
| 1381 | - $active_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> '; | |
| 1379 | +				if ($current_page < $total_pages) { | |
| 1380 | +					$next_link = add_query_arg('active_page', $current_page + 1); | |
| 1381 | +					$active_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> '; | |
| 1382 | 1382 | } | 
| 1383 | 1383 | |
| 1384 | 1384 | $active_html .= '</nav>'; | 
| 1385 | 1385 | } | 
| 1386 | 1386 | |
| 1387 | -			foreach ( $completed_courses as $course_item ) { | |
| 1387 | +			foreach ($completed_courses as $course_item) { | |
| 1388 | 1388 | $course = $course_item; | 
| 1389 | 1389 | |
| 1390 | 1390 | // Get Course Categories | 
| 1391 | - $category_output = get_the_term_list( $course_item->ID, 'course-category', '', ', ', '' ); | |
| 1391 | + $category_output = get_the_term_list($course_item->ID, 'course-category', '', ', ', ''); | |
| 1392 | 1392 | |
| 1393 | - $complete_html .= '<article class="' . join( ' ', get_post_class( array( 'course', 'post' ), $course_item->ID ) ) . '">'; | |
| 1393 | +		    	$complete_html .= '<article class="'.join(' ', get_post_class(array('course', 'post'), $course_item->ID)).'">'; | |
| 1394 | 1394 | |
| 1395 | 1395 | // Image | 
| 1396 | - $complete_html .= Sensei()->course->course_image( absint( $course_item->ID ),100, 100, true ); | |
| 1396 | + $complete_html .= Sensei()->course->course_image(absint($course_item->ID), 100, 100, true); | |
| 1397 | 1397 | |
| 1398 | 1398 | // Title | 
| 1399 | 1399 | $complete_html .= '<header>'; | 
| 1400 | 1400 | |
| 1401 | - $complete_html .= '<h2><a href="' . esc_url( get_permalink( absint( $course_item->ID ) ) ) . '" title="' . esc_attr( $course_item->post_title ) . '">' . esc_html( $course_item->post_title ) . '</a></h2>'; | |
| 1401 | + $complete_html .= '<h2><a href="'.esc_url(get_permalink(absint($course_item->ID))).'" title="'.esc_attr($course_item->post_title).'">'.esc_html($course_item->post_title).'</a></h2>'; | |
| 1402 | 1402 | |
| 1403 | 1403 | $complete_html .= '</header>'; | 
| 1404 | 1404 | |
| @@ -1407,49 +1407,49 @@ discard block | ||
| 1407 | 1407 | $complete_html .= '<p class="sensei-course-meta">'; | 
| 1408 | 1408 | |
| 1409 | 1409 | // Author | 
| 1410 | - $user_info = get_userdata( absint( $course_item->post_author ) ); | |
| 1411 | -		    		    	if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { | |
| 1412 | - $complete_html .= '<span class="course-author">' . __( 'by ', 'woothemes-sensei' ) . '<a href="' . esc_url( get_author_posts_url( absint( $course_item->post_author ) ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>'; | |
| 1410 | + $user_info = get_userdata(absint($course_item->post_author)); | |
| 1411 | +		    		    	if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { | |
| 1412 | +		    		    		$complete_html .= '<span class="course-author">'.__('by ', 'woothemes-sensei').'<a href="'.esc_url(get_author_posts_url(absint($course_item->post_author))).'" title="'.esc_attr($user_info->display_name).'">'.esc_html($user_info->display_name).'</a></span>'; | |
| 1413 | 1413 | } // End If Statement | 
| 1414 | 1414 | |
| 1415 | 1415 | // Lesson count for this author | 
| 1416 | 1416 | $complete_html .= '<span class="course-lesson-count">' | 
| 1417 | - . Sensei()->course->course_lesson_count( absint( $course_item->ID ) ) | |
| 1418 | - . ' ' . __( 'Lessons', 'woothemes-sensei' ) | |
| 1417 | + . Sensei()->course->course_lesson_count(absint($course_item->ID)) | |
| 1418 | +                                . ' '.__('Lessons', 'woothemes-sensei') | |
| 1419 | 1419 | . '</span>'; | 
| 1420 | 1420 | |
| 1421 | 1421 | // Course Categories | 
| 1422 | -		    		    	if ( '' != $category_output ) { | |
| 1422 | +		    		    	if ('' != $category_output) { | |
| 1423 | 1423 | |
| 1424 | - $complete_html .= '<span class="course-category">' . sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ) . '</span>'; | |
| 1424 | +		    		    		$complete_html .= '<span class="course-category">'.sprintf(__('in %s', 'woothemes-sensei'), $category_output).'</span>'; | |
| 1425 | 1425 | |
| 1426 | 1426 | } // End If Statement | 
| 1427 | 1427 | |
| 1428 | 1428 | $complete_html .= '</p>'; | 
| 1429 | 1429 | |
| 1430 | - $complete_html .= '<p class="course-excerpt">' . $course_item->post_excerpt . '</p>'; | |
| 1430 | + $complete_html .= '<p class="course-excerpt">'.$course_item->post_excerpt.'</p>'; | |
| 1431 | 1431 | |
| 1432 | - $complete_html .= $this->get_progress_meter( 100 ); | |
| 1432 | + $complete_html .= $this->get_progress_meter(100); | |
| 1433 | 1433 | |
| 1434 | -						if( $manage ) { | |
| 1435 | - $has_quizzes = Sensei()->course->course_quizzes( $course_item->ID, true ); | |
| 1434 | +						if ($manage) { | |
| 1435 | + $has_quizzes = Sensei()->course->course_quizzes($course_item->ID, true); | |
| 1436 | 1436 | // Output only if there is content to display | 
| 1437 | -							if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { | |
| 1437 | +							if (has_filter('sensei_results_links') || $has_quizzes) { | |
| 1438 | 1438 | |
| 1439 | 1439 | |
| 1440 | 1440 | $complete_html .= '<p class="sensei-results-links">'; | 
| 1441 | 1441 | $results_link = ''; | 
| 1442 | -								if( $has_quizzes ) { | |
| 1442 | +								if ($has_quizzes) { | |
| 1443 | 1443 | |
| 1444 | 1444 | $results_link = '<a class="button view-results" href="' | 
| 1445 | - . Sensei()->course_results->get_permalink( $course_item->ID ) | |
| 1446 | - . '">' . __( 'View results', 'woothemes-sensei' ) | |
| 1445 | + . Sensei()->course_results->get_permalink($course_item->ID) | |
| 1446 | +                                        . '">'.__('View results', 'woothemes-sensei') | |
| 1447 | 1447 | . '</a>'; | 
| 1448 | 1448 | } | 
| 1449 | 1449 | /** | 
| 1450 | 1450 | * Filter documented in Sensei_Course::the_course_action_buttons | 
| 1451 | 1451 | */ | 
| 1452 | - $complete_html .= apply_filters( 'sensei_results_links', $results_link, $course_item->ID ); | |
| 1452 | +								$complete_html .= apply_filters('sensei_results_links', $results_link, $course_item->ID); | |
| 1453 | 1453 | $complete_html .= '</p>'; | 
| 1454 | 1454 | |
| 1455 | 1455 | } | 
| @@ -1461,35 +1461,35 @@ discard block | ||
| 1461 | 1461 | } | 
| 1462 | 1462 | |
| 1463 | 1463 | // Active pagination | 
| 1464 | -			if( $completed_count > $per_page ) { | |
| 1464 | +			if ($completed_count > $per_page) { | |
| 1465 | 1465 | |
| 1466 | 1466 | $current_page = 1; | 
| 1467 | -				if( isset( $_GET['completed_page'] ) && 0 < intval( $_GET['completed_page'] ) ) { | |
| 1467 | +				if (isset($_GET['completed_page']) && 0 < intval($_GET['completed_page'])) { | |
| 1468 | 1468 | $current_page = $_GET['completed_page']; | 
| 1469 | 1469 | } | 
| 1470 | 1470 | |
| 1471 | 1471 | $complete_html .= '<nav class="pagination woo-pagination">'; | 
| 1472 | - $total_pages = ceil( $completed_count / $per_page ); | |
| 1472 | + $total_pages = ceil($completed_count / $per_page); | |
| 1473 | 1473 | |
| 1474 | 1474 | |
| 1475 | -				if( $current_page > 1 ) { | |
| 1476 | - $prev_link = add_query_arg( 'completed_page', $current_page - 1 ); | |
| 1477 | - $complete_html .= '<a class="prev page-numbers" href="' . esc_url( $prev_link ) . '">' . __( 'Previous' , 'woothemes-sensei' ) . '</a> '; | |
| 1475 | +				if ($current_page > 1) { | |
| 1476 | +					$prev_link = add_query_arg('completed_page', $current_page - 1); | |
| 1477 | +					$complete_html .= '<a class="prev page-numbers" href="'.esc_url($prev_link).'">'.__('Previous', 'woothemes-sensei').'</a> '; | |
| 1478 | 1478 | } | 
| 1479 | 1479 | |
| 1480 | -				for ( $i = 1; $i <= $total_pages; $i++ ) { | |
| 1481 | - $link = add_query_arg( 'completed_page', $i ); | |
| 1480 | +				for ($i = 1; $i <= $total_pages; $i++) { | |
| 1481 | +					$link = add_query_arg('completed_page', $i); | |
| 1482 | 1482 | |
| 1483 | -					if( $i == $current_page ) { | |
| 1484 | - $complete_html .= '<span class="page-numbers current">' . $i . '</span> '; | |
| 1483 | +					if ($i == $current_page) { | |
| 1484 | + $complete_html .= '<span class="page-numbers current">'.$i.'</span> '; | |
| 1485 | 1485 |  					} else { | 
| 1486 | - $complete_html .= '<a class="page-numbers" href="' . esc_url( $link ) . '">' . $i . '</a> '; | |
| 1486 | + $complete_html .= '<a class="page-numbers" href="'.esc_url($link).'">'.$i.'</a> '; | |
| 1487 | 1487 | } | 
| 1488 | 1488 | } | 
| 1489 | 1489 | |
| 1490 | -				if( $current_page < $total_pages ) { | |
| 1491 | - $next_link = add_query_arg( 'completed_page', $current_page + 1 ); | |
| 1492 | - $complete_html .= '<a class="next page-numbers" href="' . esc_url( $next_link ) . '">' . __( 'Next' , 'woothemes-sensei' ) . '</a> '; | |
| 1490 | +				if ($current_page < $total_pages) { | |
| 1491 | +					$next_link = add_query_arg('completed_page', $current_page + 1); | |
| 1492 | +					$complete_html .= '<a class="next page-numbers" href="'.esc_url($next_link).'">'.__('Next', 'woothemes-sensei').'</a> '; | |
| 1493 | 1493 | } | 
| 1494 | 1494 | |
| 1495 | 1495 | $complete_html .= '</nav>'; | 
| @@ -1497,26 +1497,26 @@ discard block | ||
| 1497 | 1497 | |
| 1498 | 1498 | } // End If Statement | 
| 1499 | 1499 | |
| 1500 | -		if( $manage ) { | |
| 1501 | - $no_active_message = __( 'You have no active courses.', 'woothemes-sensei' ); | |
| 1502 | - $no_complete_message = __( 'You have not completed any courses yet.', 'woothemes-sensei' ); | |
| 1500 | +		if ($manage) { | |
| 1501 | +			$no_active_message = __('You have no active courses.', 'woothemes-sensei'); | |
| 1502 | +			$no_complete_message = __('You have not completed any courses yet.', 'woothemes-sensei'); | |
| 1503 | 1503 |  		} else { | 
| 1504 | - $no_active_message = __( 'This learner has no active courses.', 'woothemes-sensei' ); | |
| 1505 | - $no_complete_message = __( 'This learner has not completed any courses yet.', 'woothemes-sensei' ); | |
| 1504 | +			$no_active_message = __('This learner has no active courses.', 'woothemes-sensei'); | |
| 1505 | +			$no_complete_message = __('This learner has not completed any courses yet.', 'woothemes-sensei'); | |
| 1506 | 1506 | } | 
| 1507 | 1507 | |
| 1508 | 1508 | ob_start(); | 
| 1509 | 1509 | ?> | 
| 1510 | 1510 | |
| 1511 | - <?php do_action( 'sensei_before_user_courses' ); ?> | |
| 1511 | +		<?php do_action('sensei_before_user_courses'); ?> | |
| 1512 | 1512 | |
| 1513 | 1513 | <?php | 
| 1514 | -		if( $manage && ( ! isset( Sensei()->settings->settings['messages_disable'] ) || ! Sensei()->settings->settings['messages_disable'] ) ) { | |
| 1514 | +		if ($manage && ( ! isset(Sensei()->settings->settings['messages_disable']) || ! Sensei()->settings->settings['messages_disable'])) { | |
| 1515 | 1515 | ?> | 
| 1516 | 1516 | <p class="my-messages-link-container"> | 
| 1517 | - <a class="my-messages-link" href="<?php echo get_post_type_archive_link( 'sensei_message' ); ?>" | |
| 1518 | - title="<?php _e( 'View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei' ); ?>"> | |
| 1519 | - <?php _e( 'My Messages', 'woothemes-sensei' ); ?> | |
| 1517 | +                <a class="my-messages-link" href="<?php echo get_post_type_archive_link('sensei_message'); ?>" | |
| 1518 | +                   title="<?php _e('View & reply to private messages sent to your course & lesson teachers.', 'woothemes-sensei'); ?>"> | |
| 1519 | +                    <?php _e('My Messages', 'woothemes-sensei'); ?> | |
| 1520 | 1520 | </a> | 
| 1521 | 1521 | </p> | 
| 1522 | 1522 | <?php | 
| @@ -1525,11 +1525,11 @@ discard block | ||
| 1525 | 1525 | <div id="my-courses"> | 
| 1526 | 1526 | |
| 1527 | 1527 | <ul> | 
| 1528 | - <li><a href="#active-courses"><?php _e( 'Active Courses', 'woothemes-sensei' ); ?></a></li> | |
| 1529 | - <li><a href="#completed-courses"><?php _e( 'Completed Courses', 'woothemes-sensei' ); ?></a></li> | |
| 1528 | +		    	<li><a href="#active-courses"><?php  _e('Active Courses', 'woothemes-sensei'); ?></a></li> | |
| 1529 | +		    	<li><a href="#completed-courses"><?php  _e('Completed Courses', 'woothemes-sensei'); ?></a></li> | |
| 1530 | 1530 | </ul> | 
| 1531 | 1531 | |
| 1532 | - <?php do_action( 'sensei_before_active_user_courses' ); ?> | |
| 1532 | +		    <?php do_action('sensei_before_active_user_courses'); ?> | |
| 1533 | 1533 | |
| 1534 | 1534 | <?php | 
| 1535 | 1535 | $course_page_url = Sensei_Course::get_courses_page_url(); | 
| @@ -1537,7 +1537,7 @@ discard block | ||
| 1537 | 1537 | |
| 1538 | 1538 | <div id="active-courses"> | 
| 1539 | 1539 | |
| 1540 | -		    	<?php if ( '' != $active_html ) { | |
| 1540 | +		    	<?php if ('' != $active_html) { | |
| 1541 | 1541 | |
| 1542 | 1542 | echo $active_html; | 
| 1543 | 1543 | |
| @@ -1549,7 +1549,7 @@ discard block | ||
| 1549 | 1549 | |
| 1550 | 1550 | <a href="<?php echo $course_page_url; ?>"> | 
| 1551 | 1551 | |
| 1552 | - <?php _e( 'Start a Course!', 'woothemes-sensei' ); ?> | |
| 1552 | +                            <?php  _e('Start a Course!', 'woothemes-sensei'); ?> | |
| 1553 | 1553 | |
| 1554 | 1554 | </a> | 
| 1555 | 1555 | |
| @@ -1559,13 +1559,13 @@ discard block | ||
| 1559 | 1559 | |
| 1560 | 1560 | </div> | 
| 1561 | 1561 | |
| 1562 | - <?php do_action( 'sensei_after_active_user_courses' ); ?> | |
| 1562 | +		    <?php do_action('sensei_after_active_user_courses'); ?> | |
| 1563 | 1563 | |
| 1564 | - <?php do_action( 'sensei_before_completed_user_courses' ); ?> | |
| 1564 | +		    <?php do_action('sensei_before_completed_user_courses'); ?> | |
| 1565 | 1565 | |
| 1566 | 1566 | <div id="completed-courses"> | 
| 1567 | 1567 | |
| 1568 | -		    	<?php if ( '' != $complete_html ) { | |
| 1568 | +		    	<?php if ('' != $complete_html) { | |
| 1569 | 1569 | |
| 1570 | 1570 | echo $complete_html; | 
| 1571 | 1571 | |
| @@ -1581,16 +1581,16 @@ discard block | ||
| 1581 | 1581 | |
| 1582 | 1582 | </div> | 
| 1583 | 1583 | |
| 1584 | - <?php do_action( 'sensei_after_completed_user_courses' ); ?> | |
| 1584 | +		    <?php do_action('sensei_after_completed_user_courses'); ?> | |
| 1585 | 1585 | |
| 1586 | 1586 | </div> | 
| 1587 | 1587 | |
| 1588 | - <?php do_action( 'sensei_after_user_courses' ); ?> | |
| 1588 | +		<?php do_action('sensei_after_user_courses'); ?> | |
| 1589 | 1589 | |
| 1590 | 1590 | <?php | 
| 1591 | 1591 | echo ob_get_clean(); | 
| 1592 | 1592 | |
| 1593 | - do_action( 'sensei_after_learner_course_content', $user ); | |
| 1593 | +        do_action('sensei_after_learner_course_content', $user); | |
| 1594 | 1594 | |
| 1595 | 1595 | } // end load_user_courses_content | 
| 1596 | 1596 | |
| @@ -1602,7 +1602,7 @@ discard block | ||
| 1602 | 1602 | * @type $course WP_Post | 
| 1603 | 1603 | * } | 
| 1604 | 1604 | */ | 
| 1605 | -    public static function get_all_courses(){ | |
| 1605 | +    public static function get_all_courses() { | |
| 1606 | 1606 | |
| 1607 | 1607 | $args = array( | 
| 1608 | 1608 | 'post_type' => 'course', | 
| @@ -1613,7 +1613,7 @@ discard block | ||
| 1613 | 1613 | 'suppress_filters' => 0, | 
| 1614 | 1614 | ); | 
| 1615 | 1615 | |
| 1616 | - $wp_query_obj = new WP_Query( $args ); | |
| 1616 | + $wp_query_obj = new WP_Query($args); | |
| 1617 | 1617 | |
| 1618 | 1618 | /** | 
| 1619 | 1619 | * sensei_get_all_courses filter | 
| @@ -1625,7 +1625,7 @@ discard block | ||
| 1625 | 1625 | * } | 
| 1626 | 1626 | * @param array $attributes | 
| 1627 | 1627 | */ | 
| 1628 | - return apply_filters( 'sensei_get_all_courses' , $wp_query_obj->posts ); | |
| 1628 | +        return apply_filters('sensei_get_all_courses', $wp_query_obj->posts); | |
| 1629 | 1629 | |
| 1630 | 1630 | }// end get_all_courses | 
| 1631 | 1631 | |
| @@ -1636,16 +1636,16 @@ discard block | ||
| 1636 | 1636 | * @param int $progress_percentage 0 - 100 | 
| 1637 | 1637 | * @return string $progress_bar_html | 
| 1638 | 1638 | */ | 
| 1639 | -    public function get_progress_meter( $progress_percentage ){ | |
| 1639 | +    public function get_progress_meter($progress_percentage) { | |
| 1640 | 1640 | |
| 1641 | -        if ( 50 < $progress_percentage ) { | |
| 1641 | +        if (50 < $progress_percentage) { | |
| 1642 | 1642 | $class = ' green'; | 
| 1643 | -        } elseif ( 25 <= $progress_percentage && 50 >= $progress_percentage ) { | |
| 1643 | +        } elseif (25 <= $progress_percentage && 50 >= $progress_percentage) { | |
| 1644 | 1644 | $class = ' orange'; | 
| 1645 | 1645 |          } else { | 
| 1646 | 1646 | $class = ' red'; | 
| 1647 | 1647 | } | 
| 1648 | - $progress_bar_html = '<div class="meter' . esc_attr( $class ) . '"><span style="width: ' . $progress_percentage . '%">' . round( $progress_percentage ) . '%</span></div>'; | |
| 1648 | + $progress_bar_html = '<div class="meter'.esc_attr($class).'"><span style="width: '.$progress_percentage.'%">'.round($progress_percentage).'%</span></div>'; | |
| 1649 | 1649 | |
| 1650 | 1650 | return $progress_bar_html; | 
| 1651 | 1651 | |
| @@ -1660,17 +1660,17 @@ discard block | ||
| 1660 | 1660 | * | 
| 1661 | 1661 | * @return string $statement_html | 
| 1662 | 1662 | */ | 
| 1663 | -    public function get_progress_statement( $course_id, $user_id ){ | |
| 1663 | +    public function get_progress_statement($course_id, $user_id) { | |
| 1664 | 1664 | |
| 1665 | - if( empty( $course_id ) || empty( $user_id ) | |
| 1666 | -        || ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){ | |
| 1665 | + if (empty($course_id) || empty($user_id) | |
| 1666 | +        || ! Sensei_Utils::user_started_course($course_id, $user_id)) { | |
| 1667 | 1667 | return ''; | 
| 1668 | 1668 | } | 
| 1669 | 1669 | |
| 1670 | - $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) ); | |
| 1671 | - $total_lessons = count( $this->course_lessons( $course_id ) ); | |
| 1670 | + $completed = count($this->get_completed_lesson_ids($course_id, $user_id)); | |
| 1671 | + $total_lessons = count($this->course_lessons($course_id)); | |
| 1672 | 1672 | |
| 1673 | -        $statement = sprintf( _n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons ); | |
| 1673 | +        $statement = sprintf(_n('Currently completed %s lesson of %s in total', 'Currently completed %s lessons of %s in total', $completed, 'woothemes-sensei'), $completed, $total_lessons); | |
| 1674 | 1674 | |
| 1675 | 1675 | /** | 
| 1676 | 1676 | * Filter the course completion statement. | 
| @@ -1678,7 +1678,7 @@ discard block | ||
| 1678 | 1678 | * | 
| 1679 | 1679 | * @param string $statement | 
| 1680 | 1680 | */ | 
| 1681 | - return apply_filters( 'sensei_course_completion_statement', $statement ); | |
| 1681 | +        return apply_filters('sensei_course_completion_statement', $statement); | |
| 1682 | 1682 | |
| 1683 | 1683 | }// end generate_progress_statement | 
| 1684 | 1684 | |
| @@ -1688,17 +1688,17 @@ discard block | ||
| 1688 | 1688 | * @param $course_id | 
| 1689 | 1689 | * @return void | 
| 1690 | 1690 | */ | 
| 1691 | -    public function the_progress_statement( $course_id = 0, $user_id = 0 ){ | |
| 1692 | -        if( empty( $course_id ) ){ | |
| 1691 | +    public function the_progress_statement($course_id = 0, $user_id = 0) { | |
| 1692 | +        if (empty($course_id)) { | |
| 1693 | 1693 | global $post; | 
| 1694 | 1694 | $course_id = $post->ID; | 
| 1695 | 1695 | } | 
| 1696 | 1696 | |
| 1697 | -        if( empty( $user_id ) ){ | |
| 1697 | +        if (empty($user_id)) { | |
| 1698 | 1698 | $user_id = get_current_user_id(); | 
| 1699 | 1699 | } | 
| 1700 | 1700 | |
| 1701 | - echo '<span class="progress statement course-completion-rate">' . $this->get_progress_statement( $course_id, $user_id ) . '</span>'; | |
| 1701 | + echo '<span class="progress statement course-completion-rate">'.$this->get_progress_statement($course_id, $user_id).'</span>'; | |
| 1702 | 1702 | } | 
| 1703 | 1703 | |
| 1704 | 1704 | /** | 
| @@ -1707,24 +1707,24 @@ discard block | ||
| 1707 | 1707 | * @param $course_id | 
| 1708 | 1708 | * @return void | 
| 1709 | 1709 | */ | 
| 1710 | -    public function the_progress_meter( $course_id = 0, $user_id = 0 ){ | |
| 1710 | +    public function the_progress_meter($course_id = 0, $user_id = 0) { | |
| 1711 | 1711 | |
| 1712 | -        if( empty( $course_id ) ){ | |
| 1712 | +        if (empty($course_id)) { | |
| 1713 | 1713 | global $post; | 
| 1714 | 1714 | $course_id = $post->ID; | 
| 1715 | 1715 | } | 
| 1716 | 1716 | |
| 1717 | -        if( empty( $user_id ) ){ | |
| 1717 | +        if (empty($user_id)) { | |
| 1718 | 1718 | $user_id = get_current_user_id(); | 
| 1719 | 1719 | } | 
| 1720 | 1720 | |
| 1721 | - if( 'course' != get_post_type( $course_id ) || ! get_userdata( $user_id ) | |
| 1722 | -            || ! Sensei_Utils::user_started_course( $course_id ,$user_id ) ){ | |
| 1721 | +        if ('course' != get_post_type($course_id) || ! get_userdata($user_id) | |
| 1722 | +            || ! Sensei_Utils::user_started_course($course_id, $user_id)) { | |
| 1723 | 1723 | return; | 
| 1724 | 1724 | } | 
| 1725 | - $percentage_completed = $this->get_completion_percentage( $course_id, $user_id ); | |
| 1725 | + $percentage_completed = $this->get_completion_percentage($course_id, $user_id); | |
| 1726 | 1726 | |
| 1727 | - echo $this->get_progress_meter( $percentage_completed ); | |
| 1727 | + echo $this->get_progress_meter($percentage_completed); | |
| 1728 | 1728 | |
| 1729 | 1729 | }// end the_progress_meter | 
| 1730 | 1730 | |
| @@ -1737,20 +1737,20 @@ discard block | ||
| 1737 | 1737 | * @param int $user_id | 
| 1738 | 1738 | * @return array $completed_lesson_ids | 
| 1739 | 1739 | */ | 
| 1740 | -    public function get_completed_lesson_ids( $course_id, $user_id = 0 ){ | |
| 1740 | +    public function get_completed_lesson_ids($course_id, $user_id = 0) { | |
| 1741 | 1741 | |
| 1742 | -        if( !( intval( $user_id ) ) > 0 ){ | |
| 1742 | +        if ( ! (intval($user_id)) > 0) { | |
| 1743 | 1743 | $user_id = get_current_user_id(); | 
| 1744 | 1744 | } | 
| 1745 | 1745 | |
| 1746 | 1746 | $completed_lesson_ids = array(); | 
| 1747 | 1747 | |
| 1748 | - $course_lessons = $this->course_lessons( $course_id ); | |
| 1748 | + $course_lessons = $this->course_lessons($course_id); | |
| 1749 | 1749 | |
| 1750 | -        foreach( $course_lessons as $lesson ){ | |
| 1750 | +        foreach ($course_lessons as $lesson) { | |
| 1751 | 1751 | |
| 1752 | - $is_lesson_completed = Sensei_Utils::user_completed_lesson( $lesson->ID, $user_id ); | |
| 1753 | -            if( $is_lesson_completed ){ | |
| 1752 | + $is_lesson_completed = Sensei_Utils::user_completed_lesson($lesson->ID, $user_id); | |
| 1753 | +            if ($is_lesson_completed) { | |
| 1754 | 1754 | $completed_lesson_ids[] = $lesson->ID; | 
| 1755 | 1755 | } | 
| 1756 | 1756 | |
| @@ -1769,19 +1769,19 @@ discard block | ||
| 1769 | 1769 | * @param int $user_id | 
| 1770 | 1770 | * @return int $percentage | 
| 1771 | 1771 | */ | 
| 1772 | -    public function get_completion_percentage( $course_id, $user_id = 0 ){ | |
| 1772 | +    public function get_completion_percentage($course_id, $user_id = 0) { | |
| 1773 | 1773 | |
| 1774 | -        if( !( intval( $user_id ) ) > 0 ){ | |
| 1774 | +        if ( ! (intval($user_id)) > 0) { | |
| 1775 | 1775 | $user_id = get_current_user_id(); | 
| 1776 | 1776 | } | 
| 1777 | 1777 | |
| 1778 | - $completed = count( $this->get_completed_lesson_ids( $course_id, $user_id ) ); | |
| 1778 | + $completed = count($this->get_completed_lesson_ids($course_id, $user_id)); | |
| 1779 | 1779 | |
| 1780 | -        if( ! (  $completed  > 0 ) ){ | |
| 1780 | +        if ( ! ($completed > 0)) { | |
| 1781 | 1781 | return 0; | 
| 1782 | 1782 | } | 
| 1783 | 1783 | |
| 1784 | - $total_lessons = count( $this->course_lessons( $course_id ) ); | |
| 1784 | + $total_lessons = count($this->course_lessons($course_id)); | |
| 1785 | 1785 | $percentage = $completed / $total_lessons * 100; | 
| 1786 | 1786 | |
| 1787 | 1787 | /** | 
| @@ -1793,7 +1793,7 @@ discard block | ||
| 1793 | 1793 | * @param $user_id | 
| 1794 | 1794 | * @since 1.8.0 | 
| 1795 | 1795 | */ | 
| 1796 | - return apply_filters( 'sensei_course_completion_percentage', $percentage, $course_id, $user_id ); | |
| 1796 | +        return apply_filters('sensei_course_completion_percentage', $percentage, $course_id, $user_id); | |
| 1797 | 1797 | |
| 1798 | 1798 | }// end get_completed_lesson_ids | 
| 1799 | 1799 | |
| @@ -1805,28 +1805,28 @@ discard block | ||
| 1805 | 1805 | * @param $should_send | 
| 1806 | 1806 | * @return bool | 
| 1807 | 1807 | */ | 
| 1808 | -    public function block_notification_emails( $should_send ){ | |
| 1808 | +    public function block_notification_emails($should_send) { | |
| 1809 | 1809 | global $sensei_email_data; | 
| 1810 | 1810 | $email = $sensei_email_data; | 
| 1811 | 1811 | |
| 1812 | 1812 | $course_id = ''; | 
| 1813 | 1813 | |
| 1814 | -        if( isset( $email['course_id'] ) ){ | |
| 1814 | +        if (isset($email['course_id'])) { | |
| 1815 | 1815 | |
| 1816 | 1816 | $course_id = $email['course_id']; | 
| 1817 | 1817 | |
| 1818 | -        }elseif( isset( $email['lesson_id'] ) ){ | |
| 1818 | +        }elseif (isset($email['lesson_id'])) { | |
| 1819 | 1819 | |
| 1820 | - $course_id = Sensei()->lesson->get_course_id( $email['lesson_id'] ); | |
| 1820 | + $course_id = Sensei()->lesson->get_course_id($email['lesson_id']); | |
| 1821 | 1821 | |
| 1822 | -        }elseif( isset( $email['quiz_id'] ) ){ | |
| 1822 | +        }elseif (isset($email['quiz_id'])) { | |
| 1823 | 1823 | |
| 1824 | - $lesson_id = Sensei()->quiz->get_lesson_id( $email['quiz_id'] ); | |
| 1825 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); | |
| 1824 | + $lesson_id = Sensei()->quiz->get_lesson_id($email['quiz_id']); | |
| 1825 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); | |
| 1826 | 1826 | |
| 1827 | 1827 | } | 
| 1828 | 1828 | |
| 1829 | -        if( !empty( $course_id ) && 'course'== get_post_type( $course_id ) ) { | |
| 1829 | +        if ( ! empty($course_id) && 'course' == get_post_type($course_id)) { | |
| 1830 | 1830 | |
| 1831 | 1831 | $course_emails_disabled = get_post_meta($course_id, 'disable_notification', true); | 
| 1832 | 1832 | |
| @@ -1847,19 +1847,19 @@ discard block | ||
| 1847 | 1847 | * @since 1.8.0 | 
| 1848 | 1848 | * @param $course | 
| 1849 | 1849 | */ | 
| 1850 | -    public function course_notification_meta_box_content( $course ){ | |
| 1850 | +    public function course_notification_meta_box_content($course) { | |
| 1851 | 1851 | |
| 1852 | - $checked = get_post_meta( $course->ID , 'disable_notification', true ); | |
| 1852 | + $checked = get_post_meta($course->ID, 'disable_notification', true); | |
| 1853 | 1853 | |
| 1854 | 1854 | // generate checked html | 
| 1855 | 1855 | $checked_html = ''; | 
| 1856 | -        if( $checked ){ | |
| 1856 | +        if ($checked) { | |
| 1857 | 1857 | $checked_html = 'checked="checked"'; | 
| 1858 | 1858 | } | 
| 1859 | - wp_nonce_field( 'update-course-notification-setting','_sensei_course_notification' ); | |
| 1859 | +        wp_nonce_field('update-course-notification-setting', '_sensei_course_notification'); | |
| 1860 | 1860 | |
| 1861 | - echo '<input id="disable_sensei_course_notification" '.$checked_html .' type="checkbox" name="disable_sensei_course_notification" >'; | |
| 1862 | -        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei'). '</label>'; | |
| 1861 | + echo '<input id="disable_sensei_course_notification" '.$checked_html.' type="checkbox" name="disable_sensei_course_notification" >'; | |
| 1862 | +        echo '<label for="disable_sensei_course_notification">'.__('Disable notifications on this course ?', 'woothemes-sensei').'</label>'; | |
| 1863 | 1863 | |
| 1864 | 1864 | }// end course_notification_meta_box_content | 
| 1865 | 1865 | |
| @@ -1871,20 +1871,20 @@ discard block | ||
| 1871 | 1871 | * | 
| 1872 | 1872 | * @param $course_id | 
| 1873 | 1873 | */ | 
| 1874 | -    public function save_course_notification_meta_box( $course_id ){ | |
| 1874 | +    public function save_course_notification_meta_box($course_id) { | |
| 1875 | 1875 | |
| 1876 | - if( !isset( $_POST['_sensei_course_notification'] ) | |
| 1877 | -            || ! wp_verify_nonce( $_POST['_sensei_course_notification'], 'update-course-notification-setting' ) ){ | |
| 1876 | + if ( ! isset($_POST['_sensei_course_notification']) | |
| 1877 | +            || ! wp_verify_nonce($_POST['_sensei_course_notification'], 'update-course-notification-setting')) { | |
| 1878 | 1878 | return; | 
| 1879 | 1879 | } | 
| 1880 | 1880 | |
| 1881 | -        if( isset( $_POST['disable_sensei_course_notification'] ) && 'on'== $_POST['disable_sensei_course_notification']  ) { | |
| 1881 | +        if (isset($_POST['disable_sensei_course_notification']) && 'on' == $_POST['disable_sensei_course_notification']) { | |
| 1882 | 1882 | $new_val = true; | 
| 1883 | -        }else{ | |
| 1883 | +        } else { | |
| 1884 | 1884 | $new_val = false; | 
| 1885 | 1885 | } | 
| 1886 | 1886 | |
| 1887 | - update_post_meta( $course_id , 'disable_notification', $new_val ); | |
| 1887 | + update_post_meta($course_id, 'disable_notification', $new_val); | |
| 1888 | 1888 | |
| 1889 | 1889 | }// end save notification meta box | 
| 1890 | 1890 | |
| @@ -1898,10 +1898,10 @@ discard block | ||
| 1898 | 1898 | * | 
| 1899 | 1899 | * @param WP_Post $post | 
| 1900 | 1900 | */ | 
| 1901 | -    public function content_before_backwards_compatibility_hooks( $post_id ){ | |
| 1901 | +    public function content_before_backwards_compatibility_hooks($post_id) { | |
| 1902 | 1902 | |
| 1903 | - sensei_do_deprecated_action( 'sensei_course_image','1.9.0','sensei_course_content_inside_before' ); | |
| 1904 | - sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before' ); | |
| 1903 | +        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_course_content_inside_before'); | |
| 1904 | +        sensei_do_deprecated_action('sensei_course_archive_course_title', '1.9.0', 'sensei_course_content_inside_before'); | |
| 1905 | 1905 | |
| 1906 | 1906 | } | 
| 1907 | 1907 | |
| @@ -1914,10 +1914,10 @@ discard block | ||
| 1914 | 1914 | * | 
| 1915 | 1915 | * @global WP_Post $post | 
| 1916 | 1916 | */ | 
| 1917 | -    public  function loop_before_backwards_compatibility_hooks( ){ | |
| 1917 | +    public  function loop_before_backwards_compatibility_hooks( ) { | |
| 1918 | 1918 | |
| 1919 | 1919 | global $post; | 
| 1920 | - sensei_do_deprecated_action( 'sensei_course_archive_header','1.9.0','sensei_course_content_inside_before', $post->post_type ); | |
| 1920 | +        sensei_do_deprecated_action('sensei_course_archive_header', '1.9.0', 'sensei_course_content_inside_before', $post->post_type); | |
| 1921 | 1921 | |
| 1922 | 1922 | } | 
| 1923 | 1923 | |
| @@ -1930,19 +1930,19 @@ discard block | ||
| 1930 | 1930 | * | 
| 1931 | 1931 | * @param integer $course_id | 
| 1932 | 1932 | */ | 
| 1933 | -    public function the_course_free_lesson_preview( $course_id ){ | |
| 1933 | +    public function the_course_free_lesson_preview($course_id) { | |
| 1934 | 1934 | // Meta data | 
| 1935 | - $course = get_post( $course_id ); | |
| 1936 | - $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course->ID ) ); | |
| 1937 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course->ID, get_current_user_id() ); | |
| 1935 | + $course = get_post($course_id); | |
| 1936 | + $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course->ID)); | |
| 1937 | + $is_user_taking_course = Sensei_Utils::user_started_course($course->ID, get_current_user_id()); | |
| 1938 | 1938 | |
| 1939 | -        if ( 0 < $preview_lesson_count && !$is_user_taking_course ) { | |
| 1939 | +        if (0 < $preview_lesson_count && ! $is_user_taking_course) { | |
| 1940 | 1940 | ?> | 
| 1941 | 1941 | <p class="sensei-free-lessons"> | 
| 1942 | 1942 | <a href="<?php echo get_permalink(); ?>"> | 
| 1943 | - <?php _e( 'Preview this course', 'woothemes-sensei' ) ?> | |
| 1943 | +                    <?php _e('Preview this course', 'woothemes-sensei') ?> | |
| 1944 | 1944 | </a> | 
| 1945 | - - <?php echo sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ) ; ?> | |
| 1945 | +                - <?php echo sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?> | |
| 1946 | 1946 | </p> | 
| 1947 | 1947 | |
| 1948 | 1948 | <?php | 
| @@ -1955,42 +1955,42 @@ discard block | ||
| 1955 | 1955 | * @since 1.9.0 | 
| 1956 | 1956 | * @param integer $course_id | 
| 1957 | 1957 | */ | 
| 1958 | -    public function the_course_meta( $course_id ){ | |
| 1958 | +    public function the_course_meta($course_id) { | |
| 1959 | 1959 | echo '<p class="sensei-course-meta">'; | 
| 1960 | 1960 | |
| 1961 | - $course = get_post( $course_id ); | |
| 1962 | - $category_output = get_the_term_list( $course->ID, 'course-category', '', ', ', '' ); | |
| 1963 | - $author_display_name = get_the_author_meta( 'display_name', $course->post_author ); | |
| 1961 | + $course = get_post($course_id); | |
| 1962 | + $category_output = get_the_term_list($course->ID, 'course-category', '', ', ', ''); | |
| 1963 | +        $author_display_name = get_the_author_meta('display_name', $course->post_author); | |
| 1964 | 1964 | |
| 1965 | -        if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) {?> | |
| 1965 | +        if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) {?> | |
| 1966 | 1966 | |
| 1967 | - <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?> | |
| 1967 | +            <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?> | |
| 1968 | 1968 | |
| 1969 | - <a href="<?php esc_attr_e( get_author_posts_url( $course->post_author ) ); ?>" title="<?php esc_attr_e( $author_display_name ); ?>"><?php esc_attr_e( $author_display_name ); ?></a> | |
| 1969 | + <a href="<?php esc_attr_e(get_author_posts_url($course->post_author)); ?>" title="<?php esc_attr_e($author_display_name); ?>"><?php esc_attr_e($author_display_name); ?></a> | |
| 1970 | 1970 | |
| 1971 | 1971 | </span> | 
| 1972 | 1972 | |
| 1973 | 1973 | <?php } // End If Statement ?> | 
| 1974 | 1974 | |
| 1975 | - <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $course->ID ) . ' ' . __( 'Lessons', 'woothemes-sensei' ); ?></span> | |
| 1975 | +        <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($course->ID).' '.__('Lessons', 'woothemes-sensei'); ?></span> | |
| 1976 | 1976 | |
| 1977 | -       <?php if ( '' != $category_output ) { ?> | |
| 1977 | +       <?php if ('' != $category_output) { ?> | |
| 1978 | 1978 | |
| 1979 | - <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span> | |
| 1979 | +            <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span> | |
| 1980 | 1980 | |
| 1981 | 1981 | <?php } // End If Statement | 
| 1982 | 1982 | |
| 1983 | 1983 | // number of completed lessons | 
| 1984 | - if( Sensei_Utils::user_started_course( $course->ID, get_current_user_id() ) | |
| 1985 | -            || Sensei_Utils::user_completed_course( $course->ID,  get_current_user_id() )  ){ | |
| 1984 | + if (Sensei_Utils::user_started_course($course->ID, get_current_user_id()) | |
| 1985 | +            || Sensei_Utils::user_completed_course($course->ID, get_current_user_id())) { | |
| 1986 | 1986 | |
| 1987 | - $completed = count( $this->get_completed_lesson_ids( $course->ID, get_current_user_id() ) ); | |
| 1988 | - $lesson_count = count( $this->course_lessons( $course->ID ) ); | |
| 1989 | - echo '<span class="course-lesson-progress">' . sprintf( __( '%1$d of %2$d lessons completed', 'woothemes-sensei' ) , $completed, $lesson_count ) . '</span>'; | |
| 1987 | + $completed = count($this->get_completed_lesson_ids($course->ID, get_current_user_id())); | |
| 1988 | + $lesson_count = count($this->course_lessons($course->ID)); | |
| 1989 | +            echo '<span class="course-lesson-progress">'.sprintf(__('%1$d of %2$d lessons completed', 'woothemes-sensei'), $completed, $lesson_count).'</span>'; | |
| 1990 | 1990 | |
| 1991 | 1991 | } | 
| 1992 | 1992 | |
| 1993 | - sensei_simple_course_price( $course->ID ); | |
| 1993 | + sensei_simple_course_price($course->ID); | |
| 1994 | 1994 | |
| 1995 | 1995 | echo '</p>'; | 
| 1996 | 1996 | } // end the course meta | 
| @@ -2005,15 +2005,15 @@ discard block | ||
| 2005 | 2005 | * | 
| 2006 | 2006 | * @return array $classes | 
| 2007 | 2007 | */ | 
| 2008 | -    public static function add_course_user_status_class( $classes, $class, $course_id ){ | |
| 2008 | +    public static function add_course_user_status_class($classes, $class, $course_id) { | |
| 2009 | 2009 | |
| 2010 | -        if( 'course' == get_post_type( $course_id )  &&  is_user_logged_in() ){ | |
| 2010 | +        if ('course' == get_post_type($course_id) && is_user_logged_in()) { | |
| 2011 | 2011 | |
| 2012 | -            if( Sensei_Utils::user_completed_course( $course_id, get_current_user_id() ) ){ | |
| 2012 | +            if (Sensei_Utils::user_completed_course($course_id, get_current_user_id())) { | |
| 2013 | 2013 | |
| 2014 | 2014 | $classes[] = 'user-status-completed'; | 
| 2015 | 2015 | |
| 2016 | -            }else{ | |
| 2016 | +            } else { | |
| 2017 | 2017 | |
| 2018 | 2018 | $classes[] = 'user-status-active'; | 
| 2019 | 2019 | |
| @@ -2033,37 +2033,37 @@ discard block | ||
| 2033 | 2033 | * | 
| 2034 | 2034 | * @param WP_Post $course | 
| 2035 | 2035 | */ | 
| 2036 | -    public static function the_course_action_buttons( $course ){ | |
| 2036 | +    public static function the_course_action_buttons($course) { | |
| 2037 | 2037 | |
| 2038 | -        if( is_user_logged_in() ) { ?> | |
| 2038 | +        if (is_user_logged_in()) { ?> | |
| 2039 | 2039 | |
| 2040 | 2040 | <section class="entry-actions"> | 
| 2041 | - <form method="POST" action="<?php echo esc_url( remove_query_arg( array( 'active_page', 'completed_page' ) ) ); ?>"> | |
| 2041 | +                <form method="POST" action="<?php  echo esc_url(remove_query_arg(array('active_page', 'completed_page'))); ?>"> | |
| 2042 | 2042 | |
| 2043 | 2043 | <input type="hidden" | 
| 2044 | - name="<?php esc_attr_e( 'woothemes_sensei_complete_course_noonce' ) ?>" | |
| 2045 | - id="<?php esc_attr_e( 'woothemes_sensei_complete_course_noonce' ); ?>" | |
| 2046 | - value="<?php esc_attr_e( wp_create_nonce( 'woothemes_sensei_complete_course_noonce' ) ); ?>" | |
| 2044 | +                           name="<?php esc_attr_e('woothemes_sensei_complete_course_noonce') ?>" | |
| 2045 | +                           id="<?php  esc_attr_e('woothemes_sensei_complete_course_noonce'); ?>" | |
| 2046 | +                           value="<?php esc_attr_e(wp_create_nonce('woothemes_sensei_complete_course_noonce')); ?>" | |
| 2047 | 2047 | /> | 
| 2048 | 2048 | |
| 2049 | - <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e( intval( $course->ID ) ); ?>" /> | |
| 2049 | + <input type="hidden" name="course_complete_id" id="course-complete-id" value="<?php esc_attr_e(intval($course->ID)); ?>" /> | |
| 2050 | 2050 | |
| 2051 | - <?php if ( 0 < absint( count( Sensei()->course->course_lessons( $course->ID ) ) ) | |
| 2051 | + <?php if (0 < absint(count(Sensei()->course->course_lessons($course->ID))) | |
| 2052 | 2052 | && Sensei()->settings->settings['course_completion'] == 'complete' | 
| 2053 | -                        && ! Sensei_Utils::user_completed_course( $course, get_current_user_id() )) { ?> | |
| 2053 | +                        && ! Sensei_Utils::user_completed_course($course, get_current_user_id())) { ?> | |
| 2054 | 2054 | |
| 2055 | - <span><input name="course_complete" type="submit" class="course-complete" value="<?php _e( 'Mark as Complete', 'woothemes-sensei' ); ?>" /></span> | |
| 2055 | +                        <span><input name="course_complete" type="submit" class="course-complete" value="<?php  _e('Mark as Complete', 'woothemes-sensei'); ?>" /></span> | |
| 2056 | 2056 | |
| 2057 | 2057 | <?php } // End If Statement | 
| 2058 | 2058 | |
| 2059 | 2059 | $course_purchased = false; | 
| 2060 | -                    if ( Sensei_WC::is_woocommerce_active() ) { | |
| 2060 | +                    if (Sensei_WC::is_woocommerce_active()) { | |
| 2061 | 2061 | // Get the product ID | 
| 2062 | - $wc_post_id = get_post_meta( intval( $course->ID ), '_course_woocommerce_product', true ); | |
| 2063 | -                        if ( 0 < $wc_post_id ) { | |
| 2062 | + $wc_post_id = get_post_meta(intval($course->ID), '_course_woocommerce_product', true); | |
| 2063 | +                        if (0 < $wc_post_id) { | |
| 2064 | 2064 | |
| 2065 | 2065 | $user = wp_get_current_user(); | 
| 2066 | - $course_purchased = Sensei_Utils::sensei_customer_bought_product( $user->user_email, $user->ID, $wc_post_id ); | |
| 2066 | + $course_purchased = Sensei_Utils::sensei_customer_bought_product($user->user_email, $user->ID, $wc_post_id); | |
| 2067 | 2067 | |
| 2068 | 2068 | } // End If Statement | 
| 2069 | 2069 | } // End If Statement | 
| @@ -2077,24 +2077,24 @@ discard block | ||
| 2077 | 2077 | * @since 1.9.0 | 
| 2078 | 2078 | * @param bool $show_delete_course_button defaults to false | 
| 2079 | 2079 | */ | 
| 2080 | - $show_delete_course_button = apply_filters( 'sensei_show_delete_course_button', false ); | |
| 2080 | +                    $show_delete_course_button = apply_filters('sensei_show_delete_course_button', false); | |
| 2081 | 2081 | |
| 2082 | 2082 | if ( ! $course_purchased | 
| 2083 | - && ! Sensei_Utils::user_completed_course( $course->ID, get_current_user_id() ) | |
| 2084 | -                         && $show_delete_course_button ) { ?> | |
| 2083 | + && ! Sensei_Utils::user_completed_course($course->ID, get_current_user_id()) | |
| 2084 | +                         && $show_delete_course_button) { ?> | |
| 2085 | 2085 | |
| 2086 | - <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __( 'Delete Course', 'woothemes-sensei' ); ?>"/></span> | |
| 2086 | +                        <span><input name="course_complete" type="submit" class="course-delete" value="<?php echo __('Delete Course', 'woothemes-sensei'); ?>"/></span> | |
| 2087 | 2087 | |
| 2088 | 2088 | <?php } // End If Statement | 
| 2089 | 2089 | |
| 2090 | - $has_quizzes = Sensei()->course->course_quizzes( $course->ID, true ); | |
| 2090 | + $has_quizzes = Sensei()->course->course_quizzes($course->ID, true); | |
| 2091 | 2091 | $results_link = ''; | 
| 2092 | -                    if( $has_quizzes ){ | |
| 2093 | - $results_link = '<a class="button view-results" href="' . Sensei()->course_results->get_permalink( $course->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>'; | |
| 2092 | +                    if ($has_quizzes) { | |
| 2093 | +                        $results_link = '<a class="button view-results" href="'.Sensei()->course_results->get_permalink($course->ID).'">'.__('View results', 'woothemes-sensei').'</a>'; | |
| 2094 | 2094 | } | 
| 2095 | 2095 | |
| 2096 | 2096 | // Output only if there is content to display | 
| 2097 | -                    if ( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?> | |
| 2097 | +                    if (has_filter('sensei_results_links') || $has_quizzes) { ?> | |
| 2098 | 2098 | |
| 2099 | 2099 | <p class="sensei-results-links"> | 
| 2100 | 2100 | <?php | 
| @@ -2104,7 +2104,7 @@ discard block | ||
| 2104 | 2104 | * @param string $results_links_html | 
| 2105 | 2105 | * @param integer $course_id | 
| 2106 | 2106 | */ | 
| 2107 | - echo apply_filters( 'sensei_results_links', $results_link, $course->ID ); | |
| 2107 | +                            echo apply_filters('sensei_results_links', $results_link, $course->ID); | |
| 2108 | 2108 | ?> | 
| 2109 | 2109 | </p> | 
| 2110 | 2110 | |
| @@ -2130,17 +2130,17 @@ discard block | ||
| 2130 | 2130 | * @param WP_Query $query | 
| 2131 | 2131 | * @return WP_Query $query | 
| 2132 | 2132 | */ | 
| 2133 | -    public static function course_query_filter( $query ){ | |
| 2133 | +    public static function course_query_filter($query) { | |
| 2134 | 2134 | |
| 2135 | 2135 | // exit early for no course queries and admin queries | 
| 2136 | -        if( is_admin( ) || 'course' != $query->get( 'post_type' ) ){ | |
| 2136 | +        if (is_admin( ) || 'course' != $query->get('post_type')) { | |
| 2137 | 2137 | return $query; | 
| 2138 | 2138 | } | 
| 2139 | 2139 | |
| 2140 | 2140 | global $post; // used to get the current page id for my courses | 
| 2141 | 2141 | |
| 2142 | 2142 | // for the course archive page | 
| 2143 | -        if( $query->is_main_query() && is_post_type_archive('course') ) | |
| 2143 | +        if ($query->is_main_query() && is_post_type_archive('course')) | |
| 2144 | 2144 |          { | 
| 2145 | 2145 | /** | 
| 2146 | 2146 | * sensei_archive_courses_per_page | 
| @@ -2151,11 +2151,11 @@ discard block | ||
| 2151 | 2151 | * @since 1.9.0 | 
| 2152 | 2152 | * @param integer $posts_per_page default 10 | 
| 2153 | 2153 | */ | 
| 2154 | - $query->set( 'posts_per_page', apply_filters( 'sensei_archive_courses_per_page', 10 ) ); | |
| 2154 | +            $query->set('posts_per_page', apply_filters('sensei_archive_courses_per_page', 10)); | |
| 2155 | 2155 | |
| 2156 | 2156 | } | 
| 2157 | 2157 | // for the my courses page | 
| 2158 | - elseif( is_page() && Sensei()->settings->get( 'my_course_page' ) == $post->ID ) | |
| 2158 | +        elseif (is_page() && Sensei()->settings->get('my_course_page') == $post->ID) | |
| 2159 | 2159 |          { | 
| 2160 | 2160 | /** | 
| 2161 | 2161 | * sensei_my_courses_per_page | 
| @@ -2166,7 +2166,7 @@ discard block | ||
| 2166 | 2166 | * @since 1.9.0 | 
| 2167 | 2167 | * @param integer $posts_per_page default 10 | 
| 2168 | 2168 | */ | 
| 2169 | - $query->set( 'posts_per_page', apply_filters( 'sensei_my_courses_per_page', 10 ) ); | |
| 2169 | +            $query->set('posts_per_page', apply_filters('sensei_my_courses_per_page', 10)); | |
| 2170 | 2170 | |
| 2171 | 2171 | } | 
| 2172 | 2172 | |
| @@ -2182,21 +2182,21 @@ discard block | ||
| 2182 | 2182 | * @return array $extra_classes | 
| 2183 | 2183 | * @since 1.9.0 | 
| 2184 | 2184 | */ | 
| 2185 | - public static function get_course_loop_content_class () | |
| 2185 | + public static function get_course_loop_content_class() | |
| 2186 | 2186 |      { | 
| 2187 | 2187 | |
| 2188 | 2188 | global $sensei_course_loop; | 
| 2189 | 2189 | |
| 2190 | 2190 | |
| 2191 | -        if( !isset( $sensei_course_loop ) ){ | |
| 2191 | +        if ( ! isset($sensei_course_loop)) { | |
| 2192 | 2192 | $sensei_course_loop = array(); | 
| 2193 | 2193 | } | 
| 2194 | 2194 | |
| 2195 | -        if (!isset($sensei_course_loop['counter'])) { | |
| 2195 | +        if ( ! isset($sensei_course_loop['counter'])) { | |
| 2196 | 2196 | $sensei_course_loop['counter'] = 0; | 
| 2197 | 2197 | } | 
| 2198 | 2198 | |
| 2199 | -        if (!isset($sensei_course_loop['columns'])) { | |
| 2199 | +        if ( ! isset($sensei_course_loop['columns'])) { | |
| 2200 | 2200 | $sensei_course_loop['columns'] = self::get_loop_number_of_columns(); | 
| 2201 | 2201 | } | 
| 2202 | 2202 | |
| @@ -2204,16 +2204,16 @@ discard block | ||
| 2204 | 2204 | $sensei_course_loop['counter']++; | 
| 2205 | 2205 | |
| 2206 | 2206 | $extra_classes = array(); | 
| 2207 | -        if( 0 == ( $sensei_course_loop['counter'] - 1 ) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']  ){ | |
| 2207 | +        if (0 == ($sensei_course_loop['counter'] - 1) % $sensei_course_loop['columns'] || 1 == $sensei_course_loop['columns']) { | |
| 2208 | 2208 | $extra_classes[] = 'first'; | 
| 2209 | 2209 | } | 
| 2210 | 2210 | |
| 2211 | -        if( 0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']  ){ | |
| 2211 | +        if (0 == $sensei_course_loop['counter'] % $sensei_course_loop['columns']) { | |
| 2212 | 2212 | $extra_classes[] = 'last'; | 
| 2213 | 2213 | } | 
| 2214 | 2214 | |
| 2215 | 2215 | // add the item number to the classes as well. | 
| 2216 | - $extra_classes[] = 'loop-item-number-'. $sensei_course_loop['counter']; | |
| 2216 | + $extra_classes[] = 'loop-item-number-'.$sensei_course_loop['counter']; | |
| 2217 | 2217 | |
| 2218 | 2218 | /** | 
| 2219 | 2219 | * Filter the course loop class the fires in the in get_course_loop_content_class function | 
| @@ -2224,7 +2224,7 @@ discard block | ||
| 2224 | 2224 | * @param array $extra_classes | 
| 2225 | 2225 | * @param WP_Post $loop_current_course | 
| 2226 | 2226 | */ | 
| 2227 | - return apply_filters( 'sensei_course_loop_content_class', $extra_classes ,get_post() ); | |
| 2227 | +        return apply_filters('sensei_course_loop_content_class', $extra_classes, get_post()); | |
| 2228 | 2228 | |
| 2229 | 2229 | }// end get_course_loop_class | 
| 2230 | 2230 | |
| @@ -2234,7 +2234,7 @@ discard block | ||
| 2234 | 2234 | * @since 1.9.0 | 
| 2235 | 2235 | * @return mixed|void | 
| 2236 | 2236 | */ | 
| 2237 | -    public static function get_loop_number_of_columns(){ | |
| 2237 | +    public static function get_loop_number_of_columns() { | |
| 2238 | 2238 | |
| 2239 | 2239 | /** | 
| 2240 | 2240 | * Filter the number of columns on the course archive page. | 
| @@ -2254,10 +2254,10 @@ discard block | ||
| 2254 | 2254 | * @since 1.9.0 | 
| 2255 | 2255 | * @param | 
| 2256 | 2256 | */ | 
| 2257 | -    public static function course_archive_sorting( $query ){ | |
| 2257 | +    public static function course_archive_sorting($query) { | |
| 2258 | 2258 | |
| 2259 | 2259 | // don't show on category pages and other pages | 
| 2260 | -        if( ! is_archive(  'course ') || is_tax('course-category') ){ | |
| 2260 | +        if ( ! is_archive('course ') || is_tax('course-category')) { | |
| 2261 | 2261 | return; | 
| 2262 | 2262 | } | 
| 2263 | 2263 | |
| @@ -2270,27 +2270,27 @@ discard block | ||
| 2270 | 2270 | * @type string $option_string | 
| 2271 | 2271 | * } | 
| 2272 | 2272 | */ | 
| 2273 | - $course_order_by_options = apply_filters( 'sensei_archive_course_order_by_options', array( | |
| 2274 | - "newness" => __( "Sort by newest first", "woothemes-sensei"), | |
| 2275 | - "title" => __( "Sort by title A-Z", "woothemes-sensei" ), | |
| 2273 | +        $course_order_by_options = apply_filters('sensei_archive_course_order_by_options', array( | |
| 2274 | +            "newness"     => __("Sort by newest first", "woothemes-sensei"), | |
| 2275 | +            "title"       => __("Sort by title A-Z", "woothemes-sensei"), | |
| 2276 | 2276 | )); | 
| 2277 | 2277 | |
| 2278 | 2278 | // setup the currently selected item | 
| 2279 | 2279 | $selected = 'newness'; | 
| 2280 | -        if( isset( $_GET['orderby'] ) ){ | |
| 2280 | +        if (isset($_GET['orderby'])) { | |
| 2281 | 2281 | |
| 2282 | - $selected = $_GET[ 'orderby' ]; | |
| 2282 | + $selected = $_GET['orderby']; | |
| 2283 | 2283 | |
| 2284 | 2284 | } | 
| 2285 | 2285 | |
| 2286 | 2286 | ?> | 
| 2287 | 2287 | |
| 2288 | - <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr( Sensei_Utils::get_current_url() ) ; ?>" method="POST"> | |
| 2288 | + <form class="sensei-ordering" name="sensei-course-order" action="<?php echo esc_attr(Sensei_Utils::get_current_url()); ?>" method="POST"> | |
| 2289 | 2289 | <select name="course-orderby" class="orderby"> | 
| 2290 | 2290 | <?php | 
| 2291 | -                foreach( $course_order_by_options as $value => $text ){ | |
| 2291 | +                foreach ($course_order_by_options as $value => $text) { | |
| 2292 | 2292 | |
| 2293 | - echo '<option value="'. $value . ' "' . selected( $selected, $value, false ) . '>'. $text. '</option>'; | |
| 2293 | + echo '<option value="'.$value.' "'.selected($selected, $value, false).'>'.$text.'</option>'; | |
| 2294 | 2294 | |
| 2295 | 2295 | } | 
| 2296 | 2296 | ?> | 
| @@ -2308,10 +2308,10 @@ discard block | ||
| 2308 | 2308 | * @since 1.9.0 | 
| 2309 | 2309 | * @param | 
| 2310 | 2310 | */ | 
| 2311 | -    public static function course_archive_filters( $query ){ | |
| 2311 | +    public static function course_archive_filters($query) { | |
| 2312 | 2312 | |
| 2313 | 2313 | // don't show on category pages | 
| 2314 | -        if( is_tax('course-category') ){ | |
| 2314 | +        if (is_tax('course-category')) { | |
| 2315 | 2315 | return; | 
| 2316 | 2316 | } | 
| 2317 | 2317 | |
| @@ -2324,9 +2324,9 @@ discard block | ||
| 2324 | 2324 | * } | 
| 2325 | 2325 | * | 
| 2326 | 2326 | */ | 
| 2327 | - $filters = apply_filters( 'sensei_archive_course_filter_by_options', array( | |
| 2328 | - array( 'id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __( 'All', 'woothemes-sensei' ) ), | |
| 2329 | - array( 'id' => 'featured', 'url' => add_query_arg( array( 'course_filter'=>'featured'), self::get_courses_page_url() ), 'title'=> __( 'Featured', 'woothemes-sensei' ) ), | |
| 2327 | +        $filters = apply_filters('sensei_archive_course_filter_by_options', array( | |
| 2328 | +            array('id' => 'all', 'url' => self::get_courses_page_url(), 'title'=> __('All', 'woothemes-sensei')), | |
| 2329 | +            array('id' => 'featured', 'url' => add_query_arg(array('course_filter'=>'featured'), self::get_courses_page_url()), 'title'=> __('Featured', 'woothemes-sensei')), | |
| 2330 | 2330 | )); | 
| 2331 | 2331 | |
| 2332 | 2332 | |
| @@ -2337,11 +2337,11 @@ discard block | ||
| 2337 | 2337 | //determine the current active url | 
| 2338 | 2338 | $current_url = Sensei_Utils::get_current_url(); | 
| 2339 | 2339 | |
| 2340 | -            foreach( $filters as $filter ) { | |
| 2340 | +            foreach ($filters as $filter) { | |
| 2341 | 2341 | |
| 2342 | - $active_class = $current_url == $filter['url'] ? ' class="active" ' : ''; | |
| 2342 | + $active_class = $current_url == $filter['url'] ? ' class="active" ' : ''; | |
| 2343 | 2343 | |
| 2344 | - echo '<li><a '. $active_class .' id="'. $filter['id'] .'" href="'. esc_url( $filter['url'] ).'" >'. $filter['title'] .'</a></li>'; | |
| 2344 | + echo '<li><a '.$active_class.' id="'.$filter['id'].'" href="'.esc_url($filter['url']).'" >'.$filter['title'].'</a></li>'; | |
| 2345 | 2345 | |
| 2346 | 2346 | } | 
| 2347 | 2347 | ?> | 
| @@ -2362,13 +2362,13 @@ discard block | ||
| 2362 | 2362 | * @param WP_Query $query | 
| 2363 | 2363 | * @return WP_Query $query | 
| 2364 | 2364 | */ | 
| 2365 | -    public static function course_archive_featured_filter( $query ){ | |
| 2365 | +    public static function course_archive_featured_filter($query) { | |
| 2366 | 2366 | |
| 2367 | -        if( isset ( $_GET[ 'course_filter' ] ) && 'featured'== $_GET['course_filter'] && $query->is_main_query()  ){ | |
| 2367 | +        if (isset ($_GET['course_filter']) && 'featured' == $_GET['course_filter'] && $query->is_main_query()) { | |
| 2368 | 2368 | //setup meta query for featured courses | 
| 2369 | - $query->set( 'meta_value', 'featured' ); | |
| 2370 | - $query->set( 'meta_key', '_course_featured' ); | |
| 2371 | - $query->set( 'meta_compare', '=' ); | |
| 2369 | +            $query->set('meta_value', 'featured'); | |
| 2370 | +            $query->set('meta_key', '_course_featured'); | |
| 2371 | +            $query->set('meta_compare', '='); | |
| 2372 | 2372 | } | 
| 2373 | 2373 | |
| 2374 | 2374 | return $query; | 
| @@ -2383,13 +2383,13 @@ discard block | ||
| 2383 | 2383 | * @param WP_Query $query | 
| 2384 | 2384 | * @return WP_Query $query | 
| 2385 | 2385 | */ | 
| 2386 | -    public static function course_archive_order_by_title( $query ){ | |
| 2386 | +    public static function course_archive_order_by_title($query) { | |
| 2387 | 2387 | |
| 2388 | - if( isset ( $_POST[ 'course-orderby' ] ) && 'title '== $_POST['course-orderby'] | |
| 2389 | -            && 'course'== $query->get('post_type') && $query->is_main_query()  ){ | |
| 2388 | + if (isset ($_POST['course-orderby']) && 'title ' == $_POST['course-orderby'] | |
| 2389 | +            && 'course' == $query->get('post_type') && $query->is_main_query()) { | |
| 2390 | 2390 | // setup the order by title for this query | 
| 2391 | - $query->set( 'orderby', 'title' ); | |
| 2392 | - $query->set( 'order', 'ASC' ); | |
| 2391 | +            $query->set('orderby', 'title'); | |
| 2392 | +            $query->set('order', 'ASC'); | |
| 2393 | 2393 | } | 
| 2394 | 2394 | |
| 2395 | 2395 | return $query; | 
| @@ -2403,10 +2403,10 @@ discard block | ||
| 2403 | 2403 | * @since 1.9.0 | 
| 2404 | 2404 | * @return string $course_page_url | 
| 2405 | 2405 | */ | 
| 2406 | -    public static function get_courses_page_url(){ | |
| 2406 | +    public static function get_courses_page_url() { | |
| 2407 | 2407 | |
| 2408 | - $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] ); | |
| 2409 | -        $course_page_url = empty( $course_page_id ) ? get_post_type_archive_link('course') : get_permalink( $course_page_id ); | |
| 2408 | + $course_page_id = intval(Sensei()->settings->settings['course_page']); | |
| 2409 | +        $course_page_url = empty($course_page_id) ? get_post_type_archive_link('course') : get_permalink($course_page_id); | |
| 2410 | 2410 | |
| 2411 | 2411 | return $course_page_url; | 
| 2412 | 2412 | |
| @@ -2423,61 +2423,61 @@ discard block | ||
| 2423 | 2423 | * @param string $after_html | 
| 2424 | 2424 | * @return void | 
| 2425 | 2425 | */ | 
| 2426 | -    public static function archive_header( $query_type ='' , $before_html='', $after_html =''  ){ | |
| 2426 | +    public static function archive_header($query_type = '', $before_html = '', $after_html = '') { | |
| 2427 | 2427 | |
| 2428 | -        if( ! is_post_type_archive('course') ){ | |
| 2428 | +        if ( ! is_post_type_archive('course')) { | |
| 2429 | 2429 | return; | 
| 2430 | 2430 | } | 
| 2431 | 2431 | |
| 2432 | 2432 | // deprecated since 1.9.0 | 
| 2433 | -        sensei_do_deprecated_action('sensei_archive_title','1.9.0','sensei_archive_before_course_loop'); | |
| 2433 | +        sensei_do_deprecated_action('sensei_archive_title', '1.9.0', 'sensei_archive_before_course_loop'); | |
| 2434 | 2434 | |
| 2435 | 2435 | $html = ''; | 
| 2436 | 2436 | |
| 2437 | -        if( empty( $before_html ) ){ | |
| 2437 | +        if (empty($before_html)) { | |
| 2438 | 2438 | |
| 2439 | 2439 | $before_html = '<header class="archive-header"><h1>'; | 
| 2440 | 2440 | |
| 2441 | 2441 | } | 
| 2442 | 2442 | |
| 2443 | -        if( empty( $after_html ) ){ | |
| 2443 | +        if (empty($after_html)) { | |
| 2444 | 2444 | |
| 2445 | 2445 | $after_html = '</h1></header>'; | 
| 2446 | 2446 | |
| 2447 | 2447 | } | 
| 2448 | 2448 | |
| 2449 | -        if ( is_tax( 'course-category' ) ) { | |
| 2449 | +        if (is_tax('course-category')) { | |
| 2450 | 2450 | |
| 2451 | 2451 | global $wp_query; | 
| 2452 | 2452 | |
| 2453 | 2453 | $taxonomy_obj = $wp_query->get_queried_object(); | 
| 2454 | 2454 | $taxonomy_short_name = $taxonomy_obj->taxonomy; | 
| 2455 | - $taxonomy_raw_obj = get_taxonomy( $taxonomy_short_name ); | |
| 2456 | - $title = sprintf( __( '%1$s Archives: %2$s', 'woothemes-sensei' ), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name ); | |
| 2457 | - echo apply_filters( 'course_category_archive_title', $before_html . $title . $after_html ); | |
| 2455 | + $taxonomy_raw_obj = get_taxonomy($taxonomy_short_name); | |
| 2456 | +            $title = sprintf(__('%1$s Archives: %2$s', 'woothemes-sensei'), $taxonomy_raw_obj->labels->name, $taxonomy_obj->name); | |
| 2457 | +            echo apply_filters('course_category_archive_title', $before_html.$title.$after_html); | |
| 2458 | 2458 | return; | 
| 2459 | 2459 | |
| 2460 | 2460 | } // End If Statement | 
| 2461 | 2461 | |
| 2462 | -        switch ( $query_type ) { | |
| 2462 | +        switch ($query_type) { | |
| 2463 | 2463 | case 'newcourses': | 
| 2464 | - $html .= $before_html . __( 'New Courses', 'woothemes-sensei' ) . $after_html; | |
| 2464 | +                $html .= $before_html.__('New Courses', 'woothemes-sensei').$after_html; | |
| 2465 | 2465 | break; | 
| 2466 | 2466 | case 'featuredcourses': | 
| 2467 | - $html .= $before_html . __( 'Featured Courses', 'woothemes-sensei' ) . $after_html; | |
| 2467 | +                $html .= $before_html.__('Featured Courses', 'woothemes-sensei').$after_html; | |
| 2468 | 2468 | break; | 
| 2469 | 2469 | case 'freecourses': | 
| 2470 | - $html .= $before_html . __( 'Free Courses', 'woothemes-sensei' ) . $after_html; | |
| 2470 | +                $html .= $before_html.__('Free Courses', 'woothemes-sensei').$after_html; | |
| 2471 | 2471 | break; | 
| 2472 | 2472 | case 'paidcourses': | 
| 2473 | - $html .= $before_html . __( 'Paid Courses', 'woothemes-sensei' ) . $after_html; | |
| 2473 | +                $html .= $before_html.__('Paid Courses', 'woothemes-sensei').$after_html; | |
| 2474 | 2474 | break; | 
| 2475 | 2475 | default: | 
| 2476 | - $html .= $before_html . __( 'Courses', 'woothemes-sensei' ) . $after_html; | |
| 2476 | +                $html .= $before_html.__('Courses', 'woothemes-sensei').$after_html; | |
| 2477 | 2477 | break; | 
| 2478 | 2478 | } // End Switch Statement | 
| 2479 | 2479 | |
| 2480 | - echo apply_filters( 'course_archive_title', $html ); | |
| 2480 | +        echo apply_filters('course_archive_title', $html); | |
| 2481 | 2481 | |
| 2482 | 2482 | }//course_archive_header | 
| 2483 | 2483 | |
| @@ -2491,9 +2491,9 @@ discard block | ||
| 2491 | 2491 | * @param string $content | 
| 2492 | 2492 | * @return string $content or $excerpt | 
| 2493 | 2493 | */ | 
| 2494 | -    public static function single_course_content( $content ){ | |
| 2494 | +    public static function single_course_content($content) { | |
| 2495 | 2495 | |
| 2496 | -        if( ! is_singular('course') ){ | |
| 2496 | +        if ( ! is_singular('course')) { | |
| 2497 | 2497 | |
| 2498 | 2498 | return $content; | 
| 2499 | 2499 | |
| @@ -2502,21 +2502,21 @@ discard block | ||
| 2502 | 2502 | // Content Access Permissions | 
| 2503 | 2503 | $access_permission = false; | 
| 2504 | 2504 | |
| 2505 | -        if ( ! Sensei()->settings->get('access_permission')  || sensei_all_access() ) { | |
| 2505 | +        if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) { | |
| 2506 | 2506 | |
| 2507 | 2507 | $access_permission = true; | 
| 2508 | 2508 | |
| 2509 | 2509 | } // End If Statement | 
| 2510 | 2510 | |
| 2511 | 2511 | // Check if the user is taking the course | 
| 2512 | - $is_user_taking_course = Sensei_Utils::user_started_course( get_the_ID(), get_current_user_id() ); | |
| 2512 | + $is_user_taking_course = Sensei_Utils::user_started_course(get_the_ID(), get_current_user_id()); | |
| 2513 | 2513 | |
| 2514 | -        if(Sensei_WC::is_woocommerce_active()) { | |
| 2514 | +        if (Sensei_WC::is_woocommerce_active()) { | |
| 2515 | 2515 | |
| 2516 | - $wc_post_id = get_post_meta( get_the_ID(), '_course_woocommerce_product', true ); | |
| 2517 | - $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id ); | |
| 2516 | + $wc_post_id = get_post_meta(get_the_ID(), '_course_woocommerce_product', true); | |
| 2517 | + $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id); | |
| 2518 | 2518 | |
| 2519 | - $has_product_attached = isset ( $product ) && is_object ( $product ); | |
| 2519 | + $has_product_attached = isset ($product) && is_object($product); | |
| 2520 | 2520 | |
| 2521 | 2521 |          } else { | 
| 2522 | 2522 | |
| @@ -2524,17 +2524,17 @@ discard block | ||
| 2524 | 2524 | |
| 2525 | 2525 | } | 
| 2526 | 2526 | |
| 2527 | - if ( ( is_user_logged_in() && $is_user_taking_course ) | |
| 2528 | - || ( $access_permission && !$has_product_attached) | |
| 2529 | -            || 'full' == Sensei()->settings->get( 'course_single_content_display' ) ) { | |
| 2527 | + if ((is_user_logged_in() && $is_user_taking_course) | |
| 2528 | + || ($access_permission && ! $has_product_attached) | |
| 2529 | +            || 'full' == Sensei()->settings->get('course_single_content_display')) { | |
| 2530 | 2530 | |
| 2531 | 2531 | // compensate for core providing and empty $content | 
| 2532 | 2532 | |
| 2533 | -	        if( empty( $content ) ){ | |
| 2534 | - remove_filter( 'the_content', array( 'Sensei_Course', 'single_course_content') ); | |
| 2535 | - $course = get_post( get_the_ID() ); | |
| 2533 | +	        if (empty($content)) { | |
| 2534 | +		        remove_filter('the_content', array('Sensei_Course', 'single_course_content')); | |
| 2535 | + $course = get_post(get_the_ID()); | |
| 2536 | 2536 | |
| 2537 | - $content = apply_filters( 'the_content', $course->post_content ); | |
| 2537 | +		        $content = apply_filters('the_content', $course->post_content); | |
| 2538 | 2538 | |
| 2539 | 2539 | } | 
| 2540 | 2540 | |
| @@ -2542,7 +2542,7 @@ discard block | ||
| 2542 | 2542 | |
| 2543 | 2543 |          } else { | 
| 2544 | 2544 | |
| 2545 | - return '<p class="course-excerpt">' . get_post( get_the_ID() )->post_excerpt . '</p>'; | |
| 2545 | + return '<p class="course-excerpt">'.get_post(get_the_ID())->post_excerpt.'</p>'; | |
| 2546 | 2546 | |
| 2547 | 2547 | } | 
| 2548 | 2548 | |
| @@ -2553,25 +2553,25 @@ discard block | ||
| 2553 | 2553 | * | 
| 2554 | 2554 | * @since 1.9.0 | 
| 2555 | 2555 | */ | 
| 2556 | -    public static function the_course_lessons_title(){ | |
| 2556 | +    public static function the_course_lessons_title() { | |
| 2557 | 2557 | |
| 2558 | -	    if ( ! is_singular( 'course' )  ) { | |
| 2558 | +	    if ( ! is_singular('course')) { | |
| 2559 | 2559 | return; | 
| 2560 | 2560 | } | 
| 2561 | 2561 | |
| 2562 | 2562 | global $post; | 
| 2563 | - $none_module_lessons = Sensei()->modules->get_none_module_lessons( $post->ID ); | |
| 2564 | - $course_lessons = Sensei()->course->course_lessons( $post->ID ); | |
| 2563 | + $none_module_lessons = Sensei()->modules->get_none_module_lessons($post->ID); | |
| 2564 | + $course_lessons = Sensei()->course->course_lessons($post->ID); | |
| 2565 | 2565 | |
| 2566 | 2566 | // title should be Other Lessons if there are lessons belonging to models. | 
| 2567 | 2567 |          $title = __('Other Lessons', 'woothemes-sensei'); | 
| 2568 | 2568 | |
| 2569 | 2569 | // show lessons if the number of lesson in the course is the same as those that isn't assigned to a module | 
| 2570 | -        if( count( $course_lessons ) == count( $none_module_lessons )  ){ | |
| 2570 | +        if (count($course_lessons) == count($none_module_lessons)) { | |
| 2571 | 2571 | |
| 2572 | 2572 |              $title = __('Lessons', 'woothemes-sensei'); | 
| 2573 | 2573 | |
| 2574 | -        }elseif( empty( $none_module_lessons ) ){ // if the none module lessons are simply empty the title should not be shown | |
| 2574 | +        }elseif (empty($none_module_lessons)) { // if the none module lessons are simply empty the title should not be shown | |
| 2575 | 2575 | |
| 2576 | 2576 | $title = ''; | 
| 2577 | 2577 | } | 
| @@ -2579,7 +2579,7 @@ discard block | ||
| 2579 | 2579 | /** | 
| 2580 | 2580 | * hook document in class-woothemes-sensei-message.php | 
| 2581 | 2581 | */ | 
| 2582 | - $title = apply_filters( 'sensei_single_title', $title, $post->post_type ); | |
| 2582 | +        $title = apply_filters('sensei_single_title', $title, $post->post_type); | |
| 2583 | 2583 | |
| 2584 | 2584 | ob_start(); // start capturing the following output. | 
| 2585 | 2585 | |
| @@ -2598,7 +2598,7 @@ discard block | ||
| 2598 | 2598 | * @since 1.9.0 | 
| 2599 | 2599 | * @param string $lessons_title_html | 
| 2600 | 2600 | */ | 
| 2601 | -        echo apply_filters('the_course_lessons_title', ob_get_clean() ); // output and filter the captured output and stop capturing. | |
| 2601 | +        echo apply_filters('the_course_lessons_title', ob_get_clean()); // output and filter the captured output and stop capturing. | |
| 2602 | 2602 | |
| 2603 | 2603 | }// end the_course_lessons_title | 
| 2604 | 2604 | |
| @@ -2613,13 +2613,13 @@ discard block | ||
| 2613 | 2613 | * @since 1.9.0 | 
| 2614 | 2614 | * @global $wp_query | 
| 2615 | 2615 | */ | 
| 2616 | -    public static function load_single_course_lessons_query(){ | |
| 2616 | +    public static function load_single_course_lessons_query() { | |
| 2617 | 2617 | |
| 2618 | 2618 | global $post, $wp_query; | 
| 2619 | 2619 | |
| 2620 | 2620 | $course_id = $post->ID; | 
| 2621 | 2621 | |
| 2622 | -        if( 'course' != get_post_type( $course_id ) ){ | |
| 2622 | +        if ('course' != get_post_type($course_id)) { | |
| 2623 | 2623 | return; | 
| 2624 | 2624 | } | 
| 2625 | 2625 | |
| @@ -2631,7 +2631,7 @@ discard block | ||
| 2631 | 2631 | 'meta_query' => array( | 
| 2632 | 2632 | array( | 
| 2633 | 2633 | 'key' => '_lesson_course', | 
| 2634 | - 'value' => intval( $course_id ), | |
| 2634 | + 'value' => intval($course_id), | |
| 2635 | 2635 | ), | 
| 2636 | 2636 | ), | 
| 2637 | 2637 | 'post_status' => 'public', | 
| @@ -2639,17 +2639,17 @@ discard block | ||
| 2639 | 2639 | ); | 
| 2640 | 2640 | |
| 2641 | 2641 | // Exclude lessons belonging to modules as they are queried along with the modules. | 
| 2642 | - $modules = Sensei()->modules->get_course_modules( $course_id ); | |
| 2643 | -        if( !is_wp_error( $modules ) && ! empty( $modules ) && is_array( $modules ) ){ | |
| 2642 | + $modules = Sensei()->modules->get_course_modules($course_id); | |
| 2643 | +        if ( ! is_wp_error($modules) && ! empty($modules) && is_array($modules)) { | |
| 2644 | 2644 | |
| 2645 | 2645 | $terms_ids = array(); | 
| 2646 | -            foreach( $modules as $term ){ | |
| 2646 | +            foreach ($modules as $term) { | |
| 2647 | 2647 | |
| 2648 | 2648 | $terms_ids[] = $term->term_id; | 
| 2649 | 2649 | |
| 2650 | 2650 | } | 
| 2651 | 2651 | |
| 2652 | - $course_lesson_query_args[ 'tax_query'] = array( | |
| 2652 | + $course_lesson_query_args['tax_query'] = array( | |
| 2653 | 2653 | array( | 
| 2654 | 2654 | 'taxonomy' => 'module', | 
| 2655 | 2655 | 'field' => 'id', | 
| @@ -2660,16 +2660,16 @@ discard block | ||
| 2660 | 2660 | } | 
| 2661 | 2661 | |
| 2662 | 2662 | //setting lesson order | 
| 2663 | - $course_lesson_order = get_post_meta( $course_id, '_lesson_order', true); | |
| 2664 | -        if( !empty( $course_lesson_order ) ){ | |
| 2663 | + $course_lesson_order = get_post_meta($course_id, '_lesson_order', true); | |
| 2664 | +        if ( ! empty($course_lesson_order)) { | |
| 2665 | 2665 | |
| 2666 | - $course_lesson_query_args['post__in'] = explode( ',', $course_lesson_order ); | |
| 2667 | - $course_lesson_query_args['orderby']= 'post__in' ; | |
| 2668 | - unset( $course_lesson_query_args['order'] ); | |
| 2666 | +            $course_lesson_query_args['post__in'] = explode(',', $course_lesson_order); | |
| 2667 | + $course_lesson_query_args['orderby'] = 'post__in'; | |
| 2668 | + unset($course_lesson_query_args['order']); | |
| 2669 | 2669 | |
| 2670 | 2670 | } | 
| 2671 | 2671 | |
| 2672 | - $wp_query = new WP_Query( $course_lesson_query_args ); | |
| 2672 | + $wp_query = new WP_Query($course_lesson_query_args); | |
| 2673 | 2673 | |
| 2674 | 2674 | }// load_single_course_lessons | 
| 2675 | 2675 | |
| @@ -2680,16 +2680,16 @@ discard block | ||
| 2680 | 2680 | * | 
| 2681 | 2681 | * @param $post_id | 
| 2682 | 2682 | */ | 
| 2683 | -    public static function flush_rewrite_rules( $post_id ){ | |
| 2683 | +    public static function flush_rewrite_rules($post_id) { | |
| 2684 | 2684 | |
| 2685 | -        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){ | |
| 2685 | +        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) { | |
| 2686 | 2686 | |
| 2687 | 2687 | return; | 
| 2688 | 2688 | |
| 2689 | 2689 | } | 
| 2690 | 2690 | |
| 2691 | 2691 | |
| 2692 | -        if( 'course' == get_post_type( $post_id )  ){ | |
| 2692 | +        if ('course' == get_post_type($post_id)) { | |
| 2693 | 2693 | |
| 2694 | 2694 | Sensei()->initiate_rewrite_rules_flush(); | 
| 2695 | 2695 | |
| @@ -2705,10 +2705,10 @@ discard block | ||
| 2705 | 2705 | * @param $excerpt | 
| 2706 | 2706 | * @return string | 
| 2707 | 2707 | */ | 
| 2708 | -    public static function full_content_excerpt_override( $excerpt ){ | |
| 2708 | +    public static function full_content_excerpt_override($excerpt) { | |
| 2709 | 2709 | |
| 2710 | -        if (   is_singular('course')  && | |
| 2711 | -                'full' == Sensei()->settings->get( 'course_single_content_display' ) ){ | |
| 2710 | +        if (is_singular('course') && | |
| 2711 | +                'full' == Sensei()->settings->get('course_single_content_display')) { | |
| 2712 | 2712 | |
| 2713 | 2713 | return get_the_content(); | 
| 2714 | 2714 | |
| @@ -2725,11 +2725,11 @@ discard block | ||
| 2725 | 2725 | * | 
| 2726 | 2726 | * @since 1.9.0 | 
| 2727 | 2727 | */ | 
| 2728 | -    public static function the_course_enrolment_actions(){ | |
| 2728 | +    public static function the_course_enrolment_actions() { | |
| 2729 | 2729 | |
| 2730 | 2730 | global $post; | 
| 2731 | 2731 | |
| 2732 | -	    if ( 'course' != $post->post_type ) { | |
| 2732 | +	    if ('course' != $post->post_type) { | |
| 2733 | 2733 | return; | 
| 2734 | 2734 | } | 
| 2735 | 2735 | |
| @@ -2737,15 +2737,15 @@ discard block | ||
| 2737 | 2737 | <section class="course-meta course-enrolment"> | 
| 2738 | 2738 | <?php | 
| 2739 | 2739 | global $post, $current_user; | 
| 2740 | - $is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID ); | |
| 2740 | + $is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID); | |
| 2741 | 2741 | |
| 2742 | -	    if ( is_user_logged_in() && ! $is_user_taking_course ) { | |
| 2742 | +	    if (is_user_logged_in() && ! $is_user_taking_course) { | |
| 2743 | 2743 | |
| 2744 | 2744 | // Get the product ID | 
| 2745 | - $wc_product = wc_get_product( get_post_meta( $post->ID, '_course_woocommerce_product', true ) ); | |
| 2745 | + $wc_product = wc_get_product(get_post_meta($post->ID, '_course_woocommerce_product', true)); | |
| 2746 | 2746 | |
| 2747 | 2747 | // Check for woocommerce | 
| 2748 | -	        if ( Sensei_WC::is_woocommerce_active() && ( isset( $wc_product->price  ) ) ) { | |
| 2748 | +	        if (Sensei_WC::is_woocommerce_active() && (isset($wc_product->price))) { | |
| 2749 | 2749 | |
| 2750 | 2750 | Sensei_WC::the_add_to_cart_button_html($post->ID); | 
| 2751 | 2751 | |
| @@ -2755,53 +2755,53 @@ discard block | ||
| 2755 | 2755 | |
| 2756 | 2756 | } // End If Statement | 
| 2757 | 2757 | |
| 2758 | -        } elseif ( is_user_logged_in() ) { | |
| 2758 | +        } elseif (is_user_logged_in()) { | |
| 2759 | 2759 | |
| 2760 | 2760 | // Check if course is completed | 
| 2761 | - $user_course_status = Sensei_Utils::user_course_status( $post->ID, $current_user->ID ); | |
| 2762 | - $completed_course = Sensei_Utils::user_completed_course( $user_course_status ); | |
| 2761 | + $user_course_status = Sensei_Utils::user_course_status($post->ID, $current_user->ID); | |
| 2762 | + $completed_course = Sensei_Utils::user_completed_course($user_course_status); | |
| 2763 | 2763 | // Success message | 
| 2764 | -            if ( $completed_course ) { ?> | |
| 2765 | - <div class="status completed"><?php _e( 'Completed', 'woothemes-sensei' ); ?></div> | |
| 2764 | +            if ($completed_course) { ?> | |
| 2765 | +                <div class="status completed"><?php  _e('Completed', 'woothemes-sensei'); ?></div> | |
| 2766 | 2766 | <?php | 
| 2767 | - $has_quizzes = Sensei()->course->course_quizzes( $post->ID, true ); | |
| 2768 | -                if( has_filter( 'sensei_results_links' ) || $has_quizzes ) { ?> | |
| 2767 | + $has_quizzes = Sensei()->course->course_quizzes($post->ID, true); | |
| 2768 | +                if (has_filter('sensei_results_links') || $has_quizzes) { ?> | |
| 2769 | 2769 | <p class="sensei-results-links"> | 
| 2770 | 2770 | <?php | 
| 2771 | 2771 | $results_link = ''; | 
| 2772 | -                        if( $has_quizzes ) { | |
| 2773 | - $results_link = '<a class="view-results" href="' . Sensei()->course_results->get_permalink( $post->ID ) . '">' . __( 'View results', 'woothemes-sensei' ) . '</a>'; | |
| 2772 | +                        if ($has_quizzes) { | |
| 2773 | +                            $results_link = '<a class="view-results" href="'.Sensei()->course_results->get_permalink($post->ID).'">'.__('View results', 'woothemes-sensei').'</a>'; | |
| 2774 | 2774 | } | 
| 2775 | 2775 | /** | 
| 2776 | 2776 | * Filter documented in Sensei_Course::the_course_action_buttons | 
| 2777 | 2777 | */ | 
| 2778 | - $results_link = apply_filters( 'sensei_results_links', $results_link, $post->ID ); | |
| 2778 | +                        $results_link = apply_filters('sensei_results_links', $results_link, $post->ID); | |
| 2779 | 2779 | echo $results_link; | 
| 2780 | 2780 | ?></p> | 
| 2781 | 2781 | <?php } ?> | 
| 2782 | 2782 |              <?php } else { ?> | 
| 2783 | - <div class="status in-progress"><?php echo __( 'In Progress', 'woothemes-sensei' ); ?></div> | |
| 2783 | +                <div class="status in-progress"><?php echo __('In Progress', 'woothemes-sensei'); ?></div> | |
| 2784 | 2784 | <?php } | 
| 2785 | 2785 | |
| 2786 | 2786 |          } else { | 
| 2787 | 2787 | |
| 2788 | 2788 | // Get the product ID | 
| 2789 | - $wc_product = wc_get_product( get_post_meta( $post->ID, '_course_woocommerce_product', true ) ); | |
| 2789 | + $wc_product = wc_get_product(get_post_meta($post->ID, '_course_woocommerce_product', true)); | |
| 2790 | 2790 | |
| 2791 | 2791 | // Check for woocommerce | 
| 2792 | -            if ( Sensei_WC::is_woocommerce_active() && ( isset( $wc_product->price  ) ) ) { | |
| 2792 | +            if (Sensei_WC::is_woocommerce_active() && (isset($wc_product->price))) { | |
| 2793 | 2793 | |
| 2794 | - $login_link = '<a href="' . sensei_user_login_url() . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>'; | |
| 2795 | - $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); | |
| 2796 | - Sensei()->notices->add_notice( $message, 'info' ) ; | |
| 2797 | - Sensei_WC::the_add_to_cart_button_html( $post->ID ); | |
| 2794 | +	            $login_link = '<a href="'.sensei_user_login_url().'">'.__('log in', 'woothemes-sensei').'</a>'; | |
| 2795 | +	            $message = sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link); | |
| 2796 | + Sensei()->notices->add_notice($message, 'info'); | |
| 2797 | + Sensei_WC::the_add_to_cart_button_html($post->ID); | |
| 2798 | 2798 | |
| 2799 | 2799 |              } else { | 
| 2800 | 2800 | |
| 2801 | -                if( get_option( 'users_can_register') ) { | |
| 2801 | +                if (get_option('users_can_register')) { | |
| 2802 | 2802 | |
| 2803 | 2803 | // set the permissions message | 
| 2804 | - $anchor_before = '<a href="' . esc_url( sensei_user_login_url() ) . '" >'; | |
| 2804 | + $anchor_before = '<a href="'.esc_url(sensei_user_login_url()).'" >'; | |
| 2805 | 2805 | $anchor_after = '</a>'; | 
| 2806 | 2806 | $notice = sprintf( | 
| 2807 | 2807 |  		                __('or log in to view this courses. Click here to %slogin%s.'), | 
| @@ -2810,8 +2810,8 @@ discard block | ||
| 2810 | 2810 | ); | 
| 2811 | 2811 | |
| 2812 | 2812 | // register the notice to display | 
| 2813 | -	                if( Sensei()->settings->get( 'access_permission' ) ){ | |
| 2814 | - Sensei()->notices->add_notice( $notice, 'info' ) ; | |
| 2813 | +	                if (Sensei()->settings->get('access_permission')) { | |
| 2814 | + Sensei()->notices->add_notice($notice, 'info'); | |
| 2815 | 2815 | } | 
| 2816 | 2816 | |
| 2817 | 2817 | |
| @@ -2828,24 +2828,24 @@ discard block | ||
| 2828 | 2828 |                      $wp_register_link = apply_filters('sensei_use_wp_register_link', false); | 
| 2829 | 2829 | |
| 2830 | 2830 | $settings = Sensei()->settings->get_settings(); | 
| 2831 | - if( isset( $settings[ 'my_course_page' ] ) | |
| 2832 | -                        && 0 < intval( $settings[ 'my_course_page' ] ) ){ | |
| 2831 | + if (isset($settings['my_course_page']) | |
| 2832 | +                        && 0 < intval($settings['my_course_page'])) { | |
| 2833 | 2833 | |
| 2834 | - $my_courses_page_id = $settings[ 'my_course_page' ]; | |
| 2834 | + $my_courses_page_id = $settings['my_course_page']; | |
| 2835 | 2835 | |
| 2836 | 2836 | } | 
| 2837 | 2837 | |
| 2838 | 2838 | // If a My Courses page was set in Settings, and 'sensei_use_wp_register_link' | 
| 2839 | 2839 | // is false, link to My Courses. If not, link to default WordPress registration page. | 
| 2840 | -                    if( !empty( $my_courses_page_id ) && $my_courses_page_id && !$wp_register_link){ | |
| 2840 | +                    if ( ! empty($my_courses_page_id) && $my_courses_page_id && ! $wp_register_link) { | |
| 2841 | 2841 | |
| 2842 | - $my_courses_url = get_permalink( $my_courses_page_id ); | |
| 2843 | -                        $register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>'; | |
| 2844 | - echo '<div class="status register">' . $register_link . '</div>' ; | |
| 2842 | + $my_courses_url = get_permalink($my_courses_page_id); | |
| 2843 | +                        $register_link = '<a href="'.$my_courses_url.'">'.__('Register', 'woothemes-sensei').'</a>'; | |
| 2844 | + echo '<div class="status register">'.$register_link.'</div>'; | |
| 2845 | 2845 | |
| 2846 | -                    } else{ | |
| 2846 | +                    } else { | |
| 2847 | 2847 | |
| 2848 | - wp_register( '<div class="status register">', '</div>' ); | |
| 2848 | +                        wp_register('<div class="status register">', '</div>'); | |
| 2849 | 2849 | |
| 2850 | 2850 | } | 
| 2851 | 2851 | |
| @@ -2864,23 +2864,23 @@ discard block | ||
| 2864 | 2864 | * | 
| 2865 | 2865 | * @since 1.9.0 | 
| 2866 | 2866 | */ | 
| 2867 | -    public static function the_course_video(){ | |
| 2867 | +    public static function the_course_video() { | |
| 2868 | 2868 | |
| 2869 | 2869 | global $post; | 
| 2870 | 2870 | |
| 2871 | -	    if ( ! is_singular( 'course' )  ) { | |
| 2871 | +	    if ( ! is_singular('course')) { | |
| 2872 | 2872 | return; | 
| 2873 | 2873 | } | 
| 2874 | 2874 | // Get the meta info | 
| 2875 | - $course_video_embed = get_post_meta( $post->ID, '_course_video_embed', true ); | |
| 2875 | + $course_video_embed = get_post_meta($post->ID, '_course_video_embed', true); | |
| 2876 | 2876 | |
| 2877 | -        if ( 'http' == substr( $course_video_embed, 0, 4) ) { | |
| 2877 | +        if ('http' == substr($course_video_embed, 0, 4)) { | |
| 2878 | 2878 | |
| 2879 | - $course_video_embed = wp_oembed_get( esc_url( $course_video_embed ) ); | |
| 2879 | + $course_video_embed = wp_oembed_get(esc_url($course_video_embed)); | |
| 2880 | 2880 | |
| 2881 | 2881 | } // End If Statement | 
| 2882 | 2882 | |
| 2883 | -        if ( '' != $course_video_embed ) { ?> | |
| 2883 | +        if ('' != $course_video_embed) { ?> | |
| 2884 | 2884 | |
| 2885 | 2885 | <div class="course-video"> | 
| 2886 | 2886 | <?php echo html_entity_decode($course_video_embed); ?> | 
| @@ -2895,9 +2895,9 @@ discard block | ||
| 2895 | 2895 | * @global $post | 
| 2896 | 2896 | * @since 1.9.0 | 
| 2897 | 2897 | */ | 
| 2898 | -    public static function the_title(){ | |
| 2898 | +    public static function the_title() { | |
| 2899 | 2899 | |
| 2900 | -	    if( ! is_singular( 'course' ) ){ | |
| 2900 | +	    if ( ! is_singular('course')) { | |
| 2901 | 2901 | return; | 
| 2902 | 2902 | } | 
| 2903 | 2903 | global $post; | 
| @@ -2911,7 +2911,7 @@ discard block | ||
| 2911 | 2911 | /** | 
| 2912 | 2912 | * Filter documented in class-sensei-messages.php the_title | 
| 2913 | 2913 | */ | 
| 2914 | - echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ); | |
| 2914 | +                echo apply_filters('sensei_single_title', get_the_title($post), $post->post_type); | |
| 2915 | 2915 | ?> | 
| 2916 | 2916 | |
| 2917 | 2917 | </h1> | 
| @@ -2927,30 +2927,30 @@ discard block | ||
| 2927 | 2927 | * | 
| 2928 | 2928 | * @since 1.9.0 | 
| 2929 | 2929 | */ | 
| 2930 | -    public static function course_category_title(){ | |
| 2930 | +    public static function course_category_title() { | |
| 2931 | 2931 | |
| 2932 | -        if( ! is_tax( 'course-category' ) ){ | |
| 2932 | +        if ( ! is_tax('course-category')) { | |
| 2933 | 2933 | return; | 
| 2934 | 2934 | } | 
| 2935 | 2935 | |
| 2936 | 2936 |          $category_slug = get_query_var('course-category'); | 
| 2937 | -        $term  = get_term_by('slug',$category_slug,'course-category'); | |
| 2937 | +        $term = get_term_by('slug', $category_slug, 'course-category'); | |
| 2938 | 2938 | |
| 2939 | -        if( ! empty($term) ){ | |
| 2939 | +        if ( ! empty($term)) { | |
| 2940 | 2940 | |
| 2941 | 2941 | $title = $term->name; | 
| 2942 | 2942 | |
| 2943 | -        }else{ | |
| 2943 | +        } else { | |
| 2944 | 2944 | |
| 2945 | 2945 | $title = 'Course Category'; | 
| 2946 | 2946 | |
| 2947 | 2947 | } | 
| 2948 | 2948 | |
| 2949 | 2949 | $html = '<h2 class="sensei-category-title">'; | 
| 2950 | -        $html .= __('Category') . ' ' . $title; | |
| 2950 | +        $html .= __('Category').' '.$title; | |
| 2951 | 2951 | $html .= '</h2>'; | 
| 2952 | 2952 | |
| 2953 | - echo apply_filters( 'course_category_title', $html , $term->term_id ); | |
| 2953 | +        echo apply_filters('course_category_title', $html, $term->term_id); | |
| 2954 | 2954 | |
| 2955 | 2955 | }// course_category_title | 
| 2956 | 2956 | |
| @@ -2963,16 +2963,16 @@ discard block | ||
| 2963 | 2963 | * @param WP_Query $query | 
| 2964 | 2964 | * @return WP_Query | 
| 2965 | 2965 | */ | 
| 2966 | -    public static function alter_course_category_order( $query ){ | |
| 2966 | +    public static function alter_course_category_order($query) { | |
| 2967 | 2967 | |
| 2968 | -        if( ! is_tax( 'course-category' ) || ! $query->is_main_query() ){ | |
| 2968 | +        if ( ! is_tax('course-category') || ! $query->is_main_query()) { | |
| 2969 | 2969 | return $query; | 
| 2970 | 2970 | } | 
| 2971 | 2971 | |
| 2972 | - $order = get_option( 'sensei_course_order', '' ); | |
| 2973 | -        if( !empty( $order )  ){ | |
| 2974 | -            $query->set('orderby', 'menu_order' ); | |
| 2975 | -            $query->set('order', 'ASC' ); | |
| 2972 | +        $order = get_option('sensei_course_order', ''); | |
| 2973 | +        if ( ! empty($order)) { | |
| 2974 | +            $query->set('orderby', 'menu_order'); | |
| 2975 | +            $query->set('order', 'ASC'); | |
| 2976 | 2976 | } | 
| 2977 | 2977 | |
| 2978 | 2978 | return $query; | 
| @@ -2993,7 +2993,7 @@ discard block | ||
| 2993 | 2993 | * | 
| 2994 | 2994 | * @return array | 
| 2995 | 2995 | */ | 
| 2996 | -    public static function get_default_query_args(){ | |
| 2996 | +    public static function get_default_query_args() { | |
| 2997 | 2997 | return array( | 
| 2998 | 2998 | 'post_type' => 'course', | 
| 2999 | 2999 | 'posts_per_page' => 1000, | 
| @@ -3011,14 +3011,14 @@ discard block | ||
| 3011 | 3011 | * @param $course_id | 
| 3012 | 3012 | * @return bool | 
| 3013 | 3013 | */ | 
| 3014 | -    public static function is_prerequisite_complete( $course_id ){ | |
| 3014 | +    public static function is_prerequisite_complete($course_id) { | |
| 3015 | 3015 | |
| 3016 | - $course_prerequisite_id = get_post_meta( $course_id, '_course_prerequisite', true ); | |
| 3016 | + $course_prerequisite_id = get_post_meta($course_id, '_course_prerequisite', true); | |
| 3017 | 3017 | |
| 3018 | 3018 | // if it has a pre requisite course check it | 
| 3019 | -        if( ! empty(  $course_prerequisite_id ) ){ | |
| 3019 | +        if ( ! empty($course_prerequisite_id)) { | |
| 3020 | 3020 | |
| 3021 | - return Sensei_Utils::user_completed_course( $course_prerequisite_id, get_current_user_id() ); | |
| 3021 | + return Sensei_Utils::user_completed_course($course_prerequisite_id, get_current_user_id()); | |
| 3022 | 3022 | |
| 3023 | 3023 | } | 
| 3024 | 3024 | |
| @@ -3034,4 +3034,4 @@ discard block | ||
| 3034 | 3034 | * @ignore only for backward compatibility | 
| 3035 | 3035 | * @since 1.9.0 | 
| 3036 | 3036 | */ | 
| 3037 | -class WooThemes_Sensei_Course extends Sensei_Course{} | |
| 3037 | +class WooThemes_Sensei_Course extends Sensei_Course {} | |
| @@ -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 Lessons Class | 
| @@ -19,83 +19,83 @@ discard block | ||
| 19 | 19 | * Constructor. | 
| 20 | 20 | * @since 1.0.0 | 
| 21 | 21 | */ | 
| 22 | -	public function __construct () { | |
| 22 | +	public function __construct() { | |
| 23 | 23 | |
| 24 | 24 | $this->token = 'lesson'; | 
| 25 | 25 | |
| 26 | 26 | // Setup meta fields for this post type | 
| 27 | - $this->meta_fields = array( 'lesson_prerequisite', 'lesson_course', 'lesson_preview', 'lesson_length', 'lesson_complexity', 'lesson_video_embed' ); | |
| 27 | +		$this->meta_fields = array('lesson_prerequisite', 'lesson_course', 'lesson_preview', 'lesson_length', 'lesson_complexity', 'lesson_video_embed'); | |
| 28 | 28 | |
| 29 | 29 | $this->question_order = ''; | 
| 30 | 30 | |
| 31 | 31 | // Admin actions | 
| 32 | -		if ( is_admin() ) { | |
| 32 | +		if (is_admin()) { | |
| 33 | 33 | |
| 34 | 34 | // Metabox functions | 
| 35 | - add_action( 'admin_menu', array( $this, 'meta_box_setup' ), 20 ); | |
| 36 | - add_action( 'save_post', array( $this, 'meta_box_save' ) ); | |
| 37 | - add_action( 'save_post', array( $this, 'quiz_update' ) ); | |
| 35 | +			add_action('admin_menu', array($this, 'meta_box_setup'), 20); | |
| 36 | +			add_action('save_post', array($this, 'meta_box_save')); | |
| 37 | +			add_action('save_post', array($this, 'quiz_update')); | |
| 38 | 38 | |
| 39 | 39 | // Custom Write Panel Columns | 
| 40 | - add_filter( 'manage_edit-lesson_columns', array( $this, 'add_column_headings' ), 10, 1 ); | |
| 41 | - add_action( 'manage_posts_custom_column', array( $this, 'add_column_data' ), 10, 2 ); | |
| 40 | +			add_filter('manage_edit-lesson_columns', array($this, 'add_column_headings'), 10, 1); | |
| 41 | +			add_action('manage_posts_custom_column', array($this, 'add_column_data'), 10, 2); | |
| 42 | 42 | |
| 43 | 43 | // Add/Update question | 
| 44 | - add_action( 'wp_ajax_lesson_update_question', array( $this, 'lesson_update_question' ) ); | |
| 45 | - add_action( 'wp_ajax_nopriv_lesson_update_question', array( $this, 'lesson_update_question' ) ); | |
| 44 | +			add_action('wp_ajax_lesson_update_question', array($this, 'lesson_update_question')); | |
| 45 | +			add_action('wp_ajax_nopriv_lesson_update_question', array($this, 'lesson_update_question')); | |
| 46 | 46 | |
| 47 | 47 | // Add course | 
| 48 | - add_action( 'wp_ajax_lesson_add_course', array( $this, 'lesson_add_course' ) ); | |
| 49 | - add_action( 'wp_ajax_nopriv_lesson_add_course', array( $this, 'lesson_add_course' ) ); | |
| 48 | +			add_action('wp_ajax_lesson_add_course', array($this, 'lesson_add_course')); | |
| 49 | +			add_action('wp_ajax_nopriv_lesson_add_course', array($this, 'lesson_add_course')); | |
| 50 | 50 | |
| 51 | 51 | // Update grade type | 
| 52 | - add_action( 'wp_ajax_lesson_update_grade_type', array( $this, 'lesson_update_grade_type' ) ); | |
| 53 | - add_action( 'wp_ajax_nopriv_lesson_update_grade_type', array( $this, 'lesson_update_grade_type' ) ); | |
| 52 | +			add_action('wp_ajax_lesson_update_grade_type', array($this, 'lesson_update_grade_type')); | |
| 53 | +			add_action('wp_ajax_nopriv_lesson_update_grade_type', array($this, 'lesson_update_grade_type')); | |
| 54 | 54 | |
| 55 | 55 | // Update question order | 
| 56 | - add_action( 'wp_ajax_lesson_update_question_order', array( $this, 'lesson_update_question_order' ) ); | |
| 57 | - add_action( 'wp_ajax_nopriv_lesson_update_question_order', array( $this, 'lesson_update_question_order' ) ); | |
| 56 | +			add_action('wp_ajax_lesson_update_question_order', array($this, 'lesson_update_question_order')); | |
| 57 | +			add_action('wp_ajax_nopriv_lesson_update_question_order', array($this, 'lesson_update_question_order')); | |
| 58 | 58 | |
| 59 | 59 | //Update question order | 
| 60 | - add_action( 'wp_ajax_lesson_update_question_order_random', array( $this, 'lesson_update_question_order_random' ) ); | |
| 61 | - add_action( 'wp_ajax_nopriv_lesson_update_question_order_random', array( $this, 'lesson_update_question_order_random' ) ); | |
| 60 | +			add_action('wp_ajax_lesson_update_question_order_random', array($this, 'lesson_update_question_order_random')); | |
| 61 | +			add_action('wp_ajax_nopriv_lesson_update_question_order_random', array($this, 'lesson_update_question_order_random')); | |
| 62 | 62 | |
| 63 | 63 | // Get answer ID | 
| 64 | - add_action( 'wp_ajax_question_get_answer_id', array( $this, 'question_get_answer_id' ) ); | |
| 65 | - add_action( 'wp_ajax_nopriv_question_get_answer_id', array( $this, 'question_get_answer_id' ) ); | |
| 64 | +			add_action('wp_ajax_question_get_answer_id', array($this, 'question_get_answer_id')); | |
| 65 | +			add_action('wp_ajax_nopriv_question_get_answer_id', array($this, 'question_get_answer_id')); | |
| 66 | 66 | |
| 67 | 67 | // Add multiple questions | 
| 68 | - add_action( 'wp_ajax_lesson_add_multiple_questions', array( $this, 'lesson_add_multiple_questions' ) ); | |
| 69 | - add_action( 'wp_ajax_nopriv_lesson_add_multiple_questions', array( $this, 'lesson_add_multiple_questions' ) ); | |
| 68 | +			add_action('wp_ajax_lesson_add_multiple_questions', array($this, 'lesson_add_multiple_questions')); | |
| 69 | +			add_action('wp_ajax_nopriv_lesson_add_multiple_questions', array($this, 'lesson_add_multiple_questions')); | |
| 70 | 70 | |
| 71 | 71 | // Remove multiple questions | 
| 72 | - add_action( 'wp_ajax_lesson_remove_multiple_questions', array( $this, 'lesson_remove_multiple_questions' ) ); | |
| 73 | - add_action( 'wp_ajax_nopriv_lesson_remove_multiple_questions', array( $this, 'lesson_remove_multiple_questions' ) ); | |
| 72 | +			add_action('wp_ajax_lesson_remove_multiple_questions', array($this, 'lesson_remove_multiple_questions')); | |
| 73 | +			add_action('wp_ajax_nopriv_lesson_remove_multiple_questions', array($this, 'lesson_remove_multiple_questions')); | |
| 74 | 74 | |
| 75 | 75 | // Get question category limit | 
| 76 | - add_action( 'wp_ajax_get_question_category_limit', array( $this, 'get_question_category_limit' ) ); | |
| 77 | - add_action( 'wp_ajax_nopriv_get_question_category_limit', array( $this, 'get_question_category_limit' ) ); | |
| 76 | +			add_action('wp_ajax_get_question_category_limit', array($this, 'get_question_category_limit')); | |
| 77 | +			add_action('wp_ajax_nopriv_get_question_category_limit', array($this, 'get_question_category_limit')); | |
| 78 | 78 | |
| 79 | 79 | // Add existing questions | 
| 80 | - add_action( 'wp_ajax_lesson_add_existing_questions', array( $this, 'lesson_add_existing_questions' ) ); | |
| 81 | - add_action( 'wp_ajax_nopriv_lesson_add_existing_questions', array( $this, 'lesson_add_existing_questions' ) ); | |
| 80 | +			add_action('wp_ajax_lesson_add_existing_questions', array($this, 'lesson_add_existing_questions')); | |
| 81 | +			add_action('wp_ajax_nopriv_lesson_add_existing_questions', array($this, 'lesson_add_existing_questions')); | |
| 82 | 82 | |
| 83 | 83 | // Filter existing questions | 
| 84 | - add_action( 'wp_ajax_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) ); | |
| 85 | - add_action( 'wp_ajax_nopriv_filter_existing_questions', array( $this, 'quiz_panel_filter_existing_questions' ) ); | |
| 84 | +			add_action('wp_ajax_filter_existing_questions', array($this, 'quiz_panel_filter_existing_questions')); | |
| 85 | +			add_action('wp_ajax_nopriv_filter_existing_questions', array($this, 'quiz_panel_filter_existing_questions')); | |
| 86 | 86 | |
| 87 | 87 | // output bulk edit fields | 
| 88 | - add_action( 'bulk_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 ); | |
| 89 | - add_action( 'quick_edit_custom_box', array( $this, 'all_lessons_edit_fields' ), 10, 2 ); | |
| 88 | +            add_action('bulk_edit_custom_box', array($this, 'all_lessons_edit_fields'), 10, 2); | |
| 89 | +            add_action('quick_edit_custom_box', array($this, 'all_lessons_edit_fields'), 10, 2); | |
| 90 | 90 | |
| 91 | 91 | // load quick edit default values | 
| 92 | -            add_action('manage_lesson_posts_custom_column', array( $this, 'set_quick_edit_admin_defaults'), 11, 2); | |
| 92 | +            add_action('manage_lesson_posts_custom_column', array($this, 'set_quick_edit_admin_defaults'), 11, 2); | |
| 93 | 93 | |
| 94 | 94 | // save bulk edit fields | 
| 95 | - add_action( 'wp_ajax_save_bulk_edit_book', array( $this, 'save_all_lessons_edit_fields' ) ); | |
| 95 | +            add_action('wp_ajax_save_bulk_edit_book', array($this, 'save_all_lessons_edit_fields')); | |
| 96 | 96 | |
| 97 | 97 | // flush rewrite rules when saving a lesson | 
| 98 | -            add_action('save_post', array( __CLASS__, 'flush_rewrite_rules' ) ); | |
| 98 | +            add_action('save_post', array(__CLASS__, 'flush_rewrite_rules')); | |
| 99 | 99 | |
| 100 | 100 |  		} else { | 
| 101 | 101 | // Frontend actions | 
| @@ -108,34 +108,34 @@ discard block | ||
| 108 | 108 | * @access public | 
| 109 | 109 | * @return void | 
| 110 | 110 | */ | 
| 111 | -	public function meta_box_setup () { | |
| 111 | +	public function meta_box_setup() { | |
| 112 | 112 | |
| 113 | 113 | // Add Meta Box for Prerequisite Lesson | 
| 114 | - add_meta_box( 'lesson-prerequisite', __( 'Lesson Prerequisite', 'woothemes-sensei' ), array( $this, 'lesson_prerequisite_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 114 | +		add_meta_box('lesson-prerequisite', __('Lesson Prerequisite', 'woothemes-sensei'), array($this, 'lesson_prerequisite_meta_box_content'), $this->token, 'side', 'default'); | |
| 115 | 115 | |
| 116 | 116 | // Add Meta Box for Lesson Course | 
| 117 | - add_meta_box( 'lesson-course', __( 'Lesson Course', 'woothemes-sensei' ), array( $this, 'lesson_course_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 117 | +		add_meta_box('lesson-course', __('Lesson Course', 'woothemes-sensei'), array($this, 'lesson_course_meta_box_content'), $this->token, 'side', 'default'); | |
| 118 | 118 | |
| 119 | 119 | // Add Meta Box for Lesson Preview | 
| 120 | - add_meta_box( 'lesson-preview', __( 'Lesson Preview', 'woothemes-sensei' ), array( $this, 'lesson_preview_meta_box_content' ), $this->token, 'side', 'default' ); | |
| 120 | +		add_meta_box('lesson-preview', __('Lesson Preview', 'woothemes-sensei'), array($this, 'lesson_preview_meta_box_content'), $this->token, 'side', 'default'); | |
| 121 | 121 | |
| 122 | 122 | // Add Meta Box for Lesson Information | 
| 123 | - add_meta_box( 'lesson-info', __( 'Lesson Information', 'woothemes-sensei' ), array( $this, 'lesson_info_meta_box_content' ), $this->token, 'normal', 'default' ); | |
| 123 | +		add_meta_box('lesson-info', __('Lesson Information', 'woothemes-sensei'), array($this, 'lesson_info_meta_box_content'), $this->token, 'normal', 'default'); | |
| 124 | 124 | |
| 125 | 125 | // Add Meta Box for Quiz Settings | 
| 126 | - add_meta_box( 'lesson-quiz-settings', __( 'Quiz Settings', 'woothemes-sensei' ), array( $this, 'lesson_quiz_settings_meta_box_content' ), $this->token, 'normal', 'default' ); | |
| 126 | +		add_meta_box('lesson-quiz-settings', __('Quiz Settings', 'woothemes-sensei'), array($this, 'lesson_quiz_settings_meta_box_content'), $this->token, 'normal', 'default'); | |
| 127 | 127 | |
| 128 | 128 | // Add Meta Box for Lesson Quiz Questions | 
| 129 | - add_meta_box( 'lesson-quiz', __( 'Quiz Questions', 'woothemes-sensei' ), array( $this, 'lesson_quiz_meta_box_content' ), $this->token, 'normal', 'default' ); | |
| 129 | +		add_meta_box('lesson-quiz', __('Quiz Questions', 'woothemes-sensei'), array($this, 'lesson_quiz_meta_box_content'), $this->token, 'normal', 'default'); | |
| 130 | 130 | |
| 131 | 131 | // Remove "Custom Settings" meta box. | 
| 132 | - remove_meta_box( 'woothemes-settings', $this->token, 'normal' ); | |
| 132 | +		remove_meta_box('woothemes-settings', $this->token, 'normal'); | |
| 133 | 133 | |
| 134 | 134 | // Add JS scripts | 
| 135 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); | |
| 135 | +		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); | |
| 136 | 136 | |
| 137 | 137 | // Add CSS | 
| 138 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) ); | |
| 138 | +		add_action('admin_enqueue_scripts', array($this, 'enqueue_styles')); | |
| 139 | 139 | |
| 140 | 140 | } // End meta_box_setup() | 
| 141 | 141 | |
| @@ -146,30 +146,30 @@ discard block | ||
| 146 | 146 | * @access public | 
| 147 | 147 | * @return void | 
| 148 | 148 | */ | 
| 149 | -	public function lesson_info_meta_box_content () { | |
| 149 | +	public function lesson_info_meta_box_content() { | |
| 150 | 150 | global $post; | 
| 151 | 151 | |
| 152 | - $lesson_length = get_post_meta( $post->ID, '_lesson_length', true ); | |
| 153 | - $lesson_complexity = get_post_meta( $post->ID, '_lesson_complexity', true ); | |
| 152 | + $lesson_length = get_post_meta($post->ID, '_lesson_length', true); | |
| 153 | + $lesson_complexity = get_post_meta($post->ID, '_lesson_complexity', true); | |
| 154 | 154 | $complexity_array = $this->lesson_complexities(); | 
| 155 | - $lesson_video_embed = get_post_meta( $post->ID, '_lesson_video_embed', true ); | |
| 155 | + $lesson_video_embed = get_post_meta($post->ID, '_lesson_video_embed', true); | |
| 156 | 156 | |
| 157 | 157 | $html = ''; | 
| 158 | 158 | // Lesson Length | 
| 159 | - $html .= '<p><label for="lesson_length">' . __( 'Lesson Length in minutes', 'woothemes-sensei' ) . ': </label>'; | |
| 160 | - $html .= '<input type="number" id="lesson-length" name="lesson_length" class="small-text" value="' . esc_attr( $lesson_length ) . '" /></p>' . "\n"; | |
| 159 | +		$html .= '<p><label for="lesson_length">'.__('Lesson Length in minutes', 'woothemes-sensei').': </label>'; | |
| 160 | + $html .= '<input type="number" id="lesson-length" name="lesson_length" class="small-text" value="'.esc_attr($lesson_length).'" /></p>'."\n"; | |
| 161 | 161 | // Lesson Complexity | 
| 162 | - $html .= '<p><label for="lesson_complexity">' . __( 'Lesson Complexity', 'woothemes-sensei' ) . ': </label>'; | |
| 162 | +		$html .= '<p><label for="lesson_complexity">'.__('Lesson Complexity', 'woothemes-sensei').': </label>'; | |
| 163 | 163 | $html .= '<select id="lesson-complexity-options" name="lesson_complexity" class="chosen_select lesson-complexity-select">'; | 
| 164 | - $html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 165 | -			foreach ($complexity_array as $key => $value){ | |
| 166 | - $html .= '<option value="' . esc_attr( $key ) . '"' . selected( $key, $lesson_complexity, false ) . '>' . esc_html( $value ) . '</option>' . "\n"; | |
| 164 | +			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; | |
| 165 | +			foreach ($complexity_array as $key => $value) { | |
| 166 | + $html .= '<option value="'.esc_attr($key).'"'.selected($key, $lesson_complexity, false).'>'.esc_html($value).'</option>'."\n"; | |
| 167 | 167 | } // End For Loop | 
| 168 | - $html .= '</select></p>' . "\n"; | |
| 168 | + $html .= '</select></p>'."\n"; | |
| 169 | 169 | |
| 170 | - $html .= '<p><label for="lesson_video_embed">' . __( 'Video Embed Code', 'woothemes-sensei' ) . ':</label><br/>' . "\n"; | |
| 171 | - $html .= '<textarea rows="5" cols="50" name="lesson_video_embed" tabindex="6" id="course-video-embed">' . $lesson_video_embed . '</textarea></p>' . "\n"; | |
| 172 | - $html .= '<p>' . __( 'Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei' ) . '</p>'; | |
| 170 | +		$html .= '<p><label for="lesson_video_embed">'.__('Video Embed Code', 'woothemes-sensei').':</label><br/>'."\n"; | |
| 171 | + $html .= '<textarea rows="5" cols="50" name="lesson_video_embed" tabindex="6" id="course-video-embed">'.$lesson_video_embed.'</textarea></p>'."\n"; | |
| 172 | +		$html .= '<p>'.__('Paste the embed code for your video (e.g. YouTube, Vimeo etc.) in the box above.', 'woothemes-sensei').'</p>'; | |
| 173 | 173 | |
| 174 | 174 | echo $html; | 
| 175 | 175 | |
| @@ -181,31 +181,31 @@ discard block | ||
| 181 | 181 | * @access public | 
| 182 | 182 | * @return void | 
| 183 | 183 | */ | 
| 184 | -	public function lesson_prerequisite_meta_box_content () { | |
| 184 | +	public function lesson_prerequisite_meta_box_content() { | |
| 185 | 185 | global $post; | 
| 186 | 186 | // Get existing post meta | 
| 187 | - $select_lesson_prerequisite = get_post_meta( $post->ID, '_lesson_prerequisite', true ); | |
| 187 | + $select_lesson_prerequisite = get_post_meta($post->ID, '_lesson_prerequisite', true); | |
| 188 | 188 | // Get the Lesson Posts | 
| 189 | - $post_args = array( 'post_type' => 'lesson', | |
| 189 | +		$post_args = array('post_type' 		=> 'lesson', | |
| 190 | 190 | 'posts_per_page' => -1, | 
| 191 | 191 | 'orderby' => 'title', | 
| 192 | 192 | 'order' => 'ASC', | 
| 193 | 193 | 'exclude' => $post->ID, | 
| 194 | 194 | 'suppress_filters' => 0 | 
| 195 | 195 | ); | 
| 196 | - $posts_array = get_posts( $post_args ); | |
| 196 | + $posts_array = get_posts($post_args); | |
| 197 | 197 | // Build the HTML to Output | 
| 198 | 198 | $html = ''; | 
| 199 | - $html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false ); | |
| 200 | -		if ( count( $posts_array ) > 0 ) { | |
| 201 | - $html .= '<select id="lesson-prerequisite-options" name="lesson_prerequisite" class="chosen_select widefat">' . "\n"; | |
| 202 | - $html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 203 | -				foreach ($posts_array as $post_item){ | |
| 204 | - $html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '"' . selected( $post_item->ID, $select_lesson_prerequisite, false ) . '>' . esc_html( $post_item->post_title ) . '</option>' . "\n"; | |
| 199 | +		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false); | |
| 200 | +		if (count($posts_array) > 0) { | |
| 201 | + $html .= '<select id="lesson-prerequisite-options" name="lesson_prerequisite" class="chosen_select widefat">'."\n"; | |
| 202 | +			$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; | |
| 203 | +				foreach ($posts_array as $post_item) { | |
| 204 | + $html .= '<option value="'.esc_attr(absint($post_item->ID)).'"'.selected($post_item->ID, $select_lesson_prerequisite, false).'>'.esc_html($post_item->post_title).'</option>'."\n"; | |
| 205 | 205 | } // End For Loop | 
| 206 | - $html .= '</select>' . "\n"; | |
| 206 | + $html .= '</select>'."\n"; | |
| 207 | 207 |  		} else { | 
| 208 | - $html .= '<p>' . esc_html( __( 'No lessons exist yet. Please add some first.', 'woothemes-sensei' ) ) . '</p>'; | |
| 208 | +			$html .= '<p>'.esc_html(__('No lessons exist yet. Please add some first.', 'woothemes-sensei')).'</p>'; | |
| 209 | 209 | } // End If Statement | 
| 210 | 210 | // Output the HTML | 
| 211 | 211 | echo $html; | 
| @@ -217,20 +217,20 @@ discard block | ||
| 217 | 217 | * @access public | 
| 218 | 218 | * @return void | 
| 219 | 219 | */ | 
| 220 | -	public function lesson_preview_meta_box_content () { | |
| 220 | +	public function lesson_preview_meta_box_content() { | |
| 221 | 221 | global $post; | 
| 222 | 222 | // Get existing post meta | 
| 223 | - $lesson_preview = get_post_meta( $post->ID, '_lesson_preview', true ); | |
| 223 | + $lesson_preview = get_post_meta($post->ID, '_lesson_preview', true); | |
| 224 | 224 | $html = ''; | 
| 225 | - $html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false ); | |
| 225 | +		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false); | |
| 226 | 226 | |
| 227 | 227 | $checked = ''; | 
| 228 | -		if ( isset( $lesson_preview ) && ( '' != $lesson_preview ) ) { | |
| 229 | - $checked = checked( 'preview', $lesson_preview, false ); | |
| 228 | +		if (isset($lesson_preview) && ('' != $lesson_preview)) { | |
| 229 | +	 	    $checked = checked('preview', $lesson_preview, false); | |
| 230 | 230 | } // End If Statement | 
| 231 | 231 | |
| 232 | 232 | $html .= '<label for="lesson_preview">'; | 
| 233 | - $html .= '<input type="checkbox" id="lesson_preview" name="lesson_preview" value="preview" ' . $checked . '> ' . __( 'Allow this lesson to be viewed without purchase/login', 'woothemes-sensei' ) . '<br>'; | |
| 233 | +	 	$html .= '<input type="checkbox" id="lesson_preview" name="lesson_preview" value="preview" '.$checked.'> '.__('Allow this lesson to be viewed without purchase/login', 'woothemes-sensei').'<br>'; | |
| 234 | 234 | |
| 235 | 235 | // Output the HTML | 
| 236 | 236 | echo $html; | 
| @@ -243,32 +243,32 @@ discard block | ||
| 243 | 243 | * @param int $post_id | 
| 244 | 244 | * @return integer $post_id | 
| 245 | 245 | */ | 
| 246 | -	public function meta_box_save ( $post_id ) { | |
| 246 | +	public function meta_box_save($post_id) { | |
| 247 | 247 | |
| 248 | 248 | // Verify the nonce before proceeding. | 
| 249 | -		if ( ( get_post_type( $post_id ) != $this->token ) || !isset(   $_POST[ 'woo_' . $this->token . '_nonce'] )  || ! wp_verify_nonce( $_POST[ 'woo_' . $this->token . '_nonce' ], 'sensei-save-post-meta' ) ) { | |
| 249 | +		if ((get_post_type($post_id) != $this->token) || ! isset($_POST['woo_'.$this->token.'_nonce']) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_nonce'], 'sensei-save-post-meta')) { | |
| 250 | 250 | return $post_id; | 
| 251 | 251 | } // End If Statement | 
| 252 | 252 | // Get the post type object. | 
| 253 | - $post_type = get_post_type_object( get_post_type( $post_id ) ); | |
| 253 | + $post_type = get_post_type_object(get_post_type($post_id)); | |
| 254 | 254 | // Check if the current user has permission to edit the post. | 
| 255 | -		if ( !current_user_can( $post_type->cap->edit_post, $post_id ) ) { | |
| 255 | +		if ( ! current_user_can($post_type->cap->edit_post, $post_id)) { | |
| 256 | 256 | return $post_id; | 
| 257 | 257 | } // End If Statement | 
| 258 | 258 | // Check if the current post type is a page | 
| 259 | -		if ( 'page' == $_POST[ 'post_type' ] ) { | |
| 260 | -			if ( ! current_user_can( 'edit_page', $post_id ) ) { | |
| 259 | +		if ('page' == $_POST['post_type']) { | |
| 260 | +			if ( ! current_user_can('edit_page', $post_id)) { | |
| 261 | 261 | return $post_id; | 
| 262 | 262 | } // End If Statement | 
| 263 | 263 |  		} else { | 
| 264 | -			if ( ! current_user_can( 'edit_post', $post_id ) ) { | |
| 264 | +			if ( ! current_user_can('edit_post', $post_id)) { | |
| 265 | 265 | return $post_id; | 
| 266 | 266 | } // End If Statement | 
| 267 | 267 | } // End If Statement | 
| 268 | 268 | // Save the post meta data fields | 
| 269 | -		if ( isset($this->meta_fields) && is_array($this->meta_fields) ) { | |
| 270 | -			foreach ( $this->meta_fields as $meta_key ) { | |
| 271 | - $this->save_post_meta( $meta_key, $post_id ); | |
| 269 | +		if (isset($this->meta_fields) && is_array($this->meta_fields)) { | |
| 270 | +			foreach ($this->meta_fields as $meta_key) { | |
| 271 | + $this->save_post_meta($meta_key, $post_id); | |
| 272 | 272 | } // End For Loop | 
| 273 | 273 | } // End If Statement | 
| 274 | 274 | } // End meta_box_save() | 
| @@ -280,37 +280,37 @@ discard block | ||
| 280 | 280 | * @access public | 
| 281 | 281 | * @return integer|boolean $post_id or false | 
| 282 | 282 | */ | 
| 283 | -	public function quiz_update( $post_id ) { | |
| 283 | +	public function quiz_update($post_id) { | |
| 284 | 284 | global $post; | 
| 285 | 285 | // Verify the nonce before proceeding. | 
| 286 | -		if ( ( 'lesson' != get_post_type( $post_id ) )|| !isset(   $_POST[ 'woo_' . $this->token . '_nonce'] )  || ! wp_verify_nonce( $_POST[ 'woo_' . $this->token . '_nonce' ], 'sensei-save-post-meta') ) { | |
| 287 | -			if ( isset($post->ID) ) { | |
| 286 | +		if (('lesson' != get_post_type($post_id)) || ! isset($_POST['woo_'.$this->token.'_nonce']) || ! wp_verify_nonce($_POST['woo_'.$this->token.'_nonce'], 'sensei-save-post-meta')) { | |
| 287 | +			if (isset($post->ID)) { | |
| 288 | 288 | return $post->ID; | 
| 289 | 289 |  			} else { | 
| 290 | 290 | return false; | 
| 291 | 291 | } // End If Statement | 
| 292 | 292 | } // End If Statement | 
| 293 | 293 | |
| 294 | -		if( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) { | |
| 294 | +		if (wp_is_post_revision($post_id) || wp_is_post_autosave($post_id)) { | |
| 295 | 295 | return false; | 
| 296 | 296 | } | 
| 297 | 297 | |
| 298 | 298 | // Temporarily disable the filter | 
| 299 | - remove_action( 'save_post', array( $this, 'quiz_update' ) ); | |
| 299 | +        remove_action('save_post', array($this, 'quiz_update')); | |
| 300 | 300 | // Save the Quiz | 
| 301 | - $quiz_id = $this->lesson_quizzes( $post_id, 'any'); | |
| 301 | + $quiz_id = $this->lesson_quizzes($post_id, 'any'); | |
| 302 | 302 | |
| 303 | 303 | // Sanitize and setup the post data | 
| 304 | - $_POST = stripslashes_deep( $_POST ); | |
| 305 | -		if ( isset( $_POST[ 'quiz_id' ] ) && ( 0 < absint( $_POST[ 'quiz_id' ] ) ) ) { | |
| 306 | - $quiz_id = absint( $_POST[ 'quiz_id' ] ); | |
| 304 | + $_POST = stripslashes_deep($_POST); | |
| 305 | +		if (isset($_POST['quiz_id']) && (0 < absint($_POST['quiz_id']))) { | |
| 306 | + $quiz_id = absint($_POST['quiz_id']); | |
| 307 | 307 | } // End If Statement | 
| 308 | - $post_title = esc_html( $_POST[ 'post_title' ] ); | |
| 309 | - $post_status = esc_html( $_POST[ 'post_status' ] ); | |
| 308 | + $post_title = esc_html($_POST['post_title']); | |
| 309 | + $post_status = esc_html($_POST['post_status']); | |
| 310 | 310 | $post_content = ''; | 
| 311 | 311 | |
| 312 | 312 | // Setup Query Arguments | 
| 313 | - $post_type_args = array( 'post_content' => $post_content, | |
| 313 | +		$post_type_args = array('post_content' => $post_content, | |
| 314 | 314 | 'post_status' => $post_status, | 
| 315 | 315 | 'post_title' => $post_title, | 
| 316 | 316 | 'post_type' => 'quiz', | 
| @@ -320,84 +320,84 @@ discard block | ||
| 320 | 320 | $settings = $this->get_quiz_settings(); | 
| 321 | 321 | |
| 322 | 322 | // Update or Insert the Lesson Quiz | 
| 323 | -		if ( 0 < $quiz_id ) { | |
| 323 | +		if (0 < $quiz_id) { | |
| 324 | 324 | // Update the Quiz | 
| 325 | - $post_type_args[ 'ID' ] = $quiz_id; | |
| 325 | + $post_type_args['ID'] = $quiz_id; | |
| 326 | 326 | wp_update_post($post_type_args); | 
| 327 | 327 | |
| 328 | 328 | // Update the post meta data | 
| 329 | - update_post_meta( $quiz_id, '_quiz_lesson', $post_id ); | |
| 329 | + update_post_meta($quiz_id, '_quiz_lesson', $post_id); | |
| 330 | 330 | |
| 331 | -		    foreach( $settings as $field ) { | |
| 332 | -		    	if( 'random_question_order' != $field['id'] ) { | |
| 333 | - $value = $this->get_submitted_setting_value( $field ); | |
| 334 | -			    	if( isset( $value ) ) { | |
| 335 | - update_post_meta( $quiz_id, '_' . $field['id'], $value ); | |
| 331 | +		    foreach ($settings as $field) { | |
| 332 | +		    	if ('random_question_order' != $field['id']) { | |
| 333 | + $value = $this->get_submitted_setting_value($field); | |
| 334 | +			    	if (isset($value)) { | |
| 335 | + update_post_meta($quiz_id, '_'.$field['id'], $value); | |
| 336 | 336 | } | 
| 337 | 337 | } | 
| 338 | 338 | } | 
| 339 | 339 | |
| 340 | 340 | // Set the post terms for quiz-type | 
| 341 | - wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' ); | |
| 341 | +		    wp_set_post_terms($quiz_id, array('multiple-choice'), 'quiz-type'); | |
| 342 | 342 |  		} else { | 
| 343 | 343 | // Create the Quiz | 
| 344 | 344 | $quiz_id = wp_insert_post($post_type_args); | 
| 345 | 345 | |
| 346 | 346 | // Add the post meta data WP will add it if it doesn't exist | 
| 347 | - update_post_meta( $quiz_id, '_quiz_lesson', $post_id ); | |
| 347 | + update_post_meta($quiz_id, '_quiz_lesson', $post_id); | |
| 348 | 348 | |
| 349 | -		    foreach( $settings as $field ) { | |
| 350 | -		    	if( 'random_question_order' != $field['id'] ) { | |
| 349 | +		    foreach ($settings as $field) { | |
| 350 | +		    	if ('random_question_order' != $field['id']) { | |
| 351 | 351 | |
| 352 | 352 | //ignore values not posted to avoid | 
| 353 | 353 | // overwriting with empty or default values | 
| 354 | 354 | // when the values are posted from bulk edit or quick edit | 
| 355 | -                    if( !isset( $_POST[ $field['id'] ] ) ){ | |
| 355 | +                    if ( ! isset($_POST[$field['id']])) { | |
| 356 | 356 | continue; | 
| 357 | 357 | } | 
| 358 | 358 | |
| 359 | - $value = $this->get_submitted_setting_value( $field ); | |
| 360 | -			    	if( isset( $value ) ) { | |
| 361 | - add_post_meta( $quiz_id, '_' . $field['id'], $value ); | |
| 359 | + $value = $this->get_submitted_setting_value($field); | |
| 360 | +			    	if (isset($value)) { | |
| 361 | + add_post_meta($quiz_id, '_'.$field['id'], $value); | |
| 362 | 362 | } | 
| 363 | 363 | } | 
| 364 | 364 | } | 
| 365 | 365 | |
| 366 | 366 | // Set the post terms for quiz-type | 
| 367 | - wp_set_post_terms( $quiz_id, array( 'multiple-choice' ), 'quiz-type' ); | |
| 367 | +		    wp_set_post_terms($quiz_id, array('multiple-choice'), 'quiz-type'); | |
| 368 | 368 | } // End If Statement | 
| 369 | 369 | |
| 370 | 370 | // Add default lesson order meta value | 
| 371 | - $course_id = get_post_meta( $post_id, '_lesson_course', true ); | |
| 372 | -		if( $course_id ) { | |
| 373 | -			if( ! get_post_meta( $post_id, '_order_' . $course_id, true ) ) { | |
| 374 | - update_post_meta( $post_id, '_order_' . $course_id, 0 ); | |
| 371 | + $course_id = get_post_meta($post_id, '_lesson_course', true); | |
| 372 | +		if ($course_id) { | |
| 373 | +			if ( ! get_post_meta($post_id, '_order_'.$course_id, true)) { | |
| 374 | + update_post_meta($post_id, '_order_'.$course_id, 0); | |
| 375 | 375 | } | 
| 376 | 376 | } | 
| 377 | 377 | // Add reference back to the Quiz | 
| 378 | - update_post_meta( $post_id, '_lesson_quiz', $quiz_id ); | |
| 378 | + update_post_meta($post_id, '_lesson_quiz', $quiz_id); | |
| 379 | 379 | // Mark if the Lesson Quiz has questions | 
| 380 | - $quiz_questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id ); | |
| 381 | -		if( 0 < count( $quiz_questions ) ) { | |
| 382 | - update_post_meta( $post_id, '_quiz_has_questions', '1' ); | |
| 380 | + $quiz_questions = Sensei()->lesson->lesson_quiz_questions($quiz_id); | |
| 381 | +		if (0 < count($quiz_questions)) { | |
| 382 | + update_post_meta($post_id, '_quiz_has_questions', '1'); | |
| 383 | 383 | } | 
| 384 | 384 |  		else { | 
| 385 | - delete_post_meta( $post_id, '_quiz_has_questions' ); | |
| 385 | + delete_post_meta($post_id, '_quiz_has_questions'); | |
| 386 | 386 | } | 
| 387 | 387 | |
| 388 | 388 | // Restore the previously disabled filter | 
| 389 | - add_action( 'save_post', array( $this, 'quiz_update' ) ); | |
| 389 | +        add_action('save_post', array($this, 'quiz_update')); | |
| 390 | 390 | |
| 391 | 391 | } // End post_updated() | 
| 392 | 392 | |
| 393 | -	public function get_submitted_setting_value( $field = false ) { | |
| 393 | +	public function get_submitted_setting_value($field = false) { | |
| 394 | 394 | |
| 395 | - if( ! $field ) return; | |
| 395 | + if ( ! $field) return; | |
| 396 | 396 | |
| 397 | 397 | $value = false; | 
| 398 | 398 | |
| 399 | -		if( 'quiz_grade_type' == $field['id'] ) { | |
| 400 | -			if( isset( $_POST[ $field['id'] ] ) && 'on' == $_POST[ $field['id'] ] ) { | |
| 399 | +		if ('quiz_grade_type' == $field['id']) { | |
| 400 | +			if (isset($_POST[$field['id']]) && 'on' == $_POST[$field['id']]) { | |
| 401 | 401 | $value = 'auto'; | 
| 402 | 402 |  			} else { | 
| 403 | 403 | $value = 'manual'; | 
| @@ -405,8 +405,8 @@ discard block | ||
| 405 | 405 | return $value; | 
| 406 | 406 | } | 
| 407 | 407 | |
| 408 | -		if ( isset( $_POST[ $field['id'] ] ) ) { | |
| 409 | - $value = $_POST[ $field['id'] ]; | |
| 408 | +		if (isset($_POST[$field['id']])) { | |
| 409 | + $value = $_POST[$field['id']]; | |
| 410 | 410 |  		} else { | 
| 411 | 411 | $value = $field['default']; | 
| 412 | 412 | } | 
| @@ -422,18 +422,18 @@ discard block | ||
| 422 | 422 | * @param int $post_id (default: 0) | 
| 423 | 423 | * @return int|bool meta id or saved status | 
| 424 | 424 | */ | 
| 425 | -	private function save_post_meta( $post_key = '', $post_id = 0 ) { | |
| 425 | +	private function save_post_meta($post_key = '', $post_id = 0) { | |
| 426 | 426 | // Get the meta key. | 
| 427 | - $meta_key = '_' . $post_key; | |
| 427 | + $meta_key = '_'.$post_key; | |
| 428 | 428 | |
| 429 | 429 | //ignore fields are not posted | 
| 430 | 430 | |
| 431 | -        if( !isset( $_POST[ $post_key ] ) ){ | |
| 431 | +        if ( ! isset($_POST[$post_key])) { | |
| 432 | 432 | |
| 433 | 433 | // except for lesson preview checkbox field | 
| 434 | -            if( 'lesson_preview' == $post_key ){ | |
| 434 | +            if ('lesson_preview' == $post_key) { | |
| 435 | 435 | |
| 436 | - $_POST[ $post_key ] = ''; | |
| 436 | + $_POST[$post_key] = ''; | |
| 437 | 437 | |
| 438 | 438 |              } else { | 
| 439 | 439 | |
| @@ -444,15 +444,15 @@ discard block | ||
| 444 | 444 | } | 
| 445 | 445 | |
| 446 | 446 | // Get the posted data and sanitize it for use as an HTML class. | 
| 447 | -		if ( 'lesson_video_embed' == $post_key) { | |
| 448 | - $new_meta_value = esc_html( $_POST[$post_key] ); | |
| 447 | +		if ('lesson_video_embed' == $post_key) { | |
| 448 | + $new_meta_value = esc_html($_POST[$post_key]); | |
| 449 | 449 |  		} else { | 
| 450 | - $new_meta_value = ( isset( $_POST[$post_key] ) ? sanitize_html_class( $_POST[$post_key] ) : '' ); | |
| 450 | + $new_meta_value = (isset($_POST[$post_key]) ? sanitize_html_class($_POST[$post_key]) : ''); | |
| 451 | 451 | } // End If Statement | 
| 452 | 452 | |
| 453 | 453 | // update field with the new value | 
| 454 | -        if( -1 != $new_meta_value  ){ | |
| 455 | - return update_post_meta( $post_id, $meta_key, $new_meta_value ); | |
| 454 | +        if ( -1 != $new_meta_value  ) { | |
| 455 | + return update_post_meta($post_id, $meta_key, $new_meta_value); | |
| 456 | 456 | } | 
| 457 | 457 | |
| 458 | 458 | } // End save_post_meta() | 
| @@ -463,30 +463,30 @@ discard block | ||
| 463 | 463 | * @access public | 
| 464 | 464 | * @return void | 
| 465 | 465 | */ | 
| 466 | -	public function lesson_course_meta_box_content () { | |
| 466 | +	public function lesson_course_meta_box_content() { | |
| 467 | 467 | global $post; | 
| 468 | 468 | // Setup Lesson Meta Data | 
| 469 | 469 | $selected_lesson_course = 0; | 
| 470 | -		if ( 0 < $post->ID ) { | |
| 471 | - $selected_lesson_course = get_post_meta( $post->ID, '_lesson_course', true ); | |
| 470 | +		if (0 < $post->ID) { | |
| 471 | + $selected_lesson_course = get_post_meta($post->ID, '_lesson_course', true); | |
| 472 | 472 | } // End If Statement | 
| 473 | 473 | // Handle preselected course | 
| 474 | -		if ( isset( $_GET[ 'course_id' ] ) && ( 0 < absint( $_GET[ 'course_id' ] ) ) ) { | |
| 475 | - $selected_lesson_course = absint( $_GET[ 'course_id' ] ); | |
| 474 | +		if (isset($_GET['course_id']) && (0 < absint($_GET['course_id']))) { | |
| 475 | + $selected_lesson_course = absint($_GET['course_id']); | |
| 476 | 476 | } // End If Statement | 
| 477 | 477 | // Get the Lesson Posts | 
| 478 | - $post_args = array( 'post_type' => 'course', | |
| 478 | +		$post_args = array('post_type' 		=> 'course', | |
| 479 | 479 | 'posts_per_page' => -1, | 
| 480 | 480 | 'orderby' => 'title', | 
| 481 | 481 | 'order' => 'ASC', | 
| 482 | 482 | 'post_status' => 'any', | 
| 483 | 483 | 'suppress_filters' => 0, | 
| 484 | 484 | ); | 
| 485 | - $posts_array = get_posts( $post_args ); | |
| 485 | + $posts_array = get_posts($post_args); | |
| 486 | 486 | // Buid the HTML to Output | 
| 487 | 487 | $html = ''; | 
| 488 | 488 | // Nonce | 
| 489 | - $html .= wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false ); | |
| 489 | +		$html .= wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false); | |
| 490 | 490 | |
| 491 | 491 | // Select the course for the lesson | 
| 492 | 492 | $drop_down_args = array( | 
| @@ -496,67 +496,67 @@ discard block | ||
| 496 | 496 | |
| 497 | 497 | $courses = WooThemes_Sensei_Course::get_all_courses(); | 
| 498 | 498 | $courses_options = array(); | 
| 499 | -        foreach( $courses as $course ){ | |
| 500 | - $courses_options[ $course->ID ] = get_the_title( $course ) ; | |
| 499 | +        foreach ($courses as $course) { | |
| 500 | + $courses_options[$course->ID] = get_the_title($course); | |
| 501 | 501 | } | 
| 502 | - $html .= Sensei_Utils::generate_drop_down( $selected_lesson_course, $courses_options, $drop_down_args ); | |
| 502 | + $html .= Sensei_Utils::generate_drop_down($selected_lesson_course, $courses_options, $drop_down_args); | |
| 503 | 503 | |
| 504 | 504 | // Course Actions Panel | 
| 505 | -		if ( current_user_can( 'publish_courses' )) { | |
| 505 | +		if (current_user_can('publish_courses')) { | |
| 506 | 506 | $html .= '<div id="lesson-course-actions">'; | 
| 507 | 507 | $html .= '<p>'; | 
| 508 | 508 | // Add a course action link | 
| 509 | -						$html .= '<a id="lesson-course-add" href="#course-add" class="lesson-add-course">+ ' . __('Add New Course', 'woothemes-sensei' ) . '</a>'; | |
| 509 | +						$html .= '<a id="lesson-course-add" href="#course-add" class="lesson-add-course">+ '.__('Add New Course', 'woothemes-sensei').'</a>'; | |
| 510 | 510 | $html .= '</p>'; | 
| 511 | 511 | $html .= '</div>'; | 
| 512 | 512 | // Add a course input fields | 
| 513 | 513 | $html .= '<div id="lesson-course-details" class="hidden">'; | 
| 514 | 514 | $html .= '<p>'; | 
| 515 | 515 | // Course Title input | 
| 516 | - $html .= '<label>' . __( 'Course Title' , 'woothemes-sensei' ) . '</label> '; | |
| 516 | +						$html .= '<label>'.__('Course Title', 'woothemes-sensei').'</label> '; | |
| 517 | 517 | $html .= '<input type="text" id="course-title" name="course_title" value="" size="25" class="widefat" />'; | 
| 518 | 518 | // Course Description input | 
| 519 | - $html .= '<label>' . __( 'Description' , 'woothemes-sensei' ) . '</label> '; | |
| 519 | +	  					$html .= '<label>'.__('Description', 'woothemes-sensei').'</label> '; | |
| 520 | 520 | $html .= '<textarea rows="10" cols="40" id="course-content" name="course_content" value="" size="300" class="widefat"></textarea>'; | 
| 521 | 521 | // Course Prerequisite | 
| 522 | - $html .= '<label>' . __( 'Course Prerequisite' , 'woothemes-sensei' ) . '</label> '; | |
| 523 | - $html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">' . "\n"; | |
| 524 | - $html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 525 | -							foreach ($posts_array as $post_item){ | |
| 526 | - $html .= '<option value="' . esc_attr( absint( $post_item->ID ) ) . '">' . esc_html( $post_item->post_title ) . '</option>' . "\n"; | |
| 522 | +	  					$html .= '<label>'.__('Course Prerequisite', 'woothemes-sensei').'</label> '; | |
| 523 | + $html .= '<select id="course-prerequisite-options" name="course_prerequisite" class="chosen_select widefat">'."\n"; | |
| 524 | +							$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; | |
| 525 | +							foreach ($posts_array as $post_item) { | |
| 526 | + $html .= '<option value="'.esc_attr(absint($post_item->ID)).'">'.esc_html($post_item->post_title).'</option>'."\n"; | |
| 527 | 527 | } // End For Loop | 
| 528 | - $html .= '</select>' . "\n"; | |
| 528 | + $html .= '</select>'."\n"; | |
| 529 | 529 | // Course Product | 
| 530 | -                        if ( Sensei_WC::is_woocommerce_active() ) { | |
| 530 | +                        if (Sensei_WC::is_woocommerce_active()) { | |
| 531 | 531 | // Get the Products | 
| 532 | - $select_course_woocommerce_product = get_post_meta( $post_item->ID, '_course_woocommerce_product', true ); | |
| 532 | + $select_course_woocommerce_product = get_post_meta($post_item->ID, '_course_woocommerce_product', true); | |
| 533 | 533 | |
| 534 | - $product_args = array( 'post_type' => array( 'product', 'product_variation' ), | |
| 534 | +							$product_args = array('post_type' 		=> array('product', 'product_variation'), | |
| 535 | 535 | 'posts_per_page' => -1, | 
| 536 | 536 | 'orderby' => 'title', | 
| 537 | 537 | 'order' => 'DESC', | 
| 538 | - 'post_status' => array( 'publish', 'private', 'draft' ), | |
| 538 | +	    											'post_status'		=> array('publish', 'private', 'draft'), | |
| 539 | 539 | 'tax_query' => array( | 
| 540 | 540 | array( | 
| 541 | 541 | 'taxonomy' => 'product_type', | 
| 542 | 542 | 'field' => 'slug', | 
| 543 | - 'terms' => array( 'variable', 'grouped' ), | |
| 543 | +															'terms'		=> array('variable', 'grouped'), | |
| 544 | 544 | 'operator' => 'NOT IN' | 
| 545 | 545 | ) | 
| 546 | 546 | ), | 
| 547 | 547 | 'suppress_filters' => 0 | 
| 548 | 548 | ); | 
| 549 | - $products_array = get_posts( $product_args ); | |
| 550 | - $html .= '<label>' . __( 'WooCommerce Product' , 'woothemes-sensei' ) . '</label> '; | |
| 551 | - $html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">' . "\n"; | |
| 552 | - $html .= '<option value="-">' . __( 'None', 'woothemes-sensei' ) . '</option>'; | |
| 549 | + $products_array = get_posts($product_args); | |
| 550 | +							$html .= '<label>'.__('WooCommerce Product', 'woothemes-sensei').'</label> '; | |
| 551 | + $html .= '<select id="course-woocommerce-product-options" name="course_woocommerce_product" class="chosen_select widefat">'."\n"; | |
| 552 | +								$html .= '<option value="-">'.__('None', 'woothemes-sensei').'</option>'; | |
| 553 | 553 | $prev_parent_id = 0; | 
| 554 | -								foreach ($products_array as $products_item){ | |
| 554 | +								foreach ($products_array as $products_item) { | |
| 555 | 555 | |
| 556 | -									if ( 'product_variation' == $products_item->post_type ) { | |
| 557 | - $product_object = get_product( $products_item->ID ); | |
| 558 | - $parent_id = wp_get_post_parent_id( $products_item->ID ); | |
| 559 | - $product_name = ucwords( woocommerce_get_formatted_variation( $product_object->variation_data, true ) ); | |
| 556 | +									if ('product_variation' == $products_item->post_type) { | |
| 557 | + $product_object = get_product($products_item->ID); | |
| 558 | + $parent_id = wp_get_post_parent_id($products_item->ID); | |
| 559 | + $product_name = ucwords(woocommerce_get_formatted_variation($product_object->variation_data, true)); | |
| 560 | 560 |  									} else { | 
| 561 | 561 | $parent_id = false; | 
| 562 | 562 | $prev_parent_id = 0; | 
| @@ -564,32 +564,32 @@ discard block | ||
| 564 | 564 | } | 
| 565 | 565 | |
| 566 | 566 | // Show variations in groups | 
| 567 | -									if( $parent_id && $parent_id != $prev_parent_id ) { | |
| 568 | -										if( 0 != $prev_parent_id ) { | |
| 567 | +									if ($parent_id && $parent_id != $prev_parent_id) { | |
| 568 | +										if (0 != $prev_parent_id) { | |
| 569 | 569 | $html .= '</optgroup>'; | 
| 570 | 570 | } | 
| 571 | - $html .= '<optgroup label="' . get_the_title( $parent_id ) . '">'; | |
| 571 | + $html .= '<optgroup label="'.get_the_title($parent_id).'">'; | |
| 572 | 572 | $prev_parent_id = $parent_id; | 
| 573 | -									} elseif( ! $parent_id && 0 == $prev_parent_id ) { | |
| 573 | +									} elseif ( ! $parent_id && 0 == $prev_parent_id) { | |
| 574 | 574 | $html .= '</optgroup>'; | 
| 575 | 575 | } | 
| 576 | 576 | |
| 577 | - $html .= '<option value="' . esc_attr( absint( $products_item->ID ) ) . '">' . esc_html( $products_item->post_title ) . '</option>' . "\n"; | |
| 577 | + $html .= '<option value="'.esc_attr(absint($products_item->ID)).'">'.esc_html($products_item->post_title).'</option>'."\n"; | |
| 578 | 578 | } // End For Loop | 
| 579 | - $html .= '</select>' . "\n"; | |
| 579 | + $html .= '</select>'."\n"; | |
| 580 | 580 |  						} else { | 
| 581 | 581 | // Default | 
| 582 | 582 | $html .= '<input type="hidden" name="course_woocommerce_product" id="course-woocommerce-product-options" value="-" />'; | 
| 583 | 583 | } | 
| 584 | 584 | // Course Category | 
| 585 | - $html .= '<label>' . __( 'Course Category' , 'woothemes-sensei' ) . '</label> '; | |
| 586 | - $cat_args = array( 'echo' => false, 'hierarchical' => true, 'show_option_none' => __( 'None', 'woothemes-sensei' ), 'taxonomy' => 'course-category', 'orderby' => 'name', 'id' => 'course-category-options', 'name' => 'course_category', 'class' => 'widefat' ); | |
| 587 | -						$html .= wp_dropdown_categories(apply_filters('widget_course_categories_dropdown_args', $cat_args)) . "\n"; | |
| 585 | +	  					$html .= '<label>'.__('Course Category', 'woothemes-sensei').'</label> '; | |
| 586 | +	  					$cat_args = array('echo' => false, 'hierarchical' => true, 'show_option_none' => __('None', 'woothemes-sensei'), 'taxonomy' => 'course-category', 'orderby' => 'name', 'id' => 'course-category-options', 'name' => 'course_category', 'class' => 'widefat'); | |
| 587 | +						$html .= wp_dropdown_categories(apply_filters('widget_course_categories_dropdown_args', $cat_args))."\n"; | |
| 588 | 588 | // Save the course action button | 
| 589 | - $html .= '<a title="' . esc_attr( __( 'Save Course', 'woothemes-sensei' ) ) . '" href="#add-course-metadata" class="lesson_course_save button button-highlighted">' . esc_html( __( 'Add Course', 'woothemes-sensei' ) ) . '</a>'; | |
| 589 | +	  					$html .= '<a title="'.esc_attr(__('Save Course', 'woothemes-sensei')).'" href="#add-course-metadata" class="lesson_course_save button button-highlighted">'.esc_html(__('Add Course', 'woothemes-sensei')).'</a>'; | |
| 590 | 590 | $html .= '   '; | 
| 591 | 591 | // Cancel action link | 
| 592 | - $html .= '<a href="#course-add-cancel" class="lesson_course_cancel">' . __( 'Cancel', 'woothemes-sensei' ) . '</a>'; | |
| 592 | +						$html .= '<a href="#course-add-cancel" class="lesson_course_cancel">'.__('Cancel', 'woothemes-sensei').'</a>'; | |
| 593 | 593 | $html .= '</p>'; | 
| 594 | 594 | $html .= '</div>'; | 
| 595 | 595 | } // End If Statement | 
| @@ -598,20 +598,20 @@ discard block | ||
| 598 | 598 | echo $html; | 
| 599 | 599 | } // End lesson_course_meta_box_content() | 
| 600 | 600 | |
| 601 | -	public function quiz_panel( $quiz_id = 0 ) { | |
| 601 | +	public function quiz_panel($quiz_id = 0) { | |
| 602 | 602 | |
| 603 | - $html = wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce', true, false ); | |
| 603 | +		$html = wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce', true, false); | |
| 604 | 604 | $html .= '<div id="add-quiz-main">'; | 
| 605 | -			if ( 0 == $quiz_id ) { | |
| 605 | +			if (0 == $quiz_id) { | |
| 606 | 606 | $html .= '<p>'; | 
| 607 | 607 | // Default message and Add a Quiz button | 
| 608 | - $html .= esc_html( __( 'Once you have saved your lesson you will be able to add questions.', 'woothemes-sensei' ) ); | |
| 608 | +					$html .= esc_html(__('Once you have saved your lesson you will be able to add questions.', 'woothemes-sensei')); | |
| 609 | 609 | $html .= '</p>'; | 
| 610 | 610 | } | 
| 611 | 611 | |
| 612 | 612 | // Quiz Panel CSS Class | 
| 613 | 613 | $quiz_class = ''; | 
| 614 | -			if ( 0 == $quiz_id ) { | |
| 614 | +			if (0 == $quiz_id) { | |
| 615 | 615 | $quiz_class = ' class="hidden"'; | 
| 616 | 616 | } // End If Statement | 
| 617 | 617 | // Build the HTML to Output | 
| @@ -619,15 +619,15 @@ discard block | ||
| 619 | 619 | |
| 620 | 620 | // Setup Questions Query | 
| 621 | 621 | $questions = array(); | 
| 622 | -			if ( 0 < $quiz_id ) { | |
| 623 | - $questions = $this->lesson_quiz_questions( $quiz_id ); | |
| 622 | +			if (0 < $quiz_id) { | |
| 623 | + $questions = $this->lesson_quiz_questions($quiz_id); | |
| 624 | 624 | } // End If Statement | 
| 625 | 625 | |
| 626 | 626 | $question_count = 0; | 
| 627 | -			foreach( $questions as $question ) { | |
| 627 | +			foreach ($questions as $question) { | |
| 628 | 628 | |
| 629 | -				if( $question->post_type == 'multiple_question' ) { | |
| 630 | - $question_number = get_post_meta( $question->ID, 'number', true ); | |
| 629 | +				if ($question->post_type == 'multiple_question') { | |
| 630 | + $question_number = get_post_meta($question->ID, 'number', true); | |
| 631 | 631 | $question_count += $question_number; | 
| 632 | 632 |  				} else { | 
| 633 | 633 | ++$question_count; | 
| @@ -636,68 +636,68 @@ discard block | ||
| 636 | 636 | } | 
| 637 | 637 | |
| 638 | 638 | // Inner DIV | 
| 639 | - $html .= '<div id="add-quiz-metadata"' . $quiz_class . '>'; | |
| 639 | + $html .= '<div id="add-quiz-metadata"'.$quiz_class.'>'; | |
| 640 | 640 | |
| 641 | 641 | // Quiz ID | 
| 642 | - $html .= '<input type="hidden" name="quiz_id" id="quiz_id" value="' . esc_attr( $quiz_id ) . '" />'; | |
| 642 | + $html .= '<input type="hidden" name="quiz_id" id="quiz_id" value="'.esc_attr($quiz_id).'" />'; | |
| 643 | 643 | |
| 644 | 644 | // Default Message | 
| 645 | -				if ( 0 == $quiz_id ) { | |
| 645 | +				if (0 == $quiz_id) { | |
| 646 | 646 | $html .= '<p class="save-note">'; | 
| 647 | - $html .= esc_html( __( 'Please save your lesson in order to add questions to your quiz.', 'woothemes-sensei' ) ); | |
| 647 | +						$html .= esc_html(__('Please save your lesson in order to add questions to your quiz.', 'woothemes-sensei')); | |
| 648 | 648 | $html .= '</p>'; | 
| 649 | 649 | } // End If Statement | 
| 650 | 650 | |
| 651 | 651 | $html .= '</div>'; | 
| 652 | 652 | |
| 653 | 653 | // Question Container DIV | 
| 654 | - $html .= '<div id="add-question-main"' . $quiz_class . '>'; | |
| 654 | + $html .= '<div id="add-question-main"'.$quiz_class.'>'; | |
| 655 | 655 | // Inner DIV | 
| 656 | 656 | $html .= '<div id="add-question-metadata">'; | 
| 657 | 657 | |
| 658 | 658 | // Count of questions | 
| 659 | - $html .= '<input type="hidden" name="question_counter" id="question_counter" value="' . esc_attr( $question_count ) . '" />'; | |
| 659 | + $html .= '<input type="hidden" name="question_counter" id="question_counter" value="'.esc_attr($question_count).'" />'; | |
| 660 | 660 | // Table headers | 
| 661 | 661 | $html .= '<table class="widefat" id="sortable-questions"> | 
| 662 | 662 | <thead> | 
| 663 | 663 | <tr> | 
| 664 | 664 | <th class="question-count-column">#</th> | 
| 665 | - <th>' . __( 'Question', 'woothemes-sensei' ) . '</th> | |
| 666 | - <th style="width:45px;">' . __( 'Grade', 'woothemes-sensei' ) . '</th> | |
| 667 | - <th style="width:125px;">' . __( 'Type', 'woothemes-sensei' ) . '</th> | |
| 668 | - <th style="width:125px;">' . __( 'Action', 'woothemes-sensei' ) . '</th> | |
| 665 | +								        <th>' . __('Question', 'woothemes-sensei').'</th> | |
| 666 | +								        <th style="width:45px;">' . __('Grade', 'woothemes-sensei').'</th> | |
| 667 | +								        <th style="width:125px;">' . __('Type', 'woothemes-sensei').'</th> | |
| 668 | +								        <th style="width:125px;">' . __('Action', 'woothemes-sensei').'</th> | |
| 669 | 669 | </tr> | 
| 670 | 670 | </thead> | 
| 671 | 671 | <tfoot> | 
| 672 | 672 | <tr> | 
| 673 | 673 | <th class="question-count-column">#</th> | 
| 674 | - <th>' . __( 'Question', 'woothemes-sensei' ) . '</th> | |
| 675 | - <th>' . __( 'Grade', 'woothemes-sensei' ) . '</th> | |
| 676 | - <th>' . __( 'Type', 'woothemes-sensei' ) . '</th> | |
| 677 | - <th>' . __( 'Action', 'woothemes-sensei' ) . '</th> | |
| 674 | +									    <th>' . __('Question', 'woothemes-sensei').'</th> | |
| 675 | +									    <th>' . __('Grade', 'woothemes-sensei').'</th> | |
| 676 | +									    <th>' . __('Type', 'woothemes-sensei').'</th> | |
| 677 | +									    <th>' . __('Action', 'woothemes-sensei').'</th> | |
| 678 | 678 | </tr> | 
| 679 | 679 | </tfoot>'; | 
| 680 | 680 | |
| 681 | 681 | $message_class = ''; | 
| 682 | -					if ( 0 < $question_count ) { $message_class = 'hidden'; } | |
| 682 | +					if (0 < $question_count) { $message_class = 'hidden'; } | |
| 683 | 683 | |
| 684 | - $html .= '<tbody id="no-questions-message" class="' . esc_attr( $message_class ) . '">'; | |
| 684 | + $html .= '<tbody id="no-questions-message" class="'.esc_attr($message_class).'">'; | |
| 685 | 685 | $html .= '<tr>'; | 
| 686 | - $html .= '<td colspan="5">' . __( 'There are no Questions for this Quiz yet. Please add some below.', 'woothemes-sensei' ) . '</td>'; | |
| 686 | +							$html .= '<td colspan="5">'.__('There are no Questions for this Quiz yet. Please add some below.', 'woothemes-sensei').'</td>'; | |
| 687 | 687 | $html .= '</tr>'; | 
| 688 | 688 | $html .= '</tbody>'; | 
| 689 | 689 | |
| 690 | -					if( 0 < $question_count ) { | |
| 691 | - $html .= $this->quiz_panel_questions( $questions ); | |
| 690 | +					if (0 < $question_count) { | |
| 691 | + $html .= $this->quiz_panel_questions($questions); | |
| 692 | 692 | } | 
| 693 | 693 | |
| 694 | 694 | $html .= '</table>'; | 
| 695 | 695 | |
| 696 | -					if( ! isset( $this->question_order ) ) { | |
| 696 | +					if ( ! isset($this->question_order)) { | |
| 697 | 697 | $this->question_order = ''; | 
| 698 | 698 | } | 
| 699 | 699 | |
| 700 | - $html .= '<input type="hidden" id="question-order" name="question-order" value="' . $this->question_order . '" />'; | |
| 700 | + $html .= '<input type="hidden" id="question-order" name="question-order" value="'.$this->question_order.'" />'; | |
| 701 | 701 | |
| 702 | 702 | $html .= '</div>'; | 
| 703 | 703 | |
| @@ -716,47 +716,47 @@ discard block | ||
| 716 | 716 | |
| 717 | 717 | } | 
| 718 | 718 | |
| 719 | -	public function quiz_panel_questions( $questions = array() ) { | |
| 719 | +	public function quiz_panel_questions($questions = array()) { | |
| 720 | 720 | global $quiz_questions; | 
| 721 | 721 | |
| 722 | 722 | $quiz_questions = $questions; | 
| 723 | 723 | |
| 724 | 724 | $html = ''; | 
| 725 | 725 | |
| 726 | -		if( count( $questions ) > 0 ) { | |
| 726 | +		if (count($questions) > 0) { | |
| 727 | 727 | |
| 728 | 728 | $question_class = ''; | 
| 729 | 729 | $question_counter = 1; | 
| 730 | 730 | |
| 731 | -			foreach ( $questions as $question ) { | |
| 731 | +			foreach ($questions as $question) { | |
| 732 | 732 | |
| 733 | 733 | $question_id = $question->ID; | 
| 734 | 734 | |
| 735 | - $question_type = Sensei()->question->get_question_type( $question_id ); | |
| 735 | + $question_type = Sensei()->question->get_question_type($question_id); | |
| 736 | 736 | |
| 737 | 737 | $multiple_data = array(); | 
| 738 | 738 | $question_increment = 1; | 
| 739 | -				if( 'multiple_question' == $question->post_type ) { | |
| 739 | +				if ('multiple_question' == $question->post_type) { | |
| 740 | 740 | $question_type = 'category'; | 
| 741 | 741 | |
| 742 | - $question_category = get_post_meta( $question->ID, 'category', true ); | |
| 743 | - $question_cat = get_term( $question_category, 'question-category' ); | |
| 742 | + $question_category = get_post_meta($question->ID, 'category', true); | |
| 743 | + $question_cat = get_term($question_category, 'question-category'); | |
| 744 | 744 | |
| 745 | - $question_number = get_post_meta( $question->ID, 'number', true ); | |
| 745 | + $question_number = get_post_meta($question->ID, 'number', true); | |
| 746 | 746 | $question_increment = $question_number; | 
| 747 | 747 | |
| 748 | - $multiple_data = array( $question_cat->name, $question_number ); | |
| 748 | + $multiple_data = array($question_cat->name, $question_number); | |
| 749 | 749 | } | 
| 750 | 750 | |
| 751 | -				if( ! $question_type ) { | |
| 751 | +				if ( ! $question_type) { | |
| 752 | 752 | $question_type = 'multiple-choice'; | 
| 753 | 753 | } | 
| 754 | 754 | |
| 755 | 755 | // Row with question and actions | 
| 756 | - $html .= $this->quiz_panel_question( $question_type, $question_counter, $question_id, 'quiz', $multiple_data ); | |
| 756 | + $html .= $this->quiz_panel_question($question_type, $question_counter, $question_id, 'quiz', $multiple_data); | |
| 757 | 757 | $question_counter += $question_increment; | 
| 758 | 758 | |
| 759 | -				if( isset( $this->question_order ) && strlen( $this->question_order ) > 0 ) { $this->question_order .= ','; } | |
| 759 | +				if (isset($this->question_order) && strlen($this->question_order) > 0) { $this->question_order .= ','; } | |
| 760 | 760 | $this->question_order .= $question_id; | 
| 761 | 761 | } // End For Loop | 
| 762 | 762 | } | 
| @@ -765,161 +765,161 @@ discard block | ||
| 765 | 765 | |
| 766 | 766 | } | 
| 767 | 767 | |
| 768 | -	public function quiz_panel_question( $question_type = '', $question_counter = 0, $question_id = 0, $context = 'quiz', $multiple_data = array() ) { | |
| 769 | - global $row_counter, $quiz_questions; | |
| 768 | +	public function quiz_panel_question($question_type = '', $question_counter = 0, $question_id = 0, $context = 'quiz', $multiple_data = array()) { | |
| 769 | + global $row_counter, $quiz_questions; | |
| 770 | 770 | |
| 771 | 771 | $html = ''; | 
| 772 | 772 | |
| 773 | 773 | $question_class = ''; | 
| 774 | -		if( 'quiz' == $context ) { | |
| 775 | -			if( ! $row_counter || ! isset( $row_counter ) ) { | |
| 774 | +		if ('quiz' == $context) { | |
| 775 | +			if ( ! $row_counter || ! isset($row_counter)) { | |
| 776 | 776 | $row_counter = 1; | 
| 777 | 777 | } | 
| 778 | -			if( $row_counter % 2 ) { $question_class = 'alternate'; } | |
| 778 | +			if ($row_counter % 2) { $question_class = 'alternate'; } | |
| 779 | 779 | ++$row_counter; | 
| 780 | 780 | } | 
| 781 | 781 | |
| 782 | -		if( $question_id ) { | |
| 782 | +		if ($question_id) { | |
| 783 | 783 | |
| 784 | -			if( $question_type != 'category' ) { | |
| 784 | +			if ($question_type != 'category') { | |
| 785 | 785 | |
| 786 | - $question_grade = Sensei()->question->get_question_grade( $question_id ); | |
| 786 | + $question_grade = Sensei()->question->get_question_grade($question_id); | |
| 787 | 787 | |
| 788 | - $question_media = get_post_meta( $question_id, '_question_media', true ); | |
| 788 | + $question_media = get_post_meta($question_id, '_question_media', true); | |
| 789 | 789 | $question_media_type = $question_media_thumb = $question_media_link = $question_media_title = ''; | 
| 790 | 790 | $question_media_thumb_class = $question_media_link_class = $question_media_delete_class = 'hidden'; | 
| 791 | - $question_media_add_button = __( 'Add file', 'woothemes-sensei' ); | |
| 792 | -				if( 0 < intval( $question_media ) ) { | |
| 793 | - $mimetype = get_post_mime_type( $question_media ); | |
| 794 | -					if( $mimetype ) { | |
| 795 | - $mimetype_array = explode( '/', $mimetype); | |
| 796 | -						if( isset( $mimetype_array[0] ) && $mimetype_array[0] ) { | |
| 791 | +				$question_media_add_button = __('Add file', 'woothemes-sensei'); | |
| 792 | +				if (0 < intval($question_media)) { | |
| 793 | + $mimetype = get_post_mime_type($question_media); | |
| 794 | +					if ($mimetype) { | |
| 795 | +						$mimetype_array = explode('/', $mimetype); | |
| 796 | +						if (isset($mimetype_array[0]) && $mimetype_array[0]) { | |
| 797 | 797 | $question_media_delete_class = ''; | 
| 798 | 798 | $question_media_type = $mimetype_array[0]; | 
| 799 | -							if( 'image' == $question_media_type ) { | |
| 800 | - $question_media_thumb = wp_get_attachment_thumb_url( $question_media ); | |
| 801 | -								if( $question_media_thumb ) { | |
| 799 | +							if ('image' == $question_media_type) { | |
| 800 | + $question_media_thumb = wp_get_attachment_thumb_url($question_media); | |
| 801 | +								if ($question_media_thumb) { | |
| 802 | 802 | $question_media_thumb_class = ''; | 
| 803 | 803 | } | 
| 804 | 804 | } | 
| 805 | - $question_media_url = wp_get_attachment_url( $question_media ); | |
| 806 | -							if( $question_media_url ) { | |
| 807 | - $attachment = get_post( $question_media ); | |
| 805 | + $question_media_url = wp_get_attachment_url($question_media); | |
| 806 | +							if ($question_media_url) { | |
| 807 | + $attachment = get_post($question_media); | |
| 808 | 808 | $question_media_title = $attachment->post_title; | 
| 809 | 809 | |
| 810 | -								if( ! $question_media_title ) { | |
| 811 | - $question_media_filename = basename( $question_media_url ); | |
| 810 | +								if ( ! $question_media_title) { | |
| 811 | + $question_media_filename = basename($question_media_url); | |
| 812 | 812 | $question_media_title = $question_media_filename; | 
| 813 | 813 | } | 
| 814 | - $question_media_link = '<a class="' . $question_media_type . '" href="' . esc_url( $question_media_url ) . '" target="_blank">' . $question_media_title . '</a>'; | |
| 814 | + $question_media_link = '<a class="'.$question_media_type.'" href="'.esc_url($question_media_url).'" target="_blank">'.$question_media_title.'</a>'; | |
| 815 | 815 | $question_media_link_class = ''; | 
| 816 | 816 | } | 
| 817 | 817 | |
| 818 | - $question_media_add_button = __( 'Change file', 'woothemes-sensei' ); | |
| 818 | +							$question_media_add_button = __('Change file', 'woothemes-sensei'); | |
| 819 | 819 | } | 
| 820 | 820 | } | 
| 821 | 821 | } | 
| 822 | 822 | |
| 823 | - $random_order = get_post_meta( $question_id, '_random_order', true ); | |
| 824 | -				if( ! $random_order ) { | |
| 823 | + $random_order = get_post_meta($question_id, '_random_order', true); | |
| 824 | +				if ( ! $random_order) { | |
| 825 | 825 | $random_order = 'yes'; | 
| 826 | 826 | } | 
| 827 | 827 | |
| 828 | -				if( ! $question_type ) { $question_type = 'multiple-choice'; } | |
| 828 | +				if ( ! $question_type) { $question_type = 'multiple-choice'; } | |
| 829 | 829 | } | 
| 830 | 830 | |
| 831 | - $html .= '<tbody class="' . $question_class . '">'; | |
| 831 | + $html .= '<tbody class="'.$question_class.'">'; | |
| 832 | 832 | |
| 833 | -				if( 'quiz' == $context ) { | |
| 833 | +				if ('quiz' == $context) { | |
| 834 | 834 | $html .= '<tr>'; | 
| 835 | -						if( $question_type != 'category' ) { | |
| 836 | - $question = get_post( $question_id ); | |
| 837 | - $html .= '<td class="table-count question-number question-count-column"><span class="number">' . $question_counter . '</span></td>'; | |
| 838 | - $html .= '<td>' . esc_html( $question->post_title ) . '</td>'; | |
| 839 | - $html .= '<td class="question-grade-column">' . esc_html( $question_grade ) . '</td>'; | |
| 840 | - $question_types_filtered = ucwords( str_replace( array( '-', 'boolean' ), array( ' ', __( 'True/False', 'woothemes-sensei' ) ), $question_type ) ); | |
| 841 | - $html .= '<td>' . esc_html( $question_types_filtered ) . '</td>'; | |
| 842 | - $html .= '<td><a title="' . esc_attr( __( 'Edit Question', 'woothemes-sensei' ) ) . '" href="#question_' . $question_counter .'" class="question_table_edit">' . esc_html( __( 'Edit', 'woothemes-sensei' ) ) . '</a> <a title="' . esc_attr( __( 'Remove Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_delete">' . esc_html( __( 'Remove', 'woothemes-sensei' ) ) . '</a></td>'; | |
| 835 | +						if ($question_type != 'category') { | |
| 836 | + $question = get_post($question_id); | |
| 837 | + $html .= '<td class="table-count question-number question-count-column"><span class="number">'.$question_counter.'</span></td>'; | |
| 838 | + $html .= '<td>'.esc_html($question->post_title).'</td>'; | |
| 839 | + $html .= '<td class="question-grade-column">'.esc_html($question_grade).'</td>'; | |
| 840 | +							$question_types_filtered = ucwords(str_replace(array('-', 'boolean'), array(' ', __('True/False', 'woothemes-sensei')), $question_type)); | |
| 841 | + $html .= '<td>'.esc_html($question_types_filtered).'</td>'; | |
| 842 | +							$html .= '<td><a title="'.esc_attr(__('Edit Question', 'woothemes-sensei')).'" href="#question_'.$question_counter.'" class="question_table_edit">'.esc_html(__('Edit', 'woothemes-sensei')).'</a> <a title="'.esc_attr(__('Remove Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_table_delete">'.esc_html(__('Remove', 'woothemes-sensei')).'</a></td>'; | |
| 843 | 843 | |
| 844 | 844 |  						} else { | 
| 845 | 845 | |
| 846 | - $end_number = intval( $question_counter ) + intval( $multiple_data[1] ) - 1; | |
| 847 | -							if( $question_counter == $end_number ) { | |
| 846 | + $end_number = intval($question_counter) + intval($multiple_data[1]) - 1; | |
| 847 | +							if ($question_counter == $end_number) { | |
| 848 | 848 | $row_numbers = $question_counter; | 
| 849 | 849 |  							} else { | 
| 850 | - $row_numbers = $question_counter . ' - ' . $end_number; | |
| 850 | + $row_numbers = $question_counter.' - '.$end_number; | |
| 851 | 851 | } | 
| 852 | - $row_title = sprintf( __( 'Selected from \'%1$s\' ', 'woothemes-sensei' ), $multiple_data[0] ); | |
| 852 | +							$row_title = sprintf(__('Selected from \'%1$s\' ', 'woothemes-sensei'), $multiple_data[0]); | |
| 853 | 853 | |
| 854 | - $html .= '<td class="table-count question-number question-count-column"><span class="number hidden">' . $question_counter . '</span><span class="hidden total-number">' . $multiple_data[1] . '</span><span class="row-numbers">' . esc_html( $row_numbers ) . '</span></td>'; | |
| 855 | - $html .= '<td>' . esc_html( $row_title ) . '</td>'; | |
| 854 | + $html .= '<td class="table-count question-number question-count-column"><span class="number hidden">'.$question_counter.'</span><span class="hidden total-number">'.$multiple_data[1].'</span><span class="row-numbers">'.esc_html($row_numbers).'</span></td>'; | |
| 855 | + $html .= '<td>'.esc_html($row_title).'</td>'; | |
| 856 | 856 | $html .= '<td class="question-grade-column"></td>'; | 
| 857 | - $html .= '<td><input type="hidden" name="question_id" class="row_question_id" id="question_' . $question_counter . '_id" value="' . $question_id . '" /></td>'; | |
| 858 | - $html .= '<td><a title="' . esc_attr( __( 'Edit Question', 'woothemes-sensei' ) ) . '" href="#question_' . $question_counter .'" class="question_table_edit" style="visibility:hidden;">' . esc_html( __( 'Edit', 'woothemes-sensei' ) ) . '</a> <a title="' . esc_attr( __( 'Remove Question(s)', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_multiple_delete" rel="' . $question_id . '">' . esc_html( __( 'Remove', 'woothemes-sensei' ) ) . '</a></td>'; | |
| 857 | + $html .= '<td><input type="hidden" name="question_id" class="row_question_id" id="question_'.$question_counter.'_id" value="'.$question_id.'" /></td>'; | |
| 858 | +							$html .= '<td><a title="'.esc_attr(__('Edit Question', 'woothemes-sensei')).'" href="#question_'.$question_counter.'" class="question_table_edit" style="visibility:hidden;">'.esc_html(__('Edit', 'woothemes-sensei')).'</a> <a title="'.esc_attr(__('Remove Question(s)', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_multiple_delete" rel="'.$question_id.'">'.esc_html(__('Remove', 'woothemes-sensei')).'</a></td>'; | |
| 859 | 859 | |
| 860 | 860 | } | 
| 861 | 861 | $html .= '</tr>'; | 
| 862 | 862 | } | 
| 863 | 863 | |
| 864 | -				if( $question_type != 'category' ) { | |
| 864 | +				if ($question_type != 'category') { | |
| 865 | 865 | |
| 866 | 866 | $edit_class = ''; | 
| 867 | -					if( 'quiz' == $context ) { | |
| 867 | +					if ('quiz' == $context) { | |
| 868 | 868 | $edit_class = 'hidden'; | 
| 869 | 869 | } | 
| 870 | 870 | |
| 871 | - $question = get_post( $question_id ); | |
| 872 | - $html .= '<tr class="question-quick-edit ' . esc_attr( $edit_class ) . '">'; | |
| 871 | + $question = get_post($question_id); | |
| 872 | + $html .= '<tr class="question-quick-edit '.esc_attr($edit_class).'">'; | |
| 873 | 873 | $html .= '<td colspan="5">'; | 
| 874 | - $html .= '<span class="hidden question_original_counter">' . $question_counter . '</span>'; | |
| 874 | + $html .= '<span class="hidden question_original_counter">'.$question_counter.'</span>'; | |
| 875 | 875 | $html .= '<div class="question_required_fields">'; | 
| 876 | 876 | |
| 877 | 877 | // Question title | 
| 878 | 878 | $html .= '<div>'; | 
| 879 | - $html .= '<label for="question_' . $question_counter . '">' . __( 'Question:', 'woothemes-sensei' ) . '</label> '; | |
| 880 | - $html .= '<input type="text" id="question_' . $question_counter . '" name="question" value="' . esc_attr( htmlspecialchars( $question->post_title ) ) . '" size="25" class="widefat" />'; | |
| 879 | +							    	$html .= '<label for="question_'.$question_counter.'">'.__('Question:', 'woothemes-sensei').'</label> '; | |
| 880 | + $html .= '<input type="text" id="question_'.$question_counter.'" name="question" value="'.esc_attr(htmlspecialchars($question->post_title)).'" size="25" class="widefat" />'; | |
| 881 | 881 | $html .= '</div>'; | 
| 882 | 882 | |
| 883 | 883 | // Question description | 
| 884 | 884 | $html .= '<div>'; | 
| 885 | - $html .= '<label for="question_' . $question_counter . '_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> '; | |
| 885 | +							    	$html .= '<label for="question_'.$question_counter.'_desc">'.__('Question Description (optional):', 'woothemes-sensei').'</label> '; | |
| 886 | 886 | $html .= '</div>'; | 
| 887 | - $html .= '<textarea id="question_' . $question_counter . '_desc" name="question_description" class="widefat" rows="4">' . esc_textarea( $question->post_content ) . '</textarea>'; | |
| 887 | + $html .= '<textarea id="question_'.$question_counter.'_desc" name="question_description" class="widefat" rows="4">'.esc_textarea($question->post_content).'</textarea>'; | |
| 888 | 888 | |
| 889 | 889 | // Question grade | 
| 890 | 890 | $html .= '<div>'; | 
| 891 | - $html .= '<label for="question_' . $question_counter . '_grade">' . __( 'Question grade:', 'woothemes-sensei' ) . '</label> '; | |
| 892 | - $html .= '<input type="number" id="question_' . $question_counter . '_grade" class="question_grade small-text" name="question_grade" min="0" value="' . $question_grade . '" />'; | |
| 891 | +							    	$html .= '<label for="question_'.$question_counter.'_grade">'.__('Question grade:', 'woothemes-sensei').'</label> '; | |
| 892 | + $html .= '<input type="number" id="question_'.$question_counter.'_grade" class="question_grade small-text" name="question_grade" min="0" value="'.$question_grade.'" />'; | |
| 893 | 893 | $html .= '</div>'; | 
| 894 | 894 | |
| 895 | 895 | // Random order | 
| 896 | -						    	if( $question_type == 'multiple-choice' ) { | |
| 896 | +						    	if ($question_type == 'multiple-choice') { | |
| 897 | 897 | $html .= '<div>'; | 
| 898 | - $html .= '<label for="' . $question_counter . '_random_order"><input type="checkbox" name="random_order" class="random_order" id="' . $question_counter . '_random_order" value="yes" ' . checked( $random_order, 'yes', false ) . ' /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>'; | |
| 898 | +						    			$html .= '<label for="'.$question_counter.'_random_order"><input type="checkbox" name="random_order" class="random_order" id="'.$question_counter.'_random_order" value="yes" '.checked($random_order, 'yes', false).' /> '.__('Randomise answer order', 'woothemes-sensei').'</label>'; | |
| 899 | 899 | $html .= '</div>'; | 
| 900 | 900 | } | 
| 901 | 901 | |
| 902 | 902 | // Question media | 
| 903 | 903 | $html .= '<div>'; | 
| 904 | - $html .= '<label for="question_' . $question_counter . '_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>'; | |
| 905 | - $html .= '<button id="question_' . $question_counter . '_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . $question_media_add_button . '</button>'; | |
| 906 | - $html .= '<button id="question_' . $question_counter . '_media_button_delete" class="delete_media_file_button button-secondary ' . $question_media_delete_class . '">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>'; | |
| 907 | - $html .= '<span id="question_' . $question_counter . '_media_link" class="question_media_link ' . $question_media_link_class . '">' . $question_media_link . '</span>'; | |
| 908 | - $html .= '<br/><img id="question_' . $question_counter . '_media_preview" class="question_media_preview ' . $question_media_thumb_class . '" src="' . $question_media_thumb . '" /><br/>'; | |
| 909 | - $html .= '<input type="hidden" id="question_' . $question_counter . '_media" class="question_media" name="question_media" value="' . $question_media . '" />'; | |
| 904 | +							    	$html .= '<label for="question_'.$question_counter.'_media_button">'.__('Question media:', 'woothemes-sensei').'</label><br/>'; | |
| 905 | +							    	$html .= '<button id="question_'.$question_counter.'_media_button" class="upload_media_file_button button-secondary" data-uploader_title="'.__('Add file to question', 'woothemes-sensei').'" data-uploader_button_text="'.__('Add to question', 'woothemes-sensei').'">'.$question_media_add_button.'</button>'; | |
| 906 | +							    	$html .= '<button id="question_'.$question_counter.'_media_button_delete" class="delete_media_file_button button-secondary '.$question_media_delete_class.'">'.__('Delete file', 'woothemes-sensei').'</button><br/>'; | |
| 907 | + $html .= '<span id="question_'.$question_counter.'_media_link" class="question_media_link '.$question_media_link_class.'">'.$question_media_link.'</span>'; | |
| 908 | + $html .= '<br/><img id="question_'.$question_counter.'_media_preview" class="question_media_preview '.$question_media_thumb_class.'" src="'.$question_media_thumb.'" /><br/>'; | |
| 909 | + $html .= '<input type="hidden" id="question_'.$question_counter.'_media" class="question_media" name="question_media" value="'.$question_media.'" />'; | |
| 910 | 910 | $html .= '</div>'; | 
| 911 | 911 | |
| 912 | 912 | $html .= '</div>'; | 
| 913 | 913 | |
| 914 | - $html .= $this->quiz_panel_question_field( $question_type, $question_id, $question_counter ); | |
| 914 | + $html .= $this->quiz_panel_question_field($question_type, $question_id, $question_counter); | |
| 915 | 915 | |
| 916 | - $html .= '<input type="hidden" id="question_' . $question_counter . '_question_type" class="question_type" name="question_type" value="' . $question_type . '" />'; | |
| 917 | - $html .= '<input type="hidden" name="question_id" class="row_question_id" id="question_' . $question_counter . '_id" value="' . $question_id . '" />'; | |
| 916 | + $html .= '<input type="hidden" id="question_'.$question_counter.'_question_type" class="question_type" name="question_type" value="'.$question_type.'" />'; | |
| 917 | + $html .= '<input type="hidden" name="question_id" class="row_question_id" id="question_'.$question_counter.'_id" value="'.$question_id.'" />'; | |
| 918 | 918 | |
| 919 | -							if( 'quiz' == $context ) { | |
| 919 | +							if ('quiz' == $context) { | |
| 920 | 920 | $html .= '<div class="update-question">'; | 
| 921 | - $html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="' . esc_attr( __( 'Cancel', 'woothemes-sensei' ) ) . '">' . __( 'Cancel', 'woothemes-sensei' ) . '</a> '; | |
| 922 | - $html .= '<a title="' . esc_attr( __( 'Update Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="question_table_save button button-highlighted">' . esc_html( __( 'Update', 'woothemes-sensei' ) ) . '</a>'; | |
| 921 | +						    		$html .= '<a href="#question-edit-cancel" class="lesson_question_cancel" title="'.esc_attr(__('Cancel', 'woothemes-sensei')).'">'.__('Cancel', 'woothemes-sensei').'</a> '; | |
| 922 | +						    		$html .= '<a title="'.esc_attr(__('Update Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="question_table_save button button-highlighted">'.esc_html(__('Update', 'woothemes-sensei')).'</a>'; | |
| 923 | 923 | $html .= '</div>'; | 
| 924 | 924 | } | 
| 925 | 925 | |
| @@ -934,79 +934,79 @@ discard block | ||
| 934 | 934 | return $html; | 
| 935 | 935 | } | 
| 936 | 936 | |
| 937 | -	public function quiz_panel_add( $context = 'quiz' ) { | |
| 937 | +	public function quiz_panel_add($context = 'quiz') { | |
| 938 | 938 | |
| 939 | 939 | |
| 940 | 940 | $html = '<div id="add-new-question">'; | 
| 941 | 941 | |
| 942 | 942 | $question_types = Sensei()->question->question_types(); | 
| 943 | 943 | |
| 944 | - $question_cats = get_terms( 'question-category', array( 'hide_empty' => false ) ); | |
| 944 | +			$question_cats = get_terms('question-category', array('hide_empty' => false)); | |
| 945 | 945 | |
| 946 | -			if( 'quiz' == $context ) { | |
| 946 | +			if ('quiz' == $context) { | |
| 947 | 947 | $html .= '<h2 class="nav-tab-wrapper add-question-tabs">'; | 
| 948 | - $html .= '<a id="tab-new" class="nav-tab nav-tab-active">' . __( 'New Question' , 'woothemes-sensei' ) . '</a>'; | |
| 949 | - $html .= '<a id="tab-existing" class="nav-tab">' . __( 'Existing Questions' , 'woothemes-sensei' ) . '</a>'; | |
| 950 | -                    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats )  && ! Sensei()->teacher->is_admin_teacher() ) { | |
| 951 | - $html .= '<a id="tab-multiple" class="nav-tab">' . __( 'Category Questions' , 'woothemes-sensei' ) . '</a>'; | |
| 948 | +	    			$html .= '<a id="tab-new" class="nav-tab nav-tab-active">'.__('New Question', 'woothemes-sensei').'</a>'; | |
| 949 | +	    			$html .= '<a id="tab-existing" class="nav-tab">'.__('Existing Questions', 'woothemes-sensei').'</a>'; | |
| 950 | +                    if ( ! empty($question_cats) && ! is_wp_error($question_cats) && ! Sensei()->teacher->is_admin_teacher()) { | |
| 951 | +	    				$html .= '<a id="tab-multiple" class="nav-tab">'.__('Category Questions', 'woothemes-sensei').'</a>'; | |
| 952 | 952 | } | 
| 953 | 953 | $html .= '</h2>'; | 
| 954 | 954 | } | 
| 955 | 955 | |
| 956 | 956 | $html .= '<div class="tab-content" id="tab-new-content">'; | 
| 957 | 957 | |
| 958 | -	    		if( 'quiz' == $context ) { | |
| 959 | - $html .= '<p><em>' . sprintf( __( 'Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>'; | |
| 958 | +	    		if ('quiz' == $context) { | |
| 959 | +	    			$html .= '<p><em>'.sprintf(__('Add a new question to this quiz - your question will also be added to the %1$squestion bank%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit.php?post_type=question').'">', '</a>').'</em></p>'; | |
| 960 | 960 | } | 
| 961 | 961 | |
| 962 | 962 | $html .= '<div class="question">'; | 
| 963 | 963 | $html .= '<div class="question_required_fields">'; | 
| 964 | 964 | |
| 965 | 965 | // Question title | 
| 966 | - $html .= '<p><label>' . __( 'Question:' , 'woothemes-sensei' ) . '</label> '; | |
| 966 | +						$html .= '<p><label>'.__('Question:', 'woothemes-sensei').'</label> '; | |
| 967 | 967 | $html .= '<input type="text" id="add_question" name="question" value="" size="25" class="widefat" /></p>'; | 
| 968 | 968 | |
| 969 | 969 | // Question description | 
| 970 | 970 | $html .= '<p>'; | 
| 971 | - $html .= '<label for="question_desc">' . __( 'Question Description (optional):', 'woothemes-sensei' ) . '</label> '; | |
| 971 | +							$html .= '<label for="question_desc">'.__('Question Description (optional):', 'woothemes-sensei').'</label> '; | |
| 972 | 972 | $html .= '</p>'; | 
| 973 | 973 | $html .= '<textarea id="question_desc" name="question_description" class="widefat" rows="4"></textarea>'; | 
| 974 | 974 | |
| 975 | 975 | // Question type | 
| 976 | - $html .= '<p><label>' . __( 'Question Type:' , 'woothemes-sensei' ) . '</label> '; | |
| 977 | - $html .= '<select id="add-question-type-options" name="question_type" class="chosen_select widefat question-type-select">' . "\n"; | |
| 978 | -							foreach ( $question_types as $type => $label ) { | |
| 979 | - $html .= '<option value="' . esc_attr( $type ) . '">' . esc_html( $label ) . '</option>' . "\n"; | |
| 976 | +						$html .= '<p><label>'.__('Question Type:', 'woothemes-sensei').'</label> '; | |
| 977 | + $html .= '<select id="add-question-type-options" name="question_type" class="chosen_select widefat question-type-select">'."\n"; | |
| 978 | +							foreach ($question_types as $type => $label) { | |
| 979 | + $html .= '<option value="'.esc_attr($type).'">'.esc_html($label).'</option>'."\n"; | |
| 980 | 980 | } // End For Loop | 
| 981 | - $html .= '</select></p>' . "\n"; | |
| 981 | + $html .= '</select></p>'."\n"; | |
| 982 | 982 | |
| 983 | 983 | // Question category | 
| 984 | -						if( 'quiz' == $context ) { | |
| 985 | -							if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) { | |
| 986 | - $html .= '<p><label>' . __( 'Question Category:' , 'woothemes-sensei' ) . '</label> '; | |
| 987 | - $html .= '<select id="add-question-category-options" name="question_category" class="chosen_select widefat question-category-select">' . "\n"; | |
| 988 | - $html .= '<option value="">' . __( 'None', 'woothemes-sensei' ) . '</option>' . "\n"; | |
| 989 | -								foreach( $question_cats as $cat ) { | |
| 990 | - $html .= '<option value="' . esc_attr( $cat->term_id ) . '">' . esc_html( $cat->name ) . '</option>'; | |
| 984 | +						if ('quiz' == $context) { | |
| 985 | +							if ( ! empty($question_cats) && ! is_wp_error($question_cats)) { | |
| 986 | +								$html .= '<p><label>'.__('Question Category:', 'woothemes-sensei').'</label> '; | |
| 987 | + $html .= '<select id="add-question-category-options" name="question_category" class="chosen_select widefat question-category-select">'."\n"; | |
| 988 | +								$html .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'."\n"; | |
| 989 | +								foreach ($question_cats as $cat) { | |
| 990 | + $html .= '<option value="'.esc_attr($cat->term_id).'">'.esc_html($cat->name).'</option>'; | |
| 991 | 991 | } // End For Loop | 
| 992 | - $html .= '</select></p>' . "\n"; | |
| 992 | + $html .= '</select></p>'."\n"; | |
| 993 | 993 | } | 
| 994 | 994 | } | 
| 995 | 995 | |
| 996 | 996 | // Question grade | 
| 997 | - $html .= '<p><label>' . __( 'Question Grade:' , 'woothemes-sensei' ) . '</label> '; | |
| 998 | - $html .= '<input type="number" id="add-question-grade" name="question_grade" class="small-text" min="0" value="1" /></p>' . "\n"; | |
| 997 | +						$html .= '<p><label>'.__('Question Grade:', 'woothemes-sensei').'</label> '; | |
| 998 | + $html .= '<input type="number" id="add-question-grade" name="question_grade" class="small-text" min="0" value="1" /></p>'."\n"; | |
| 999 | 999 | |
| 1000 | 1000 | // Random order | 
| 1001 | 1001 | $html .= '<p class="add_question_random_order">'; | 
| 1002 | - $html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> ' . __( 'Randomise answer order', 'woothemes-sensei' ) . '</label>'; | |
| 1002 | +			    			$html .= '<label for="add_random_order"><input type="checkbox" name="random_order" class="random_order" id="add_random_order" value="yes" checked="checked" /> '.__('Randomise answer order', 'woothemes-sensei').'</label>'; | |
| 1003 | 1003 | $html .= '</p>'; | 
| 1004 | 1004 | |
| 1005 | 1005 | // Question media | 
| 1006 | 1006 | $html .= '<p>'; | 
| 1007 | - $html .= '<label for="question_add_new_media_button">' . __( 'Question media:', 'woothemes-sensei' ) . '</label><br/>'; | |
| 1008 | - $html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="' . __( 'Add file to question', 'woothemes-sensei' ) . '" data-uploader_button_text="' . __( 'Add to question', 'woothemes-sensei' ) . '">' . __( 'Add file', 'woothemes-sensei' ) . '</button>'; | |
| 1009 | - $html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">' . __( 'Delete file', 'woothemes-sensei' ) . '</button><br/>'; | |
| 1007 | +					    	$html .= '<label for="question_add_new_media_button">'.__('Question media:', 'woothemes-sensei').'</label><br/>'; | |
| 1008 | +					    	$html .= '<button id="question_add_new_media_button" class="upload_media_file_button button-secondary" data-uploader_title="'.__('Add file to question', 'woothemes-sensei').'" data-uploader_button_text="'.__('Add to question', 'woothemes-sensei').'">'.__('Add file', 'woothemes-sensei').'</button>'; | |
| 1009 | +					    	$html .= '<button id="question_add_new_media_button_delete" class="delete_media_file_button button-secondary hidden">'.__('Delete file', 'woothemes-sensei').'</button><br/>'; | |
| 1010 | 1010 | $html .= '<span id="question_add_new_media_link" class="question_media_link hidden"></span>'; | 
| 1011 | 1011 | $html .= '<br/><img id="question_add_new_media_preview" class="question_media_preview hidden" src="" /><br/>'; | 
| 1012 | 1012 | $html .= '<input type="hidden" id="question_add_new_media" class="question_media" name="question_media" value="" />'; | 
| @@ -1015,44 +1015,44 @@ discard block | ||
| 1015 | 1015 | $html .= '</div>'; | 
| 1016 | 1016 | $html .= '</div>'; | 
| 1017 | 1017 | |
| 1018 | -				foreach ( $question_types as $type => $label ) { | |
| 1019 | - $html .= $this->quiz_panel_question_field( $type ); | |
| 1018 | +				foreach ($question_types as $type => $label) { | |
| 1019 | + $html .= $this->quiz_panel_question_field($type); | |
| 1020 | 1020 | } | 
| 1021 | 1021 | |
| 1022 | -				if( 'quiz' == $context ) { | |
| 1022 | +				if ('quiz' == $context) { | |
| 1023 | 1023 | $html .= '<div class="add-question">'; | 
| 1024 | - $html .= '<a title="' . esc_attr( __( 'Add Question', 'woothemes-sensei' ) ) . '" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">' . esc_html( __( 'Add Question', 'woothemes-sensei' ) ) . '</a>'; | |
| 1024 | +			    		$html .= '<a title="'.esc_attr(__('Add Question', 'woothemes-sensei')).'" href="#add-question-metadata" class="add_question_save button button-primary button-highlighted">'.esc_html(__('Add Question', 'woothemes-sensei')).'</a>'; | |
| 1025 | 1025 | $html .= '</div>'; | 
| 1026 | 1026 | } | 
| 1027 | 1027 | |
| 1028 | 1028 | $html .= '</div>'; | 
| 1029 | 1029 | |
| 1030 | -		    if( 'quiz' == $context ) { | |
| 1030 | +		    if ('quiz' == $context) { | |
| 1031 | 1031 | |
| 1032 | 1032 | $html .= '<div class="tab-content hidden" id="tab-existing-content">'; | 
| 1033 | 1033 | |
| 1034 | - $html .= '<p><em>' . sprintf( __( 'Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit.php?post_type=question' ) . '">', '</a>' ) . '</em></p>'; | |
| 1034 | +			    	$html .= '<p><em>'.sprintf(__('Add an existing question to this quiz from the %1$squestion bank%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit.php?post_type=question').'">', '</a>').'</em></p>'; | |
| 1035 | 1035 | |
| 1036 | 1036 | $html .= '<div id="existing-filters" class="alignleft actions"> | 
| 1037 | 1037 | <select id="existing-status"> | 
| 1038 | - <option value="all">' . __( 'All', 'woothemes-sensei' ) . '</option> | |
| 1039 | - <option value="unused">' . __( 'Unused', 'woothemes-sensei' ) . '</option> | |
| 1040 | - <option value="used">' . __( 'Used', 'woothemes-sensei' ) . '</option> | |
| 1038 | +			    					<option value="all">' . __('All', 'woothemes-sensei').'</option> | |
| 1039 | +			    					<option value="unused">' . __('Unused', 'woothemes-sensei').'</option> | |
| 1040 | +			    					<option value="used">' . __('Used', 'woothemes-sensei').'</option> | |
| 1041 | 1041 | </select> | 
| 1042 | 1042 | <select id="existing-type"> | 
| 1043 | - <option value="">' . __( 'All Types', 'woothemes-sensei' ) . '</option>'; | |
| 1044 | -							    	foreach ( $question_types as $type => $label ) { | |
| 1045 | - $html .= '<option value="' . esc_attr( $type ) . '">' . esc_html( $label ) . '</option>'; | |
| 1043 | +			    					<option value="">' . __('All Types', 'woothemes-sensei').'</option>'; | |
| 1044 | +							    	foreach ($question_types as $type => $label) { | |
| 1045 | + $html .= '<option value="'.esc_attr($type).'">'.esc_html($label).'</option>'; | |
| 1046 | 1046 | } | 
| 1047 | 1047 | $html .= '</select> | 
| 1048 | 1048 | <select id="existing-category"> | 
| 1049 | - <option value="">' . __( 'All Categories', 'woothemes-sensei' ) . '</option>'; | |
| 1050 | -				    				foreach( $question_cats as $cat ) { | |
| 1051 | - $html .= '<option value="' . esc_attr( $cat->slug ) . '">' . esc_html( $cat->name ) . '</option>'; | |
| 1049 | +			    					<option value="">' . __('All Categories', 'woothemes-sensei').'</option>'; | |
| 1050 | +				    				foreach ($question_cats as $cat) { | |
| 1051 | + $html .= '<option value="'.esc_attr($cat->slug).'">'.esc_html($cat->name).'</option>'; | |
| 1052 | 1052 | } | 
| 1053 | 1053 | $html .= '</select> | 
| 1054 | - <input type="text" id="existing-search" placeholder="' . __( 'Search', 'woothemes-sensei' ) . '" /> | |
| 1055 | - <a class="button" id="existing-filter-button">' . __( 'Filter', 'woothemes-sensei' ) . '</a> | |
| 1054 | +    							<input type="text" id="existing-search" placeholder="' . __('Search', 'woothemes-sensei').'" /> | |
| 1055 | +    							<a class="button" id="existing-filter-button">' . __('Filter', 'woothemes-sensei').'</a> | |
| 1056 | 1056 | </div>'; | 
| 1057 | 1057 | |
| 1058 | 1058 | $html .= '<table id="existing-table" class="widefat">'; | 
| @@ -1060,17 +1060,17 @@ discard block | ||
| 1060 | 1060 | $html .= '<thead> | 
| 1061 | 1061 | <tr> | 
| 1062 | 1062 | <th scope="col" class="column-cb check-column"><input type="checkbox" /></th> | 
| 1063 | - <th scope="col">' . __( 'Question', 'woothemes-sensei' ) . '</th> | |
| 1064 | - <th scope="col">' . __( 'Type', 'woothemes-sensei' ) . '</th> | |
| 1065 | - <th scope="col">' . __( 'Category', 'woothemes-sensei' ) . '</th> | |
| 1063 | +									        <th scope="col">' . __('Question', 'woothemes-sensei').'</th> | |
| 1064 | +									        <th scope="col">' . __('Type', 'woothemes-sensei').'</th> | |
| 1065 | +									        <th scope="col">' . __('Category', 'woothemes-sensei').'</th> | |
| 1066 | 1066 | </tr> | 
| 1067 | 1067 | </thead> | 
| 1068 | 1068 | <tfoot> | 
| 1069 | 1069 | <tr> | 
| 1070 | 1070 | <th scope="col" class="check-column"><input type="checkbox" /></th> | 
| 1071 | - <th scope="col">' . __( 'Question', 'woothemes-sensei' ) . '</th> | |
| 1072 | - <th scope="col">' . __( 'Type', 'woothemes-sensei' ) . '</th> | |
| 1073 | - <th scope="col">' . __( 'Category', 'woothemes-sensei' ) . '</th> | |
| 1071 | +									        <th scope="col">' . __('Question', 'woothemes-sensei').'</th> | |
| 1072 | +									        <th scope="col">' . __('Type', 'woothemes-sensei').'</th> | |
| 1073 | +									        <th scope="col">' . __('Category', 'woothemes-sensei').'</th> | |
| 1074 | 1074 | </tr> | 
| 1075 | 1075 | </tfoot>'; | 
| 1076 | 1076 | $html .= '<tbody id="existing-questions">'; | 
| @@ -1078,8 +1078,8 @@ discard block | ||
| 1078 | 1078 | $questions = $this->quiz_panel_get_existing_questions(); | 
| 1079 | 1079 | |
| 1080 | 1080 | $row = 1; | 
| 1081 | -						foreach( $questions['questions'] as $question ) { | |
| 1082 | - $html .= $this->quiz_panel_add_existing_question( $question->ID, $row ); | |
| 1081 | +						foreach ($questions['questions'] as $question) { | |
| 1082 | + $html .= $this->quiz_panel_add_existing_question($question->ID, $row); | |
| 1083 | 1083 | ++$row; | 
| 1084 | 1084 | } | 
| 1085 | 1085 | |
| @@ -1088,36 +1088,36 @@ discard block | ||
| 1088 | 1088 | $html .= '</table>'; | 
| 1089 | 1089 | |
| 1090 | 1090 | $next_class = ''; | 
| 1091 | -			    	if( $questions['count'] <= 10 ) { | |
| 1091 | +			    	if ($questions['count'] <= 10) { | |
| 1092 | 1092 | $next_class = 'hidden'; | 
| 1093 | 1093 | } | 
| 1094 | 1094 | |
| 1095 | 1095 | $html .= '<div id="existing-pagination">'; | 
| 1096 | 1096 | $html .= '<input type="hidden" id="existing-page" value="1" />'; | 
| 1097 | - $html .= '<a class="prev no-paging">← ' . __( 'Previous', 'woothemes-sensei') . '</a> <a class="next ' . esc_attr( $next_class ) . '">' . __( 'Next', 'woothemes-sensei') . ' →</a>'; | |
| 1097 | +			    		$html .= '<a class="prev no-paging">← '.__('Previous', 'woothemes-sensei').'</a> <a class="next '.esc_attr($next_class).'">'.__('Next', 'woothemes-sensei').' →</a>'; | |
| 1098 | 1098 | $html .= '</div>'; | 
| 1099 | 1099 | |
| 1100 | 1100 | $html .= '<div class="existing-actions">'; | 
| 1101 | - $html .= '<a title="' . esc_attr( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '" class="add_existing_save button button-primary button-highlighted">' . esc_html( __( 'Add Selected Question(s)', 'woothemes-sensei' ) ) . '</a></p>'; | |
| 1101 | +			    		$html .= '<a title="'.esc_attr(__('Add Selected Question(s)', 'woothemes-sensei')).'" class="add_existing_save button button-primary button-highlighted">'.esc_html(__('Add Selected Question(s)', 'woothemes-sensei')).'</a></p>'; | |
| 1102 | 1102 | $html .= '</div>'; | 
| 1103 | 1103 | |
| 1104 | 1104 | $html .= '</div>'; | 
| 1105 | 1105 | |
| 1106 | -			    if ( ! empty( $question_cats ) && ! is_wp_error( $question_cats ) ) { | |
| 1106 | +			    if ( ! empty($question_cats) && ! is_wp_error($question_cats)) { | |
| 1107 | 1107 | $html .= '<div class="tab-content hidden" id="tab-multiple-content">'; | 
| 1108 | 1108 | |
| 1109 | - $html .= '<p><em>' . sprintf( __( 'Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei' ), '<a href="' . admin_url( 'edit-tags.php?taxonomy=question-category&post_type=question' ) . '">', '</a>' ) . '</em></p>'; | |
| 1109 | +				    	$html .= '<p><em>'.sprintf(__('Add any number of questions from a specified category. Edit your question categories %1$shere%2$s.', 'woothemes-sensei'), '<a href="'.admin_url('edit-tags.php?taxonomy=question-category&post_type=question').'">', '</a>').'</em></p>'; | |
| 1110 | 1110 | |
| 1111 | - $html .= '<p><select id="add-multiple-question-category-options" name="multiple_category" class="chosen_select widefat question-category-select">' . "\n"; | |
| 1112 | - $html .= '<option value="">' . __( 'Select a Question Category', 'woothemes-sensei' ) . '</option>' . "\n"; | |
| 1113 | -						foreach( $question_cats as $cat ) { | |
| 1114 | - $html .= '<option value="' . esc_attr( $cat->term_id ) . '">' . esc_html( $cat->name ) . '</option>'; | |
| 1111 | + $html .= '<p><select id="add-multiple-question-category-options" name="multiple_category" class="chosen_select widefat question-category-select">'."\n"; | |
| 1112 | +						$html .= '<option value="">'.__('Select a Question Category', 'woothemes-sensei').'</option>'."\n"; | |
| 1113 | +						foreach ($question_cats as $cat) { | |
| 1114 | + $html .= '<option value="'.esc_attr($cat->term_id).'">'.esc_html($cat->name).'</option>'; | |
| 1115 | 1115 | } // End For Loop | 
| 1116 | - $html .= '</select></p>' . "\n"; | |
| 1116 | + $html .= '</select></p>'."\n"; | |
| 1117 | 1117 | |
| 1118 | - $html .= '<p>' . __( 'Number of questions:', 'woothemes-sensei' ) . ' <input type="number" min="1" value="1" max="1" id="add-multiple-question-count" class="small-text"/>'; | |
| 1118 | +						$html .= '<p>'.__('Number of questions:', 'woothemes-sensei').' <input type="number" min="1" value="1" max="1" id="add-multiple-question-count" class="small-text"/>'; | |
| 1119 | 1119 | |
| 1120 | - $html .= '<a title="' . esc_attr( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '" class="add_multiple_save button button-primary button-highlighted">' . esc_html( __( 'Add Question(s)', 'woothemes-sensei' ) ) . '</a></p>'; | |
| 1120 | +						$html .= '<a title="'.esc_attr(__('Add Question(s)', 'woothemes-sensei')).'" class="add_multiple_save button button-primary button-highlighted">'.esc_html(__('Add Question(s)', 'woothemes-sensei')).'</a></p>'; | |
| 1121 | 1121 | |
| 1122 | 1122 | $html .= '</div>'; | 
| 1123 | 1123 | } | 
| @@ -1128,7 +1128,7 @@ discard block | ||
| 1128 | 1128 | return $html; | 
| 1129 | 1129 | } | 
| 1130 | 1130 | |
| 1131 | -	public function quiz_panel_get_existing_questions( $question_status = 'all', $question_type = '', $question_category = '', $question_search = '', $page = 1 ) { | |
| 1131 | +	public function quiz_panel_get_existing_questions($question_status = 'all', $question_type = '', $question_category = '', $question_search = '', $page = 1) { | |
| 1132 | 1132 | |
| 1133 | 1133 | $args = array( | 
| 1134 | 1134 | 'post_type' => 'question', | 
| @@ -1137,14 +1137,14 @@ discard block | ||
| 1137 | 1137 | 'suppress_filters' => 0, | 
| 1138 | 1138 | ); | 
| 1139 | 1139 | |
| 1140 | -		switch( $question_status ) { | |
| 1140 | +		switch ($question_status) { | |
| 1141 | 1141 | case 'unused': $quiz_status = 'NOT EXISTS'; break; | 
| 1142 | 1142 | case 'used': $quiz_status = 'EXISTS'; break; | 
| 1143 | 1143 | default: $quiz_status = ''; break; | 
| 1144 | 1144 | } | 
| 1145 | 1145 | |
| 1146 | -		if( $quiz_status ) { | |
| 1147 | -			switch( $quiz_status ) { | |
| 1146 | +		if ($quiz_status) { | |
| 1147 | +			switch ($quiz_status) { | |
| 1148 | 1148 | case 'EXISTS': | 
| 1149 | 1149 | $args['meta_query'][] = array( | 
| 1150 | 1150 | 'key' => '_quiz_id', | 
| @@ -1162,7 +1162,7 @@ discard block | ||
| 1162 | 1162 | } | 
| 1163 | 1163 | } | 
| 1164 | 1164 | |
| 1165 | -		if( $question_type ) { | |
| 1165 | +		if ($question_type) { | |
| 1166 | 1166 | $args['tax_query'][] = array( | 
| 1167 | 1167 | 'taxonomy' => 'question-type', | 
| 1168 | 1168 | 'field' => 'slug', | 
| @@ -1170,7 +1170,7 @@ discard block | ||
| 1170 | 1170 | ); | 
| 1171 | 1171 | } | 
| 1172 | 1172 | |
| 1173 | -		if( $question_category ) { | |
| 1173 | +		if ($question_category) { | |
| 1174 | 1174 | $args['tax_query'][] = array( | 
| 1175 | 1175 | 'taxonomy' => 'question-category', | 
| 1176 | 1176 | 'field' => 'slug', | 
| @@ -1178,19 +1178,19 @@ discard block | ||
| 1178 | 1178 | ); | 
| 1179 | 1179 | } | 
| 1180 | 1180 | |
| 1181 | -		if( $question_type && $question_category ) { | |
| 1181 | +		if ($question_type && $question_category) { | |
| 1182 | 1182 | $args['tax_query']['relation'] = 'AND'; | 
| 1183 | 1183 | } | 
| 1184 | 1184 | |
| 1185 | -		if( $question_search ) { | |
| 1185 | +		if ($question_search) { | |
| 1186 | 1186 | $args['s'] = $question_search; | 
| 1187 | 1187 | } | 
| 1188 | 1188 | |
| 1189 | -		if( $page ) { | |
| 1189 | +		if ($page) { | |
| 1190 | 1190 | $args['paged'] = $page; | 
| 1191 | 1191 | } | 
| 1192 | 1192 | |
| 1193 | - $qry = new WP_Query( $args ); | |
| 1193 | + $qry = new WP_Query($args); | |
| 1194 | 1194 | |
| 1195 | 1195 | /** | 
| 1196 | 1196 | * Filter existing questions query | 
| @@ -1199,39 +1199,39 @@ discard block | ||
| 1199 | 1199 | * | 
| 1200 | 1200 | * @param WP_Query $wp_query | 
| 1201 | 1201 | */ | 
| 1202 | - $qry = apply_filters( 'sensei_existing_questions_query_results', $qry ); | |
| 1202 | +        $qry = apply_filters('sensei_existing_questions_query_results', $qry); | |
| 1203 | 1203 | |
| 1204 | 1204 | $questions['questions'] = $qry->posts; | 
| 1205 | - $questions['count'] = intval( $qry->found_posts ); | |
| 1205 | + $questions['count'] = intval($qry->found_posts); | |
| 1206 | 1206 | $questions['page'] = $page; | 
| 1207 | 1207 | |
| 1208 | 1208 | return $questions; | 
| 1209 | 1209 | } | 
| 1210 | 1210 | |
| 1211 | -	public function quiz_panel_add_existing_question( $question_id = 0, $row = 1 ) { | |
| 1211 | +	public function quiz_panel_add_existing_question($question_id = 0, $row = 1) { | |
| 1212 | 1212 | |
| 1213 | 1213 | $html = ''; | 
| 1214 | 1214 | |
| 1215 | -		if( ! $question_id ) { | |
| 1215 | +		if ( ! $question_id) { | |
| 1216 | 1216 | |
| 1217 | 1217 | return; | 
| 1218 | 1218 | |
| 1219 | 1219 | } | 
| 1220 | 1220 | |
| 1221 | 1221 | $existing_class = ''; | 
| 1222 | -		if( $row % 2 ) { | |
| 1222 | +		if ($row % 2) { | |
| 1223 | 1223 | $existing_class = 'alternate'; | 
| 1224 | 1224 | } | 
| 1225 | 1225 | |
| 1226 | - $question_type = Sensei()->question->get_question_type( $question_id ); | |
| 1226 | + $question_type = Sensei()->question->get_question_type($question_id); | |
| 1227 | 1227 | |
| 1228 | - $question_cat_list = strip_tags( get_the_term_list( $question_id, 'question-category', '', ', ', '' ) ); | |
| 1228 | + $question_cat_list = strip_tags(get_the_term_list($question_id, 'question-category', '', ', ', '')); | |
| 1229 | 1229 | |
| 1230 | - $html .= '<tr class="' . esc_attr( $existing_class ) . '"> | |
| 1231 | - <td class="cb"><input type="checkbox" value="' . $question_id . '" class="existing-item" /></td> | |
| 1232 | - <td>' . get_the_title( $question_id ) . '</td> | |
| 1233 | - <td>' . esc_html( $question_type ) . '</td> | |
| 1234 | - <td>' . esc_html( $question_cat_list ) . '</td> | |
| 1230 | + $html .= '<tr class="'.esc_attr($existing_class).'"> | |
| 1231 | + <td class="cb"><input type="checkbox" value="' . $question_id.'" class="existing-item" /></td> | |
| 1232 | + <td>' . get_the_title($question_id).'</td> | |
| 1233 | + <td>' . esc_html($question_type).'</td> | |
| 1234 | + <td>' . esc_html($question_cat_list).'</td> | |
| 1235 | 1235 | </tr>'; | 
| 1236 | 1236 | |
| 1237 | 1237 | return $html; | 
| @@ -1244,58 +1244,58 @@ discard block | ||
| 1244 | 1244 | |
| 1245 | 1245 | //Add nonce security to the request | 
| 1246 | 1246 | $nonce = ''; | 
| 1247 | -		if( isset( $_POST['filter_existing_questions_nonce'] ) ) { | |
| 1248 | - $nonce = esc_html( $_POST['filter_existing_questions_nonce'] ); | |
| 1247 | +		if (isset($_POST['filter_existing_questions_nonce'])) { | |
| 1248 | + $nonce = esc_html($_POST['filter_existing_questions_nonce']); | |
| 1249 | 1249 | } // End If Statement | 
| 1250 | 1250 | |
| 1251 | -		if( ! wp_verify_nonce( $nonce, 'filter_existing_questions_nonce' ) ) { | |
| 1252 | - die( $return ); | |
| 1251 | +		if ( ! wp_verify_nonce($nonce, 'filter_existing_questions_nonce')) { | |
| 1252 | + die($return); | |
| 1253 | 1253 | } // End If Statement | 
| 1254 | 1254 | |
| 1255 | 1255 | // Parse POST data | 
| 1256 | 1256 | $data = $_POST['data']; | 
| 1257 | 1257 | $question_data = array(); | 
| 1258 | - parse_str( $data, $question_data ); | |
| 1258 | + parse_str($data, $question_data); | |
| 1259 | 1259 | |
| 1260 | -		if( 0 < count( $question_data ) ) { | |
| 1260 | +		if (0 < count($question_data)) { | |
| 1261 | 1261 | |
| 1262 | 1262 | $question_status = ''; | 
| 1263 | -			if( isset( $question_data['question_status'] ) ) { | |
| 1263 | +			if (isset($question_data['question_status'])) { | |
| 1264 | 1264 | $question_status = $question_data['question_status']; | 
| 1265 | 1265 | } | 
| 1266 | 1266 | |
| 1267 | 1267 | $question_type = ''; | 
| 1268 | -			if( isset( $question_data['question_type'] ) ) { | |
| 1268 | +			if (isset($question_data['question_type'])) { | |
| 1269 | 1269 | $question_type = $question_data['question_type']; | 
| 1270 | 1270 | } | 
| 1271 | 1271 | |
| 1272 | 1272 | $question_category = ''; | 
| 1273 | -			if( isset( $question_data['question_category'] ) ) { | |
| 1273 | +			if (isset($question_data['question_category'])) { | |
| 1274 | 1274 | $question_category = $question_data['question_category']; | 
| 1275 | 1275 | } | 
| 1276 | 1276 | |
| 1277 | 1277 | $question_search = ''; | 
| 1278 | -			if( isset( $question_data['question_search'] ) ) { | |
| 1278 | +			if (isset($question_data['question_search'])) { | |
| 1279 | 1279 | $question_search = $question_data['question_search']; | 
| 1280 | 1280 | } | 
| 1281 | 1281 | |
| 1282 | 1282 | $question_page = 1; | 
| 1283 | -			if( isset( $question_data['question_page'] ) ) { | |
| 1284 | - $question_page = intval( $question_data['question_page'] ); | |
| 1283 | +			if (isset($question_data['question_page'])) { | |
| 1284 | + $question_page = intval($question_data['question_page']); | |
| 1285 | 1285 | } | 
| 1286 | 1286 | |
| 1287 | - $questions = $this->quiz_panel_get_existing_questions( $question_status, $question_type, $question_category, $question_search, $question_page ); | |
| 1287 | + $questions = $this->quiz_panel_get_existing_questions($question_status, $question_type, $question_category, $question_search, $question_page); | |
| 1288 | 1288 | |
| 1289 | 1289 | $row = 1; | 
| 1290 | 1290 | $html = ''; | 
| 1291 | -			foreach( $questions['questions'] as $question ) { | |
| 1292 | - $html .= $this->quiz_panel_add_existing_question( $question->ID, $row ); | |
| 1291 | +			foreach ($questions['questions'] as $question) { | |
| 1292 | + $html .= $this->quiz_panel_add_existing_question($question->ID, $row); | |
| 1293 | 1293 | ++$row; | 
| 1294 | 1294 | } | 
| 1295 | 1295 | |
| 1296 | -			if( ! $html ) { | |
| 1296 | +			if ( ! $html) { | |
| 1297 | 1297 | $html = '<tr class="alternate"> | 
| 1298 | - <td class="no-results" colspan="4"><em>' . __( 'There are no questions matching your search.', 'woothemes-sensei' ) . '</em></td> | |
| 1298 | +								<td class="no-results" colspan="4"><em>' . __('There are no questions matching your search.', 'woothemes-sensei').'</em></td> | |
| 1299 | 1299 | </tr>'; | 
| 1300 | 1300 | } | 
| 1301 | 1301 | |
| @@ -1303,53 +1303,53 @@ discard block | ||
| 1303 | 1303 | $return['count'] = $questions['count']; | 
| 1304 | 1304 | $return['page'] = $questions['page']; | 
| 1305 | 1305 | |
| 1306 | - wp_send_json( $return ); | |
| 1306 | + wp_send_json($return); | |
| 1307 | 1307 | } | 
| 1308 | 1308 | |
| 1309 | - die( $return ); | |
| 1309 | + die($return); | |
| 1310 | 1310 | } | 
| 1311 | 1311 | |
| 1312 | -	public function quiz_panel_question_field( $question_type = '', $question_id = 0, $question_counter = 0 ) { | |
| 1312 | +	public function quiz_panel_question_field($question_type = '', $question_id = 0, $question_counter = 0) { | |
| 1313 | 1313 | |
| 1314 | 1314 | $html = ''; | 
| 1315 | 1315 | |
| 1316 | -		if( $question_type ) { | |
| 1316 | +		if ($question_type) { | |
| 1317 | 1317 | |
| 1318 | 1318 | $right_answer = ''; | 
| 1319 | 1319 | $wrong_answers = array(); | 
| 1320 | 1320 | $answer_order_string = ''; | 
| 1321 | 1321 | $answer_order = array(); | 
| 1322 | -			if( $question_id ) { | |
| 1323 | - $right_answer = get_post_meta( $question_id, '_question_right_answer', true); | |
| 1324 | - $wrong_answers = get_post_meta( $question_id, '_question_wrong_answers', true); | |
| 1325 | - $answer_order_string = get_post_meta( $question_id, '_answer_order', true ); | |
| 1326 | - $answer_order = array_filter( explode( ',', $answer_order_string ) ); | |
| 1322 | +			if ($question_id) { | |
| 1323 | + $right_answer = get_post_meta($question_id, '_question_right_answer', true); | |
| 1324 | + $wrong_answers = get_post_meta($question_id, '_question_wrong_answers', true); | |
| 1325 | + $answer_order_string = get_post_meta($question_id, '_answer_order', true); | |
| 1326 | +				$answer_order = array_filter(explode(',', $answer_order_string)); | |
| 1327 | 1327 | $question_class = ''; | 
| 1328 | 1328 |  			} else { | 
| 1329 | 1329 | $question_id = ''; | 
| 1330 | 1330 | $question_class = 'answer-fields question_required_fields hidden'; | 
| 1331 | 1331 | } | 
| 1332 | 1332 | |
| 1333 | -			switch ( $question_type ) { | |
| 1333 | +			switch ($question_type) { | |
| 1334 | 1334 | case 'multiple-choice': | 
| 1335 | - $html .= '<div class="question_default_fields multiple-choice-answers ' . str_replace( ' hidden', '', $question_class ) . '">'; | |
| 1335 | +					$html .= '<div class="question_default_fields multiple-choice-answers '.str_replace(' hidden', '', $question_class).'">'; | |
| 1336 | 1336 | |
| 1337 | 1337 | $right_answers = (array) $right_answer; | 
| 1338 | 1338 | // Calculate total right answers available (defaults to 1) | 
| 1339 | 1339 | $total_right = 0; | 
| 1340 | -						if( $question_id ) { | |
| 1341 | - $total_right = get_post_meta( $question_id, '_right_answer_count', true ); | |
| 1340 | +						if ($question_id) { | |
| 1341 | + $total_right = get_post_meta($question_id, '_right_answer_count', true); | |
| 1342 | 1342 | } | 
| 1343 | -						if( 0 == intval( $total_right ) ) { | |
| 1343 | +						if (0 == intval($total_right)) { | |
| 1344 | 1344 | $total_right = 1; | 
| 1345 | 1345 | } | 
| 1346 | -						for ( $i = 0; $i < $total_right; $i++ ) { | |
| 1347 | -							if ( !isset( $right_answers[ $i ] ) ) { $right_answers[ $i ] = ''; } | |
| 1348 | - $right_answer_id = $this->get_answer_id( $right_answers[ $i ] ); | |
| 1346 | +						for ($i = 0; $i < $total_right; $i++) { | |
| 1347 | +							if ( ! isset($right_answers[$i])) { $right_answers[$i] = ''; } | |
| 1348 | + $right_answer_id = $this->get_answer_id($right_answers[$i]); | |
| 1349 | 1349 | // Right Answer | 
| 1350 | - $right_answer = '<label class="answer" for="question_' . $question_counter . '_right_answer_' . $i . '"><span>' . __( 'Right:' , 'woothemes-sensei' ) . '</span> <input rel="' . esc_attr( $right_answer_id ) . '" type="text" id="question_' . $question_counter . '_right_answer_' . $i . '" name="question_right_answers[]" value="' . esc_attr( $right_answers[ $i ] ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>'; | |
| 1351 | -							if( $question_id ) { | |
| 1352 | - $answers[ $right_answer_id ] = $right_answer; | |
| 1350 | +							$right_answer = '<label class="answer" for="question_'.$question_counter.'_right_answer_'.$i.'"><span>'.__('Right:', 'woothemes-sensei').'</span> <input rel="'.esc_attr($right_answer_id).'" type="text" id="question_'.$question_counter.'_right_answer_'.$i.'" name="question_right_answers[]" value="'.esc_attr($right_answers[$i]).'" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>'; | |
| 1351 | +							if ($question_id) { | |
| 1352 | + $answers[$right_answer_id] = $right_answer; | |
| 1353 | 1353 |  							} else { | 
| 1354 | 1354 | $answers[] = $right_answer; | 
| 1355 | 1355 | } | 
| @@ -1357,23 +1357,23 @@ discard block | ||
| 1357 | 1357 | |
| 1358 | 1358 | // Calculate total wrong answers available (defaults to 4) | 
| 1359 | 1359 | $total_wrong = 0; | 
| 1360 | -				    	if( $question_id ) { | |
| 1361 | - $total_wrong = get_post_meta( $question_id, '_wrong_answer_count', true ); | |
| 1360 | +				    	if ($question_id) { | |
| 1361 | + $total_wrong = get_post_meta($question_id, '_wrong_answer_count', true); | |
| 1362 | 1362 | } | 
| 1363 | -				    	if( 0 == intval( $total_wrong ) ) { | |
| 1363 | +				    	if (0 == intval($total_wrong)) { | |
| 1364 | 1364 | $total_wrong = 1; | 
| 1365 | 1365 | } | 
| 1366 | 1366 | |
| 1367 | 1367 | // Setup Wrong Answer HTML | 
| 1368 | -                        foreach ( $wrong_answers as $i => $answer ){ | |
| 1368 | +                        foreach ($wrong_answers as $i => $answer) { | |
| 1369 | 1369 | |
| 1370 | - $answer_id = $this->get_answer_id( $answer ); | |
| 1371 | - $wrong_answer = '<label class="answer" for="question_' . $question_counter . '_wrong_answer_' . $i . '"><span>' . __( 'Wrong:' , 'woothemes-sensei' ) ; | |
| 1372 | - $wrong_answer .= '</span> <input rel="' . esc_attr( $answer_id ) . '" type="text" id="question_' . $question_counter . '_wrong_answer_' . $i ; | |
| 1373 | - $wrong_answer .= '" name="question_wrong_answers[]" value="' . esc_attr( $answer ) . '" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>'; | |
| 1374 | -                            if( $question_id ) { | |
| 1370 | + $answer_id = $this->get_answer_id($answer); | |
| 1371 | +                            $wrong_answer = '<label class="answer" for="question_'.$question_counter.'_wrong_answer_'.$i.'"><span>'.__('Wrong:', 'woothemes-sensei'); | |
| 1372 | + $wrong_answer .= '</span> <input rel="'.esc_attr($answer_id).'" type="text" id="question_'.$question_counter.'_wrong_answer_'.$i; | |
| 1373 | + $wrong_answer .= '" name="question_wrong_answers[]" value="'.esc_attr($answer).'" size="25" class="question_answer widefat" /> <a class="remove_answer_option"></a></label>'; | |
| 1374 | +                            if ($question_id) { | |
| 1375 | 1375 | |
| 1376 | - $answers[ $answer_id ] = $wrong_answer; | |
| 1376 | + $answers[$answer_id] = $wrong_answer; | |
| 1377 | 1377 | |
| 1378 | 1378 |                              } else { | 
| 1379 | 1379 | |
| @@ -1384,115 +1384,115 @@ discard block | ||
| 1384 | 1384 | } // end for each | 
| 1385 | 1385 | |
| 1386 | 1386 | $answers_sorted = $answers; | 
| 1387 | -				    	if( $question_id && count( $answer_order ) > 0 ) { | |
| 1387 | +				    	if ($question_id && count($answer_order) > 0) { | |
| 1388 | 1388 | $answers_sorted = array(); | 
| 1389 | -				    		foreach( $answer_order as $answer_id ) { | |
| 1390 | -				    			if( isset( $answers[ $answer_id ] ) ) { | |
| 1391 | - $answers_sorted[ $answer_id ] = $answers[ $answer_id ]; | |
| 1392 | - unset( $answers[ $answer_id ] ); | |
| 1389 | +				    		foreach ($answer_order as $answer_id) { | |
| 1390 | +				    			if (isset($answers[$answer_id])) { | |
| 1391 | + $answers_sorted[$answer_id] = $answers[$answer_id]; | |
| 1392 | + unset($answers[$answer_id]); | |
| 1393 | 1393 | } | 
| 1394 | 1394 | } | 
| 1395 | 1395 | |
| 1396 | -				    		if( count( $answers ) > 0 ) { | |
| 1397 | -						    	foreach( $answers as $id => $answer ) { | |
| 1398 | - $answers_sorted[ $id ] = $answer; | |
| 1396 | +				    		if (count($answers) > 0) { | |
| 1397 | +						    	foreach ($answers as $id => $answer) { | |
| 1398 | + $answers_sorted[$id] = $answer; | |
| 1399 | 1399 | } | 
| 1400 | 1400 | } | 
| 1401 | 1401 | } | 
| 1402 | 1402 | |
| 1403 | -						foreach( $answers_sorted as $id => $answer ) { | |
| 1403 | +						foreach ($answers_sorted as $id => $answer) { | |
| 1404 | 1404 | $html .= $answer; | 
| 1405 | 1405 | } | 
| 1406 | 1406 | |
| 1407 | - $html .= '<input type="hidden" class="answer_order" name="answer_order" value="' . $answer_order_string . '" />'; | |
| 1408 | - $html .= '<span class="hidden right_answer_count">' . $total_right . '</span>'; | |
| 1409 | - $html .= '<span class="hidden wrong_answer_count">' . $total_wrong . '</span>'; | |
| 1407 | + $html .= '<input type="hidden" class="answer_order" name="answer_order" value="'.$answer_order_string.'" />'; | |
| 1408 | + $html .= '<span class="hidden right_answer_count">'.$total_right.'</span>'; | |
| 1409 | + $html .= '<span class="hidden wrong_answer_count">'.$total_wrong.'</span>'; | |
| 1410 | 1410 | |
| 1411 | 1411 | $html .= '<div class="add_answer_options">'; | 
| 1412 | - $html .= '<a class="add_right_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add right answer', 'woothemes-sensei' ) . '</a>'; | |
| 1413 | - $html .= '<a class="add_wrong_answer_option add_answer_option button" rel="' . $question_counter . '">' . __( 'Add wrong answer', 'woothemes-sensei' ) . '</a>'; | |
| 1412 | +					    	$html .= '<a class="add_right_answer_option add_answer_option button" rel="'.$question_counter.'">'.__('Add right answer', 'woothemes-sensei').'</a>'; | |
| 1413 | +					    	$html .= '<a class="add_wrong_answer_option add_answer_option button" rel="'.$question_counter.'">'.__('Add wrong answer', 'woothemes-sensei').'</a>'; | |
| 1414 | 1414 | $html .= '</div>'; | 
| 1415 | 1415 | |
| 1416 | - $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id , 'multiple-choice' ); | |
| 1416 | + $html .= $this->quiz_panel_question_feedback($question_counter, $question_id, 'multiple-choice'); | |
| 1417 | 1417 | |
| 1418 | 1418 | $html .= '</div>'; | 
| 1419 | 1419 | break; | 
| 1420 | 1420 | case 'boolean': | 
| 1421 | - $html .= '<div class="question_boolean_fields ' . $question_class . '">'; | |
| 1422 | -						if( $question_id ) { | |
| 1423 | - $field_name = 'question_' . $question_id . '_right_answer_boolean'; | |
| 1421 | + $html .= '<div class="question_boolean_fields '.$question_class.'">'; | |
| 1422 | +						if ($question_id) { | |
| 1423 | + $field_name = 'question_'.$question_id.'_right_answer_boolean'; | |
| 1424 | 1424 |  						} else { | 
| 1425 | 1425 | $field_name = 'question_right_answer_boolean'; | 
| 1426 | 1426 | $right_answer = 'true'; | 
| 1427 | 1427 | } | 
| 1428 | - $html .= '<label for="question_' . $question_id . '_boolean_true"><input id="question_' . $question_id . '_boolean_true" type="radio" name="' . $field_name . '" value="true" '. checked( $right_answer, 'true', false ) . ' /> ' . __( 'True', 'woothemes-sensei' ) . '</label>'; | |
| 1429 | - $html .= '<label for="question_' . $question_id . '_boolean_false"><input id="question_' . $question_id . '_boolean_false" type="radio" name="' . $field_name . '" value="false" '. checked( $right_answer, 'false', false ) . ' /> ' . __( 'False', 'woothemes-sensei' ) . '</label>'; | |
| 1428 | +						$html .= '<label for="question_'.$question_id.'_boolean_true"><input id="question_'.$question_id.'_boolean_true" type="radio" name="'.$field_name.'" value="true" '.checked($right_answer, 'true', false).' /> '.__('True', 'woothemes-sensei').'</label>'; | |
| 1429 | +						$html .= '<label for="question_'.$question_id.'_boolean_false"><input id="question_'.$question_id.'_boolean_false" type="radio" name="'.$field_name.'" value="false" '.checked($right_answer, 'false', false).' /> '.__('False', 'woothemes-sensei').'</label>'; | |
| 1430 | 1430 | |
| 1431 | - $html .= $this->quiz_panel_question_feedback( $question_counter, $question_id, 'boolean' ); | |
| 1431 | + $html .= $this->quiz_panel_question_feedback($question_counter, $question_id, 'boolean'); | |
| 1432 | 1432 | |
| 1433 | 1433 | $html .= '</div>'; | 
| 1434 | 1434 | break; | 
| 1435 | 1435 | case 'gap-fill': | 
| 1436 | - $gapfill_array = explode( '||', $right_answer ); | |
| 1437 | -					if ( isset( $gapfill_array[0] ) ) { $gapfill_pre = $gapfill_array[0]; } else { $gapfill_pre = ''; } | |
| 1438 | -					if ( isset( $gapfill_array[1] ) ) { $gapfill_gap = $gapfill_array[1]; } else { $gapfill_gap = ''; } | |
| 1439 | -					if ( isset( $gapfill_array[2] ) ) { $gapfill_post = $gapfill_array[2]; } else { $gapfill_post = ''; } | |
| 1440 | - $html .= '<div class="question_gapfill_fields ' . $question_class . '">'; | |
| 1436 | +					$gapfill_array = explode('||', $right_answer); | |
| 1437 | +					if (isset($gapfill_array[0])) { $gapfill_pre = $gapfill_array[0]; } else { $gapfill_pre = ''; } | |
| 1438 | +					if (isset($gapfill_array[1])) { $gapfill_gap = $gapfill_array[1]; } else { $gapfill_gap = ''; } | |
| 1439 | +					if (isset($gapfill_array[2])) { $gapfill_post = $gapfill_array[2]; } else { $gapfill_post = ''; } | |
| 1440 | + $html .= '<div class="question_gapfill_fields '.$question_class.'">'; | |
| 1441 | 1441 | // Fill in the Gaps | 
| 1442 | - $html .= '<label>' . __( 'Text before the Gap:' , 'woothemes-sensei' ) . '</label> '; | |
| 1443 | - $html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_pre" name="add_question_right_answer_gapfill_pre" value="' . $gapfill_pre . '" size="25" class="widefat gapfill-field" />'; | |
| 1444 | - $html .= '<label>' . __( 'The Gap:' , 'woothemes-sensei' ) . '</label> '; | |
| 1445 | - $html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_gap" name="add_question_right_answer_gapfill_gap" value="' . $gapfill_gap . '" size="25" class="widefat gapfill-field" />'; | |
| 1446 | - $html .= '<label>' . __( 'Text after the Gap:' , 'woothemes-sensei' ) . '</label> '; | |
| 1447 | - $html .= '<input type="text" id="question_' . $question_counter . '_add_question_right_answer_gapfill_post" name="add_question_right_answer_gapfill_post" value="' . $gapfill_post . '" size="25" class="widefat gapfill-field" />'; | |
| 1448 | - $html .= '<label>' . __( 'Preview:' , 'woothemes-sensei' ) . '</label> '; | |
| 1449 | - $html .= '<p class="gapfill-preview">' . $gapfill_pre . ' <u>' . $gapfill_gap . '</u> ' . $gapfill_post . '</p>'; | |
| 1442 | +						$html .= '<label>'.__('Text before the Gap:', 'woothemes-sensei').'</label> '; | |
| 1443 | + $html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_pre" name="add_question_right_answer_gapfill_pre" value="'.$gapfill_pre.'" size="25" class="widefat gapfill-field" />'; | |
| 1444 | +	  					$html .= '<label>'.__('The Gap:', 'woothemes-sensei').'</label> '; | |
| 1445 | + $html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_gap" name="add_question_right_answer_gapfill_gap" value="'.$gapfill_gap.'" size="25" class="widefat gapfill-field" />'; | |
| 1446 | +	  					$html .= '<label>'.__('Text after the Gap:', 'woothemes-sensei').'</label> '; | |
| 1447 | + $html .= '<input type="text" id="question_'.$question_counter.'_add_question_right_answer_gapfill_post" name="add_question_right_answer_gapfill_post" value="'.$gapfill_post.'" size="25" class="widefat gapfill-field" />'; | |
| 1448 | +	  					$html .= '<label>'.__('Preview:', 'woothemes-sensei').'</label> '; | |
| 1449 | + $html .= '<p class="gapfill-preview">'.$gapfill_pre.' <u>'.$gapfill_gap.'</u> '.$gapfill_post.'</p>'; | |
| 1450 | 1450 | $html .= '</div>'; | 
| 1451 | 1451 | break; | 
| 1452 | 1452 | case 'multi-line': | 
| 1453 | - $html .= '<div class="question_multiline_fields ' . $question_class . '">'; | |
| 1453 | + $html .= '<div class="question_multiline_fields '.$question_class.'">'; | |
| 1454 | 1454 | // Guides for grading | 
| 1455 | -						if( $question_counter ) { | |
| 1456 | - $field_id = 'question_' . $question_counter . '_add_question_right_answer_multiline'; | |
| 1455 | +						if ($question_counter) { | |
| 1456 | + $field_id = 'question_'.$question_counter.'_add_question_right_answer_multiline'; | |
| 1457 | 1457 |  						} else { | 
| 1458 | 1458 | $field_id = 'add_question_right_answer_multiline'; | 
| 1459 | 1459 | } | 
| 1460 | - $html .= '<label>' . __( 'Guide/Teacher Notes for grading the answer' , 'woothemes-sensei' ) . '</label> '; | |
| 1461 | - $html .= '<textarea id="' . $field_id . '" name="add_question_right_answer_multiline" rows="4" cols="40" class="widefat">' . $right_answer . '</textarea>'; | |
| 1460 | +						$html .= '<label>'.__('Guide/Teacher Notes for grading the answer', 'woothemes-sensei').'</label> '; | |
| 1461 | + $html .= '<textarea id="'.$field_id.'" name="add_question_right_answer_multiline" rows="4" cols="40" class="widefat">'.$right_answer.'</textarea>'; | |
| 1462 | 1462 | $html .= '</div>'; | 
| 1463 | 1463 | break; | 
| 1464 | 1464 | case 'single-line': | 
| 1465 | - $html .= '<div class="question_singleline_fields ' . $question_class . '">'; | |
| 1465 | + $html .= '<div class="question_singleline_fields '.$question_class.'">'; | |
| 1466 | 1466 | // Recommended Answer | 
| 1467 | -						if( $question_counter ) { | |
| 1468 | - $field_id = 'question_' . $question_counter . '_add_question_right_answer_singleline'; | |
| 1467 | +						if ($question_counter) { | |
| 1468 | + $field_id = 'question_'.$question_counter.'_add_question_right_answer_singleline'; | |
| 1469 | 1469 |  						} else { | 
| 1470 | 1470 | $field_id = 'add_question_right_answer_singleline'; | 
| 1471 | 1471 | } | 
| 1472 | - $html .= '<label>' . __( 'Recommended Answer' , 'woothemes-sensei' ) . '</label> '; | |
| 1473 | - $html .= '<input type="text" id="' . $field_id . '" name="add_question_right_answer_singleline" value="' . $right_answer . '" size="25" class="widefat" />'; | |
| 1472 | +						$html .= '<label>'.__('Recommended Answer', 'woothemes-sensei').'</label> '; | |
| 1473 | + $html .= '<input type="text" id="'.$field_id.'" name="add_question_right_answer_singleline" value="'.$right_answer.'" size="25" class="widefat" />'; | |
| 1474 | 1474 | $html .= '</div>'; | 
| 1475 | 1475 | break; | 
| 1476 | 1476 | case 'file-upload': | 
| 1477 | - $html .= '<div class="question_fileupload_fields ' . $question_class . '">'; | |
| 1478 | -						if( $question_counter ) { | |
| 1479 | - $right_field_id = 'question_' . $question_counter . '_add_question_right_answer_fileupload'; | |
| 1480 | - $wrong_field_id = 'question_' . $question_counter . '_add_question_wrong_answer_fileupload'; | |
| 1477 | + $html .= '<div class="question_fileupload_fields '.$question_class.'">'; | |
| 1478 | +						if ($question_counter) { | |
| 1479 | + $right_field_id = 'question_'.$question_counter.'_add_question_right_answer_fileupload'; | |
| 1480 | + $wrong_field_id = 'question_'.$question_counter.'_add_question_wrong_answer_fileupload'; | |
| 1481 | 1481 |  						} else { | 
| 1482 | 1482 | $right_field_id = 'add_question_right_answer_fileupload'; | 
| 1483 | 1483 | $wrong_field_id = 'add_question_wrong_answer_fileupload'; | 
| 1484 | 1484 | } | 
| 1485 | 1485 | |
| 1486 | 1486 | $wrong_answer = ''; | 
| 1487 | -						if( isset( $wrong_answers[0] ) ) { | |
| 1487 | +						if (isset($wrong_answers[0])) { | |
| 1488 | 1488 | $wrong_answer = $wrong_answers[0]; | 
| 1489 | 1489 | } | 
| 1490 | - $html .= '<label>' . __( 'Description for student explaining what needs to be uploaded' , 'woothemes-sensei' ) . '</label> '; | |
| 1491 | - $html .= '<textarea id="' . $wrong_field_id . '" name="add_question_wrong_answer_fileupload" rows="4" cols="40" class="widefat">' . $wrong_answer . '</textarea>'; | |
| 1490 | +						$html .= '<label>'.__('Description for student explaining what needs to be uploaded', 'woothemes-sensei').'</label> '; | |
| 1491 | + $html .= '<textarea id="'.$wrong_field_id.'" name="add_question_wrong_answer_fileupload" rows="4" cols="40" class="widefat">'.$wrong_answer.'</textarea>'; | |
| 1492 | 1492 | |
| 1493 | 1493 | // Guides for grading | 
| 1494 | - $html .= '<label>' . __( 'Guide/Teacher Notes for grading the upload' , 'woothemes-sensei' ) . '</label> '; | |
| 1495 | - $html .= '<textarea id="' . $right_field_id . '" name="add_question_right_answer_fileupload" rows="4" cols="40" class="widefat">' . $right_answer . '</textarea>'; | |
| 1494 | +						$html .= '<label>'.__('Guide/Teacher Notes for grading the upload', 'woothemes-sensei').'</label> '; | |
| 1495 | + $html .= '<textarea id="'.$right_field_id.'" name="add_question_right_answer_fileupload" rows="4" cols="40" class="widefat">'.$right_answer.'</textarea>'; | |
| 1496 | 1496 | $html .= '</div>'; | 
| 1497 | 1497 | break; | 
| 1498 | 1498 | } | 
| @@ -1501,32 +1501,32 @@ discard block | ||
| 1501 | 1501 | return $html; | 
| 1502 | 1502 | } | 
| 1503 | 1503 | |
| 1504 | -	public function quiz_panel_question_feedback( $question_counter = 0, $question_id = 0, $question_type = '' ) { | |
| 1504 | +	public function quiz_panel_question_feedback($question_counter = 0, $question_id = 0, $question_type = '') { | |
| 1505 | 1505 | |
| 1506 | 1506 | // default field name | 
| 1507 | 1507 | $field_name = 'answer_feedback'; | 
| 1508 | -        if( 'boolean' == $question_type ){ | |
| 1508 | +        if ('boolean' == $question_type) { | |
| 1509 | 1509 | |
| 1510 | 1510 | $field_name = 'answer_feedback_boolean'; | 
| 1511 | 1511 | |
| 1512 | -        }elseif( 'multiple-choice' == $question_type ){ | |
| 1512 | +        }elseif ('multiple-choice' == $question_type) { | |
| 1513 | 1513 | |
| 1514 | 1514 | $field_name = 'answer_feedback_multiple_choice'; | 
| 1515 | 1515 | |
| 1516 | 1516 | }// end if | 
| 1517 | 1517 | |
| 1518 | -		if( $question_counter ) { | |
| 1519 | - $field_name = 'answer_' . $question_counter . '_feedback'; | |
| 1518 | +		if ($question_counter) { | |
| 1519 | + $field_name = 'answer_'.$question_counter.'_feedback'; | |
| 1520 | 1520 | } | 
| 1521 | 1521 | |
| 1522 | 1522 | $feedback = ''; | 
| 1523 | -		if( $question_id ) { | |
| 1524 | - $feedback = get_post_meta( $question_id, '_answer_feedback', true ); | |
| 1523 | +		if ($question_id) { | |
| 1524 | + $feedback = get_post_meta($question_id, '_answer_feedback', true); | |
| 1525 | 1525 | } | 
| 1526 | 1526 | |
| 1527 | - $html = '<p title="' . __( 'This feedback will be automatically displayed to the student once they have completed the quiz.', 'woothemes-sensei' ) . '">'; | |
| 1528 | - $html .= '<label for="' . $field_name . '">' . __( 'Answer Feedback' , 'woothemes-sensei' ) . ':</label>'; | |
| 1529 | - $html .= '<textarea id="' . $field_name . '" name="' . $field_name . '" rows="4" cols="40" class="answer_feedback widefat">' . $feedback . '</textarea>'; | |
| 1527 | +		$html = '<p title="'.__('This feedback will be automatically displayed to the student once they have completed the quiz.', 'woothemes-sensei').'">'; | |
| 1528 | +		$html .= '<label for="'.$field_name.'">'.__('Answer Feedback', 'woothemes-sensei').':</label>'; | |
| 1529 | + $html .= '<textarea id="'.$field_name.'" name="'.$field_name.'" rows="4" cols="40" class="answer_feedback widefat">'.$feedback.'</textarea>'; | |
| 1530 | 1530 | $html .= '</p>'; | 
| 1531 | 1531 | |
| 1532 | 1532 | return $html; | 
| @@ -1535,19 +1535,19 @@ discard block | ||
| 1535 | 1535 |  	public function question_get_answer_id() { | 
| 1536 | 1536 | $data = $_POST['data']; | 
| 1537 | 1537 | $answer_data = array(); | 
| 1538 | - parse_str( $data, $answer_data ); | |
| 1538 | + parse_str($data, $answer_data); | |
| 1539 | 1539 | $answer = $answer_data['answer_value']; | 
| 1540 | - $answer_id = $this->get_answer_id( $answer ); | |
| 1540 | + $answer_id = $this->get_answer_id($answer); | |
| 1541 | 1541 | echo $answer_id; | 
| 1542 | 1542 | die(); | 
| 1543 | 1543 | } | 
| 1544 | 1544 | |
| 1545 | -	public function get_answer_id( $answer = '' ) { | |
| 1545 | +	public function get_answer_id($answer = '') { | |
| 1546 | 1546 | |
| 1547 | 1547 | $answer_id = ''; | 
| 1548 | 1548 | |
| 1549 | -		if( $answer ) { | |
| 1550 | - $answer_id = md5( $answer ); | |
| 1549 | +		if ($answer) { | |
| 1550 | + $answer_id = md5($answer); | |
| 1551 | 1551 | } | 
| 1552 | 1552 | |
| 1553 | 1553 | return $answer_id; | 
| @@ -1560,17 +1560,17 @@ discard block | ||
| 1560 | 1560 | * @access public | 
| 1561 | 1561 | * @return void | 
| 1562 | 1562 | */ | 
| 1563 | -	public function lesson_quiz_meta_box_content () { | |
| 1563 | +	public function lesson_quiz_meta_box_content() { | |
| 1564 | 1564 | global $post; | 
| 1565 | 1565 | |
| 1566 | 1566 | // Get quiz panel | 
| 1567 | 1567 | $quiz_id = 0; | 
| 1568 | 1568 | $quizzes = array(); | 
| 1569 | -		if ( 0 < $post->ID ) { | |
| 1570 | - $quiz_id = $this->lesson_quizzes( $post->ID, 'any' ); | |
| 1569 | +		if (0 < $post->ID) { | |
| 1570 | + $quiz_id = $this->lesson_quizzes($post->ID, 'any'); | |
| 1571 | 1571 | } | 
| 1572 | 1572 | |
| 1573 | - echo $this->quiz_panel( $quiz_id ); | |
| 1573 | + echo $this->quiz_panel($quiz_id); | |
| 1574 | 1574 | |
| 1575 | 1575 | } // End lesson_quiz_meta_box_content() | 
| 1576 | 1576 | |
| @@ -1587,53 +1587,53 @@ discard block | ||
| 1587 | 1587 | $quiz_id = 0; | 
| 1588 | 1588 | $lesson_id = $post->ID; | 
| 1589 | 1589 | $quizzes = array(); | 
| 1590 | -		if ( 0 < $lesson_id ) { | |
| 1591 | - $quiz_id = $this->lesson_quizzes( $lesson_id, 'any' ); | |
| 1590 | +		if (0 < $lesson_id) { | |
| 1591 | + $quiz_id = $this->lesson_quizzes($lesson_id, 'any'); | |
| 1592 | 1592 | } | 
| 1593 | 1593 | |
| 1594 | -		if( $quiz_id ) { | |
| 1595 | - $html .= $this->quiz_settings_panel( $lesson_id, $quiz_id ); | |
| 1594 | +		if ($quiz_id) { | |
| 1595 | + $html .= $this->quiz_settings_panel($lesson_id, $quiz_id); | |
| 1596 | 1596 |  		} else { | 
| 1597 | - $html .= '<p><em>' . __( 'There is no quiz for this lesson yet - please add one in the \'Quiz Questions\' box.', 'woothemes-sensei' ) . '</em></p>'; | |
| 1597 | +			$html .= '<p><em>'.__('There is no quiz for this lesson yet - please add one in the \'Quiz Questions\' box.', 'woothemes-sensei').'</em></p>'; | |
| 1598 | 1598 | } | 
| 1599 | 1599 | |
| 1600 | 1600 | echo $html; | 
| 1601 | 1601 | } | 
| 1602 | 1602 | |
| 1603 | -	public function quiz_settings_panel( $lesson_id = 0, $quiz_id = 0 ) { | |
| 1603 | +	public function quiz_settings_panel($lesson_id = 0, $quiz_id = 0) { | |
| 1604 | 1604 | |
| 1605 | 1605 | |
| 1606 | 1606 | $html = ''; | 
| 1607 | 1607 | |
| 1608 | - if( ! $lesson_id && ! $quiz_id ) return $html; | |
| 1608 | + if ( ! $lesson_id && ! $quiz_id) return $html; | |
| 1609 | 1609 | |
| 1610 | - $settings = $this->get_quiz_settings( $quiz_id ); | |
| 1610 | + $settings = $this->get_quiz_settings($quiz_id); | |
| 1611 | 1611 | |
| 1612 | - $html = Sensei()->admin->render_settings( $settings, $quiz_id, 'quiz-settings' ); | |
| 1612 | + $html = Sensei()->admin->render_settings($settings, $quiz_id, 'quiz-settings'); | |
| 1613 | 1613 | |
| 1614 | 1614 | return $html; | 
| 1615 | 1615 | |
| 1616 | 1616 | } | 
| 1617 | 1617 | |
| 1618 | -	public function get_quiz_settings( $quiz_id = 0 ) { | |
| 1618 | +	public function get_quiz_settings($quiz_id = 0) { | |
| 1619 | 1619 | |
| 1620 | 1620 | $disable_passmark = ''; | 
| 1621 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); | |
| 1622 | -		if( ! $pass_required ) { | |
| 1621 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); | |
| 1622 | +		if ( ! $pass_required) { | |
| 1623 | 1623 | $disable_passmark = 'hidden'; | 
| 1624 | 1624 | } | 
| 1625 | 1625 | |
| 1626 | 1626 | // Setup Questions Query | 
| 1627 | 1627 | $questions = array(); | 
| 1628 | -		if ( 0 < $quiz_id ) { | |
| 1629 | - $questions = $this->lesson_quiz_questions( $quiz_id ); | |
| 1628 | +		if (0 < $quiz_id) { | |
| 1629 | + $questions = $this->lesson_quiz_questions($quiz_id); | |
| 1630 | 1630 | } | 
| 1631 | 1631 | |
| 1632 | 1632 | // Count questions | 
| 1633 | 1633 | $question_count = 0; | 
| 1634 | -		foreach( $questions as $question ) { | |
| 1635 | -			if( $question->post_type == 'multiple_question' ) { | |
| 1636 | - $question_number = get_post_meta( $question->ID, 'number', true ); | |
| 1634 | +		foreach ($questions as $question) { | |
| 1635 | +			if ($question->post_type == 'multiple_question') { | |
| 1636 | + $question_number = get_post_meta($question->ID, 'number', true); | |
| 1637 | 1637 | $question_count += $question_number; | 
| 1638 | 1638 |  			} else { | 
| 1639 | 1639 | ++$question_count; | 
| @@ -1643,15 +1643,15 @@ discard block | ||
| 1643 | 1643 | $settings = array( | 
| 1644 | 1644 | array( | 
| 1645 | 1645 | 'id' => 'pass_required', | 
| 1646 | - 'label' => __( 'Pass required to complete lesson', 'woothemes-sensei' ), | |
| 1647 | - 'description' => __( 'The passmark must be achieved before the lesson is complete.', 'woothemes-sensei' ), | |
| 1646 | +				'label'			=> __('Pass required to complete lesson', 'woothemes-sensei'), | |
| 1647 | +				'description'	=> __('The passmark must be achieved before the lesson is complete.', 'woothemes-sensei'), | |
| 1648 | 1648 | 'type' => 'checkbox', | 
| 1649 | 1649 | 'default' => '', | 
| 1650 | 1650 | 'checked' => 'on', | 
| 1651 | 1651 | ), | 
| 1652 | 1652 | array( | 
| 1653 | 1653 | 'id' => 'quiz_passmark', | 
| 1654 | - 'label' => __( 'Quiz passmark percentage', 'woothemes-sensei' ), | |
| 1654 | +				'label'			=> __('Quiz passmark percentage', 'woothemes-sensei'), | |
| 1655 | 1655 | 'description' => '', | 
| 1656 | 1656 | 'type' => 'number', | 
| 1657 | 1657 | 'default' => 0, | 
| @@ -1662,17 +1662,17 @@ discard block | ||
| 1662 | 1662 | ), | 
| 1663 | 1663 | array( | 
| 1664 | 1664 | 'id' => 'show_questions', | 
| 1665 | - 'label' => __( 'Number of questions to show', 'woothemes-sensei' ), | |
| 1666 | - 'description' => __( 'Show a random selection of questions from this quiz each time a student views it.', 'woothemes-sensei' ), | |
| 1665 | +				'label'			=> __('Number of questions to show', 'woothemes-sensei'), | |
| 1666 | +				'description'	=> __('Show a random selection of questions from this quiz each time a student views it.', 'woothemes-sensei'), | |
| 1667 | 1667 | 'type' => 'number', | 
| 1668 | 1668 | 'default' => '', | 
| 1669 | - 'placeholder' => __( 'All', 'woothemes-sensei' ), | |
| 1669 | +				'placeholder'	=> __('All', 'woothemes-sensei'), | |
| 1670 | 1670 | 'min' => 1, | 
| 1671 | 1671 | 'max' => $question_count, | 
| 1672 | 1672 | ), | 
| 1673 | 1673 | array( | 
| 1674 | 1674 | 'id' => 'random_question_order', | 
| 1675 | - 'label' => __( 'Randomise question order', 'woothemes-sensei' ), | |
| 1675 | +				'label'			=> __('Randomise question order', 'woothemes-sensei'), | |
| 1676 | 1676 | 'description' => '', | 
| 1677 | 1677 | 'type' => 'checkbox', | 
| 1678 | 1678 | 'default' => 'no', | 
| @@ -1680,23 +1680,23 @@ discard block | ||
| 1680 | 1680 | ), | 
| 1681 | 1681 | array( | 
| 1682 | 1682 | 'id' => 'quiz_grade_type', | 
| 1683 | - 'label' => __( 'Grade quiz automatically', 'woothemes-sensei' ), | |
| 1684 | - 'description' => __( 'Grades quiz and displays answer explanation immediately after completion. Only applicable if quiz is limited to Multiple Choice, True/False and Gap Fill questions. Questions that have a grade of zero are skipped during autograding.', 'woothemes-sensei' ), | |
| 1683 | +				'label'			=> __('Grade quiz automatically', 'woothemes-sensei'), | |
| 1684 | +				'description'	=> __('Grades quiz and displays answer explanation immediately after completion. Only applicable if quiz is limited to Multiple Choice, True/False and Gap Fill questions. Questions that have a grade of zero are skipped during autograding.', 'woothemes-sensei'), | |
| 1685 | 1685 | 'type' => 'checkbox', | 
| 1686 | 1686 | 'default' => 'auto', | 
| 1687 | 1687 | 'checked' => 'auto', | 
| 1688 | 1688 | ), | 
| 1689 | 1689 | array( | 
| 1690 | 1690 | 'id' => 'enable_quiz_reset', | 
| 1691 | - 'label' => __( 'Allow user to retake the quiz', 'woothemes-sensei' ), | |
| 1692 | - 'description' => __( 'Enables the quiz reset button.', 'woothemes-sensei' ), | |
| 1691 | +				'label'			=> __('Allow user to retake the quiz', 'woothemes-sensei'), | |
| 1692 | +				'description'	=> __('Enables the quiz reset button.', 'woothemes-sensei'), | |
| 1693 | 1693 | 'type' => 'checkbox', | 
| 1694 | 1694 | 'default' => '', | 
| 1695 | 1695 | 'checked' => 'on', | 
| 1696 | 1696 | ), | 
| 1697 | 1697 | ); | 
| 1698 | 1698 | |
| 1699 | - return apply_filters( 'sensei_quiz_settings', $settings ); | |
| 1699 | +		return apply_filters('sensei_quiz_settings', $settings); | |
| 1700 | 1700 | } | 
| 1701 | 1701 | |
| 1702 | 1702 | /** | 
| @@ -1705,38 +1705,38 @@ discard block | ||
| 1705 | 1705 | * @access public | 
| 1706 | 1706 | * @return void | 
| 1707 | 1707 | */ | 
| 1708 | -	public function enqueue_scripts( $hook ) { | |
| 1708 | +	public function enqueue_scripts($hook) { | |
| 1709 | 1709 | global $post_type; | 
| 1710 | 1710 | |
| 1711 | - $allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question' ) ); | |
| 1712 | - $allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) ); | |
| 1713 | - $allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order' ) ); | |
| 1711 | +		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question')); | |
| 1712 | +		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php')); | |
| 1713 | +		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings', 'lesson-order')); | |
| 1714 | 1714 | |
| 1715 | 1715 | // Test for Write Panel Pages | 
| 1716 | -		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) { | |
| 1716 | +		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) { | |
| 1717 | 1717 | |
| 1718 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; | |
| 1718 | +			$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | |
| 1719 | 1719 | |
| 1720 | 1720 | // Load the lessons script | 
| 1721 | 1721 | wp_enqueue_media(); | 
| 1722 | - wp_enqueue_script( 'sensei-lesson-metadata', Sensei()->plugin_url . 'assets/js/lesson-metadata' . $suffix . '.js', array( 'jquery', 'sensei-core-select2' ,'jquery-ui-sortable' ), Sensei()->version, true ); | |
| 1723 | - wp_enqueue_script( 'sensei-lesson-chosen', Sensei()->plugin_url . 'assets/chosen/chosen.jquery' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true ); | |
| 1724 | - wp_enqueue_script( 'sensei-chosen-ajax', Sensei()->plugin_url . 'assets/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'sensei-lesson-chosen' ), Sensei()->version, true ); | |
| 1722 | +			wp_enqueue_script('sensei-lesson-metadata', Sensei()->plugin_url.'assets/js/lesson-metadata'.$suffix.'.js', array('jquery', 'sensei-core-select2', 'jquery-ui-sortable'), Sensei()->version, true); | |
| 1723 | +			wp_enqueue_script('sensei-lesson-chosen', Sensei()->plugin_url.'assets/chosen/chosen.jquery'.$suffix.'.js', array('jquery'), Sensei()->version, true); | |
| 1724 | +			wp_enqueue_script('sensei-chosen-ajax', Sensei()->plugin_url.'assets/chosen/ajax-chosen.jquery'.$suffix.'.js', array('jquery', 'sensei-lesson-chosen'), Sensei()->version, true); | |
| 1725 | 1725 | |
| 1726 | 1726 | // Load the bulk edit screen script | 
| 1727 | -            if( 'edit.php' == $hook && 'lesson'==$_GET['post_type'] ) { | |
| 1728 | - wp_enqueue_script( 'sensei-lessons-bulk-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-bulk-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version , true); | |
| 1727 | +            if ('edit.php' == $hook && 'lesson' == $_GET['post_type']) { | |
| 1728 | +                wp_enqueue_script('sensei-lessons-bulk-edit', Sensei()->plugin_url.'assets/js/admin/lesson-bulk-edit'.$suffix.'.js', array('jquery'), Sensei()->version, true); | |
| 1729 | 1729 | } | 
| 1730 | 1730 | |
| 1731 | 1731 | // Localise script | 
| 1732 | - $translation_strings = array( 'right_colon' => __( 'Right:', 'woothemes-sensei' ), 'wrong_colon' => __( 'Wrong:', 'woothemes-sensei' ), 'add_file' => __( 'Add file', 'woothemes-sensei' ), 'change_file' => __( 'Change file', 'woothemes-sensei' ), 'confirm_remove' => __( 'Are you sure you want to remove this question?', 'woothemes-sensei' ), 'confirm_remove_multiple' => __( 'Are you sure you want to remove these questions?', 'woothemes-sensei' ), 'too_many_for_cat' => __( 'You have selected more questions than this category contains - please reduce the number of questions that you are adding.', 'woothemes-sensei' ) ); | |
| 1733 | - $ajax_vars = array( 'lesson_update_question_nonce' => wp_create_nonce( 'lesson_update_question_nonce' ), 'lesson_add_course_nonce' => wp_create_nonce( 'lesson_add_course_nonce' ), 'lesson_update_grade_type_nonce' => wp_create_nonce( 'lesson_update_grade_type_nonce' ), 'lesson_update_question_order_nonce' => wp_create_nonce( 'lesson_update_question_order_nonce' ), 'lesson_update_question_order_random_nonce' => wp_create_nonce( 'lesson_update_question_order_random_nonce' ), 'lesson_add_multiple_questions_nonce' => wp_create_nonce( 'lesson_add_multiple_questions_nonce' ), 'lesson_remove_multiple_questions_nonce' => wp_create_nonce( 'lesson_remove_multiple_questions_nonce' ), 'lesson_add_existing_questions_nonce' => wp_create_nonce( 'lesson_add_existing_questions_nonce' ), 'filter_existing_questions_nonce' => wp_create_nonce( 'filter_existing_questions_nonce' ) ); | |
| 1734 | - $data = array_merge( $translation_strings, $ajax_vars ); | |
| 1735 | - wp_localize_script( 'sensei-lesson-metadata', 'woo_localized_data', $data ); | |
| 1732 | +			$translation_strings = array('right_colon' => __('Right:', 'woothemes-sensei'), 'wrong_colon' => __('Wrong:', 'woothemes-sensei'), 'add_file' => __('Add file', 'woothemes-sensei'), 'change_file' => __('Change file', 'woothemes-sensei'), 'confirm_remove' => __('Are you sure you want to remove this question?', 'woothemes-sensei'), 'confirm_remove_multiple' => __('Are you sure you want to remove these questions?', 'woothemes-sensei'), 'too_many_for_cat' => __('You have selected more questions than this category contains - please reduce the number of questions that you are adding.', 'woothemes-sensei')); | |
| 1733 | +			$ajax_vars = array('lesson_update_question_nonce' => wp_create_nonce('lesson_update_question_nonce'), 'lesson_add_course_nonce' => wp_create_nonce('lesson_add_course_nonce'), 'lesson_update_grade_type_nonce' => wp_create_nonce('lesson_update_grade_type_nonce'), 'lesson_update_question_order_nonce' => wp_create_nonce('lesson_update_question_order_nonce'), 'lesson_update_question_order_random_nonce' => wp_create_nonce('lesson_update_question_order_random_nonce'), 'lesson_add_multiple_questions_nonce' => wp_create_nonce('lesson_add_multiple_questions_nonce'), 'lesson_remove_multiple_questions_nonce' => wp_create_nonce('lesson_remove_multiple_questions_nonce'), 'lesson_add_existing_questions_nonce' => wp_create_nonce('lesson_add_existing_questions_nonce'), 'filter_existing_questions_nonce' => wp_create_nonce('filter_existing_questions_nonce')); | |
| 1734 | + $data = array_merge($translation_strings, $ajax_vars); | |
| 1735 | +			wp_localize_script('sensei-lesson-metadata', 'woo_localized_data', $data); | |
| 1736 | 1736 | |
| 1737 | 1737 | // Chosen RTL | 
| 1738 | -			if ( is_rtl() ) { | |
| 1739 | - wp_enqueue_script( 'sensei-chosen-rtl', Sensei()->plugin_url . 'assets/chosen/chosen-rtl' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true ); | |
| 1738 | +			if (is_rtl()) { | |
| 1739 | +				wp_enqueue_script('sensei-chosen-rtl', Sensei()->plugin_url.'assets/chosen/chosen-rtl'.$suffix.'.js', array('jquery'), Sensei()->version, true); | |
| 1740 | 1740 | } | 
| 1741 | 1741 | |
| 1742 | 1742 | } | 
| @@ -1750,16 +1750,16 @@ discard block | ||
| 1750 | 1750 | * @since 1.4.0 | 
| 1751 | 1751 | * @return void | 
| 1752 | 1752 | */ | 
| 1753 | -	public function enqueue_styles ( $hook ) { | |
| 1753 | +	public function enqueue_styles($hook) { | |
| 1754 | 1754 | global $post_type; | 
| 1755 | 1755 | |
| 1756 | - $allowed_post_types = apply_filters( 'sensei_scripts_allowed_post_types', array( 'lesson', 'course', 'question', 'sensei_message' ) ); | |
| 1757 | - $allowed_post_type_pages = apply_filters( 'sensei_scripts_allowed_post_type_pages', array( 'edit.php', 'post-new.php', 'post.php', 'edit-tags.php' ) ); | |
| 1758 | - $allowed_pages = apply_filters( 'sensei_scripts_allowed_pages', array( 'sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings' ) ); | |
| 1756 | +		$allowed_post_types = apply_filters('sensei_scripts_allowed_post_types', array('lesson', 'course', 'question', 'sensei_message')); | |
| 1757 | +		$allowed_post_type_pages = apply_filters('sensei_scripts_allowed_post_type_pages', array('edit.php', 'post-new.php', 'post.php', 'edit-tags.php')); | |
| 1758 | +		$allowed_pages = apply_filters('sensei_scripts_allowed_pages', array('sensei_grading', 'sensei_analysis', 'sensei_learners', 'sensei_updates', 'woothemes-sensei-settings')); | |
| 1759 | 1759 | |
| 1760 | 1760 | // Test for Write Panel Pages | 
| 1761 | -		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $_GET['page'] ) && in_array( $_GET['page'], $allowed_pages ) ) ) { | |
| 1762 | - wp_enqueue_style( 'woothemes-sensei-settings-api', esc_url( Sensei()->plugin_url . 'assets/css/settings.css' ), '', Sensei()->version ); | |
| 1761 | +		if (((isset($post_type) && in_array($post_type, $allowed_post_types)) && (isset($hook) && in_array($hook, $allowed_post_type_pages))) || (isset($_GET['page']) && in_array($_GET['page'], $allowed_pages))) { | |
| 1762 | +			wp_enqueue_style('woothemes-sensei-settings-api', esc_url(Sensei()->plugin_url.'assets/css/settings.css'), '', Sensei()->version); | |
| 1763 | 1763 | } | 
| 1764 | 1764 | |
| 1765 | 1765 | } // End enqueue_styles() | 
| @@ -1771,12 +1771,12 @@ discard block | ||
| 1771 | 1771 | * @param array $defaults | 
| 1772 | 1772 | * @return array $new_columns | 
| 1773 | 1773 | */ | 
| 1774 | -	public function add_column_headings ( $defaults ) { | |
| 1774 | +	public function add_column_headings($defaults) { | |
| 1775 | 1775 | $new_columns['cb'] = '<input type="checkbox" />'; | 
| 1776 | - $new_columns['title'] = _x( 'Lesson Title', 'column name', 'woothemes-sensei' ); | |
| 1777 | - $new_columns['lesson-course'] = _x( 'Course', 'column name', 'woothemes-sensei' ); | |
| 1778 | - $new_columns['lesson-prerequisite'] = _x( 'Pre-requisite Lesson', 'column name', 'woothemes-sensei' ); | |
| 1779 | -		if ( isset( $defaults['date'] ) ) { | |
| 1776 | +		$new_columns['title'] = _x('Lesson Title', 'column name', 'woothemes-sensei'); | |
| 1777 | +		$new_columns['lesson-course'] = _x('Course', 'column name', 'woothemes-sensei'); | |
| 1778 | +		$new_columns['lesson-prerequisite'] = _x('Pre-requisite Lesson', 'column name', 'woothemes-sensei'); | |
| 1779 | +		if (isset($defaults['date'])) { | |
| 1780 | 1780 | $new_columns['date'] = $defaults['date']; | 
| 1781 | 1781 | } | 
| 1782 | 1782 | return $new_columns; | 
| @@ -1790,23 +1790,23 @@ discard block | ||
| 1790 | 1790 | * @param int $id | 
| 1791 | 1791 | * @return void | 
| 1792 | 1792 | */ | 
| 1793 | -	public function add_column_data ( $column_name, $id ) { | |
| 1793 | +	public function add_column_data($column_name, $id) { | |
| 1794 | 1794 | global $wpdb, $post; | 
| 1795 | 1795 | |
| 1796 | -		switch ( $column_name ) { | |
| 1796 | +		switch ($column_name) { | |
| 1797 | 1797 | case 'id': | 
| 1798 | 1798 | echo $id; | 
| 1799 | 1799 | break; | 
| 1800 | 1800 | case 'lesson-course': | 
| 1801 | - $lesson_course_id = get_post_meta( $id, '_lesson_course', true); | |
| 1802 | -				if ( 0 < absint( $lesson_course_id ) ) { | |
| 1803 | - echo '<a href="' . esc_url( get_edit_post_link( absint( $lesson_course_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $lesson_course_id ) ) ) ) . '">' . get_the_title( absint( $lesson_course_id ) ) . '</a>'; | |
| 1801 | + $lesson_course_id = get_post_meta($id, '_lesson_course', true); | |
| 1802 | +				if (0 < absint($lesson_course_id)) { | |
| 1803 | +					echo '<a href="'.esc_url(get_edit_post_link(absint($lesson_course_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($lesson_course_id)))).'">'.get_the_title(absint($lesson_course_id)).'</a>'; | |
| 1804 | 1804 | } // End If Statement | 
| 1805 | 1805 | break; | 
| 1806 | 1806 | case 'lesson-prerequisite': | 
| 1807 | - $lesson_prerequisite_id = get_post_meta( $id, '_lesson_prerequisite', true); | |
| 1808 | -				if ( 0 < absint( $lesson_prerequisite_id ) ) { | |
| 1809 | - echo '<a href="' . esc_url( get_edit_post_link( absint( $lesson_prerequisite_id ) ) ) . '" title="' . esc_attr( sprintf( __( 'Edit %s', 'woothemes-sensei' ), get_the_title( absint( $lesson_prerequisite_id ) ) ) ) . '">' . get_the_title( absint( $lesson_prerequisite_id ) ) . '</a>'; | |
| 1807 | + $lesson_prerequisite_id = get_post_meta($id, '_lesson_prerequisite', true); | |
| 1808 | +				if (0 < absint($lesson_prerequisite_id)) { | |
| 1809 | +					echo '<a href="'.esc_url(get_edit_post_link(absint($lesson_prerequisite_id))).'" title="'.esc_attr(sprintf(__('Edit %s', 'woothemes-sensei'), get_the_title(absint($lesson_prerequisite_id)))).'">'.get_the_title(absint($lesson_prerequisite_id)).'</a>'; | |
| 1810 | 1810 | } // End If Statement | 
| 1811 | 1811 | break; | 
| 1812 | 1812 | default: | 
| @@ -1820,14 +1820,14 @@ discard block | ||
| 1820 | 1820 | * @access public | 
| 1821 | 1821 | * @return void | 
| 1822 | 1822 | */ | 
| 1823 | -	public function lesson_add_course () { | |
| 1823 | +	public function lesson_add_course() { | |
| 1824 | 1824 | global $current_user; | 
| 1825 | 1825 | //Add nonce security to the request | 
| 1826 | -		if ( isset($_POST['lesson_add_course_nonce']) ) { | |
| 1827 | - $nonce = esc_html( $_POST['lesson_add_course_nonce'] ); | |
| 1826 | +		if (isset($_POST['lesson_add_course_nonce'])) { | |
| 1827 | + $nonce = esc_html($_POST['lesson_add_course_nonce']); | |
| 1828 | 1828 | } // End If Statement | 
| 1829 | - if ( ! wp_verify_nonce( $nonce, 'lesson_add_course_nonce' ) | |
| 1830 | -            || ! current_user_can( 'edit_lessons' ) ) { | |
| 1829 | + if ( ! wp_verify_nonce($nonce, 'lesson_add_course_nonce') | |
| 1830 | +            || ! current_user_can('edit_lessons')) { | |
| 1831 | 1831 |  			die(''); | 
| 1832 | 1832 | } // End If Statement | 
| 1833 | 1833 | // Parse POST data | 
| @@ -1849,14 +1849,14 @@ discard block | ||
| 1849 | 1849 | * @access public | 
| 1850 | 1850 | * @return void | 
| 1851 | 1851 | */ | 
| 1852 | -	public function lesson_update_question () { | |
| 1852 | +	public function lesson_update_question() { | |
| 1853 | 1853 | global $current_user; | 
| 1854 | 1854 | //Add nonce security to the request | 
| 1855 | -		if ( isset($_POST['lesson_update_question_nonce']) ) { | |
| 1856 | - $nonce = esc_html( $_POST['lesson_update_question_nonce'] ); | |
| 1855 | +		if (isset($_POST['lesson_update_question_nonce'])) { | |
| 1856 | + $nonce = esc_html($_POST['lesson_update_question_nonce']); | |
| 1857 | 1857 | } // End If Statement | 
| 1858 | - if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_nonce' ) | |
| 1859 | -            ||  ! current_user_can( 'edit_questions' )) { | |
| 1858 | + if ( ! wp_verify_nonce($nonce, 'lesson_update_question_nonce') | |
| 1859 | +            ||  ! current_user_can('edit_questions')) { | |
| 1860 | 1860 | |
| 1861 | 1861 |  			die(''); | 
| 1862 | 1862 | |
| @@ -1866,30 +1866,30 @@ discard block | ||
| 1866 | 1866 | // WP slashes all incoming data regardless of Magic Quotes setting (see wp_magic_quotes()), which means that | 
| 1867 | 1867 | // even the $_POST['data'] encoded with encodeURIComponent has it's apostrophes slashed. | 
| 1868 | 1868 | // So first restore the original unslashed apostrophes by removing those slashes | 
| 1869 | - $data = wp_unslash( $_POST['data'] ); | |
| 1869 | + $data = wp_unslash($_POST['data']); | |
| 1870 | 1870 | // Then parse the string to an array (note that parse_str automatically urldecodes all the variables) | 
| 1871 | 1871 | $question_data = array(); | 
| 1872 | 1872 | parse_str($data, $question_data); | 
| 1873 | 1873 | // Finally re-slash all elements to ensure consistancy for lesson_save_question() | 
| 1874 | - $question_data = wp_slash( $question_data ); | |
| 1874 | + $question_data = wp_slash($question_data); | |
| 1875 | 1875 | // Save the question | 
| 1876 | 1876 | $return = false; | 
| 1877 | 1877 | // Question Save and Delete logic | 
| 1878 | -		if ( isset( $question_data['action'] ) && ( $question_data['action'] == 'delete' ) ) { | |
| 1878 | +		if (isset($question_data['action']) && ($question_data['action'] == 'delete')) { | |
| 1879 | 1879 | // Delete the Question | 
| 1880 | 1880 | $return = $this->lesson_delete_question($question_data); | 
| 1881 | 1881 |  		} else { | 
| 1882 | 1882 | // Save the Question | 
| 1883 | -			if ( isset( $question_data['quiz_id'] ) && ( 0 < absint( $question_data['quiz_id'] ) ) ) { | |
| 1883 | +			if (isset($question_data['quiz_id']) && (0 < absint($question_data['quiz_id']))) { | |
| 1884 | 1884 | $current_user = wp_get_current_user(); | 
| 1885 | 1885 | $question_data['post_author'] = $current_user->ID; | 
| 1886 | - $question_id = $this->lesson_save_question( $question_data ); | |
| 1887 | - $question_type = Sensei()->question->get_question_type( $question_id ); | |
| 1886 | + $question_id = $this->lesson_save_question($question_data); | |
| 1887 | + $question_type = Sensei()->question->get_question_type($question_id); | |
| 1888 | 1888 | |
| 1889 | - $question_count = intval( $question_data['question_count'] ); | |
| 1889 | + $question_count = intval($question_data['question_count']); | |
| 1890 | 1890 | ++$question_count; | 
| 1891 | 1891 | |
| 1892 | - $return = $this->quiz_panel_question( $question_type, $question_count, $question_id ); | |
| 1892 | + $return = $this->quiz_panel_question($question_type, $question_count, $question_id); | |
| 1893 | 1893 | } // End If Statement | 
| 1894 | 1894 | } // End If Statement | 
| 1895 | 1895 | |
| @@ -1904,49 +1904,49 @@ discard block | ||
| 1904 | 1904 | |
| 1905 | 1905 | //Add nonce security to the request | 
| 1906 | 1906 | $nonce = ''; | 
| 1907 | -		if( isset( $_POST['lesson_add_multiple_questions_nonce'] ) ) { | |
| 1908 | - $nonce = esc_html( $_POST['lesson_add_multiple_questions_nonce'] ); | |
| 1907 | +		if (isset($_POST['lesson_add_multiple_questions_nonce'])) { | |
| 1908 | + $nonce = esc_html($_POST['lesson_add_multiple_questions_nonce']); | |
| 1909 | 1909 | } // End If Statement | 
| 1910 | 1910 | |
| 1911 | - if( ! wp_verify_nonce( $nonce, 'lesson_add_multiple_questions_nonce' ) | |
| 1912 | -            || ! current_user_can( 'edit_lessons' ) ) { | |
| 1913 | - die( $return ); | |
| 1911 | + if ( ! wp_verify_nonce($nonce, 'lesson_add_multiple_questions_nonce') | |
| 1912 | +            || ! current_user_can('edit_lessons')) { | |
| 1913 | + die($return); | |
| 1914 | 1914 | } // End If Statement | 
| 1915 | 1915 | |
| 1916 | 1916 | // Parse POST data | 
| 1917 | 1917 | $data = $_POST['data']; | 
| 1918 | 1918 | $question_data = array(); | 
| 1919 | - parse_str( $data, $question_data ); | |
| 1919 | + parse_str($data, $question_data); | |
| 1920 | 1920 | |
| 1921 | -		if( is_array( $question_data ) ) { | |
| 1922 | -			if( isset( $question_data['quiz_id'] ) && ( 0 < absint( $question_data['quiz_id'] ) ) ) { | |
| 1921 | +		if (is_array($question_data)) { | |
| 1922 | +			if (isset($question_data['quiz_id']) && (0 < absint($question_data['quiz_id']))) { | |
| 1923 | 1923 | |
| 1924 | - $quiz_id = intval( $question_data['quiz_id'] ); | |
| 1925 | - $question_number = intval( $question_data['question_number'] ); | |
| 1926 | - $question_category = intval( $question_data['question_category'] ); | |
| 1924 | + $quiz_id = intval($question_data['quiz_id']); | |
| 1925 | + $question_number = intval($question_data['question_number']); | |
| 1926 | + $question_category = intval($question_data['question_category']); | |
| 1927 | 1927 | |
| 1928 | - $question_counter = intval( $question_data['question_count'] ); | |
| 1928 | + $question_counter = intval($question_data['question_count']); | |
| 1929 | 1929 | ++$question_counter; | 
| 1930 | 1930 | |
| 1931 | - $cat = get_term( $question_category, 'question-category' ); | |
| 1931 | + $cat = get_term($question_category, 'question-category'); | |
| 1932 | 1932 | |
| 1933 | 1933 | $post_data = array( | 
| 1934 | 1934 | 'post_content' => '', | 
| 1935 | 1935 | 'post_status' => 'publish', | 
| 1936 | - 'post_title' => sprintf( __( '%1$s Question(s) from %2$s', 'woothemes-sensei' ), $question_number, $cat->name ), | |
| 1936 | +					'post_title' => sprintf(__('%1$s Question(s) from %2$s', 'woothemes-sensei'), $question_number, $cat->name), | |
| 1937 | 1937 | 'post_type' => 'multiple_question' | 
| 1938 | 1938 | ); | 
| 1939 | 1939 | |
| 1940 | - $multiple_id = wp_insert_post( $post_data ); | |
| 1940 | + $multiple_id = wp_insert_post($post_data); | |
| 1941 | 1941 | |
| 1942 | -				if( $multiple_id && ! is_wp_error( $multiple_id ) ) { | |
| 1943 | - add_post_meta( $multiple_id, 'category', $question_category ); | |
| 1944 | - add_post_meta( $multiple_id, 'number', $question_number ); | |
| 1945 | - add_post_meta( $multiple_id, '_quiz_id', $quiz_id, false ); | |
| 1946 | - add_post_meta( $multiple_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_counter ); | |
| 1947 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 1948 | - update_post_meta( $lesson_id, '_quiz_has_questions', '1' ); | |
| 1949 | - $return = $this->quiz_panel_question( 'category', $question_counter, $multiple_id, 'quiz', array( $cat->name, $question_number ) ); | |
| 1942 | +				if ($multiple_id && ! is_wp_error($multiple_id)) { | |
| 1943 | + add_post_meta($multiple_id, 'category', $question_category); | |
| 1944 | + add_post_meta($multiple_id, 'number', $question_number); | |
| 1945 | + add_post_meta($multiple_id, '_quiz_id', $quiz_id, false); | |
| 1946 | + add_post_meta($multiple_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_counter); | |
| 1947 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 1948 | + update_post_meta($lesson_id, '_quiz_has_questions', '1'); | |
| 1949 | +					$return = $this->quiz_panel_question('category', $question_counter, $multiple_id, 'quiz', array($cat->name, $question_number)); | |
| 1950 | 1950 | } | 
| 1951 | 1951 | } | 
| 1952 | 1952 | } | 
| @@ -1960,25 +1960,25 @@ discard block | ||
| 1960 | 1960 | |
| 1961 | 1961 | //Add nonce security to the request | 
| 1962 | 1962 | $nonce = ''; | 
| 1963 | -		if( isset( $_POST['lesson_remove_multiple_questions_nonce'] ) ) { | |
| 1964 | - $nonce = esc_html( $_POST['lesson_remove_multiple_questions_nonce'] ); | |
| 1963 | +		if (isset($_POST['lesson_remove_multiple_questions_nonce'])) { | |
| 1964 | + $nonce = esc_html($_POST['lesson_remove_multiple_questions_nonce']); | |
| 1965 | 1965 | } // End If Statement | 
| 1966 | 1966 | |
| 1967 | - if( ! wp_verify_nonce( $nonce, 'lesson_remove_multiple_questions_nonce' ) | |
| 1968 | -        || ! current_user_can( 'edit_lessons' ) ) { | |
| 1967 | + if ( ! wp_verify_nonce($nonce, 'lesson_remove_multiple_questions_nonce') | |
| 1968 | +        || ! current_user_can('edit_lessons')) { | |
| 1969 | 1969 |  			die(''); | 
| 1970 | 1970 | } // End If Statement | 
| 1971 | 1971 | |
| 1972 | 1972 | // Parse POST data | 
| 1973 | 1973 | $data = $_POST['data']; | 
| 1974 | 1974 | $question_data = array(); | 
| 1975 | - parse_str( $data, $question_data ); | |
| 1975 | + parse_str($data, $question_data); | |
| 1976 | 1976 | |
| 1977 | -		if( is_array( $question_data ) ) { | |
| 1978 | - wp_delete_post( $question_data['question_id'], true ); | |
| 1977 | +		if (is_array($question_data)) { | |
| 1978 | + wp_delete_post($question_data['question_id'], true); | |
| 1979 | 1979 | } | 
| 1980 | 1980 | |
| 1981 | - die( 'Deleted' ); | |
| 1981 | +		die('Deleted'); | |
| 1982 | 1982 | } | 
| 1983 | 1983 | |
| 1984 | 1984 |  	public function get_question_category_limit() { | 
| @@ -1989,11 +1989,11 @@ discard block | ||
| 1989 | 1989 | // Parse POST data | 
| 1990 | 1990 | $data = $_POST['data']; | 
| 1991 | 1991 | $cat_data = array(); | 
| 1992 | - parse_str( $data, $cat_data ); | |
| 1992 | + parse_str($data, $cat_data); | |
| 1993 | 1993 | |
| 1994 | -		if( isset( $cat_data['cat'] ) && '' != $cat_data['cat'] ) { | |
| 1995 | - $cat = get_term( $cat_data['cat'], 'question-category' ); | |
| 1996 | -			if( isset( $cat->count ) ) { | |
| 1994 | +		if (isset($cat_data['cat']) && '' != $cat_data['cat']) { | |
| 1995 | + $cat = get_term($cat_data['cat'], 'question-category'); | |
| 1996 | +			if (isset($cat->count)) { | |
| 1997 | 1997 | $return = $cat->count; | 
| 1998 | 1998 | } | 
| 1999 | 1999 | } | 
| @@ -2007,45 +2007,45 @@ discard block | ||
| 2007 | 2007 | |
| 2008 | 2008 | //Add nonce security to the request | 
| 2009 | 2009 | $nonce = ''; | 
| 2010 | -		if( isset( $_POST['lesson_add_existing_questions_nonce'] ) ) { | |
| 2011 | - $nonce = esc_html( $_POST['lesson_add_existing_questions_nonce'] ); | |
| 2010 | +		if (isset($_POST['lesson_add_existing_questions_nonce'])) { | |
| 2011 | + $nonce = esc_html($_POST['lesson_add_existing_questions_nonce']); | |
| 2012 | 2012 | } // End If Statement | 
| 2013 | 2013 | |
| 2014 | - if( ! wp_verify_nonce( $nonce, 'lesson_add_existing_questions_nonce' ) | |
| 2015 | -        || ! current_user_can( 'edit_lessons' ) ) { | |
| 2014 | + if ( ! wp_verify_nonce($nonce, 'lesson_add_existing_questions_nonce') | |
| 2015 | +        || ! current_user_can('edit_lessons')) { | |
| 2016 | 2016 |  			die(''); | 
| 2017 | 2017 | } // End If Statement | 
| 2018 | 2018 | |
| 2019 | 2019 | // Parse POST data | 
| 2020 | 2020 | $data = $_POST['data']; | 
| 2021 | 2021 | $question_data = array(); | 
| 2022 | - parse_str( $data, $question_data ); | |
| 2022 | + parse_str($data, $question_data); | |
| 2023 | 2023 | |
| 2024 | 2024 | $return = ''; | 
| 2025 | 2025 | |
| 2026 | -		if( is_array( $question_data ) ) { | |
| 2026 | +		if (is_array($question_data)) { | |
| 2027 | 2027 | |
| 2028 | -			if( isset( $question_data['questions'] ) && '' != $question_data['questions'] ) { | |
| 2028 | +			if (isset($question_data['questions']) && '' != $question_data['questions']) { | |
| 2029 | 2029 | |
| 2030 | - $questions = explode( ',', trim( $question_data['questions'], ',' ) ); | |
| 2030 | +				$questions = explode(',', trim($question_data['questions'], ',')); | |
| 2031 | 2031 | $quiz_id = $question_data['quiz_id']; | 
| 2032 | - $question_count = intval( $question_data['question_count'] ); | |
| 2032 | + $question_count = intval($question_data['question_count']); | |
| 2033 | 2033 | |
| 2034 | -				foreach( $questions as $question_id ) { | |
| 2034 | +				foreach ($questions as $question_id) { | |
| 2035 | 2035 | |
| 2036 | 2036 | ++$question_count; | 
| 2037 | 2037 | |
| 2038 | - $quizzes = get_post_meta( $question_id, '_quiz_id', false ); | |
| 2039 | -					if( ! in_array( $quiz_id, $quizzes ) ) { | |
| 2040 | - add_post_meta( $question_id, '_quiz_id', $quiz_id, false ); | |
| 2041 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 2042 | - update_post_meta( $lesson_id, '_quiz_has_questions', '1' ); | |
| 2038 | + $quizzes = get_post_meta($question_id, '_quiz_id', false); | |
| 2039 | +					if ( ! in_array($quiz_id, $quizzes)) { | |
| 2040 | + add_post_meta($question_id, '_quiz_id', $quiz_id, false); | |
| 2041 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 2042 | + update_post_meta($lesson_id, '_quiz_has_questions', '1'); | |
| 2043 | 2043 | } | 
| 2044 | 2044 | |
| 2045 | - add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count ); | |
| 2046 | - $question_type = Sensei()->question->get_question_type( $question_id ); | |
| 2045 | + add_post_meta($question_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_count); | |
| 2046 | + $question_type = Sensei()->question->get_question_type($question_id); | |
| 2047 | 2047 | |
| 2048 | - $return .= $this->quiz_panel_question( $question_type, $question_count, $question_id ); | |
| 2048 | + $return .= $this->quiz_panel_question($question_type, $question_count, $question_id); | |
| 2049 | 2049 | } | 
| 2050 | 2050 | } | 
| 2051 | 2051 | } | 
| @@ -2057,14 +2057,14 @@ discard block | ||
| 2057 | 2057 | |
| 2058 | 2058 |  	public function lesson_update_grade_type() { | 
| 2059 | 2059 | //Add nonce security to the request | 
| 2060 | -		if ( isset($_POST['lesson_update_grade_type_nonce']) ) { | |
| 2060 | +		if (isset($_POST['lesson_update_grade_type_nonce'])) { | |
| 2061 | 2061 | |
| 2062 | - $nonce = esc_html( $_POST['lesson_update_grade_type_nonce'] ); | |
| 2062 | + $nonce = esc_html($_POST['lesson_update_grade_type_nonce']); | |
| 2063 | 2063 | |
| 2064 | 2064 | } // End If Statement | 
| 2065 | 2065 | |
| 2066 | - if ( ! wp_verify_nonce( $nonce, 'lesson_update_grade_type_nonce' ) | |
| 2067 | -        || ! current_user_can( 'edit_lessons' ) ) { | |
| 2066 | + if ( ! wp_verify_nonce($nonce, 'lesson_update_grade_type_nonce') | |
| 2067 | +        || ! current_user_can('edit_lessons')) { | |
| 2068 | 2068 | |
| 2069 | 2069 |  			die(''); | 
| 2070 | 2070 | |
| @@ -2074,18 +2074,18 @@ discard block | ||
| 2074 | 2074 | $data = $_POST['data']; | 
| 2075 | 2075 | $quiz_data = array(); | 
| 2076 | 2076 | parse_str($data, $quiz_data); | 
| 2077 | - update_post_meta( $quiz_data['quiz_id'], '_quiz_grade_type', $quiz_data['quiz_grade_type'] ); | |
| 2077 | + update_post_meta($quiz_data['quiz_id'], '_quiz_grade_type', $quiz_data['quiz_grade_type']); | |
| 2078 | 2078 | die(); | 
| 2079 | 2079 | } | 
| 2080 | 2080 | |
| 2081 | 2081 |  	public function lesson_update_question_order() { | 
| 2082 | 2082 | // Add nonce security to the request | 
| 2083 | -		if ( isset($_POST['lesson_update_question_order_nonce']) ) { | |
| 2084 | - $nonce = esc_html( $_POST['lesson_update_question_order_nonce'] ); | |
| 2083 | +		if (isset($_POST['lesson_update_question_order_nonce'])) { | |
| 2084 | + $nonce = esc_html($_POST['lesson_update_question_order_nonce']); | |
| 2085 | 2085 | } // End If Statement | 
| 2086 | 2086 | |
| 2087 | - if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_nonce' ) | |
| 2088 | -            ||! current_user_can( 'edit_lessons' ) ) { | |
| 2087 | + if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_nonce') | |
| 2088 | +            ||! current_user_can('edit_lessons')) { | |
| 2089 | 2089 |  			die(''); | 
| 2090 | 2090 | } // End If Statement | 
| 2091 | 2091 | |
| @@ -2093,25 +2093,25 @@ discard block | ||
| 2093 | 2093 | $data = $_POST['data']; | 
| 2094 | 2094 | $quiz_data = array(); | 
| 2095 | 2095 | parse_str($data, $quiz_data); | 
| 2096 | -		if( strlen( $quiz_data['question_order'] ) > 0 ) { | |
| 2097 | - $questions = explode( ',', $quiz_data['question_order'] ); | |
| 2096 | +		if (strlen($quiz_data['question_order']) > 0) { | |
| 2097 | +			$questions = explode(',', $quiz_data['question_order']); | |
| 2098 | 2098 | $o = 1; | 
| 2099 | -			foreach( $questions as $question_id ) { | |
| 2100 | - update_post_meta( $question_id, '_quiz_question_order' . $quiz_data['quiz_id'], $quiz_data['quiz_id'] . '000' . $o ); | |
| 2099 | +			foreach ($questions as $question_id) { | |
| 2100 | + update_post_meta($question_id, '_quiz_question_order'.$quiz_data['quiz_id'], $quiz_data['quiz_id'].'000'.$o); | |
| 2101 | 2101 | ++$o; | 
| 2102 | 2102 | } | 
| 2103 | - update_post_meta( $quiz_data['quiz_id'], '_question_order', $questions ); | |
| 2103 | + update_post_meta($quiz_data['quiz_id'], '_question_order', $questions); | |
| 2104 | 2104 | } | 
| 2105 | 2105 | die(); | 
| 2106 | 2106 | } | 
| 2107 | 2107 | |
| 2108 | 2108 |  	public function lesson_update_question_order_random() { | 
| 2109 | 2109 | //Add nonce security to the request | 
| 2110 | -		if ( isset($_POST['lesson_update_question_order_random_nonce']) ) { | |
| 2111 | - $nonce = esc_html( $_POST['lesson_update_question_order_random_nonce'] ); | |
| 2110 | +		if (isset($_POST['lesson_update_question_order_random_nonce'])) { | |
| 2111 | + $nonce = esc_html($_POST['lesson_update_question_order_random_nonce']); | |
| 2112 | 2112 | } // End If Statement | 
| 2113 | - if ( ! wp_verify_nonce( $nonce, 'lesson_update_question_order_random_nonce' ) | |
| 2114 | -            || ! current_user_can( 'edit_lessons' ) ) { | |
| 2113 | + if ( ! wp_verify_nonce($nonce, 'lesson_update_question_order_random_nonce') | |
| 2114 | +            || ! current_user_can('edit_lessons')) { | |
| 2115 | 2115 | |
| 2116 | 2116 |  			die(''); | 
| 2117 | 2117 | |
| @@ -2120,7 +2120,7 @@ discard block | ||
| 2120 | 2120 | $data = $_POST['data']; | 
| 2121 | 2121 | $quiz_data = array(); | 
| 2122 | 2122 | parse_str($data, $quiz_data); | 
| 2123 | - update_post_meta( $quiz_data['quiz_id'], '_random_question_order', $quiz_data['random_question_order'] ); | |
| 2123 | + update_post_meta($quiz_data['quiz_id'], '_random_question_order', $quiz_data['random_question_order']); | |
| 2124 | 2124 | die(); | 
| 2125 | 2125 | } | 
| 2126 | 2126 | |
| @@ -2131,7 +2131,7 @@ discard block | ||
| 2131 | 2131 | * @param array $data (default: array()) | 
| 2132 | 2132 | * @return integer|boolean $course_id or false | 
| 2133 | 2133 | */ | 
| 2134 | -	private function lesson_save_course( $data = array() ) { | |
| 2134 | +	private function lesson_save_course($data = array()) { | |
| 2135 | 2135 | global $current_user; | 
| 2136 | 2136 | $return = false; | 
| 2137 | 2137 | // Setup the course data | 
| @@ -2140,58 +2140,58 @@ discard block | ||
| 2140 | 2140 | $course_title = ''; | 
| 2141 | 2141 | $course_prerequisite = 0; | 
| 2142 | 2142 | $course_category = 0; | 
| 2143 | -		if ( isset( $data[ 'course_id' ] ) && ( 0 < absint( $data[ 'course_id' ] ) ) ) { | |
| 2144 | - $course_id = absint( $data[ 'course_id' ] ); | |
| 2143 | +		if (isset($data['course_id']) && (0 < absint($data['course_id']))) { | |
| 2144 | + $course_id = absint($data['course_id']); | |
| 2145 | 2145 | } // End If Statement | 
| 2146 | -		if ( isset( $data[ 'course_title' ] ) && ( '' != $data[ 'course_title' ] ) ) { | |
| 2147 | - $course_title = $data[ 'course_title' ]; | |
| 2146 | +		if (isset($data['course_title']) && ('' != $data['course_title'])) { | |
| 2147 | + $course_title = $data['course_title']; | |
| 2148 | 2148 | } // End If Statement | 
| 2149 | 2149 | $post_title = $course_title; | 
| 2150 | -		if ( isset($data[ 'post_author' ]) ) { | |
| 2151 | - $post_author = $data[ 'post_author' ]; | |
| 2150 | +		if (isset($data['post_author'])) { | |
| 2151 | + $post_author = $data['post_author']; | |
| 2152 | 2152 |  		} else { | 
| 2153 | 2153 | $current_user = wp_get_current_user(); | 
| 2154 | 2154 | $post_author = $current_user->ID; | 
| 2155 | 2155 | } // End If Statement | 
| 2156 | 2156 | $post_status = 'publish'; | 
| 2157 | 2157 | $post_type = 'course'; | 
| 2158 | -		if ( isset( $data[ 'course_content' ] ) && ( '' != $data[ 'course_content' ] ) ) { | |
| 2159 | - $course_content = $data[ 'course_content' ]; | |
| 2158 | +		if (isset($data['course_content']) && ('' != $data['course_content'])) { | |
| 2159 | + $course_content = $data['course_content']; | |
| 2160 | 2160 | } // End If Statement | 
| 2161 | 2161 | $post_content = $course_content; | 
| 2162 | 2162 | // Course Query Arguments | 
| 2163 | - $post_type_args = array( 'post_content' => $post_content, | |
| 2163 | +		$post_type_args = array('post_content' => $post_content, | |
| 2164 | 2164 | 'post_status' => $post_status, | 
| 2165 | 2165 | 'post_title' => $post_title, | 
| 2166 | 2166 | 'post_type' => $post_type | 
| 2167 | 2167 | ); | 
| 2168 | 2168 | // Only save if there is a valid title | 
| 2169 | -  		if ( $post_title != '' ) { | |
| 2169 | +  		if ($post_title != '') { | |
| 2170 | 2170 | // Check for prerequisite courses & product id | 
| 2171 | - $course_prerequisite_id = absint( $data[ 'course_prerequisite' ] ); | |
| 2172 | - $course_woocommerce_product_id = absint( $data[ 'course_woocommerce_product' ] ); | |
| 2173 | - $course_category_id = absint( $data[ 'course_category' ] ); | |
| 2174 | -  		    if ( 0 == $course_woocommerce_product_id ) { $course_woocommerce_product_id = '-'; } | |
| 2171 | + $course_prerequisite_id = absint($data['course_prerequisite']); | |
| 2172 | + $course_woocommerce_product_id = absint($data['course_woocommerce_product']); | |
| 2173 | + $course_category_id = absint($data['course_category']); | |
| 2174 | +  		    if (0 == $course_woocommerce_product_id) { $course_woocommerce_product_id = '-'; } | |
| 2175 | 2175 | // Insert or Update the Lesson Quiz | 
| 2176 | -		    if ( 0 < $course_id ) { | |
| 2177 | - $post_type_args[ 'ID' ] = $course_id; | |
| 2176 | +		    if (0 < $course_id) { | |
| 2177 | + $post_type_args['ID'] = $course_id; | |
| 2178 | 2178 | $course_id = wp_update_post($post_type_args); | 
| 2179 | - update_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id ); | |
| 2180 | - update_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id ); | |
| 2181 | -		    	if ( 0 < $course_category_id ) { | |
| 2182 | - wp_set_object_terms( $course_id, $course_category_id, 'course-category' ); | |
| 2179 | + update_post_meta($course_id, '_course_prerequisite', $course_prerequisite_id); | |
| 2180 | + update_post_meta($course_id, '_course_woocommerce_product', $course_woocommerce_product_id); | |
| 2181 | +		    	if (0 < $course_category_id) { | |
| 2182 | + wp_set_object_terms($course_id, $course_category_id, 'course-category'); | |
| 2183 | 2183 | } // End If Statement | 
| 2184 | 2184 |  		    } else { | 
| 2185 | 2185 | $course_id = wp_insert_post($post_type_args); | 
| 2186 | - add_post_meta( $course_id, '_course_prerequisite', $course_prerequisite_id ); | |
| 2187 | - add_post_meta( $course_id, '_course_woocommerce_product', $course_woocommerce_product_id ); | |
| 2188 | -		    	if ( 0 < $course_category_id ) { | |
| 2189 | - wp_set_object_terms( $course_id, $course_category_id, 'course-category' ); | |
| 2186 | + add_post_meta($course_id, '_course_prerequisite', $course_prerequisite_id); | |
| 2187 | + add_post_meta($course_id, '_course_woocommerce_product', $course_woocommerce_product_id); | |
| 2188 | +		    	if (0 < $course_category_id) { | |
| 2189 | + wp_set_object_terms($course_id, $course_category_id, 'course-category'); | |
| 2190 | 2190 | } // End If Statement | 
| 2191 | 2191 | } // End If Statement | 
| 2192 | 2192 | } // End If Statement | 
| 2193 | 2193 | // Check that the insert or update saved by testing the post id | 
| 2194 | -  		if ( 0 < $course_id ) { | |
| 2194 | +  		if (0 < $course_id) { | |
| 2195 | 2195 | $return = $course_id; | 
| 2196 | 2196 | } // End If Statement | 
| 2197 | 2197 | return $return; | 
| @@ -2205,7 +2205,7 @@ discard block | ||
| 2205 | 2205 | * @param array $data (default: array()) | 
| 2206 | 2206 | * @return integer|boolean $question_id or false | 
| 2207 | 2207 | */ | 
| 2208 | -	public function lesson_save_question( $data = array(), $context = 'quiz' ) { | |
| 2208 | +	public function lesson_save_question($data = array(), $context = 'quiz') { | |
| 2209 | 2209 | $return = false; | 
| 2210 | 2210 | // Save the Questions | 
| 2211 | 2211 | // Setup the Question data | 
| @@ -2217,130 +2217,130 @@ discard block | ||
| 2217 | 2217 | $question_category = ''; | 
| 2218 | 2218 | |
| 2219 | 2219 | // Handle Question Type | 
| 2220 | -		if ( isset( $data[ 'question_type' ] ) && ( '' != $data[ 'question_type' ] ) ) { | |
| 2221 | - $question_type = $data[ 'question_type' ]; | |
| 2220 | +		if (isset($data['question_type']) && ('' != $data['question_type'])) { | |
| 2221 | + $question_type = $data['question_type']; | |
| 2222 | 2222 | } // End If Statement | 
| 2223 | 2223 | |
| 2224 | -		if ( isset( $data[ 'question_category' ] ) && ( '' != $data[ 'question_category' ] ) ) { | |
| 2225 | - $question_category = $data[ 'question_category' ]; | |
| 2224 | +		if (isset($data['question_category']) && ('' != $data['question_category'])) { | |
| 2225 | + $question_category = $data['question_category']; | |
| 2226 | 2226 | } // End If Statement | 
| 2227 | 2227 | |
| 2228 | -		if ( isset( $data[ 'question_id' ] ) && ( 0 < absint( $data[ 'question_id' ] ) ) ) { | |
| 2229 | - $question_id = absint( $data[ 'question_id' ] ); | |
| 2228 | +		if (isset($data['question_id']) && (0 < absint($data['question_id']))) { | |
| 2229 | + $question_id = absint($data['question_id']); | |
| 2230 | 2230 | } // End If Statement | 
| 2231 | -		if ( isset( $data[ 'question' ] ) && ( '' != $data[ 'question' ] ) ) { | |
| 2232 | - $question_text = $data[ 'question' ]; | |
| 2231 | +		if (isset($data['question']) && ('' != $data['question'])) { | |
| 2232 | + $question_text = $data['question']; | |
| 2233 | 2233 | } // End If Statement | 
| 2234 | 2234 | $post_title = $question_text; | 
| 2235 | 2235 | // Handle Default Fields (multiple choice) | 
| 2236 | -		if ( 'multiple-choice' == $question_type && isset( $data[ 'question_right_answers' ] ) && ( '' != $data[ 'question_right_answers' ] ) ) { | |
| 2237 | - $question_right_answers = $data[ 'question_right_answers' ]; | |
| 2236 | +		if ('multiple-choice' == $question_type && isset($data['question_right_answers']) && ('' != $data['question_right_answers'])) { | |
| 2237 | + $question_right_answers = $data['question_right_answers']; | |
| 2238 | 2238 | } // End If Statement | 
| 2239 | -		elseif ( 'multiple-choice' == $question_type && isset( $data[ 'question_right_answer' ] ) && ( '' != $data[ 'question_right_answer' ] ) ) { | |
| 2240 | - $question_right_answer = $data[ 'question_right_answer' ]; | |
| 2239 | +		elseif ('multiple-choice' == $question_type && isset($data['question_right_answer']) && ('' != $data['question_right_answer'])) { | |
| 2240 | + $question_right_answer = $data['question_right_answer']; | |
| 2241 | 2241 | } // End If Statement | 
| 2242 | -		if ( 'multiple-choice' == $question_type && isset( $data[ 'question_wrong_answers' ] ) && ( '' != $data[ 'question_wrong_answers' ] ) ) { | |
| 2243 | - $question_wrong_answers = $data[ 'question_wrong_answers' ]; | |
| 2242 | +		if ('multiple-choice' == $question_type && isset($data['question_wrong_answers']) && ('' != $data['question_wrong_answers'])) { | |
| 2243 | + $question_wrong_answers = $data['question_wrong_answers']; | |
| 2244 | 2244 | } // End If Statement | 
| 2245 | 2245 | // Handle Boolean Fields - Edit | 
| 2246 | -		if ( 'boolean' == $question_type && isset( $data[ 'question_' . $question_id . '_right_answer_boolean' ] ) && ( '' != $data[ 'question_' . $question_id . '_right_answer_boolean' ] ) ) { | |
| 2247 | - $question_right_answer = $data[ 'question_' . $question_id . '_right_answer_boolean' ]; | |
| 2246 | +		if ('boolean' == $question_type && isset($data['question_'.$question_id.'_right_answer_boolean']) && ('' != $data['question_'.$question_id.'_right_answer_boolean'])) { | |
| 2247 | + $question_right_answer = $data['question_'.$question_id.'_right_answer_boolean']; | |
| 2248 | 2248 | } // End If Statement | 
| 2249 | 2249 | // Handle Boolean Fields - Add | 
| 2250 | -		if ( 'boolean' == $question_type && isset( $data[ 'question_right_answer_boolean' ] ) && ( '' != $data[ 'question_right_answer_boolean' ] ) ) { | |
| 2251 | - $question_right_answer = $data[ 'question_right_answer_boolean' ]; | |
| 2250 | +		if ('boolean' == $question_type && isset($data['question_right_answer_boolean']) && ('' != $data['question_right_answer_boolean'])) { | |
| 2251 | + $question_right_answer = $data['question_right_answer_boolean']; | |
| 2252 | 2252 | } // End If Statement | 
| 2253 | 2253 | // Handle Gap Fill Fields | 
| 2254 | -		if ( 'gap-fill' == $question_type && isset( $data[ 'add_question_right_answer_gapfill_gap' ] ) && '' != $data[ 'add_question_right_answer_gapfill_gap' ] ) { | |
| 2255 | - $question_right_answer = $data[ 'add_question_right_answer_gapfill_pre' ] . '||' . $data[ 'add_question_right_answer_gapfill_gap' ] . '||' . $data[ 'add_question_right_answer_gapfill_post' ]; | |
| 2254 | +		if ('gap-fill' == $question_type && isset($data['add_question_right_answer_gapfill_gap']) && '' != $data['add_question_right_answer_gapfill_gap']) { | |
| 2255 | + $question_right_answer = $data['add_question_right_answer_gapfill_pre'].'||'.$data['add_question_right_answer_gapfill_gap'].'||'.$data['add_question_right_answer_gapfill_post']; | |
| 2256 | 2256 | } // End If Statement | 
| 2257 | 2257 | // Handle Multi Line Fields | 
| 2258 | -		if ( 'multi-line' == $question_type && isset( $data[ 'add_question_right_answer_multiline' ] ) && ( '' != $data[ 'add_question_right_answer_multiline' ] ) ) { | |
| 2259 | - $question_right_answer = $data[ 'add_question_right_answer_multiline' ]; | |
| 2258 | +		if ('multi-line' == $question_type && isset($data['add_question_right_answer_multiline']) && ('' != $data['add_question_right_answer_multiline'])) { | |
| 2259 | + $question_right_answer = $data['add_question_right_answer_multiline']; | |
| 2260 | 2260 | } // End If Statement | 
| 2261 | 2261 | // Handle Single Line Fields | 
| 2262 | -		if ( 'single-line' == $question_type && isset( $data[ 'add_question_right_answer_singleline' ] ) && ( '' != $data[ 'add_question_right_answer_singleline' ] ) ) { | |
| 2263 | - $question_right_answer = $data[ 'add_question_right_answer_singleline' ]; | |
| 2262 | +		if ('single-line' == $question_type && isset($data['add_question_right_answer_singleline']) && ('' != $data['add_question_right_answer_singleline'])) { | |
| 2263 | + $question_right_answer = $data['add_question_right_answer_singleline']; | |
| 2264 | 2264 | } // End If Statement | 
| 2265 | 2265 | // Handle File Upload Fields | 
| 2266 | -		if ( 'file-upload' == $question_type && isset( $data[ 'add_question_right_answer_fileupload' ] ) && ( '' != $data[ 'add_question_right_answer_fileupload' ] ) ) { | |
| 2267 | - $question_right_answer = $data[ 'add_question_right_answer_fileupload' ]; | |
| 2266 | +		if ('file-upload' == $question_type && isset($data['add_question_right_answer_fileupload']) && ('' != $data['add_question_right_answer_fileupload'])) { | |
| 2267 | + $question_right_answer = $data['add_question_right_answer_fileupload']; | |
| 2268 | 2268 | } // End If Statement | 
| 2269 | -		if ( 'file-upload' == $question_type && isset( $data[ 'add_question_wrong_answer_fileupload' ] ) && ( '' != $data[ 'add_question_wrong_answer_fileupload' ] ) ) { | |
| 2270 | - $question_wrong_answers = array( $data[ 'add_question_wrong_answer_fileupload' ] ); | |
| 2269 | +		if ('file-upload' == $question_type && isset($data['add_question_wrong_answer_fileupload']) && ('' != $data['add_question_wrong_answer_fileupload'])) { | |
| 2270 | + $question_wrong_answers = array($data['add_question_wrong_answer_fileupload']); | |
| 2271 | 2271 | } // End If Statement | 
| 2272 | 2272 | |
| 2273 | 2273 | // Handle Question Grade | 
| 2274 | -		if ( isset( $data[ 'question_grade' ] ) && ( '' != $data[ 'question_grade' ] ) ) { | |
| 2275 | - $question_grade = $data[ 'question_grade' ]; | |
| 2274 | +		if (isset($data['question_grade']) && ('' != $data['question_grade'])) { | |
| 2275 | + $question_grade = $data['question_grade']; | |
| 2276 | 2276 | } // End If Statement | 
| 2277 | 2277 | |
| 2278 | 2278 | // Handle Answer Feedback | 
| 2279 | 2279 | $answer_feedback = ''; | 
| 2280 | -		if ( isset( $data[ 'answer_feedback_boolean' ] ) && !empty( $data[ 'answer_feedback_boolean' ] ) ) { | |
| 2280 | +		if (isset($data['answer_feedback_boolean']) && ! empty($data['answer_feedback_boolean'])) { | |
| 2281 | 2281 | |
| 2282 | - $answer_feedback = $data[ 'answer_feedback_boolean' ]; | |
| 2282 | + $answer_feedback = $data['answer_feedback_boolean']; | |
| 2283 | 2283 | |
| 2284 | -		}elseif( isset( $data[ 'answer_feedback_multiple_choice' ] ) && !empty( $data[ 'answer_feedback_multiple_choice' ] ) ){ | |
| 2284 | +		}elseif (isset($data['answer_feedback_multiple_choice']) && ! empty($data['answer_feedback_multiple_choice'])) { | |
| 2285 | 2285 | |
| 2286 | - $answer_feedback = $data[ 'answer_feedback_multiple_choice' ]; | |
| 2286 | + $answer_feedback = $data['answer_feedback_multiple_choice']; | |
| 2287 | 2287 | |
| 2288 | -        }elseif( isset( $data[ 'answer_feedback' ] )  ){ | |
| 2288 | +        }elseif (isset($data['answer_feedback'])) { | |
| 2289 | 2289 | |
| 2290 | - $answer_feedback = $data[ 'answer_feedback' ]; | |
| 2290 | + $answer_feedback = $data['answer_feedback']; | |
| 2291 | 2291 | |
| 2292 | 2292 | } // End If Statement | 
| 2293 | 2293 | |
| 2294 | 2294 | $post_title = $question_text; | 
| 2295 | - $post_author = $data[ 'post_author' ]; | |
| 2295 | + $post_author = $data['post_author']; | |
| 2296 | 2296 | $post_status = 'publish'; | 
| 2297 | 2297 | $post_type = 'question'; | 
| 2298 | 2298 | // Handle the extended question text | 
| 2299 | -		if ( isset( $data[ 'question_description' ] ) && ( '' != $data[ 'question_description' ] ) ) { | |
| 2300 | - $post_content = $data[ 'question_description' ]; | |
| 2299 | +		if (isset($data['question_description']) && ('' != $data['question_description'])) { | |
| 2300 | + $post_content = $data['question_description']; | |
| 2301 | 2301 | } | 
| 2302 | 2302 |  		else { | 
| 2303 | 2303 | $post_content = ''; | 
| 2304 | 2304 | } | 
| 2305 | 2305 | // Question Query Arguments | 
| 2306 | - $post_type_args = array( 'post_content' => $post_content, | |
| 2306 | +		$post_type_args = array('post_content' => $post_content, | |
| 2307 | 2307 | 'post_status' => $post_status, | 
| 2308 | 2308 | 'post_title' => $post_title, | 
| 2309 | 2309 | 'post_type' => $post_type | 
| 2310 | 2310 | ); | 
| 2311 | 2311 | |
| 2312 | 2312 | // Remove empty values and reindex the array | 
| 2313 | -  		if ( is_array( $question_right_answers ) && 0 < count($question_right_answers) ) { | |
| 2314 | - $question_right_answers_array = array_values( array_filter( $question_right_answers, 'strlen' ) ); | |
| 2313 | +  		if (is_array($question_right_answers) && 0 < count($question_right_answers)) { | |
| 2314 | + $question_right_answers_array = array_values(array_filter($question_right_answers, 'strlen')); | |
| 2315 | 2315 | $question_right_answers = array(); | 
| 2316 | 2316 | |
| 2317 | -  			foreach( $question_right_answers_array as $answer ) { | |
| 2318 | -  				if( ! in_array( $answer, $question_right_answers ) ) { | |
| 2317 | +  			foreach ($question_right_answers_array as $answer) { | |
| 2318 | +  				if ( ! in_array($answer, $question_right_answers)) { | |
| 2319 | 2319 | $question_right_answers[] = $answer; | 
| 2320 | 2320 | } | 
| 2321 | 2321 | } | 
| 2322 | -  			if ( 0 < count($question_right_answers) ) { | |
| 2322 | +  			if (0 < count($question_right_answers)) { | |
| 2323 | 2323 | $question_right_answer = $question_right_answers; | 
| 2324 | 2324 | } | 
| 2325 | 2325 | } // End If Statement | 
| 2326 | - $right_answer_count = count( $question_right_answer ); | |
| 2326 | + $right_answer_count = count($question_right_answer); | |
| 2327 | 2327 | |
| 2328 | 2328 | // Remove empty values and reindex the array | 
| 2329 | -  		if ( is_array( $question_wrong_answers ) ) { | |
| 2330 | - $question_wrong_answers_array = array_values( array_filter( $question_wrong_answers, 'strlen' ) ); | |
| 2329 | +  		if (is_array($question_wrong_answers)) { | |
| 2330 | + $question_wrong_answers_array = array_values(array_filter($question_wrong_answers, 'strlen')); | |
| 2331 | 2331 | $question_wrong_answers = array(); | 
| 2332 | 2332 | } // End If Statement | 
| 2333 | 2333 | |
| 2334 | -  		foreach( $question_wrong_answers_array as $answer ) { | |
| 2335 | -  			if( ! in_array( $answer, $question_wrong_answers ) ) { | |
| 2334 | +  		foreach ($question_wrong_answers_array as $answer) { | |
| 2335 | +  			if ( ! in_array($answer, $question_wrong_answers)) { | |
| 2336 | 2336 | $question_wrong_answers[] = $answer; | 
| 2337 | 2337 | } | 
| 2338 | 2338 | } | 
| 2339 | 2339 | |
| 2340 | - $wrong_answer_count = count( $question_wrong_answers ); | |
| 2340 | + $wrong_answer_count = count($question_wrong_answers); | |
| 2341 | 2341 | |
| 2342 | 2342 | // Only save if there is a valid title | 
| 2343 | -  		if ( $post_title != '' ) { | |
| 2343 | +  		if ($post_title != '') { | |
| 2344 | 2344 | |
| 2345 | 2345 | // Get Quiz ID for the question | 
| 2346 | 2346 | $quiz_id = $data['quiz_id']; | 
| @@ -2350,86 +2350,86 @@ discard block | ||
| 2350 | 2350 | |
| 2351 | 2351 | // Get answer order | 
| 2352 | 2352 | $answer_order = ''; | 
| 2353 | -  		    if( isset( $data['answer_order'] ) ) { | |
| 2353 | +  		    if (isset($data['answer_order'])) { | |
| 2354 | 2354 | $answer_order = $data['answer_order']; | 
| 2355 | 2355 | } | 
| 2356 | 2356 | |
| 2357 | 2357 | // Get random order selection | 
| 2358 | 2358 | $random_order = 'no'; | 
| 2359 | -			if( isset( $data['random_order'] ) ) { | |
| 2359 | +			if (isset($data['random_order'])) { | |
| 2360 | 2360 | $random_order = $data['random_order']; | 
| 2361 | 2361 | } | 
| 2362 | 2362 | |
| 2363 | 2363 | // Insert or Update the question | 
| 2364 | -  		    if ( 0 < $question_id ) { | |
| 2364 | +  		    if (0 < $question_id) { | |
| 2365 | 2365 | |
| 2366 | - $post_type_args[ 'ID' ] = $question_id; | |
| 2367 | - $question_id = wp_update_post( $post_type_args ); | |
| 2366 | + $post_type_args['ID'] = $question_id; | |
| 2367 | + $question_id = wp_update_post($post_type_args); | |
| 2368 | 2368 | |
| 2369 | 2369 | // Update poast meta | 
| 2370 | -		    	if( 'quiz' == $context ) { | |
| 2371 | - $quizzes = get_post_meta( $question_id, '_quiz_id', false ); | |
| 2372 | -		    		if( ! in_array( $quiz_id, $quizzes ) ) { | |
| 2373 | - add_post_meta( $question_id, '_quiz_id', $quiz_id, false ); | |
| 2370 | +		    	if ('quiz' == $context) { | |
| 2371 | + $quizzes = get_post_meta($question_id, '_quiz_id', false); | |
| 2372 | +		    		if ( ! in_array($quiz_id, $quizzes)) { | |
| 2373 | + add_post_meta($question_id, '_quiz_id', $quiz_id, false); | |
| 2374 | 2374 | } | 
| 2375 | 2375 | } | 
| 2376 | 2376 | |
| 2377 | - update_post_meta( $question_id, '_question_grade', $question_grade ); | |
| 2378 | - update_post_meta( $question_id, '_question_right_answer', $question_right_answer ); | |
| 2379 | - update_post_meta( $question_id, '_right_answer_count', $right_answer_count ); | |
| 2380 | - update_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers ); | |
| 2381 | - update_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count ); | |
| 2382 | - update_post_meta( $question_id, '_question_media', $question_media ); | |
| 2383 | - update_post_meta( $question_id, '_answer_order', $answer_order ); | |
| 2384 | - update_post_meta( $question_id, '_random_order', $random_order ); | |
| 2385 | - | |
| 2386 | -		    	if( 'quiz' != $context ) { | |
| 2387 | - wp_set_post_terms( $question_id, array( $question_type ), 'question-type', false ); | |
| 2377 | + update_post_meta($question_id, '_question_grade', $question_grade); | |
| 2378 | + update_post_meta($question_id, '_question_right_answer', $question_right_answer); | |
| 2379 | + update_post_meta($question_id, '_right_answer_count', $right_answer_count); | |
| 2380 | + update_post_meta($question_id, '_question_wrong_answers', $question_wrong_answers); | |
| 2381 | + update_post_meta($question_id, '_wrong_answer_count', $wrong_answer_count); | |
| 2382 | + update_post_meta($question_id, '_question_media', $question_media); | |
| 2383 | + update_post_meta($question_id, '_answer_order', $answer_order); | |
| 2384 | + update_post_meta($question_id, '_random_order', $random_order); | |
| 2385 | + | |
| 2386 | +		    	if ('quiz' != $context) { | |
| 2387 | + wp_set_post_terms($question_id, array($question_type), 'question-type', false); | |
| 2388 | 2388 | } | 
| 2389 | 2389 | // Don't store empty value, no point | 
| 2390 | -				if ( !empty($answer_feedback) ) { | |
| 2391 | - update_post_meta( $question_id, '_answer_feedback', $answer_feedback ); | |
| 2390 | +				if ( ! empty($answer_feedback)) { | |
| 2391 | + update_post_meta($question_id, '_answer_feedback', $answer_feedback); | |
| 2392 | 2392 | } | 
| 2393 | 2393 | |
| 2394 | 2394 |  		    } else { | 
| 2395 | - $question_id = wp_insert_post( $post_type_args ); | |
| 2396 | - $question_count = intval( $data['question_count'] ); | |
| 2395 | + $question_id = wp_insert_post($post_type_args); | |
| 2396 | + $question_count = intval($data['question_count']); | |
| 2397 | 2397 | ++$question_count; | 
| 2398 | 2398 | |
| 2399 | 2399 | // Set post meta | 
| 2400 | -				if( 'quiz' == $context ) { | |
| 2401 | - add_post_meta( $question_id, '_quiz_id', $quiz_id, false ); | |
| 2402 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 2403 | - update_post_meta( $lesson_id, '_quiz_has_questions', '1' ); | |
| 2400 | +				if ('quiz' == $context) { | |
| 2401 | + add_post_meta($question_id, '_quiz_id', $quiz_id, false); | |
| 2402 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 2403 | + update_post_meta($lesson_id, '_quiz_has_questions', '1'); | |
| 2404 | 2404 | } | 
| 2405 | 2405 | |
| 2406 | -				if( isset( $question_grade ) ) { | |
| 2407 | - add_post_meta( $question_id, '_question_grade', $question_grade ); | |
| 2406 | +				if (isset($question_grade)) { | |
| 2407 | + add_post_meta($question_id, '_question_grade', $question_grade); | |
| 2408 | 2408 | } | 
| 2409 | - add_post_meta( $question_id, '_question_right_answer', $question_right_answer ); | |
| 2410 | - add_post_meta( $question_id, '_right_answer_count', $right_answer_count ); | |
| 2411 | - add_post_meta( $question_id, '_question_wrong_answers', $question_wrong_answers ); | |
| 2412 | - add_post_meta( $question_id, '_wrong_answer_count', $wrong_answer_count ); | |
| 2413 | - add_post_meta( $question_id, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $question_count ); | |
| 2414 | - add_post_meta( $question_id, '_question_media', $question_media ); | |
| 2415 | - add_post_meta( $question_id, '_answer_order', $answer_order ); | |
| 2416 | - add_post_meta( $question_id, '_random_order', $random_order ); | |
| 2409 | + add_post_meta($question_id, '_question_right_answer', $question_right_answer); | |
| 2410 | + add_post_meta($question_id, '_right_answer_count', $right_answer_count); | |
| 2411 | + add_post_meta($question_id, '_question_wrong_answers', $question_wrong_answers); | |
| 2412 | + add_post_meta($question_id, '_wrong_answer_count', $wrong_answer_count); | |
| 2413 | + add_post_meta($question_id, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$question_count); | |
| 2414 | + add_post_meta($question_id, '_question_media', $question_media); | |
| 2415 | + add_post_meta($question_id, '_answer_order', $answer_order); | |
| 2416 | + add_post_meta($question_id, '_random_order', $random_order); | |
| 2417 | 2417 | // Don't store empty value, no point | 
| 2418 | -				if ( !empty($answer_feedback) ) { | |
| 2419 | - add_post_meta( $question_id, '_answer_feedback', $answer_feedback ); | |
| 2418 | +				if ( ! empty($answer_feedback)) { | |
| 2419 | + add_post_meta($question_id, '_answer_feedback', $answer_feedback); | |
| 2420 | 2420 | } | 
| 2421 | 2421 | |
| 2422 | 2422 | // Set the post terms for question-type | 
| 2423 | - wp_set_post_terms( $question_id, array( $question_type ), 'question-type' ); | |
| 2423 | + wp_set_post_terms($question_id, array($question_type), 'question-type'); | |
| 2424 | 2424 | |
| 2425 | -			    if( $question_category ) { | |
| 2426 | - wp_set_post_terms( $question_id, array( $question_category ), 'question-category' ); | |
| 2425 | +			    if ($question_category) { | |
| 2426 | + wp_set_post_terms($question_id, array($question_category), 'question-category'); | |
| 2427 | 2427 | } | 
| 2428 | 2428 | |
| 2429 | 2429 | } // End If Statement | 
| 2430 | 2430 | } // End If Statement | 
| 2431 | 2431 | // Check that the insert or update saved by testing the post id | 
| 2432 | -  		if ( 0 < $question_id ) { | |
| 2432 | +  		if (0 < $question_id) { | |
| 2433 | 2433 | $return = $question_id; | 
| 2434 | 2434 | } // End If Statement | 
| 2435 | 2435 | return $return; | 
| @@ -2443,20 +2443,20 @@ discard block | ||
| 2443 | 2443 | * @param array $data (default: array()) | 
| 2444 | 2444 | * @return boolean | 
| 2445 | 2445 | */ | 
| 2446 | -	private function lesson_delete_question( $data = array() ) { | |
| 2446 | +	private function lesson_delete_question($data = array()) { | |
| 2447 | 2447 | |
| 2448 | 2448 | // Get which question to delete | 
| 2449 | 2449 | $question_id = 0; | 
| 2450 | -		if ( isset( $data[ 'question_id' ] ) && ( 0 < absint( $data[ 'question_id' ] ) ) ) { | |
| 2451 | - $question_id = absint( $data[ 'question_id' ] ); | |
| 2450 | +		if (isset($data['question_id']) && (0 < absint($data['question_id']))) { | |
| 2451 | + $question_id = absint($data['question_id']); | |
| 2452 | 2452 | } // End If Statement | 
| 2453 | 2453 | // Delete the question | 
| 2454 | -		if ( 0 < $question_id ) { | |
| 2455 | - $quizzes = get_post_meta( $question_id, '_quiz_id', false ); | |
| 2454 | +		if (0 < $question_id) { | |
| 2455 | + $quizzes = get_post_meta($question_id, '_quiz_id', false); | |
| 2456 | 2456 | |
| 2457 | -			foreach( $quizzes as $quiz_id ) { | |
| 2458 | -				if( $quiz_id == $data['quiz_id'] ) { | |
| 2459 | - delete_post_meta( $question_id, '_quiz_id', $quiz_id ); | |
| 2457 | +			foreach ($quizzes as $quiz_id) { | |
| 2458 | +				if ($quiz_id == $data['quiz_id']) { | |
| 2459 | + delete_post_meta($question_id, '_quiz_id', $quiz_id); | |
| 2460 | 2460 | } | 
| 2461 | 2461 | } | 
| 2462 | 2462 | |
| @@ -2475,9 +2475,9 @@ discard block | ||
| 2475 | 2475 |  	public function lesson_complexities() { | 
| 2476 | 2476 | |
| 2477 | 2477 | // V2 - make filter for this array | 
| 2478 | - $lesson_complexities = array( 'easy' => __( 'Easy', 'woothemes-sensei' ), | |
| 2479 | - 'std' => __( 'Standard', 'woothemes-sensei' ), | |
| 2480 | - 'hard' => __( 'Hard', 'woothemes-sensei' ) | |
| 2478 | +        $lesson_complexities = array('easy' => __('Easy', 'woothemes-sensei'), | |
| 2479 | +									'std' => __('Standard', 'woothemes-sensei'), | |
| 2480 | +									'hard' => __('Hard', 'woothemes-sensei') | |
| 2481 | 2481 | ); | 
| 2482 | 2482 | |
| 2483 | 2483 | return $lesson_complexities; | 
| @@ -2492,9 +2492,9 @@ discard block | ||
| 2492 | 2492 | * @param string $post_status (default: 'publish') | 
| 2493 | 2493 | * @return int | 
| 2494 | 2494 | */ | 
| 2495 | -	public function lesson_count( $post_status = 'publish', $course_id = false ) { | |
| 2495 | +	public function lesson_count($post_status = 'publish', $course_id = false) { | |
| 2496 | 2496 | |
| 2497 | - $post_args = array( 'post_type' => 'lesson', | |
| 2497 | +		$post_args = array('post_type'         => 'lesson', | |
| 2498 | 2498 | 'posts_per_page' => -1, | 
| 2499 | 2499 | // 'orderby' => 'menu_order date', | 
| 2500 | 2500 | // 'order' => 'ASC', | 
| @@ -2502,7 +2502,7 @@ discard block | ||
| 2502 | 2502 | 'suppress_filters' => 0, | 
| 2503 | 2503 | 'fields' => 'ids', | 
| 2504 | 2504 | ); | 
| 2505 | -		if( $course_id ) { | |
| 2505 | +		if ($course_id) { | |
| 2506 | 2506 | $post_args['meta_query'][] = array( | 
| 2507 | 2507 | 'key' => '_lesson_course', | 
| 2508 | 2508 | 'value' => $course_id, | 
| @@ -2519,10 +2519,10 @@ discard block | ||
| 2519 | 2519 | |
| 2520 | 2520 | // Allow WP to generate the complex final query, just shortcut to only do an overall count | 
| 2521 | 2521 | // add_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) ); | 
| 2522 | - $lessons_query = new WP_Query( apply_filters( 'sensei_lesson_count', $post_args ) ); | |
| 2522 | +		$lessons_query = new WP_Query(apply_filters('sensei_lesson_count', $post_args)); | |
| 2523 | 2523 | // remove_filter( 'posts_clauses', array( 'WooThemes_Sensei_Utils', 'get_posts_count_only_filter' ) ); | 
| 2524 | 2524 | |
| 2525 | - return count( $lessons_query->posts ); | |
| 2525 | + return count($lessons_query->posts); | |
| 2526 | 2526 | } // End lesson_count() | 
| 2527 | 2527 | |
| 2528 | 2528 | |
| @@ -2535,11 +2535,11 @@ discard block | ||
| 2535 | 2535 | * @param string $fields (default: 'ids') | 
| 2536 | 2536 | * @return int $quiz_id | 
| 2537 | 2537 | */ | 
| 2538 | -	public function lesson_quizzes( $lesson_id = 0, $post_status = 'any', $fields = 'ids' ) { | |
| 2538 | +	public function lesson_quizzes($lesson_id = 0, $post_status = 'any', $fields = 'ids') { | |
| 2539 | 2539 | |
| 2540 | 2540 | $posts_array = array(); | 
| 2541 | 2541 | |
| 2542 | - $post_args = array( 'post_type' => 'quiz', | |
| 2542 | +		$post_args = array('post_type' 		=> 'quiz', | |
| 2543 | 2543 | 'posts_per_page' => 1, | 
| 2544 | 2544 | 'orderby' => 'title', | 
| 2545 | 2545 | 'order' => 'DESC', | 
| @@ -2548,7 +2548,7 @@ discard block | ||
| 2548 | 2548 | 'suppress_filters' => 0, | 
| 2549 | 2549 | 'fields' => $fields | 
| 2550 | 2550 | ); | 
| 2551 | - $posts_array = get_posts( $post_args ); | |
| 2551 | + $posts_array = get_posts($post_args); | |
| 2552 | 2552 | $quiz_id = array_shift($posts_array); | 
| 2553 | 2553 | |
| 2554 | 2554 | return $quiz_id; | 
| @@ -2571,37 +2571,37 @@ discard block | ||
| 2571 | 2571 | * | 
| 2572 | 2572 |  	 * @return array $questions { $question type WP_Post } | 
| 2573 | 2573 | */ | 
| 2574 | -	public function lesson_quiz_questions( $quiz_id = 0, $post_status = 'any', $orderby = 'meta_value_num title', $order = 'ASC' ) { | |
| 2574 | +	public function lesson_quiz_questions($quiz_id = 0, $post_status = 'any', $orderby = 'meta_value_num title', $order = 'ASC') { | |
| 2575 | 2575 | |
| 2576 | 2576 | $quiz_id = (string) $quiz_id; | 
| 2577 | - $quiz_lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id ); | |
| 2577 | + $quiz_lesson_id = Sensei()->quiz->get_lesson_id($quiz_id); | |
| 2578 | 2578 | |
| 2579 | 2579 | // setup the user id | 
| 2580 | -        if( is_admin() ) { | |
| 2581 | - $user_id = isset( $_GET['user'] ) ? $_GET['user'] : '' ; | |
| 2580 | +        if (is_admin()) { | |
| 2581 | + $user_id = isset($_GET['user']) ? $_GET['user'] : ''; | |
| 2582 | 2582 |          } else { | 
| 2583 | 2583 | $user_id = get_current_user_id(); | 
| 2584 | 2584 | } | 
| 2585 | 2585 | |
| 2586 | 2586 | // get the users current status on the lesson | 
| 2587 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $quiz_lesson_id, $user_id ); | |
| 2587 | + $user_lesson_status = Sensei_Utils::user_lesson_status($quiz_lesson_id, $user_id); | |
| 2588 | 2588 | |
| 2589 | 2589 | // Set the default question order if it has not already been set for this quiz | 
| 2590 | - $this->set_default_question_order( $quiz_id ); | |
| 2590 | + $this->set_default_question_order($quiz_id); | |
| 2591 | 2591 | |
| 2592 | 2592 | // If viewing quiz on the frontend then show questions in random order if set | 
| 2593 | -		if ( ! is_admin() ) { | |
| 2594 | - $random_order = get_post_meta( $quiz_id, '_random_question_order', true ); | |
| 2595 | -			if( $random_order && $random_order == 'yes' ) { | |
| 2593 | +		if ( ! is_admin()) { | |
| 2594 | + $random_order = get_post_meta($quiz_id, '_random_question_order', true); | |
| 2595 | +			if ($random_order && $random_order == 'yes') { | |
| 2596 | 2596 | $orderby = 'rand'; | 
| 2597 | 2597 | } | 
| 2598 | 2598 | } | 
| 2599 | 2599 | |
| 2600 | 2600 | // Get all questions and multiple questions | 
| 2601 | 2601 | $question_query_args = array( | 
| 2602 | - 'post_type' => array( 'question', 'multiple_question' ), | |
| 2602 | +			'post_type' 		=> array('question', 'multiple_question'), | |
| 2603 | 2603 | 'posts_per_page' => -1, | 
| 2604 | - 'meta_key' => '_quiz_question_order' . $quiz_id, | |
| 2604 | + 'meta_key' => '_quiz_question_order'.$quiz_id, | |
| 2605 | 2605 | 'orderby' => $orderby, | 
| 2606 | 2606 | 'order' => $order, | 
| 2607 | 2607 | 'meta_query' => array( | 
| @@ -2615,7 +2615,7 @@ discard block | ||
| 2615 | 2615 | ); | 
| 2616 | 2616 | |
| 2617 | 2617 | //query the questions | 
| 2618 | - $questions_query = new WP_Query( $question_query_args ); | |
| 2618 | + $questions_query = new WP_Query($question_query_args); | |
| 2619 | 2619 | |
| 2620 | 2620 | // Set return array to initially include all items | 
| 2621 | 2621 | $questions = $questions_query->posts; | 
| @@ -2625,20 +2625,20 @@ discard block | ||
| 2625 | 2625 | |
| 2626 | 2626 | // If viewing quiz on frontend or in grading then only single questions must be shown | 
| 2627 | 2627 | $selected_questions = false; | 
| 2628 | -		if( ! is_admin() || ( is_admin() && isset( $_GET['page'] ) && 'sensei_grading' == $_GET['page'] && isset( $_GET['user'] ) && isset( $_GET['quiz_id'] ) ) ) { | |
| 2628 | +		if ( ! is_admin() || (is_admin() && isset($_GET['page']) && 'sensei_grading' == $_GET['page'] && isset($_GET['user']) && isset($_GET['quiz_id']))) { | |
| 2629 | 2629 | |
| 2630 | 2630 | // Fetch the questions that the user was asked in their quiz if they have already completed it | 
| 2631 | - $questions_asked_string = !empty( $user_lesson_status->comment_ID) ? get_comment_meta( $user_lesson_status->comment_ID, 'questions_asked', true ) : false; | |
| 2632 | -			if( !empty($questions_asked_string) ) { | |
| 2631 | + $questions_asked_string = ! empty($user_lesson_status->comment_ID) ? get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true) : false; | |
| 2632 | +			if ( ! empty($questions_asked_string)) { | |
| 2633 | 2633 | |
| 2634 | - $selected_questions = explode( ',', $questions_asked_string ); | |
| 2634 | +				$selected_questions = explode(',', $questions_asked_string); | |
| 2635 | 2635 | |
| 2636 | 2636 | // Fetch each question in the order in which they were asked | 
| 2637 | 2637 | $questions = array(); | 
| 2638 | -				foreach( $selected_questions as $question_id ) { | |
| 2639 | - if( ! $question_id ) continue; | |
| 2640 | - $question = get_post( $question_id ); | |
| 2641 | - if( ! isset( $question ) || ! isset( $question->ID ) ) continue; | |
| 2638 | +				foreach ($selected_questions as $question_id) { | |
| 2639 | + if ( ! $question_id) continue; | |
| 2640 | + $question = get_post($question_id); | |
| 2641 | + if ( ! isset($question) || ! isset($question->ID)) continue; | |
| 2642 | 2642 | $questions[] = $question; | 
| 2643 | 2643 | } | 
| 2644 | 2644 | |
| @@ -2650,24 +2650,24 @@ discard block | ||
| 2650 | 2650 | $existing_questions = array(); | 
| 2651 | 2651 | |
| 2652 | 2652 | // Set array of questions that already exist so we can prevent duplicates from appearing | 
| 2653 | -				foreach( $questions_array as $question ) { | |
| 2654 | - if( 'question' != $question->post_type ) continue; | |
| 2653 | +				foreach ($questions_array as $question) { | |
| 2654 | +					if ('question' != $question->post_type) continue; | |
| 2655 | 2655 | $existing_questions[] = $question->ID; | 
| 2656 | 2656 | } | 
| 2657 | 2657 | |
| 2658 | 2658 | // Include only single questions in the return array | 
| 2659 | 2659 | $questions_loop = $questions_array; | 
| 2660 | 2660 | $questions_array = array(); | 
| 2661 | -				foreach( $questions_loop as $k => $question ) { | |
| 2661 | +				foreach ($questions_loop as $k => $question) { | |
| 2662 | 2662 | |
| 2663 | 2663 | // If this is a single question then include it | 
| 2664 | -					if( 'question' == $question->post_type ) { | |
| 2664 | +					if ('question' == $question->post_type) { | |
| 2665 | 2665 | $questions_array[] = $question; | 
| 2666 | 2666 |  					} else { | 
| 2667 | 2667 | |
| 2668 | 2668 | // If this is a multiple question then get the specified amount of questions from the specified category | 
| 2669 | - $question_cat = intval( get_post_meta( $question->ID, 'category', true ) ); | |
| 2670 | - $question_number = intval( get_post_meta( $question->ID, 'number', true ) ); | |
| 2669 | + $question_cat = intval(get_post_meta($question->ID, 'category', true)); | |
| 2670 | + $question_number = intval(get_post_meta($question->ID, 'number', true)); | |
| 2671 | 2671 | |
| 2672 | 2672 | $qargs = array( | 
| 2673 | 2673 | 'post_type' => 'question', | 
| @@ -2684,14 +2684,14 @@ discard block | ||
| 2684 | 2684 | 'suppress_filters' => 0, | 
| 2685 | 2685 | 'post__not_in' => $existing_questions, | 
| 2686 | 2686 | ); | 
| 2687 | - $cat_questions = get_posts( $qargs ); | |
| 2687 | + $cat_questions = get_posts($qargs); | |
| 2688 | 2688 | |
| 2689 | 2689 | // Merge results into return array | 
| 2690 | - $questions_array = array_merge( $questions_array, $cat_questions ); | |
| 2690 | + $questions_array = array_merge($questions_array, $cat_questions); | |
| 2691 | 2691 | |
| 2692 | 2692 | // Add selected questions to existing questions array to prevent duplicates from being added | 
| 2693 | -						foreach( $questions_array as $cat_question ) { | |
| 2694 | - if( in_array( $cat_question->ID, $existing_questions ) ) continue; | |
| 2693 | +						foreach ($questions_array as $cat_question) { | |
| 2694 | + if (in_array($cat_question->ID, $existing_questions)) continue; | |
| 2695 | 2695 | $existing_questions[] = $cat_question->ID; | 
| 2696 | 2696 | } | 
| 2697 | 2697 | } | 
| @@ -2703,29 +2703,29 @@ discard block | ||
| 2703 | 2703 | } | 
| 2704 | 2704 | |
| 2705 | 2705 | // If user has not already taken the quiz and a limited number of questions are to be shown, then show a random selection of the specified amount of questions | 
| 2706 | -		if( ! $selected_questions ) { | |
| 2706 | +		if ( ! $selected_questions) { | |
| 2707 | 2707 | |
| 2708 | 2708 | // Only limit questions like this on the frontend | 
| 2709 | -			if( ! is_admin() ) { | |
| 2709 | +			if ( ! is_admin()) { | |
| 2710 | 2710 | |
| 2711 | 2711 | // Get number of questions to show | 
| 2712 | - $show_questions = intval( get_post_meta( $quiz_id, '_show_questions', true ) ); | |
| 2713 | -				if( $show_questions ) { | |
| 2712 | + $show_questions = intval(get_post_meta($quiz_id, '_show_questions', true)); | |
| 2713 | +				if ($show_questions) { | |
| 2714 | 2714 | |
| 2715 | 2715 | // Get random set of array keys from selected questions array | 
| 2716 | - $selected_questions = array_rand( $questions_array, $show_questions ); | |
| 2716 | + $selected_questions = array_rand($questions_array, $show_questions); | |
| 2717 | 2717 | |
| 2718 | 2718 | // Loop through all questions and pick the the ones to be shown based on the random key selection | 
| 2719 | 2719 | $questions = array(); | 
| 2720 | -					foreach( $questions_array as $k => $question ) { | |
| 2720 | +					foreach ($questions_array as $k => $question) { | |
| 2721 | 2721 | |
| 2722 | 2722 | // Random keys will always be an array, unless only one question is to be shown | 
| 2723 | -						if( is_array( $selected_questions ) ) { | |
| 2724 | -							if( in_array( $k, $selected_questions ) ) { | |
| 2723 | +						if (is_array($selected_questions)) { | |
| 2724 | +							if (in_array($k, $selected_questions)) { | |
| 2725 | 2725 | $questions[] = $question; | 
| 2726 | 2726 | } | 
| 2727 | -						} elseif( 1 == $show_questions ) { | |
| 2728 | -							if ( $selected_questions == $k ) { | |
| 2727 | +						} elseif (1 == $show_questions) { | |
| 2728 | +							if ($selected_questions == $k) { | |
| 2729 | 2729 | $questions[] = $question; | 
| 2730 | 2730 | } | 
| 2731 | 2731 | } | 
| @@ -2736,12 +2736,12 @@ discard block | ||
| 2736 | 2736 | |
| 2737 | 2737 | // Save the questions that will be asked for the current user | 
| 2738 | 2738 | // this happens only once per user/quiz, unless the user resets the quiz | 
| 2739 | -        if( ! is_admin() ){ | |
| 2739 | +        if ( ! is_admin()) { | |
| 2740 | 2740 | |
| 2741 | -            if( $user_lesson_status ) { | |
| 2741 | +            if ($user_lesson_status) { | |
| 2742 | 2742 | |
| 2743 | 2743 | $questions_asked = get_comment_meta($user_lesson_status->comment_ID, 'questions_asked', true); | 
| 2744 | -                if ( empty($questions_asked) && $user_lesson_status) { | |
| 2744 | +                if (empty($questions_asked) && $user_lesson_status) { | |
| 2745 | 2745 | |
| 2746 | 2746 | $questions_asked = array(); | 
| 2747 | 2747 |                      foreach ($questions as $question) { | 
| @@ -2764,7 +2764,7 @@ discard block | ||
| 2764 | 2764 | * @hooked Sensei_Teacher::allow_teacher_access_to_questions | 
| 2765 | 2765 | * @since 1.8.0 | 
| 2766 | 2766 | */ | 
| 2767 | - return apply_filters( 'sensei_lesson_quiz_questions', $questions, $quiz_id ); | |
| 2767 | +		return apply_filters('sensei_lesson_quiz_questions', $questions, $quiz_id); | |
| 2768 | 2768 | |
| 2769 | 2769 | } // End lesson_quiz_questions() | 
| 2770 | 2770 | |
| @@ -2772,13 +2772,13 @@ discard block | ||
| 2772 | 2772 | * Set the default quiz order | 
| 2773 | 2773 | * @param integer $quiz_id ID of quiz | 
| 2774 | 2774 | */ | 
| 2775 | -	public function set_default_question_order( $quiz_id = 0 ) { | |
| 2775 | +	public function set_default_question_order($quiz_id = 0) { | |
| 2776 | 2776 | |
| 2777 | -		if( $quiz_id ) { | |
| 2777 | +		if ($quiz_id) { | |
| 2778 | 2778 | |
| 2779 | - $question_order = get_post_meta( $quiz_id, '_question_order', true ); | |
| 2779 | + $question_order = get_post_meta($quiz_id, '_question_order', true); | |
| 2780 | 2780 | |
| 2781 | -			if( ! $question_order ) { | |
| 2781 | +			if ( ! $question_order) { | |
| 2782 | 2782 | |
| 2783 | 2783 | $args = array( | 
| 2784 | 2784 | 'post_type' => 'question', | 
| @@ -2794,11 +2794,11 @@ discard block | ||
| 2794 | 2794 | 'post_status' => 'any', | 
| 2795 | 2795 | 'suppress_filters' => 0 | 
| 2796 | 2796 | ); | 
| 2797 | - $questions = get_posts( $args ); | |
| 2797 | + $questions = get_posts($args); | |
| 2798 | 2798 | |
| 2799 | 2799 | $o = 1; | 
| 2800 | -				foreach( $questions as $question ) { | |
| 2801 | - add_post_meta( $question->ID, '_quiz_question_order' . $quiz_id, $quiz_id . '000' . $o, true ); | |
| 2800 | +				foreach ($questions as $question) { | |
| 2801 | + add_post_meta($question->ID, '_quiz_question_order'.$quiz_id, $quiz_id.'000'.$o, true); | |
| 2802 | 2802 | $o++; | 
| 2803 | 2803 | } | 
| 2804 | 2804 | } | 
| @@ -2817,36 +2817,36 @@ discard block | ||
| 2817 | 2817 | * @param string $height (default: '100') | 
| 2818 | 2818 | * @return string | 
| 2819 | 2819 | */ | 
| 2820 | -	public function lesson_image( $lesson_id = 0, $width = '100', $height = '100', $widget = false ) { | |
| 2820 | +	public function lesson_image($lesson_id = 0, $width = '100', $height = '100', $widget = false) { | |
| 2821 | 2821 | |
| 2822 | 2822 | $html = ''; | 
| 2823 | 2823 | |
| 2824 | 2824 | // Get Width and Height settings | 
| 2825 | -		if ( ( $width == '100' ) && ( $height == '100' ) ) { | |
| 2825 | +		if (($width == '100') && ($height == '100')) { | |
| 2826 | 2826 | |
| 2827 | -			if ( is_singular( 'lesson' ) ) { | |
| 2827 | +			if (is_singular('lesson')) { | |
| 2828 | 2828 | |
| 2829 | -				if ( ! $widget && ! Sensei()->settings->settings[ 'lesson_single_image_enable' ] ) { | |
| 2829 | +				if ( ! $widget && ! Sensei()->settings->settings['lesson_single_image_enable']) { | |
| 2830 | 2830 | |
| 2831 | 2831 | return ''; | 
| 2832 | 2832 | |
| 2833 | 2833 | } // End If Statement | 
| 2834 | 2834 | |
| 2835 | 2835 | $image_thumb_size = 'lesson_single_image'; | 
| 2836 | - $dimensions = Sensei()->get_image_size( $image_thumb_size ); | |
| 2836 | + $dimensions = Sensei()->get_image_size($image_thumb_size); | |
| 2837 | 2837 | $width = $dimensions['width']; | 
| 2838 | 2838 | $height = $dimensions['height']; | 
| 2839 | 2839 | $crop = $dimensions['crop']; | 
| 2840 | 2840 | |
| 2841 | 2841 |  			} else { | 
| 2842 | 2842 | |
| 2843 | -				if ( ! $widget && ! Sensei()->settings->settings[ 'course_lesson_image_enable' ] ) { | |
| 2843 | +				if ( ! $widget && ! Sensei()->settings->settings['course_lesson_image_enable']) { | |
| 2844 | 2844 | |
| 2845 | 2845 | return ''; | 
| 2846 | 2846 | } // End If Statement | 
| 2847 | 2847 | |
| 2848 | 2848 | $image_thumb_size = 'lesson_archive_image'; | 
| 2849 | - $dimensions = Sensei()->get_image_size( $image_thumb_size ); | |
| 2849 | + $dimensions = Sensei()->get_image_size($image_thumb_size); | |
| 2850 | 2850 | $width = $dimensions['width']; | 
| 2851 | 2851 | $height = $dimensions['height']; | 
| 2852 | 2852 | $crop = $dimensions['crop']; | 
| @@ -2857,23 +2857,23 @@ discard block | ||
| 2857 | 2857 | |
| 2858 | 2858 | $img_url = ''; | 
| 2859 | 2859 | |
| 2860 | -		if ( has_post_thumbnail( $lesson_id ) ) { | |
| 2860 | +		if (has_post_thumbnail($lesson_id)) { | |
| 2861 | 2861 | |
| 2862 | 2862 | // Get Featured Image | 
| 2863 | - $img_url = get_the_post_thumbnail( $lesson_id, array( $width, $height ), array( 'class' => 'woo-image thumbnail alignleft') ); | |
| 2863 | +   			$img_url = get_the_post_thumbnail($lesson_id, array($width, $height), array('class' => 'woo-image thumbnail alignleft')); | |
| 2864 | 2864 | |
| 2865 | 2865 |   		} else { | 
| 2866 | 2866 | |
| 2867 | 2867 | // Display Image Placeholder if none | 
| 2868 | -			if ( Sensei()->settings->settings[ 'placeholder_images_enable' ] ) { | |
| 2868 | +			if (Sensei()->settings->settings['placeholder_images_enable']) { | |
| 2869 | 2869 | |
| 2870 | - $img_url = apply_filters( 'sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/' . $width . 'x' . $height . '" class="woo-image thumbnail alignleft" />' ); | |
| 2870 | +                $img_url = apply_filters('sensei_lesson_placeholder_image_url', '<img src="http://placehold.it/'.$width.'x'.$height.'" class="woo-image thumbnail alignleft" />'); | |
| 2871 | 2871 | |
| 2872 | 2872 | } // End If Statement | 
| 2873 | 2873 | |
| 2874 | 2874 | } // End If Statement | 
| 2875 | 2875 | |
| 2876 | - $html .= '<a href="' . get_permalink( $lesson_id ) . '" title="' . esc_attr( get_post_field( 'post_title', $lesson_id ) ) . '">' . $img_url . '</a>'; | |
| 2876 | +		$html .= '<a href="'.get_permalink($lesson_id).'" title="'.esc_attr(get_post_field('post_title', $lesson_id)).'">'.$img_url.'</a>'; | |
| 2877 | 2877 | |
| 2878 | 2878 | return $html; | 
| 2879 | 2879 | |
| @@ -2885,9 +2885,9 @@ discard block | ||
| 2885 | 2885 | * @since 1.9.0 | 
| 2886 | 2886 | * @param integer $lesson_id | 
| 2887 | 2887 | */ | 
| 2888 | -    public static function the_lesson_image( $lesson_id = 0 ){ | |
| 2888 | +    public static function the_lesson_image($lesson_id = 0) { | |
| 2889 | 2889 | |
| 2890 | - echo Sensei()->lesson->lesson_image( $lesson_id ); | |
| 2890 | + echo Sensei()->lesson->lesson_image($lesson_id); | |
| 2891 | 2891 | |
| 2892 | 2892 | } | 
| 2893 | 2893 | |
| @@ -2898,17 +2898,17 @@ discard block | ||
| 2898 | 2898 | * @param bool $add_p_tags should the excerpt be wrapped by calling wpautop() | 
| 2899 | 2899 | * @return string | 
| 2900 | 2900 | */ | 
| 2901 | -	public static function lesson_excerpt( $lesson = null, $add_p_tags = true ) { | |
| 2901 | +	public static function lesson_excerpt($lesson = null, $add_p_tags = true) { | |
| 2902 | 2902 | $html = ''; | 
| 2903 | -		if ( is_a( $lesson, 'WP_Post' ) && 'lesson' == $lesson->post_type ) { | |
| 2903 | +		if (is_a($lesson, 'WP_Post') && 'lesson' == $lesson->post_type) { | |
| 2904 | 2904 | |
| 2905 | - $excerpt = $lesson->post_excerpt; | |
| 2905 | + $excerpt = $lesson->post_excerpt; | |
| 2906 | 2906 | |
| 2907 | 2907 | // if $add_p_tags true wrap with <p> else return the excerpt as is | 
| 2908 | - $html = $add_p_tags ? wpautop( $excerpt ) : $excerpt; | |
| 2908 | + $html = $add_p_tags ? wpautop($excerpt) : $excerpt; | |
| 2909 | 2909 | |
| 2910 | 2910 | } | 
| 2911 | - return apply_filters( 'sensei_lesson_excerpt', $html ); | |
| 2911 | +		return apply_filters('sensei_lesson_excerpt', $html); | |
| 2912 | 2912 | |
| 2913 | 2913 | } // End lesson_excerpt() | 
| 2914 | 2914 | |
| @@ -2921,20 +2921,20 @@ discard block | ||
| 2921 | 2921 | * @param int $lesson_id | 
| 2922 | 2922 | * @return int|bool $course_id or bool when nothing is found. | 
| 2923 | 2923 | */ | 
| 2924 | -     public function get_course_id( $lesson_id ){ | |
| 2924 | +     public function get_course_id($lesson_id) { | |
| 2925 | 2925 | |
| 2926 | - if( ! isset( $lesson_id ) || empty( $lesson_id ) | |
| 2927 | -         ||  'lesson' != get_post_type( $lesson_id ) ){ | |
| 2926 | + if ( ! isset($lesson_id) || empty($lesson_id) | |
| 2927 | +         ||  'lesson' != get_post_type($lesson_id)) { | |
| 2928 | 2928 | return false; | 
| 2929 | 2929 | } | 
| 2930 | 2930 | |
| 2931 | - $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true); | |
| 2931 | + $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 2932 | 2932 | |
| 2933 | 2933 | // make sure the course id is valid | 
| 2934 | - if( empty( $lesson_course_id ) | |
| 2935 | - || is_array( $lesson_course_id ) | |
| 2936 | - || intval( $lesson_course_id ) < 1 | |
| 2937 | -             || 'course' != get_post_type( $lesson_course_id ) ){ | |
| 2934 | + if (empty($lesson_course_id) | |
| 2935 | + || is_array($lesson_course_id) | |
| 2936 | + || intval($lesson_course_id) < 1 | |
| 2937 | +             || 'course' != get_post_type($lesson_course_id)) { | |
| 2938 | 2938 | |
| 2939 | 2939 | return false; | 
| 2940 | 2940 | |
| @@ -2961,11 +2961,11 @@ discard block | ||
| 2961 | 2961 | * @param string $post_type | 
| 2962 | 2962 | * @return void | 
| 2963 | 2963 | */ | 
| 2964 | -    public function all_lessons_edit_fields( $column_name, $post_type ) { | |
| 2964 | +    public function all_lessons_edit_fields($column_name, $post_type) { | |
| 2965 | 2965 | |
| 2966 | 2966 | // only show these options ont he lesson post type edit screen | 
| 2967 | - if( 'lesson' != $post_type || 'lesson-course' != $column_name | |
| 2968 | -            || ! current_user_can( 'edit_lessons' ) ) { | |
| 2967 | +        if ('lesson' != $post_type || 'lesson-course' != $column_name | |
| 2968 | +            || ! current_user_can('edit_lessons')) { | |
| 2969 | 2969 | return; | 
| 2970 | 2970 | } | 
| 2971 | 2971 | |
| @@ -2973,41 +2973,41 @@ discard block | ||
| 2973 | 2973 | <fieldset class="sensei-edit-field-set inline-edit-lesson"> | 
| 2974 | 2974 | <div class="sensei-inline-edit-col column-<?php echo $column_name ?>"> | 
| 2975 | 2975 | <?php | 
| 2976 | -                    echo '<h4>' . __('Lesson Information', 'woothemes-sensei') . '</h4>'; | |
| 2976 | +                    echo '<h4>'.__('Lesson Information', 'woothemes-sensei').'</h4>'; | |
| 2977 | 2977 | // create a nonce field to be used as a security measure when saving the data | 
| 2978 | - wp_nonce_field( 'bulk-edit-lessons', '_edit_lessons_nonce' ); | |
| 2979 | - wp_nonce_field( 'sensei-save-post-meta','woo_' . $this->token . '_nonce' ); | |
| 2978 | +                    wp_nonce_field('bulk-edit-lessons', '_edit_lessons_nonce'); | |
| 2979 | +                    wp_nonce_field('sensei-save-post-meta', 'woo_'.$this->token.'_nonce'); | |
| 2980 | 2980 | |
| 2981 | 2981 | // unchanged option - we need this in because | 
| 2982 | 2982 | // the default option in bulk edit should not be empty. If it is | 
| 2983 | 2983 | // the user will erase data they didn't want to touch. | 
| 2984 | -                    $no_change_text = '-- ' . __('No Change', 'woothemes-sensei') . ' --'; | |
| 2984 | +                    $no_change_text = '-- '.__('No Change', 'woothemes-sensei').' --'; | |
| 2985 | 2985 | |
| 2986 | 2986 | // | 
| 2987 | 2987 | //course selection | 
| 2988 | 2988 | // | 
| 2989 | - $courses = WooThemes_Sensei_Course::get_all_courses(); | |
| 2989 | + $courses = WooThemes_Sensei_Course::get_all_courses(); | |
| 2990 | 2990 | $course_options = array(); | 
| 2991 | -                    if ( count( $courses ) > 0 ) { | |
| 2992 | -                        foreach ($courses as $course ){ | |
| 2993 | - $course_options[ $course->ID ] = get_the_title( $course->ID ); | |
| 2991 | +                    if (count($courses) > 0) { | |
| 2992 | +                        foreach ($courses as $course) { | |
| 2993 | + $course_options[$course->ID] = get_the_title($course->ID); | |
| 2994 | 2994 | } | 
| 2995 | 2995 | } | 
| 2996 | 2996 | //pre-append the no change option | 
| 2997 | - $course_options['-1']= $no_change_text; | |
| 2998 | - $course_attributes = array( 'name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course' , 'class'=>' ' ); | |
| 2999 | - $course_field = Sensei_Utils::generate_drop_down( '-1', $course_options, $course_attributes ); | |
| 3000 | -                    echo $this->generate_all_lessons_edit_field( __('Lesson Course', 'woothemes-sensei'),   $course_field  ); | |
| 2997 | + $course_options['-1'] = $no_change_text; | |
| 2998 | +                    $course_attributes = array('name'=> 'lesson_course', 'id'=>'sensei-edit-lesson-course', 'class'=>' '); | |
| 2999 | +                    $course_field = Sensei_Utils::generate_drop_down('-1', $course_options, $course_attributes); | |
| 3000 | +                    echo $this->generate_all_lessons_edit_field(__('Lesson Course', 'woothemes-sensei'), $course_field); | |
| 3001 | 3001 | |
| 3002 | 3002 | // | 
| 3003 | 3003 | // lesson complexity selection | 
| 3004 | 3004 | // | 
| 3005 | - $lesson_complexities = $this->lesson_complexities(); | |
| 3005 | + $lesson_complexities = $this->lesson_complexities(); | |
| 3006 | 3006 | //pre-append the no change option | 
| 3007 | - $lesson_complexities['-1']= $no_change_text; | |
| 3008 | - $complexity_dropdown_attributes = array( 'name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity' , 'class'=>' '); | |
| 3009 | - $complexity_filed = Sensei_Utils::generate_drop_down( '-1', $lesson_complexities, $complexity_dropdown_attributes ); | |
| 3010 | -                    echo $this->generate_all_lessons_edit_field( __('Lesson Complexity', 'woothemes-sensei'),   $complexity_filed  ); | |
| 3007 | + $lesson_complexities['-1'] = $no_change_text; | |
| 3008 | +                    $complexity_dropdown_attributes = array('name'=> 'lesson_complexity', 'id'=>'sensei-edit-lesson-complexity', 'class'=>' '); | |
| 3009 | +                    $complexity_filed = Sensei_Utils::generate_drop_down('-1', $lesson_complexities, $complexity_dropdown_attributes); | |
| 3010 | +                    echo $this->generate_all_lessons_edit_field(__('Lesson Complexity', 'woothemes-sensei'), $complexity_filed); | |
| 3011 | 3011 | |
| 3012 | 3012 | ?> | 
| 3013 | 3013 | |
| @@ -3020,34 +3020,34 @@ discard block | ||
| 3020 | 3020 | // | 
| 3021 | 3021 | $pass_required_options = array( | 
| 3022 | 3022 | '-1' => $no_change_text, | 
| 3023 | -                         '0' => __('No','woothemes'), | |
| 3024 | -                         '1' => __('Yes','woothemes'), | |
| 3023 | +                         '0' => __('No', 'woothemes'), | |
| 3024 | +                         '1' => __('Yes', 'woothemes'), | |
| 3025 | 3025 | ); | 
| 3026 | 3026 | |
| 3027 | - $pass_required_select_attributes = array( 'name'=> 'pass_required', | |
| 3027 | +                    $pass_required_select_attributes = array('name'=> 'pass_required', | |
| 3028 | 3028 | 'id'=> 'sensei-edit-lesson-pass-required', | 
| 3029 | - 'class'=>' ' ); | |
| 3030 | - $require_pass_field = Sensei_Utils::generate_drop_down( '-1', $pass_required_options, $pass_required_select_attributes, false ); | |
| 3031 | -                    echo $this->generate_all_lessons_edit_field( __('Pass required', 'woothemes-sensei'),   $require_pass_field  ); | |
| 3029 | + 'class'=>' '); | |
| 3030 | +                    $require_pass_field = Sensei_Utils::generate_drop_down('-1', $pass_required_options, $pass_required_select_attributes, false); | |
| 3031 | +                    echo $this->generate_all_lessons_edit_field(__('Pass required', 'woothemes-sensei'), $require_pass_field); | |
| 3032 | 3032 | |
| 3033 | 3033 | // | 
| 3034 | 3034 | // Quiz pass percentage | 
| 3035 | 3035 | // | 
| 3036 | 3036 | $quiz_pass_percentage_field = '<input name="quiz_passmark" id="sensei-edit-quiz-pass-percentage" type="number" />'; | 
| 3037 | -                    echo $this->generate_all_lessons_edit_field( __('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field  ); | |
| 3037 | +                    echo $this->generate_all_lessons_edit_field(__('Pass Percentage', 'woothemes-sensei'), $quiz_pass_percentage_field); | |
| 3038 | 3038 | |
| 3039 | 3039 | // | 
| 3040 | 3040 | // Enable quiz reset button | 
| 3041 | 3041 | // | 
| 3042 | 3042 | $quiz_reset_select__options = array( | 
| 3043 | 3043 | '-1' => $no_change_text, | 
| 3044 | -                        '0' => __('No','woothemes'), | |
| 3045 | -                        '1' => __('Yes','woothemes'), | |
| 3044 | +                        '0' => __('No', 'woothemes'), | |
| 3045 | +                        '1' => __('Yes', 'woothemes'), | |
| 3046 | 3046 | ); | 
| 3047 | 3047 | $quiz_reset_name_id = 'sensei-edit-enable-quiz-reset'; | 
| 3048 | - $quiz_reset_select_attributes = array( 'name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' ' ); | |
| 3049 | - $quiz_reset_field = Sensei_Utils::generate_drop_down( '-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false ); | |
| 3050 | -                    echo $this->generate_all_lessons_edit_field( __('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field  ); | |
| 3048 | +                    $quiz_reset_select_attributes = array('name'=> 'enable_quiz_reset', 'id'=>$quiz_reset_name_id, 'class'=>' '); | |
| 3049 | +                    $quiz_reset_field = Sensei_Utils::generate_drop_down('-1', $quiz_reset_select__options, $quiz_reset_select_attributes, false); | |
| 3050 | +                    echo $this->generate_all_lessons_edit_field(__('Enable quiz reset button', 'woothemes-sensei'), $quiz_reset_field); | |
| 3051 | 3051 | |
| 3052 | 3052 | ?> | 
| 3053 | 3053 | </div> | 
| @@ -3066,17 +3066,17 @@ discard block | ||
| 3066 | 3066 | * @param string $field type markup for the field that must be wrapped. | 
| 3067 | 3067 | * @return string $field_html | 
| 3068 | 3068 | */ | 
| 3069 | -    public function generate_all_lessons_edit_field( $title  ,$field ){ | |
| 3069 | +    public function generate_all_lessons_edit_field($title, $field) { | |
| 3070 | 3070 | |
| 3071 | 3071 | $html = ''; | 
| 3072 | 3072 | $html = '<div class="inline-edit-group" >'; | 
| 3073 | - $html .= '<span class="title">'. $title .'</span> '; | |
| 3073 | + $html .= '<span class="title">'.$title.'</span> '; | |
| 3074 | 3074 | $html .= '<span class="input-text-wrap">'; | 
| 3075 | 3075 | $html .= $field; | 
| 3076 | 3076 | $html .= '</span>'; | 
| 3077 | 3077 | $html .= '</label></div>'; | 
| 3078 | 3078 | |
| 3079 | - return $html ; | |
| 3079 | + return $html; | |
| 3080 | 3080 | |
| 3081 | 3081 | }//end generate_all_lessons_edit_field | 
| 3082 | 3082 | |
| @@ -3090,48 +3090,48 @@ discard block | ||
| 3090 | 3090 |      function save_all_lessons_edit_fields() { | 
| 3091 | 3091 | |
| 3092 | 3092 | // verify all the data before attempting to save | 
| 3093 | - if( ! isset( $_POST['security'] ) || ! check_ajax_referer( 'bulk-edit-lessons', 'security' ) | |
| 3094 | -            ||  empty( $_POST[ 'post_ids' ] )  || ! is_array( $_POST[ 'post_ids' ] ) ) { | |
| 3093 | +        if ( ! isset($_POST['security']) || ! check_ajax_referer('bulk-edit-lessons', 'security') | |
| 3094 | +            ||  empty($_POST['post_ids']) || ! is_array($_POST['post_ids'])) { | |
| 3095 | 3095 | die(); | 
| 3096 | 3096 | } | 
| 3097 | 3097 | |
| 3098 | 3098 | // get our variables | 
| 3099 | - $new_course = sanitize_text_field( $_POST['sensei_edit_lesson_course'] ); | |
| 3100 | - $new_complexity = sanitize_text_field( $_POST['sensei_edit_complexity'] ); | |
| 3101 | - $new_pass_required = sanitize_text_field( $_POST['sensei_edit_pass_required'] ); | |
| 3102 | - $new_pass_percentage = sanitize_text_field( $_POST['sensei_edit_pass_percentage'] ); | |
| 3103 | - $new_enable_quiz_reset = sanitize_text_field( $_POST['sensei_edit_enable_quiz_reset'] ); | |
| 3099 | + $new_course = sanitize_text_field($_POST['sensei_edit_lesson_course']); | |
| 3100 | + $new_complexity = sanitize_text_field($_POST['sensei_edit_complexity']); | |
| 3101 | + $new_pass_required = sanitize_text_field($_POST['sensei_edit_pass_required']); | |
| 3102 | + $new_pass_percentage = sanitize_text_field($_POST['sensei_edit_pass_percentage']); | |
| 3103 | + $new_enable_quiz_reset = sanitize_text_field($_POST['sensei_edit_enable_quiz_reset']); | |
| 3104 | 3104 | // store the values for all selected posts | 
| 3105 | -        foreach( $_POST[ 'post_ids' ] as $lesson_id ) { | |
| 3105 | +        foreach ($_POST['post_ids'] as $lesson_id) { | |
| 3106 | 3106 | |
| 3107 | 3107 | // get the quiz id needed for the quiz meta | 
| 3108 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 3108 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 3109 | 3109 | |
| 3110 | 3110 | // do not save the items if the value is -1 as this | 
| 3111 | 3111 | // means it was not changed | 
| 3112 | 3112 | |
| 3113 | 3113 | // update lesson course | 
| 3114 | -            if( -1 != $new_course ){ | |
| 3115 | - update_post_meta( $lesson_id, '_lesson_course', $new_course ); | |
| 3114 | +            if ( -1 != $new_course ) { | |
| 3115 | + update_post_meta($lesson_id, '_lesson_course', $new_course); | |
| 3116 | 3116 | } | 
| 3117 | 3117 | // update lesson complexity | 
| 3118 | -            if( -1 != $new_complexity ){ | |
| 3119 | - update_post_meta( $lesson_id, '_lesson_complexity', $new_complexity ); | |
| 3118 | +            if ( -1 != $new_complexity ) { | |
| 3119 | + update_post_meta($lesson_id, '_lesson_complexity', $new_complexity); | |
| 3120 | 3120 | } | 
| 3121 | 3121 | |
| 3122 | 3122 | // Quiz Related settings | 
| 3123 | -            if( isset( $quiz_id) && 0 < intval( $quiz_id ) ) { | |
| 3123 | +            if (isset($quiz_id) && 0 < intval($quiz_id)) { | |
| 3124 | 3124 | |
| 3125 | 3125 | // update pass required | 
| 3126 | 3126 |                  if (-1 != $new_pass_required) { | 
| 3127 | 3127 | |
| 3128 | - $checked = $new_pass_required ? 'on' : ''; | |
| 3128 | + $checked = $new_pass_required ? 'on' : ''; | |
| 3129 | 3129 | update_post_meta($quiz_id, '_pass_required', $checked); | 
| 3130 | - unset( $checked ); | |
| 3130 | + unset($checked); | |
| 3131 | 3131 | } | 
| 3132 | 3132 | |
| 3133 | 3133 | // update pass percentage | 
| 3134 | -                if( !empty( $new_pass_percentage) && is_numeric( $new_pass_percentage ) ){ | |
| 3134 | +                if ( ! empty($new_pass_percentage) && is_numeric($new_pass_percentage)) { | |
| 3135 | 3135 | |
| 3136 | 3136 | update_post_meta($quiz_id, '_quiz_passmark', $new_pass_percentage); | 
| 3137 | 3137 | |
| @@ -3142,9 +3142,9 @@ discard block | ||
| 3142 | 3142 | // | 
| 3143 | 3143 |                  if (-1 != $new_enable_quiz_reset ) { | 
| 3144 | 3144 | |
| 3145 | - $checked = $new_enable_quiz_reset ? 'on' : '' ; | |
| 3145 | + $checked = $new_enable_quiz_reset ? 'on' : ''; | |
| 3146 | 3146 | update_post_meta($quiz_id, '_enable_quiz_reset', $checked); | 
| 3147 | - unset( $checked ); | |
| 3147 | + unset($checked); | |
| 3148 | 3148 | |
| 3149 | 3149 | } | 
| 3150 | 3150 | |
| @@ -3168,31 +3168,31 @@ discard block | ||
| 3168 | 3168 | * @since 1.8.0 | 
| 3169 | 3169 | * @return void | 
| 3170 | 3170 | */ | 
| 3171 | -    public function set_quick_edit_admin_defaults( $column_name, $post_id ){ | |
| 3171 | +    public function set_quick_edit_admin_defaults($column_name, $post_id) { | |
| 3172 | 3172 | |
| 3173 | -        if( 'lesson-course' != $column_name ){ | |
| 3173 | +        if ('lesson-course' != $column_name) { | |
| 3174 | 3174 | return; | 
| 3175 | 3175 | } | 
| 3176 | 3176 | // load the script | 
| 3177 | - $suffix = defined( 'SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | |
| 3178 | - wp_enqueue_script( 'sensei-lesson-quick-edit', Sensei()->plugin_url . 'assets/js/admin/lesson-quick-edit' . $suffix . '.js', array( 'jquery' ), Sensei()->version, true ); | |
| 3177 | +        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; | |
| 3178 | +        wp_enqueue_script('sensei-lesson-quick-edit', Sensei()->plugin_url.'assets/js/admin/lesson-quick-edit'.$suffix.'.js', array('jquery'), Sensei()->version, true); | |
| 3179 | 3179 | |
| 3180 | 3180 | // setup the values for all meta fields | 
| 3181 | 3181 | $data = array(); | 
| 3182 | -        foreach( $this->meta_fields as $field ){ | |
| 3182 | +        foreach ($this->meta_fields as $field) { | |
| 3183 | 3183 | |
| 3184 | - $data[$field] = get_post_meta( $post_id, '_'.$field, true ); | |
| 3184 | + $data[$field] = get_post_meta($post_id, '_'.$field, true); | |
| 3185 | 3185 | |
| 3186 | 3186 | } | 
| 3187 | 3187 | // add quiz meta fields | 
| 3188 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $post_id ); | |
| 3189 | -        foreach( Sensei()->quiz->meta_fields as $field ){ | |
| 3188 | + $quiz_id = Sensei()->lesson->lesson_quizzes($post_id); | |
| 3189 | +        foreach (Sensei()->quiz->meta_fields as $field) { | |
| 3190 | 3190 | |
| 3191 | - $data[$field] = get_post_meta( $quiz_id, '_'.$field, true ); | |
| 3191 | + $data[$field] = get_post_meta($quiz_id, '_'.$field, true); | |
| 3192 | 3192 | |
| 3193 | 3193 | } | 
| 3194 | 3194 | |
| 3195 | - wp_localize_script( 'sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data ); | |
| 3195 | +        wp_localize_script('sensei-lesson-quick-edit', 'sensei_quick_edit_'.$post_id, $data); | |
| 3196 | 3196 | |
| 3197 | 3197 | }// end quick edit admin defaults | 
| 3198 | 3198 | |
| @@ -3205,19 +3205,19 @@ discard block | ||
| 3205 | 3205 | * @param array $classes | 
| 3206 | 3206 | * @return array $classes | 
| 3207 | 3207 | */ | 
| 3208 | -    public static function single_course_lessons_classes( $classes ){ | |
| 3208 | +    public static function single_course_lessons_classes($classes) { | |
| 3209 | 3209 | |
| 3210 | -        if(  is_singular('course') ){ | |
| 3210 | +        if (is_singular('course')) { | |
| 3211 | 3211 | |
| 3212 | 3212 | global $post; | 
| 3213 | 3213 | $course_id = $post->ID; | 
| 3214 | 3214 | |
| 3215 | - $lesson_classes = array( 'course', 'post' ); | |
| 3216 | -            if ( is_user_logged_in() ) { | |
| 3215 | +            $lesson_classes = array('course', 'post'); | |
| 3216 | +            if (is_user_logged_in()) { | |
| 3217 | 3217 | |
| 3218 | 3218 | // Check if Lesson is complete | 
| 3219 | - $single_lesson_complete = Sensei_Utils::user_completed_lesson( get_the_ID(), get_current_user_id() ); | |
| 3220 | -                if ( $single_lesson_complete ) { | |
| 3219 | + $single_lesson_complete = Sensei_Utils::user_completed_lesson(get_the_ID(), get_current_user_id()); | |
| 3220 | +                if ($single_lesson_complete) { | |
| 3221 | 3221 | |
| 3222 | 3222 | $lesson_classes[] = 'lesson-completed'; | 
| 3223 | 3223 | |
| @@ -3225,14 +3225,14 @@ discard block | ||
| 3225 | 3225 | |
| 3226 | 3226 | } // End If Statement | 
| 3227 | 3227 | |
| 3228 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() ); | |
| 3229 | -            if (  Sensei_Utils::is_preview_lesson( get_the_ID() ) && !$is_user_taking_course ) { | |
| 3228 | + $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id()); | |
| 3229 | +            if (Sensei_Utils::is_preview_lesson(get_the_ID()) && ! $is_user_taking_course) { | |
| 3230 | 3230 | |
| 3231 | 3231 | $lesson_classes[] = 'lesson-preview'; | 
| 3232 | 3232 | |
| 3233 | 3233 | } | 
| 3234 | 3234 | |
| 3235 | - $classes = array_merge( $classes, $lesson_classes ); | |
| 3235 | + $classes = array_merge($classes, $lesson_classes); | |
| 3236 | 3236 | |
| 3237 | 3237 | } | 
| 3238 | 3238 | |
| @@ -3246,56 +3246,56 @@ discard block | ||
| 3246 | 3246 | * @since 1.9.0 | 
| 3247 | 3247 | * @param $lesson_id | 
| 3248 | 3248 | */ | 
| 3249 | -    public static function the_lesson_meta( $lesson_id ){ | |
| 3249 | +    public static function the_lesson_meta($lesson_id) { | |
| 3250 | 3250 | |
| 3251 | 3251 | global $wp_query; | 
| 3252 | 3252 | $loop_lesson_number = $wp_query->current_post + 1; | 
| 3253 | 3253 | |
| 3254 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); | |
| 3254 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); | |
| 3255 | 3255 | $single_lesson_complete = false; | 
| 3256 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() ); | |
| 3256 | + $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id()); | |
| 3257 | 3257 | |
| 3258 | 3258 | // Get Lesson data | 
| 3259 | 3259 | $complexity_array = Sensei()->lesson->lesson_complexities(); | 
| 3260 | 3260 | |
| 3261 | - $lesson_complexity = get_post_meta( $lesson_id, '_lesson_complexity', true ); | |
| 3262 | -        if ( '' != $lesson_complexity ) { | |
| 3261 | + $lesson_complexity = get_post_meta($lesson_id, '_lesson_complexity', true); | |
| 3262 | +        if ('' != $lesson_complexity) { | |
| 3263 | 3263 | |
| 3264 | 3264 | $lesson_complexity = $complexity_array[$lesson_complexity]; | 
| 3265 | 3265 | |
| 3266 | 3266 | } | 
| 3267 | - $user_info = get_userdata( absint( get_post()->post_author ) ); | |
| 3268 | - $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id); | |
| 3267 | + $user_info = get_userdata(absint(get_post()->post_author)); | |
| 3268 | + $is_preview = Sensei_Utils::is_preview_lesson($lesson_id); | |
| 3269 | 3269 | $preview_label = ''; | 
| 3270 | -        if ( $is_preview && !$is_user_taking_course ) { | |
| 3270 | +        if ($is_preview && ! $is_user_taking_course) { | |
| 3271 | 3271 | |
| 3272 | - $preview_label = Sensei()->frontend->sensei_lesson_preview_title_text( $lesson_id); | |
| 3273 | - $preview_label = '<span class="preview-heading">' . $preview_label . '</span>'; | |
| 3272 | + $preview_label = Sensei()->frontend->sensei_lesson_preview_title_text($lesson_id); | |
| 3273 | + $preview_label = '<span class="preview-heading">'.$preview_label.'</span>'; | |
| 3274 | 3274 | |
| 3275 | 3275 | } | 
| 3276 | 3276 | |
| 3277 | 3277 | |
| 3278 | - $count_markup= ''; | |
| 3278 | + $count_markup = ''; | |
| 3279 | 3279 | /** | 
| 3280 | 3280 | * Filter for if you want the $lesson_count to show next to the lesson. | 
| 3281 | 3281 | * | 
| 3282 | 3282 | * @since 1.0 | 
| 3283 | 3283 | * @param bool default false. | 
| 3284 | 3284 | */ | 
| 3285 | -        if( apply_filters( 'sensei_show_lesson_numbers', false ) ) { | |
| 3285 | +        if (apply_filters('sensei_show_lesson_numbers', false)) { | |
| 3286 | 3286 | |
| 3287 | - $count_markup = '<span class="lesson-number">' . $loop_lesson_number. '</span>'; | |
| 3287 | + $count_markup = '<span class="lesson-number">'.$loop_lesson_number.'</span>'; | |
| 3288 | 3288 | |
| 3289 | 3289 | } | 
| 3290 | 3290 | |
| 3291 | - $heading_link_title = sprintf( __( 'Start %s', 'woothemes-sensei' ), get_the_title( $lesson_id ) ); | |
| 3291 | +        $heading_link_title = sprintf(__('Start %s', 'woothemes-sensei'), get_the_title($lesson_id)); | |
| 3292 | 3292 | |
| 3293 | 3293 | ?> | 
| 3294 | 3294 | <header> | 
| 3295 | 3295 | <h2> | 
| 3296 | - <a href="<?php echo esc_url_raw( get_permalink( $lesson_id ) ) ?>" | |
| 3297 | - title="<?php esc_attr_e( $heading_link_title ) ?>" > | |
| 3298 | - <?php echo $count_markup. get_the_title( $lesson_id ) . $preview_label; ?> | |
| 3296 | + <a href="<?php echo esc_url_raw(get_permalink($lesson_id)) ?>" | |
| 3297 | + title="<?php esc_attr_e($heading_link_title) ?>" > | |
| 3298 | + <?php echo $count_markup.get_the_title($lesson_id).$preview_label; ?> | |
| 3299 | 3299 | </a> | 
| 3300 | 3300 | </h2> | 
| 3301 | 3301 | |
| @@ -3304,33 +3304,33 @@ discard block | ||
| 3304 | 3304 | <?php | 
| 3305 | 3305 | |
| 3306 | 3306 | $meta_html = ''; | 
| 3307 | - $user_lesson_status = Sensei_Utils::user_lesson_status( get_the_ID(), get_current_user_id() ); | |
| 3307 | + $user_lesson_status = Sensei_Utils::user_lesson_status(get_the_ID(), get_current_user_id()); | |
| 3308 | 3308 | |
| 3309 | - $lesson_length = get_post_meta( $lesson_id, '_lesson_length', true ); | |
| 3310 | -                if ( '' != $lesson_length ) { | |
| 3309 | + $lesson_length = get_post_meta($lesson_id, '_lesson_length', true); | |
| 3310 | +                if ('' != $lesson_length) { | |
| 3311 | 3311 | |
| 3312 | - $meta_html .= '<span class="lesson-length">' . __( 'Length: ', 'woothemes-sensei' ) . $lesson_length . __( ' minutes', 'woothemes-sensei' ) . '</span>'; | |
| 3312 | +                    $meta_html .= '<span class="lesson-length">'.__('Length: ', 'woothemes-sensei').$lesson_length.__(' minutes', 'woothemes-sensei').'</span>'; | |
| 3313 | 3313 | |
| 3314 | 3314 | } | 
| 3315 | 3315 | |
| 3316 | -                if ( Sensei()->settings->get( 'lesson_author' ) ) { | |
| 3316 | +                if (Sensei()->settings->get('lesson_author')) { | |
| 3317 | 3317 | |
| 3318 | - $meta_html .= '<span class="lesson-author">' . __( 'Author: ', 'woothemes-sensei' ) . '<a href="' . get_author_posts_url( absint( get_post()->post_author ) ) . '" title="' . esc_attr( $user_info->display_name ) . '">' . esc_html( $user_info->display_name ) . '</a></span>'; | |
| 3318 | +                    $meta_html .= '<span class="lesson-author">'.__('Author: ', 'woothemes-sensei').'<a href="'.get_author_posts_url(absint(get_post()->post_author)).'" title="'.esc_attr($user_info->display_name).'">'.esc_html($user_info->display_name).'</a></span>'; | |
| 3319 | 3319 | |
| 3320 | 3320 | } // End If Statement | 
| 3321 | -                if ( '' != $lesson_complexity ) { | |
| 3321 | +                if ('' != $lesson_complexity) { | |
| 3322 | 3322 | |
| 3323 | - $meta_html .= '<span class="lesson-complexity">' . __( 'Complexity: ', 'woothemes-sensei' ) . $lesson_complexity .'</span>'; | |
| 3323 | +                    $meta_html .= '<span class="lesson-complexity">'.__('Complexity: ', 'woothemes-sensei').$lesson_complexity.'</span>'; | |
| 3324 | 3324 | |
| 3325 | 3325 | } | 
| 3326 | 3326 | |
| 3327 | -                if ( $single_lesson_complete ) { | |
| 3327 | +                if ($single_lesson_complete) { | |
| 3328 | 3328 | |
| 3329 | - $meta_html .= '<span class="lesson-status complete">' .__( 'Complete', 'woothemes-sensei' ) .'</span>'; | |
| 3329 | +                    $meta_html .= '<span class="lesson-status complete">'.__('Complete', 'woothemes-sensei').'</span>'; | |
| 3330 | 3330 | |
| 3331 | -                } elseif ( $user_lesson_status ) { | |
| 3331 | +                } elseif ($user_lesson_status) { | |
| 3332 | 3332 | |
| 3333 | - $meta_html .= '<span class="lesson-status in-progress">' . __( 'In Progress', 'woothemes-sensei' ) .'</span>'; | |
| 3333 | +                    $meta_html .= '<span class="lesson-status in-progress">'.__('In Progress', 'woothemes-sensei').'</span>'; | |
| 3334 | 3334 | |
| 3335 | 3335 | } // End If Statement | 
| 3336 | 3336 | |
| @@ -3353,19 +3353,19 @@ discard block | ||
| 3353 | 3353 | * | 
| 3354 | 3354 | * @param $lesson_id | 
| 3355 | 3355 | */ | 
| 3356 | -    public static function the_lesson_thumbnail( $lesson_id ){ | |
| 3356 | +    public static function the_lesson_thumbnail($lesson_id) { | |
| 3357 | 3357 | |
| 3358 | -        if( empty( $lesson_id ) ){ | |
| 3358 | +        if (empty($lesson_id)) { | |
| 3359 | 3359 | |
| 3360 | 3360 | $lesson_id = get_the_ID(); | 
| 3361 | 3361 | |
| 3362 | 3362 | } | 
| 3363 | 3363 | |
| 3364 | -        if( 'lesson' != get_post_type( $lesson_id ) ){ | |
| 3364 | +        if ('lesson' != get_post_type($lesson_id)) { | |
| 3365 | 3365 | return; | 
| 3366 | 3366 | } | 
| 3367 | 3367 | |
| 3368 | - echo Sensei()->lesson->lesson_image( $lesson_id ); | |
| 3368 | + echo Sensei()->lesson->lesson_image($lesson_id); | |
| 3369 | 3369 | } | 
| 3370 | 3370 | |
| 3371 | 3371 | |
| @@ -3376,14 +3376,14 @@ discard block | ||
| 3376 | 3376 | * @param string $excerpt | 
| 3377 | 3377 | * @return string $excerpt | 
| 3378 | 3378 | */ | 
| 3379 | -    public static function alter_the_lesson_excerpt( $excerpt ) { | |
| 3379 | +    public static function alter_the_lesson_excerpt($excerpt) { | |
| 3380 | 3380 | |
| 3381 | -        if ('lesson' == get_post_type(get_the_ID())){ | |
| 3381 | +        if ('lesson' == get_post_type(get_the_ID())) { | |
| 3382 | 3382 | |
| 3383 | 3383 | // remove this hooks to avoid an infinite loop. | 
| 3384 | - remove_filter( 'get_the_excerpt', array( 'WooThemes_Sensei_Lesson','alter_the_lesson_excerpt') ); | |
| 3384 | +            remove_filter('get_the_excerpt', array('WooThemes_Sensei_Lesson', 'alter_the_lesson_excerpt')); | |
| 3385 | 3385 | |
| 3386 | - return WooThemes_Sensei_Lesson::lesson_excerpt( get_post( get_the_ID() ) ); | |
| 3386 | + return WooThemes_Sensei_Lesson::lesson_excerpt(get_post(get_the_ID())); | |
| 3387 | 3387 | } | 
| 3388 | 3388 | |
| 3389 | 3389 | return $excerpt; | 
| @@ -3398,20 +3398,20 @@ discard block | ||
| 3398 | 3398 | * @param $current_lesson_id | 
| 3399 | 3399 | * @return mixed | bool | int $prerequisite_lesson_id or false | 
| 3400 | 3400 | */ | 
| 3401 | -    public static function get_lesson_prerequisite_id( $current_lesson_id  ){ | |
| 3401 | +    public static function get_lesson_prerequisite_id($current_lesson_id) { | |
| 3402 | 3402 | |
| 3403 | - $prerequisite_lesson_id = get_post_meta( $current_lesson_id , '_lesson_prerequisite', true ); | |
| 3403 | + $prerequisite_lesson_id = get_post_meta($current_lesson_id, '_lesson_prerequisite', true); | |
| 3404 | 3404 | |
| 3405 | 3405 | // set ti to false if not a valid prerequisite lesson id | 
| 3406 | - if( empty( $prerequisite_lesson_id ) | |
| 3407 | - || 'lesson' != get_post_type( $prerequisite_lesson_id ) | |
| 3408 | -            || $prerequisite_lesson_id == $current_lesson_id  ) { | |
| 3406 | + if (empty($prerequisite_lesson_id) | |
| 3407 | + || 'lesson' != get_post_type($prerequisite_lesson_id) | |
| 3408 | +            || $prerequisite_lesson_id == $current_lesson_id) { | |
| 3409 | 3409 | |
| 3410 | 3410 | $prerequisite_lesson_id = false; | 
| 3411 | 3411 | |
| 3412 | 3412 | } | 
| 3413 | 3413 | |
| 3414 | - return apply_filters( 'sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id ); | |
| 3414 | +        return apply_filters('sensei_lesson_prerequisite', $prerequisite_lesson_id, $current_lesson_id); | |
| 3415 | 3415 | |
| 3416 | 3416 | } | 
| 3417 | 3417 | |
| @@ -3426,27 +3426,27 @@ discard block | ||
| 3426 | 3426 | * @param $user_id | 
| 3427 | 3427 | * @return bool | 
| 3428 | 3428 | */ | 
| 3429 | -    public  static function is_prerequisite_complete( $lesson_id, $user_id  ){ | |
| 3429 | +    public  static function is_prerequisite_complete($lesson_id, $user_id) { | |
| 3430 | 3430 | |
| 3431 | - if( empty( $lesson_id ) || empty( $user_id ) | |
| 3432 | - || 'lesson' != get_post_type( $lesson_id ) | |
| 3433 | -        ||  ! is_a( get_user_by( 'id', $user_id ), 'WP_User' )){ | |
| 3431 | + if (empty($lesson_id) || empty($user_id) | |
| 3432 | + || 'lesson' != get_post_type($lesson_id) | |
| 3433 | +        ||  ! is_a(get_user_by('id', $user_id), 'WP_User')) { | |
| 3434 | 3434 | |
| 3435 | 3435 | return false; | 
| 3436 | 3436 | |
| 3437 | 3437 | } | 
| 3438 | 3438 | |
| 3439 | - $pre_requisite_id = (string) self::get_lesson_prerequisite_id( $lesson_id ); | |
| 3439 | + $pre_requisite_id = (string) self::get_lesson_prerequisite_id($lesson_id); | |
| 3440 | 3440 | |
| 3441 | 3441 | // not a valid pre-requisite so pre-requisite is completed | 
| 3442 | - if( 'lesson' != get_post_type( $pre_requisite_id ) | |
| 3443 | -            || ! is_numeric( $pre_requisite_id ) ){ | |
| 3442 | +        if ('lesson' != get_post_type($pre_requisite_id) | |
| 3443 | +            || ! is_numeric($pre_requisite_id)) { | |
| 3444 | 3444 | |
| 3445 | 3445 | return true; | 
| 3446 | 3446 | |
| 3447 | 3447 | } | 
| 3448 | 3448 | |
| 3449 | - return Sensei_Utils::user_completed_lesson( $pre_requisite_id, $user_id ); | |
| 3449 | + return Sensei_Utils::user_completed_lesson($pre_requisite_id, $user_id); | |
| 3450 | 3450 | |
| 3451 | 3451 | }// end is_prerequisite_complete | 
| 3452 | 3452 | |
| @@ -3455,20 +3455,20 @@ discard block | ||
| 3455 | 3455 | * | 
| 3456 | 3456 | * @since 1.9.0 | 
| 3457 | 3457 | */ | 
| 3458 | -    public  static function user_not_taking_course_message(){ | |
| 3458 | +    public  static function user_not_taking_course_message() { | |
| 3459 | 3459 | |
| 3460 | 3460 | $lesson_id = get_the_ID(); | 
| 3461 | 3461 | |
| 3462 | -        if( 'lesson' != get_post_type( $lesson_id ) ){ | |
| 3462 | +        if ('lesson' != get_post_type($lesson_id)) { | |
| 3463 | 3463 | return; | 
| 3464 | 3464 | } | 
| 3465 | 3465 | |
| 3466 | - $is_preview = Sensei_Utils::is_preview_lesson( $lesson_id ); | |
| 3467 | - $pre_requisite_complete = self::is_prerequisite_complete( $lesson_id , get_current_user_id() ); | |
| 3468 | - $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true ); | |
| 3469 | - $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() ); | |
| 3466 | + $is_preview = Sensei_Utils::is_preview_lesson($lesson_id); | |
| 3467 | + $pre_requisite_complete = self::is_prerequisite_complete($lesson_id, get_current_user_id()); | |
| 3468 | + $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 3469 | + $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id()); | |
| 3470 | 3470 | |
| 3471 | -        if ( $pre_requisite_complete && $is_preview && !$user_taking_course ) { | |
| 3471 | +        if ($pre_requisite_complete && $is_preview && ! $user_taking_course) { | |
| 3472 | 3472 | ?> | 
| 3473 | 3473 | |
| 3474 | 3474 | <div class="sensei-message alert"> | 
| @@ -3488,11 +3488,11 @@ discard block | ||
| 3488 | 3488 | * | 
| 3489 | 3489 | * @since 1.9.0 | 
| 3490 | 3490 | */ | 
| 3491 | -    public static function course_signup_link( ){ | |
| 3491 | +    public static function course_signup_link( ) { | |
| 3492 | 3492 | |
| 3493 | - $course_id = Sensei()->lesson->get_course_id( get_the_ID() ); | |
| 3493 | + $course_id = Sensei()->lesson->get_course_id(get_the_ID()); | |
| 3494 | 3494 | |
| 3495 | -        if ( empty( $course_id ) || 'course' != get_post_type( $course_id ) || sensei_all_access() ) { | |
| 3495 | +        if (empty($course_id) || 'course' != get_post_type($course_id) || sensei_all_access()) { | |
| 3496 | 3496 | |
| 3497 | 3497 | return; | 
| 3498 | 3498 | |
| @@ -3505,39 +3505,39 @@ discard block | ||
| 3505 | 3505 | <?php | 
| 3506 | 3506 | |
| 3507 | 3507 | global $current_user; | 
| 3508 | - $wc_post_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true ); | |
| 3508 | + $wc_post_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true); | |
| 3509 | 3509 | |
| 3510 | -            if ( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $course_id ) ) { | |
| 3510 | +            if (Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable($course_id)) { | |
| 3511 | 3511 | |
| 3512 | -                if( is_user_logged_in() ) { | |
| 3512 | +                if (is_user_logged_in()) { | |
| 3513 | 3513 | wp_get_current_user(); | 
| 3514 | 3514 | |
| 3515 | - $course_purchased = Sensei_Utils::sensei_customer_bought_product( $current_user->user_email, $current_user->ID, $wc_post_id ); | |
| 3515 | + $course_purchased = Sensei_Utils::sensei_customer_bought_product($current_user->user_email, $current_user->ID, $wc_post_id); | |
| 3516 | 3516 | |
| 3517 | -                    if( $course_purchased ) { | |
| 3517 | +                    if ($course_purchased) { | |
| 3518 | 3518 | |
| 3519 | - $prereq_course_id = get_post_meta( $course_id, '_course_prerequisite',true ); | |
| 3520 | - $course_link = '<a href="' . esc_url( get_permalink( $prereq_course_id ) ) . '" title="' . esc_attr( get_the_title( $prereq_course_id ) ) . '">' . __( 'the previous course', 'woothemes-sensei' ) . '</a>'; | |
| 3519 | + $prereq_course_id = get_post_meta($course_id, '_course_prerequisite', true); | |
| 3520 | +                        $course_link = '<a href="'.esc_url(get_permalink($prereq_course_id)).'" title="'.esc_attr(get_the_title($prereq_course_id)).'">'.__('the previous course', 'woothemes-sensei').'</a>'; | |
| 3521 | 3521 | ?> | 
| 3522 | 3522 | <div class="sensei-message info"> | 
| 3523 | 3523 | |
| 3524 | - <?php echo sprintf( __( 'Please complete %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link ); ?> | |
| 3524 | +                                <?php  echo sprintf(__('Please complete %1$s before starting the lesson.', 'woothemes-sensei'), $course_link); ?> | |
| 3525 | 3525 | |
| 3526 | 3526 | </div> | 
| 3527 | 3527 | |
| 3528 | 3528 |                      <?php } else { | 
| 3529 | 3529 | |
| 3530 | -		                    if( ! Sensei_Utils::user_started_course( $course_id, $current_user->ID )  ) { ?> | |
| 3530 | +		                    if ( ! Sensei_Utils::user_started_course($course_id, $current_user->ID)) { ?> | |
| 3531 | 3531 | |
| 3532 | 3532 | <div class="sensei-message info"> | 
| 3533 | 3533 | |
| 3534 | 3534 | <?php | 
| 3535 | - $course_link = '<a href="' . esc_url( get_permalink( $course_id ) ) | |
| 3536 | - . '"title="' . __( 'Sign Up', 'woothemes-sensei' ) | |
| 3537 | - . '">' . __( 'course', 'woothemes-sensei' ) | |
| 3535 | + $course_link = '<a href="'.esc_url(get_permalink($course_id)) | |
| 3536 | +		                                            . '"title="'.__('Sign Up', 'woothemes-sensei') | |
| 3537 | +		                                            . '">'.__('course', 'woothemes-sensei') | |
| 3538 | 3538 | . '</a>'; | 
| 3539 | 3539 | |
| 3540 | - echo sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link ); | |
| 3540 | +		                            echo  sprintf(__('Please purchase the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link); | |
| 3541 | 3541 | |
| 3542 | 3542 | ?> | 
| 3543 | 3543 | |
| @@ -3545,43 +3545,43 @@ discard block | ||
| 3545 | 3545 | <?php } // end if user started course | 
| 3546 | 3546 | }// end | 
| 3547 | 3547 |  	               } else { | 
| 3548 | - $a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' ) . '">'; | |
| 3549 | - $a_element .= __( 'course', 'woothemes-sensei' ); | |
| 3548 | +	                $a_element = '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Sign Up', 'woothemes-sensei').'">'; | |
| 3549 | +	                $a_element .= __('course', 'woothemes-sensei'); | |
| 3550 | 3550 | $a_element .= '</a>'; | 
| 3551 | 3551 | |
| 3552 | -	                if( Sensei_Utils::is_preview_lesson( get_the_ID()  ) ){ | |
| 3552 | +	                if (Sensei_Utils::is_preview_lesson(get_the_ID())) { | |
| 3553 | 3553 | |
| 3554 | - $message = sprintf( __( 'This is a preview lesson. Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element ); | |
| 3554 | +						$message = sprintf(__('This is a preview lesson. Please purchase the %1$s before starting the lesson.', 'woothemes-sensei'), $a_element); | |
| 3555 | 3555 | |
| 3556 | -					}else{ | |
| 3556 | +					} else { | |
| 3557 | 3557 | |
| 3558 | - $message = sprintf( __( 'Please purchase the %1$s before starting the lesson.', 'woothemes-sensei' ), $a_element ); | |
| 3558 | +						$message = sprintf(__('Please purchase the %1$s before starting the lesson.', 'woothemes-sensei'), $a_element); | |
| 3559 | 3559 | |
| 3560 | 3560 | } | 
| 3561 | 3561 | |
| 3562 | - Sensei()->notices->add_notice( $message, 'alert' ); | |
| 3562 | + Sensei()->notices->add_notice($message, 'alert'); | |
| 3563 | 3563 | |
| 3564 | 3564 | } | 
| 3565 | 3565 | |
| 3566 | 3566 |              } else { ?> | 
| 3567 | 3567 | |
| 3568 | - <?php if( ! Sensei_Utils::user_started_course( $course_id, get_current_user_id() ) && sensei_is_login_required() ) : ?> | |
| 3568 | + <?php if ( ! Sensei_Utils::user_started_course($course_id, get_current_user_id()) && sensei_is_login_required()) : ?> | |
| 3569 | 3569 | |
| 3570 | 3570 | <div class="sensei-message alert"> | 
| 3571 | 3571 | <?php | 
| 3572 | - $course_link = '<a href="' | |
| 3573 | - . esc_url( get_permalink( $course_id ) ) | |
| 3574 | - . '" title="' . __( 'Sign Up', 'woothemes-sensei' ) | |
| 3575 | - . '">' . __( 'course', 'woothemes-sensei' ) | |
| 3572 | + $course_link = '<a href="' | |
| 3573 | + . esc_url(get_permalink($course_id)) | |
| 3574 | +	                                        . '" title="'.__('Sign Up', 'woothemes-sensei') | |
| 3575 | +	                                        . '">'.__('course', 'woothemes-sensei') | |
| 3576 | 3576 | . '</a>'; | 
| 3577 | 3577 | |
| 3578 | -						if ( Sensei_Utils::is_preview_lesson( get_the_ID( ) ) ) { | |
| 3578 | +						if (Sensei_Utils::is_preview_lesson(get_the_ID( ))) { | |
| 3579 | 3579 | |
| 3580 | - echo sprintf( __( 'This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link ); | |
| 3580 | +							echo sprintf(__('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei'), $course_link); | |
| 3581 | 3581 | |
| 3582 | 3582 |  						} else { | 
| 3583 | 3583 | |
| 3584 | - echo sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link ); | |
| 3584 | +							echo sprintf(__('Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link); | |
| 3585 | 3585 | |
| 3586 | 3586 | } | 
| 3587 | 3587 | |
| @@ -3602,14 +3602,14 @@ discard block | ||
| 3602 | 3602 | * | 
| 3603 | 3603 | * @since 1.9.0 | 
| 3604 | 3604 | */ | 
| 3605 | -    public  static function prerequisite_complete_message(){ | |
| 3605 | +    public  static function prerequisite_complete_message() { | |
| 3606 | 3606 | |
| 3607 | - $lesson_prerequisite = WooThemes_Sensei_Lesson::get_lesson_prerequisite_id( get_the_ID() ); | |
| 3607 | + $lesson_prerequisite = WooThemes_Sensei_Lesson::get_lesson_prerequisite_id(get_the_ID()); | |
| 3608 | 3608 | $lesson_has_pre_requisite = $lesson_prerequisite > 0; | 
| 3609 | -        if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(  get_the_ID(), get_current_user_id() ) && $lesson_has_pre_requisite ) { | |
| 3609 | +        if ( ! WooThemes_Sensei_Lesson::is_prerequisite_complete(get_the_ID(), get_current_user_id()) && $lesson_has_pre_requisite) { | |
| 3610 | 3610 | |
| 3611 | - $prerequisite_lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite ) ) . '" title="' . esc_attr( sprintf( __( 'You must first complete: %1$s', 'woothemes-sensei' ), get_the_title( $lesson_prerequisite ) ) ) . '">' . get_the_title( $lesson_prerequisite ). '</a>'; | |
| 3612 | - echo sprintf( __( 'You must first complete %1$s before viewing this Lesson', 'woothemes-sensei' ), $prerequisite_lesson_link ); | |
| 3611 | +            $prerequisite_lesson_link = '<a href="'.esc_url(get_permalink($lesson_prerequisite)).'" title="'.esc_attr(sprintf(__('You must first complete: %1$s', 'woothemes-sensei'), get_the_title($lesson_prerequisite))).'">'.get_the_title($lesson_prerequisite).'</a>'; | |
| 3612 | +            echo sprintf(__('You must first complete %1$s before viewing this Lesson', 'woothemes-sensei'), $prerequisite_lesson_link); | |
| 3613 | 3613 | |
| 3614 | 3614 | } | 
| 3615 | 3615 | |
| @@ -3621,7 +3621,7 @@ discard block | ||
| 3621 | 3621 | * | 
| 3622 | 3622 | * @deprecated since 1.9.0 | 
| 3623 | 3623 | */ | 
| 3624 | -    public static function deprecate_sensei_lesson_archive_header_hook(){ | |
| 3624 | +    public static function deprecate_sensei_lesson_archive_header_hook() { | |
| 3625 | 3625 | |
| 3626 | 3626 |          sensei_do_deprecated_action('sensei_lesson_archive_header', '1.9.0', 'sensei_loop_lesson_inside_before'); | 
| 3627 | 3627 | |
| @@ -3637,9 +3637,9 @@ discard block | ||
| 3637 | 3637 | |
| 3638 | 3638 | $before_html = '<header class="archive-header"><h1>'; | 
| 3639 | 3639 | $after_html = '</h1></header>'; | 
| 3640 | - $html = $before_html . __( 'Lessons Archive', 'woothemes-sensei' ) . $after_html; | |
| 3640 | +        $html = $before_html.__('Lessons Archive', 'woothemes-sensei').$after_html; | |
| 3641 | 3641 | |
| 3642 | - echo apply_filters( 'sensei_lesson_archive_title', $html ); | |
| 3642 | +        echo apply_filters('sensei_lesson_archive_title', $html); | |
| 3643 | 3643 | |
| 3644 | 3644 | } // sensei_course_archive_header() | 
| 3645 | 3645 | |
| @@ -3649,7 +3649,7 @@ discard block | ||
| 3649 | 3649 | * @global $post | 
| 3650 | 3650 | * @since 1.9.0 | 
| 3651 | 3651 | */ | 
| 3652 | -    public static function the_title(){ | |
| 3652 | +    public static function the_title() { | |
| 3653 | 3653 | |
| 3654 | 3654 | global $post; | 
| 3655 | 3655 | |
| @@ -3662,7 +3662,7 @@ discard block | ||
| 3662 | 3662 | /** | 
| 3663 | 3663 | * Filter documented in class-sensei-messages.php the_title | 
| 3664 | 3664 | */ | 
| 3665 | - echo apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ); | |
| 3665 | +                echo apply_filters('sensei_single_title', get_the_title($post), $post->post_type); | |
| 3666 | 3666 | ?> | 
| 3667 | 3667 | |
| 3668 | 3668 | </h1> | 
| @@ -3680,16 +3680,16 @@ discard block | ||
| 3680 | 3680 | * | 
| 3681 | 3681 | * @param $post_id | 
| 3682 | 3682 | */ | 
| 3683 | -    public static function flush_rewrite_rules( $post_id ){ | |
| 3683 | +    public static function flush_rewrite_rules($post_id) { | |
| 3684 | 3684 | |
| 3685 | -        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE){ | |
| 3685 | +        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) { | |
| 3686 | 3686 | |
| 3687 | 3687 | return; | 
| 3688 | 3688 | |
| 3689 | 3689 | } | 
| 3690 | 3690 | |
| 3691 | 3691 | |
| 3692 | -        if( 'lesson' == get_post_type( $post_id )  ){ | |
| 3692 | +        if ('lesson' == get_post_type($post_id)) { | |
| 3693 | 3693 | |
| 3694 | 3694 | Sensei()->initiate_rewrite_rules_flush(); | 
| 3695 | 3695 | |
| @@ -3706,27 +3706,27 @@ discard block | ||
| 3706 | 3706 | * @param int $lesson_id | 
| 3707 | 3707 | * @param int $user_id | 
| 3708 | 3708 | */ | 
| 3709 | -    public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0 ) { | |
| 3709 | +    public static function footer_quiz_call_to_action($lesson_id = 0, $user_id = 0) { | |
| 3710 | 3710 | |
| 3711 | 3711 | |
| 3712 | - $lesson_id = empty( $lesson_id ) ? get_the_ID() : $lesson_id; | |
| 3713 | - $user_id = empty( $lesson_id ) ? get_current_user_id() : $user_id; | |
| 3712 | + $lesson_id = empty($lesson_id) ? get_the_ID() : $lesson_id; | |
| 3713 | + $user_id = empty($lesson_id) ? get_current_user_id() : $user_id; | |
| 3714 | 3714 | |
| 3715 | 3715 | |
| 3716 | -	    if ( ! sensei_can_user_view_lesson( $lesson_id, $user_id ) ) { | |
| 3716 | +	    if ( ! sensei_can_user_view_lesson($lesson_id, $user_id)) { | |
| 3717 | 3717 | return; | 
| 3718 | 3718 | } | 
| 3719 | 3719 | |
| 3720 | - $lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true ); | |
| 3721 | - $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true ); | |
| 3722 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 3723 | - $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id ); | |
| 3720 | + $lesson_prerequisite = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true); | |
| 3721 | + $lesson_course_id = (int) get_post_meta($lesson_id, '_lesson_course', true); | |
| 3722 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 3723 | + $has_user_completed_lesson = Sensei_Utils::user_completed_lesson(intval($lesson_id), $user_id); | |
| 3724 | 3724 | $show_actions = is_user_logged_in() ? true : false; | 
| 3725 | 3725 | |
| 3726 | -        if( intval( $lesson_prerequisite ) > 0 ) { | |
| 3726 | +        if (intval($lesson_prerequisite) > 0) { | |
| 3727 | 3727 | |
| 3728 | 3728 | // If the user hasn't completed the prereq then hide the current actions | 
| 3729 | - $show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id ); | |
| 3729 | + $show_actions = Sensei_Utils::user_completed_lesson($lesson_prerequisite, $user_id); | |
| 3730 | 3730 | |
| 3731 | 3731 | } | 
| 3732 | 3732 | |
| @@ -3735,19 +3735,19 @@ discard block | ||
| 3735 | 3735 | <footer> | 
| 3736 | 3736 | |
| 3737 | 3737 | <?php | 
| 3738 | -            if( $show_actions && $quiz_id && Sensei()->access_settings() ) { | |
| 3738 | +            if ($show_actions && $quiz_id && Sensei()->access_settings()) { | |
| 3739 | 3739 | |
| 3740 | - $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); | |
| 3741 | -                if( $has_quiz_questions ) { | |
| 3740 | + $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); | |
| 3741 | +                if ($has_quiz_questions) { | |
| 3742 | 3742 | ?> | 
| 3743 | 3743 | |
| 3744 | 3744 | <p> | 
| 3745 | 3745 | |
| 3746 | 3746 | <a class="button" | 
| 3747 | - href="<?php echo esc_url_raw( get_permalink( $quiz_id ) ); ?>" | |
| 3748 | - title="<?php _e( 'View the Lesson Quiz', 'woothemes-sensei' ); ?>"> | |
| 3747 | + href="<?php echo esc_url_raw(get_permalink($quiz_id)); ?>" | |
| 3748 | +                           title="<?php _e('View the Lesson Quiz', 'woothemes-sensei'); ?>"> | |
| 3749 | 3749 | |
| 3750 | - <?php _e( 'View the Lesson Quiz', 'woothemes-sensei' ); ?> | |
| 3750 | +                            <?php  _e('View the Lesson Quiz', 'woothemes-sensei'); ?> | |
| 3751 | 3751 | |
| 3752 | 3752 | </a> | 
| 3753 | 3753 | |
| @@ -3758,11 +3758,11 @@ discard block | ||
| 3758 | 3758 | |
| 3759 | 3759 | } // End If Statement | 
| 3760 | 3760 | |
| 3761 | -            if ( $show_actions && ! $has_user_completed_lesson ) { | |
| 3761 | +            if ($show_actions && ! $has_user_completed_lesson) { | |
| 3762 | 3762 | |
| 3763 | 3763 | sensei_complete_lesson_button(); | 
| 3764 | 3764 | |
| 3765 | -            } elseif( $show_actions ) { | |
| 3765 | +            } elseif ($show_actions) { | |
| 3766 | 3766 | |
| 3767 | 3767 | sensei_reset_lesson_button(); | 
| 3768 | 3768 | |
| @@ -3779,20 +3779,20 @@ discard block | ||
| 3779 | 3779 | * | 
| 3780 | 3780 | * @since 1.9.0 | 
| 3781 | 3781 | */ | 
| 3782 | -    public static function output_comments(){ | |
| 3782 | +    public static function output_comments() { | |
| 3783 | 3783 | |
| 3784 | -        if( ! is_user_logged_in() ){ | |
| 3784 | +        if ( ! is_user_logged_in()) { | |
| 3785 | 3785 | return; | 
| 3786 | 3786 | } | 
| 3787 | 3787 | |
| 3788 | - $pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete( get_the_ID(), get_current_user_id() ); | |
| 3789 | - $course_id = Sensei()->lesson->get_course_id( get_the_ID() ); | |
| 3790 | - $allow_comments = Sensei()->settings->settings[ 'lesson_comments' ]; | |
| 3791 | - $user_taking_course = Sensei_Utils::user_started_course($course_id ); | |
| 3788 | + $pre_requisite_complete = Sensei()->lesson->is_prerequisite_complete(get_the_ID(), get_current_user_id()); | |
| 3789 | + $course_id = Sensei()->lesson->get_course_id(get_the_ID()); | |
| 3790 | + $allow_comments = Sensei()->settings->settings['lesson_comments']; | |
| 3791 | + $user_taking_course = Sensei_Utils::user_started_course($course_id); | |
| 3792 | 3792 | |
| 3793 | - $lesson_allow_comments = $allow_comments && $pre_requisite_complete && $user_taking_course; | |
| 3793 | + $lesson_allow_comments = $allow_comments && $pre_requisite_complete && $user_taking_course; | |
| 3794 | 3794 | |
| 3795 | -        if (  $lesson_allow_comments || is_singular( 'sensei_message' ) ) { | |
| 3795 | +        if ($lesson_allow_comments || is_singular('sensei_message')) { | |
| 3796 | 3796 | |
| 3797 | 3797 | comments_template(); | 
| 3798 | 3798 | |
| @@ -3808,26 +3808,26 @@ discard block | ||
| 3808 | 3808 | * | 
| 3809 | 3809 | * @since 1.9.0 | 
| 3810 | 3810 | */ | 
| 3811 | -    public static function user_lesson_quiz_status_message( $lesson_id = 0, $user_id = 0){ | |
| 3811 | +    public static function user_lesson_quiz_status_message($lesson_id = 0, $user_id = 0) { | |
| 3812 | 3812 | |
| 3813 | - $lesson_id = empty( $lesson_id ) ? get_the_ID() : $lesson_id; | |
| 3814 | - $user_id = empty( $lesson_id ) ? get_current_user_id() : $user_id; | |
| 3815 | - $lesson_course_id = (int) get_post_meta( $lesson_id, '_lesson_course', true ); | |
| 3816 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 3817 | - $has_user_completed_lesson = Sensei_Utils::user_completed_lesson( intval( $lesson_id ), $user_id ); | |
| 3813 | + $lesson_id = empty($lesson_id) ? get_the_ID() : $lesson_id; | |
| 3814 | + $user_id = empty($lesson_id) ? get_current_user_id() : $user_id; | |
| 3815 | + $lesson_course_id = (int) get_post_meta($lesson_id, '_lesson_course', true); | |
| 3816 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 3817 | + $has_user_completed_lesson = Sensei_Utils::user_completed_lesson(intval($lesson_id), $user_id); | |
| 3818 | 3818 | |
| 3819 | 3819 | |
| 3820 | - if ( $quiz_id && is_user_logged_in() | |
| 3821 | -            && Sensei_Utils::user_started_course( $lesson_course_id, $user_id ) ) { | |
| 3820 | + if ($quiz_id && is_user_logged_in() | |
| 3821 | +            && Sensei_Utils::user_started_course($lesson_course_id, $user_id)) { | |
| 3822 | 3822 | |
| 3823 | 3823 | $no_quiz_count = 0; | 
| 3824 | - $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); | |
| 3824 | + $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); | |
| 3825 | 3825 | |
| 3826 | 3826 | // Display lesson quiz status message | 
| 3827 | -            if ( $has_user_completed_lesson || $has_quiz_questions ) { | |
| 3828 | - $status = Sensei_Utils::sensei_user_quiz_status_message( $lesson_id, $user_id, true ); | |
| 3829 | - echo '<div class="sensei-message ' . $status['box_class'] . '">' . $status['message'] . '</div>'; | |
| 3830 | -                if( $has_quiz_questions ) { | |
| 3827 | +            if ($has_user_completed_lesson || $has_quiz_questions) { | |
| 3828 | + $status = Sensei_Utils::sensei_user_quiz_status_message($lesson_id, $user_id, true); | |
| 3829 | + echo '<div class="sensei-message '.$status['box_class'].'">'.$status['message'].'</div>'; | |
| 3830 | +                if ($has_quiz_questions) { | |
| 3831 | 3831 | // echo $status['extra']; | 
| 3832 | 3832 | } // End If Statement | 
| 3833 | 3833 | } // End If Statement | 
| @@ -3843,11 +3843,11 @@ discard block | ||
| 3843 | 3843 | * @param $content | 
| 3844 | 3844 | * @return string | 
| 3845 | 3845 | */ | 
| 3846 | -    public static function limit_archive_content ( $content ){ | |
| 3846 | +    public static function limit_archive_content($content) { | |
| 3847 | 3847 | |
| 3848 | -        if( is_archive('lesson') && Sensei()->settings->get('access_permission') ){ | |
| 3848 | +        if (is_archive('lesson') && Sensei()->settings->get('access_permission')) { | |
| 3849 | 3849 | |
| 3850 | - return wp_trim_words( $content, $num_words = 30, $more = '…' ); | |
| 3850 | + return wp_trim_words($content, $num_words = 30, $more = '…'); | |
| 3851 | 3851 | } | 
| 3852 | 3852 | |
| 3853 | 3853 | return $content; | 
| @@ -3860,9 +3860,9 @@ discard block | ||
| 3860 | 3860 | * @since 1.9.0 | 
| 3861 | 3861 | * @return array | 
| 3862 | 3862 | */ | 
| 3863 | -    public static function get_all_lesson_ids(){ | |
| 3863 | +    public static function get_all_lesson_ids() { | |
| 3864 | 3864 | |
| 3865 | - return get_posts( array( | |
| 3865 | + return get_posts(array( | |
| 3866 | 3866 | 'post_type'=>'lesson', | 
| 3867 | 3867 | 'fields'=>'ids', | 
| 3868 | 3868 | 'post_status' => 'publish', | 
| @@ -3879,4 +3879,4 @@ discard block | ||
| 3879 | 3879 | * @ignore only for backward compatibility | 
| 3880 | 3880 | * @since 1.9.0 | 
| 3881 | 3881 | */ | 
| 3882 | -class WooThemes_Sensei_Lesson extends Sensei_Lesson{} | |
| 3882 | +class WooThemes_Sensei_Lesson extends Sensei_Lesson {} | |
| @@ -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 Notices Class | 
| @@ -11,7 +11,7 @@ discard block | ||
| 11 | 11 | * | 
| 12 | 12 | * @since 1.6.3 | 
| 13 | 13 | */ | 
| 14 | -class Sensei_Notices{ | |
| 14 | +class Sensei_Notices { | |
| 15 | 15 | |
| 16 | 16 | /** | 
| 17 | 17 | * @var $notices | 
| @@ -26,7 +26,7 @@ discard block | ||
| 26 | 26 | /** | 
| 27 | 27 | * constructor | 
| 28 | 28 | */ | 
| 29 | -	public function __construct(){ | |
| 29 | +	public function __construct() { | |
| 30 | 30 | //initialize the notices variable | 
| 31 | 31 | $this->notices = array(); | 
| 32 | 32 | $this->has_printed = false; | 
| @@ -42,12 +42,12 @@ discard block | ||
| 42 | 42 | * @return void | 
| 43 | 43 | */ | 
| 44 | 44 | |
| 45 | -	public function add_notice( $content ,  $type = 'alert'   ){ | |
| 45 | +	public function add_notice($content, $type = 'alert') { | |
| 46 | 46 | // append the new notice | 
| 47 | -		$this->notices[] = array('content' => $content , 'type'=> $type ); | |
| 47 | +		$this->notices[] = array('content' => $content, 'type'=> $type); | |
| 48 | 48 | |
| 49 | 49 | // if a notice is added after we've printed print it immediately. | 
| 50 | -		if( $this->has_printed  ){ | |
| 50 | +		if ($this->has_printed) { | |
| 51 | 51 | $this->maybe_print_notices(); | 
| 52 | 52 | } | 
| 53 | 53 | |
| @@ -59,12 +59,12 @@ discard block | ||
| 59 | 59 | * @return void | 
| 60 | 60 | */ | 
| 61 | 61 | |
| 62 | -	public function maybe_print_notices(){ | |
| 63 | -		if(  count( $this->notices ) > 0  ){ | |
| 62 | +	public function maybe_print_notices() { | |
| 63 | +		if (count($this->notices) > 0) { | |
| 64 | 64 |  			foreach ($this->notices  as  $notice) { | 
| 65 | 65 | |
| 66 | - $classes = 'sensei-message '. $notice['type']; | |
| 67 | - $html = '<div class="'. $classes . '">'. $notice['content'] . '</div>'; | |
| 66 | + $classes = 'sensei-message '.$notice['type']; | |
| 67 | + $html = '<div class="'.$classes.'">'.$notice['content'].'</div>'; | |
| 68 | 68 | |
| 69 | 69 | echo $html; | 
| 70 | 70 | } | 
| @@ -83,7 +83,7 @@ discard block | ||
| 83 | 83 | * | 
| 84 | 84 | * @return void | 
| 85 | 85 | */ | 
| 86 | -	public function clear_notices(){ | |
| 86 | +	public function clear_notices() { | |
| 87 | 87 | // assign an empty array to clear all existing notices | 
| 88 | 88 | $this->notices = array(); | 
| 89 | 89 | } // end clear_notices() | 
| @@ -95,4 +95,4 @@ discard block | ||
| 95 | 95 | * @ignore only for backward compatibility | 
| 96 | 96 | * @since 1.9.0 | 
| 97 | 97 | */ | 
| 98 | -class Woothemes_Sensei_Notices extends Sensei_Notices{} | |
| 98 | +class Woothemes_Sensei_Notices extends Sensei_Notices {} | |
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP | |
| 2 | +if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP | |
| 3 | 3 | /** | 
| 4 | 4 | * Sensei Template Class | 
| 5 | 5 | * | 
| @@ -21,38 +21,38 @@ discard block | ||
| 21 | 21 | * | 
| 22 | 22 | * @return void | 
| 23 | 23 | */ | 
| 24 | -    public static function get_part(  $slug, $name = ''  ){ | |
| 24 | +    public static function get_part($slug, $name = '') { | |
| 25 | 25 | |
| 26 | 26 | $template = ''; | 
| 27 | 27 | $plugin_template_url = Sensei()->template_url; | 
| 28 | - $plugin_template_path = Sensei()->plugin_path() . "/templates/"; | |
| 28 | + $plugin_template_path = Sensei()->plugin_path()."/templates/"; | |
| 29 | 29 | |
| 30 | 30 | // Look in yourtheme/slug-name.php and yourtheme/sensei/slug-name.php | 
| 31 | -        if ( $name ){ | |
| 31 | +        if ($name) { | |
| 32 | 32 | |
| 33 | -            $template = locate_template( array ( "{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php" ) ); | |
| 33 | +            $template = locate_template(array("{$slug}-{$name}.php", "{$plugin_template_url}{$slug}-{$name}.php")); | |
| 34 | 34 | |
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 | // Get default slug-name.php | 
| 38 | -        if ( ! $template && $name && file_exists( $plugin_template_path . "{$slug}-{$name}.php" ) ){ | |
| 38 | +        if ( ! $template && $name && file_exists($plugin_template_path."{$slug}-{$name}.php")) { | |
| 39 | 39 | |
| 40 | -            $template = $plugin_template_path . "{$slug}-{$name}.php"; | |
| 40 | +            $template = $plugin_template_path."{$slug}-{$name}.php"; | |
| 41 | 41 | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/sensei/slug.php | 
| 46 | -        if ( !$template ){ | |
| 46 | +        if ( ! $template) { | |
| 47 | 47 | |
| 48 | -            $template = locate_template( array ( "{$slug}.php", "{$plugin_template_url}{$slug}.php" ) ); | |
| 48 | +            $template = locate_template(array("{$slug}.php", "{$plugin_template_url}{$slug}.php")); | |
| 49 | 49 | |
| 50 | 50 | } | 
| 51 | 51 | |
| 52 | 52 | |
| 53 | -        if ( $template ){ | |
| 53 | +        if ($template) { | |
| 54 | 54 | |
| 55 | - load_template( $template, false ); | |
| 55 | + load_template($template, false); | |
| 56 | 56 | |
| 57 | 57 | } | 
| 58 | 58 | |
| @@ -68,20 +68,20 @@ discard block | ||
| 68 | 68 | * @param string $template_path | 
| 69 | 69 | * @param string $default_path | 
| 70 | 70 | */ | 
| 71 | -    public static function get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) { | |
| 71 | +    public static function get_template($template_name, $args = array(), $template_path = '', $default_path = '') { | |
| 72 | 72 | |
| 73 | - if ( $args && is_array($args) ) | |
| 74 | - extract( $args ); | |
| 73 | + if ($args && is_array($args)) | |
| 74 | + extract($args); | |
| 75 | 75 | |
| 76 | - $located = self::locate_template( $template_name, $template_path, $default_path ); | |
| 76 | + $located = self::locate_template($template_name, $template_path, $default_path); | |
| 77 | 77 | |
| 78 | -        if( ! empty( $located ) ){ | |
| 78 | +        if ( ! empty($located)) { | |
| 79 | 79 | |
| 80 | - do_action( 'sensei_before_template_part', $template_name, $template_path, $located ); | |
| 80 | +            do_action('sensei_before_template_part', $template_name, $template_path, $located); | |
| 81 | 81 | |
| 82 | - include( $located ); | |
| 82 | + include($located); | |
| 83 | 83 | |
| 84 | - do_action( 'sensei_after_template_part', $template_name, $template_path, $located ); | |
| 84 | +            do_action('sensei_after_template_part', $template_name, $template_path, $located); | |
| 85 | 85 | |
| 86 | 86 | } | 
| 87 | 87 | |
| @@ -98,32 +98,32 @@ discard block | ||
| 98 | 98 | * | 
| 99 | 99 | * @return mixed|void | 
| 100 | 100 | */ | 
| 101 | -    public static function locate_template( $template_name, $template_path = '', $default_path = '' ) { | |
| 101 | +    public static function locate_template($template_name, $template_path = '', $default_path = '') { | |
| 102 | 102 | |
| 103 | - if ( ! $template_path ) $template_path = Sensei()->template_url; | |
| 104 | - if ( ! $default_path ) $default_path = Sensei()->plugin_path() . '/templates/'; | |
| 103 | + if ( ! $template_path) $template_path = Sensei()->template_url; | |
| 104 | + if ( ! $default_path) $default_path = Sensei()->plugin_path().'/templates/'; | |
| 105 | 105 | |
| 106 | 106 | // Look within passed path within the theme - this is priority | 
| 107 | 107 | $template = locate_template( | 
| 108 | 108 | array( | 
| 109 | - $template_path . $template_name, | |
| 109 | + $template_path.$template_name, | |
| 110 | 110 | $template_name | 
| 111 | 111 | ) | 
| 112 | 112 | ); | 
| 113 | 113 | |
| 114 | 114 | // Get default template | 
| 115 | -        if ( ! $template ){ | |
| 115 | +        if ( ! $template) { | |
| 116 | 116 | |
| 117 | - $template = $default_path . $template_name; | |
| 117 | + $template = $default_path.$template_name; | |
| 118 | 118 | |
| 119 | 119 | } | 
| 120 | 120 | // return nothing for file that do not exist | 
| 121 | -        if( !file_exists( $template ) ){ | |
| 121 | +        if ( ! file_exists($template)) { | |
| 122 | 122 | $template = ''; | 
| 123 | 123 | } | 
| 124 | 124 | |
| 125 | 125 | // Return what we found | 
| 126 | - return apply_filters( 'sensei_locate_template', $template, $template_name, $template_path ); | |
| 126 | +        return apply_filters('sensei_locate_template', $template, $template_name, $template_path); | |
| 127 | 127 | |
| 128 | 128 | } // end locate | 
| 129 | 129 | |
| @@ -136,122 +136,122 @@ discard block | ||
| 136 | 136 | * @param string $template | 
| 137 | 137 | * @return string $template | 
| 138 | 138 | */ | 
| 139 | -    public static function template_loader ( $template = '' ) { | |
| 139 | +    public static function template_loader($template = '') { | |
| 140 | 140 | |
| 141 | 141 | global $wp_query, $email_template; | 
| 142 | 142 | |
| 143 | - $find = array( 'woothemes-sensei.php' ); | |
| 143 | +        $find = array('woothemes-sensei.php'); | |
| 144 | 144 | $file = ''; | 
| 145 | 145 | |
| 146 | -        if ( isset( $email_template ) && $email_template ) { | |
| 146 | +        if (isset($email_template) && $email_template) { | |
| 147 | 147 | |
| 148 | - $file = 'emails/' . $email_template; | |
| 148 | + $file = 'emails/'.$email_template; | |
| 149 | 149 | $find[] = $file; | 
| 150 | - $find[] = Sensei()->template_url . $file; | |
| 150 | + $find[] = Sensei()->template_url.$file; | |
| 151 | 151 | |
| 152 | -        } elseif ( is_single() && get_post_type() == 'course' ) { | |
| 152 | +        } elseif (is_single() && get_post_type() == 'course') { | |
| 153 | 153 | |
| 154 | 154 | // possible backward compatible template include if theme overrides content-single-course.php | 
| 155 | 155 | // this template was removed in 1.9.0 and code all moved into the main single-course.php file | 
| 156 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-course.php', true ); | |
| 156 | + self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-course.php', true); | |
| 157 | 157 | |
| 158 | - $file = 'single-course.php'; | |
| 158 | + $file = 'single-course.php'; | |
| 159 | 159 | $find[] = $file; | 
| 160 | - $find[] = Sensei()->template_url . $file; | |
| 160 | + $find[] = Sensei()->template_url.$file; | |
| 161 | 161 | |
| 162 | 162 | |
| 163 | -        } elseif ( is_single() && get_post_type() == 'lesson' ) {  // check | |
| 163 | +        } elseif (is_single() && get_post_type() == 'lesson') {  // check | |
| 164 | 164 | |
| 165 | 165 | // possible backward compatible template include if theme overrides content-single-lesson.php | 
| 166 | 166 | // this template was removed in 1.9.0 and code all moved into the main single-lesson.php file | 
| 167 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-lesson.php', true ); | |
| 167 | + self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-lesson.php', true); | |
| 168 | 168 | |
| 169 | - $file = 'single-lesson.php'; | |
| 169 | + $file = 'single-lesson.php'; | |
| 170 | 170 | $find[] = $file; | 
| 171 | - $find[] = Sensei()->template_url . $file; | |
| 171 | + $find[] = Sensei()->template_url.$file; | |
| 172 | 172 | |
| 173 | -        } elseif ( is_single() && get_post_type() == 'quiz' ) {  // check | |
| 173 | +        } elseif (is_single() && get_post_type() == 'quiz') {  // check | |
| 174 | 174 | |
| 175 | 175 | // possible backward compatible template include if theme overrides content-single-quiz.php | 
| 176 | 176 | // this template was removed in 1.9.0 and code all moved into the main single-quiz.php file | 
| 177 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-quiz.php' , true); | |
| 177 | + self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-quiz.php', true); | |
| 178 | 178 | |
| 179 | - $file = 'single-quiz.php'; | |
| 179 | + $file = 'single-quiz.php'; | |
| 180 | 180 | $find[] = $file; | 
| 181 | - $find[] = Sensei()->template_url . $file; | |
| 181 | + $find[] = Sensei()->template_url.$file; | |
| 182 | 182 | |
| 183 | 183 | |
| 184 | -        } elseif ( is_single() && get_post_type() == 'sensei_message' ) { //// check | |
| 184 | +        } elseif (is_single() && get_post_type() == 'sensei_message') { //// check | |
| 185 | 185 | |
| 186 | 186 | // possible backward compatible template include if theme overrides content-single-message.php | 
| 187 | 187 | // this template was removed in 1.9.0 and code all moved into the main single-message.php file | 
| 188 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'content-single-message.php', true ); | |
| 188 | + self::locate_and_load_template_overrides(Sensei()->template_url.'content-single-message.php', true); | |
| 189 | 189 | |
| 190 | - $file = 'single-message.php'; | |
| 190 | + $file = 'single-message.php'; | |
| 191 | 191 | $find[] = $file; | 
| 192 | - $find[] = Sensei()->template_url . $file; | |
| 192 | + $find[] = Sensei()->template_url.$file; | |
| 193 | 193 | |
| 194 | - } elseif ( is_post_type_archive( 'course' ) | |
| 195 | - || is_page( Sensei()->get_page_id( 'courses' ) ) | |
| 196 | -                    || is_tax( 'course-category' )) { | |
| 194 | +        } elseif (is_post_type_archive('course') | |
| 195 | +                    || is_page(Sensei()->get_page_id('courses')) | |
| 196 | +                    || is_tax('course-category')) { | |
| 197 | 197 | |
| 198 | 198 | // possible backward compatible template include if theme overrides 'taxonomy-course-category' | 
| 199 | 199 | // this template was removed in 1.9.0 and replaced by archive-course.php | 
| 200 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-course-category.php'); | |
| 200 | + self::locate_and_load_template_overrides(Sensei()->template_url.'taxonomy-course-category.php'); | |
| 201 | 201 | |
| 202 | - $file = 'archive-course.php'; | |
| 202 | + $file = 'archive-course.php'; | |
| 203 | 203 | $find[] = $file; | 
| 204 | - $find[] = Sensei()->template_url . $file; | |
| 204 | + $find[] = Sensei()->template_url.$file; | |
| 205 | 205 | |
| 206 | -        } elseif ( is_post_type_archive( 'sensei_message' ) ) { | |
| 206 | +        } elseif (is_post_type_archive('sensei_message')) { | |
| 207 | 207 | |
| 208 | - $file = 'archive-message.php'; | |
| 208 | + $file = 'archive-message.php'; | |
| 209 | 209 | $find[] = $file; | 
| 210 | - $find[] = Sensei()->template_url . $file; | |
| 210 | + $find[] = Sensei()->template_url.$file; | |
| 211 | 211 | |
| 212 | -        } elseif( is_tax( 'lesson-tag' ) ) { | |
| 212 | +        } elseif (is_tax('lesson-tag')) { | |
| 213 | 213 | |
| 214 | 214 | // possible backward compatible template include if theme overrides 'taxonomy-lesson-tag.php' | 
| 215 | 215 | // this template was removed in 1.9.0 and replaced by archive-lesson.php | 
| 216 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'taxonomy-lesson-tag.php' ); | |
| 216 | + self::locate_and_load_template_overrides(Sensei()->template_url.'taxonomy-lesson-tag.php'); | |
| 217 | 217 | |
| 218 | - $file = 'archive-lesson.php'; | |
| 218 | + $file = 'archive-lesson.php'; | |
| 219 | 219 | $find[] = $file; | 
| 220 | - $find[] = Sensei()->template_url . $file; | |
| 220 | + $find[] = Sensei()->template_url.$file; | |
| 221 | 221 | |
| 222 | -        } elseif ( isset( $wp_query->query_vars['learner_profile'] ) ) { | |
| 222 | +        } elseif (isset($wp_query->query_vars['learner_profile'])) { | |
| 223 | 223 | |
| 224 | 224 | // Override for sites with static home page | 
| 225 | 225 | $wp_query->is_home = false; | 
| 226 | 226 | |
| 227 | - $file = 'learner-profile.php'; | |
| 227 | + $file = 'learner-profile.php'; | |
| 228 | 228 | $find[] = $file; | 
| 229 | - $find[] = Sensei()->template_url . $file; | |
| 229 | + $find[] = Sensei()->template_url.$file; | |
| 230 | 230 | |
| 231 | -        } elseif ( isset( $wp_query->query_vars['course_results'] ) ) { | |
| 231 | +        } elseif (isset($wp_query->query_vars['course_results'])) { | |
| 232 | 232 | |
| 233 | 233 | // Override for sites with static home page | 
| 234 | 234 | $wp_query->is_home = false; | 
| 235 | 235 | |
| 236 | 236 | $file = 'course-results.php'; | 
| 237 | 237 | $find[] = $file; | 
| 238 | - $find[] = Sensei()->template_url . $file; | |
| 238 | + $find[] = Sensei()->template_url.$file; | |
| 239 | 239 | |
| 240 | - }elseif( is_author() | |
| 241 | -                 && Sensei_Teacher::is_a_teacher( get_query_var('author') ) | |
| 242 | -                 && ! user_can( get_query_var('author'), 'manage_options' ) ){ | |
| 240 | + }elseif (is_author() | |
| 241 | +                 && Sensei_Teacher::is_a_teacher(get_query_var('author')) | |
| 242 | +                 && ! user_can(get_query_var('author'), 'manage_options')) { | |
| 243 | 243 | |
| 244 | 244 | $file = 'teacher-archive.php'; | 
| 245 | 245 | $find[] = $file; | 
| 246 | - $find[] = Sensei()->template_url . $file; | |
| 246 | + $find[] = Sensei()->template_url.$file; | |
| 247 | 247 | |
| 248 | 248 | } // Load the template file | 
| 249 | 249 | |
| 250 | 250 | // if file is present set it to be loaded otherwise continue with the initial template given by WP | 
| 251 | -        if ( $file ) { | |
| 251 | +        if ($file) { | |
| 252 | 252 | |
| 253 | - $template = locate_template( $find ); | |
| 254 | - if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file; | |
| 253 | + $template = locate_template($find); | |
| 254 | + if ( ! $template) $template = Sensei()->plugin_path().'/templates/'.$file; | |
| 255 | 255 | |
| 256 | 256 | } // End If Statement | 
| 257 | 257 | |
| @@ -271,21 +271,21 @@ discard block | ||
| 271 | 271 | * | 
| 272 | 272 | * @since 1.9.0 | 
| 273 | 273 | */ | 
| 274 | -    public static function get_no_permission_template( ){ | |
| 274 | +    public static function get_no_permission_template( ) { | |
| 275 | 275 | |
| 276 | 276 | // possible backward compatible template loading | 
| 277 | 277 | // this template was removed in 1.9.0 and code all moved into the no-permissions.php file | 
| 278 | - self::locate_and_load_template_overrides( Sensei()->template_url . 'content-no-permissions.php', true ); | |
| 278 | + self::locate_and_load_template_overrides(Sensei()->template_url.'content-no-permissions.php', true); | |
| 279 | 279 | |
| 280 | - $file = 'no-permissions.php'; | |
| 280 | + $file = 'no-permissions.php'; | |
| 281 | 281 | $find[] = $file; | 
| 282 | - $find[] = Sensei()->template_url . $file; | |
| 282 | + $find[] = Sensei()->template_url.$file; | |
| 283 | 283 | |
| 284 | - $template = locate_template( $find ); | |
| 285 | - if ( ! $template ) $template = Sensei()->plugin_path() . '/templates/' . $file; | |
| 284 | + $template = locate_template($find); | |
| 285 | + if ( ! $template) $template = Sensei()->plugin_path().'/templates/'.$file; | |
| 286 | 286 | |
| 287 | 287 | // set a global constant so that we know that we're in this template | 
| 288 | -	    define('SENSEI_NO_PERMISSION', true ); | |
| 288 | +	    define('SENSEI_NO_PERMISSION', true); | |
| 289 | 289 | |
| 290 | 290 | return $template; | 
| 291 | 291 | |
| @@ -304,20 +304,20 @@ discard block | ||
| 304 | 304 | * @param string $template | 
| 305 | 305 | * @param bool $load_header_footer should the file be wrapped in between header and footer? Default: true | 
| 306 | 306 | */ | 
| 307 | -    public static function locate_and_load_template_overrides( $template = '', $load_header_footer = false ){ | |
| 307 | +    public static function locate_and_load_template_overrides($template = '', $load_header_footer = false) { | |
| 308 | 308 | |
| 309 | - $found_template = locate_template( array( $template ) ); | |
| 310 | -        if( $found_template ){ | |
| 309 | + $found_template = locate_template(array($template)); | |
| 310 | +        if ($found_template) { | |
| 311 | 311 | |
| 312 | -            if( $load_header_footer ){ | |
| 312 | +            if ($load_header_footer) { | |
| 313 | 313 | |
| 314 | 314 | get_sensei_header(); | 
| 315 | - include( $found_template ); | |
| 315 | + include($found_template); | |
| 316 | 316 | get_sensei_footer(); | 
| 317 | 317 | |
| 318 | -            }else{ | |
| 318 | +            } else { | |
| 319 | 319 | |
| 320 | - include( $found_template ); | |
| 320 | + include($found_template); | |
| 321 | 321 | |
| 322 | 322 | } | 
| 323 | 323 | |
| @@ -334,9 +334,9 @@ discard block | ||
| 334 | 334 | * | 
| 335 | 335 | * @deprecated since 1.9.0 | 
| 336 | 336 | */ | 
| 337 | -    public static function deprecated_archive_course_content_hook(){ | |
| 337 | +    public static function deprecated_archive_course_content_hook() { | |
| 338 | 338 | |
| 339 | - sensei_do_deprecated_action( 'sensei_course_archive_main_content','1.9.0', 'sensei_loop_course_before' ); | |
| 339 | +        sensei_do_deprecated_action('sensei_course_archive_main_content', '1.9.0', 'sensei_loop_course_before'); | |
| 340 | 340 | |
| 341 | 341 | }// end deprecated_archive_hook | 
| 342 | 342 | |
| @@ -346,11 +346,11 @@ discard block | ||
| 346 | 346 | * @since 1.9.0 | 
| 347 | 347 | * @param WP_Post $post | 
| 348 | 348 | */ | 
| 349 | -    public static function the_title( $post ){ | |
| 349 | +    public static function the_title($post) { | |
| 350 | 350 | |
| 351 | 351 | // ID passed in | 
| 352 | -        if( is_numeric( $post ) ){ | |
| 353 | - $post = get_post( $post ); | |
| 352 | +        if (is_numeric($post)) { | |
| 353 | + $post = get_post($post); | |
| 354 | 354 | } | 
| 355 | 355 | |
| 356 | 356 | /** | 
| @@ -360,7 +360,7 @@ discard block | ||
| 360 | 360 | * | 
| 361 | 361 | * @param $title_html_tag default is 'h3' | 
| 362 | 362 | */ | 
| 363 | -        $title_html_tag = apply_filters('sensei_the_title_html_tag','h3'); | |
| 363 | +        $title_html_tag = apply_filters('sensei_the_title_html_tag', 'h3'); | |
| 364 | 364 | |
| 365 | 365 | /** | 
| 366 | 366 | * Filter the title classes | 
| @@ -368,14 +368,14 @@ discard block | ||
| 368 | 368 | * @since 1.9.0 | 
| 369 | 369 | * @param string $title_classes defaults to $post_type-title | 
| 370 | 370 | */ | 
| 371 | -        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type . '-title' ); | |
| 371 | +        $title_classes = apply_filters('sensei_the_title_classes', $post->post_type.'-title'); | |
| 372 | 372 | |
| 373 | - $html= ''; | |
| 374 | - $html .= '<'. $title_html_tag .' class="'. $title_classes .'" >'; | |
| 375 | - $html .= '<a href="' . get_permalink( $post->ID ) . '" >'; | |
| 376 | - $html .= $post->post_title ; | |
| 373 | + $html = ''; | |
| 374 | + $html .= '<'.$title_html_tag.' class="'.$title_classes.'" >'; | |
| 375 | + $html .= '<a href="'.get_permalink($post->ID).'" >'; | |
| 376 | + $html .= $post->post_title; | |
| 377 | 377 | $html .= '</a>'; | 
| 378 | - $html .= '</'. $title_html_tag. '>'; | |
| 378 | + $html .= '</'.$title_html_tag.'>'; | |
| 379 | 379 | echo $html; | 
| 380 | 380 | |
| 381 | 381 | }// end the title | 
| @@ -387,11 +387,11 @@ discard block | ||
| 387 | 387 | * @since 1.9.0 | 
| 388 | 388 | * @deprecated 1.9.0 | 
| 389 | 389 | */ | 
| 390 | -    public static function deprecated_single_course_inside_before_hooks(){ | |
| 390 | +    public static function deprecated_single_course_inside_before_hooks() { | |
| 391 | 391 | |
| 392 | -        sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', array( get_the_ID()) ); | |
| 393 | -        sensei_do_deprecated_action('sensei_course_single_title','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 394 | -        sensei_do_deprecated_action('sensei_course_single_meta','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 392 | +        sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', array(get_the_ID())); | |
| 393 | +        sensei_do_deprecated_action('sensei_course_single_title', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 394 | +        sensei_do_deprecated_action('sensei_course_single_meta', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 395 | 395 | |
| 396 | 396 | }// end deprecated_single_course_inside_before_hooks | 
| 397 | 397 | |
| @@ -402,9 +402,9 @@ discard block | ||
| 402 | 402 | * @since 1.9.0 | 
| 403 | 403 | * @deprecated 1.9.0 | 
| 404 | 404 | */ | 
| 405 | -    public static function deprecate_sensei_course_single_lessons_hook(){ | |
| 405 | +    public static function deprecate_sensei_course_single_lessons_hook() { | |
| 406 | 406 | |
| 407 | -        sensei_do_deprecated_action('sensei_course_single_lessons','1.9.0', 'sensei_single_course_content_inside_after'); | |
| 407 | +        sensei_do_deprecated_action('sensei_course_single_lessons', '1.9.0', 'sensei_single_course_content_inside_after'); | |
| 408 | 408 | |
| 409 | 409 | }// deprecate_sensei_course_single_lessons_hook | 
| 410 | 410 | |
| @@ -416,13 +416,13 @@ discard block | ||
| 416 | 416 | * @since 1.9.0 | 
| 417 | 417 | * @deprecated 1.9.0 | 
| 418 | 418 | */ | 
| 419 | -    public static function deprecated_single_main_content_hook(){ | |
| 419 | +    public static function deprecated_single_main_content_hook() { | |
| 420 | 420 | |
| 421 | -            if( is_singular( 'course' ) ) { | |
| 421 | +            if (is_singular('course')) { | |
| 422 | 422 | |
| 423 | 423 |                  sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_course_content_inside_before or sensei_single_course_content_inside_after'); | 
| 424 | 424 | |
| 425 | -            } elseif( is_singular( 'message' ) ){ | |
| 425 | +            } elseif (is_singular('message')) { | |
| 426 | 426 | |
| 427 | 427 |                  sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_message_content_inside_before or sensei_single_message_content_inside_after'); | 
| 428 | 428 | } | 
| @@ -434,9 +434,9 @@ discard block | ||
| 434 | 434 | * @since 1.9.0 | 
| 435 | 435 | * @deprecated since 1.9.0 | 
| 436 | 436 | */ | 
| 437 | -    public static function deprecate_module_before_hook(){ | |
| 437 | +    public static function deprecate_module_before_hook() { | |
| 438 | 438 | |
| 439 | -        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0','sensei_single_course_modules_after' ); | |
| 439 | +        sensei_do_deprecated_action('sensei_modules_page_before', '1.9.0', 'sensei_single_course_modules_after'); | |
| 440 | 440 | |
| 441 | 441 | } | 
| 442 | 442 | |
| @@ -445,9 +445,9 @@ discard block | ||
| 445 | 445 | * @since 1.9.0 | 
| 446 | 446 | * @deprecated since 1.9.0 | 
| 447 | 447 | */ | 
| 448 | -    public static function deprecate_module_after_hook(){ | |
| 448 | +    public static function deprecate_module_after_hook() { | |
| 449 | 449 | |
| 450 | -        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0','sensei_single_course_modules_after' ); | |
| 450 | +        sensei_do_deprecated_action('sensei_modules_page_after', '1.9.0', 'sensei_single_course_modules_after'); | |
| 451 | 451 | |
| 452 | 452 | } | 
| 453 | 453 | |
| @@ -457,11 +457,11 @@ discard block | ||
| 457 | 457 | * @since 1.9.0 | 
| 458 | 458 | * @deprecated since 1.9.0 | 
| 459 | 459 | */ | 
| 460 | -    public static function deprecate_all_post_type_single_title_hooks(){ | |
| 460 | +    public static function deprecate_all_post_type_single_title_hooks() { | |
| 461 | 461 | |
| 462 | -        if( is_singular( 'sensei_message' ) ){ | |
| 462 | +        if (is_singular('sensei_message')) { | |
| 463 | 463 | |
| 464 | - sensei_do_deprecated_action( 'sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before' ); | |
| 464 | +            sensei_do_deprecated_action('sensei_message_single_title', '1.9.0', 'sensei_single_message_content_inside_before'); | |
| 465 | 465 | |
| 466 | 466 | } | 
| 467 | 467 | |
| @@ -477,10 +477,10 @@ discard block | ||
| 477 | 477 |      public static function deprecate_course_single_meta_hooks() { | 
| 478 | 478 | |
| 479 | 479 | // deprecate all these hooks | 
| 480 | -        sensei_do_deprecated_action('sensei_course_start','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 481 | -        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 482 | -        sensei_do_deprecated_action('sensei_course_meta','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 483 | -        sensei_do_deprecated_action('sensei_course_meta_video','1.9.0', 'sensei_single_course_content_inside_before' ); | |
| 480 | +        sensei_do_deprecated_action('sensei_course_start', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 481 | +        sensei_do_deprecated_action('sensei_woocommerce_in_cart_message', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 482 | +        sensei_do_deprecated_action('sensei_course_meta', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 483 | +        sensei_do_deprecated_action('sensei_course_meta_video', '1.9.0', 'sensei_single_course_content_inside_before'); | |
| 484 | 484 | |
| 485 | 485 | } // End deprecate_course_single_meta_hooks | 
| 486 | 486 | |
| @@ -490,10 +490,10 @@ discard block | ||
| 490 | 490 | */ | 
| 491 | 491 |      public static function deprecate_single_lesson_breadcrumbs_and_comments_hooks() { | 
| 492 | 492 | |
| 493 | -        if( is_singular( 'lesson' ) ){ | |
| 493 | +        if (is_singular('lesson')) { | |
| 494 | 494 | |
| 495 | - sensei_do_deprecated_action( 'sensei_breadcrumb','1.9.0','sensei_after_main_content', get_the_ID() ); | |
| 496 | - sensei_do_deprecated_action( 'sensei_comments','1.9.0','sensei_after_main_content', get_the_ID() ); | |
| 495 | +            sensei_do_deprecated_action('sensei_breadcrumb', '1.9.0', 'sensei_after_main_content', get_the_ID()); | |
| 496 | +            sensei_do_deprecated_action('sensei_comments', '1.9.0', 'sensei_after_main_content', get_the_ID()); | |
| 497 | 497 | |
| 498 | 498 | } | 
| 499 | 499 | |
| @@ -507,14 +507,14 @@ discard block | ||
| 507 | 507 | * | 
| 508 | 508 | * @deprecated since 1.9.0 | 
| 509 | 509 | */ | 
| 510 | -    public static function deprecate_sensei_lesson_course_signup_hook(){ | |
| 510 | +    public static function deprecate_sensei_lesson_course_signup_hook() { | |
| 511 | 511 | |
| 512 | - $lesson_course_id = get_post_meta( get_the_ID(), '_lesson_course', true ); | |
| 513 | - $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id() ); | |
| 512 | + $lesson_course_id = get_post_meta(get_the_ID(), '_lesson_course', true); | |
| 513 | + $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id()); | |
| 514 | 514 | |
| 515 | -        if(  !$user_taking_course ) { | |
| 515 | +        if ( ! $user_taking_course) { | |
| 516 | 516 | |
| 517 | - sensei_do_deprecated_action( 'sensei_lesson_course_signup','1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id ); | |
| 517 | +            sensei_do_deprecated_action('sensei_lesson_course_signup', '1.9.0', 'sensei_single_lesson_content_inside_after', $lesson_course_id); | |
| 518 | 518 | |
| 519 | 519 | } | 
| 520 | 520 | }// end deprecate_sensei_lesson_course_signup_hook | 
| @@ -525,11 +525,11 @@ discard block | ||
| 525 | 525 | * @since 1.9.0 | 
| 526 | 526 | * @deprecated since 1.9.0 | 
| 527 | 527 | */ | 
| 528 | -    public static function deprecate_sensei_lesson_single_meta_hook(){ | |
| 528 | +    public static function deprecate_sensei_lesson_single_meta_hook() { | |
| 529 | 529 | |
| 530 | -        if ( sensei_can_user_view_lesson()  ) { | |
| 530 | +        if (sensei_can_user_view_lesson()) { | |
| 531 | 531 | |
| 532 | - sensei_do_deprecated_action( 'sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after' ); | |
| 532 | +            sensei_do_deprecated_action('sensei_lesson_single_meta', '1.9.0', 'sensei_single_lesson_content_inside_after'); | |
| 533 | 533 | |
| 534 | 534 | |
| 535 | 535 | } | 
| @@ -540,9 +540,9 @@ discard block | ||
| 540 | 540 | * Deprecate the sensei lesson single title hook | 
| 541 | 541 | * @deprecated since 1.9.0 | 
| 542 | 542 | */ | 
| 543 | -    public static function deprecate_sensei_lesson_single_title(){ | |
| 543 | +    public static function deprecate_sensei_lesson_single_title() { | |
| 544 | 544 | |
| 545 | - sensei_do_deprecated_action( 'sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() ); | |
| 545 | +        sensei_do_deprecated_action('sensei_lesson_single_title', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID()); | |
| 546 | 546 | |
| 547 | 547 | }// end deprecate_sensei_lesson_single_title | 
| 548 | 548 | |
| @@ -550,9 +550,9 @@ discard block | ||
| 550 | 550 | * hook in the deperecated single main content to the lesson | 
| 551 | 551 | * @deprecated since 1.9.0 | 
| 552 | 552 | */ | 
| 553 | -    public  static function deprecate_lesson_single_main_content_hook(){ | |
| 553 | +    public  static function deprecate_lesson_single_main_content_hook() { | |
| 554 | 554 | |
| 555 | - sensei_do_deprecated_action( 'sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before' ); | |
| 555 | +        sensei_do_deprecated_action('sensei_single_main_content', '1.9.0', 'sensei_single_lesson_content_inside_before'); | |
| 556 | 556 | |
| 557 | 557 | }// end sensei_deprecate_lesson_single_main_content_hook | 
| 558 | 558 | |
| @@ -560,9 +560,9 @@ discard block | ||
| 560 | 560 | * hook in the deperecated single main content to the lesson | 
| 561 | 561 | * @deprecated since 1.9.0 | 
| 562 | 562 | */ | 
| 563 | -    public  static function deprecate_lesson_image_hook(){ | |
| 563 | +    public  static function deprecate_lesson_image_hook() { | |
| 564 | 564 | |
| 565 | - sensei_do_deprecated_action( 'sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID() ); | |
| 565 | +        sensei_do_deprecated_action('sensei_lesson_image', '1.9.0', 'sensei_single_lesson_content_inside_before', get_the_ID()); | |
| 566 | 566 | |
| 567 | 567 | }// end sensei_deprecate_lesson_single_main_content_hook | 
| 568 | 568 | |
| @@ -573,9 +573,9 @@ discard block | ||
| 573 | 573 | * @since 1.9.0 | 
| 574 | 574 | * @deprecated since 1.9.0 | 
| 575 | 575 | */ | 
| 576 | -    public static function deprecate_sensei_login_form_hook(){ | |
| 576 | +    public static function deprecate_sensei_login_form_hook() { | |
| 577 | 577 | |
| 578 | - sensei_do_deprecated_action( 'sensei_login_form', '1.9.0', 'sensei_login_form_before' ); | |
| 578 | +        sensei_do_deprecated_action('sensei_login_form', '1.9.0', 'sensei_login_form_before'); | |
| 579 | 579 | |
| 580 | 580 | } // end deprecate_sensei_login_form_hook | 
| 581 | 581 | |
| @@ -588,9 +588,9 @@ discard block | ||
| 588 | 588 | * | 
| 589 | 589 | * @since 1.9.0 | 
| 590 | 590 | */ | 
| 591 | -    public static function  fire_sensei_complete_course_hook(){ | |
| 591 | +    public static function  fire_sensei_complete_course_hook() { | |
| 592 | 592 | |
| 593 | - do_action( 'sensei_complete_course' ); | |
| 593 | +        do_action('sensei_complete_course'); | |
| 594 | 594 | |
| 595 | 595 | } //fire_sensei_complete_course_hook | 
| 596 | 596 | |
| @@ -599,9 +599,9 @@ discard block | ||
| 599 | 599 | * | 
| 600 | 600 | * @since 1.9.0 | 
| 601 | 601 | */ | 
| 602 | -    public static function  fire_frontend_messages_hook(){ | |
| 602 | +    public static function  fire_frontend_messages_hook() { | |
| 603 | 603 | |
| 604 | - do_action( 'sensei_frontend_messages' ); | |
| 604 | +        do_action('sensei_frontend_messages'); | |
| 605 | 605 | |
| 606 | 606 | }// end sensei_complete_course_action | 
| 607 | 607 | |
| @@ -611,9 +611,9 @@ discard block | ||
| 611 | 611 | * | 
| 612 | 612 | * @deprected since 1.9.0 | 
| 613 | 613 | */ | 
| 614 | -    public static function  deprecate_sensei_before_user_course_content_hook(){ | |
| 614 | +    public static function  deprecate_sensei_before_user_course_content_hook() { | |
| 615 | 615 | |
| 616 | - sensei_do_deprecated_action( 'sensei_before_user_course_content','1.9.0', 'sensei_my_courses_content_inside_before' , wp_get_current_user() ); | |
| 616 | +        sensei_do_deprecated_action('sensei_before_user_course_content', '1.9.0', 'sensei_my_courses_content_inside_before', wp_get_current_user()); | |
| 617 | 617 | |
| 618 | 618 | }// deprecate_sensei_before_user_course_content_hook | 
| 619 | 619 | |
| @@ -623,9 +623,9 @@ discard block | ||
| 623 | 623 | * | 
| 624 | 624 | * @deprected since 1.9.0 | 
| 625 | 625 | */ | 
| 626 | -    public static function  deprecate_sensei_after_user_course_content_hook(){ | |
| 626 | +    public static function  deprecate_sensei_after_user_course_content_hook() { | |
| 627 | 627 | |
| 628 | - sensei_do_deprecated_action( 'sensei_after_user_course_content','1.9.0', 'sensei_my_courses_content_inside_after' , wp_get_current_user() ); | |
| 628 | +        sensei_do_deprecated_action('sensei_after_user_course_content', '1.9.0', 'sensei_my_courses_content_inside_after', wp_get_current_user()); | |
| 629 | 629 | |
| 630 | 630 | }// deprecate_sensei_after_user_course_content_hook | 
| 631 | 631 | |
| @@ -635,10 +635,10 @@ discard block | ||
| 635 | 635 | * @deprecated since 1.9.0 | 
| 636 | 636 | * @since 1.9.0 | 
| 637 | 637 | */ | 
| 638 | -    public static function deprecated_archive_message_hooks (){ | |
| 638 | +    public static function deprecated_archive_message_hooks() { | |
| 639 | 639 | |
| 640 | -        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop' ); | |
| 641 | -        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop' ); | |
| 640 | +        sensei_do_deprecated_action('sensei_message_archive_main_content', '1.9.0', 'sensei_archive_before_message_loop OR sensei_archive_after_message_loop'); | |
| 641 | +        sensei_do_deprecated_action('sensei_message_archive_header', '1.9.0', 'sensei_archive_before_message_loop'); | |
| 642 | 642 | |
| 643 | 643 | } | 
| 644 | 644 | |
| @@ -648,9 +648,9 @@ discard block | ||
| 648 | 648 | * | 
| 649 | 649 | * @deprecated since 1.9.0 | 
| 650 | 650 | */ | 
| 651 | -    public static function deprecate_sensei_complete_quiz_action(){ | |
| 651 | +    public static function deprecate_sensei_complete_quiz_action() { | |
| 652 | 652 | |
| 653 | - sensei_do_deprecated_action( 'sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before' ); | |
| 653 | +        sensei_do_deprecated_action('sensei_complete_quiz', '1.9.0', 'sensei_single_quiz_content_inside_before'); | |
| 654 | 654 | |
| 655 | 655 | } | 
| 656 | 656 | |
| @@ -660,7 +660,7 @@ discard block | ||
| 660 | 660 | * | 
| 661 | 661 | * @deprecated since 1.9.0 | 
| 662 | 662 | */ | 
| 663 | -    public static function deprecate_sensei_quiz_question_type_action(){ | |
| 663 | +    public static function deprecate_sensei_quiz_question_type_action() { | |
| 664 | 664 | |
| 665 | 665 | // Question Type | 
| 666 | 666 | global $sensei_question_loop; | 
| @@ -670,14 +670,14 @@ discard block | ||
| 670 | 670 | } | 
| 671 | 671 | |
| 672 | 672 | |
| 673 | -	public static function the_register_button( $post_id = "" ){ | |
| 673 | +	public static function the_register_button($post_id = "") { | |
| 674 | 674 | |
| 675 | 675 | global $current_user, $post; | 
| 676 | 676 | |
| 677 | 677 |  		if ( ! get_option('users_can_register') | 
| 678 | - || 'course' != get_post_type( $post_id ) | |
| 679 | - || ! empty( $current_user->caps ) | |
| 680 | -		     || ! Sensei()->settings->get('access_permission')  ) { | |
| 678 | + || 'course' != get_post_type($post_id) | |
| 679 | + || ! empty($current_user->caps) | |
| 680 | +		     || ! Sensei()->settings->get('access_permission')) { | |
| 681 | 681 | |
| 682 | 682 | return; | 
| 683 | 683 | |
| @@ -687,15 +687,15 @@ discard block | ||
| 687 | 687 | |
| 688 | 688 | // show a link to the my_courses page or the WordPress register page if | 
| 689 | 689 | // not my courses page was set in the settings | 
| 690 | -		if( !empty( $my_courses_page_id ) && $my_courses_page_id ){ | |
| 690 | +		if ( ! empty($my_courses_page_id) && $my_courses_page_id) { | |
| 691 | 691 | |
| 692 | - $my_courses_url = get_permalink( $my_courses_page_id ); | |
| 693 | -			$register_link = '<a href="'.$my_courses_url. '">' . __('Register', 'woothemes-sensei') .'</a>'; | |
| 694 | - echo '<div class="status register">' . $register_link . '</div>' ; | |
| 692 | + $my_courses_url = get_permalink($my_courses_page_id); | |
| 693 | +			$register_link = '<a href="'.$my_courses_url.'">'.__('Register', 'woothemes-sensei').'</a>'; | |
| 694 | + echo '<div class="status register">'.$register_link.'</div>'; | |
| 695 | 695 | |
| 696 | -		} else{ | |
| 696 | +		} else { | |
| 697 | 697 | |
| 698 | - wp_register( '<div class="status register">', '</div>' ); | |
| 698 | +			wp_register('<div class="status register">', '</div>'); | |
| 699 | 699 | |
| 700 | 700 | } | 
| 701 | 701 | |
| @@ -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 Utilities Class | 
| @@ -18,9 +18,9 @@ discard block | ||
| 18 | 18 | * @since 1.0.0 | 
| 19 | 19 | * @return string The URL to the placeholder thumbnail image. | 
| 20 | 20 | */ | 
| 21 | -	public static function get_placeholder_image () { | |
| 21 | +	public static function get_placeholder_image() { | |
| 22 | 22 | |
| 23 | - return esc_url( apply_filters( 'sensei_placeholder_thumbnail', Sensei()->plugin_url . 'assets/images/placeholder.png' ) ); | |
| 23 | +		return esc_url(apply_filters('sensei_placeholder_thumbnail', Sensei()->plugin_url.'assets/images/placeholder.png')); | |
| 24 | 24 | } // End get_placeholder_image() | 
| 25 | 25 | |
| 26 | 26 | /** | 
| @@ -32,7 +32,7 @@ discard block | ||
| 32 | 32 | * @static | 
| 33 | 33 | * @return bool | 
| 34 | 34 | */ | 
| 35 | -	public static function sensei_is_woocommerce_present () { | |
| 35 | +	public static function sensei_is_woocommerce_present() { | |
| 36 | 36 | |
| 37 | 37 | return Sensei_WC::is_woocommerce_present(); | 
| 38 | 38 | |
| @@ -47,7 +47,7 @@ discard block | ||
| 47 | 47 | * @static | 
| 48 | 48 | * @return boolean | 
| 49 | 49 | */ | 
| 50 | -	public static function sensei_is_woocommerce_activated () { | |
| 50 | +	public static function sensei_is_woocommerce_activated() { | |
| 51 | 51 | |
| 52 | 52 | return Sensei_WC::is_woocommerce_active(); | 
| 53 | 53 | |
| @@ -60,70 +60,70 @@ discard block | ||
| 60 | 60 | * @param array $args (default: array()) | 
| 61 | 61 | * @return bool | int | 
| 62 | 62 | */ | 
| 63 | -	public static function sensei_log_activity ( $args = array() ) { | |
| 63 | +	public static function sensei_log_activity($args = array()) { | |
| 64 | 64 | global $wpdb; | 
| 65 | 65 | |
| 66 | 66 | // Args, minimum data required for WP | 
| 67 | 67 | $data = array( | 
| 68 | - 'comment_post_ID' => intval( $args['post_id'] ), | |
| 68 | + 'comment_post_ID' => intval($args['post_id']), | |
| 69 | 69 | 'comment_author' => '', // Not needed | 
| 70 | 70 | 'comment_author_email' => '', // Not needed | 
| 71 | 71 | 'comment_author_url' => '', // Not needed | 
| 72 | - 'comment_content' => !empty($args['data']) ? esc_html( $args['data'] ) : '', | |
| 73 | - 'comment_type' => esc_attr( $args['type'] ), | |
| 74 | - 'user_id' => intval( $args['user_id'] ), | |
| 75 | - 'comment_approved' => !empty($args['status']) ? esc_html( $args['status'] ) : 'log', // 'log' == 'sensei_user_answer' | |
| 72 | + 'comment_content' => ! empty($args['data']) ? esc_html($args['data']) : '', | |
| 73 | + 'comment_type' => esc_attr($args['type']), | |
| 74 | + 'user_id' => intval($args['user_id']), | |
| 75 | + 'comment_approved' => ! empty($args['status']) ? esc_html($args['status']) : 'log', // 'log' == 'sensei_user_answer' | |
| 76 | 76 | ); | 
| 77 | 77 | // Allow extra data | 
| 78 | -		if ( !empty($args['username']) ) { | |
| 79 | - $data['comment_author'] = sanitize_user( $args['username'] ); | |
| 78 | +		if ( ! empty($args['username'])) { | |
| 79 | + $data['comment_author'] = sanitize_user($args['username']); | |
| 80 | 80 | } | 
| 81 | -		if ( !empty($args['user_email']) ) { | |
| 82 | - $data['comment_author_email'] = sanitize_email( $args['user_email'] ); | |
| 81 | +		if ( ! empty($args['user_email'])) { | |
| 82 | + $data['comment_author_email'] = sanitize_email($args['user_email']); | |
| 83 | 83 | } | 
| 84 | -		if ( !empty($args['user_url']) ) { | |
| 85 | - $data['comment_author_url'] = esc_url( $args['user_url'] ); | |
| 84 | +		if ( ! empty($args['user_url'])) { | |
| 85 | + $data['comment_author_url'] = esc_url($args['user_url']); | |
| 86 | 86 | } | 
| 87 | -		if ( !empty($args['parent']) ) { | |
| 87 | +		if ( ! empty($args['parent'])) { | |
| 88 | 88 | $data['comment_parent'] = $args['parent']; | 
| 89 | 89 | } | 
| 90 | 90 | // Sanity check | 
| 91 | -		if ( empty($args['user_id']) ) { | |
| 92 | -			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') ); | |
| 91 | +		if (empty($args['user_id'])) { | |
| 92 | +			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei')); | |
| 93 | 93 | return false; | 
| 94 | 94 | } | 
| 95 | 95 | |
| 96 | - do_action( 'sensei_log_activity_before', $args, $data ); | |
| 96 | +		do_action('sensei_log_activity_before', $args, $data); | |
| 97 | 97 | |
| 98 | 98 | $flush_cache = false; | 
| 99 | 99 | |
| 100 | 100 | // Custom Logic | 
| 101 | 101 | // Check if comment exists first | 
| 102 | - $comment_id = $wpdb->get_var( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'] ) ); | |
| 103 | -		if ( ! $comment_id ) { | |
| 102 | +		$comment_id = $wpdb->get_var($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'])); | |
| 103 | +		if ( ! $comment_id) { | |
| 104 | 104 | // Add the comment | 
| 105 | - $comment_id = wp_insert_comment( $data ); | |
| 105 | + $comment_id = wp_insert_comment($data); | |
| 106 | 106 | |
| 107 | 107 | $flush_cache = true; | 
| 108 | -		} elseif ( isset( $args['action'] ) && 'update' == $args['action'] ) { | |
| 108 | +		} elseif (isset($args['action']) && 'update' == $args['action']) { | |
| 109 | 109 | // Update the comment if an update was requested | 
| 110 | 110 | $data['comment_ID'] = $comment_id; | 
| 111 | 111 | // By default update the timestamp of the comment | 
| 112 | -			if ( empty($args['keep_time']) ) { | |
| 112 | +			if (empty($args['keep_time'])) { | |
| 113 | 113 |  				$data['comment_date'] = current_time('mysql'); | 
| 114 | 114 | } | 
| 115 | - wp_update_comment( $data ); | |
| 115 | + wp_update_comment($data); | |
| 116 | 116 | $flush_cache = true; | 
| 117 | 117 | } // End If Statement | 
| 118 | 118 | |
| 119 | 119 | // Manually Flush the Cache | 
| 120 | -		if ( $flush_cache ) { | |
| 120 | +		if ($flush_cache) { | |
| 121 | 121 | wp_cache_flush(); | 
| 122 | 122 | } | 
| 123 | 123 | |
| 124 | - do_action( 'sensei_log_activity_after', $args, $data, $comment_id ); | |
| 124 | +		do_action('sensei_log_activity_after', $args, $data, $comment_id); | |
| 125 | 125 | |
| 126 | -		if ( 0 < $comment_id ) { | |
| 126 | +		if (0 < $comment_id) { | |
| 127 | 127 | // Return the ID so that it can be used for meta data storage | 
| 128 | 128 | return $comment_id; | 
| 129 | 129 |  		} else { | 
| @@ -140,41 +140,41 @@ discard block | ||
| 140 | 140 | * @param bool $return_comments (default: false) | 
| 141 | 141 | * @return mixed | int | 
| 142 | 142 | */ | 
| 143 | -	public static function sensei_check_for_activity ( $args = array(), $return_comments = false ) { | |
| 143 | +	public static function sensei_check_for_activity($args = array(), $return_comments = false) { | |
| 144 | 144 | |
| 145 | 145 | global $wp_version; | 
| 146 | -		if ( !$return_comments ) { | |
| 146 | +		if ( ! $return_comments) { | |
| 147 | 147 | $args['count'] = true; | 
| 148 | 148 | } | 
| 149 | 149 | |
| 150 | 150 | // Are we only retrieving a single entry, or not care about the order... | 
| 151 | -		if ( isset( $args['count'] ) || isset( $args['post_id'] ) ){ | |
| 151 | +		if (isset($args['count']) || isset($args['post_id'])) { | |
| 152 | 152 | |
| 153 | 153 | // ...then we don't need to ask the db to order the results, this overrides WP default behaviour | 
| 154 | -			if ( version_compare( $wp_version, '4.1', '>=' ) ) { | |
| 154 | +			if (version_compare($wp_version, '4.1', '>=')) { | |
| 155 | 155 | $args['order'] = false; | 
| 156 | 156 | $args['orderby'] = false; | 
| 157 | 157 | } | 
| 158 | 158 | } | 
| 159 | 159 | |
| 160 | 160 | // A user ID of 0 is in valid, so shortcut this | 
| 161 | -		if ( isset( $args['user_id'] ) && 0 == intval ( $args['user_id'] ) ) { | |
| 162 | -			_deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') ); | |
| 161 | +		if (isset($args['user_id']) && 0 == intval($args['user_id'])) { | |
| 162 | +			_deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei')); | |
| 163 | 163 | return false; | 
| 164 | 164 | } | 
| 165 | 165 | // Check for legacy code | 
| 166 | -		if ( isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes') ) ) { | |
| 167 | -			_deprecated_argument( __FUNCTION__, '1.7', sprintf( __('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'] ) ); | |
| 166 | +		if (isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes'))) { | |
| 167 | +			_deprecated_argument(__FUNCTION__, '1.7', sprintf(__('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'])); | |
| 168 | 168 | return false; | 
| 169 | 169 | } | 
| 170 | 170 | // Are we checking for specific comment_approved statuses? | 
| 171 | -		if ( isset($args['status']) ) { | |
| 171 | +		if (isset($args['status'])) { | |
| 172 | 172 | // Temporarily store as a custom status if requesting an array... | 
| 173 | -			if ( is_array( $args['status'] ) && version_compare($wp_version, '4.1', '<') ) { | |
| 173 | +			if (is_array($args['status']) && version_compare($wp_version, '4.1', '<')) { | |
| 174 | 174 | // Encode now, decode later | 
| 175 | - $args['status'] = implode( ",", $args['status'] ); | |
| 175 | +				$args['status'] = implode(",", $args['status']); | |
| 176 | 176 | // ...use a filter to switch the encoding back | 
| 177 | - add_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) ); | |
| 177 | +				add_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter')); | |
| 178 | 178 | } | 
| 179 | 179 | } | 
| 180 | 180 |  		else { | 
| @@ -182,8 +182,8 @@ discard block | ||
| 182 | 182 | } | 
| 183 | 183 | |
| 184 | 184 | // Take into account WP < 4.1 will automatically add ' comment_approved = 1 OR comment_approved = 0 ' | 
| 185 | -		if ( ( is_array( $args['status'] ) || 'any' == $args['status'] ) && version_compare($wp_version, '4.1', '<') ) { | |
| 186 | - add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) ); | |
| 185 | +		if ((is_array($args['status']) || 'any' == $args['status']) && version_compare($wp_version, '4.1', '<')) { | |
| 186 | +			add_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter')); | |
| 187 | 187 | } | 
| 188 | 188 | |
| 189 | 189 | //Get the comments | 
| @@ -194,14 +194,14 @@ discard block | ||
| 194 | 194 | * | 
| 195 | 195 | * @param int|array $comments | 
| 196 | 196 | */ | 
| 197 | -        $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) ); | |
| 197 | +        $comments = apply_filters('sensei_check_for_activity', get_comments($args)); | |
| 198 | 198 | |
| 199 | - remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) ); | |
| 200 | - remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) ); | |
| 199 | +		remove_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter')); | |
| 200 | +		remove_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter')); | |
| 201 | 201 | // Return comments | 
| 202 | -		if ( $return_comments ) { | |
| 202 | +		if ($return_comments) { | |
| 203 | 203 | // Could check for array of 1 and just return the 1 item? | 
| 204 | -			if ( is_array($comments) && 1 == count($comments) ) { | |
| 204 | +			if (is_array($comments) && 1 == count($comments)) { | |
| 205 | 205 | $comments = array_shift($comments); | 
| 206 | 206 | } | 
| 207 | 207 | |
| @@ -219,31 +219,31 @@ discard block | ||
| 219 | 219 | * @param array $args (default: array()) | 
| 220 | 220 | * @return array | 
| 221 | 221 | */ | 
| 222 | -	public static function sensei_activity_ids ( $args = array() ) { | |
| 222 | +	public static function sensei_activity_ids($args = array()) { | |
| 223 | 223 | |
| 224 | 224 | |
| 225 | - $comments = Sensei_Utils::sensei_check_for_activity( $args, true ); | |
| 225 | + $comments = Sensei_Utils::sensei_check_for_activity($args, true); | |
| 226 | 226 | // Need to always use an array, even with only 1 item | 
| 227 | -		if ( !is_array($comments) ) { | |
| 228 | - $comments = array( $comments ); | |
| 227 | +		if ( ! is_array($comments)) { | |
| 228 | + $comments = array($comments); | |
| 229 | 229 | } | 
| 230 | 230 | |
| 231 | 231 | $post_ids = array(); | 
| 232 | 232 | // Count comments | 
| 233 | -		if ( is_array( $comments ) && ( 0 < intval( count( $comments ) ) ) ) { | |
| 234 | -			foreach ( $comments as $key => $value  ) { | |
| 233 | +		if (is_array($comments) && (0 < intval(count($comments)))) { | |
| 234 | +			foreach ($comments as $key => $value) { | |
| 235 | 235 | // Add matches to id array | 
| 236 | -				if ( isset( $args['field'] ) && 'comment' == $args['field'] ) { | |
| 237 | - array_push( $post_ids, $value->comment_ID ); | |
| 238 | -				} elseif( isset( $args['field'] ) && 'user_id' == $args['field'] ) { | |
| 239 | - array_push( $post_ids, $value->user_id ); | |
| 236 | +				if (isset($args['field']) && 'comment' == $args['field']) { | |
| 237 | + array_push($post_ids, $value->comment_ID); | |
| 238 | +				} elseif (isset($args['field']) && 'user_id' == $args['field']) { | |
| 239 | + array_push($post_ids, $value->user_id); | |
| 240 | 240 |  				} else { | 
| 241 | - array_push( $post_ids, $value->comment_post_ID ); | |
| 241 | + array_push($post_ids, $value->comment_post_ID); | |
| 242 | 242 | } // End If Statement | 
| 243 | 243 | } // End For Loop | 
| 244 | 244 | // Reset array indexes | 
| 245 | - $post_ids = array_unique( $post_ids ); | |
| 246 | - $post_ids = array_values( $post_ids ); | |
| 245 | + $post_ids = array_unique($post_ids); | |
| 246 | + $post_ids = array_values($post_ids); | |
| 247 | 247 | } // End If Statement | 
| 248 | 248 | |
| 249 | 249 | return $post_ids; | 
| @@ -257,20 +257,20 @@ discard block | ||
| 257 | 257 | * @param array $args (default: array()) | 
| 258 | 258 | * @return boolean | 
| 259 | 259 | */ | 
| 260 | -	public static function sensei_delete_activities ( $args = array() ) { | |
| 260 | +	public static function sensei_delete_activities($args = array()) { | |
| 261 | 261 | |
| 262 | 262 | $dataset_changes = false; | 
| 263 | 263 | |
| 264 | 264 | // If activity exists remove activity from log | 
| 265 | - $comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => intval( $args['post_id'] ), 'user_id' => intval( $args['user_id'] ), 'type' => esc_attr( $args['type'] ) ), true ); | |
| 266 | -		if( $comments ) { | |
| 265 | +		$comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => intval($args['post_id']), 'user_id' => intval($args['user_id']), 'type' => esc_attr($args['type'])), true); | |
| 266 | +		if ($comments) { | |
| 267 | 267 | // Need to always return an array, even with only 1 item | 
| 268 | -			if ( !is_array( $comments ) ) { | |
| 269 | - $comments = array( $comments ); | |
| 268 | +			if ( ! is_array($comments)) { | |
| 269 | + $comments = array($comments); | |
| 270 | 270 | } | 
| 271 | -			foreach ( $comments as $key => $value  ) { | |
| 272 | -				if ( isset( $value->comment_ID ) && 0 < $value->comment_ID ) { | |
| 273 | - $dataset_changes = wp_delete_comment( intval( $value->comment_ID ), true ); | |
| 271 | +			foreach ($comments as $key => $value) { | |
| 272 | +				if (isset($value->comment_ID) && 0 < $value->comment_ID) { | |
| 273 | + $dataset_changes = wp_delete_comment(intval($value->comment_ID), true); | |
| 274 | 274 | } // End If Statement | 
| 275 | 275 | } // End For Loop | 
| 276 | 276 | // Manually flush the cache | 
| @@ -286,25 +286,25 @@ discard block | ||
| 286 | 286 | * @param integer $user_id User ID | 
| 287 | 287 | * @return boolean | 
| 288 | 288 | */ | 
| 289 | -    public static function delete_all_user_activity( $user_id = 0 ) { | |
| 289 | +    public static function delete_all_user_activity($user_id = 0) { | |
| 290 | 290 | |
| 291 | 291 | $dataset_changes = false; | 
| 292 | 292 | |
| 293 | -    	if( $user_id ) { | |
| 293 | +    	if ($user_id) { | |
| 294 | 294 | |
| 295 | - $activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true ); | |
| 295 | +			$activities = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user_id), true); | |
| 296 | 296 | |
| 297 | -			if( $activities ) { | |
| 297 | +			if ($activities) { | |
| 298 | 298 | |
| 299 | 299 | // Need to always return an array, even with only 1 item | 
| 300 | -				if ( ! is_array( $activities ) ) { | |
| 301 | - $activities = array( $activities ); | |
| 300 | +				if ( ! is_array($activities)) { | |
| 301 | + $activities = array($activities); | |
| 302 | 302 | } | 
| 303 | 303 | |
| 304 | -				foreach( $activities as $activity ) { | |
| 305 | - if( '' == $activity->comment_type ) continue; | |
| 306 | - if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue; | |
| 307 | - $dataset_changes = wp_delete_comment( intval( $activity->comment_ID ), true ); | |
| 304 | +				foreach ($activities as $activity) { | |
| 305 | +					if ('' == $activity->comment_type) continue; | |
| 306 | +					if (strpos('sensei_', $activity->comment_type) != 0) continue; | |
| 307 | + $dataset_changes = wp_delete_comment(intval($activity->comment_ID), true); | |
| 308 | 308 | wp_cache_flush(); | 
| 309 | 309 | } | 
| 310 | 310 | } | 
| @@ -321,13 +321,13 @@ discard block | ||
| 321 | 321 | * @param array $args (default: array()) | 
| 322 | 322 | * @return string | 
| 323 | 323 | */ | 
| 324 | -	public static function sensei_get_activity_value ( $args = array() ) { | |
| 324 | +	public static function sensei_get_activity_value($args = array()) { | |
| 325 | 325 | |
| 326 | 326 | $activity_value = false; | 
| 327 | -		if ( !empty($args['field']) ) { | |
| 328 | - $comment = Sensei_Utils::sensei_check_for_activity( $args, true ); | |
| 327 | +		if ( ! empty($args['field'])) { | |
| 328 | + $comment = Sensei_Utils::sensei_check_for_activity($args, true); | |
| 329 | 329 | |
| 330 | -			if ( isset( $comment->{$args['field']} ) && '' != $comment->{$args['field']} ) { | |
| 330 | +			if (isset($comment->{$args['field']} ) && '' != $comment->{$args['field']} ) { | |
| 331 | 331 |  				$activity_value = $comment->{$args['field']}; | 
| 332 | 332 | } // End If Statement | 
| 333 | 333 | } | 
| @@ -345,22 +345,22 @@ discard block | ||
| 345 | 345 | * @param int $product_id | 
| 346 | 346 | * @return bool | 
| 347 | 347 | */ | 
| 348 | -    public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) { | |
| 348 | +    public static function sensei_customer_bought_product($customer_email, $user_id, $product_id) { | |
| 349 | 349 | |
| 350 | 350 | $emails = array(); | 
| 351 | 351 | |
| 352 | -        if ( $user_id ) { | |
| 353 | - $user = get_user_by( 'id', intval( $user_id ) ); | |
| 352 | +        if ($user_id) { | |
| 353 | +            $user = get_user_by('id', intval($user_id)); | |
| 354 | 354 | $emails[] = $user->user_email; | 
| 355 | 355 | } | 
| 356 | 356 | |
| 357 | - if ( is_email( $customer_email ) ) | |
| 357 | + if (is_email($customer_email)) | |
| 358 | 358 | $emails[] = $customer_email; | 
| 359 | 359 | |
| 360 | - if ( sizeof( $emails ) == 0 ) | |
| 360 | + if (sizeof($emails) == 0) | |
| 361 | 361 | return false; | 
| 362 | 362 | |
| 363 | - return Sensei_WC::has_customer_bought_product( $user_id, $product_id ); | |
| 363 | + return Sensei_WC::has_customer_bought_product($user_id, $product_id); | |
| 364 | 364 | |
| 365 | 365 | } // End sensei_customer_bought_product() | 
| 366 | 366 | |
| @@ -371,9 +371,9 @@ discard block | ||
| 371 | 371 | * @param string $input_name Name for text area form element | 
| 372 | 372 | * @return void | 
| 373 | 373 | */ | 
| 374 | -	public static function sensei_text_editor( $content = '', $editor_id = 'senseitexteditor', $input_name = '' ) { | |
| 374 | +	public static function sensei_text_editor($content = '', $editor_id = 'senseitexteditor', $input_name = '') { | |
| 375 | 375 | |
| 376 | - if( ! $input_name ) $input_name = $editor_id; | |
| 376 | + if ( ! $input_name) $input_name = $editor_id; | |
| 377 | 377 | |
| 378 | 378 | $buttons = 'bold,italic,underline,strikethrough,blockquote,bullist,numlist,justifyleft,justifycenter,justifyright,undo,redo,pastetext'; | 
| 379 | 379 | |
| @@ -391,7 +391,7 @@ discard block | ||
| 391 | 391 | 'quicktags' => false | 
| 392 | 392 | ); | 
| 393 | 393 | |
| 394 | - wp_editor( $content, $editor_id, $settings ); | |
| 394 | + wp_editor($content, $editor_id, $settings); | |
| 395 | 395 | |
| 396 | 396 | } // End sensei_text_editor() | 
| 397 | 397 | |
| @@ -401,57 +401,57 @@ discard block | ||
| 401 | 401 | * @param int $user_id | 
| 402 | 402 | * @return boolean Whether the answers were saved or not | 
| 403 | 403 | */ | 
| 404 | -	public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) { | |
| 404 | +	public static function sensei_save_quiz_answers($submitted = array(), $user_id = 0) { | |
| 405 | 405 | |
| 406 | -		if( intval( $user_id ) == 0 ) { | |
| 406 | +		if (intval($user_id) == 0) { | |
| 407 | 407 | $user_id = get_current_user_id(); | 
| 408 | 408 | } | 
| 409 | 409 | |
| 410 | 410 | $answers_saved = false; | 
| 411 | 411 | |
| 412 | -		if( $submitted && intval( $user_id ) > 0 ) { | |
| 412 | +		if ($submitted && intval($user_id) > 0) { | |
| 413 | 413 | |
| 414 | -			foreach( $submitted as $question_id => $answer ) { | |
| 414 | +			foreach ($submitted as $question_id => $answer) { | |
| 415 | 415 | |
| 416 | 416 | // Get 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 | -				switch( $question_type ) { | |
| 424 | - case 'multi-line': $answer = nl2br( $answer ); break; | |
| 423 | +				switch ($question_type) { | |
| 424 | + case 'multi-line': $answer = nl2br($answer); break; | |
| 425 | 425 | case 'single-line': break; | 
| 426 | 426 | case 'gap-fill': break; | 
| 427 | - default: $answer = maybe_serialize( $answer ); break; | |
| 427 | + default: $answer = maybe_serialize($answer); break; | |
| 428 | 428 | } | 
| 429 | 429 | $args = array( | 
| 430 | 430 | 'post_id' => $question_id, | 
| 431 | - 'data' => base64_encode( $answer ), | |
| 431 | + 'data' => base64_encode($answer), | |
| 432 | 432 | 'type' => 'sensei_user_answer', /* FIELD SIZE 20 */ | 
| 433 | 433 | 'user_id' => $user_id, | 
| 434 | 434 | 'action' => 'update' | 
| 435 | 435 | ); | 
| 436 | - $answers_saved = Sensei_Utils::sensei_log_activity( $args ); | |
| 436 | + $answers_saved = Sensei_Utils::sensei_log_activity($args); | |
| 437 | 437 | } | 
| 438 | 438 | |
| 439 | 439 | // Handle file upload questions | 
| 440 | -			if( isset( $_FILES ) ) { | |
| 441 | -				foreach( $_FILES as $field => $file ) { | |
| 442 | -					if( strpos( $field, 'file_upload_' ) !== false ) { | |
| 443 | - $question_id = str_replace( 'file_upload_', '', $field ); | |
| 444 | -						if( $file && $question_id ) { | |
| 445 | - $attachment_id = self::upload_file( $file ); | |
| 446 | -							if( $attachment_id ) { | |
| 440 | +			if (isset($_FILES)) { | |
| 441 | +				foreach ($_FILES as $field => $file) { | |
| 442 | +					if (strpos($field, 'file_upload_') !== false) { | |
| 443 | +						$question_id = str_replace('file_upload_', '', $field); | |
| 444 | +						if ($file && $question_id) { | |
| 445 | + $attachment_id = self::upload_file($file); | |
| 446 | +							if ($attachment_id) { | |
| 447 | 447 | $args = array( | 
| 448 | 448 | 'post_id' => $question_id, | 
| 449 | - 'data' => base64_encode( $attachment_id ), | |
| 449 | + 'data' => base64_encode($attachment_id), | |
| 450 | 450 | 'type' => 'sensei_user_answer', /* FIELD SIZE 20 */ | 
| 451 | 451 | 'user_id' => $user_id, | 
| 452 | 452 | 'action' => 'update' | 
| 453 | 453 | ); | 
| 454 | - $answers_saved = Sensei_Utils::sensei_log_activity( $args ); | |
| 454 | + $answers_saved = Sensei_Utils::sensei_log_activity($args); | |
| 455 | 455 | } | 
| 456 | 456 | } | 
| 457 | 457 | } | 
| @@ -463,9 +463,9 @@ discard block | ||
| 463 | 463 | |
| 464 | 464 | } // End sensei_save_quiz_answers() | 
| 465 | 465 | |
| 466 | -	public static function upload_file( $file = array() ) { | |
| 466 | +	public static function upload_file($file = array()) { | |
| 467 | 467 | |
| 468 | - require_once( ABSPATH . 'wp-admin/includes/admin.php' ); | |
| 468 | + require_once(ABSPATH.'wp-admin/includes/admin.php'); | |
| 469 | 469 | |
| 470 | 470 | /** | 
| 471 | 471 | * Filter the data array for the Sensei wp_handle_upload function call | 
| @@ -480,11 +480,11 @@ discard block | ||
| 480 | 480 | * @type string test_form set to false by default | 
| 481 | 481 | * } | 
| 482 | 482 | */ | 
| 483 | -        $file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) ); | |
| 483 | +        $file_upload_args = apply_filters('sensei_file_upload_args', array('test_form' => false)); | |
| 484 | 484 | |
| 485 | - $file_return = wp_handle_upload( $file, $file_upload_args ); | |
| 485 | + $file_return = wp_handle_upload($file, $file_upload_args); | |
| 486 | 486 | |
| 487 | -        if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) { | |
| 487 | +        if (isset($file_return['error']) || isset($file_return['upload_error_handler'])) { | |
| 488 | 488 | return false; | 
| 489 | 489 |          } else { | 
| 490 | 490 | |
| @@ -492,19 +492,19 @@ discard block | ||
| 492 | 492 | |
| 493 | 493 | $attachment = array( | 
| 494 | 494 | 'post_mime_type' => $file_return['type'], | 
| 495 | - 'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ), | |
| 495 | +                'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)), | |
| 496 | 496 | 'post_content' => '', | 
| 497 | 497 | 'post_status' => 'inherit', | 
| 498 | 498 | 'guid' => $file_return['url'] | 
| 499 | 499 | ); | 
| 500 | 500 | |
| 501 | - $attachment_id = wp_insert_attachment( $attachment, $filename ); | |
| 501 | + $attachment_id = wp_insert_attachment($attachment, $filename); | |
| 502 | 502 | |
| 503 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); | |
| 504 | - $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename ); | |
| 505 | - wp_update_attachment_metadata( $attachment_id, $attachment_data ); | |
| 503 | + require_once(ABSPATH.'wp-admin/includes/image.php'); | |
| 504 | + $attachment_data = wp_generate_attachment_metadata($attachment_id, $filename); | |
| 505 | + wp_update_attachment_metadata($attachment_id, $attachment_data); | |
| 506 | 506 | |
| 507 | -            if( 0 < intval( $attachment_id ) ) { | |
| 507 | +            if (0 < intval($attachment_id)) { | |
| 508 | 508 | return $attachment_id; | 
| 509 | 509 | } | 
| 510 | 510 | } | 
| @@ -530,9 +530,9 @@ discard block | ||
| 530 | 530 | * | 
| 531 | 531 | * @return int $quiz_grade total sum of all question grades | 
| 532 | 532 | */ | 
| 533 | -	public static function sensei_grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) { | |
| 533 | +	public static function sensei_grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') { | |
| 534 | 534 | |
| 535 | - return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type ); | |
| 535 | + return Sensei_Grading::grade_quiz_auto($quiz_id, $submitted, $total_questions, $quiz_grade_type); | |
| 536 | 536 | |
| 537 | 537 | } // End sensei_grade_quiz_auto() | 
| 538 | 538 | |
| @@ -544,20 +544,20 @@ discard block | ||
| 544 | 544 | * @param string $quiz_grade_type default 'auto' | 
| 545 | 545 | * @return boolean | 
| 546 | 546 | */ | 
| 547 | -	public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) { | |
| 548 | -		if( intval( $user_id ) == 0 ) { | |
| 547 | +	public static function sensei_grade_quiz($quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto') { | |
| 548 | +		if (intval($user_id) == 0) { | |
| 549 | 549 | $user_id = get_current_user_id(); | 
| 550 | 550 | } | 
| 551 | 551 | |
| 552 | 552 | $activity_logged = false; | 
| 553 | -		if( intval( $quiz_id ) > 0 && intval( $user_id ) > 0 ) { | |
| 554 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 555 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); | |
| 556 | - $activity_logged = update_comment_meta( $user_lesson_status->comment_ID, 'grade', $grade ); | |
| 553 | +		if (intval($quiz_id) > 0 && intval($user_id) > 0) { | |
| 554 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 555 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); | |
| 556 | + $activity_logged = update_comment_meta($user_lesson_status->comment_ID, 'grade', $grade); | |
| 557 | 557 | |
| 558 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); | |
| 558 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); | |
| 559 | 559 | |
| 560 | - do_action( 'sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type ); | |
| 560 | +			do_action('sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type); | |
| 561 | 561 | } | 
| 562 | 562 | |
| 563 | 563 | return $activity_logged; | 
| @@ -577,9 +577,9 @@ discard block | ||
| 577 | 577 | * | 
| 578 | 578 | * @return int $question_grade | 
| 579 | 579 | */ | 
| 580 | -	public static function sensei_grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) { | |
| 580 | +	public static function sensei_grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) { | |
| 581 | 581 | |
| 582 | - return WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id ); | |
| 582 | + return WooThemes_Sensei_Grading::grade_question_auto($question_id, $question_type, $answer, $user_id); | |
| 583 | 583 | |
| 584 | 584 | } // end sensei_grade_question_auto | 
| 585 | 585 | |
| @@ -590,20 +590,20 @@ discard block | ||
| 590 | 590 | * @param int $user_id | 
| 591 | 591 | * @return boolean | 
| 592 | 592 | */ | 
| 593 | -	public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) { | |
| 594 | -		if( intval( $user_id ) == 0 ) { | |
| 593 | +	public static function sensei_grade_question($question_id = 0, $grade = 0, $user_id = 0) { | |
| 594 | +		if (intval($user_id) == 0) { | |
| 595 | 595 | $user_id = get_current_user_id(); | 
| 596 | 596 | } | 
| 597 | 597 | |
| 598 | 598 | $activity_logged = false; | 
| 599 | -		if( intval( $question_id ) > 0 && intval( $user_id ) > 0 ) { | |
| 599 | +		if (intval($question_id) > 0 && intval($user_id) > 0) { | |
| 600 | 600 | |
| 601 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); | |
| 602 | - $activity_logged = update_comment_meta( $user_answer_id, 'user_grade', $grade ); | |
| 601 | +			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); | |
| 602 | + $activity_logged = update_comment_meta($user_answer_id, 'user_grade', $grade); | |
| 603 | 603 | |
| 604 | - $answer_notes = get_post_meta( $question_id, '_answer_feedback', true ); | |
| 605 | -			if ( !empty($answer_notes) ) { | |
| 606 | - update_comment_meta( $user_answer_id, 'answer_note', base64_encode( $answer_notes ) ); | |
| 604 | + $answer_notes = get_post_meta($question_id, '_answer_feedback', true); | |
| 605 | +			if ( ! empty($answer_notes)) { | |
| 606 | + update_comment_meta($user_answer_id, 'answer_note', base64_encode($answer_notes)); | |
| 607 | 607 | } | 
| 608 | 608 | |
| 609 | 609 | } | 
| @@ -611,15 +611,15 @@ discard block | ||
| 611 | 611 | return $activity_logged; | 
| 612 | 612 | } | 
| 613 | 613 | |
| 614 | -	public static function sensei_delete_question_grade( $question_id = 0, $user_id = 0 ) { | |
| 615 | -		if( intval( $user_id ) == 0 ) { | |
| 614 | +	public static function sensei_delete_question_grade($question_id = 0, $user_id = 0) { | |
| 615 | +		if (intval($user_id) == 0) { | |
| 616 | 616 | $user_id = get_current_user_id(); | 
| 617 | 617 | } | 
| 618 | 618 | |
| 619 | 619 | $activity_logged = false; | 
| 620 | -		if( intval( $question_id ) > 0 ) { | |
| 621 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); | |
| 622 | - $activity_logged = delete_comment_meta( $user_answer_id, 'user_grade' ); | |
| 620 | +		if (intval($question_id) > 0) { | |
| 621 | +			$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); | |
| 622 | + $activity_logged = delete_comment_meta($user_answer_id, 'user_grade'); | |
| 623 | 623 | } | 
| 624 | 624 | |
| 625 | 625 | return $activity_logged; | 
| @@ -637,9 +637,9 @@ discard block | ||
| 637 | 637 | * | 
| 638 | 638 | * @return mixed boolean or comment_ID | 
| 639 | 639 | */ | 
| 640 | -    public static function user_start_lesson(  $user_id = 0, $lesson_id = 0, $complete = false ) { | |
| 640 | +    public static function user_start_lesson($user_id = 0, $lesson_id = 0, $complete = false) { | |
| 641 | 641 | |
| 642 | - return self::sensei_start_lesson( $lesson_id, $user_id, $complete ); | |
| 642 | + return self::sensei_start_lesson($lesson_id, $user_id, $complete); | |
| 643 | 643 | |
| 644 | 644 | }// end user_start_lesson() | 
| 645 | 645 | |
| @@ -656,22 +656,22 @@ discard block | ||
| 656 | 656 | * | 
| 657 | 657 | * @return mixed boolean or comment_ID | 
| 658 | 658 | */ | 
| 659 | -	public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) { | |
| 659 | +	public static function sensei_start_lesson($lesson_id = 0, $user_id = 0, $complete = false) { | |
| 660 | 660 | |
| 661 | 661 | |
| 662 | -		if( intval( $user_id ) == 0 ) { | |
| 662 | +		if (intval($user_id) == 0) { | |
| 663 | 663 | $user_id = get_current_user_id(); | 
| 664 | 664 | } | 
| 665 | 665 | |
| 666 | 666 | $activity_logged = false; | 
| 667 | 667 | |
| 668 | -		if( intval( $lesson_id ) > 0 ) { | |
| 668 | +		if (intval($lesson_id) > 0) { | |
| 669 | 669 | |
| 670 | - $course_id = get_post_meta( $lesson_id, '_lesson_course', true ); | |
| 671 | -			if( $course_id ) { | |
| 672 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, $user_id ); | |
| 673 | -				if( ! $is_user_taking_course ) { | |
| 674 | - Sensei_Utils::user_start_course( $user_id, $course_id ); | |
| 670 | + $course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 671 | +			if ($course_id) { | |
| 672 | + $is_user_taking_course = Sensei_Utils::user_started_course($course_id, $user_id); | |
| 673 | +				if ( ! $is_user_taking_course) { | |
| 674 | + Sensei_Utils::user_start_course($user_id, $course_id); | |
| 675 | 675 | } | 
| 676 | 676 | } | 
| 677 | 677 | |
| @@ -679,12 +679,12 @@ discard block | ||
| 679 | 679 | $status = 'in-progress'; | 
| 680 | 680 | |
| 681 | 681 | // Note: When this action runs the lesson status may not yet exist | 
| 682 | - do_action( 'sensei_user_lesson_start', $user_id, $lesson_id ); | |
| 682 | +			do_action('sensei_user_lesson_start', $user_id, $lesson_id); | |
| 683 | 683 | |
| 684 | -			if( $complete ) { | |
| 684 | +			if ($complete) { | |
| 685 | 685 | |
| 686 | - $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); | |
| 687 | -				if ( $has_questions ) { | |
| 686 | + $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); | |
| 687 | +				if ($has_questions) { | |
| 688 | 688 | $status = 'passed'; // Force a pass | 
| 689 | 689 | $metadata['grade'] = 0; | 
| 690 | 690 | } | 
| @@ -694,31 +694,31 @@ discard block | ||
| 694 | 694 | } | 
| 695 | 695 | |
| 696 | 696 | // Check if user is already taking the lesson | 
| 697 | - $activity_logged = Sensei_Utils::user_started_lesson( $lesson_id, $user_id ); | |
| 698 | -			if( ! $activity_logged ) { | |
| 697 | + $activity_logged = Sensei_Utils::user_started_lesson($lesson_id, $user_id); | |
| 698 | +			if ( ! $activity_logged) { | |
| 699 | 699 | |
| 700 | 700 |  				$metadata['start'] = current_time('mysql'); | 
| 701 | - $activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata ); | |
| 701 | + $activity_logged = Sensei_Utils::update_lesson_status($user_id, $lesson_id, $status, $metadata); | |
| 702 | 702 | |
| 703 | 703 |              } else { | 
| 704 | 704 | |
| 705 | 705 | // if users is already taking the lesson and the status changes to complete update it | 
| 706 | 706 | $current_user_activity = get_comment($activity_logged); | 
| 707 | - if( $status=='complete' && | |
| 708 | -                    $status != $current_user_activity->comment_approved  ){ | |
| 707 | + if ($status == 'complete' && | |
| 708 | +                    $status != $current_user_activity->comment_approved) { | |
| 709 | 709 | |
| 710 | 710 | $comment = array(); | 
| 711 | 711 | $comment['comment_ID'] = $activity_logged; | 
| 712 | 712 | $comment['comment_approved'] = $status; | 
| 713 | - wp_update_comment( $comment ); | |
| 713 | + wp_update_comment($comment); | |
| 714 | 714 | |
| 715 | 715 | } | 
| 716 | 716 | |
| 717 | 717 | } | 
| 718 | 718 | |
| 719 | -			if ( $complete ) { | |
| 719 | +			if ($complete) { | |
| 720 | 720 | // Run this *after* the lesson status has been created/updated | 
| 721 | - do_action( 'sensei_user_lesson_end', $user_id, $lesson_id ); | |
| 721 | +				do_action('sensei_user_lesson_end', $user_id, $lesson_id); | |
| 722 | 722 | } | 
| 723 | 723 | |
| 724 | 724 | } | 
| @@ -733,20 +733,20 @@ discard block | ||
| 733 | 733 | * @param int $user_id | 
| 734 | 734 | * @return boolean | 
| 735 | 735 | */ | 
| 736 | -	public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) { | |
| 736 | +	public static function sensei_remove_user_from_lesson($lesson_id = 0, $user_id = 0, $from_course = false) { | |
| 737 | 737 | |
| 738 | 738 | |
| 739 | - if( ! $lesson_id ) return false; | |
| 739 | + if ( ! $lesson_id) return false; | |
| 740 | 740 | |
| 741 | -		if( intval( $user_id ) == 0 ) { | |
| 741 | +		if (intval($user_id) == 0) { | |
| 742 | 742 | $user_id = get_current_user_id(); | 
| 743 | 743 | } | 
| 744 | 744 | |
| 745 | 745 | // Process quiz | 
| 746 | - $lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 746 | + $lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 747 | 747 | |
| 748 | 748 | // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade | 
| 749 | - Sensei_Utils::sensei_delete_quiz_answers( $lesson_quiz_id, $user_id ); | |
| 749 | + Sensei_Utils::sensei_delete_quiz_answers($lesson_quiz_id, $user_id); | |
| 750 | 750 | |
| 751 | 751 | // Delete lesson status | 
| 752 | 752 | $args = array( | 
| @@ -755,10 +755,10 @@ discard block | ||
| 755 | 755 | 'user_id' => $user_id, | 
| 756 | 756 | ); | 
| 757 | 757 | // This auto deletes the corresponding meta data, such as the quiz grade, and questions asked | 
| 758 | - Sensei_Utils::sensei_delete_activities( $args ); | |
| 758 | + Sensei_Utils::sensei_delete_activities($args); | |
| 759 | 759 | |
| 760 | -		if( ! $from_course ) { | |
| 761 | - do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id ); | |
| 760 | +		if ( ! $from_course) { | |
| 761 | +			do_action('sensei_user_lesson_reset', $user_id, $lesson_id); | |
| 762 | 762 | } | 
| 763 | 763 | |
| 764 | 764 | return true; | 
| @@ -771,19 +771,19 @@ discard block | ||
| 771 | 771 | * @param int $user_id | 
| 772 | 772 | * @return boolean | 
| 773 | 773 | */ | 
| 774 | -	public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) { | |
| 774 | +	public static function sensei_remove_user_from_course($course_id = 0, $user_id = 0) { | |
| 775 | 775 | |
| 776 | 776 | |
| 777 | - if( ! $course_id ) return false; | |
| 777 | + if ( ! $course_id) return false; | |
| 778 | 778 | |
| 779 | -		if( intval( $user_id ) == 0 ) { | |
| 779 | +		if (intval($user_id) == 0) { | |
| 780 | 780 | $user_id = get_current_user_id(); | 
| 781 | 781 | } | 
| 782 | 782 | |
| 783 | - $lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' ); | |
| 783 | + $lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids'); | |
| 784 | 784 | |
| 785 | -		foreach( $lesson_ids as $lesson_id ) { | |
| 786 | - Sensei_Utils::sensei_remove_user_from_lesson( $lesson_id, $user_id, true ); | |
| 785 | +		foreach ($lesson_ids as $lesson_id) { | |
| 786 | + Sensei_Utils::sensei_remove_user_from_lesson($lesson_id, $user_id, true); | |
| 787 | 787 | } | 
| 788 | 788 | |
| 789 | 789 | // Delete course status | 
| @@ -793,36 +793,36 @@ discard block | ||
| 793 | 793 | 'user_id' => $user_id, | 
| 794 | 794 | ); | 
| 795 | 795 | |
| 796 | - Sensei_Utils::sensei_delete_activities( $args ); | |
| 796 | + Sensei_Utils::sensei_delete_activities($args); | |
| 797 | 797 | |
| 798 | - do_action( 'sensei_user_course_reset', $user_id, $course_id ); | |
| 798 | +		do_action('sensei_user_course_reset', $user_id, $course_id); | |
| 799 | 799 | |
| 800 | 800 | return true; | 
| 801 | 801 | } | 
| 802 | 802 | |
| 803 | -	public static function sensei_get_quiz_questions( $quiz_id = 0 ) { | |
| 803 | +	public static function sensei_get_quiz_questions($quiz_id = 0) { | |
| 804 | 804 | |
| 805 | 805 | |
| 806 | 806 | $questions = array(); | 
| 807 | 807 | |
| 808 | -		if( intval( $quiz_id ) > 0 ) { | |
| 809 | - $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id ); | |
| 810 | - $questions = Sensei_Utils::array_sort_reorder( $questions ); | |
| 808 | +		if (intval($quiz_id) > 0) { | |
| 809 | + $questions = Sensei()->lesson->lesson_quiz_questions($quiz_id); | |
| 810 | + $questions = Sensei_Utils::array_sort_reorder($questions); | |
| 811 | 811 | } | 
| 812 | 812 | |
| 813 | 813 | return $questions; | 
| 814 | 814 | } | 
| 815 | 815 | |
| 816 | -	public static function sensei_get_quiz_total( $quiz_id = 0 ) { | |
| 816 | +	public static function sensei_get_quiz_total($quiz_id = 0) { | |
| 817 | 817 | |
| 818 | 818 | |
| 819 | 819 | $quiz_total = 0; | 
| 820 | 820 | |
| 821 | -		if( $quiz_id > 0 ) { | |
| 822 | - $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id ); | |
| 821 | +		if ($quiz_id > 0) { | |
| 822 | + $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id); | |
| 823 | 823 | $question_grade = 0; | 
| 824 | -			foreach( $questions as $question ) { | |
| 825 | - $question_grade = Sensei()->question->get_question_grade( $question->ID ); | |
| 824 | +			foreach ($questions as $question) { | |
| 825 | + $question_grade = Sensei()->question->get_question_grade($question->ID); | |
| 826 | 826 | $quiz_total += $question_grade; | 
| 827 | 827 | } | 
| 828 | 828 | } | 
| @@ -837,20 +837,20 @@ discard block | ||
| 837 | 837 | * @param int $user_id | 
| 838 | 838 | * @return string | 
| 839 | 839 | */ | 
| 840 | -	public static function sensei_get_user_question_grade( $question = 0, $user_id = 0 ) { | |
| 840 | +	public static function sensei_get_user_question_grade($question = 0, $user_id = 0) { | |
| 841 | 841 | $question_grade = false; | 
| 842 | -		if( $question ) { | |
| 843 | -			if ( is_object( $question ) ) { | |
| 842 | +		if ($question) { | |
| 843 | +			if (is_object($question)) { | |
| 844 | 844 | $user_answer_id = $question->comment_ID; | 
| 845 | 845 | } | 
| 846 | 846 |  			else { | 
| 847 | -				if( intval( $user_id ) == 0 ) { | |
| 847 | +				if (intval($user_id) == 0) { | |
| 848 | 848 | $user_id = get_current_user_id(); | 
| 849 | 849 | } | 
| 850 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); | |
| 850 | +				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); | |
| 851 | 851 | } | 
| 852 | -			if ( $user_answer_id ) { | |
| 853 | - $question_grade = get_comment_meta( $user_answer_id, 'user_grade', true ); | |
| 852 | +			if ($user_answer_id) { | |
| 853 | + $question_grade = get_comment_meta($user_answer_id, 'user_grade', true); | |
| 854 | 854 | } | 
| 855 | 855 | } | 
| 856 | 856 | |
| @@ -865,52 +865,52 @@ discard block | ||
| 865 | 865 | * @param int $user_id | 
| 866 | 866 | * @return string | 
| 867 | 867 | */ | 
| 868 | -	public static function sensei_get_user_question_answer_notes( $question = 0, $user_id = 0 ) { | |
| 868 | +	public static function sensei_get_user_question_answer_notes($question = 0, $user_id = 0) { | |
| 869 | 869 | $answer_notes = false; | 
| 870 | -		if( $question ) { | |
| 871 | -			if ( is_object( $question ) ) { | |
| 870 | +		if ($question) { | |
| 871 | +			if (is_object($question)) { | |
| 872 | 872 | $user_answer_id = $question->comment_ID; | 
| 873 | 873 | } | 
| 874 | 874 |  			else { | 
| 875 | -				if( intval( $user_id ) == 0 ) { | |
| 875 | +				if (intval($user_id) == 0) { | |
| 876 | 876 | $user_id = get_current_user_id(); | 
| 877 | 877 | } | 
| 878 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); | |
| 878 | +				$user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); | |
| 879 | 879 | } | 
| 880 | -			if ( $user_answer_id ) { | |
| 881 | - $answer_notes = base64_decode( get_comment_meta( $user_answer_id, 'answer_note', true ) ); | |
| 880 | +			if ($user_answer_id) { | |
| 881 | + $answer_notes = base64_decode(get_comment_meta($user_answer_id, 'answer_note', true)); | |
| 882 | 882 | } | 
| 883 | 883 | } | 
| 884 | 884 | |
| 885 | 885 | return $answer_notes; | 
| 886 | 886 | } | 
| 887 | 887 | |
| 888 | -	public static function sensei_delete_quiz_answers( $quiz_id = 0, $user_id = 0 ) { | |
| 889 | -		if( intval( $user_id ) == 0 ) { | |
| 888 | +	public static function sensei_delete_quiz_answers($quiz_id = 0, $user_id = 0) { | |
| 889 | +		if (intval($user_id) == 0) { | |
| 890 | 890 | $user_id = get_current_user_id(); | 
| 891 | 891 | } | 
| 892 | 892 | |
| 893 | 893 | $delete_answers = false; | 
| 894 | -		if( intval( $quiz_id ) > 0 ) { | |
| 895 | - $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id ); | |
| 896 | -			foreach( $questions as $question ) { | |
| 897 | - $delete_answers = Sensei_Utils::sensei_delete_activities( array( 'post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ) ); | |
| 894 | +		if (intval($quiz_id) > 0) { | |
| 895 | + $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id); | |
| 896 | +			foreach ($questions as $question) { | |
| 897 | +				$delete_answers = Sensei_Utils::sensei_delete_activities(array('post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer')); | |
| 898 | 898 | } | 
| 899 | 899 | } | 
| 900 | 900 | |
| 901 | 901 | return $delete_answers; | 
| 902 | 902 | } | 
| 903 | 903 | |
| 904 | -	public static function sensei_delete_quiz_grade( $quiz_id = 0, $user_id = 0 ) { | |
| 905 | -		if( intval( $user_id ) == 0 ) { | |
| 904 | +	public static function sensei_delete_quiz_grade($quiz_id = 0, $user_id = 0) { | |
| 905 | +		if (intval($user_id) == 0) { | |
| 906 | 906 | $user_id = get_current_user_id(); | 
| 907 | 907 | } | 
| 908 | 908 | |
| 909 | 909 | $delete_grade = false; | 
| 910 | -		if( intval( $quiz_id ) > 0 ) { | |
| 911 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 912 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); | |
| 913 | - $delete_grade = delete_comment_meta( $user_lesson_status->comment_ID, 'grade' ); | |
| 910 | +		if (intval($quiz_id) > 0) { | |
| 911 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 912 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); | |
| 913 | + $delete_grade = delete_comment_meta($user_lesson_status->comment_ID, 'grade'); | |
| 914 | 914 | } | 
| 915 | 915 | |
| 916 | 916 | return $delete_grade; | 
| @@ -923,20 +923,20 @@ discard block | ||
| 923 | 923 | * @param string $notes | 
| 924 | 924 | * @return boolean | 
| 925 | 925 | */ | 
| 926 | -	public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) { | |
| 927 | -		if( intval( $user_id ) == 0 ) { | |
| 926 | +	public static function sensei_add_answer_notes($question_id = 0, $user_id = 0, $notes = '') { | |
| 927 | +		if (intval($user_id) == 0) { | |
| 928 | 928 | $user_id = get_current_user_id(); | 
| 929 | 929 | } | 
| 930 | 930 | |
| 931 | 931 | $activity_logged = false; | 
| 932 | 932 | |
| 933 | -		if( intval( $question_id ) > 0 ) { | |
| 934 | - $notes = base64_encode( $notes ); | |
| 933 | +		if (intval($question_id) > 0) { | |
| 934 | + $notes = base64_encode($notes); | |
| 935 | 935 | |
| 936 | 936 | // Don't store empty values, no point | 
| 937 | -			if ( !empty($notes) ) { | |
| 938 | - $user_lesson_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); | |
| 939 | - $activity_logged = update_comment_meta( $user_lesson_id, 'answer_note', $notes ); | |
| 937 | +			if ( ! empty($notes)) { | |
| 938 | +				$user_lesson_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); | |
| 939 | + $activity_logged = update_comment_meta($user_lesson_id, 'answer_note', $notes); | |
| 940 | 940 | } | 
| 941 | 941 |  			else { | 
| 942 | 942 | $activity_logged = true; | 
| @@ -952,16 +952,16 @@ discard block | ||
| 952 | 952 | * @param array $return_array data to be ordered | 
| 953 | 953 | * @return array $return_array ordered data | 
| 954 | 954 | */ | 
| 955 | -	public static function array_sort_reorder( $return_array ) { | |
| 956 | -		if ( isset( $_GET['orderby'] ) && '' != esc_html( $_GET['orderby'] ) ) { | |
| 955 | +	public static function array_sort_reorder($return_array) { | |
| 956 | +		if (isset($_GET['orderby']) && '' != esc_html($_GET['orderby'])) { | |
| 957 | 957 | $sort_key = ''; | 
| 958 | 958 |  			// if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->sortable_columns ) ) { | 
| 959 | 959 | // $sort_key = esc_html( $_GET['orderby'] ); | 
| 960 | 960 | // } // End If Statement | 
| 961 | -			if ( '' != $sort_key ) { | |
| 962 | - Sensei_Utils::sort_array_by_key($return_array,$sort_key); | |
| 963 | -				if ( isset( $_GET['order'] ) && 'desc' == esc_html( $_GET['order'] ) ) { | |
| 964 | - $return_array = array_reverse( $return_array, true ); | |
| 961 | +			if ('' != $sort_key) { | |
| 962 | + Sensei_Utils::sort_array_by_key($return_array, $sort_key); | |
| 963 | +				if (isset($_GET['order']) && 'desc' == esc_html($_GET['order'])) { | |
| 964 | + $return_array = array_reverse($return_array, true); | |
| 965 | 965 | } // End If Statement | 
| 966 | 966 | } // End If Statement | 
| 967 | 967 | return $return_array; | 
| @@ -977,15 +977,15 @@ discard block | ||
| 977 | 977 | * @param $key string column name in array | 
| 978 | 978 | * @return void | 
| 979 | 979 | */ | 
| 980 | -	public static function sort_array_by_key( $array, $key ) { | |
| 980 | +	public static function sort_array_by_key($array, $key) { | |
| 981 | 981 | $sorter = array(); | 
| 982 | 982 | $ret = array(); | 
| 983 | - reset( $array ); | |
| 984 | -	    foreach ( $array as $ii => $va ) { | |
| 983 | + reset($array); | |
| 984 | +	    foreach ($array as $ii => $va) { | |
| 985 | 985 | $sorter[$ii] = $va[$key]; | 
| 986 | 986 | } // End For Loop | 
| 987 | - asort( $sorter ); | |
| 988 | -	    foreach ( $sorter as $ii => $va ) { | |
| 987 | + asort($sorter); | |
| 988 | +	    foreach ($sorter as $ii => $va) { | |
| 989 | 989 | $ret[$ii] = $array[$ii]; | 
| 990 | 990 | } // End For Loop | 
| 991 | 991 | $array = $ret; | 
| @@ -997,10 +997,10 @@ discard block | ||
| 997 | 997 | * @param integer $quiz_id | 
| 998 | 998 | * @return array of quiz questions | 
| 999 | 999 | */ | 
| 1000 | -	public static function lesson_quiz_questions( $quiz_id = 0 ) { | |
| 1000 | +	public static function lesson_quiz_questions($quiz_id = 0) { | |
| 1001 | 1001 | $questions_array = array(); | 
| 1002 | -		if ( 0 < $quiz_id ) { | |
| 1003 | - $question_args = array( 'post_type' => 'question', | |
| 1002 | +		if (0 < $quiz_id) { | |
| 1003 | +			$question_args = array('post_type'         => 'question', | |
| 1004 | 1004 | 'posts_per_page' => -1, | 
| 1005 | 1005 | 'orderby' => 'ID', | 
| 1006 | 1006 | 'order' => 'ASC', | 
| @@ -1013,7 +1013,7 @@ discard block | ||
| 1013 | 1013 | 'post_status' => 'any', | 
| 1014 | 1014 | 'suppress_filters' => 0 | 
| 1015 | 1015 | ); | 
| 1016 | - $questions_array = get_posts( $question_args ); | |
| 1016 | + $questions_array = get_posts($question_args); | |
| 1017 | 1017 | } // End If Statement | 
| 1018 | 1018 | return $questions_array; | 
| 1019 | 1019 | } // End lesson_quiz_questions() | 
| @@ -1023,25 +1023,25 @@ discard block | ||
| 1023 | 1023 | * @param integer $course_id ID of course | 
| 1024 | 1024 | * @return integer Pass mark for course | 
| 1025 | 1025 | */ | 
| 1026 | -	public static function sensei_course_pass_grade( $course_id = 0 ) { | |
| 1026 | +	public static function sensei_course_pass_grade($course_id = 0) { | |
| 1027 | 1027 | |
| 1028 | 1028 | |
| 1029 | 1029 | $course_passmark = 0; | 
| 1030 | 1030 | |
| 1031 | -		if( $course_id > 0 ) { | |
| 1032 | - $lessons = Sensei()->course->course_lessons( $course_id ); | |
| 1031 | +		if ($course_id > 0) { | |
| 1032 | + $lessons = Sensei()->course->course_lessons($course_id); | |
| 1033 | 1033 | $lesson_count = 0; | 
| 1034 | 1034 | $total_passmark = 0; | 
| 1035 | -			foreach( $lessons as $lesson ) { | |
| 1035 | +			foreach ($lessons as $lesson) { | |
| 1036 | 1036 | |
| 1037 | 1037 | // Get Quiz ID | 
| 1038 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID ); | |
| 1038 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson->ID); | |
| 1039 | 1039 | |
| 1040 | 1040 | // Check for a pass being required | 
| 1041 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); | |
| 1042 | -				if ( $pass_required ) { | |
| 1041 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); | |
| 1042 | +				if ($pass_required) { | |
| 1043 | 1043 | // Get quiz passmark | 
| 1044 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); | |
| 1044 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); | |
| 1045 | 1045 | |
| 1046 | 1046 | // Add up total passmark | 
| 1047 | 1047 | $total_passmark += $quiz_passmark; | 
| @@ -1050,12 +1050,12 @@ discard block | ||
| 1050 | 1050 | } | 
| 1051 | 1051 | } | 
| 1052 | 1052 | // Might be a case of no required lessons | 
| 1053 | -			if ( $lesson_count ) { | |
| 1054 | - $course_passmark = ( $total_passmark / $lesson_count ); | |
| 1053 | +			if ($lesson_count) { | |
| 1054 | + $course_passmark = ($total_passmark / $lesson_count); | |
| 1055 | 1055 | } | 
| 1056 | 1056 | } | 
| 1057 | 1057 | |
| 1058 | - return Sensei_Utils::round( $course_passmark ); | |
| 1058 | + return Sensei_Utils::round($course_passmark); | |
| 1059 | 1059 | } | 
| 1060 | 1060 | |
| 1061 | 1061 | /** | 
| @@ -1064,31 +1064,31 @@ discard block | ||
| 1064 | 1064 | * @param integer $user_id ID of user | 
| 1065 | 1065 | * @return integer User's total grade | 
| 1066 | 1066 | */ | 
| 1067 | -	public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) { | |
| 1067 | +	public static function sensei_course_user_grade($course_id = 0, $user_id = 0) { | |
| 1068 | 1068 | |
| 1069 | 1069 | |
| 1070 | -		if( intval( $user_id ) == 0 ) { | |
| 1070 | +		if (intval($user_id) == 0) { | |
| 1071 | 1071 | $user_id = get_current_user_id(); | 
| 1072 | 1072 | } | 
| 1073 | 1073 | |
| 1074 | 1074 | $total_grade = 0; | 
| 1075 | 1075 | |
| 1076 | -		if( $course_id > 0 && $user_id > 0 ) { | |
| 1077 | - $lessons = Sensei()->course->course_lessons( $course_id ); | |
| 1076 | +		if ($course_id > 0 && $user_id > 0) { | |
| 1077 | + $lessons = Sensei()->course->course_lessons($course_id); | |
| 1078 | 1078 | $lesson_count = 0; | 
| 1079 | 1079 | $total_grade = 0; | 
| 1080 | -			foreach( $lessons as $lesson ) { | |
| 1080 | +			foreach ($lessons as $lesson) { | |
| 1081 | 1081 | |
| 1082 | 1082 | // Check for lesson having questions, thus a quiz, thus having a grade | 
| 1083 | - $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true ); | |
| 1084 | -				if ( $has_questions ) { | |
| 1085 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, $user_id ); | |
| 1083 | + $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true); | |
| 1084 | +				if ($has_questions) { | |
| 1085 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, $user_id); | |
| 1086 | 1086 | |
| 1087 | -					if(  empty( $user_lesson_status ) ){ | |
| 1087 | +					if (empty($user_lesson_status)) { | |
| 1088 | 1088 | continue; | 
| 1089 | 1089 | } | 
| 1090 | 1090 | // Get user quiz grade | 
| 1091 | - $quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); | |
| 1091 | + $quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); | |
| 1092 | 1092 | |
| 1093 | 1093 | // Add up total grade | 
| 1094 | 1094 | $total_grade += $quiz_grade; | 
| @@ -1098,13 +1098,13 @@ discard block | ||
| 1098 | 1098 | } | 
| 1099 | 1099 | |
| 1100 | 1100 | // Might be a case of no lessons with quizzes | 
| 1101 | -			if ( $lesson_count ) { | |
| 1102 | - $total_grade = ( $total_grade / $lesson_count ); | |
| 1101 | +			if ($lesson_count) { | |
| 1102 | + $total_grade = ($total_grade / $lesson_count); | |
| 1103 | 1103 | } | 
| 1104 | 1104 | |
| 1105 | 1105 | } | 
| 1106 | 1106 | |
| 1107 | - return Sensei_Utils::round( $total_grade ); | |
| 1107 | + return Sensei_Utils::round($total_grade); | |
| 1108 | 1108 | } | 
| 1109 | 1109 | |
| 1110 | 1110 | /** | 
| @@ -1113,18 +1113,18 @@ discard block | ||
| 1113 | 1113 | * @param integer $user_id ID of user | 
| 1114 | 1114 | * @return boolean | 
| 1115 | 1115 | */ | 
| 1116 | -	public static function sensei_user_passed_course( $course_id = 0, $user_id = 0 ) { | |
| 1117 | -		if( intval( $user_id ) == 0 ) { | |
| 1116 | +	public static function sensei_user_passed_course($course_id = 0, $user_id = 0) { | |
| 1117 | +		if (intval($user_id) == 0) { | |
| 1118 | 1118 | $user_id = get_current_user_id(); | 
| 1119 | 1119 | } | 
| 1120 | 1120 | |
| 1121 | 1121 | $pass = false; | 
| 1122 | 1122 | |
| 1123 | -		if( $course_id > 0 && $user_id > 0 ) { | |
| 1124 | - $passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); | |
| 1125 | - $user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); | |
| 1123 | +		if ($course_id > 0 && $user_id > 0) { | |
| 1124 | + $passmark = Sensei_Utils::sensei_course_pass_grade($course_id); | |
| 1125 | + $user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); | |
| 1126 | 1126 | |
| 1127 | -			if( $user_grade >= $passmark ) { | |
| 1127 | +			if ($user_grade >= $passmark) { | |
| 1128 | 1128 | $pass = true; | 
| 1129 | 1129 | } | 
| 1130 | 1130 | } | 
| @@ -1138,37 +1138,37 @@ discard block | ||
| 1138 | 1138 | * @param integer $course_id ID of course | 
| 1139 | 1139 | * @param integer $user_id ID of user | 
| 1140 | 1140 | */ | 
| 1141 | -	public static function sensei_user_course_status_message( $course_id = 0, $user_id = 0 ) { | |
| 1142 | -		if( intval( $user_id ) == 0 ) { | |
| 1141 | +	public static function sensei_user_course_status_message($course_id = 0, $user_id = 0) { | |
| 1142 | +		if (intval($user_id) == 0) { | |
| 1143 | 1143 | $user_id = get_current_user_id(); | 
| 1144 | 1144 | } | 
| 1145 | 1145 | |
| 1146 | 1146 | $status = 'not_started'; | 
| 1147 | 1147 | $box_class = 'info'; | 
| 1148 | - $message = __( 'You have not started this course yet.', 'woothemes-sensei' ); | |
| 1148 | +		$message = __('You have not started this course yet.', 'woothemes-sensei'); | |
| 1149 | 1149 | |
| 1150 | -		if( $course_id > 0 && $user_id > 0 ) { | |
| 1150 | +		if ($course_id > 0 && $user_id > 0) { | |
| 1151 | 1151 | |
| 1152 | - $started_course = Sensei_Utils::user_started_course( $course_id, $user_id ); | |
| 1152 | + $started_course = Sensei_Utils::user_started_course($course_id, $user_id); | |
| 1153 | 1153 | |
| 1154 | -			if( $started_course ) { | |
| 1155 | - $passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); // This happens inside sensei_user_passed_course()! | |
| 1156 | - $user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); // This happens inside sensei_user_passed_course()! | |
| 1157 | -				if( $user_grade >= $passmark ) { | |
| 1154 | +			if ($started_course) { | |
| 1155 | + $passmark = Sensei_Utils::sensei_course_pass_grade($course_id); // This happens inside sensei_user_passed_course()! | |
| 1156 | + $user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); // This happens inside sensei_user_passed_course()! | |
| 1157 | +				if ($user_grade >= $passmark) { | |
| 1158 | 1158 | $status = 'passed'; | 
| 1159 | 1159 | $box_class = 'tick'; | 
| 1160 | - $message = sprintf( __( 'You have passed this course with a grade of %1$d%%.', 'woothemes-sensei' ), $user_grade ); | |
| 1160 | +					$message = sprintf(__('You have passed this course with a grade of %1$d%%.', 'woothemes-sensei'), $user_grade); | |
| 1161 | 1161 |  				} else { | 
| 1162 | 1162 | $status = 'failed'; | 
| 1163 | 1163 | $box_class = 'alert'; | 
| 1164 | - $message = sprintf( __( 'You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei' ), $passmark, $user_grade ); | |
| 1164 | +					$message = sprintf(__('You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei'), $passmark, $user_grade); | |
| 1165 | 1165 | } | 
| 1166 | 1166 | } | 
| 1167 | 1167 | |
| 1168 | 1168 | } | 
| 1169 | 1169 | |
| 1170 | - $message = apply_filters( 'sensei_user_course_status_' . $status, $message ); | |
| 1171 | - Sensei()->notices->add_notice( $message, $box_class ); | |
| 1170 | +		$message = apply_filters('sensei_user_course_status_'.$status, $message); | |
| 1171 | + Sensei()->notices->add_notice($message, $box_class); | |
| 1172 | 1172 | } | 
| 1173 | 1173 | |
| 1174 | 1174 | /** | 
| @@ -1178,94 +1178,94 @@ discard block | ||
| 1178 | 1178 | * @param bool $is_lesson | 
| 1179 | 1179 | * @return array Status code and message | 
| 1180 | 1180 | */ | 
| 1181 | -	public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) { | |
| 1181 | +	public static function sensei_user_quiz_status_message($lesson_id = 0, $user_id = 0, $is_lesson = false) { | |
| 1182 | 1182 | global $current_user; | 
| 1183 | -		if( intval( $user_id ) == 0 ) { | |
| 1183 | +		if (intval($user_id) == 0) { | |
| 1184 | 1184 | $user_id = $current_user->ID; | 
| 1185 | 1185 | } | 
| 1186 | 1186 | |
| 1187 | 1187 | $status = 'not_started'; | 
| 1188 | 1188 | $box_class = 'info'; | 
| 1189 | - $message = __( "You have not taken this lesson's quiz yet", 'woothemes-sensei' ); | |
| 1189 | +		$message = __("You have not taken this lesson's quiz yet", 'woothemes-sensei'); | |
| 1190 | 1190 | $extra = ''; | 
| 1191 | 1191 | |
| 1192 | -		if( $lesson_id > 0 && $user_id > 0 ) { | |
| 1192 | +		if ($lesson_id > 0 && $user_id > 0) { | |
| 1193 | 1193 | |
| 1194 | 1194 | // Prerequisite lesson | 
| 1195 | - $prerequisite = get_post_meta( $lesson_id, '_lesson_prerequisite', true ); | |
| 1195 | + $prerequisite = get_post_meta($lesson_id, '_lesson_prerequisite', true); | |
| 1196 | 1196 | |
| 1197 | 1197 | // Course ID | 
| 1198 | - $course_id = absint( get_post_meta( $lesson_id, '_lesson_course', true ) ); | |
| 1198 | + $course_id = absint(get_post_meta($lesson_id, '_lesson_course', true)); | |
| 1199 | 1199 | |
| 1200 | 1200 | // Has user started course | 
| 1201 | - $started_course = Sensei_Utils::user_started_course( $course_id, $user_id ); | |
| 1201 | + $started_course = Sensei_Utils::user_started_course($course_id, $user_id); | |
| 1202 | 1202 | |
| 1203 | 1203 | // Has user completed lesson | 
| 1204 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); | |
| 1205 | - $lesson_complete = Sensei_Utils::user_completed_lesson( $user_lesson_status ); | |
| 1204 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); | |
| 1205 | + $lesson_complete = Sensei_Utils::user_completed_lesson($user_lesson_status); | |
| 1206 | 1206 | |
| 1207 | 1207 | // Quiz ID | 
| 1208 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 1208 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 1209 | 1209 | |
| 1210 | 1210 | // Quiz grade | 
| 1211 | 1211 | $quiz_grade = 0; | 
| 1212 | -			if ( $user_lesson_status ) { | |
| 1213 | - $quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); | |
| 1212 | +			if ($user_lesson_status) { | |
| 1213 | + $quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); | |
| 1214 | 1214 | } | 
| 1215 | 1215 | |
| 1216 | 1216 | // Quiz passmark | 
| 1217 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); | |
| 1217 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); | |
| 1218 | 1218 | $quiz_passmark_float = (float) $quiz_passmark; | 
| 1219 | 1219 | |
| 1220 | 1220 | // Pass required | 
| 1221 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); | |
| 1221 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); | |
| 1222 | 1222 | |
| 1223 | 1223 | // Quiz questions | 
| 1224 | - $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); | |
| 1224 | + $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); | |
| 1225 | 1225 | |
| 1226 | -			if ( ! $started_course ) { | |
| 1226 | +			if ( ! $started_course) { | |
| 1227 | 1227 | |
| 1228 | 1228 | $status = 'not_started_course'; | 
| 1229 | 1229 | $box_class = 'info'; | 
| 1230 | - $message = sprintf( __( 'Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . esc_attr( __( 'Sign Up', 'woothemes-sensei' ) ) . '">', '</a>' ); | |
| 1230 | +				$message = sprintf(__('Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($course_id)).'" title="'.esc_attr(__('Sign Up', 'woothemes-sensei')).'">', '</a>'); | |
| 1231 | 1231 | |
| 1232 | -			} elseif ( ! is_user_logged_in() ) { | |
| 1232 | +			} elseif ( ! is_user_logged_in()) { | |
| 1233 | 1233 | |
| 1234 | 1234 | $status = 'login_required'; | 
| 1235 | 1235 | $box_class = 'info'; | 
| 1236 | - $message = __( 'You must be logged in to take this quiz', 'woothemes-sensei' ); | |
| 1236 | +				$message = __('You must be logged in to take this quiz', 'woothemes-sensei'); | |
| 1237 | 1237 | |
| 1238 | 1238 | } | 
| 1239 | 1239 | // Lesson/Quiz is marked as complete thus passing any quiz restrictions | 
| 1240 | -			elseif ( $lesson_complete ) { | |
| 1240 | +			elseif ($lesson_complete) { | |
| 1241 | 1241 | |
| 1242 | 1242 | $status = 'passed'; | 
| 1243 | 1243 | $box_class = 'tick'; | 
| 1244 | 1244 | // Lesson status will be "complete" (has no Quiz) | 
| 1245 | -				if ( ! $has_quiz_questions ) { | |
| 1246 | - $message = sprintf( __( 'Congratulations! You have passed this lesson.', 'woothemes-sensei' ) ); | |
| 1245 | +				if ( ! $has_quiz_questions) { | |
| 1246 | +					$message = sprintf(__('Congratulations! You have passed this lesson.', 'woothemes-sensei')); | |
| 1247 | 1247 | } | 
| 1248 | 1248 | // Lesson status will be "graded" (no passmark required so might have failed all the questions) | 
| 1249 | -				elseif ( empty( $quiz_grade ) ) { | |
| 1250 | - $message = sprintf( __( 'Congratulations! You have completed this lesson.', 'woothemes-sensei' ) ); | |
| 1249 | +				elseif (empty($quiz_grade)) { | |
| 1250 | +					$message = sprintf(__('Congratulations! You have completed this lesson.', 'woothemes-sensei')); | |
| 1251 | 1251 | } | 
| 1252 | 1252 | // Lesson status will be "passed" (passmark reached) | 
| 1253 | -				elseif ( ! empty( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) { | |
| 1254 | -					if( $is_lesson ) { | |
| 1255 | - $message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) ); | |
| 1253 | +				elseif ( ! empty($quiz_grade) && abs($quiz_grade) >= 0) { | |
| 1254 | +					if ($is_lesson) { | |
| 1255 | +						$message = sprintf(__('Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade)); | |
| 1256 | 1256 |  					} else { | 
| 1257 | - $message = sprintf( __( 'Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) ); | |
| 1257 | +						$message = sprintf(__('Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade)); | |
| 1258 | 1258 | } | 
| 1259 | 1259 | } | 
| 1260 | 1260 | |
| 1261 | 1261 | // add next lesson button | 
| 1262 | - $nav_id_array = sensei_get_prev_next_lessons( $lesson_id ); | |
| 1263 | - $next_lesson_id = absint( $nav_id_array['next_lesson'] ); | |
| 1262 | + $nav_id_array = sensei_get_prev_next_lessons($lesson_id); | |
| 1263 | + $next_lesson_id = absint($nav_id_array['next_lesson']); | |
| 1264 | 1264 | |
| 1265 | 1265 | // Output HTML | 
| 1266 | -                if ( ( 0 < $next_lesson_id ) ) { | |
| 1267 | - $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) ) | |
| 1268 | - . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei') | |
| 1266 | +                if ((0 < $next_lesson_id)) { | |
| 1267 | + $message .= ' '.'<a class="next-lesson" href="'.esc_url(get_permalink($next_lesson_id)) | |
| 1268 | +                                . '" rel="next"><span class="meta-nav"></span>'.__('Next Lesson', 'woothemes-sensei') | |
| 1269 | 1269 | .'</a>'; | 
| 1270 | 1270 | |
| 1271 | 1271 | } | 
| @@ -1274,51 +1274,51 @@ discard block | ||
| 1274 | 1274 | // Lesson/Quiz not complete | 
| 1275 | 1275 |  			else { | 
| 1276 | 1276 | // Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete) | 
| 1277 | -				if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) { | |
| 1277 | +				if (isset($user_lesson_status->comment_approved) && 'ungraded' == $user_lesson_status->comment_approved) { | |
| 1278 | 1278 | $status = 'complete'; | 
| 1279 | 1279 | $box_class = 'info'; | 
| 1280 | -					if( $is_lesson ) { | |
| 1281 | - $message = sprintf( __( 'You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . esc_attr( get_the_title( $quiz_id ) ) . '">', '</a>' ); | |
| 1280 | +					if ($is_lesson) { | |
| 1281 | +						$message = sprintf(__('You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($quiz_id)).'" title="'.esc_attr(get_the_title($quiz_id)).'">', '</a>'); | |
| 1282 | 1282 |  					} else { | 
| 1283 | - $message = sprintf( __( 'You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); | |
| 1283 | +						$message = sprintf(__('You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); | |
| 1284 | 1284 | } | 
| 1285 | 1285 | } | 
| 1286 | 1286 | // Lesson status must be "failed" | 
| 1287 | -				elseif ( isset( $user_lesson_status->comment_approved ) && 'failed' == $user_lesson_status->comment_approved ) { | |
| 1287 | +				elseif (isset($user_lesson_status->comment_approved) && 'failed' == $user_lesson_status->comment_approved) { | |
| 1288 | 1288 | $status = 'failed'; | 
| 1289 | 1289 | $box_class = 'alert'; | 
| 1290 | -					if( $is_lesson ) { | |
| 1291 | - $message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ), Sensei_Utils::round( $quiz_grade ) ); | |
| 1290 | +					if ($is_lesson) { | |
| 1291 | +						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade)); | |
| 1292 | 1292 |  					} else { | 
| 1293 | - $message = sprintf( __( 'You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ), Sensei_Utils::round( $quiz_grade ) ); | |
| 1293 | +						$message = sprintf(__('You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade)); | |
| 1294 | 1294 | } | 
| 1295 | 1295 | } | 
| 1296 | 1296 | // Lesson/Quiz requires a pass | 
| 1297 | -				elseif( $pass_required ) { | |
| 1297 | +				elseif ($pass_required) { | |
| 1298 | 1298 | $status = 'not_started'; | 
| 1299 | 1299 | $box_class = 'info'; | 
| 1300 | -					if( $is_lesson ) { | |
| 1301 | - $message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); | |
| 1300 | +					if ($is_lesson) { | |
| 1301 | +						$message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); | |
| 1302 | 1302 |  					} else { | 
| 1303 | - $message = sprintf( __( 'You require %1$d%% to pass this quiz.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); | |
| 1303 | +						$message = sprintf(__('You require %1$d%% to pass this quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); | |
| 1304 | 1304 | } | 
| 1305 | 1305 | } | 
| 1306 | 1306 | } | 
| 1307 | 1307 | |
| 1308 | -		}else{ | |
| 1308 | +		} else { | |
| 1309 | 1309 | |
| 1310 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); | |
| 1311 | - $a_element = '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Sign Up', 'woothemes-sensei' ) . '">'; | |
| 1312 | - $a_element .= __( 'course', 'woothemes-sensei' ); | |
| 1310 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); | |
| 1311 | +			$a_element = '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Sign Up', 'woothemes-sensei').'">'; | |
| 1312 | +			$a_element .= __('course', 'woothemes-sensei'); | |
| 1313 | 1313 | $a_element .= '</a>'; | 
| 1314 | 1314 | |
| 1315 | -			if ( Sensei_WC::is_course_purchasable( $course_id ) ){ | |
| 1315 | +			if (Sensei_WC::is_course_purchasable($course_id)) { | |
| 1316 | 1316 | |
| 1317 | - $message = sprintf( __( 'Please purchase the %1$s before taking this quiz.', 'woothemes-sensei' ), $a_element ); | |
| 1317 | +				$message = sprintf(__('Please purchase the %1$s before taking this quiz.', 'woothemes-sensei'), $a_element); | |
| 1318 | 1318 | |
| 1319 | 1319 |  			} else { | 
| 1320 | 1320 | |
| 1321 | - $message = sprintf( __( 'Please sign up for the %1$s before taking this quiz.', 'woothemes-sensei' ), $a_element ); | |
| 1321 | +				$message = sprintf(__('Please sign up for the %1$s before taking this quiz.', 'woothemes-sensei'), $a_element); | |
| 1322 | 1322 | |
| 1323 | 1323 | } | 
| 1324 | 1324 | |
| @@ -1326,15 +1326,15 @@ discard block | ||
| 1326 | 1326 | } | 
| 1327 | 1327 | |
| 1328 | 1328 | // Legacy filter | 
| 1329 | - $message = apply_filters( 'sensei_user_quiz_status_' . $status, $message ); | |
| 1329 | +		$message = apply_filters('sensei_user_quiz_status_'.$status, $message); | |
| 1330 | 1330 | |
| 1331 | -		if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) { | |
| 1332 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 1333 | - $extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' . __( 'View the lesson quiz', 'woothemes-sensei' ) . '</a></p>'; | |
| 1331 | +		if ($is_lesson && ! in_array($status, array('login_required', 'not_started_course'))) { | |
| 1332 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 1333 | +			$extra = '<p><a class="button" href="'.esc_url(get_permalink($quiz_id)).'" title="'.__('View the lesson quiz', 'woothemes-sensei').'">'.__('View the lesson quiz', 'woothemes-sensei').'</a></p>'; | |
| 1334 | 1334 | } | 
| 1335 | 1335 | |
| 1336 | 1336 | // Filter of all messages | 
| 1337 | - return apply_filters( 'sensei_user_quiz_status', array( 'status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra ), $lesson_id, $user_id, $is_lesson ); | |
| 1337 | +		return apply_filters('sensei_user_quiz_status', array('status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra), $lesson_id, $user_id, $is_lesson); | |
| 1338 | 1338 | } | 
| 1339 | 1339 | |
| 1340 | 1340 | /** | 
| @@ -1344,14 +1344,14 @@ discard block | ||
| 1344 | 1344 | * @param integer $course_id Course ID | 
| 1345 | 1345 | * @return mixed boolean or comment_ID | 
| 1346 | 1346 | */ | 
| 1347 | -	public static function user_start_course( $user_id = 0, $course_id = 0 ) { | |
| 1347 | +	public static function user_start_course($user_id = 0, $course_id = 0) { | |
| 1348 | 1348 | |
| 1349 | 1349 | $activity_logged = false; | 
| 1350 | 1350 | |
| 1351 | -		if( $user_id && $course_id ) { | |
| 1351 | +		if ($user_id && $course_id) { | |
| 1352 | 1352 | // Check if user is already on the Course | 
| 1353 | - $activity_logged = Sensei_Utils::user_started_course( $course_id, $user_id ); | |
| 1354 | -			if ( ! $activity_logged ) { | |
| 1353 | + $activity_logged = Sensei_Utils::user_started_course($course_id, $user_id); | |
| 1354 | +			if ( ! $activity_logged) { | |
| 1355 | 1355 | |
| 1356 | 1356 | // Add user to course | 
| 1357 | 1357 | $course_metadata = array( | 
| @@ -1360,11 +1360,11 @@ discard block | ||
| 1360 | 1360 | 'complete' => 0, | 
| 1361 | 1361 | ); | 
| 1362 | 1362 | |
| 1363 | - $activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status = 'in-progress', $course_metadata ); | |
| 1363 | + $activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status = 'in-progress', $course_metadata); | |
| 1364 | 1364 | |
| 1365 | 1365 | // Allow further actions | 
| 1366 | -				if ( $activity_logged ) { | |
| 1367 | - do_action( 'sensei_user_course_start', $user_id, $course_id ); | |
| 1366 | +				if ($activity_logged) { | |
| 1367 | +					do_action('sensei_user_course_start', $user_id, $course_id); | |
| 1368 | 1368 | } | 
| 1369 | 1369 | } | 
| 1370 | 1370 | } | 
| @@ -1380,19 +1380,19 @@ discard block | ||
| 1380 | 1380 | * @param int $user_id | 
| 1381 | 1381 | * @return mixed false or comment_ID | 
| 1382 | 1382 | */ | 
| 1383 | -	public static function user_started_course( $course_id = 0, $user_id = 0 ) { | |
| 1383 | +	public static function user_started_course($course_id = 0, $user_id = 0) { | |
| 1384 | 1384 | |
| 1385 | -		if( $course_id ) { | |
| 1386 | -			if( ! $user_id ) { | |
| 1385 | +		if ($course_id) { | |
| 1386 | +			if ( ! $user_id) { | |
| 1387 | 1387 | $user_id = get_current_user_id(); | 
| 1388 | 1388 | } | 
| 1389 | 1389 | |
| 1390 | -            if( ! $user_id > 0 ){ | |
| 1390 | +            if ( ! $user_id > 0) { | |
| 1391 | 1391 | return false; | 
| 1392 | 1392 | } | 
| 1393 | 1393 | |
| 1394 | - $user_course_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID' ) ); | |
| 1395 | -			if( $user_course_status_id ) { | |
| 1394 | +			$user_course_status_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID')); | |
| 1395 | +			if ($user_course_status_id) { | |
| 1396 | 1396 | return $user_course_status_id; | 
| 1397 | 1397 | } | 
| 1398 | 1398 | } | 
| @@ -1407,17 +1407,17 @@ discard block | ||
| 1407 | 1407 | * @param integer $user_id User ID | 
| 1408 | 1408 | * @return int | 
| 1409 | 1409 | */ | 
| 1410 | -	public static function user_complete_course( $course_id = 0, $user_id = 0 ) { | |
| 1410 | +	public static function user_complete_course($course_id = 0, $user_id = 0) { | |
| 1411 | 1411 | global $wp_version; | 
| 1412 | 1412 | |
| 1413 | -		if( $course_id ) { | |
| 1414 | -			if( ! $user_id ) { | |
| 1413 | +		if ($course_id) { | |
| 1414 | +			if ( ! $user_id) { | |
| 1415 | 1415 | $user_id = get_current_user_id(); | 
| 1416 | 1416 | } | 
| 1417 | 1417 | |
| 1418 | 1418 | $course_status = 'in-progress'; | 
| 1419 | 1419 | $course_metadata = array(); | 
| 1420 | - $course_completion = Sensei()->settings->settings[ 'course_completion' ]; | |
| 1420 | + $course_completion = Sensei()->settings->settings['course_completion']; | |
| 1421 | 1421 | $lessons_completed = $total_lessons = 0; | 
| 1422 | 1422 | $lesson_status_args = array( | 
| 1423 | 1423 | 'user_id' => $user_id, | 
| @@ -1426,8 +1426,8 @@ discard block | ||
| 1426 | 1426 | ); | 
| 1427 | 1427 | |
| 1428 | 1428 | // Grab all of this Courses' lessons, looping through each... | 
| 1429 | - $lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' ); | |
| 1430 | - $total_lessons = count( $lesson_ids ); | |
| 1429 | + $lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids'); | |
| 1430 | + $total_lessons = count($lesson_ids); | |
| 1431 | 1431 | // ...if course completion not set to 'passed', and all lessons are complete or graded, | 
| 1432 | 1432 | // ......then all lessons are 'passed' | 
| 1433 | 1433 | // ...else if course completion is set to 'passed', check if each lesson has questions... | 
| @@ -1440,29 +1440,29 @@ discard block | ||
| 1440 | 1440 | // The below checks if a lesson is fully completed, though maybe should be Utils::user_completed_lesson() | 
| 1441 | 1441 | $all_lesson_statuses = array(); | 
| 1442 | 1442 | // In WordPress 4.1 get_comments() allows a single query to cover multiple comment_post_IDs | 
| 1443 | -			if ( version_compare($wp_version, '4.1', '>=') ) { | |
| 1443 | +			if (version_compare($wp_version, '4.1', '>=')) { | |
| 1444 | 1444 | $lesson_status_args['post__in'] = $lesson_ids; | 
| 1445 | - $all_lesson_statuses = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true ); | |
| 1445 | + $all_lesson_statuses = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true); | |
| 1446 | 1446 | // Need to always return an array, even with only 1 item | 
| 1447 | -				if ( !is_array($all_lesson_statuses) ) { | |
| 1448 | - $all_lesson_statuses = array( $all_lesson_statuses ); | |
| 1447 | +				if ( ! is_array($all_lesson_statuses)) { | |
| 1448 | + $all_lesson_statuses = array($all_lesson_statuses); | |
| 1449 | 1449 | } | 
| 1450 | 1450 | } | 
| 1451 | 1451 | // ...otherwise check each one | 
| 1452 | 1452 |  			else { | 
| 1453 | -				foreach( $lesson_ids as $lesson_id ) { | |
| 1453 | +				foreach ($lesson_ids as $lesson_id) { | |
| 1454 | 1454 | $lesson_status_args['post_id'] = $lesson_id; | 
| 1455 | - $each_lesson_status = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true ); | |
| 1455 | + $each_lesson_status = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true); | |
| 1456 | 1456 | // Check for valid return before using | 
| 1457 | -					if ( !empty($each_lesson_status->comment_approved) ) { | |
| 1457 | +					if ( ! empty($each_lesson_status->comment_approved)) { | |
| 1458 | 1458 | $all_lesson_statuses[] = $each_lesson_status; | 
| 1459 | 1459 | } | 
| 1460 | 1460 | } | 
| 1461 | 1461 | } | 
| 1462 | -			foreach( $all_lesson_statuses as $lesson_status ) { | |
| 1462 | +			foreach ($all_lesson_statuses as $lesson_status) { | |
| 1463 | 1463 | // If lessons are complete without needing quizzes to be passed | 
| 1464 | -				if ( 'passed' != $course_completion ) { | |
| 1465 | -					switch ( $lesson_status->comment_approved ) { | |
| 1464 | +				if ('passed' != $course_completion) { | |
| 1465 | +					switch ($lesson_status->comment_approved) { | |
| 1466 | 1466 | // A user cannot 'complete' a course if a lesson... | 
| 1467 | 1467 | case 'in-progress': // ...is still in progress | 
| 1468 | 1468 | case 'ungraded': // ...hasn't yet been graded | 
| @@ -1474,7 +1474,7 @@ discard block | ||
| 1474 | 1474 | } | 
| 1475 | 1475 | } | 
| 1476 | 1476 |  				else { | 
| 1477 | -					switch ( $lesson_status->comment_approved ) { | |
| 1477 | +					switch ($lesson_status->comment_approved) { | |
| 1478 | 1478 | case 'complete': // Lesson has no quiz/questions | 
| 1479 | 1479 | case 'graded': // Lesson has quiz, but it's not important what the grade was | 
| 1480 | 1480 | case 'passed': // Lesson has quiz and the user passed | 
| @@ -1488,20 +1488,20 @@ discard block | ||
| 1488 | 1488 | } | 
| 1489 | 1489 | } | 
| 1490 | 1490 | } // Each lesson | 
| 1491 | -			if ( $lessons_completed == $total_lessons ) { | |
| 1491 | +			if ($lessons_completed == $total_lessons) { | |
| 1492 | 1492 | $course_status = 'complete'; | 
| 1493 | 1493 | } | 
| 1494 | 1494 | |
| 1495 | 1495 | // Update meta data on how many lessons have been completed | 
| 1496 | 1496 | $course_metadata['complete'] = $lessons_completed; | 
| 1497 | 1497 | // update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above | 
| 1498 | - $course_metadata['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) ); | |
| 1498 | + $course_metadata['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0)); | |
| 1499 | 1499 | |
| 1500 | - $activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status, $course_metadata ); | |
| 1500 | + $activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status, $course_metadata); | |
| 1501 | 1501 | |
| 1502 | 1502 | // Allow further actions | 
| 1503 | -			if ( 'complete' == $course_status ) { | |
| 1504 | - do_action( 'sensei_user_course_end', $user_id, $course_id ); | |
| 1503 | +			if ('complete' == $course_status) { | |
| 1504 | +				do_action('sensei_user_course_end', $user_id, $course_id); | |
| 1505 | 1505 | } | 
| 1506 | 1506 | return $activity_logged; | 
| 1507 | 1507 | } | 
| @@ -1517,40 +1517,40 @@ discard block | ||
| 1517 | 1517 | * @param int $user_id | 
| 1518 | 1518 | * @return boolean | 
| 1519 | 1519 | */ | 
| 1520 | -	public static function user_completed_course( $course , $user_id = 0 ) { | |
| 1520 | +	public static function user_completed_course($course, $user_id = 0) { | |
| 1521 | 1521 | |
| 1522 | -		if( $course ) { | |
| 1523 | -			if ( is_object( $course ) && is_a( $course,'WP_Comment') ) { | |
| 1522 | +		if ($course) { | |
| 1523 | +			if (is_object($course) && is_a($course, 'WP_Comment')) { | |
| 1524 | 1524 | $user_course_status = $course->comment_approved; | 
| 1525 | 1525 | } | 
| 1526 | -			elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) { | |
| 1526 | +			elseif ( ! is_numeric($course) && ! is_a($course, 'WP_Post')) { | |
| 1527 | 1527 | $user_course_status = $course; | 
| 1528 | 1528 | } | 
| 1529 | 1529 |  			else { | 
| 1530 | 1530 | |
| 1531 | 1531 | // check the user_id | 
| 1532 | -				if( ! $user_id ) { | |
| 1532 | +				if ( ! $user_id) { | |
| 1533 | 1533 | |
| 1534 | 1534 | $user_id = get_current_user_id(); | 
| 1535 | 1535 | |
| 1536 | -					if( empty( $user_id ) ){ | |
| 1536 | +					if (empty($user_id)) { | |
| 1537 | 1537 | |
| 1538 | 1538 | return false; | 
| 1539 | 1539 | |
| 1540 | 1540 | } | 
| 1541 | 1541 | } | 
| 1542 | 1542 | |
| 1543 | -                if( is_a( $course, 'WP_Post' ) ){ | |
| 1544 | - $course = $course->ID; | |
| 1543 | +                if (is_a($course, 'WP_Post')) { | |
| 1544 | + $course = $course->ID; | |
| 1545 | 1545 | } | 
| 1546 | 1546 | |
| 1547 | - $user_course_status = Sensei_Utils::user_course_status( $course , $user_id ); | |
| 1548 | -				if( isset( $user_course_status->comment_approved ) ){ | |
| 1547 | + $user_course_status = Sensei_Utils::user_course_status($course, $user_id); | |
| 1548 | +				if (isset($user_course_status->comment_approved)) { | |
| 1549 | 1549 | $user_course_status = $user_course_status->comment_approved; | 
| 1550 | 1550 | } | 
| 1551 | 1551 | |
| 1552 | 1552 | } | 
| 1553 | -			if( $user_course_status && 'complete' == $user_course_status ) { | |
| 1553 | +			if ($user_course_status && 'complete' == $user_course_status) { | |
| 1554 | 1554 | return true; | 
| 1555 | 1555 | } | 
| 1556 | 1556 | } | 
| @@ -1565,10 +1565,10 @@ discard block | ||
| 1565 | 1565 | * @param int $user_id | 
| 1566 | 1566 | * @return mixed false or comment_ID | 
| 1567 | 1567 | */ | 
| 1568 | -	public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) { | |
| 1568 | +	public static function user_started_lesson($lesson_id = 0, $user_id = 0) { | |
| 1569 | 1569 | |
| 1570 | -		if( $lesson_id ) { | |
| 1571 | -			if( ! $user_id ) { | |
| 1570 | +		if ($lesson_id) { | |
| 1571 | +			if ( ! $user_id) { | |
| 1572 | 1572 | $user_id = get_current_user_id(); | 
| 1573 | 1573 | } | 
| 1574 | 1574 | |
| @@ -1578,8 +1578,8 @@ discard block | ||
| 1578 | 1578 | 'type' => 'sensei_lesson_status', | 
| 1579 | 1579 | 'field' => 'comment_ID' ); | 
| 1580 | 1580 | |
| 1581 | - $user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args ); | |
| 1582 | -			if( $user_lesson_status_id ) { | |
| 1581 | + $user_lesson_status_id = Sensei_Utils::sensei_get_activity_value($activity_args); | |
| 1582 | +			if ($user_lesson_status_id) { | |
| 1583 | 1583 | return $user_lesson_status_id; | 
| 1584 | 1584 | } | 
| 1585 | 1585 | } | 
| @@ -1594,29 +1594,29 @@ discard block | ||
| 1594 | 1594 | * @param int $user_id | 
| 1595 | 1595 | * @return boolean | 
| 1596 | 1596 | */ | 
| 1597 | -	public static function user_completed_lesson( $lesson = 0, $user_id = 0 ) { | |
| 1597 | +	public static function user_completed_lesson($lesson = 0, $user_id = 0) { | |
| 1598 | 1598 | |
| 1599 | -		if( $lesson ) { | |
| 1599 | +		if ($lesson) { | |
| 1600 | 1600 | $lesson_id = 0; | 
| 1601 | -			if ( is_object( $lesson ) ) { | |
| 1601 | +			if (is_object($lesson)) { | |
| 1602 | 1602 | $user_lesson_status = $lesson->comment_approved; | 
| 1603 | 1603 | $lesson_id = $lesson->comment_post_ID; | 
| 1604 | 1604 | } | 
| 1605 | -			elseif ( ! is_numeric( $lesson ) ) { | |
| 1605 | +			elseif ( ! is_numeric($lesson)) { | |
| 1606 | 1606 | $user_lesson_status = $lesson; | 
| 1607 | 1607 | } | 
| 1608 | 1608 |  			else { | 
| 1609 | -				if( ! $user_id ) { | |
| 1609 | +				if ( ! $user_id) { | |
| 1610 | 1610 | $user_id = get_current_user_id(); | 
| 1611 | 1611 | } | 
| 1612 | 1612 | |
| 1613 | 1613 | // the user is not logged in | 
| 1614 | -                if( ! $user_id > 0 ){ | |
| 1614 | +                if ( ! $user_id > 0) { | |
| 1615 | 1615 | return false; | 
| 1616 | 1616 | } | 
| 1617 | - $_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id ); | |
| 1617 | + $_user_lesson_status = Sensei_Utils::user_lesson_status($lesson, $user_id); | |
| 1618 | 1618 | |
| 1619 | -				if ( $_user_lesson_status ) { | |
| 1619 | +				if ($_user_lesson_status) { | |
| 1620 | 1620 | $user_lesson_status = $_user_lesson_status->comment_approved; | 
| 1621 | 1621 | } | 
| 1622 | 1622 |  				else { | 
| @@ -1624,12 +1624,12 @@ discard block | ||
| 1624 | 1624 | } | 
| 1625 | 1625 | $lesson_id = $lesson; | 
| 1626 | 1626 | } | 
| 1627 | -			if ( 'in-progress' != $user_lesson_status ) { | |
| 1627 | +			if ('in-progress' != $user_lesson_status) { | |
| 1628 | 1628 | // Check for Passed or Completed Setting | 
| 1629 | 1629 | // Should we be checking for the Course completion setting? Surely that should only affect the Course completion, not bypass each Lesson setting | 
| 1630 | 1630 | // $course_completion = Sensei()->settings->settings[ 'course_completion' ]; | 
| 1631 | 1631 |  //				if ( 'passed' == $course_completion ) { | 
| 1632 | -					switch( $user_lesson_status ) { | |
| 1632 | +					switch ($user_lesson_status) { | |
| 1633 | 1633 | case 'complete': | 
| 1634 | 1634 | case 'graded': | 
| 1635 | 1635 | case 'passed': | 
| @@ -1638,13 +1638,13 @@ discard block | ||
| 1638 | 1638 | |
| 1639 | 1639 | case 'failed': | 
| 1640 | 1640 | // This may be 'completed' depending on... | 
| 1641 | -							if ( $lesson_id ) { | |
| 1641 | +							if ($lesson_id) { | |
| 1642 | 1642 | // Get Quiz ID, this won't be needed once all Quiz meta fields are stored on the Lesson | 
| 1643 | - $lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); | |
| 1644 | -								if ( $lesson_quiz_id ) { | |
| 1643 | + $lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); | |
| 1644 | +								if ($lesson_quiz_id) { | |
| 1645 | 1645 | // ...the quiz pass setting | 
| 1646 | - $pass_required = get_post_meta( $lesson_quiz_id, '_pass_required', true ); | |
| 1647 | -									if ( empty($pass_required) ) { | |
| 1646 | + $pass_required = get_post_meta($lesson_quiz_id, '_pass_required', true); | |
| 1647 | +									if (empty($pass_required)) { | |
| 1648 | 1648 | // We just require the user to have done the quiz, not to have passed | 
| 1649 | 1649 | return true; | 
| 1650 | 1650 | } | 
| @@ -1667,15 +1667,15 @@ discard block | ||
| 1667 | 1667 | * @param int $user_id | 
| 1668 | 1668 | * @return object | 
| 1669 | 1669 | */ | 
| 1670 | -	public static function user_course_status( $course_id = 0, $user_id = 0 ) { | |
| 1670 | +	public static function user_course_status($course_id = 0, $user_id = 0) { | |
| 1671 | 1671 | |
| 1672 | 1672 | |
| 1673 | -		if( $course_id ) { | |
| 1674 | -			if( ! $user_id ) { | |
| 1673 | +		if ($course_id) { | |
| 1674 | +			if ( ! $user_id) { | |
| 1675 | 1675 | $user_id = get_current_user_id(); | 
| 1676 | 1676 | } | 
| 1677 | 1677 | |
| 1678 | - $user_course_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status' ), true ); | |
| 1678 | +			$user_course_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status'), true); | |
| 1679 | 1679 | return $user_course_status; | 
| 1680 | 1680 | } | 
| 1681 | 1681 | |
| @@ -1690,27 +1690,27 @@ discard block | ||
| 1690 | 1690 | * @param int $user_id | 
| 1691 | 1691 | * @return object | bool | 
| 1692 | 1692 | */ | 
| 1693 | -	public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) { | |
| 1693 | +	public static function user_lesson_status($lesson_id = 0, $user_id = 0) { | |
| 1694 | 1694 | |
| 1695 | -        if( ! $user_id ) { | |
| 1695 | +        if ( ! $user_id) { | |
| 1696 | 1696 | $user_id = get_current_user_id(); | 
| 1697 | 1697 | } | 
| 1698 | 1698 | |
| 1699 | -		if( $lesson_id > 0 && $user_id > 0 ) { | |
| 1699 | +		if ($lesson_id > 0 && $user_id > 0) { | |
| 1700 | 1700 | |
| 1701 | - $user_lesson_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status' ), true ); | |
| 1701 | +			$user_lesson_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status'), true); | |
| 1702 | 1702 | return $user_lesson_status; | 
| 1703 | 1703 | } | 
| 1704 | 1704 | |
| 1705 | 1705 | return false; | 
| 1706 | 1706 | } | 
| 1707 | 1707 | |
| 1708 | -	public static function is_preview_lesson( $lesson_id ) { | |
| 1708 | +	public static function is_preview_lesson($lesson_id) { | |
| 1709 | 1709 | $is_preview = false; | 
| 1710 | 1710 | |
| 1711 | -		if( 'lesson' == get_post_type( $lesson_id ) ) { | |
| 1712 | - $lesson_preview = get_post_meta( $lesson_id, '_lesson_preview', true ); | |
| 1713 | -			if ( isset( $lesson_preview ) && '' != $lesson_preview ) { | |
| 1711 | +		if ('lesson' == get_post_type($lesson_id)) { | |
| 1712 | + $lesson_preview = get_post_meta($lesson_id, '_lesson_preview', true); | |
| 1713 | +			if (isset($lesson_preview) && '' != $lesson_preview) { | |
| 1714 | 1714 | $is_preview = true; | 
| 1715 | 1715 | } | 
| 1716 | 1716 | } | 
| @@ -1718,22 +1718,22 @@ discard block | ||
| 1718 | 1718 | return $is_preview; | 
| 1719 | 1719 | } | 
| 1720 | 1720 | |
| 1721 | -	public static function user_passed_quiz( $quiz_id = 0, $user_id = 0 ) { | |
| 1721 | +	public static function user_passed_quiz($quiz_id = 0, $user_id = 0) { | |
| 1722 | 1722 | |
| 1723 | - if( ! $quiz_id ) return false; | |
| 1723 | + if ( ! $quiz_id) return false; | |
| 1724 | 1724 | |
| 1725 | -		if( ! $user_id ) { | |
| 1725 | +		if ( ! $user_id) { | |
| 1726 | 1726 | $user_id = get_current_user_id(); | 
| 1727 | 1727 | } | 
| 1728 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); | |
| 1728 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); | |
| 1729 | 1729 | |
| 1730 | 1730 | // Quiz Grade | 
| 1731 | - $lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); | |
| 1732 | - $quiz_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true ); | |
| 1731 | + $lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); | |
| 1732 | + $quiz_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); | |
| 1733 | 1733 | |
| 1734 | 1734 | // Check if Grade is greater than or equal to pass percentage | 
| 1735 | - $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) ); | |
| 1736 | -		if ( $quiz_passmark <= intval( $quiz_grade ) ) { | |
| 1735 | + $quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2)); | |
| 1736 | +		if ($quiz_passmark <= intval($quiz_grade)) { | |
| 1737 | 1737 | return true; | 
| 1738 | 1738 | } | 
| 1739 | 1739 | |
| @@ -1753,9 +1753,9 @@ discard block | ||
| 1753 | 1753 | * | 
| 1754 | 1754 | * @return mixed false or comment_ID | 
| 1755 | 1755 | */ | 
| 1756 | -	public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) { | |
| 1756 | +	public static function update_lesson_status($user_id, $lesson_id, $status = 'in-progress', $metadata = array()) { | |
| 1757 | 1757 | $comment_id = false; | 
| 1758 | -		if ( !empty($status) ) { | |
| 1758 | +		if ( ! empty($status)) { | |
| 1759 | 1759 | $args = array( | 
| 1760 | 1760 | 'user_id' => $user_id, | 
| 1761 | 1761 | 'post_id' => $lesson_id, | 
| @@ -1764,18 +1764,18 @@ discard block | ||
| 1764 | 1764 | 'action' => 'update', // Update the existing status... | 
| 1765 | 1765 | 'keep_time' => true, // ...but don't change the existing timestamp | 
| 1766 | 1766 | ); | 
| 1767 | -			if( 'in-progress' == $status ) { | |
| 1768 | - unset( $args['keep_time'] ); // Keep updating what's happened | |
| 1767 | +			if ('in-progress' == $status) { | |
| 1768 | + unset($args['keep_time']); // Keep updating what's happened | |
| 1769 | 1769 | } | 
| 1770 | 1770 | |
| 1771 | - $comment_id = Sensei_Utils::sensei_log_activity( $args ); | |
| 1772 | -			if ( $comment_id && !empty($metadata) ) { | |
| 1773 | -				foreach( $metadata as $key => $value ) { | |
| 1774 | - update_comment_meta( $comment_id, $key, $value ); | |
| 1771 | + $comment_id = Sensei_Utils::sensei_log_activity($args); | |
| 1772 | +			if ($comment_id && ! empty($metadata)) { | |
| 1773 | +				foreach ($metadata as $key => $value) { | |
| 1774 | + update_comment_meta($comment_id, $key, $value); | |
| 1775 | 1775 | } | 
| 1776 | 1776 | } | 
| 1777 | 1777 | |
| 1778 | - do_action( 'sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id ); | |
| 1778 | +			do_action('sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id); | |
| 1779 | 1779 | } | 
| 1780 | 1780 | return $comment_id; | 
| 1781 | 1781 | } | 
| @@ -1791,9 +1791,9 @@ discard block | ||
| 1791 | 1791 | * @param array $metadata | 
| 1792 | 1792 | * @return mixed false or comment_ID | 
| 1793 | 1793 | */ | 
| 1794 | -	public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) { | |
| 1794 | +	public static function update_course_status($user_id, $course_id, $status = 'in-progress', $metadata = array()) { | |
| 1795 | 1795 | $comment_id = false; | 
| 1796 | -		if ( !empty($status) ) { | |
| 1796 | +		if ( ! empty($status)) { | |
| 1797 | 1797 | $args = array( | 
| 1798 | 1798 | 'user_id' => $user_id, | 
| 1799 | 1799 | 'post_id' => $course_id, | 
| @@ -1802,17 +1802,17 @@ discard block | ||
| 1802 | 1802 | 'action' => 'update', // Update the existing status... | 
| 1803 | 1803 | 'keep_time' => true, // ...but don't change the existing timestamp | 
| 1804 | 1804 | ); | 
| 1805 | -			if( 'in-progress' == $status ) { | |
| 1806 | - unset( $args['keep_time'] ); // Keep updating what's happened | |
| 1805 | +			if ('in-progress' == $status) { | |
| 1806 | + unset($args['keep_time']); // Keep updating what's happened | |
| 1807 | 1807 | } | 
| 1808 | 1808 | |
| 1809 | - $comment_id = Sensei_Utils::sensei_log_activity( $args ); | |
| 1810 | -			if ( $comment_id && !empty($metadata) ) { | |
| 1811 | -				foreach( $metadata as $key => $value ) { | |
| 1812 | - update_comment_meta( $comment_id, $key, $value ); | |
| 1809 | + $comment_id = Sensei_Utils::sensei_log_activity($args); | |
| 1810 | +			if ($comment_id && ! empty($metadata)) { | |
| 1811 | +				foreach ($metadata as $key => $value) { | |
| 1812 | + update_comment_meta($comment_id, $key, $value); | |
| 1813 | 1813 | } | 
| 1814 | 1814 | } | 
| 1815 | - do_action( 'sensei_course_status_updated', $status, $user_id, $course_id, $comment_id ); | |
| 1815 | +			do_action('sensei_course_status_updated', $status, $user_id, $course_id, $comment_id); | |
| 1816 | 1816 | } | 
| 1817 | 1817 | return $comment_id; | 
| 1818 | 1818 | } | 
| @@ -1824,9 +1824,9 @@ discard block | ||
| 1824 | 1824 | * @param array $pieces (default: array()) | 
| 1825 | 1825 | * @return array | 
| 1826 | 1826 | */ | 
| 1827 | -	public static function single_comment_filter( $pieces ) { | |
| 1828 | - unset( $pieces['orderby'] ); | |
| 1829 | - unset( $pieces['order'] ); | |
| 1827 | +	public static function single_comment_filter($pieces) { | |
| 1828 | + unset($pieces['orderby']); | |
| 1829 | + unset($pieces['order']); | |
| 1830 | 1830 | |
| 1831 | 1831 | return $pieces; | 
| 1832 | 1832 | } | 
| @@ -1838,9 +1838,9 @@ discard block | ||
| 1838 | 1838 | * @param array $pieces (default: array()) | 
| 1839 | 1839 | * @return array | 
| 1840 | 1840 | */ | 
| 1841 | -	public static function comment_any_status_filter( $pieces ) { | |
| 1841 | +	public static function comment_any_status_filter($pieces) { | |
| 1842 | 1842 | |
| 1843 | - $pieces['where'] = str_replace( array( "( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND" ), '', $pieces['where'] ); | |
| 1843 | +		$pieces['where'] = str_replace(array("( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND"), '', $pieces['where']); | |
| 1844 | 1844 | |
| 1845 | 1845 | return $pieces; | 
| 1846 | 1846 | } | 
| @@ -1852,12 +1852,12 @@ discard block | ||
| 1852 | 1852 | * @param array $pieces (default: array()) | 
| 1853 | 1853 | * @return array | 
| 1854 | 1854 | */ | 
| 1855 | -	public static function comment_multiple_status_filter( $pieces ) { | |
| 1855 | +	public static function comment_multiple_status_filter($pieces) { | |
| 1856 | 1856 | |
| 1857 | - preg_match( "/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder ); | |
| 1858 | -		if ( !empty($placeholder[1]) ) { | |
| 1859 | - $statuses = explode( ',', $placeholder[1] ); | |
| 1860 | -			$pieces['where'] = str_replace( "comment_approved = '" . $placeholder[1] . "'", "comment_approved IN ('". implode( "', '", $statuses ) . "')", $pieces['where'] ); | |
| 1857 | +		preg_match("/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder); | |
| 1858 | +		if ( ! empty($placeholder[1])) { | |
| 1859 | +			$statuses = explode(',', $placeholder[1]); | |
| 1860 | +			$pieces['where'] = str_replace("comment_approved = '".$placeholder[1]."'", "comment_approved IN ('".implode("', '", $statuses)."')", $pieces['where']); | |
| 1861 | 1861 | } | 
| 1862 | 1862 | |
| 1863 | 1863 | return $pieces; | 
| @@ -1869,12 +1869,12 @@ discard block | ||
| 1869 | 1869 | * @param array $pieces | 
| 1870 | 1870 | * @return array $pieces | 
| 1871 | 1871 | */ | 
| 1872 | -	public static function comment_total_sum_meta_value_filter( $pieces ) { | |
| 1872 | +	public static function comment_total_sum_meta_value_filter($pieces) { | |
| 1873 | 1873 | global $wpdb, $wp_version; | 
| 1874 | 1874 | |
| 1875 | 1875 | $pieces['fields'] = " COUNT(*) AS total, SUM($wpdb->commentmeta.meta_value) AS meta_sum "; | 
| 1876 | - unset( $pieces['groupby'] ); | |
| 1877 | -		if ( version_compare($wp_version, '4.1', '>=') ) { | |
| 1876 | + unset($pieces['groupby']); | |
| 1877 | +		if (version_compare($wp_version, '4.1', '>=')) { | |
| 1878 | 1878 | $args['order'] = false; | 
| 1879 | 1879 | $args['orderby'] = false; | 
| 1880 | 1880 | } | 
| @@ -1889,12 +1889,12 @@ discard block | ||
| 1889 | 1889 | * @param array $pieces (default: array()) | 
| 1890 | 1890 | * @return array | 
| 1891 | 1891 | */ | 
| 1892 | -	public static function get_posts_count_only_filter( $pieces ) { | |
| 1892 | +	public static function get_posts_count_only_filter($pieces) { | |
| 1893 | 1893 | global $wp_version; | 
| 1894 | 1894 | |
| 1895 | 1895 | $pieces['fields'] = " COUNT(*) AS total "; | 
| 1896 | - unset( $pieces['groupby'] ); | |
| 1897 | -		if ( version_compare($wp_version, '4.1', '>=') ) { | |
| 1896 | + unset($pieces['groupby']); | |
| 1897 | +		if (version_compare($wp_version, '4.1', '>=')) { | |
| 1898 | 1898 | $args['order'] = false; | 
| 1899 | 1899 | $args['orderby'] = false; | 
| 1900 | 1900 | } | 
| @@ -1913,9 +1913,9 @@ discard block | ||
| 1913 | 1913 | * | 
| 1914 | 1914 | * @return bool $success | 
| 1915 | 1915 | */ | 
| 1916 | -    public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0  ){ | |
| 1916 | +    public static function add_user_data($data_key, $post_id, $value = '', $user_id = 0) { | |
| 1917 | 1917 | |
| 1918 | - return self::update_user_data( $data_key, $post_id, $value , $user_id ); | |
| 1918 | + return self::update_user_data($data_key, $post_id, $value, $user_id); | |
| 1919 | 1919 | |
| 1920 | 1920 | }// end add_user_data | 
| 1921 | 1921 | |
| @@ -1934,18 +1934,18 @@ discard block | ||
| 1934 | 1934 | * | 
| 1935 | 1935 | * @return bool $success | 
| 1936 | 1936 | */ | 
| 1937 | -    public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0  ){ | |
| 1937 | +    public static function update_user_data($data_key, $post_id, $value = '', $user_id = 0) { | |
| 1938 | 1938 | |
| 1939 | -        if( ! ( $user_id > 0 ) ){ | |
| 1939 | +        if ( ! ($user_id > 0)) { | |
| 1940 | 1940 | $user_id = get_current_user_id(); | 
| 1941 | 1941 | } | 
| 1942 | 1942 | |
| 1943 | - $supported_post_types = array( 'course', 'lesson' ); | |
| 1944 | - $post_type = get_post_type( $post_id ); | |
| 1945 | - if( empty( $post_id ) || empty( $data_key ) | |
| 1946 | - || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) | |
| 1947 | - || !get_userdata( $user_id ) | |
| 1948 | -            || ! in_array( $post_type, $supported_post_types )  ){ | |
| 1943 | +        $supported_post_types = array('course', 'lesson'); | |
| 1944 | + $post_type = get_post_type($post_id); | |
| 1945 | + if (empty($post_id) || empty($data_key) | |
| 1946 | + || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) | |
| 1947 | + || ! get_userdata($user_id) | |
| 1948 | +            || ! in_array($post_type, $supported_post_types)) { | |
| 1949 | 1949 | |
| 1950 | 1950 | return false; | 
| 1951 | 1951 | } | 
| @@ -1953,20 +1953,20 @@ discard block | ||
| 1953 | 1953 | // check if there and existing Sensei status on this post type if not create it | 
| 1954 | 1954 | // and get the activity ID | 
| 1955 | 1955 | $status_function = 'user_'.$post_type.'_status'; | 
| 1956 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); | |
| 1957 | -        if( ! isset( $sensei_user_status->comment_ID ) ){ | |
| 1956 | + $sensei_user_status = self::$status_function($post_id, $user_id); | |
| 1957 | +        if ( ! isset($sensei_user_status->comment_ID)) { | |
| 1958 | 1958 | |
| 1959 | 1959 | $start_function = 'user_start_'.$post_type; | 
| 1960 | - $sensei_user_activity_id = self::$start_function( $user_id, $post_id ); | |
| 1960 | + $sensei_user_activity_id = self::$start_function($user_id, $post_id); | |
| 1961 | 1961 | |
| 1962 | -        }else{ | |
| 1962 | +        } else { | |
| 1963 | 1963 | |
| 1964 | 1964 | $sensei_user_activity_id = $sensei_user_status->comment_ID; | 
| 1965 | 1965 | |
| 1966 | 1966 | } | 
| 1967 | 1967 | |
| 1968 | 1968 | // store the data | 
| 1969 | - $success = update_comment_meta( $sensei_user_activity_id, $data_key, $value ); | |
| 1969 | + $success = update_comment_meta($sensei_user_activity_id, $data_key, $value); | |
| 1970 | 1970 | |
| 1971 | 1971 | return $success; | 
| 1972 | 1972 | |
| @@ -1985,20 +1985,20 @@ discard block | ||
| 1985 | 1985 | * | 
| 1986 | 1986 | * @return mixed $user_data_value | 
| 1987 | 1987 | */ | 
| 1988 | -    public static function get_user_data( $data_key, $post_id, $user_id = 0  ){ | |
| 1988 | +    public static function get_user_data($data_key, $post_id, $user_id = 0) { | |
| 1989 | 1989 | |
| 1990 | 1990 | $user_data_value = true; | 
| 1991 | 1991 | |
| 1992 | -        if( ! ( $user_id > 0 ) ){ | |
| 1992 | +        if ( ! ($user_id > 0)) { | |
| 1993 | 1993 | $user_id = get_current_user_id(); | 
| 1994 | 1994 | } | 
| 1995 | 1995 | |
| 1996 | - $supported_post_types = array( 'course', 'lesson' ); | |
| 1997 | - $post_type = get_post_type( $post_id ); | |
| 1998 | - if( empty( $post_id ) || empty( $data_key ) | |
| 1999 | - || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) | |
| 2000 | - || ! get_userdata( $user_id ) | |
| 2001 | -            || !in_array( $post_type, $supported_post_types )  ){ | |
| 1996 | +        $supported_post_types = array('course', 'lesson'); | |
| 1997 | + $post_type = get_post_type($post_id); | |
| 1998 | + if (empty($post_id) || empty($data_key) | |
| 1999 | + || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) | |
| 2000 | + || ! get_userdata($user_id) | |
| 2001 | +            || ! in_array($post_type, $supported_post_types)) { | |
| 2002 | 2002 | |
| 2003 | 2003 | return false; | 
| 2004 | 2004 | } | 
| @@ -2006,13 +2006,13 @@ discard block | ||
| 2006 | 2006 | // check if there and existing Sensei status on this post type if not create it | 
| 2007 | 2007 | // and get the activity ID | 
| 2008 | 2008 | $status_function = 'user_'.$post_type.'_status'; | 
| 2009 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); | |
| 2010 | -        if( ! isset( $sensei_user_status->comment_ID ) ){ | |
| 2009 | + $sensei_user_status = self::$status_function($post_id, $user_id); | |
| 2010 | +        if ( ! isset($sensei_user_status->comment_ID)) { | |
| 2011 | 2011 | return false; | 
| 2012 | 2012 | } | 
| 2013 | 2013 | |
| 2014 | 2014 | $sensei_user_activity_id = $sensei_user_status->comment_ID; | 
| 2015 | - $user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true ); | |
| 2015 | + $user_data_value = get_comment_meta($sensei_user_activity_id, $data_key, true); | |
| 2016 | 2016 | |
| 2017 | 2017 | return $user_data_value; | 
| 2018 | 2018 | |
| @@ -2027,19 +2027,19 @@ discard block | ||
| 2027 | 2027 | * | 
| 2028 | 2028 | * @return bool $deleted | 
| 2029 | 2029 | */ | 
| 2030 | -    public static function delete_user_data( $data_key, $post_id , $user_id ){ | |
| 2030 | +    public static function delete_user_data($data_key, $post_id, $user_id) { | |
| 2031 | 2031 | $deleted = true; | 
| 2032 | 2032 | |
| 2033 | -        if( ! ( $user_id > 0 ) ){ | |
| 2033 | +        if ( ! ($user_id > 0)) { | |
| 2034 | 2034 | $user_id = get_current_user_id(); | 
| 2035 | 2035 | } | 
| 2036 | 2036 | |
| 2037 | - $supported_post_types = array( 'course', 'lesson' ); | |
| 2038 | - $post_type = get_post_type( $post_id ); | |
| 2039 | - if( empty( $post_id ) || empty( $data_key ) | |
| 2040 | - || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) | |
| 2041 | - || ! get_userdata( $user_id ) | |
| 2042 | -            || !in_array( $post_type, $supported_post_types )  ){ | |
| 2037 | +        $supported_post_types = array('course', 'lesson'); | |
| 2038 | + $post_type = get_post_type($post_id); | |
| 2039 | + if (empty($post_id) || empty($data_key) | |
| 2040 | + || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) | |
| 2041 | + || ! get_userdata($user_id) | |
| 2042 | +            || ! in_array($post_type, $supported_post_types)) { | |
| 2043 | 2043 | |
| 2044 | 2044 | return false; | 
| 2045 | 2045 | } | 
| @@ -2047,13 +2047,13 @@ discard block | ||
| 2047 | 2047 | // check if there and existing Sensei status on this post type if not create it | 
| 2048 | 2048 | // and get the activity ID | 
| 2049 | 2049 | $status_function = 'user_'.$post_type.'_status'; | 
| 2050 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); | |
| 2051 | -        if( ! isset( $sensei_user_status->comment_ID ) ){ | |
| 2050 | + $sensei_user_status = self::$status_function($post_id, $user_id); | |
| 2051 | +        if ( ! isset($sensei_user_status->comment_ID)) { | |
| 2052 | 2052 | return false; | 
| 2053 | 2053 | } | 
| 2054 | 2054 | |
| 2055 | 2055 | $sensei_user_activity_id = $sensei_user_status->comment_ID; | 
| 2056 | - $deleted = delete_comment_meta( $sensei_user_activity_id , $data_key ); | |
| 2056 | + $deleted = delete_comment_meta($sensei_user_activity_id, $data_key); | |
| 2057 | 2057 | |
| 2058 | 2058 | return $deleted; | 
| 2059 | 2059 | |
| @@ -2078,62 +2078,62 @@ discard block | ||
| 2078 | 2078 | * | 
| 2079 | 2079 | * @return string $drop_down_element | 
| 2080 | 2080 | */ | 
| 2081 | -    public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) { | |
| 2081 | +    public static function generate_drop_down($selected_value, $options = array(), $attributes = array(), $enable_none_option = true) { | |
| 2082 | 2082 | |
| 2083 | 2083 | $drop_down_element = ''; | 
| 2084 | 2084 | |
| 2085 | 2085 | // setup the basic attributes | 
| 2086 | -        if( !isset( $attributes['name'] ) || empty( $attributes['name']  ) ) { | |
| 2086 | +        if ( ! isset($attributes['name']) || empty($attributes['name'])) { | |
| 2087 | 2087 | |
| 2088 | 2088 | $attributes['name'] = 'sensei-options'; | 
| 2089 | 2089 | |
| 2090 | 2090 | } | 
| 2091 | 2091 | |
| 2092 | -        if( !isset( $attributes['id'] ) || empty( $attributes['id']  ) ) { | |
| 2092 | +        if ( ! isset($attributes['id']) || empty($attributes['id'])) { | |
| 2093 | 2093 | |
| 2094 | 2094 | $attributes['id'] = 'sensei-options'; | 
| 2095 | 2095 | |
| 2096 | 2096 | } | 
| 2097 | 2097 | |
| 2098 | -        if( !isset( $attributes['class'] ) || empty( $attributes['class']  ) ) { | |
| 2098 | +        if ( ! isset($attributes['class']) || empty($attributes['class'])) { | |
| 2099 | 2099 | |
| 2100 | - $attributes['class'] ='chosen_select widefat'; | |
| 2100 | + $attributes['class'] = 'chosen_select widefat'; | |
| 2101 | 2101 | |
| 2102 | 2102 | } | 
| 2103 | 2103 | |
| 2104 | 2104 | // create element attributes | 
| 2105 | 2105 | $combined_attributes = ''; | 
| 2106 | -        foreach( $attributes as $attribute => $value ){ | |
| 2106 | +        foreach ($attributes as $attribute => $value) { | |
| 2107 | 2107 | |
| 2108 | - $combined_attributes .= $attribute . '="'.$value.'"' . ' '; | |
| 2108 | + $combined_attributes .= $attribute.'="'.$value.'"'.' '; | |
| 2109 | 2109 | |
| 2110 | 2110 | }// end for each | 
| 2111 | 2111 | |
| 2112 | 2112 | |
| 2113 | 2113 | // create the select element | 
| 2114 | - $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n"; | |
| 2114 | + $drop_down_element .= '<select '.$combined_attributes.' >'."\n"; | |
| 2115 | 2115 | |
| 2116 | 2116 | // show the none option if the client requested | 
| 2117 | -        if( $enable_none_option ) { | |
| 2118 | -            $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>'; | |
| 2117 | +        if ($enable_none_option) { | |
| 2118 | +            $drop_down_element .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; | |
| 2119 | 2119 | } | 
| 2120 | 2120 | |
| 2121 | -        if ( count( $options ) > 0 ) { | |
| 2121 | +        if (count($options) > 0) { | |
| 2122 | 2122 | |
| 2123 | -            foreach ($options as $value => $option ){ | |
| 2123 | +            foreach ($options as $value => $option) { | |
| 2124 | 2124 | |
| 2125 | 2125 | $element = ''; | 
| 2126 | - $element.= '<option value="' . esc_attr( $value ) . '"'; | |
| 2127 | - $element .= selected( $value, $selected_value, false ) . '>'; | |
| 2128 | - $element .= esc_html( $option ) . '</option>' . "\n"; | |
| 2126 | + $element .= '<option value="'.esc_attr($value).'"'; | |
| 2127 | + $element .= selected($value, $selected_value, false).'>'; | |
| 2128 | + $element .= esc_html($option).'</option>'."\n"; | |
| 2129 | 2129 | |
| 2130 | 2130 | // add the element to the select html | 
| 2131 | - $drop_down_element.= $element; | |
| 2131 | + $drop_down_element .= $element; | |
| 2132 | 2132 | } // End For Loop | 
| 2133 | 2133 | |
| 2134 | 2134 | } // End If Statement | 
| 2135 | 2135 | |
| 2136 | - $drop_down_element .= '</select>' . "\n"; | |
| 2136 | + $drop_down_element .= '</select>'."\n"; | |
| 2137 | 2137 | |
| 2138 | 2138 | return $drop_down_element; | 
| 2139 | 2139 | |
| @@ -2153,14 +2153,14 @@ discard block | ||
| 2153 | 2153 | * | 
| 2154 | 2154 | * @return double $val | 
| 2155 | 2155 | */ | 
| 2156 | -    public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = ''  ){ | |
| 2156 | +    public static function round($val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = '') { | |
| 2157 | 2157 | |
| 2158 | 2158 | /**å | 
| 2159 | 2159 | * Change the precision for the Sensei_Utils::round function. | 
| 2160 | 2160 | * the precision given will be passed into the php round function | 
| 2161 | 2161 | * @since 1.8.5 | 
| 2162 | 2162 | */ | 
| 2163 | - $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode ); | |
| 2163 | +        $precision = apply_filters('sensei_round_precision', $precision, $val, $context, $mode); | |
| 2164 | 2164 | |
| 2165 | 2165 | /** | 
| 2166 | 2166 | * Change the mode for the Sensei_Utils::round function. | 
| @@ -2170,15 +2170,15 @@ discard block | ||
| 2170 | 2170 | * | 
| 2171 | 2171 | * @since 1.8.5 | 
| 2172 | 2172 | */ | 
| 2173 | - $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision ); | |
| 2173 | +        $mode = apply_filters('sensei_round_mode', $mode, $val, $context, $precision); | |
| 2174 | 2174 | |
| 2175 | -        if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) { | |
| 2175 | +        if (version_compare(PHP_VERSION, '5.3.0') >= 0) { | |
| 2176 | 2176 | |
| 2177 | - return round( $val, $precision, $mode ); | |
| 2177 | + return round($val, $precision, $mode); | |
| 2178 | 2178 | |
| 2179 | -        }else{ | |
| 2179 | +        } else { | |
| 2180 | 2180 | |
| 2181 | - return round( $val, $precision ); | |
| 2181 | + return round($val, $precision); | |
| 2182 | 2182 | |
| 2183 | 2183 | } | 
| 2184 | 2184 | |
| @@ -2190,15 +2190,15 @@ discard block | ||
| 2190 | 2190 | * @since 1.9.0 | 
| 2191 | 2191 | * @return string $url | 
| 2192 | 2192 | */ | 
| 2193 | -    public static function get_current_url(){ | |
| 2193 | +    public static function get_current_url() { | |
| 2194 | 2194 | |
| 2195 | 2195 | global $wp; | 
| 2196 | - $current_url = trailingslashit( home_url( $wp->request ) ); | |
| 2197 | -        if ( isset( $_GET ) ) { | |
| 2196 | + $current_url = trailingslashit(home_url($wp->request)); | |
| 2197 | +        if (isset($_GET)) { | |
| 2198 | 2198 | |
| 2199 | -            foreach ($_GET as $param => $val ) { | |
| 2199 | +            foreach ($_GET as $param => $val) { | |
| 2200 | 2200 | |
| 2201 | - $current_url = add_query_arg( $param, $val , $current_url ); | |
| 2201 | + $current_url = add_query_arg($param, $val, $current_url); | |
| 2202 | 2202 | |
| 2203 | 2203 | } | 
| 2204 | 2204 | } | 
| @@ -2228,27 +2228,27 @@ discard block | ||
| 2228 | 2228 | * @param array $array_b | 
| 2229 | 2229 | * @return array $merged_array | 
| 2230 | 2230 | */ | 
| 2231 | -    public static function array_zip_merge( $array_a, $array_b ){ | |
| 2231 | +    public static function array_zip_merge($array_a, $array_b) { | |
| 2232 | 2232 | |
| 2233 | -        if( ! is_array( $array_a ) || ! is_array( $array_b )  ){ | |
| 2233 | +        if ( ! is_array($array_a) || ! is_array($array_b)) { | |
| 2234 | 2234 |              trigger_error('array_zip_merge requires both arrays to be indexed arrays '); | 
| 2235 | 2235 | } | 
| 2236 | 2236 | |
| 2237 | 2237 | $merged_array = array(); | 
| 2238 | - $total_elements = count( $array_a ) + count( $array_b ); | |
| 2238 | + $total_elements = count($array_a) + count($array_b); | |
| 2239 | 2239 | |
| 2240 | 2240 | // Zip arrays | 
| 2241 | -        for ( $i = 0; $i < $total_elements; $i++) { | |
| 2241 | +        for ($i = 0; $i < $total_elements; $i++) { | |
| 2242 | 2242 | |
| 2243 | 2243 | // if has an element at current index push a on top | 
| 2244 | -            if( isset( $array_a[ $i ] ) ){ | |
| 2245 | - $merged_array[] = $array_a[ $i ] ; | |
| 2244 | +            if (isset($array_a[$i])) { | |
| 2245 | + $merged_array[] = $array_a[$i]; | |
| 2246 | 2246 | } | 
| 2247 | 2247 | |
| 2248 | 2248 | // next if $array_b has an element at current index push a on top of the element | 
| 2249 | 2249 | // from a if there was one, if not the element before that. | 
| 2250 | -            if( isset( $array_b[ $i ] ) ){ | |
| 2251 | - $merged_array[] = $array_b[ $i ] ; | |
| 2250 | +            if (isset($array_b[$i])) { | |
| 2251 | + $merged_array[] = $array_b[$i]; | |
| 2252 | 2252 | } | 
| 2253 | 2253 | |
| 2254 | 2254 | } | 
| @@ -2263,4 +2263,4 @@ discard block | ||
| 2263 | 2263 | * @ignore only for backward compatibility | 
| 2264 | 2264 | * @since 1.9.0 | 
| 2265 | 2265 | */ | 
| 2266 | -class WooThemes_Sensei_Utils extends Sensei_Utils{} | |
| 2267 | 2266 | \ No newline at end of file | 
| 2267 | +class WooThemes_Sensei_Utils extends Sensei_Utils {} | |
| 2268 | 2268 | \ No newline at end of file | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // security check, don't load file outside WP | |
| 2 | +if ( ! defined('ABSPATH')) exit; // security check, don't load file outside WP | |
| 3 | 3 | |
| 4 | 4 | /** | 
| 5 | 5 | * Sensei WooCommerce class | 
| @@ -11,16 +11,16 @@ discard block | ||
| 11 | 11 | * @since 1.9.0 | 
| 12 | 12 | */ | 
| 13 | 13 | |
| 14 | -Class Sensei_WC{ | |
| 14 | +Class Sensei_WC { | |
| 15 | 15 | /** | 
| 16 | 16 | * Load the files needed for the woocommerce integration. | 
| 17 | 17 | * | 
| 18 | 18 | * @since 1.9.0 | 
| 19 | 19 | */ | 
| 20 | -    public static function load_woocommerce_integration_hooks(){ | |
| 20 | +    public static function load_woocommerce_integration_hooks() { | |
| 21 | 21 | |
| 22 | - $woocommerce_hooks_file_path = Sensei()->plugin_path() . 'includes/hooks/woocommerce.php'; | |
| 23 | - require_once( $woocommerce_hooks_file_path ); | |
| 22 | + $woocommerce_hooks_file_path = Sensei()->plugin_path().'includes/hooks/woocommerce.php'; | |
| 23 | + require_once($woocommerce_hooks_file_path); | |
| 24 | 24 | |
| 25 | 25 | } | 
| 26 | 26 | /** | 
| @@ -29,9 +29,9 @@ discard block | ||
| 29 | 29 | * @since 1.9.0 | 
| 30 | 30 | * @return bool | 
| 31 | 31 | */ | 
| 32 | -    public static function is_woocommerce_active(){ | |
| 32 | +    public static function is_woocommerce_active() { | |
| 33 | 33 | |
| 34 | - $is_woocommerce_enabled_in_settings = isset( Sensei()->settings->settings['woocommerce_enabled'] ) && Sensei()->settings->settings['woocommerce_enabled']; | |
| 34 | + $is_woocommerce_enabled_in_settings = isset(Sensei()->settings->settings['woocommerce_enabled']) && Sensei()->settings->settings['woocommerce_enabled']; | |
| 35 | 35 | return self::is_woocommerce_present() && $is_woocommerce_enabled_in_settings; | 
| 36 | 36 | |
| 37 | 37 | } // end is_woocommerce_active | 
| @@ -46,19 +46,19 @@ discard block | ||
| 46 | 46 | * | 
| 47 | 47 | * @return bool | 
| 48 | 48 | */ | 
| 49 | -    public static function is_woocommerce_present(){ | |
| 49 | +    public static function is_woocommerce_present() { | |
| 50 | 50 | |
| 51 | - $active_plugins = (array) get_option( 'active_plugins', array() ); | |
| 51 | +        $active_plugins = (array) get_option('active_plugins', array()); | |
| 52 | 52 | |
| 53 | -        if ( is_multisite() ){ | |
| 53 | +        if (is_multisite()) { | |
| 54 | 54 | |
| 55 | - $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) ); | |
| 55 | +            $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array())); | |
| 56 | 56 | |
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | - $is_woocommerce_plugin_present_and_activated = in_array( 'woocommerce/woocommerce.php', $active_plugins ) || array_key_exists( 'woocommerce/woocommerce.php', $active_plugins ); | |
| 59 | +        $is_woocommerce_plugin_present_and_activated = in_array('woocommerce/woocommerce.php', $active_plugins) || array_key_exists('woocommerce/woocommerce.php', $active_plugins); | |
| 60 | 60 | |
| 61 | - return class_exists( 'Woocommerce' ) || $is_woocommerce_plugin_present_and_activated; | |
| 61 | +        return class_exists('Woocommerce') || $is_woocommerce_plugin_present_and_activated; | |
| 62 | 62 | |
| 63 | 63 | }// end is_woocommerce_present | 
| 64 | 64 | |
| @@ -71,48 +71,48 @@ discard block | ||
| 71 | 71 | * @param $course_id | 
| 72 | 72 | * @return array $user_course_orders | 
| 73 | 73 | */ | 
| 74 | -    public static function get_learner_course_active_order_id( $user_id, $course_id ){ | |
| 74 | +    public static function get_learner_course_active_order_id($user_id, $course_id) { | |
| 75 | 75 | |
| 76 | - $course_product_id = get_post_meta( $course_id, '_course_woocommerce_product', true ); | |
| 76 | + $course_product_id = get_post_meta($course_id, '_course_woocommerce_product', true); | |
| 77 | 77 | |
| 78 | - $orders_query = new WP_Query( array( | |
| 78 | + $orders_query = new WP_Query(array( | |
| 79 | 79 | 'post_type' => 'shop_order', | 
| 80 | 80 | 'posts_per_page' => -1, | 
| 81 | - 'post_status' => array( 'wc-processing', 'wc-completed' ), | |
| 81 | +            'post_status' => array('wc-processing', 'wc-completed'), | |
| 82 | 82 | 'meta_key'=> '_customer_user', | 
| 83 | 83 | 'meta_value'=> $user_id, | 
| 84 | - ) ); | |
| 84 | + )); | |
| 85 | 85 | |
| 86 | -        if( $orders_query->post_count == 0 ){ | |
| 86 | +        if ($orders_query->post_count == 0) { | |
| 87 | 87 | |
| 88 | 88 | return false; | 
| 89 | 89 | |
| 90 | 90 | } | 
| 91 | 91 | |
| 92 | -        foreach( $orders_query->get_posts() as $order ){ | |
| 92 | +        foreach ($orders_query->get_posts() as $order) { | |
| 93 | 93 | |
| 94 | - $order = new WC_Order( $order->ID ); | |
| 94 | + $order = new WC_Order($order->ID); | |
| 95 | 95 | $items = $order->get_items(); | 
| 96 | 96 | |
| 97 | - $user_orders = array(); | |
| 97 | + $user_orders = array(); | |
| 98 | 98 | |
| 99 | -            foreach( $items as $item ){ | |
| 99 | +            foreach ($items as $item) { | |
| 100 | 100 | |
| 101 | 101 | // if the product id on the order and the one given to this function | 
| 102 | 102 | // this order has been placed by the given user on the given course. | 
| 103 | - $product = wc_get_product( $item['product_id'] ); | |
| 103 | + $product = wc_get_product($item['product_id']); | |
| 104 | 104 | |
| 105 | -                if ( is_object( $product ) && $product->is_type( 'variable' )) { | |
| 105 | +                if (is_object($product) && $product->is_type('variable')) { | |
| 106 | 106 | |
| 107 | 107 | $item_product_id = $item['variation_id']; | 
| 108 | 108 | |
| 109 | 109 |                  } else { | 
| 110 | 110 | |
| 111 | - $item_product_id = $item['product_id']; | |
| 111 | + $item_product_id = $item['product_id']; | |
| 112 | 112 | |
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | -                if( $course_product_id == $item_product_id ){ | |
| 115 | +                if ($course_product_id == $item_product_id) { | |
| 116 | 116 | |
| 117 | 117 | return $order->id; | 
| 118 | 118 | |
| @@ -136,12 +136,12 @@ discard block | ||
| 136 | 136 | * @param $filter_links | 
| 137 | 137 | * @return mixed | 
| 138 | 138 | */ | 
| 139 | -    public static function add_course_archive_wc_filter_links( $filter_links ){ | |
| 139 | +    public static function add_course_archive_wc_filter_links($filter_links) { | |
| 140 | 140 | |
| 141 | 141 | $free_courses = self::get_free_courses(); | 
| 142 | 142 | $paid_courses = self::get_paid_courses(); | 
| 143 | 143 | |
| 144 | -        if ( empty( $free_courses ) || empty( $paid_courses )  ){ | |
| 144 | +        if (empty($free_courses) || empty($paid_courses)) { | |
| 145 | 145 | // do not show any WooCommerce filters if all courses are | 
| 146 | 146 | // free or if all courses are paid | 
| 147 | 147 | return $filter_links; | 
| @@ -149,15 +149,15 @@ discard block | ||
| 149 | 149 | } | 
| 150 | 150 | |
| 151 | 151 | $filter_links[] = array( | 
| 152 | - 'id'=>'paid' , | |
| 153 | - 'url'=> add_query_arg( array( 'course_filter'=>'paid'), Sensei_Course::get_courses_page_url() ), | |
| 154 | - 'title'=>__( 'Paid', 'woothemes-sensei' ) | |
| 152 | + 'id'=>'paid', | |
| 153 | +            'url'=> add_query_arg(array('course_filter'=>'paid'), Sensei_Course::get_courses_page_url()), | |
| 154 | +            'title'=>__('Paid', 'woothemes-sensei') | |
| 155 | 155 | ); | 
| 156 | 156 | |
| 157 | 157 | $filter_links[] = array( | 
| 158 | 158 | 'id'=>'free', | 
| 159 | - 'url'=> add_query_arg( array( 'course_filter'=>'free'), Sensei_Course::get_courses_page_url() ), | |
| 160 | - 'title'=>__( 'Free', 'woothemes-sensei' ) | |
| 159 | +            'url'=> add_query_arg(array('course_filter'=>'free'), Sensei_Course::get_courses_page_url()), | |
| 160 | +            'title'=>__('Free', 'woothemes-sensei') | |
| 161 | 161 | ); | 
| 162 | 162 | |
| 163 | 163 | return $filter_links; | 
| @@ -174,24 +174,24 @@ discard block | ||
| 174 | 174 | * @param WP_Query $query | 
| 175 | 175 | * @return WP_Query $query | 
| 176 | 176 | */ | 
| 177 | -    public static function course_archive_wc_filter_free( $query ){ | |
| 177 | +    public static function course_archive_wc_filter_free($query) { | |
| 178 | 178 | |
| 179 | - if( isset( $_GET['course_filter'] ) && 'free' == $_GET['course_filter'] | |
| 180 | -            && 'course' == $query->get( 'post_type') && $query->is_main_query()  ){ | |
| 179 | + if (isset($_GET['course_filter']) && 'free' == $_GET['course_filter'] | |
| 180 | +            && 'course' == $query->get('post_type') && $query->is_main_query()) { | |
| 181 | 181 | |
| 182 | 182 | // setup the course meta query | 
| 183 | 183 | $meta_query = self::get_free_courses_meta_query_args(); | 
| 184 | 184 | |
| 185 | 185 | // manipulate the query to return free courses | 
| 186 | -            $query->set('meta_query', $meta_query ); | |
| 186 | +            $query->set('meta_query', $meta_query); | |
| 187 | 187 | |
| 188 | 188 | // don't show any paid courses | 
| 189 | 189 | $courses = self::get_paid_courses(); | 
| 190 | 190 | $ids = array(); | 
| 191 | -            foreach( $courses as $course ){ | |
| 191 | +            foreach ($courses as $course) { | |
| 192 | 192 | $ids[] = $course->ID; | 
| 193 | 193 | } | 
| 194 | - $query->set( 'post__not_in', $ids ); | |
| 194 | +            $query->set('post__not_in', $ids); | |
| 195 | 195 | |
| 196 | 196 | }// end if course_filter | 
| 197 | 197 | |
| @@ -210,16 +210,16 @@ discard block | ||
| 210 | 210 | * @param WP_Query $query | 
| 211 | 211 | * @return WP_Query $query | 
| 212 | 212 | */ | 
| 213 | -    public static function course_archive_wc_filter_paid( $query ){ | |
| 213 | +    public static function course_archive_wc_filter_paid($query) { | |
| 214 | 214 | |
| 215 | - if( isset( $_GET['course_filter'] ) && 'paid' == $_GET['course_filter'] | |
| 216 | -            && 'course' == $query->get( 'post_type') && $query->is_main_query() ){ | |
| 215 | + if (isset($_GET['course_filter']) && 'paid' == $_GET['course_filter'] | |
| 216 | +            && 'course' == $query->get('post_type') && $query->is_main_query()) { | |
| 217 | 217 | |
| 218 | 218 | // setup the course meta query | 
| 219 | 219 | $meta_query = self::get_paid_courses_meta_query_args(); | 
| 220 | 220 | |
| 221 | 221 | // manipulate the query to return free courses | 
| 222 | -            $query->set('meta_query', $meta_query ); | |
| 222 | +            $query->set('meta_query', $meta_query); | |
| 223 | 223 | |
| 224 | 224 | } | 
| 225 | 225 | |
| @@ -232,14 +232,14 @@ discard block | ||
| 232 | 232 | * single courses if woocommerce is active allowing purchase | 
| 233 | 233 | * information and actions to be hooked from WooCommerce. | 
| 234 | 234 | */ | 
| 235 | -    public static function do_single_course_wc_single_product_action(){ | |
| 235 | +    public static function do_single_course_wc_single_product_action() { | |
| 236 | 236 | |
| 237 | 237 | /** | 
| 238 | 238 | * this hooks is documented within the WooCommerce plugin. | 
| 239 | 239 | */ | 
| 240 | -        if ( Sensei_WC::is_woocommerce_active() ) { | |
| 240 | +        if (Sensei_WC::is_woocommerce_active()) { | |
| 241 | 241 | |
| 242 | - do_action( 'woocommerce_before_single_product' ); | |
| 242 | +            do_action('woocommerce_before_single_product'); | |
| 243 | 243 | |
| 244 | 244 | } // End If Statement | 
| 245 | 245 | |
| @@ -260,12 +260,12 @@ discard block | ||
| 260 | 260 | * @param $user_id | 
| 261 | 261 | * @return bool | 
| 262 | 262 | */ | 
| 263 | -    public static function alter_can_user_view_lesson ( $can_user_view_lesson, $lesson_id, $user_id  ){ | |
| 263 | +    public static function alter_can_user_view_lesson($can_user_view_lesson, $lesson_id, $user_id) { | |
| 264 | 264 | |
| 265 | 265 | // do not override access to admins | 
| 266 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); | |
| 267 | - if ( sensei_all_access() || Sensei_Utils::is_preview_lesson( $lesson_id ) | |
| 268 | -	         || Sensei_Utils::user_started_course( $course_id, $user_id )  ){ | |
| 266 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); | |
| 267 | + if (sensei_all_access() || Sensei_Utils::is_preview_lesson($lesson_id) | |
| 268 | +	         || Sensei_Utils::user_started_course($course_id, $user_id)) { | |
| 269 | 269 | |
| 270 | 270 | return true; | 
| 271 | 271 | |
| @@ -274,18 +274,18 @@ discard block | ||
| 274 | 274 | // check if the course has a valid product attached to it | 
| 275 | 275 | // which the user should have purchased if they want to access | 
| 276 | 276 | // the current lesson | 
| 277 | - $course_id = get_post_meta( $lesson_id , '_lesson_course', true); | |
| 278 | - $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true ); | |
| 277 | + $course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 278 | + $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true); | |
| 279 | 279 | $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id); | 
| 280 | -        if( isset ($product) && is_object($product) ){ | |
| 280 | +        if (isset ($product) && is_object($product)) { | |
| 281 | 281 | |
| 282 | 282 | // valid product found | 
| 283 | - $order_id = self::get_learner_course_active_order_id( $user_id, $course_id ); | |
| 283 | + $order_id = self::get_learner_course_active_order_id($user_id, $course_id); | |
| 284 | 284 | |
| 285 | 285 | // product has a successful order so this user may access the content | 
| 286 | 286 | // this function may only return false or the default | 
| 287 | 287 | // returning true may override other negatives which we don't want | 
| 288 | -            if( ! $order_id ){ | |
| 288 | +            if ( ! $order_id) { | |
| 289 | 289 | |
| 290 | 290 | return false; | 
| 291 | 291 | |
| @@ -308,23 +308,23 @@ discard block | ||
| 308 | 308 | */ | 
| 309 | 309 |      public static function course_link_from_order( ) { | 
| 310 | 310 | |
| 311 | -        if( ! is_order_received_page() ){ | |
| 311 | +        if ( ! is_order_received_page()) { | |
| 312 | 312 | return; | 
| 313 | 313 | } | 
| 314 | 314 | |
| 315 | - $order_id = get_query_var( 'order-received' ); | |
| 316 | - $order = new WC_Order( $order_id ); | |
| 315 | +        $order_id = get_query_var('order-received'); | |
| 316 | + $order = new WC_Order($order_id); | |
| 317 | 317 | |
| 318 | 318 | // exit early if not wc-completed or wc-processing | 
| 319 | - if( 'wc-completed' != $order->post_status | |
| 320 | -            && 'wc-processing' != $order->post_status  ) { | |
| 319 | +		if ('wc-completed' != $order->post_status | |
| 320 | +            && 'wc-processing' != $order->post_status) { | |
| 321 | 321 | return; | 
| 322 | 322 | } | 
| 323 | 323 | |
| 324 | 324 | $course_links = array(); // store the for links for courses purchased | 
| 325 | -		foreach ( $order->get_items() as $item ) { | |
| 325 | +		foreach ($order->get_items() as $item) { | |
| 326 | 326 | |
| 327 | -            if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) { | |
| 327 | +            if (isset($item['variation_id']) && (0 < $item['variation_id'])) { | |
| 328 | 328 | |
| 329 | 329 | // If item has variation_id then its a variation of the product | 
| 330 | 330 | $item_id = $item['variation_id']; | 
| @@ -336,28 +336,28 @@ discard block | ||
| 336 | 336 | |
| 337 | 337 | } // End If Statement | 
| 338 | 338 | |
| 339 | - $user_id = get_post_meta( $order->id, '_customer_user', true ); | |
| 339 | + $user_id = get_post_meta($order->id, '_customer_user', true); | |
| 340 | 340 | |
| 341 | -            if( $user_id ) { | |
| 341 | +            if ($user_id) { | |
| 342 | 342 | |
| 343 | 343 | // Get all courses for product | 
| 344 | 344 | $args = Sensei_Course::get_default_query_args(); | 
| 345 | - $args['meta_query'] = array( array( | |
| 345 | + $args['meta_query'] = array(array( | |
| 346 | 346 | 'key' => '_course_woocommerce_product', | 
| 347 | 347 | 'value' => $item_id | 
| 348 | - ) ); | |
| 348 | + )); | |
| 349 | 349 | $args['orderby'] = 'menu_order date'; | 
| 350 | 350 | $args['order'] = 'ASC'; | 
| 351 | 351 | |
| 352 | 352 | // loop through courses | 
| 353 | - $courses = get_posts( $args ); | |
| 354 | -                if( $courses && count( $courses ) > 0 ) { | |
| 353 | + $courses = get_posts($args); | |
| 354 | +                if ($courses && count($courses) > 0) { | |
| 355 | 355 | |
| 356 | -                    foreach( $courses as $course ) { | |
| 356 | +                    foreach ($courses as $course) { | |
| 357 | 357 | |
| 358 | 358 | $title = $course->post_title; | 
| 359 | - $permalink = get_permalink( $course->ID ); | |
| 360 | - $course_links[] .= '<a href="' . esc_url( $permalink ) . '" >' . $title . '</a> '; | |
| 359 | + $permalink = get_permalink($course->ID); | |
| 360 | + $course_links[] .= '<a href="'.esc_url($permalink).'" >'.$title.'</a> '; | |
| 361 | 361 | |
| 362 | 362 | } // end for each | 
| 363 | 363 | |
| @@ -368,24 +368,24 @@ discard block | ||
| 368 | 368 | }// end loop through orders | 
| 369 | 369 | |
| 370 | 370 | // add the courses to the WooCommerce notice | 
| 371 | -        if( ! empty( $course_links) ){ | |
| 371 | +        if ( ! empty($course_links)) { | |
| 372 | 372 | |
| 373 | 373 | $courses_html = _nx( | 
| 374 | 374 | 'You have purchased the following course:', | 
| 375 | 375 | 'You have purchased the following courses:', | 
| 376 | - count( $course_links ), | |
| 376 | + count($course_links), | |
| 377 | 377 | 'Purchase thank you note on Checkout page. The course link(s) will be show', 'woothemes-sensei' | 
| 378 | 378 | ); | 
| 379 | 379 | |
| 380 | -            foreach( $course_links as $link ){ | |
| 380 | +            foreach ($course_links as $link) { | |
| 381 | 381 | |
| 382 | - $courses_html .= '<li>' . $link . '</li>'; | |
| 382 | + $courses_html .= '<li>'.$link.'</li>'; | |
| 383 | 383 | |
| 384 | 384 | } | 
| 385 | 385 | |
| 386 | 386 | $courses_html .= ' </ul>'; | 
| 387 | 387 | |
| 388 | - wc_add_notice( $courses_html, 'success' ); | |
| 388 | + wc_add_notice($courses_html, 'success'); | |
| 389 | 389 | } | 
| 390 | 390 | |
| 391 | 391 | } // end course_link_order_form | 
| @@ -398,20 +398,20 @@ discard block | ||
| 398 | 398 | * | 
| 399 | 399 | * @since 1.9.0 | 
| 400 | 400 | */ | 
| 401 | -    public static function course_in_cart_message(){ | |
| 401 | +    public static function course_in_cart_message() { | |
| 402 | 402 | |
| 403 | 403 | global $post; | 
| 404 | 404 | |
| 405 | -        if( self::is_course_in_cart( $post->ID ) ){ ?> | |
| 405 | +        if (self::is_course_in_cart($post->ID)) { ?> | |
| 406 | 406 | |
| 407 | 407 | <div class="sensei-message info"> | 
| 408 | 408 | <?php | 
| 409 | 409 | |
| 410 | - $cart_link = '<a class="cart-complete" href="' . WC()->cart->get_checkout_url() | |
| 411 | -                              . '" title="' . __('complete purchase', 'woothemes-sensei') . '">' | |
| 412 | -                              . __('complete the purchase', 'woothemes-sensei') . '</a>'; | |
| 410 | + $cart_link = '<a class="cart-complete" href="'.WC()->cart->get_checkout_url() | |
| 411 | +                              . '" title="'.__('complete purchase', 'woothemes-sensei').'">' | |
| 412 | +                              . __('complete the purchase', 'woothemes-sensei').'</a>'; | |
| 413 | 413 | |
| 414 | -                echo sprintf(  __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link ); | |
| 414 | +                echo sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei'), $cart_link); | |
| 415 | 415 | |
| 416 | 416 | ?> | 
| 417 | 417 | </div> | 
| @@ -425,14 +425,14 @@ discard block | ||
| 425 | 425 | * @param $course_id | 
| 426 | 426 | * @return bool | 
| 427 | 427 | */ | 
| 428 | -    public static function is_course_in_cart( $course_id ){ | |
| 428 | +    public static function is_course_in_cart($course_id) { | |
| 429 | 429 | |
| 430 | - $wc_post_id = absint( get_post_meta( $course_id, '_course_woocommerce_product', true ) ); | |
| 431 | - $user_course_status_id = Sensei_Utils::user_started_course( $course_id , get_current_user_id() ); | |
| 430 | + $wc_post_id = absint(get_post_meta($course_id, '_course_woocommerce_product', true)); | |
| 431 | + $user_course_status_id = Sensei_Utils::user_started_course($course_id, get_current_user_id()); | |
| 432 | 432 | |
| 433 | -        if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) { | |
| 433 | +        if (0 < intval($wc_post_id) && ! $user_course_status_id) { | |
| 434 | 434 | |
| 435 | -            if ( self::is_product_in_cart( $wc_post_id ) ) { | |
| 435 | +            if (self::is_product_in_cart($wc_post_id)) { | |
| 436 | 436 | |
| 437 | 437 | return true; | 
| 438 | 438 | |
| @@ -450,20 +450,20 @@ discard block | ||
| 450 | 450 | * @param $product_id | 
| 451 | 451 | * @return bool | 
| 452 | 452 | */ | 
| 453 | -    public static function is_product_in_cart( $product_id ){ | |
| 453 | +    public static function is_product_in_cart($product_id) { | |
| 454 | 454 | |
| 455 | -        if ( 0 < $product_id ) { | |
| 455 | +        if (0 < $product_id) { | |
| 456 | 456 | |
| 457 | - $product = wc_get_product( $product_id ); | |
| 457 | + $product = wc_get_product($product_id); | |
| 458 | 458 | |
| 459 | 459 | $parent_id = ''; | 
| 460 | -            if( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { | |
| 460 | +            if (isset($product->variation_id) && 0 < intval($product->variation_id)) { | |
| 461 | 461 | $wc_product_id = $product->parent->id; | 
| 462 | 462 | } | 
| 463 | -            foreach( WC()->cart->get_cart() as $cart_item_key => $values ) { | |
| 463 | +            foreach (WC()->cart->get_cart() as $cart_item_key => $values) { | |
| 464 | 464 | |
| 465 | 465 | $cart_product = $values['data']; | 
| 466 | -                if( $product_id == $cart_product->id ) { | |
| 466 | +                if ($product_id == $cart_product->id) { | |
| 467 | 467 | |
| 468 | 468 | return true; | 
| 469 | 469 | |
| @@ -485,9 +485,9 @@ discard block | ||
| 485 | 485 | * @type int $wp_post_id | 
| 486 | 486 | * } | 
| 487 | 487 | */ | 
| 488 | -    public static function get_free_product_ids(){ | |
| 488 | +    public static function get_free_product_ids() { | |
| 489 | 489 | |
| 490 | - return get_posts( array( | |
| 490 | + return get_posts(array( | |
| 491 | 491 | 'post_type' => 'product', | 
| 492 | 492 | 'posts_per_page' => '1000', | 
| 493 | 493 | 'fields' => 'ids', | 
| @@ -512,7 +512,7 @@ discard block | ||
| 512 | 512 | * @since 1.9.0 | 
| 513 | 513 | * @return array $wp_meta_query_param | 
| 514 | 514 | */ | 
| 515 | -    public static function get_free_courses_meta_query_args(){ | |
| 515 | +    public static function get_free_courses_meta_query_args() { | |
| 516 | 516 | |
| 517 | 517 | return array( | 
| 518 | 518 | 'relation' => 'OR', | 
| @@ -536,7 +536,7 @@ discard block | ||
| 536 | 536 | * @since 1.9.0 | 
| 537 | 537 | * @return array $wp_query_meta_query_args_param | 
| 538 | 538 | */ | 
| 539 | -    public static function get_paid_courses_meta_query_args(){ | |
| 539 | +    public static function get_paid_courses_meta_query_args() { | |
| 540 | 540 | |
| 541 | 541 | $paid_product_ids = self::get_paid_product_ids(); | 
| 542 | 542 | |
| @@ -545,7 +545,7 @@ discard block | ||
| 545 | 545 | 'key' => '_course_woocommerce_product', | 
| 546 | 546 | // when empty we give a false post_id to ensure the caller doesn't get any courses for their | 
| 547 | 547 | // query | 
| 548 | - 'value' => empty( $paid_product_ids )? '-1000' : $paid_product_ids, | |
| 548 | + 'value' => empty($paid_product_ids) ? '-1000' : $paid_product_ids, | |
| 549 | 549 | 'compare' => 'IN', | 
| 550 | 550 | ), | 
| 551 | 551 | ); | 
| @@ -559,7 +559,7 @@ discard block | ||
| 559 | 559 | * @since 1.9.0 | 
| 560 | 560 | * @return array $product_query_args | 
| 561 | 561 | */ | 
| 562 | -    public static function get_paid_products_on_sale_query_args(){ | |
| 562 | +    public static function get_paid_products_on_sale_query_args() { | |
| 563 | 563 | |
| 564 | 564 | $args = array( | 
| 565 | 565 | 'post_type' => 'product', | 
| @@ -569,9 +569,9 @@ discard block | ||
| 569 | 569 | 'suppress_filters' => 0 | 
| 570 | 570 | ); | 
| 571 | 571 | |
| 572 | - $args[ 'fields' ] = 'ids'; | |
| 572 | + $args['fields'] = 'ids'; | |
| 573 | 573 | |
| 574 | - $args[ 'meta_query' ] = array( | |
| 574 | + $args['meta_query'] = array( | |
| 575 | 575 | 'relation' => 'AND', | 
| 576 | 576 | array( | 
| 577 | 577 | 'key'=> '_regular_price', | 
| @@ -598,7 +598,7 @@ discard block | ||
| 598 | 598 | * | 
| 599 | 599 | * @return array | 
| 600 | 600 | */ | 
| 601 | -    public static function get_paid_products_not_on_sale_query_args(){ | |
| 601 | +    public static function get_paid_products_not_on_sale_query_args() { | |
| 602 | 602 | |
| 603 | 603 | $args = array( | 
| 604 | 604 | 'post_type' => 'product', | 
| @@ -608,8 +608,8 @@ discard block | ||
| 608 | 608 | 'suppress_filters' => 0 | 
| 609 | 609 | ); | 
| 610 | 610 | |
| 611 | - $args[ 'fields' ] = 'ids'; | |
| 612 | - $args[ 'meta_query' ] = array( | |
| 611 | + $args['fields'] = 'ids'; | |
| 612 | + $args['meta_query'] = array( | |
| 613 | 613 | 'relation' => 'AND', | 
| 614 | 614 | array( | 
| 615 | 615 | 'key'=> '_regular_price', | 
| @@ -635,24 +635,24 @@ discard block | ||
| 635 | 635 | * | 
| 636 | 636 | * @return array $woocommerce_paid_product_ids | 
| 637 | 637 | */ | 
| 638 | -    public static function get_paid_product_ids(){ | |
| 638 | +    public static function get_paid_product_ids() { | |
| 639 | 639 | |
| 640 | 640 | // get all the paid WooCommerce products that has regular | 
| 641 | 641 | // and sale price greater than 0 | 
| 642 | 642 | // will be used later to check for course with the id as meta | 
| 643 | - $paid_product_ids_with_sale = get_posts( self::get_paid_products_on_sale_query_args() ); | |
| 643 | + $paid_product_ids_with_sale = get_posts(self::get_paid_products_on_sale_query_args()); | |
| 644 | 644 | |
| 645 | 645 | // get all the paid WooCommerce products that has regular price | 
| 646 | 646 | // greater than 0 without a sale price | 
| 647 | 647 | // will be used later to check for course with the id as meta | 
| 648 | - $paid_product_ids_without_sale = get_posts( self::get_paid_products_not_on_sale_query_args() ); | |
| 648 | + $paid_product_ids_without_sale = get_posts(self::get_paid_products_not_on_sale_query_args()); | |
| 649 | 649 | |
| 650 | 650 | // combine products ID's with regular and sale price grater than zero and those without | 
| 651 | 651 | // sale but regular price greater than zero | 
| 652 | - $woocommerce_paid_product_ids = array_merge( $paid_product_ids_with_sale, $paid_product_ids_without_sale ); | |
| 652 | + $woocommerce_paid_product_ids = array_merge($paid_product_ids_with_sale, $paid_product_ids_without_sale); | |
| 653 | 653 | |
| 654 | 654 | // if | 
| 655 | -        if( empty($woocommerce_paid_product_ids) ){ | |
| 655 | +        if (empty($woocommerce_paid_product_ids)) { | |
| 656 | 656 | return array( ); | 
| 657 | 657 | } | 
| 658 | 658 | return $woocommerce_paid_product_ids; | 
| @@ -671,20 +671,20 @@ discard block | ||
| 671 | 671 | * | 
| 672 | 672 | * @return array | 
| 673 | 673 | */ | 
| 674 | -    public static function get_free_courses(){ | |
| 674 | +    public static function get_free_courses() { | |
| 675 | 675 | |
| 676 | 676 | $free_course_query_args = Sensei_Course::get_default_query_args(); | 
| 677 | - $free_course_query_args[ 'meta_query' ] = self::get_free_courses_meta_query_args(); | |
| 677 | + $free_course_query_args['meta_query'] = self::get_free_courses_meta_query_args(); | |
| 678 | 678 | |
| 679 | 679 | // don't show any paid courses | 
| 680 | 680 | $courses = self::get_paid_courses(); | 
| 681 | 681 | $ids = array(); | 
| 682 | -        foreach( $courses as $course ){ | |
| 682 | +        foreach ($courses as $course) { | |
| 683 | 683 | $ids[] = $course->ID; | 
| 684 | 684 | } | 
| 685 | - $free_course_query_args[ 'post__not_in' ] = $ids; | |
| 685 | + $free_course_query_args['post__not_in'] = $ids; | |
| 686 | 686 | |
| 687 | - return get_posts( $free_course_query_args ); | |
| 687 | + return get_posts($free_course_query_args); | |
| 688 | 688 | |
| 689 | 689 | } | 
| 690 | 690 | |
| @@ -694,13 +694,13 @@ discard block | ||
| 694 | 694 | * @since 1.9.0 | 
| 695 | 695 | * @return array | 
| 696 | 696 | */ | 
| 697 | -    public static function get_paid_courses(){ | |
| 697 | +    public static function get_paid_courses() { | |
| 698 | 698 | |
| 699 | 699 | $paid_course_query_args = Sensei_Course::get_default_query_args(); | 
| 700 | 700 | |
| 701 | - $paid_course_query_args[ 'meta_query' ] = self::get_paid_courses_meta_query_args(); | |
| 701 | + $paid_course_query_args['meta_query'] = self::get_paid_courses_meta_query_args(); | |
| 702 | 702 | |
| 703 | - return get_posts( $paid_course_query_args ); | |
| 703 | + return get_posts($paid_course_query_args); | |
| 704 | 704 | } | 
| 705 | 705 | |
| 706 | 706 | /** | 
| @@ -715,17 +715,17 @@ discard block | ||
| 715 | 715 | * @param int $course_id | 
| 716 | 716 | * @return string $html markup for the button or nothing if user not allowed to buy | 
| 717 | 717 | */ | 
| 718 | -    public static function the_add_to_cart_button_html( $course_id ){ | |
| 718 | +    public static function the_add_to_cart_button_html($course_id) { | |
| 719 | 719 | |
| 720 | -        if ( ! Sensei_Course::is_prerequisite_complete( $course_id )) { | |
| 720 | +        if ( ! Sensei_Course::is_prerequisite_complete($course_id)) { | |
| 721 | 721 | return ''; | 
| 722 | 722 | } | 
| 723 | 723 | |
| 724 | - $wc_post_id = self::get_course_product_id( $course_id ); | |
| 724 | + $wc_post_id = self::get_course_product_id($course_id); | |
| 725 | 725 | |
| 726 | 726 | // Check if customer purchased the product | 
| 727 | - if ( self::has_customer_bought_product( get_current_user_id(), $wc_post_id ) | |
| 728 | -            || empty( $wc_post_id ) ) { | |
| 727 | + if (self::has_customer_bought_product(get_current_user_id(), $wc_post_id) | |
| 728 | +            || empty($wc_post_id)) { | |
| 729 | 729 | |
| 730 | 730 | return ''; | 
| 731 | 731 | |
| @@ -733,15 +733,15 @@ discard block | ||
| 733 | 733 | |
| 734 | 734 | // based on simple.php in WC templates/single-product/add-to-cart/ | 
| 735 | 735 | // Get the product | 
| 736 | - $product = self::get_product_object( $wc_post_id ); | |
| 736 | + $product = self::get_product_object($wc_post_id); | |
| 737 | 737 | |
| 738 | 738 | // do not show the button for invalid products, non purchasable products, out | 
| 739 | 739 | // of stock product or if course is already in cart | 
| 740 | - if ( ! isset ( $product ) | |
| 741 | - || ! is_object( $product ) | |
| 740 | + if ( ! isset ($product) | |
| 741 | + || ! is_object($product) | |
| 742 | 742 | || ! $product->is_purchasable() | 
| 743 | 743 | || ! $product->is_in_stock() | 
| 744 | -            || self::is_course_in_cart( $wc_post_id ) ) { | |
| 744 | +            || self::is_course_in_cart($wc_post_id)) { | |
| 745 | 745 | |
| 746 | 746 | return ''; | 
| 747 | 747 | |
| @@ -752,23 +752,23 @@ discard block | ||
| 752 | 752 | // | 
| 753 | 753 | ?> | 
| 754 | 754 | |
| 755 | - <form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>" | |
| 755 | + <form action="<?php echo esc_url($product->add_to_cart_url()); ?>" | |
| 756 | 756 | class="cart" | 
| 757 | 757 | method="post" | 
| 758 | 758 | enctype="multipart/form-data"> | 
| 759 | 759 | |
| 760 | - <input type="hidden" name="product_id" value="<?php echo esc_attr( $product->id ); ?>" /> | |
| 760 | + <input type="hidden" name="product_id" value="<?php echo esc_attr($product->id); ?>" /> | |
| 761 | 761 | |
| 762 | 762 | <input type="hidden" name="quantity" value="1" /> | 
| 763 | 763 | |
| 764 | -            <?php if ( isset( $product->variation_id ) && 0 < intval( $product->variation_id ) ) { ?> | |
| 764 | +            <?php if (isset($product->variation_id) && 0 < intval($product->variation_id)) { ?> | |
| 765 | 765 | |
| 766 | 766 | <input type="hidden" name="variation_id" value="<?php echo $product->variation_id; ?>" /> | 
| 767 | -                <?php if( isset( $product->variation_data ) && is_array( $product->variation_data ) && count( $product->variation_data ) > 0 ) { ?> | |
| 767 | +                <?php if (isset($product->variation_data) && is_array($product->variation_data) && count($product->variation_data) > 0) { ?> | |
| 768 | 768 | |
| 769 | -                    <?php foreach( $product->variation_data as $att => $val ) { ?> | |
| 769 | +                    <?php foreach ($product->variation_data as $att => $val) { ?> | |
| 770 | 770 | |
| 771 | - <input type="hidden" name="<?php echo esc_attr( $att ); ?>" id="<?php echo esc_attr( str_replace( 'attribute_', '', $att ) ); ?>" value="<?php echo esc_attr( $val ); ?>" /> | |
| 771 | +                        <input type="hidden" name="<?php echo esc_attr($att); ?>" id="<?php echo esc_attr(str_replace('attribute_', '', $att)); ?>" value="<?php echo esc_attr($val); ?>" /> | |
| 772 | 772 | |
| 773 | 773 | <?php } ?> | 
| 774 | 774 | |
| @@ -777,7 +777,7 @@ discard block | ||
| 777 | 777 | <?php } ?> | 
| 778 | 778 | |
| 779 | 779 | <button type="submit" class="single_add_to_cart_button button alt"> | 
| 780 | - <?php $button_text = $product->get_price_html() . ' - ' . __( 'Purchase this Course', 'woothemes-sensei' ); ?> | |
| 780 | +                <?php $button_text = $product->get_price_html().' - '.__('Purchase this Course', 'woothemes-sensei'); ?> | |
| 781 | 781 | <?php | 
| 782 | 782 | /** | 
| 783 | 783 | * Filter Add to Cart button text | 
| @@ -786,7 +786,7 @@ discard block | ||
| 786 | 786 | * | 
| 787 | 787 | * @param string $button_text | 
| 788 | 788 | */ | 
| 789 | - echo apply_filters( 'sensei_wc_single_add_to_cart_button_text', $button_text ); | |
| 789 | +                echo apply_filters('sensei_wc_single_add_to_cart_button_text', $button_text); | |
| 790 | 790 | ?> | 
| 791 | 791 | </button> | 
| 792 | 792 | |
| @@ -806,26 +806,26 @@ discard block | ||
| 806 | 806 | * | 
| 807 | 807 | * @return string $message | 
| 808 | 808 | */ | 
| 809 | -    public static function alter_no_permissions_message( $message, $post_id ){ | |
| 809 | +    public static function alter_no_permissions_message($message, $post_id) { | |
| 810 | 810 | |
| 811 | -        if( empty( $post_id ) || 'course'!=get_post_type( $post_id ) ){ | |
| 811 | +        if (empty($post_id) || 'course' != get_post_type($post_id)) { | |
| 812 | 812 | return $message; | 
| 813 | 813 | } | 
| 814 | 814 | |
| 815 | - $product_id = self::get_course_product_id( $post_id ); | |
| 815 | + $product_id = self::get_course_product_id($post_id); | |
| 816 | 816 | |
| 817 | - if( ! $product_id | |
| 818 | -            || ! self::has_customer_bought_product( get_current_user_id(),$product_id ) ){ | |
| 817 | + if ( ! $product_id | |
| 818 | +            || ! self::has_customer_bought_product(get_current_user_id(), $product_id)) { | |
| 819 | 819 | |
| 820 | 820 | return $message; | 
| 821 | 821 | |
| 822 | 822 | } | 
| 823 | 823 | |
| 824 | 824 | ob_start(); | 
| 825 | - self::the_course_no_permissions_message( $post_id ); | |
| 825 | + self::the_course_no_permissions_message($post_id); | |
| 826 | 826 | $woocommerce_course_no_permissions_message = ob_get_clean(); | 
| 827 | 827 | |
| 828 | - return $woocommerce_course_no_permissions_message ; | |
| 828 | + return $woocommerce_course_no_permissions_message; | |
| 829 | 829 | |
| 830 | 830 | } | 
| 831 | 831 | /** | 
| @@ -834,18 +834,18 @@ discard block | ||
| 834 | 834 | * | 
| 835 | 835 | * @since 1.9.0 | 
| 836 | 836 | */ | 
| 837 | -    public static function the_course_no_permissions_message( $course_id ){ | |
| 837 | +    public static function the_course_no_permissions_message($course_id) { | |
| 838 | 838 | |
| 839 | 839 | // login link | 
| 840 | - $my_courses_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] ); | |
| 841 | - $login_link = '<a href="' . esc_url( get_permalink( $my_courses_page_id ) ) . '">' . __( 'log in', 'woothemes-sensei' ) . '</a>'; | |
| 842 | - $wc_product_id = self::get_course_product_id( $course_id ); | |
| 840 | + $my_courses_page_id = intval(Sensei()->settings->settings['my_course_page']); | |
| 841 | +	    $login_link = '<a href="'.esc_url(get_permalink($my_courses_page_id)).'">'.__('log in', 'woothemes-sensei').'</a>'; | |
| 842 | + $wc_product_id = self::get_course_product_id($course_id); | |
| 843 | 843 | |
| 844 | -	    if ( self::is_product_in_cart( $wc_product_id ) ) { | |
| 844 | +	    if (self::is_product_in_cart($wc_product_id)) { | |
| 845 | 845 | |
| 846 | - $cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout','woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>'; | |
| 846 | +		    $cart_link = '<a href="'.wc_get_checkout_url().'" title="'.__('Checkout', 'woocommerce').'">'.__('checkout', 'woocommerce').'</a>'; | |
| 847 | 847 | |
| 848 | - $message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link ); | |
| 848 | +		    $message = sprintf(__('This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei'), $cart_link); | |
| 849 | 849 | ?> | 
| 850 | 850 | <span class="add-to-cart-login"> | 
| 851 | 851 | <?php echo $message; ?> | 
| @@ -853,7 +853,7 @@ discard block | ||
| 853 | 853 | |
| 854 | 854 | <?php | 
| 855 | 855 | |
| 856 | -	    } elseif ( is_user_logged_in() ) { | |
| 856 | +	    } elseif (is_user_logged_in()) { | |
| 857 | 857 | |
| 858 | 858 | ?> | 
| 859 | 859 | <style> | 
| @@ -865,7 +865,7 @@ discard block | ||
| 865 | 865 | <?php | 
| 866 | 866 | |
| 867 | 867 |  	    } else { | 
| 868 | - $message = sprintf( __( 'Or %1$s to access your purchased courses', 'woothemes-sensei' ), $login_link ); | |
| 868 | +		    $message = sprintf(__('Or %1$s to access your purchased courses', 'woothemes-sensei'), $login_link); | |
| 869 | 869 | ?> | 
| 870 | 870 | <span class="add-to-cart-login"> | 
| 871 | 871 | <?php echo $message; ?> | 
| @@ -885,34 +885,34 @@ discard block | ||
| 885 | 885 | * | 
| 886 | 886 | * @return bool | 
| 887 | 887 | */ | 
| 888 | -    public static function has_customer_bought_product ( $user_id, $product_id ){ | |
| 888 | +    public static function has_customer_bought_product($user_id, $product_id) { | |
| 889 | 889 | |
| 890 | - $orders = self::get_user_product_orders( $user_id, $product_id ); | |
| 890 | + $orders = self::get_user_product_orders($user_id, $product_id); | |
| 891 | 891 | |
| 892 | -        foreach ( $orders as $order_id ) { | |
| 892 | +        foreach ($orders as $order_id) { | |
| 893 | 893 | |
| 894 | - $order = new WC_Order( $order_id->ID ); | |
| 894 | + $order = new WC_Order($order_id->ID); | |
| 895 | 895 | |
| 896 | 896 | // wc-active is the subscriptions complete status | 
| 897 | - if ( ! in_array( $order->post_status, array( 'wc-processing', 'wc-completed' ) ) | |
| 898 | -                || ! ( 0 < sizeof( $order->get_items() ) )  ){ | |
| 897 | +            if ( ! in_array($order->post_status, array('wc-processing', 'wc-completed')) | |
| 898 | +                || ! (0 < sizeof($order->get_items()))) { | |
| 899 | 899 | |
| 900 | 900 | continue; | 
| 901 | 901 | |
| 902 | 902 | } | 
| 903 | 903 | |
| 904 | -            foreach( $order->get_items() as $item ) { | |
| 904 | +            foreach ($order->get_items() as $item) { | |
| 905 | 905 | |
| 906 | 906 | // Check if user has bought product | 
| 907 | -                if ( $item['product_id'] == $product_id || $item['variation_id'] == $product_id ) { | |
| 907 | +                if ($item['product_id'] == $product_id || $item['variation_id'] == $product_id) { | |
| 908 | 908 | |
| 909 | 909 | // Check if user has an active subscription for product | 
| 910 | -                    if( class_exists( 'WC_Subscriptions_Manager' ) ) { | |
| 911 | - $sub_key = wcs_get_subscription( $order ); | |
| 912 | -                        if( $sub_key ) { | |
| 913 | - $sub = wcs_get_subscription( $sub_key ); | |
| 914 | -                            if( $sub && isset( $sub['status'] ) ) { | |
| 915 | -                                if( 'active' == $sub['status'] ) { | |
| 910 | +                    if (class_exists('WC_Subscriptions_Manager')) { | |
| 911 | + $sub_key = wcs_get_subscription($order); | |
| 912 | +                        if ($sub_key) { | |
| 913 | + $sub = wcs_get_subscription($sub_key); | |
| 914 | +                            if ($sub && isset($sub['status'])) { | |
| 915 | +                                if ('active' == $sub['status']) { | |
| 916 | 916 | return true; | 
| 917 | 917 |                                  } else { | 
| 918 | 918 | return false; | 
| @@ -944,11 +944,11 @@ discard block | ||
| 944 | 944 | * @return string $woocommerce_product_id or false if none exist | 
| 945 | 945 | * | 
| 946 | 946 | */ | 
| 947 | -    public static function get_course_product_id( $course_id ){ | |
| 947 | +    public static function get_course_product_id($course_id) { | |
| 948 | 948 | |
| 949 | - $product_id = get_post_meta( $course_id, '_course_woocommerce_product', true ); | |
| 949 | + $product_id = get_post_meta($course_id, '_course_woocommerce_product', true); | |
| 950 | 950 | |
| 951 | -        if( empty( $product_id ) || 'product' != get_post_type( $product_id ) ){ | |
| 951 | +        if (empty($product_id) || 'product' != get_post_type($product_id)) { | |
| 952 | 952 | return false; | 
| 953 | 953 | } | 
| 954 | 954 | |
| @@ -964,11 +964,11 @@ discard block | ||
| 964 | 964 | * @param array $classes | 
| 965 | 965 | * @return array | 
| 966 | 966 | */ | 
| 967 | -    public static function add_woocommerce_body_class( $classes ){ | |
| 967 | +    public static function add_woocommerce_body_class($classes) { | |
| 968 | 968 | |
| 969 | -        if( ! in_array( 'woocommerce', $classes ) && defined( 'SENSEI_NO_PERMISSION' ) && SENSEI_NO_PERMISSION ){ | |
| 969 | +        if ( ! in_array('woocommerce', $classes) && defined('SENSEI_NO_PERMISSION') && SENSEI_NO_PERMISSION) { | |
| 970 | 970 | |
| 971 | - $classes[] ='woocommerce'; | |
| 971 | + $classes[] = 'woocommerce'; | |
| 972 | 972 | |
| 973 | 973 | } | 
| 974 | 974 | |
| @@ -986,7 +986,7 @@ discard block | ||
| 986 | 986 | * | 
| 987 | 987 | * @return void | 
| 988 | 988 | */ | 
| 989 | -    public static function activate_subscription(  $order ) { | |
| 989 | +    public static function activate_subscription($order) { | |
| 990 | 990 | |
| 991 | 991 |          $order_user = get_user_by('id', $order->user_id); | 
| 992 | 992 | $user['ID'] = $order_user->ID; | 
| @@ -995,13 +995,13 @@ discard block | ||
| 995 | 995 | $user['user_url'] = $order_user->user_url; | 
| 996 | 996 | |
| 997 | 997 | // Run through each product ordered | 
| 998 | -        if ( ! sizeof($order->get_items() )>0 ) { | |
| 998 | +        if ( ! sizeof($order->get_items()) > 0) { | |
| 999 | 999 | |
| 1000 | 1000 | return; | 
| 1001 | 1001 | |
| 1002 | 1002 | } | 
| 1003 | 1003 | |
| 1004 | -        foreach($order->get_items() as $item) { | |
| 1004 | +        foreach ($order->get_items() as $item) { | |
| 1005 | 1005 | |
| 1006 | 1006 | $product_type = ''; | 
| 1007 | 1007 | |
| @@ -1016,21 +1016,21 @@ discard block | ||
| 1016 | 1016 | |
| 1017 | 1017 | } // End If Statement | 
| 1018 | 1018 | |
| 1019 | - $_product = self::get_product_object( $item_id, $product_type ); | |
| 1019 | + $_product = self::get_product_object($item_id, $product_type); | |
| 1020 | 1020 | |
| 1021 | 1021 | // Get courses that use the WC product | 
| 1022 | 1022 | $courses = array(); | 
| 1023 | 1023 | |
| 1024 | -            if ( ! in_array( $product_type, self::get_subscription_types() ) ) { | |
| 1024 | +            if ( ! in_array($product_type, self::get_subscription_types())) { | |
| 1025 | 1025 | |
| 1026 | - $courses = Sensei()->course->get_product_courses( $item_id ); | |
| 1026 | + $courses = Sensei()->course->get_product_courses($item_id); | |
| 1027 | 1027 | |
| 1028 | 1028 | } // End If Statement | 
| 1029 | 1029 | |
| 1030 | 1030 | // Loop and add the user to the course. | 
| 1031 | -            foreach ( $courses as $course_item ){ | |
| 1031 | +            foreach ($courses as $course_item) { | |
| 1032 | 1032 | |
| 1033 | - Sensei_Utils::user_start_course( intval( $user['ID'] ), $course_item->ID ); | |
| 1033 | + Sensei_Utils::user_start_course(intval($user['ID']), $course_item->ID); | |
| 1034 | 1034 | |
| 1035 | 1035 | } // End For Loop | 
| 1036 | 1036 | |
| @@ -1048,13 +1048,13 @@ discard block | ||
| 1048 | 1048 | * | 
| 1049 | 1049 | * @return void | 
| 1050 | 1050 | */ | 
| 1051 | -    public static function email_course_details(  $order ){ | |
| 1051 | +    public static function email_course_details($order) { | |
| 1052 | 1052 | |
| 1053 | 1053 | global $woocommerce; | 
| 1054 | 1054 | |
| 1055 | 1055 | // exit early if not wc-completed or wc-processing | 
| 1056 | - if( 'wc-completed' != $order->post_status | |
| 1057 | -            && 'wc-processing' != $order->post_status  ) { | |
| 1056 | +        if ('wc-completed' != $order->post_status | |
| 1057 | +            && 'wc-processing' != $order->post_status) { | |
| 1058 | 1058 | return; | 
| 1059 | 1059 | } | 
| 1060 | 1060 | |
| @@ -1062,16 +1062,16 @@ discard block | ||
| 1062 | 1062 | $order_id = $order->id; | 
| 1063 | 1063 | |
| 1064 | 1064 | //If object have items go through them all to find course | 
| 1065 | -        if ( 0 < sizeof( $order_items ) ) { | |
| 1065 | +        if (0 < sizeof($order_items)) { | |
| 1066 | 1066 | |
| 1067 | - $course_details_html = '<h2>' . __( 'Course details', 'woothemes-sensei' ) . '</h2>'; | |
| 1067 | +            $course_details_html = '<h2>'.__('Course details', 'woothemes-sensei').'</h2>'; | |
| 1068 | 1068 | $order_contains_courses = false; | 
| 1069 | 1069 | |
| 1070 | 1070 | |
| 1071 | -            foreach ( $order_items as $item ) { | |
| 1071 | +            foreach ($order_items as $item) { | |
| 1072 | 1072 | |
| 1073 | 1073 | $product_type = ''; | 
| 1074 | -                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) { | |
| 1074 | +                if (isset($item['variation_id']) && (0 < $item['variation_id'])) { | |
| 1075 | 1075 | // If item has variation_id then its from variation | 
| 1076 | 1076 | $item_id = $item['variation_id']; | 
| 1077 | 1077 | $product_type = 'variation'; | 
| @@ -1080,9 +1080,9 @@ discard block | ||
| 1080 | 1080 | $item_id = $item['product_id']; | 
| 1081 | 1081 | } // End If Statement | 
| 1082 | 1082 | |
| 1083 | - $user_id = get_post_meta( $order_id, '_customer_user', true ); | |
| 1083 | + $user_id = get_post_meta($order_id, '_customer_user', true); | |
| 1084 | 1084 | |
| 1085 | -                if( $user_id ) { | |
| 1085 | +                if ($user_id) { | |
| 1086 | 1086 | |
| 1087 | 1087 | // Get all courses for product | 
| 1088 | 1088 | $args = array( | 
| @@ -1097,16 +1097,16 @@ discard block | ||
| 1097 | 1097 | 'orderby' => 'menu_order date', | 
| 1098 | 1098 | 'order' => 'ASC', | 
| 1099 | 1099 | ); | 
| 1100 | - $courses = get_posts( $args ); | |
| 1100 | + $courses = get_posts($args); | |
| 1101 | 1101 | |
| 1102 | -                    if( $courses && count( $courses ) > 0 ) { | |
| 1102 | +                    if ($courses && count($courses) > 0) { | |
| 1103 | 1103 | |
| 1104 | -                        foreach( $courses as $course ) { | |
| 1104 | +                        foreach ($courses as $course) { | |
| 1105 | 1105 | |
| 1106 | 1106 | $title = $course->post_title; | 
| 1107 | - $permalink = get_permalink( $course->ID ); | |
| 1107 | + $permalink = get_permalink($course->ID); | |
| 1108 | 1108 | $order_contains_courses = true; | 
| 1109 | - $course_details_html .= '<p><strong>' . sprintf( __( 'View course: %1$s', 'woothemes-sensei' ), '</strong><a href="' . esc_url( $permalink ) . '">' . $title . '</a>' ) . '</p>'; | |
| 1109 | +                            $course_details_html .= '<p><strong>'.sprintf(__('View course: %1$s', 'woothemes-sensei'), '</strong><a href="'.esc_url($permalink).'">'.$title.'</a>').'</p>'; | |
| 1110 | 1110 | } | 
| 1111 | 1111 | |
| 1112 | 1112 | |
| @@ -1117,7 +1117,7 @@ discard block | ||
| 1117 | 1117 | } // end for each order item | 
| 1118 | 1118 | |
| 1119 | 1119 | // Output Course details | 
| 1120 | -            if( $order_contains_courses ){ | |
| 1120 | +            if ($order_contains_courses) { | |
| 1121 | 1121 | |
| 1122 | 1122 | echo $course_details_html; | 
| 1123 | 1123 | |
| @@ -1135,33 +1135,33 @@ discard block | ||
| 1135 | 1135 | * @param int $order_id WC order ID | 
| 1136 | 1136 | * @return void | 
| 1137 | 1137 | */ | 
| 1138 | -    public static function complete_order ( $order_id = 0 ) { | |
| 1138 | +    public static function complete_order($order_id = 0) { | |
| 1139 | 1139 | |
| 1140 | 1140 | $order_user = array(); | 
| 1141 | 1141 | |
| 1142 | 1142 | // Check for WooCommerce | 
| 1143 | -        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $order_id ) ) { | |
| 1143 | +        if (Sensei_WC::is_woocommerce_active() && (0 < $order_id)) { | |
| 1144 | 1144 | // Get order object | 
| 1145 | - $order = new WC_Order( $order_id ); | |
| 1145 | + $order = new WC_Order($order_id); | |
| 1146 | 1146 | |
| 1147 | -	        if ( ! in_array( $order->get_status(), array( 'complete', 'processing' ) ) ) { | |
| 1147 | +	        if ( ! in_array($order->get_status(), array('complete', 'processing'))) { | |
| 1148 | 1148 | |
| 1149 | 1149 | return; | 
| 1150 | 1150 | |
| 1151 | 1151 | } | 
| 1152 | 1152 | |
| 1153 | - $user = get_user_by( 'id', $order->get_user_id() ); | |
| 1153 | +            $user = get_user_by('id', $order->get_user_id()); | |
| 1154 | 1154 | $order_user['ID'] = $user->ID; | 
| 1155 | 1155 | $order_user['user_login'] = $user->user_login; | 
| 1156 | 1156 | $order_user['user_email'] = $user->user_email; | 
| 1157 | 1157 | $order_user['user_url'] = $user->user_url; | 
| 1158 | 1158 | // Run through each product ordered | 
| 1159 | -            if ( 0 < sizeof( $order->get_items() ) ) { | |
| 1159 | +            if (0 < sizeof($order->get_items())) { | |
| 1160 | 1160 | |
| 1161 | -                foreach( $order->get_items() as $item ) { | |
| 1161 | +                foreach ($order->get_items() as $item) { | |
| 1162 | 1162 | |
| 1163 | 1163 | $product_type = ''; | 
| 1164 | -                    if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) { | |
| 1164 | +                    if (isset($item['variation_id']) && (0 < $item['variation_id'])) { | |
| 1165 | 1165 | |
| 1166 | 1166 | $item_id = $item['variation_id']; | 
| 1167 | 1167 | $product_type = 'variation'; | 
| @@ -1172,15 +1172,15 @@ discard block | ||
| 1172 | 1172 | |
| 1173 | 1173 | } // End If Statement | 
| 1174 | 1174 | |
| 1175 | - $_product = Sensei_WC::get_product_object( $item_id, $product_type ); | |
| 1175 | + $_product = Sensei_WC::get_product_object($item_id, $product_type); | |
| 1176 | 1176 | |
| 1177 | 1177 | // Get courses that use the WC product | 
| 1178 | - $courses = Sensei()->course->get_product_courses( $_product->id ); | |
| 1178 | + $courses = Sensei()->course->get_product_courses($_product->id); | |
| 1179 | 1179 | |
| 1180 | 1180 | // Loop and update those courses | 
| 1181 | -                    foreach ( $courses as $course_item ) { | |
| 1181 | +                    foreach ($courses as $course_item) { | |
| 1182 | 1182 | |
| 1183 | - $update_course = self::course_update( $course_item->ID, $order_user ); | |
| 1183 | + $update_course = self::course_update($course_item->ID, $order_user); | |
| 1184 | 1184 | |
| 1185 | 1185 | } // End For Loop | 
| 1186 | 1186 | |
| @@ -1188,7 +1188,7 @@ discard block | ||
| 1188 | 1188 | |
| 1189 | 1189 | } // End If Statement | 
| 1190 | 1190 | // Add meta to indicate that payment has been completed successfully | 
| 1191 | - update_post_meta( $order_id, 'sensei_payment_complete', '1' ); | |
| 1191 | + update_post_meta($order_id, 'sensei_payment_complete', '1'); | |
| 1192 | 1192 | |
| 1193 | 1193 | } // End If Statement | 
| 1194 | 1194 | |
| @@ -1202,34 +1202,34 @@ discard block | ||
| 1202 | 1202 | * @param integer| WC_Order $order_id order ID | 
| 1203 | 1203 | * @return void | 
| 1204 | 1204 | */ | 
| 1205 | -    public static function cancel_order ( $order_id ) { | |
| 1205 | +    public static function cancel_order($order_id) { | |
| 1206 | 1206 | |
| 1207 | 1207 | // Get order object | 
| 1208 | -		if( is_object( $order_id ) ){ | |
| 1208 | +		if (is_object($order_id)) { | |
| 1209 | 1209 | |
| 1210 | 1210 | $order = $order_id; | 
| 1211 | 1211 | |
| 1212 | -		}else{ | |
| 1212 | +		} else { | |
| 1213 | 1213 | |
| 1214 | - $order = new WC_Order( $order_id ); | |
| 1214 | + $order = new WC_Order($order_id); | |
| 1215 | 1215 | } | 
| 1216 | 1216 | |
| 1217 | -		if ( ! in_array( $order->get_status(), array( 'cancelled', 'refunded' ) ) ) { | |
| 1217 | +		if ( ! in_array($order->get_status(), array('cancelled', 'refunded'))) { | |
| 1218 | 1218 | |
| 1219 | 1219 | return; | 
| 1220 | 1220 | |
| 1221 | 1221 | } | 
| 1222 | 1222 | |
| 1223 | 1223 | // Run through each product ordered | 
| 1224 | -        if ( 0 < sizeof( $order->get_items() ) ) { | |
| 1224 | +        if (0 < sizeof($order->get_items())) { | |
| 1225 | 1225 | |
| 1226 | 1226 | // Get order user | 
| 1227 | - $user_id = $order->__get( 'user_id' ); | |
| 1227 | +            $user_id = $order->__get('user_id'); | |
| 1228 | 1228 | |
| 1229 | -            foreach( $order->get_items() as $item ) { | |
| 1229 | +            foreach ($order->get_items() as $item) { | |
| 1230 | 1230 | |
| 1231 | 1231 | $product_type = ''; | 
| 1232 | -                if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) { | |
| 1232 | +                if (isset($item['variation_id']) && (0 < $item['variation_id'])) { | |
| 1233 | 1233 | |
| 1234 | 1234 | $item_id = $item['variation_id']; | 
| 1235 | 1235 | $product_type = 'variation'; | 
| @@ -1240,20 +1240,20 @@ discard block | ||
| 1240 | 1240 | |
| 1241 | 1241 | } // End If Statement | 
| 1242 | 1242 | |
| 1243 | - $_product = Sensei_WC::get_product_object( $item_id, $product_type ); | |
| 1243 | + $_product = Sensei_WC::get_product_object($item_id, $product_type); | |
| 1244 | 1244 | |
| 1245 | 1245 | // Get courses that use the WC product | 
| 1246 | 1246 | $courses = array(); | 
| 1247 | - $courses = Sensei()->course->get_product_courses( $item_id ); | |
| 1247 | + $courses = Sensei()->course->get_product_courses($item_id); | |
| 1248 | 1248 | |
| 1249 | 1249 | // Loop and update those courses | 
| 1250 | -                foreach ($courses as $course_item){ | |
| 1250 | +                foreach ($courses as $course_item) { | |
| 1251 | 1251 | |
| 1252 | -	                if( self::has_customer_bought_product( $user_id, $course_item->ID ) ){ | |
| 1252 | +	                if (self::has_customer_bought_product($user_id, $course_item->ID)) { | |
| 1253 | 1253 | continue; | 
| 1254 | 1254 | } | 
| 1255 | 1255 | // Check and Remove course from courses user meta | 
| 1256 | - $dataset_changes = Sensei_Utils::sensei_remove_user_from_course( $course_item->ID, $user_id ); | |
| 1256 | + $dataset_changes = Sensei_Utils::sensei_remove_user_from_course($course_item->ID, $user_id); | |
| 1257 | 1257 | |
| 1258 | 1258 | } // End For Loop | 
| 1259 | 1259 | |
| @@ -1274,30 +1274,30 @@ discard block | ||
| 1274 | 1274 | * @param string $product_type '' or 'variation' | 
| 1275 | 1275 | * @return WC_Product $wc_product_object | 
| 1276 | 1276 | */ | 
| 1277 | -    public static function get_product_object ( $wc_product_id = 0, $product_type = '' ) { | |
| 1277 | +    public static function get_product_object($wc_product_id = 0, $product_type = '') { | |
| 1278 | 1278 | |
| 1279 | 1279 | $wc_product_object = false; | 
| 1280 | -        if ( 0 < intval( $wc_product_id ) ) { | |
| 1280 | +        if (0 < intval($wc_product_id)) { | |
| 1281 | 1281 | |
| 1282 | 1282 | // Get the product | 
| 1283 | -            if ( function_exists( 'wc_get_product' ) ) { | |
| 1283 | +            if (function_exists('wc_get_product')) { | |
| 1284 | 1284 | |
| 1285 | - $wc_product_object = wc_get_product( $wc_product_id ); // Post WC 2.3 | |
| 1285 | + $wc_product_object = wc_get_product($wc_product_id); // Post WC 2.3 | |
| 1286 | 1286 | |
| 1287 | -            } elseif ( function_exists( 'get_product' ) ) { | |
| 1287 | +            } elseif (function_exists('get_product')) { | |
| 1288 | 1288 | |
| 1289 | - $wc_product_object = get_product( $wc_product_id ); // Post WC 2.0 | |
| 1289 | + $wc_product_object = get_product($wc_product_id); // Post WC 2.0 | |
| 1290 | 1290 | |
| 1291 | 1291 |              } else { | 
| 1292 | 1292 | |
| 1293 | 1293 | // Pre WC 2.0 | 
| 1294 | -                if ( 'variation' == $product_type || 'subscription_variation' == $product_type ) { | |
| 1294 | +                if ('variation' == $product_type || 'subscription_variation' == $product_type) { | |
| 1295 | 1295 | |
| 1296 | - $wc_product_object = new WC_Product_Variation( $wc_product_id ); | |
| 1296 | + $wc_product_object = new WC_Product_Variation($wc_product_id); | |
| 1297 | 1297 | |
| 1298 | 1298 |                  } else { | 
| 1299 | 1299 | |
| 1300 | - $wc_product_object = new WC_Product( $wc_product_id ); | |
| 1300 | + $wc_product_object = new WC_Product($wc_product_id); | |
| 1301 | 1301 | |
| 1302 | 1302 | } // End If Statement | 
| 1303 | 1303 | |
| @@ -1320,19 +1320,19 @@ discard block | ||
| 1320 | 1320 | * | 
| 1321 | 1321 | * @return bool|int | 
| 1322 | 1322 | */ | 
| 1323 | -    public static function course_update ( $course_id = 0, $order_user = array()  ) { | |
| 1323 | +    public static function course_update($course_id = 0, $order_user = array()) { | |
| 1324 | 1324 | |
| 1325 | 1325 | global $current_user; | 
| 1326 | 1326 | |
| 1327 | - if ( ! isset( $current_user ) || !$current_user->ID > 0 ) return false; | |
| 1327 | + if ( ! isset($current_user) || ! $current_user->ID > 0) return false; | |
| 1328 | 1328 | |
| 1329 | 1329 | $data_update = false; | 
| 1330 | 1330 | |
| 1331 | 1331 | // Get the product ID | 
| 1332 | - $wc_post_id = get_post_meta( intval( $course_id ), '_course_woocommerce_product', true ); | |
| 1332 | + $wc_post_id = get_post_meta(intval($course_id), '_course_woocommerce_product', true); | |
| 1333 | 1333 | |
| 1334 | 1334 | // Check if in the admin | 
| 1335 | -        if ( is_admin() ) { | |
| 1335 | +        if (is_admin()) { | |
| 1336 | 1336 | |
| 1337 | 1337 | $user_login = $order_user['user_login']; | 
| 1338 | 1338 | $user_email = $order_user['user_email']; | 
| @@ -1349,28 +1349,28 @@ discard block | ||
| 1349 | 1349 | } // End If Statement | 
| 1350 | 1350 | |
| 1351 | 1351 | // This doesn't appear to be purely WooCommerce related. Should it be in a separate function? | 
| 1352 | - $course_prerequisite_id = (int) get_post_meta( $course_id, '_course_prerequisite', true ); | |
| 1353 | -        if( 0 < absint( $course_prerequisite_id ) ) { | |
| 1352 | + $course_prerequisite_id = (int) get_post_meta($course_id, '_course_prerequisite', true); | |
| 1353 | +        if (0 < absint($course_prerequisite_id)) { | |
| 1354 | 1354 | |
| 1355 | - $prereq_course_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, intval( $user_id ) ); | |
| 1356 | -            if ( ! $prereq_course_complete ) { | |
| 1355 | + $prereq_course_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, intval($user_id)); | |
| 1356 | +            if ( ! $prereq_course_complete) { | |
| 1357 | 1357 | |
| 1358 | 1358 | // Remove all course user meta | 
| 1359 | - return Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id ); | |
| 1359 | + return Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id); | |
| 1360 | 1360 | |
| 1361 | 1361 | } | 
| 1362 | 1362 | } | 
| 1363 | 1363 | |
| 1364 | - $is_user_taking_course = Sensei_Utils::user_started_course( intval( $course_id ), intval( $user_id ) ); | |
| 1364 | + $is_user_taking_course = Sensei_Utils::user_started_course(intval($course_id), intval($user_id)); | |
| 1365 | 1365 | |
| 1366 | 1366 | if ( ! $is_user_taking_course | 
| 1367 | 1367 | && Sensei_WC::is_woocommerce_active() | 
| 1368 | 1368 | && 0 < $wc_post_id | 
| 1369 | -            && Sensei_WC::has_customer_bought_product( $user_id, $wc_post_id ) ) { | |
| 1369 | +            && Sensei_WC::has_customer_bought_product($user_id, $wc_post_id)) { | |
| 1370 | 1370 | |
| 1371 | - $activity_logged = Sensei_Utils::user_start_course( intval( $user_id ), intval( $course_id ) ); | |
| 1371 | + $activity_logged = Sensei_Utils::user_start_course(intval($user_id), intval($course_id)); | |
| 1372 | 1372 | |
| 1373 | -	            if ( true == $activity_logged ) { | |
| 1373 | +	            if (true == $activity_logged) { | |
| 1374 | 1374 | |
| 1375 | 1375 | $is_user_taking_course = true; | 
| 1376 | 1376 | |
| @@ -1392,14 +1392,14 @@ discard block | ||
| 1392 | 1392 | * | 
| 1393 | 1393 | * @return boolean Modified guest checkout setting | 
| 1394 | 1394 | */ | 
| 1395 | -    public static function disable_guest_checkout( $guest_checkout ) { | |
| 1395 | +    public static function disable_guest_checkout($guest_checkout) { | |
| 1396 | 1396 | |
| 1397 | -        if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) { | |
| 1397 | +        if ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) { | |
| 1398 | 1398 | |
| 1399 | -            if( isset( WC()->cart->cart_contents ) && count( WC()->cart->cart_contents ) > 0 ) { | |
| 1399 | +            if (isset(WC()->cart->cart_contents) && count(WC()->cart->cart_contents) > 0) { | |
| 1400 | 1400 | |
| 1401 | -                foreach( WC()->cart->cart_contents as $cart_key => $product ) { | |
| 1402 | -                    if( isset( $product['product_id'] ) ) { | |
| 1401 | +                foreach (WC()->cart->cart_contents as $cart_key => $product) { | |
| 1402 | +                    if (isset($product['product_id'])) { | |
| 1403 | 1403 | |
| 1404 | 1404 | $args = array( | 
| 1405 | 1405 | 'posts_per_page' => -1, | 
| @@ -1412,11 +1412,11 @@ discard block | ||
| 1412 | 1412 | ) | 
| 1413 | 1413 | ); | 
| 1414 | 1414 | |
| 1415 | - $posts = get_posts( $args ); | |
| 1415 | + $posts = get_posts($args); | |
| 1416 | 1416 | |
| 1417 | -                        if( $posts && count( $posts ) > 0 ) { | |
| 1417 | +                        if ($posts && count($posts) > 0) { | |
| 1418 | 1418 | |
| 1419 | -                            foreach( $posts as $course ) { | |
| 1419 | +                            foreach ($posts as $course) { | |
| 1420 | 1420 | $guest_checkout = ''; | 
| 1421 | 1421 | break; | 
| 1422 | 1422 | |
| @@ -1445,23 +1445,23 @@ discard block | ||
| 1445 | 1445 | * | 
| 1446 | 1446 | * @return string | 
| 1447 | 1447 | **/ | 
| 1448 | -    public static function virtual_order_payment_complete( $order_status, $order_id ) { | |
| 1448 | +    public static function virtual_order_payment_complete($order_status, $order_id) { | |
| 1449 | 1449 | |
| 1450 | - $order = new WC_Order( $order_id ); | |
| 1450 | + $order = new WC_Order($order_id); | |
| 1451 | 1451 | |
| 1452 | - if ( ! isset ( $order ) ) return ''; | |
| 1452 | + if ( ! isset ($order)) return ''; | |
| 1453 | 1453 | |
| 1454 | -        if ( $order_status == 'wc-processing' && ( $order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed' ) ) { | |
| 1454 | +        if ($order_status == 'wc-processing' && ($order->post_status == 'wc-on-hold' || $order->post_status == 'wc-pending' || $order->post_status == 'wc-failed')) { | |
| 1455 | 1455 | |
| 1456 | 1456 | $virtual_order = true; | 
| 1457 | 1457 | |
| 1458 | -            if ( count( $order->get_items() ) > 0 ) { | |
| 1458 | +            if (count($order->get_items()) > 0) { | |
| 1459 | 1459 | |
| 1460 | -                foreach( $order->get_items() as $item ) { | |
| 1460 | +                foreach ($order->get_items() as $item) { | |
| 1461 | 1461 | |
| 1462 | -                    if ( $item['product_id'] > 0 ) { | |
| 1463 | - $_product = $order->get_product_from_item( $item ); | |
| 1464 | -                        if ( ! $_product->is_virtual() ) { | |
| 1462 | +                    if ($item['product_id'] > 0) { | |
| 1463 | + $_product = $order->get_product_from_item($item); | |
| 1464 | +                        if ( ! $_product->is_virtual()) { | |
| 1465 | 1465 | |
| 1466 | 1466 | $virtual_order = false; | 
| 1467 | 1467 | break; | 
| @@ -1475,7 +1475,7 @@ discard block | ||
| 1475 | 1475 | } // End If Statement | 
| 1476 | 1476 | |
| 1477 | 1477 | // virtual order, mark as completed | 
| 1478 | -            if ( $virtual_order ) { | |
| 1478 | +            if ($virtual_order) { | |
| 1479 | 1479 | |
| 1480 | 1480 | return 'completed'; | 
| 1481 | 1481 | |
| @@ -1498,14 +1498,14 @@ discard block | ||
| 1498 | 1498 | * @param integer $user_id | 
| 1499 | 1499 | * @return boolean $user_access_permission | 
| 1500 | 1500 | */ | 
| 1501 | -    public static function get_subscription_permission( $user_access_permission, $user_id ){ | |
| 1501 | +    public static function get_subscription_permission($user_access_permission, $user_id) { | |
| 1502 | 1502 | |
| 1503 | 1503 | global $post; | 
| 1504 | 1504 | |
| 1505 | 1505 | // ignore the current case if the following conditions are met | 
| 1506 | - if ( ! class_exists( 'WC_Subscriptions' ) || empty( $user_id ) | |
| 1507 | - || ! in_array( $post->post_type, array( 'course','lesson','quiz' ) ) | |
| 1508 | -            || ! wcs_user_has_subscription( $user_id) ){ | |
| 1506 | +        if ( ! class_exists('WC_Subscriptions') || empty($user_id) | |
| 1507 | +            || ! in_array($post->post_type, array('course', 'lesson', 'quiz')) | |
| 1508 | +            || ! wcs_user_has_subscription($user_id)) { | |
| 1509 | 1509 | |
| 1510 | 1510 | return $user_access_permission; | 
| 1511 | 1511 | |
| @@ -1515,25 +1515,25 @@ discard block | ||
| 1515 | 1515 | // is the subscription on the the current course? | 
| 1516 | 1516 | |
| 1517 | 1517 | $course_id = 0; | 
| 1518 | -        if ( 'course' == $post->post_type ){ | |
| 1518 | +        if ('course' == $post->post_type) { | |
| 1519 | 1519 | |
| 1520 | 1520 | $course_id = $post->ID; | 
| 1521 | 1521 | |
| 1522 | -        } elseif ( 'lesson' == $post->post_type ) { | |
| 1522 | +        } elseif ('lesson' == $post->post_type) { | |
| 1523 | 1523 | |
| 1524 | - $course_id = Sensei()->lesson->get_course_id( $post->ID ); | |
| 1524 | + $course_id = Sensei()->lesson->get_course_id($post->ID); | |
| 1525 | 1525 | |
| 1526 | 1526 |          } else { | 
| 1527 | 1527 | |
| 1528 | - $lesson_id = Sensei()->quiz->get_lesson_id( $post->ID ); | |
| 1529 | - $course_id = Sensei()->lesson->get_course_id( $lesson_id ); | |
| 1528 | + $lesson_id = Sensei()->quiz->get_lesson_id($post->ID); | |
| 1529 | + $course_id = Sensei()->lesson->get_course_id($lesson_id); | |
| 1530 | 1530 | |
| 1531 | 1531 | } | 
| 1532 | 1532 | |
| 1533 | 1533 | // if the course has no subscription WooCommerce product attached to return the permissions as is | 
| 1534 | - $product_id = Sensei_WC::get_course_product_id( $course_id ); | |
| 1535 | - $product = wc_get_product( $product_id ); | |
| 1536 | -        if( ! in_array( $product->get_type(), self::get_subscription_types() ) ){ | |
| 1534 | + $product_id = Sensei_WC::get_course_product_id($course_id); | |
| 1535 | + $product = wc_get_product($product_id); | |
| 1536 | +        if ( ! in_array($product->get_type(), self::get_subscription_types())) { | |
| 1537 | 1537 | |
| 1538 | 1538 | return $user_access_permission; | 
| 1539 | 1539 | |
| @@ -1541,19 +1541,19 @@ discard block | ||
| 1541 | 1541 | |
| 1542 | 1542 | // give access if user has active subscription on the product otherwise restrict it. | 
| 1543 | 1543 | // also check if the user was added to the course directly after the subscription started. | 
| 1544 | - if( wcs_user_has_subscription( $user_id, $product_id, 'active' ) | |
| 1545 | - || wcs_user_has_subscription( $user_id, $product_id, 'pending-cancel' ) | |
| 1546 | -            || self::was_user_added_without_subscription( $user_id, $product_id, $course_id  ) ){ | |
| 1544 | + if (wcs_user_has_subscription($user_id, $product_id, 'active') | |
| 1545 | + || wcs_user_has_subscription($user_id, $product_id, 'pending-cancel') | |
| 1546 | +            || self::was_user_added_without_subscription($user_id, $product_id, $course_id)) { | |
| 1547 | 1547 | |
| 1548 | 1548 | $user_access_permission = true; | 
| 1549 | 1549 | |
| 1550 | -        }else{ | |
| 1550 | +        } else { | |
| 1551 | 1551 | |
| 1552 | 1552 | $user_access_permission = false; | 
| 1553 | 1553 | // do not show the WC permissions message | 
| 1554 | - remove_filter( 'sensei_the_no_permissions_message', array( 'Sensei_WC', 'alter_no_permissions_message' ), 20, 2 ); | |
| 1555 | - Sensei()->permissions_message['title'] = __( 'No active subscription', 'woothemes-sensei' ); | |
| 1556 | - Sensei()->permissions_message['message'] = __( 'Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei' ); | |
| 1554 | +            remove_filter('sensei_the_no_permissions_message', array('Sensei_WC', 'alter_no_permissions_message'), 20, 2); | |
| 1555 | +            Sensei()->permissions_message['title'] = __('No active subscription', 'woothemes-sensei'); | |
| 1556 | +            Sensei()->permissions_message['message'] = __('Sorry, you do not have an access to this content without an active subscription.', 'woothemes-sensei'); | |
| 1557 | 1557 | } | 
| 1558 | 1558 | |
| 1559 | 1559 | return $user_access_permission; | 
| @@ -1566,9 +1566,9 @@ discard block | ||
| 1566 | 1566 | * @since 1.9.0 | 
| 1567 | 1567 | * @return array | 
| 1568 | 1568 | */ | 
| 1569 | -    public static function get_subscription_types(){ | |
| 1569 | +    public static function get_subscription_types() { | |
| 1570 | 1570 | |
| 1571 | - return array( 'subscription','subscription_variation','variable-subscription' ); | |
| 1571 | +        return array('subscription', 'subscription_variation', 'variable-subscription'); | |
| 1572 | 1572 | |
| 1573 | 1573 | } | 
| 1574 | 1574 | |
| @@ -1588,15 +1588,15 @@ discard block | ||
| 1588 | 1588 | * | 
| 1589 | 1589 | * @return bool | 
| 1590 | 1590 | */ | 
| 1591 | -    public static function was_user_added_without_subscription($user_id, $product_id, $course_id ){ | |
| 1591 | +    public static function was_user_added_without_subscription($user_id, $product_id, $course_id) { | |
| 1592 | 1592 | |
| 1593 | 1593 | $course_start_date = ''; | 
| 1594 | 1594 | $subscription_start_date = ''; | 
| 1595 | - $is_a_subscription =''; | |
| 1595 | + $is_a_subscription = ''; | |
| 1596 | 1596 | $was_user_added_without_subscription = true; | 
| 1597 | 1597 | |
| 1598 | 1598 | // if user is not on the course they were not added | 
| 1599 | -        if( ! Sensei_Utils::user_started_course( $course_id, $user_id ) ){ | |
| 1599 | +        if ( ! Sensei_Utils::user_started_course($course_id, $user_id)) { | |
| 1600 | 1600 | |
| 1601 | 1601 | return false; | 
| 1602 | 1602 | |
| @@ -1605,34 +1605,34 @@ discard block | ||
| 1605 | 1605 | // if user doesn't have a subscription and is taking the course | 
| 1606 | 1606 | // they were added manually | 
| 1607 | 1607 | if ( ! wcs_user_has_subscription($user_id, $product_id) | 
| 1608 | -            && Sensei_Utils::user_started_course( $course_id, get_current_user_id() )  ){ | |
| 1608 | +            && Sensei_Utils::user_started_course($course_id, get_current_user_id())) { | |
| 1609 | 1609 | |
| 1610 | 1610 | return true; | 
| 1611 | 1611 | |
| 1612 | 1612 | } | 
| 1613 | 1613 | |
| 1614 | - $course_status = Sensei_Utils::user_course_status( $course_id, $user_id ); | |
| 1614 | + $course_status = Sensei_Utils::user_course_status($course_id, $user_id); | |
| 1615 | 1615 | |
| 1616 | 1616 | // comparing dates setup data | 
| 1617 | - $course_start_date = date_create( $course_status->comment_date ); | |
| 1618 | - $subscriptions = wcs_get_users_subscriptions( $user_id ); | |
| 1617 | + $course_start_date = date_create($course_status->comment_date); | |
| 1618 | + $subscriptions = wcs_get_users_subscriptions($user_id); | |
| 1619 | 1619 | |
| 1620 | 1620 | // comparing every subscription | 
| 1621 | -        foreach( $subscriptions as $subscription ){ | |
| 1621 | +        foreach ($subscriptions as $subscription) { | |
| 1622 | 1622 | |
| 1623 | 1623 | // for the following statuses we know the user was not added | 
| 1624 | 1624 | // manually | 
| 1625 | 1625 | $status = $subscription->get_status(); | 
| 1626 | -            if ( in_array( $status, array( 'pending-canceled', 'active', 'on-hold', 'pending' ) ) ) { | |
| 1626 | +            if (in_array($status, array('pending-canceled', 'active', 'on-hold', 'pending'))) { | |
| 1627 | 1627 | |
| 1628 | 1628 | continue; | 
| 1629 | 1629 | |
| 1630 | 1630 | } | 
| 1631 | 1631 | |
| 1632 | - $current_subscription_start_date = date_create( $subscription->modified_date ); | |
| 1632 | + $current_subscription_start_date = date_create($subscription->modified_date); | |
| 1633 | 1633 | |
| 1634 | 1634 | // is the last updated subscription date newer than course start date | 
| 1635 | -            if (  $current_subscription_start_date > $course_start_date   ) { | |
| 1635 | +            if ($current_subscription_start_date > $course_start_date) { | |
| 1636 | 1636 | |
| 1637 | 1637 | return false; | 
| 1638 | 1638 | |
| @@ -1651,15 +1651,15 @@ discard block | ||
| 1651 | 1651 | * | 
| 1652 | 1652 | * @return array $orders | 
| 1653 | 1653 | */ | 
| 1654 | -	public static function get_user_product_orders( $user_id =  0, $product_id ) { | |
| 1654 | +	public static function get_user_product_orders($user_id = 0, $product_id) { | |
| 1655 | 1655 | |
| 1656 | - return get_posts( array( | |
| 1656 | + return get_posts(array( | |
| 1657 | 1657 | 'numberposts' => -1, | 
| 1658 | 1658 | 'post_type' => 'shop_order', | 
| 1659 | 1659 | 'meta_key' => '_customer_user', | 
| 1660 | - 'meta_value' => intval( $user_id ), | |
| 1661 | - 'post_status' => array( 'wc-processing', 'wc-completed' ), | |
| 1662 | - ) ); | |
| 1660 | + 'meta_value' => intval($user_id), | |
| 1661 | +			'post_status' => array('wc-processing', 'wc-completed'), | |
| 1662 | + )); | |
| 1663 | 1663 | |
| 1664 | 1664 | } | 
| 1665 | 1665 | |
| @@ -1675,12 +1675,12 @@ discard block | ||
| 1675 | 1675 | * | 
| 1676 | 1676 | * @return bool | 
| 1677 | 1677 | */ | 
| 1678 | -	public static function is_course_purchasable( $course_id = 0 ){ | |
| 1678 | +	public static function is_course_purchasable($course_id = 0) { | |
| 1679 | 1679 | |
| 1680 | -		if( ! self::is_woocommerce_active() ){ | |
| 1680 | +		if ( ! self::is_woocommerce_active()) { | |
| 1681 | 1681 | return false; | 
| 1682 | 1682 | } | 
| 1683 | - $course_product = wc_get_product( self::get_course_product_id( $course_id ) ); | |
| 1683 | + $course_product = wc_get_product(self::get_course_product_id($course_id)); | |
| 1684 | 1684 | |
| 1685 | 1685 | return $course_product->is_purchasable(); | 
| 1686 | 1686 | |
| @@ -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 | * Responsible for loading Sensei and setting up the Main WordPress hooks. | 
| @@ -142,22 +142,22 @@ discard block | ||
| 142 | 142 | * @param string $file The base file of the plugin. | 
| 143 | 143 | * @since 1.0.0 | 
| 144 | 144 | */ | 
| 145 | -    public function __construct ( $file ) { | |
| 145 | +    public function __construct($file) { | |
| 146 | 146 | |
| 147 | 147 | // Setup object data | 
| 148 | 148 | $this->file = $file; | 
| 149 | - $this->plugin_url = trailingslashit( plugins_url( '', $plugin = $file ) ); | |
| 150 | - $this->plugin_path = trailingslashit( dirname( $file ) ); | |
| 151 | - $this->template_url = apply_filters( 'sensei_template_url', 'sensei/' ); | |
| 149 | +        $this->plugin_url = trailingslashit(plugins_url('', $plugin = $file)); | |
| 150 | + $this->plugin_path = trailingslashit(dirname($file)); | |
| 151 | +        $this->template_url = apply_filters('sensei_template_url', 'sensei/'); | |
| 152 | 152 | |
| 153 | 153 | // Initialize the core Sensei functionality | 
| 154 | 154 | $this->init(); | 
| 155 | 155 | |
| 156 | 156 | // Installation | 
| 157 | - if ( is_admin() && ! defined( 'DOING_AJAX' ) ) $this->install(); | |
| 157 | +        if (is_admin() && ! defined('DOING_AJAX')) $this->install(); | |
| 158 | 158 | |
| 159 | 159 | // Run this on activation. | 
| 160 | - register_activation_hook( $this->file, array( $this, 'activation' ) ); | |
| 160 | + register_activation_hook($this->file, array($this, 'activation')); | |
| 161 | 161 | |
| 162 | 162 | // Image Sizes | 
| 163 | 163 | $this->init_image_sizes(); | 
| @@ -171,11 +171,11 @@ discard block | ||
| 171 | 171 | * Load the foundations of Sensei. | 
| 172 | 172 | * @since 1.9.0 | 
| 173 | 173 | */ | 
| 174 | -    protected function init(){ | |
| 174 | +    protected function init() { | |
| 175 | 175 | |
| 176 | 176 | // Localisation | 
| 177 | 177 | $this->load_plugin_textdomain(); | 
| 178 | - add_action( 'init', array( $this, 'load_localisation' ), 0 ); | |
| 178 | +        add_action('init', array($this, 'load_localisation'), 0); | |
| 179 | 179 | |
| 180 | 180 | // Setup settings | 
| 181 | 181 | $this->settings = new Sensei_Settings(); | 
| @@ -198,12 +198,12 @@ discard block | ||
| 198 | 198 | */ | 
| 199 | 199 |      public static function instance() { | 
| 200 | 200 | |
| 201 | -        if ( is_null( self::$_instance ) ) { | |
| 201 | +        if (is_null(self::$_instance)) { | |
| 202 | 202 | |
| 203 | 203 | //Sensei requires a reference to the main Sensei plugin file | 
| 204 | - $sensei_main_plugin_file = dirname ( dirname( __FILE__ ) ) . '/woothemes-sensei.php'; | |
| 204 | + $sensei_main_plugin_file = dirname(dirname(__FILE__)).'/woothemes-sensei.php'; | |
| 205 | 205 | |
| 206 | - self::$_instance = new self( $sensei_main_plugin_file ); | |
| 206 | + self::$_instance = new self($sensei_main_plugin_file); | |
| 207 | 207 | |
| 208 | 208 | // load the global class objects needed throughout Sensei | 
| 209 | 209 | self::$_instance->initialize_global_objects(); | 
| @@ -222,9 +222,9 @@ discard block | ||
| 222 | 222 | * | 
| 223 | 223 | * @param $plugin | 
| 224 | 224 | */ | 
| 225 | -    public static function activation_flush_rules( $plugin ){ | |
| 225 | +    public static function activation_flush_rules($plugin) { | |
| 226 | 226 | |
| 227 | -        if( strpos( $plugin, '/woothemes-sensei.php' ) > 0  ){ | |
| 227 | +        if (strpos($plugin, '/woothemes-sensei.php') > 0) { | |
| 228 | 228 | |
| 229 | 229 | flush_rewrite_rules(true); | 
| 230 | 230 | |
| @@ -237,7 +237,7 @@ discard block | ||
| 237 | 237 | * @since 1.8.0 | 
| 238 | 238 | */ | 
| 239 | 239 |      public function __clone() { | 
| 240 | - _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' ); | |
| 240 | +        _doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'woothemes-sensei'), '1.8'); | |
| 241 | 241 | } | 
| 242 | 242 | |
| 243 | 243 | /** | 
| @@ -245,7 +245,7 @@ discard block | ||
| 245 | 245 | * @since 1.8.0 | 
| 246 | 246 | */ | 
| 247 | 247 |      public function __wakeup() { | 
| 248 | - _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'woothemes-sensei' ), '1.8' ); | |
| 248 | +        _doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'woothemes-sensei'), '1.8'); | |
| 249 | 249 | } | 
| 250 | 250 | |
| 251 | 251 | /** | 
| @@ -253,13 +253,13 @@ discard block | ||
| 253 | 253 | * | 
| 254 | 254 | * @since 1.9.0 | 
| 255 | 255 | */ | 
| 256 | -    public function initialize_global_objects(){ | |
| 256 | +    public function initialize_global_objects() { | |
| 257 | 257 | |
| 258 | 258 | // Setup post types. | 
| 259 | 259 | $this->post_types = new Sensei_PostTypes(); | 
| 260 | 260 | |
| 261 | 261 | // Lad the updates class | 
| 262 | - $this->updates = new Sensei_Updates( $this ); | |
| 262 | + $this->updates = new Sensei_Updates($this); | |
| 263 | 263 | |
| 264 | 264 | // Load Course Results Class | 
| 265 | 265 | $this->course_results = new Sensei_Course_Results(); | 
| @@ -283,19 +283,19 @@ discard block | ||
| 283 | 283 | $this->load_modules_class(); | 
| 284 | 284 | |
| 285 | 285 | // Load Learner Management Functionality | 
| 286 | - $this->learners = new Sensei_Learner_Management( $this->file ); | |
| 286 | + $this->learners = new Sensei_Learner_Management($this->file); | |
| 287 | 287 | |
| 288 | 288 | // Differentiate between administration and frontend logic. | 
| 289 | -        if ( is_admin() ) { | |
| 289 | +        if (is_admin()) { | |
| 290 | 290 | |
| 291 | 291 | // Load Admin Welcome class | 
| 292 | 292 | new Sensei_Welcome(); | 
| 293 | 293 | |
| 294 | 294 | // Load Admin Class | 
| 295 | - $this->admin = new Sensei_Admin( $this->file ); | |
| 295 | + $this->admin = new Sensei_Admin($this->file); | |
| 296 | 296 | |
| 297 | 297 | // Load Analysis Reports | 
| 298 | - $this->analysis = new Sensei_Analysis( $this->file ); | |
| 298 | + $this->analysis = new Sensei_Analysis($this->file); | |
| 299 | 299 | |
| 300 | 300 |          } else { | 
| 301 | 301 | |
| @@ -312,10 +312,10 @@ discard block | ||
| 312 | 312 | } | 
| 313 | 313 | |
| 314 | 314 | // Load Grading Functionality | 
| 315 | - $this->grading = new Sensei_Grading( $this->file ); | |
| 315 | + $this->grading = new Sensei_Grading($this->file); | |
| 316 | 316 | |
| 317 | 317 | // Load Email Class | 
| 318 | - $this->emails = new Sensei_Emails( $this->file ); | |
| 318 | + $this->emails = new Sensei_Emails($this->file); | |
| 319 | 319 | |
| 320 | 320 | // Load Learner Profiles Class | 
| 321 | 321 | $this->learner_profiles = new Sensei_Learner_Profiles(); | 
| @@ -327,21 +327,21 @@ discard block | ||
| 327 | 327 | * | 
| 328 | 328 | * @since 1.9.0 | 
| 329 | 329 | */ | 
| 330 | -    public function load_hooks(){ | |
| 330 | +    public function load_hooks() { | |
| 331 | 331 | |
| 332 | - add_action( 'widgets_init', array( $this, 'register_widgets' ) ); | |
| 333 | - add_action( 'after_setup_theme', array( $this, 'ensure_post_thumbnails_support' ) ); | |
| 332 | +        add_action('widgets_init', array($this, 'register_widgets')); | |
| 333 | +        add_action('after_setup_theme', array($this, 'ensure_post_thumbnails_support')); | |
| 334 | 334 | |
| 335 | 335 | // Filter comment counts | 
| 336 | - add_filter( 'wp_count_comments', array( $this, 'sensei_count_comments' ), 10, 2 ); | |
| 336 | +        add_filter('wp_count_comments', array($this, 'sensei_count_comments'), 10, 2); | |
| 337 | 337 | |
| 338 | - add_action( 'body_class', array( $this, 'body_class' ) ); | |
| 338 | +        add_action('body_class', array($this, 'body_class')); | |
| 339 | 339 | |
| 340 | 340 | // Check for and activate JetPack LaTeX support | 
| 341 | - add_action( 'plugins_loaded', array( $this, 'jetpack_latex_support'), 200 ); // Runs after Jetpack has loaded it's modules | |
| 341 | +        add_action('plugins_loaded', array($this, 'jetpack_latex_support'), 200); // Runs after Jetpack has loaded it's modules | |
| 342 | 342 | |
| 343 | 343 | // check flush the rewrite rules if the option sensei_flush_rewrite_rules option is 1 | 
| 344 | - add_action( 'init', array( $this, 'flush_rewrite_rules'), 101 ); | |
| 344 | +        add_action('init', array($this, 'flush_rewrite_rules'), 101); | |
| 345 | 345 | |
| 346 | 346 | } | 
| 347 | 347 | |
| @@ -353,7 +353,7 @@ discard block | ||
| 353 | 353 | */ | 
| 354 | 354 |      public function run_updates() { | 
| 355 | 355 | // Run updates if administrator | 
| 356 | -        if ( current_user_can( 'manage_options' ) || current_user_can( 'manage_sensei' ) ) { | |
| 356 | +        if (current_user_can('manage_options') || current_user_can('manage_sensei')) { | |
| 357 | 357 | |
| 358 | 358 | $this->updates->update(); | 
| 359 | 359 | |
| @@ -366,21 +366,21 @@ discard block | ||
| 366 | 366 | * @since 1.0.0 | 
| 367 | 367 | * @return void | 
| 368 | 368 | */ | 
| 369 | -    public function register_widgets () { | |
| 369 | +    public function register_widgets() { | |
| 370 | 370 | // Widget List (key => value is filename => widget class). | 
| 371 | - $widget_list = apply_filters( 'sensei_registered_widgets_list', array( 'course-component' => 'Course_Component', | |
| 371 | +        $widget_list = apply_filters('sensei_registered_widgets_list', array('course-component' 	=> 'Course_Component', | |
| 372 | 372 | 'lesson-component' => 'Lesson_Component', | 
| 373 | 373 | 'course-categories' => 'Course_Categories', | 
| 374 | - 'category-courses' => 'Category_Courses' ) | |
| 374 | + 'category-courses' => 'Category_Courses') | |
| 375 | 375 | ); | 
| 376 | -        foreach ( $widget_list as $key => $value ) { | |
| 377 | -            if ( file_exists( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key  . '.php' ) ) { | |
| 378 | - require_once( $this->plugin_path . 'widgets/widget-woothemes-sensei-' . $key . '.php' ); | |
| 379 | - register_widget( 'WooThemes_Sensei_' . $value . '_Widget' ); | |
| 376 | +        foreach ($widget_list as $key => $value) { | |
| 377 | +            if (file_exists($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php')) { | |
| 378 | + require_once($this->plugin_path.'widgets/widget-woothemes-sensei-'.$key.'.php'); | |
| 379 | +                register_widget('WooThemes_Sensei_'.$value.'_Widget'); | |
| 380 | 380 | } | 
| 381 | 381 | } // End For Loop | 
| 382 | 382 | |
| 383 | - do_action( 'sensei_register_widgets' ); | |
| 383 | +        do_action('sensei_register_widgets'); | |
| 384 | 384 | |
| 385 | 385 | } // End register_widgets() | 
| 386 | 386 | |
| @@ -390,9 +390,9 @@ discard block | ||
| 390 | 390 | * @since 1.0.0 | 
| 391 | 391 | * @return void | 
| 392 | 392 | */ | 
| 393 | -    public function load_localisation () { | |
| 393 | +    public function load_localisation() { | |
| 394 | 394 | |
| 395 | - load_plugin_textdomain( 'woothemes-sensei', false, dirname( plugin_basename( $this->file ) ) . '/lang/' ); | |
| 395 | +        load_plugin_textdomain('woothemes-sensei', false, dirname(plugin_basename($this->file)).'/lang/'); | |
| 396 | 396 | |
| 397 | 397 | } // End load_localisation() | 
| 398 | 398 | |
| @@ -402,13 +402,13 @@ discard block | ||
| 402 | 402 | * @since 1.0.0 | 
| 403 | 403 | * @return void | 
| 404 | 404 | */ | 
| 405 | -    public function load_plugin_textdomain () { | |
| 405 | +    public function load_plugin_textdomain() { | |
| 406 | 406 | |
| 407 | 407 | $domain = 'woothemes-sensei'; | 
| 408 | 408 | // The "plugin_locale" filter is also used in load_plugin_textdomain() | 
| 409 | - $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); | |
| 410 | - load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' ); | |
| 411 | - load_plugin_textdomain( $domain, FALSE, dirname( plugin_basename( $this->file ) ) . '/lang/' ); | |
| 409 | +        $locale = apply_filters('plugin_locale', get_locale(), $domain); | |
| 410 | + load_textdomain($domain, WP_LANG_DIR.'/'.$domain.'/'.$domain.'-'.$locale.'.mo'); | |
| 411 | + load_plugin_textdomain($domain, FALSE, dirname(plugin_basename($this->file)).'/lang/'); | |
| 412 | 412 | |
| 413 | 413 | } // End load_plugin_textdomain() | 
| 414 | 414 | |
| @@ -418,7 +418,7 @@ discard block | ||
| 418 | 418 | * @since 1.0.0 | 
| 419 | 419 | * @return void | 
| 420 | 420 | */ | 
| 421 | -    public function activation () { | |
| 421 | +    public function activation() { | |
| 422 | 422 | |
| 423 | 423 | $this->register_plugin_version(); | 
| 424 | 424 | |
| @@ -431,10 +431,10 @@ discard block | ||
| 431 | 431 | * @since 1.0.0 | 
| 432 | 432 | * @return void | 
| 433 | 433 | */ | 
| 434 | -    public function install () { | |
| 434 | +    public function install() { | |
| 435 | 435 | |
| 436 | - register_activation_hook( $this->file, array( $this, 'activate_sensei' ) ); | |
| 437 | - register_activation_hook( $this->file, 'flush_rewrite_rules' ); | |
| 436 | + register_activation_hook($this->file, array($this, 'activate_sensei')); | |
| 437 | + register_activation_hook($this->file, 'flush_rewrite_rules'); | |
| 438 | 438 | |
| 439 | 439 | } // End install() | 
| 440 | 440 | |
| @@ -445,10 +445,10 @@ discard block | ||
| 445 | 445 | * @since 1.0.0 | 
| 446 | 446 | * @return void | 
| 447 | 447 | */ | 
| 448 | -    public function activate_sensei () { | |
| 448 | +    public function activate_sensei() { | |
| 449 | 449 | |
| 450 | - update_option( 'skip_install_sensei_pages', 0 ); | |
| 451 | - update_option( 'sensei_installed', 1 ); | |
| 450 | +        update_option('skip_install_sensei_pages', 0); | |
| 451 | +        update_option('sensei_installed', 1); | |
| 452 | 452 | |
| 453 | 453 | } // End activate_sensei() | 
| 454 | 454 | |
| @@ -458,10 +458,10 @@ discard block | ||
| 458 | 458 | * @since 1.0.0 | 
| 459 | 459 | * @return void | 
| 460 | 460 | */ | 
| 461 | -    private function register_plugin_version () { | |
| 462 | -        if ( $this->version != '' ) { | |
| 461 | +    private function register_plugin_version() { | |
| 462 | +        if ($this->version != '') { | |
| 463 | 463 | |
| 464 | - update_option( 'woothemes-sensei-version', $this->version ); | |
| 464 | +            update_option('woothemes-sensei-version', $this->version); | |
| 465 | 465 | |
| 466 | 466 | } | 
| 467 | 467 | } // End register_plugin_version() | 
| @@ -472,9 +472,9 @@ discard block | ||
| 472 | 472 | * @since 1.0.1 | 
| 473 | 473 | * @return void | 
| 474 | 474 | */ | 
| 475 | -    public function ensure_post_thumbnails_support () { | |
| 475 | +    public function ensure_post_thumbnails_support() { | |
| 476 | 476 | |
| 477 | -        if ( ! current_theme_supports( 'post-thumbnails' ) ) { add_theme_support( 'post-thumbnails' ); } | |
| 477 | +        if ( ! current_theme_supports('post-thumbnails')) { add_theme_support('post-thumbnails'); } | |
| 478 | 478 | |
| 479 | 479 | } // End ensure_post_thumbnails_support() | 
| 480 | 480 | |
| @@ -486,10 +486,10 @@ discard block | ||
| 486 | 486 | * @return void | 
| 487 | 487 | * @deprecated | 
| 488 | 488 | */ | 
| 489 | -    public function template_loader ( $template = '' ) { | |
| 489 | +    public function template_loader($template = '') { | |
| 490 | 490 | |
| 491 | - _deprecated_function( 'Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead' ); | |
| 492 | - Sensei_Templates::template_loader( $template ); | |
| 491 | +        _deprecated_function('Sensei()->template_loader', '1.9.0', 'Use Sensei_Templates::template_loader( $template ) instead'); | |
| 492 | + Sensei_Templates::template_loader($template); | |
| 493 | 493 | |
| 494 | 494 | } // End template_loader() | 
| 495 | 495 | |
| @@ -499,15 +499,15 @@ discard block | ||
| 499 | 499 | * @since 1.0.0 | 
| 500 | 500 | * @return string $sensei_plugin_path | 
| 501 | 501 | */ | 
| 502 | -    public function plugin_path () { | |
| 502 | +    public function plugin_path() { | |
| 503 | 503 | |
| 504 | -        if ( $this->plugin_path ) { | |
| 504 | +        if ($this->plugin_path) { | |
| 505 | 505 | |
| 506 | - $sensei_plugin_path = $this->plugin_path; | |
| 506 | + $sensei_plugin_path = $this->plugin_path; | |
| 507 | 507 | |
| 508 | -        }else{ | |
| 508 | +        } else { | |
| 509 | 509 | |
| 510 | - $sensei_plugin_path = plugin_dir_path( __FILE__ ); | |
| 510 | + $sensei_plugin_path = plugin_dir_path(__FILE__); | |
| 511 | 511 | |
| 512 | 512 | } | 
| 513 | 513 | |
| @@ -522,9 +522,9 @@ discard block | ||
| 522 | 522 | * @param string $page | 
| 523 | 523 | * @return int | 
| 524 | 524 | */ | 
| 525 | -    public function get_page_id ( $page ) { | |
| 526 | - $page = apply_filters( 'sensei_get_' . esc_attr( $page ) . '_page_id', get_option( 'sensei_' . esc_attr( $page ) . '_page_id' ) ); | |
| 527 | - return ( $page ) ? $page : -1; | |
| 525 | +    public function get_page_id($page) { | |
| 526 | +        $page = apply_filters('sensei_get_'.esc_attr($page).'_page_id', get_option('sensei_'.esc_attr($page).'_page_id')); | |
| 527 | + return ($page) ? $page : -1; | |
| 528 | 528 | } // End get_page_id() | 
| 529 | 529 | |
| 530 | 530 | /** | 
| @@ -535,48 +535,48 @@ discard block | ||
| 535 | 535 | * | 
| 536 | 536 | * @return bool | 
| 537 | 537 | */ | 
| 538 | -    public function check_user_permissions ( $page = '' ) { | |
| 538 | +    public function check_user_permissions($page = '') { | |
| 539 | 539 | |
| 540 | 540 | global $current_user, $post; | 
| 541 | 541 | |
| 542 | 542 | $user_allowed = false; | 
| 543 | 543 | |
| 544 | -        switch ( $page ) { | |
| 544 | +        switch ($page) { | |
| 545 | 545 | case 'course-single': | 
| 546 | 546 | // check for prerequisite course or lesson, | 
| 547 | - $course_prerequisite_id = (int) get_post_meta( $post->ID, '_course_prerequisite', true ); | |
| 548 | - $update_course = Sensei_WC::course_update( $post->ID ); | |
| 547 | + $course_prerequisite_id = (int) get_post_meta($post->ID, '_course_prerequisite', true); | |
| 548 | + $update_course = Sensei_WC::course_update($post->ID); | |
| 549 | 549 | |
| 550 | 550 | // Count completed lessons | 
| 551 | -		        if ( 0 < absint( $course_prerequisite_id ) ) { | |
| 551 | +		        if (0 < absint($course_prerequisite_id)) { | |
| 552 | 552 | |
| 553 | - $prerequisite_complete = Sensei_Utils::user_completed_course( $course_prerequisite_id, $current_user->ID ); | |
| 553 | + $prerequisite_complete = Sensei_Utils::user_completed_course($course_prerequisite_id, $current_user->ID); | |
| 554 | 554 | |
| 555 | 555 |  		        } else { | 
| 556 | 556 | $prerequisite_complete = true; | 
| 557 | 557 | } // End If Statement | 
| 558 | 558 | |
| 559 | 559 | // Handles restrictions on the course | 
| 560 | -		        if ( ( ! $prerequisite_complete && 0 < absint( $course_prerequisite_id ) ) ) { | |
| 560 | +		        if (( ! $prerequisite_complete && 0 < absint($course_prerequisite_id))) { | |
| 561 | 561 | |
| 562 | 562 | $user_allowed = false; | 
| 563 | - $course_link = '<a href="' . esc_url( get_permalink( $course_prerequisite_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>'; | |
| 564 | - $this->notices->add_notice( sprintf( __( 'Please complete the previous %1$s before taking this course.', 'woothemes-sensei' ), $course_link ), 'info' ); | |
| 563 | +			        $course_link  = '<a href="'.esc_url(get_permalink($course_prerequisite_id)).'">'.__('course', 'woothemes-sensei').'</a>'; | |
| 564 | +			        $this->notices->add_notice(sprintf(__('Please complete the previous %1$s before taking this course.', 'woothemes-sensei'), $course_link), 'info'); | |
| 565 | 565 | |
| 566 | -		        } elseif( Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable( $post->ID ) && ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) { | |
| 566 | +		        } elseif (Sensei_WC::is_woocommerce_active() && Sensei_WC::is_course_purchasable($post->ID) && ! Sensei_Utils::user_started_course($post->ID, $current_user->ID)) { | |
| 567 | 567 | |
| 568 | - $message = sprintf( __( 'Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei' ), '<a href="'.sensei_user_login_url().'">', '</a>' ); | |
| 569 | - $this->notices->add_notice( $message, 'info' ); | |
| 568 | +			        $message = sprintf(__('Or %1$s login %2$s to access your purchased courses', 'woothemes-sensei'), '<a href="'.sensei_user_login_url().'">', '</a>'); | |
| 569 | + $this->notices->add_notice($message, 'info'); | |
| 570 | 570 | |
| 571 | 571 | |
| 572 | -		        } elseif ( ! Sensei_Utils::user_started_course( $post->ID, $current_user->ID )  ) { | |
| 572 | +		        } elseif ( ! Sensei_Utils::user_started_course($post->ID, $current_user->ID)) { | |
| 573 | 573 | |
| 574 | 574 | // users who haven't started the course are allowed to view it | 
| 575 | - $user_allowed = true; | |
| 575 | + $user_allowed = true; | |
| 576 | 576 | |
| 577 | 577 | |
| 578 | 578 | |
| 579 | -		        } else  { | |
| 579 | +		        } else { | |
| 580 | 580 | |
| 581 | 581 | $user_allowed = true; | 
| 582 | 582 | |
| @@ -584,60 +584,60 @@ discard block | ||
| 584 | 584 | break; | 
| 585 | 585 | case 'lesson-single': | 
| 586 | 586 | // Check for WC purchase | 
| 587 | - $lesson_course_id = get_post_meta( $post->ID, '_lesson_course',true ); | |
| 587 | + $lesson_course_id = get_post_meta($post->ID, '_lesson_course', true); | |
| 588 | 588 | |
| 589 | - $update_course = Sensei_WC::course_update( $lesson_course_id ); | |
| 590 | - $is_preview = Sensei_Utils::is_preview_lesson( $post->ID ); | |
| 589 | + $update_course = Sensei_WC::course_update($lesson_course_id); | |
| 590 | + $is_preview = Sensei_Utils::is_preview_lesson($post->ID); | |
| 591 | 591 | |
| 592 | -                if ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) { | |
| 592 | +                if ($this->access_settings() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) { | |
| 593 | 593 | $user_allowed = true; | 
| 594 | -                } elseif( $this->access_settings() && false == $is_preview ) { | |
| 594 | +                } elseif ($this->access_settings() && false == $is_preview) { | |
| 595 | 595 | |
| 596 | 596 | $user_allowed = true; | 
| 597 | 597 | |
| 598 | 598 |                  } else { | 
| 599 | -                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' ); | |
| 600 | - $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>'; | |
| 601 | - $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true ); | |
| 602 | -                    if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) { | |
| 603 | -                        if ( $is_preview ) { | |
| 604 | -                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link ); | |
| 599 | +                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei'); | |
| 600 | +                    $course_link = '<a href="'.esc_url(get_permalink($lesson_course_id)).'">'.__('course', 'woothemes-sensei').'</a>'; | |
| 601 | + $wc_post_id = get_post_meta($lesson_course_id, '_course_woocommerce_product', true); | |
| 602 | +                    if (Sensei_WC::is_woocommerce_active() && (0 < $wc_post_id)) { | |
| 603 | +                        if ($is_preview) { | |
| 604 | +                            $this->permissions_message['message'] = sprintf(__('This is a preview lesson. Please purchase the %1$s to access all lessons.', 'woothemes-sensei'), $course_link); | |
| 605 | 605 |                          } else { | 
| 606 | -                            $this->permissions_message['message'] =  sprintf( __('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei' ), $course_link ); | |
| 606 | +                            $this->permissions_message['message'] = sprintf(__('Please purchase the %1$s before starting this Lesson.', 'woothemes-sensei'), $course_link); | |
| 607 | 607 | } | 
| 608 | 608 |                      } else { | 
| 609 | -                        if ( $is_preview ) { | |
| 610 | -                            $this->permissions_message['message'] = sprintf( __('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei' ), $course_link ); | |
| 609 | +                        if ($is_preview) { | |
| 610 | +                            $this->permissions_message['message'] = sprintf(__('This is a preview lesson. Please sign up for the %1$s to access all lessons.', 'woothemes-sensei'), $course_link); | |
| 611 | 611 |                          } else { | 
| 612 | 612 | /** This filter is documented in class-woothemes-sensei-frontend.php */ | 
| 613 | - $this->permissions_message['message'] = sprintf( __( 'Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei' ), $course_link ); | |
| 613 | +                            $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before starting the lesson.', 'woothemes-sensei'), $course_link); | |
| 614 | 614 | } | 
| 615 | 615 | } // End If Statement | 
| 616 | 616 | } // End If Statement | 
| 617 | 617 | break; | 
| 618 | 618 | case 'quiz-single': | 
| 619 | - $lesson_id = get_post_meta( $post->ID, '_quiz_lesson',true ); | |
| 620 | - $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course',true ); | |
| 619 | + $lesson_id = get_post_meta($post->ID, '_quiz_lesson', true); | |
| 620 | + $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true); | |
| 621 | 621 | |
| 622 | - $update_course = Sensei_WC::course_update( $lesson_course_id ); | |
| 623 | -                if ( ( $this->access_settings() && Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) ) || sensei_all_access() ) { | |
| 622 | + $update_course = Sensei_WC::course_update($lesson_course_id); | |
| 623 | +                if (($this->access_settings() && Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID)) || sensei_all_access()) { | |
| 624 | 624 | |
| 625 | 625 | // Check for prerequisite lesson for this quiz | 
| 626 | - $lesson_prerequisite_id = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true); | |
| 627 | - $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson( $lesson_prerequisite_id, $current_user->ID); | |
| 626 | + $lesson_prerequisite_id = (int) get_post_meta($lesson_id, '_lesson_prerequisite', true); | |
| 627 | + $user_lesson_prerequisite_complete = Sensei_Utils::user_completed_lesson($lesson_prerequisite_id, $current_user->ID); | |
| 628 | 628 | |
| 629 | 629 | // Handle restrictions | 
| 630 | -                    if( sensei_all_access() ) { | |
| 630 | +                    if (sensei_all_access()) { | |
| 631 | 631 | |
| 632 | 632 | $user_allowed = true; | 
| 633 | 633 | |
| 634 | 634 |                      } else { | 
| 635 | 635 | |
| 636 | -                        if ( 0 < absint( $lesson_prerequisite_id ) && ( !$user_lesson_prerequisite_complete ) ) { | |
| 636 | +                        if (0 < absint($lesson_prerequisite_id) && ( ! $user_lesson_prerequisite_complete)) { | |
| 637 | 637 | |
| 638 | -                            $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' ); | |
| 639 | - $lesson_link = '<a href="' . esc_url( get_permalink( $lesson_prerequisite_id ) ) . '">' . __( 'lesson', 'woothemes-sensei' ) . '</a>'; | |
| 640 | -                            $this->permissions_message['message'] = sprintf( __('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei' ), $lesson_link ); | |
| 638 | +                            $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei'); | |
| 639 | +                            $lesson_link = '<a href="'.esc_url(get_permalink($lesson_prerequisite_id)).'">'.__('lesson', 'woothemes-sensei').'</a>'; | |
| 640 | +                            $this->permissions_message['message'] = sprintf(__('Please complete the previous %1$s before taking this Quiz.', 'woothemes-sensei'), $lesson_link); | |
| 641 | 641 | |
| 642 | 642 |                          } else { | 
| 643 | 643 | |
| @@ -645,27 +645,27 @@ discard block | ||
| 645 | 645 | |
| 646 | 646 | } // End If Statement | 
| 647 | 647 | } // End If Statement | 
| 648 | -                } elseif( $this->access_settings() ) { | |
| 648 | +                } elseif ($this->access_settings()) { | |
| 649 | 649 | // Check if the user has started the course | 
| 650 | 650 | |
| 651 | -                    if ( is_user_logged_in() && ! Sensei_Utils::user_started_course( $lesson_course_id, $current_user->ID ) && ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) ) { | |
| 651 | +                    if (is_user_logged_in() && ! Sensei_Utils::user_started_course($lesson_course_id, $current_user->ID) && (isset($this->settings->settings['access_permission']) && (true == $this->settings->settings['access_permission']))) { | |
| 652 | 652 | |
| 653 | 653 | $user_allowed = false; | 
| 654 | -                        $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' ); | |
| 655 | - $course_link = '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>'; | |
| 656 | - $wc_post_id = get_post_meta( $lesson_course_id, '_course_woocommerce_product',true ); | |
| 657 | -                        if ( Sensei_WC::is_woocommerce_active() && ( 0 < $wc_post_id ) ) { | |
| 658 | -                            $this->permissions_message['message'] = sprintf( __('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link ); | |
| 654 | +                        $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei'); | |
| 655 | +                        $course_link = '<a href="'.esc_url(get_permalink($lesson_course_id)).'">'.__('course', 'woothemes-sensei').'</a>'; | |
| 656 | + $wc_post_id = get_post_meta($lesson_course_id, '_course_woocommerce_product', true); | |
| 657 | +                        if (Sensei_WC::is_woocommerce_active() && (0 < $wc_post_id)) { | |
| 658 | +                            $this->permissions_message['message'] = sprintf(__('Please purchase the %1$s before starting this Quiz.', 'woothemes-sensei'), $course_link); | |
| 659 | 659 |                          } else { | 
| 660 | -                            $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei' ), $course_link ); | |
| 660 | +                            $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before starting this Quiz.', 'woothemes-sensei'), $course_link); | |
| 661 | 661 | } // End If Statement | 
| 662 | 662 |                      } else { | 
| 663 | 663 | $user_allowed = true; | 
| 664 | 664 | } // End If Statement | 
| 665 | 665 |                  } else { | 
| 666 | -                    $this->permissions_message['title'] = get_the_title( $post->ID ) . ': ' . __('Restricted Access', 'woothemes-sensei' ); | |
| 667 | - $course_link = '<a href="' . esc_url( get_permalink( get_post_meta( get_post_meta( $post->ID, '_quiz_lesson', true ), '_lesson_course', true ) ) ) . '">' . __( 'course', 'woothemes-sensei' ) . '</a>'; | |
| 668 | -                    $this->permissions_message['message'] = sprintf( __('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei' ), $course_link ); | |
| 666 | +                    $this->permissions_message['title'] = get_the_title($post->ID).': '.__('Restricted Access', 'woothemes-sensei'); | |
| 667 | +                    $course_link = '<a href="'.esc_url(get_permalink(get_post_meta(get_post_meta($post->ID, '_quiz_lesson', true), '_lesson_course', true))).'">'.__('course', 'woothemes-sensei').'</a>'; | |
| 668 | +                    $this->permissions_message['message'] = sprintf(__('Please sign up for the %1$s before taking this Quiz.', 'woothemes-sensei'), $course_link); | |
| 669 | 669 | } // End If Statement | 
| 670 | 670 | break; | 
| 671 | 671 | default: | 
| @@ -687,11 +687,11 @@ discard block | ||
| 687 | 687 | * } | 
| 688 | 688 | * @param string $post_id | 
| 689 | 689 | */ | 
| 690 | - $this->permissions_message = apply_filters( 'sensei_permissions_message', $this->permissions_message, $post->ID ); | |
| 690 | +        $this->permissions_message = apply_filters('sensei_permissions_message', $this->permissions_message, $post->ID); | |
| 691 | 691 | |
| 692 | 692 | // add the permissions message to the stack | 
| 693 | 693 | |
| 694 | -        if( sensei_all_access() || Sensei_Utils::is_preview_lesson( $post->ID ) ) { | |
| 694 | +        if (sensei_all_access() || Sensei_Utils::is_preview_lesson($post->ID)) { | |
| 695 | 695 | $user_allowed = true; | 
| 696 | 696 | } | 
| 697 | 697 | |
| @@ -705,7 +705,7 @@ discard block | ||
| 705 | 705 | * @param integer $user_id | 
| 706 | 706 | * | 
| 707 | 707 | */ | 
| 708 | - return apply_filters( 'sensei_access_permissions', $user_allowed, $current_user->ID ); | |
| 708 | +        return apply_filters('sensei_access_permissions', $user_allowed, $current_user->ID); | |
| 709 | 709 | |
| 710 | 710 | } // End get_placeholder_image() | 
| 711 | 711 | |
| @@ -716,12 +716,12 @@ discard block | ||
| 716 | 716 | * @access public | 
| 717 | 717 | * @return bool | 
| 718 | 718 | */ | 
| 719 | -    public function access_settings () { | |
| 719 | +    public function access_settings() { | |
| 720 | 720 | |
| 721 | - if( sensei_all_access() ) return true; | |
| 721 | + if (sensei_all_access()) return true; | |
| 722 | 722 | |
| 723 | -        if ( isset( $this->settings->settings['access_permission'] ) && ( true == $this->settings->settings['access_permission'] ) ) { | |
| 724 | -            if ( is_user_logged_in() ) { | |
| 723 | +        if (isset($this->settings->settings['access_permission']) && (true == $this->settings->settings['access_permission'])) { | |
| 724 | +            if (is_user_logged_in()) { | |
| 725 | 725 | return true; | 
| 726 | 726 |              } else { | 
| 727 | 727 | return false; | 
| @@ -737,9 +737,9 @@ discard block | ||
| 737 | 737 | * @access public | 
| 738 | 738 | * @return void | 
| 739 | 739 | */ | 
| 740 | -    public function load_class ( $class_name = '' ) { | |
| 741 | -        if ( '' != $class_name && '' != $this->token ) { | |
| 742 | - require_once( 'class-' . esc_attr( $this->token ) . '-' . esc_attr( $class_name ) . '.php' ); | |
| 740 | +    public function load_class($class_name = '') { | |
| 741 | +        if ('' != $class_name && '' != $this->token) { | |
| 742 | +            require_once('class-'.esc_attr($this->token).'-'.esc_attr($class_name).'.php'); | |
| 743 | 743 | } // End If Statement | 
| 744 | 744 | } // End load_class() | 
| 745 | 745 | |
| @@ -751,44 +751,44 @@ discard block | ||
| 751 | 751 | * @param integer $post_id | 
| 752 | 752 | * @return array | 
| 753 | 753 | */ | 
| 754 | -    public function sensei_count_comments( $comments, $post_id ) { | |
| 754 | +    public function sensei_count_comments($comments, $post_id) { | |
| 755 | 755 | global $wpdb; | 
| 756 | 756 | |
| 757 | 757 | $post_id = (int) $post_id; | 
| 758 | 758 | |
| 759 | 759 |          $count = wp_cache_get("comments-{$post_id}", 'counts'); | 
| 760 | 760 | |
| 761 | -        if ( false !== $count ) { | |
| 761 | +        if (false !== $count) { | |
| 762 | 762 | return $count; | 
| 763 | 763 | } | 
| 764 | 764 | |
| 765 | - $statuses = array( '' ); // Default to the WP normal comments | |
| 766 | -        $stati = $wpdb->get_results( "SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A ); | |
| 767 | -        foreach ( (array) $stati AS $status ) { | |
| 768 | -            if ( 'sensei_' != substr($status['comment_type'], 0, 7 ) ) { | |
| 765 | +        $statuses = array(''); // Default to the WP normal comments | |
| 766 | +        $stati = $wpdb->get_results("SELECT comment_type FROM {$wpdb->comments} GROUP BY comment_type", ARRAY_A); | |
| 767 | +        foreach ((array) $stati AS $status) { | |
| 768 | +            if ('sensei_' != substr($status['comment_type'], 0, 7)) { | |
| 769 | 769 | $statuses[] = $status['comment_type']; | 
| 770 | 770 | } | 
| 771 | 771 | } | 
| 772 | -        $where = "WHERE comment_type IN ('" . join("', '", array_unique( $statuses ) ) . "')"; | |
| 772 | +        $where = "WHERE comment_type IN ('".join("', '", array_unique($statuses))."')"; | |
| 773 | 773 | |
| 774 | - if ( $post_id > 0 ) | |
| 775 | - $where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id ); | |
| 774 | + if ($post_id > 0) | |
| 775 | +            $where .= $wpdb->prepare(" AND comment_post_ID = %d", $post_id); | |
| 776 | 776 | |
| 777 | -        $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A ); | |
| 777 | +        $count = $wpdb->get_results("SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A); | |
| 778 | 778 | |
| 779 | 779 | $total = 0; | 
| 780 | 780 |          $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed'); | 
| 781 | -        foreach ( (array) $count as $row ) { | |
| 781 | +        foreach ((array) $count as $row) { | |
| 782 | 782 | // Don't count post-trashed toward totals | 
| 783 | - if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) | |
| 783 | +            if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved']) | |
| 784 | 784 | $total += $row['num_comments']; | 
| 785 | - if ( isset( $approved[$row['comment_approved']] ) ) | |
| 785 | + if (isset($approved[$row['comment_approved']])) | |
| 786 | 786 | $stats[$approved[$row['comment_approved']]] = $row['num_comments']; | 
| 787 | 787 | } | 
| 788 | 788 | |
| 789 | 789 | $stats['total_comments'] = $total; | 
| 790 | -        foreach ( $approved as $key ) { | |
| 791 | - if ( empty($stats[$key]) ) | |
| 790 | +        foreach ($approved as $key) { | |
| 791 | + if (empty($stats[$key])) | |
| 792 | 792 | $stats[$key] = 0; | 
| 793 | 793 | } | 
| 794 | 794 | |
| @@ -806,15 +806,15 @@ discard block | ||
| 806 | 806 | * @return void | 
| 807 | 807 | */ | 
| 808 | 808 |      public function init_image_sizes() { | 
| 809 | - $course_archive_thumbnail = $this->get_image_size( 'course_archive_image' ); | |
| 810 | - $course_single_thumbnail = $this->get_image_size( 'course_single_image' ); | |
| 811 | - $lesson_archive_thumbnail = $this->get_image_size( 'lesson_archive_image' ); | |
| 812 | - $lesson_single_thumbnail = $this->get_image_size( 'lesson_single_image' ); | |
| 813 | - | |
| 814 | - add_image_size( 'course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop'] ); | |
| 815 | - add_image_size( 'course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop'] ); | |
| 816 | - add_image_size( 'lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop'] ); | |
| 817 | - add_image_size( 'lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop'] ); | |
| 809 | +        $course_archive_thumbnail 	= $this->get_image_size('course_archive_image'); | |
| 810 | +        $course_single_thumbnail	= $this->get_image_size('course_single_image'); | |
| 811 | +        $lesson_archive_thumbnail 	= $this->get_image_size('lesson_archive_image'); | |
| 812 | +        $lesson_single_thumbnail	= $this->get_image_size('lesson_single_image'); | |
| 813 | + | |
| 814 | +        add_image_size('course_archive_thumbnail', $course_archive_thumbnail['width'], $course_archive_thumbnail['height'], $course_archive_thumbnail['crop']); | |
| 815 | +        add_image_size('course_single_thumbnail', $course_single_thumbnail['width'], $course_single_thumbnail['height'], $course_single_thumbnail['crop']); | |
| 816 | +        add_image_size('lesson_archive_thumbnail', $lesson_archive_thumbnail['width'], $lesson_archive_thumbnail['height'], $lesson_archive_thumbnail['crop']); | |
| 817 | +        add_image_size('lesson_single_thumbnail', $lesson_single_thumbnail['width'], $lesson_single_thumbnail['height'], $lesson_single_thumbnail['crop']); | |
| 818 | 818 | } | 
| 819 | 819 | |
| 820 | 820 | /** | 
| @@ -827,37 +827,37 @@ discard block | ||
| 827 | 827 | * @param mixed $image_size | 
| 828 | 828 | * @return string | 
| 829 | 829 | */ | 
| 830 | -    public function get_image_size( $image_size ) { | |
| 830 | +    public function get_image_size($image_size) { | |
| 831 | 831 | |
| 832 | 832 | // Only return sizes we define in settings | 
| 833 | - if ( ! in_array( $image_size, array( 'course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image' ) ) ) | |
| 834 | - return apply_filters( 'sensei_get_image_size_' . $image_size, '' ); | |
| 833 | +        if ( ! in_array($image_size, array('course_archive_image', 'course_single_image', 'lesson_archive_image', 'lesson_single_image'))) | |
| 834 | +            return apply_filters('sensei_get_image_size_'.$image_size, ''); | |
| 835 | 835 | |
| 836 | -        if( ! isset( $this->settings->settings[ $image_size . '_width' ] ) ) { | |
| 837 | - $this->settings->settings[ $image_size . '_width' ] = false; | |
| 836 | +        if ( ! isset($this->settings->settings[$image_size.'_width'])) { | |
| 837 | + $this->settings->settings[$image_size.'_width'] = false; | |
| 838 | 838 | } | 
| 839 | -        if( ! isset( $this->settings->settings[ $image_size . '_height' ] ) ) { | |
| 840 | - $this->settings->settings[ $image_size . '_height' ] = false; | |
| 839 | +        if ( ! isset($this->settings->settings[$image_size.'_height'])) { | |
| 840 | + $this->settings->settings[$image_size.'_height'] = false; | |
| 841 | 841 | } | 
| 842 | -        if( ! isset( $this->settings->settings[ $image_size . '_hard_crop' ] ) ) { | |
| 843 | - $this->settings->settings[ $image_size . '_hard_crop' ] = false; | |
| 842 | +        if ( ! isset($this->settings->settings[$image_size.'_hard_crop'])) { | |
| 843 | + $this->settings->settings[$image_size.'_hard_crop'] = false; | |
| 844 | 844 | } | 
| 845 | 845 | |
| 846 | - $size = array_filter( array( | |
| 847 | - 'width' => $this->settings->settings[ $image_size . '_width' ], | |
| 848 | - 'height' => $this->settings->settings[ $image_size . '_height' ], | |
| 849 | - 'crop' => $this->settings->settings[ $image_size . '_hard_crop' ] | |
| 850 | - ) ); | |
| 846 | + $size = array_filter(array( | |
| 847 | + 'width' => $this->settings->settings[$image_size.'_width'], | |
| 848 | + 'height' => $this->settings->settings[$image_size.'_height'], | |
| 849 | + 'crop' => $this->settings->settings[$image_size.'_hard_crop'] | |
| 850 | + )); | |
| 851 | 851 | |
| 852 | - $size['width'] = isset( $size['width'] ) ? $size['width'] : '100'; | |
| 853 | - $size['height'] = isset( $size['height'] ) ? $size['height'] : '100'; | |
| 854 | - $size['crop'] = isset( $size['crop'] ) ? $size['crop'] : 0; | |
| 852 | + $size['width'] = isset($size['width']) ? $size['width'] : '100'; | |
| 853 | + $size['height'] = isset($size['height']) ? $size['height'] : '100'; | |
| 854 | + $size['crop'] = isset($size['crop']) ? $size['crop'] : 0; | |
| 855 | 855 | |
| 856 | - return apply_filters( 'sensei_get_image_size_' . $image_size, $size ); | |
| 856 | +        return apply_filters('sensei_get_image_size_'.$image_size, $size); | |
| 857 | 857 | } | 
| 858 | 858 | |
| 859 | -    public function body_class( $classes ) { | |
| 860 | -        if( is_sensei() ) { | |
| 859 | +    public function body_class($classes) { | |
| 860 | +        if (is_sensei()) { | |
| 861 | 861 | $classes[] = 'sensei'; | 
| 862 | 862 | } | 
| 863 | 863 | return $classes; | 
| @@ -870,9 +870,9 @@ discard block | ||
| 870 | 870 | * @since 1.7.0 | 
| 871 | 871 | */ | 
| 872 | 872 |      public function jetpack_latex_support() { | 
| 873 | -        if ( function_exists( 'latex_markup') ) { | |
| 874 | - add_filter( 'sensei_question_title', 'latex_markup' ); | |
| 875 | - add_filter( 'sensei_answer_text', 'latex_markup' ); | |
| 873 | +        if (function_exists('latex_markup')) { | |
| 874 | +            add_filter('sensei_question_title', 'latex_markup'); | |
| 875 | +            add_filter('sensei_answer_text', 'latex_markup'); | |
| 876 | 876 | } | 
| 877 | 877 | } | 
| 878 | 878 | |
| @@ -884,21 +884,21 @@ discard block | ||
| 884 | 884 | * | 
| 885 | 885 | * @since 1.8.0 | 
| 886 | 886 | */ | 
| 887 | -    public function load_modules_class(){ | |
| 887 | +    public function load_modules_class() { | |
| 888 | 888 | global $sensei_modules; | 
| 889 | 889 | |
| 890 | - if( !class_exists( 'Sensei_Modules' ) | |
| 891 | -            &&  'Sensei_Modules' != get_class( $sensei_modules ) ) { | |
| 890 | +        if ( ! class_exists('Sensei_Modules') | |
| 891 | +            &&  'Sensei_Modules' != get_class($sensei_modules)) { | |
| 892 | 892 | |
| 893 | 893 | //Load the modules class | 
| 894 | - require_once( 'class-sensei-modules.php'); | |
| 895 | - Sensei()->modules = new Sensei_Core_Modules( $this->file ); | |
| 894 | +            require_once('class-sensei-modules.php'); | |
| 895 | + Sensei()->modules = new Sensei_Core_Modules($this->file); | |
| 896 | 896 | |
| 897 | -        }else{ | |
| 897 | +        } else { | |
| 898 | 898 | // fallback for people still using the modules extension. | 
| 899 | 899 | global $sensei_modules; | 
| 900 | 900 | Sensei()->modules = $sensei_modules; | 
| 901 | - add_action( 'admin_notices', array( $this, 'disable_sensei_modules_extension'), 30 ); | |
| 901 | +            add_action('admin_notices', array($this, 'disable_sensei_modules_extension'), 30); | |
| 902 | 902 | } | 
| 903 | 903 | } | 
| 904 | 904 | |
| @@ -907,12 +907,12 @@ discard block | ||
| 907 | 907 | * | 
| 908 | 908 | * @since 1.8.0 | 
| 909 | 909 | */ | 
| 910 | -    public function disable_sensei_modules_extension(){ ?> | |
| 910 | +    public function disable_sensei_modules_extension() { ?> | |
| 911 | 911 | <div class="notice updated fade"> | 
| 912 | 912 | <p> | 
| 913 | 913 | <?php | 
| 914 | 914 | $plugin_manage_url = admin_url().'plugins.php#sensei-modules'; | 
| 915 | - $plugin_link_element = '<a href="' . $plugin_manage_url . '" >plugins page</a> '; | |
| 915 | + $plugin_link_element = '<a href="'.$plugin_manage_url.'" >plugins page</a> '; | |
| 916 | 916 | ?> | 
| 917 | 917 | <strong> Modules are now included in Sensei,</strong> so you no longer need the Sensei Modules extension. | 
| 918 | 918 | Please deactivate and delete it from your <?php echo $plugin_link_element; ?>. (This will not affect your existing modules). | 
| @@ -930,18 +930,18 @@ discard block | ||
| 930 | 930 | * | 
| 931 | 931 | * @since 1.9.0 | 
| 932 | 932 | */ | 
| 933 | -    public function flush_rewrite_rules(){ | |
| 933 | +    public function flush_rewrite_rules() { | |
| 934 | 934 | |
| 935 | 935 | // ensures that the rewrite rules are flushed on the second | 
| 936 | 936 | // attempt. This ensure that the settings for any other process | 
| 937 | 937 | // have been completed and saved to the database before we refresh the | 
| 938 | 938 | // rewrite rules. | 
| 939 | -        $option =  get_option('sensei_flush_rewrite_rules'); | |
| 940 | -        if( '1' == $option ) { | |
| 939 | +        $option = get_option('sensei_flush_rewrite_rules'); | |
| 940 | +        if ('1' == $option) { | |
| 941 | 941 | |
| 942 | 942 |              update_option('sensei_flush_rewrite_rules', '2'); | 
| 943 | 943 | |
| 944 | -        }elseif( '2' == $option ) { | |
| 944 | +        }elseif ('2' == $option) { | |
| 945 | 945 | |
| 946 | 946 | flush_rewrite_rules(); | 
| 947 | 947 |              update_option('sensei_flush_rewrite_rules', '0'); | 
| @@ -956,7 +956,7 @@ discard block | ||
| 956 | 956 | * | 
| 957 | 957 | * @since 1.9.0 | 
| 958 | 958 | */ | 
| 959 | -    public function initiate_rewrite_rules_flush(){ | |
| 959 | +    public function initiate_rewrite_rules_flush() { | |
| 960 | 960 | |
| 961 | 961 |          update_option('sensei_flush_rewrite_rules', '1'); | 
| 962 | 962 | |
| @@ -973,9 +973,9 @@ discard block | ||
| 973 | 973 | * | 
| 974 | 974 | * @return void | 
| 975 | 975 | */ | 
| 976 | -    public function sensei_woocommerce_email_course_details( $order ) { | |
| 976 | +    public function sensei_woocommerce_email_course_details($order) { | |
| 977 | 977 | |
| 978 | - Sensei_WC::email_course_details( $order ); | |
| 978 | + Sensei_WC::email_course_details($order); | |
| 979 | 979 | |
| 980 | 980 | } // end func email course details | 
| 981 | 981 | |
| @@ -984,9 +984,9 @@ discard block | ||
| 984 | 984 | * @param $user_id | 
| 985 | 985 | * @param $subscription_key | 
| 986 | 986 | */ | 
| 987 | -    public function sensei_woocommerce_reactivate_subscription( $user_id, $subscription_key ){ | |
| 987 | +    public function sensei_woocommerce_reactivate_subscription($user_id, $subscription_key) { | |
| 988 | 988 | |
| 989 | - Sensei_WC::reactivate_subscription( $user_id, $subscription_key ); | |
| 989 | + Sensei_WC::reactivate_subscription($user_id, $subscription_key); | |
| 990 | 990 | } | 
| 991 | 991 | |
| 992 | 992 | /** | 
| @@ -994,9 +994,9 @@ discard block | ||
| 994 | 994 | * @param $user_id | 
| 995 | 995 | * @param $subscription_key | 
| 996 | 996 | */ | 
| 997 | -    public function sensei_woocommerce_subscription_ended( $user_id, $subscription_key ){ | |
| 997 | +    public function sensei_woocommerce_subscription_ended($user_id, $subscription_key) { | |
| 998 | 998 | |
| 999 | - Sensei_WC::end_subscription( $user_id, $subscription_key ); | |
| 999 | + Sensei_WC::end_subscription($user_id, $subscription_key); | |
| 1000 | 1000 | } | 
| 1001 | 1001 | |
| 1002 | 1002 | /** | 
| @@ -1009,9 +1009,9 @@ discard block | ||
| 1009 | 1009 | * | 
| 1010 | 1010 | * @return void | 
| 1011 | 1011 | */ | 
| 1012 | -    public function sensei_woocommerce_complete_order ( $order_id = 0 ) { | |
| 1012 | +    public function sensei_woocommerce_complete_order($order_id = 0) { | |
| 1013 | 1013 | |
| 1014 | - Sensei_WC::complete_order( $order_id ); | |
| 1014 | + Sensei_WC::complete_order($order_id); | |
| 1015 | 1015 | |
| 1016 | 1016 | } // End sensei_woocommerce_complete_order() | 
| 1017 | 1017 | |
| @@ -1024,9 +1024,9 @@ discard block | ||
| 1024 | 1024 | * @param integer $order_id order ID | 
| 1025 | 1025 | * @return void | 
| 1026 | 1026 | */ | 
| 1027 | -    public function sensei_woocommerce_cancel_order ( $order_id ) { | |
| 1027 | +    public function sensei_woocommerce_cancel_order($order_id) { | |
| 1028 | 1028 | |
| 1029 | - Sensei_WC::cancel_order( $order_id ); | |
| 1029 | + Sensei_WC::cancel_order($order_id); | |
| 1030 | 1030 | |
| 1031 | 1031 | } // End sensei_woocommerce_cancel_order() | 
| 1032 | 1032 | |
| @@ -1038,9 +1038,9 @@ discard block | ||
| 1038 | 1038 | * @param integer $order_id order ID | 
| 1039 | 1039 | * @return void | 
| 1040 | 1040 | */ | 
| 1041 | -    public function sensei_activate_subscription(  $order_id = 0 ) { | |
| 1041 | +    public function sensei_activate_subscription($order_id = 0) { | |
| 1042 | 1042 | |
| 1043 | - Sensei_WC::activate_subscription( $order_id ); | |
| 1043 | + Sensei_WC::activate_subscription($order_id); | |
| 1044 | 1044 | |
| 1045 | 1045 | } // End sensei_activate_subscription() | 
| 1046 | 1046 | |
| @@ -1052,9 +1052,9 @@ discard block | ||
| 1052 | 1052 | * @param array/Object $order_user (default: array()) Specific user's data. | 
| 1053 | 1053 | * @return bool|int | 
| 1054 | 1054 | */ | 
| 1055 | -    public function woocommerce_course_update ( $course_id = 0, $order_user = array()  ) { | |
| 1055 | +    public function woocommerce_course_update($course_id = 0, $order_user = array()) { | |
| 1056 | 1056 | |
| 1057 | - return Sensei_WC::course_update( $course_id, $order_user ); | |
| 1057 | + return Sensei_WC::course_update($course_id, $order_user); | |
| 1058 | 1058 | |
| 1059 | 1059 | } // End woocommerce_course_update() | 
| 1060 | 1060 | |
| @@ -1071,9 +1071,9 @@ discard block | ||
| 1071 | 1071 | * | 
| 1072 | 1072 | * @return WC_Product $wc_product_object | 
| 1073 | 1073 | */ | 
| 1074 | -    public function sensei_get_woocommerce_product_object ( $wc_product_id = 0, $product_type = '' ) { | |
| 1074 | +    public function sensei_get_woocommerce_product_object($wc_product_id = 0, $product_type = '') { | |
| 1075 | 1075 | |
| 1076 | - return Sensei_WC::get_product_object( $wc_product_id, $product_type ); | |
| 1076 | + return Sensei_WC::get_product_object($wc_product_id, $product_type); | |
| 1077 | 1077 | |
| 1078 | 1078 | } // End sensei_get_woocommerce_product_object() | 
| 1079 | 1079 | |
| @@ -1095,9 +1095,9 @@ discard block | ||
| 1095 | 1095 | * @param boolean $guest_checkout Current guest checkout setting | 
| 1096 | 1096 | * @return boolean Modified guest checkout setting | 
| 1097 | 1097 | */ | 
| 1098 | -    public function disable_guest_checkout( $guest_checkout ) { | |
| 1098 | +    public function disable_guest_checkout($guest_checkout) { | |
| 1099 | 1099 | |
| 1100 | - return Sensei_WC::disable_guest_checkout( $guest_checkout ); | |
| 1100 | + return Sensei_WC::disable_guest_checkout($guest_checkout); | |
| 1101 | 1101 | |
| 1102 | 1102 | }// end disable_guest_checkout | 
| 1103 | 1103 | |
| @@ -1111,9 +1111,9 @@ discard block | ||
| 1111 | 1111 | * @param int $order_id | 
| 1112 | 1112 | * @return string | 
| 1113 | 1113 | **/ | 
| 1114 | -    public function virtual_order_payment_complete( $order_status, $order_id ) { | |
| 1114 | +    public function virtual_order_payment_complete($order_status, $order_id) { | |
| 1115 | 1115 | |
| 1116 | - return Sensei_WC::virtual_order_payment_complete( $order_status, $order_id ); | |
| 1116 | + return Sensei_WC::virtual_order_payment_complete($order_status, $order_id); | |
| 1117 | 1117 | } | 
| 1118 | 1118 | |
| 1119 | 1119 | } // End Class | 
| @@ -1123,4 +1123,4 @@ discard block | ||
| 1123 | 1123 | * @ignore only for backward compatibility | 
| 1124 | 1124 | * @since 1.9.0 | 
| 1125 | 1125 | */ | 
| 1126 | -class Woothemes_Sensei extends Sensei_Main{ } | |
| 1126 | +class Woothemes_Sensei extends Sensei_Main { } | |
| @@ -18,10 +18,10 @@ discard block | ||
| 18 | 18 | * | 
| 19 | 19 | ***************************/ | 
| 20 | 20 | //This hook allow us to change the template WordPress loads for a given page/post_type @since 1.9.0 | 
| 21 | -add_filter( 'template_include', array ( 'Sensei_Templates', 'template_loader' ), 10, 1 ); | |
| 21 | +add_filter('template_include', array('Sensei_Templates', 'template_loader'), 10, 1); | |
| 22 | 22 | |
| 23 | 23 | //This hook adds the sensei pagination to the pagination hook | 
| 24 | -add_action( 'sensei_pagination', array( 'Sensei_Frontend', 'load_content_pagination' ), 30 ); | |
| 24 | +add_action('sensei_pagination', array('Sensei_Frontend', 'load_content_pagination'), 30); | |
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | /*************************** | 
| @@ -32,16 +32,16 @@ discard block | ||
| 32 | 32 | * | 
| 33 | 33 | ***************************/ | 
| 34 | 34 | // deprecate the archive content hook @since 1.9.0 | 
| 35 | -add_action( 'sensei_archive_before_course_loop', array ( 'Sensei_Templates', 'deprecated_archive_course_content_hook' ), 10, 1 ); | |
| 35 | +add_action('sensei_archive_before_course_loop', array('Sensei_Templates', 'deprecated_archive_course_content_hook'), 10, 1); | |
| 36 | 36 | |
| 37 | 37 | // Course archive title hook @since 1.9.0 | 
| 38 | -add_action('sensei_archive_before_course_loop', array( 'Sensei_Course', 'archive_header' ), 10, 0 ); | |
| 38 | +add_action('sensei_archive_before_course_loop', array('Sensei_Course', 'archive_header'), 10, 0); | |
| 39 | 39 | |
| 40 | 40 | // add the course image above the content | 
| 41 | -add_action('sensei_course_content_inside_before', array( Sensei()->course, 'course_image' ) ,10, 1 ); | |
| 41 | +add_action('sensei_course_content_inside_before', array(Sensei()->course, 'course_image'), 10, 1); | |
| 42 | 42 | |
| 43 | 43 | // add course content title to the courses on the archive page | 
| 44 | -add_action('sensei_course_content_inside_before', array( 'Sensei_Templates', 'the_title' ) ,5, 1 ); | |
| 44 | +add_action('sensei_course_content_inside_before', array('Sensei_Templates', 'the_title'), 5, 1); | |
| 45 | 45 | |
| 46 | 46 | /*************************** | 
| 47 | 47 | * | 
| @@ -53,33 +53,33 @@ discard block | ||
| 53 | 53 | // @1.9.0 | 
| 54 | 54 | // add deprecated action hooks for backwards compatibility sake | 
| 55 | 55 | // hooks on single course page: sensei_course_image , sensei_course_single_title, sensei_course_single_meta | 
| 56 | -add_action('sensei_single_course_content_inside_before', array( 'Sensei_Templates', 'deprecated_single_course_inside_before_hooks' ), 80); | |
| 56 | +add_action('sensei_single_course_content_inside_before', array('Sensei_Templates', 'deprecated_single_course_inside_before_hooks'), 80); | |
| 57 | 57 | |
| 58 | 58 | // @1.9.0 | 
| 59 | 59 | // hook the single course title on the single course page | 
| 60 | -add_action( 'sensei_single_course_content_inside_before',array( 'Sensei_Course', 'the_title'), 10 ); | |
| 60 | +add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_title'), 10); | |
| 61 | 61 | |
| 62 | 62 | // @1.9.0 | 
| 63 | 63 | // hook the single course title on the single course page | 
| 64 | -add_action( 'sensei_single_course_content_inside_before', array( Sensei()->course , 'course_image'), 20 ); | |
| 64 | +add_action('sensei_single_course_content_inside_before', array(Sensei()->course, 'course_image'), 20); | |
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | // @1.9.0 | 
| 68 | 68 | //Add legacy hooks deprecated in 1.9.0 | 
| 69 | -add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Templates','deprecate_course_single_meta_hooks'), 10 ); | |
| 69 | +add_action('sensei_single_course_content_inside_before', array('Sensei_Templates', 'deprecate_course_single_meta_hooks'), 10); | |
| 70 | 70 | |
| 71 | 71 | // @1.9.0 | 
| 72 | 72 | // Filter the content and replace it with the excerpt if the user doesn't have full access | 
| 73 | -add_filter( 'the_content', array( 'Sensei_Course', 'single_course_content' ) ); | |
| 73 | +add_filter('the_content', array('Sensei_Course', 'single_course_content')); | |
| 74 | 74 | |
| 75 | 75 | // @1.9.0 | 
| 76 | 76 | // Deprecate lessons specific single course hooks | 
| 77 | -add_action( 'sensei_single_course_content_inside_after', array( 'Sensei_Templates','deprecate_sensei_course_single_lessons_hook' ) ); | |
| 77 | +add_action('sensei_single_course_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_course_single_lessons_hook')); | |
| 78 | 78 | |
| 79 | 79 | // @1.9.0 | 
| 80 | 80 | // Deprecate single main content hooks | 
| 81 | -add_action( 'sensei_single_course_content_inside_after', array( 'Sensei_Templates', 'deprecated_single_main_content_hook') ); | |
| 82 | -add_action( 'sensei_single_message_content_inside_after', array( 'Sensei_Templates', 'deprecated_single_main_content_hook') ); | |
| 81 | +add_action('sensei_single_course_content_inside_after', array('Sensei_Templates', 'deprecated_single_main_content_hook')); | |
| 82 | +add_action('sensei_single_message_content_inside_after', array('Sensei_Templates', 'deprecated_single_main_content_hook')); | |
| 83 | 83 | |
| 84 | 84 | /** | 
| 85 | 85 | * Deprecate all the post type single titile hooks in favor of before content and after content hooks | 
| @@ -87,75 +87,75 @@ discard block | ||
| 87 | 87 | * @deprecate 1.9.0 | 
| 88 | 88 | * @1.9.0 | 
| 89 | 89 | */ | 
| 90 | -add_action('sensei_single_message_content_inside_before', array( 'Sensei_Templates', 'deprecate_all_post_type_single_title_hooks' ) ); | |
| 90 | +add_action('sensei_single_message_content_inside_before', array('Sensei_Templates', 'deprecate_all_post_type_single_title_hooks')); | |
| 91 | 91 | |
| 92 | 92 | /** | 
| 93 | 93 | * Deprecate hooks into the single course modules | 
| 94 | 94 | * @deprecated since 1.9.0 | 
| 95 | 95 | */ | 
| 96 | -add_action('sensei_single_course_modules_before', array('Sensei_Templates','deprecate_module_before_hook' ) ); | |
| 97 | -add_action('sensei_single_course_modules_after', array('Sensei_Templates','deprecate_module_after_hook' ) ); | |
| 96 | +add_action('sensei_single_course_modules_before', array('Sensei_Templates', 'deprecate_module_before_hook')); | |
| 97 | +add_action('sensei_single_course_modules_after', array('Sensei_Templates', 'deprecate_module_after_hook')); | |
| 98 | 98 | |
| 99 | 99 | // @since 1.9.0 | 
| 100 | 100 | // add the single course lessons title | 
| 101 | -add_action( 'sensei_single_course_content_inside_after' , array( 'Sensei_Course','the_course_lessons_title'), 9 ); | |
| 101 | +add_action('sensei_single_course_content_inside_after', array('Sensei_Course', 'the_course_lessons_title'), 9); | |
| 102 | 102 | |
| 103 | 103 | // @since 1.9.0 | 
| 104 | 104 | // hooks in the course lessons query and remove it at the end | 
| 105 | 105 | // also loading the course lessons template in the middle | 
| 106 | -add_action( 'sensei_single_course_lessons_before', array('Sensei_Course','load_single_course_lessons_query' ) ); | |
| 107 | -add_action( 'sensei_single_course_content_inside_after', 'course_single_lessons', 10 ); | |
| 108 | -add_action( 'sensei_single_course_lessons_after', array( 'Sensei_Utils','restore_wp_query' )); | |
| 106 | +add_action('sensei_single_course_lessons_before', array('Sensei_Course', 'load_single_course_lessons_query')); | |
| 107 | +add_action('sensei_single_course_content_inside_after', 'course_single_lessons', 10); | |
| 108 | +add_action('sensei_single_course_lessons_after', array('Sensei_Utils', 'restore_wp_query')); | |
| 109 | 109 | |
| 110 | 110 | // @since 1.9.0 | 
| 111 | 111 | // add post classes to the lessons on the single course page | 
| 112 | -add_filter( 'post_class', array( 'Sensei_Lesson', 'single_course_lessons_classes' ) ); | |
| 112 | +add_filter('post_class', array('Sensei_Lesson', 'single_course_lessons_classes')); | |
| 113 | 113 | |
| 114 | 114 | // @since 1.9.0 | 
| 115 | 115 | // lesson meta information on the single course page | 
| 116 | -add_action( 'sensei_single_course_inside_before_lesson', array('Sensei_Lesson','the_lesson_meta') , 5); | |
| 116 | +add_action('sensei_single_course_inside_before_lesson', array('Sensei_Lesson', 'the_lesson_meta'), 5); | |
| 117 | 117 | |
| 118 | 118 | //@since 1.9.0 | 
| 119 | 119 | // lesson image | 
| 120 | -add_action( 'sensei_single_course_inside_before_lesson', array('Sensei_Lesson','the_lesson_thumbnail') , 8); | |
| 120 | +add_action('sensei_single_course_inside_before_lesson', array('Sensei_Lesson', 'the_lesson_thumbnail'), 8); | |
| 121 | 121 | |
| 122 | 122 | //@since 1.9.0 | 
| 123 | 123 | // lesson custom excerpts | 
| 124 | -add_filter( 'get_the_excerpt', array( 'Sensei_Lesson', 'alter_the_lesson_excerpt' ) ); | |
| 124 | +add_filter('get_the_excerpt', array('Sensei_Lesson', 'alter_the_lesson_excerpt')); | |
| 125 | 125 | |
| 126 | 126 | // @since 1.9.0 | 
| 127 | 127 | // run a deprecated hook for backwards compatibility sake | 
| 128 | -add_action( 'sensei_single_course_modules_before', array( 'Sensei_Core_Modules', 'deprecate_sensei_single_course_modules_content' ) ); | |
| 128 | +add_action('sensei_single_course_modules_before', array('Sensei_Core_Modules', 'deprecate_sensei_single_course_modules_content')); | |
| 129 | 129 | |
| 130 | 130 | // @since 1.9.0 | 
| 131 | 131 | // hook in the module loop intialization functionality | 
| 132 | -add_action( 'sensei_single_course_modules_before', array( 'Sensei_Core_Modules', 'setup_single_course_module_loop' ) ); | |
| 132 | +add_action('sensei_single_course_modules_before', array('Sensei_Core_Modules', 'setup_single_course_module_loop')); | |
| 133 | 133 | |
| 134 | 134 | // @since 1.9.0 | 
| 135 | 135 | // hook in the module loop destructor functionality | 
| 136 | -add_action( 'sensei_single_course_modules_after', array( 'Sensei_Core_Modules', 'teardown_single_course_module_loop' ) ); | |
| 136 | +add_action('sensei_single_course_modules_after', array('Sensei_Core_Modules', 'teardown_single_course_module_loop')); | |
| 137 | 137 | |
| 138 | 138 | // @since 1.9.0 | 
| 139 | 139 | // hook in the possible full content override to show instead of excerpt | 
| 140 | -add_filter('get_the_excerpt', array( 'Sensei_Course', 'full_content_excerpt_override' ) ); | |
| 140 | +add_filter('get_the_excerpt', array('Sensei_Course', 'full_content_excerpt_override')); | |
| 141 | 141 | |
| 142 | 142 | //@since 1.9.0 | 
| 143 | 143 | //Course meta | 
| 144 | -add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Course', 'the_course_enrolment_actions' ), 30 ); | |
| 145 | -add_action( 'sensei_single_course_content_inside_before', array( 'Sensei_Course' , 'the_course_video' ), 40 ); | |
| 144 | +add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_course_enrolment_actions'), 30); | |
| 145 | +add_action('sensei_single_course_content_inside_before', array('Sensei_Course', 'the_course_video'), 40); | |
| 146 | 146 | |
| 147 | 147 | // | 
| 148 | 148 | //// no permissions template for the single course | 
| 149 | 149 | // | 
| 150 | -add_action( 'sensei_no_permissions_inside_before_content', array( 'Sensei_Course', 'the_title'), 20 ); | |
| 151 | -add_action( 'sensei_no_permissions_inside_before_content', array( 'Sensei_Course', 'the_course_enrolment_actions' ), 23 ); | |
| 152 | -add_action( 'sensei_no_permissions_inside_before_content', array( Sensei()->course , 'course_image'), 25 ); | |
| 153 | -add_action( 'sensei_no_permissions_inside_before_content', array( 'Sensei_Course' , 'the_course_video' ), 40 ); | |
| 154 | -add_action( 'sensei_no_permissions_inside_after_content', array( Sensei()->modules, 'load_course_module_content_template') , 43 ); | |
| 155 | -add_action( 'sensei_no_permissions_inside_after_content' , array( 'Sensei_Course','the_course_lessons_title'), 45 ); | |
| 156 | -add_action( 'sensei_no_permissions_inside_after_content', array('Sensei_Course','load_single_course_lessons_query' ),50 ); | |
| 157 | -add_action( 'sensei_no_permissions_inside_after_content', 'course_single_lessons', 60 ); | |
| 158 | -add_action( 'sensei_no_permissions_inside_after_content', array( 'Sensei_Utils','restore_wp_query' ), 70); | |
| 150 | +add_action('sensei_no_permissions_inside_before_content', array('Sensei_Course', 'the_title'), 20); | |
| 151 | +add_action('sensei_no_permissions_inside_before_content', array('Sensei_Course', 'the_course_enrolment_actions'), 23); | |
| 152 | +add_action('sensei_no_permissions_inside_before_content', array(Sensei()->course, 'course_image'), 25); | |
| 153 | +add_action('sensei_no_permissions_inside_before_content', array('Sensei_Course', 'the_course_video'), 40); | |
| 154 | +add_action('sensei_no_permissions_inside_after_content', array(Sensei()->modules, 'load_course_module_content_template'), 43); | |
| 155 | +add_action('sensei_no_permissions_inside_after_content', array('Sensei_Course', 'the_course_lessons_title'), 45); | |
| 156 | +add_action('sensei_no_permissions_inside_after_content', array('Sensei_Course', 'load_single_course_lessons_query'), 50); | |
| 157 | +add_action('sensei_no_permissions_inside_after_content', 'course_single_lessons', 60); | |
| 158 | +add_action('sensei_no_permissions_inside_after_content', array('Sensei_Utils', 'restore_wp_query'), 70); | |
| 159 | 159 | |
| 160 | 160 | /*************************** | 
| 161 | 161 | * | 
| @@ -166,54 +166,54 @@ discard block | ||
| 166 | 166 | ***************************/ | 
| 167 | 167 | //@since 1.9.0 | 
| 168 | 168 | // deprecate hooks no longer needed | 
| 169 | -add_action( 'sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_single_main_content_hook' ) ); | |
| 170 | -add_action( 'sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_quiz_single_title_hook' ) ); | |
| 169 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_single_main_content_hook')); | |
| 170 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'deprecate_quiz_sensei_quiz_single_title_hook')); | |
| 171 | 171 | |
| 172 | 172 | //@since 1.9.0 | 
| 173 | 173 | // Single quiz title | 
| 174 | -add_filter( 'the_title', array( 'Sensei_Quiz' , 'single_quiz_title' ), 20 , 2 ); // append Quiz | |
| 175 | -add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'the_title' ), 20 ); //output single quiz | |
| 174 | +add_filter('the_title', array('Sensei_Quiz', 'single_quiz_title'), 20, 2); // append Quiz | |
| 175 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'the_title'), 20); //output single quiz | |
| 176 | 176 | |
| 177 | 177 | // since 1.9.0 | 
| 178 | 178 | // initialize the quiz questions loop | 
| 179 | -add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'start_quiz_questions_loop') ); | |
| 179 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'start_quiz_questions_loop')); | |
| 180 | 180 | |
| 181 | 181 | // since 1.9.0 | 
| 182 | 182 | // hook in the quiz user message | 
| 183 | -add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Quiz', 'the_user_status_message' ), 40 ); | |
| 183 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Quiz', 'the_user_status_message'), 40); | |
| 184 | 184 | |
| 185 | 185 | //@since 1.9.0 | 
| 186 | 186 | // hook in the question title, description and quesiton media | 
| 187 | -add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_title' ), 10 ); | |
| 188 | -add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_description' ), 20 ); | |
| 189 | -add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_media' ), 30 ); | |
| 190 | -add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question','the_question_hidden_fields' ), 40 ); | |
| 187 | +add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_title'), 10); | |
| 188 | +add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_description'), 20); | |
| 189 | +add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_media'), 30); | |
| 190 | +add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_question_hidden_fields'), 40); | |
| 191 | 191 | |
| 192 | 192 | //@since 1.9.0 | 
| 193 | 193 | // hook in incorrect / correct message above questions if the quiz has been graded | 
| 194 | -add_action( 'sensei_quiz_question_inside_before', array( 'Sensei_Question', 'the_answer_result_indication' ), 50 ); | |
| 194 | +add_action('sensei_quiz_question_inside_before', array('Sensei_Question', 'the_answer_result_indication'), 50); | |
| 195 | 195 | |
| 196 | 196 | //@since 1.9.0 | 
| 197 | 197 | // add answer grading feedback at the bottom of the question | 
| 198 | -add_action( 'sensei_quiz_question_inside_after', array( 'Sensei_Question', 'answer_feedback_notes' ) ); | |
| 198 | +add_action('sensei_quiz_question_inside_after', array('Sensei_Question', 'answer_feedback_notes')); | |
| 199 | 199 | |
| 200 | 200 | //@since 1.9.0 | 
| 201 | 201 | // add extra question data for different quesiton types when get_question_template_data_is_called. | 
| 202 | -add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','multiple_choice_load_question_data'), 10, 3); | |
| 203 | -add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','gap_fill_load_question_data'), 10, 3); | |
| 204 | -add_filter( 'sensei_get_question_template_data', array( 'Sensei_Question','file_upload_load_question_data'), 10, 3); | |
| 202 | +add_filter('sensei_get_question_template_data', array('Sensei_Question', 'multiple_choice_load_question_data'), 10, 3); | |
| 203 | +add_filter('sensei_get_question_template_data', array('Sensei_Question', 'gap_fill_load_question_data'), 10, 3); | |
| 204 | +add_filter('sensei_get_question_template_data', array('Sensei_Question', 'file_upload_load_question_data'), 10, 3); | |
| 205 | 205 | |
| 206 | 206 | //@since 1.9.0 | 
| 207 | 207 | // deprecate the quiz button action | 
| 208 | -add_action( 'sensei_single_quiz_questions_after', array( 'Sensei_Quiz', 'action_buttons' ), 10, 0 ); | |
| 208 | +add_action('sensei_single_quiz_questions_after', array('Sensei_Quiz', 'action_buttons'), 10, 0); | |
| 209 | 209 | |
| 210 | 210 | //@since 1.9.0 | 
| 211 | 211 | // deprecate the sensei_complete_quiz hook | 
| 212 | -add_action( 'sensei_single_quiz_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_complete_quiz_action' )); | |
| 212 | +add_action('sensei_single_quiz_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_complete_quiz_action')); | |
| 213 | 213 | |
| 214 | 214 | //@since 1.9.0 | 
| 215 | 215 | // deprecate the sensei_quiz_question_type hook | 
| 216 | -add_action( 'sensei_quiz_question_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_quiz_question_type_action' )); | |
| 216 | +add_action('sensei_quiz_question_inside_after', array('Sensei_Templates', 'deprecate_sensei_quiz_question_type_action')); | |
| 217 | 217 | |
| 218 | 218 | /*************************** | 
| 219 | 219 | * | 
| @@ -224,63 +224,63 @@ discard block | ||
| 224 | 224 | ***************************/ | 
| 225 | 225 | //@since 1.9.0 | 
| 226 | 226 | // deprecate the main content hook on the single lesson page | 
| 227 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates', 'deprecate_lesson_single_main_content_hook' ), 20); | |
| 227 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_lesson_single_main_content_hook'), 20); | |
| 228 | 228 | |
| 229 | 229 | //@since 1.9.0 | 
| 230 | 230 | // hook in the lesson image on the single lesson | 
| 231 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'the_lesson_image' ), 17 ); | |
| 231 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'the_lesson_image'), 17); | |
| 232 | 232 | |
| 233 | 233 | //@since 1.9.0 | 
| 234 | 234 | // hook in the lesson image on the single lesson deprecated hook function | 
| 235 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates','deprecate_lesson_image_hook' ), 10 ); | |
| 235 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_lesson_image_hook'), 10); | |
| 236 | 236 | |
| 237 | 237 | //@since 1.9.0 | 
| 238 | 238 | // hook in the lesson single title deprecated function | 
| 239 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_lesson_single_title' ), 15 ); | |
| 239 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_lesson_single_title'), 15); | |
| 240 | 240 | |
| 241 | 241 | // @since 1.9.0 | 
| 242 | 242 | // hook in the sensei lesson user notices | 
| 243 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'user_not_taking_course_message' ), 15 ); | |
| 243 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'user_not_taking_course_message'), 15); | |
| 244 | 244 | |
| 245 | 245 | // @since 1.9.0 | 
| 246 | 246 | // attach the lesson title | 
| 247 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'the_title' ), 15 ); | |
| 247 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'the_title'), 15); | |
| 248 | 248 | |
| 249 | 249 | //@since 1.9.0 | 
| 250 | 250 | // hook in the lesson image on the single lesson | 
| 251 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'user_lesson_quiz_status_message' ), 20 ); | |
| 251 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'user_lesson_quiz_status_message'), 20); | |
| 252 | 252 | |
| 253 | 253 | // @since 1.9.0 | 
| 254 | 254 | // add the single lesson meta | 
| 255 | -add_action( 'sensei_single_lesson_content_inside_after', 'sensei_the_single_lesson_meta', 10 ); | |
| 255 | +add_action('sensei_single_lesson_content_inside_after', 'sensei_the_single_lesson_meta', 10); | |
| 256 | 256 | |
| 257 | 257 | // @since 1.9.0 | 
| 258 | 258 | // deprecate the sensei_lesson_single_meta hook | 
| 259 | -add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_lesson_single_meta_hook' ), 15 ); | |
| 259 | +add_action('sensei_single_lesson_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_lesson_single_meta_hook'), 15); | |
| 260 | 260 | |
| 261 | 261 | // @since 1.9.0 | 
| 262 | 262 | // deprecate the sensei_lesson_course_signup hook | 
| 263 | -add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Templates','deprecate_sensei_lesson_course_signup_hook' ), 20 ); | |
| 263 | +add_action('sensei_single_lesson_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_lesson_course_signup_hook'), 20); | |
| 264 | 264 | |
| 265 | 265 | // @since 1.9.0 | 
| 266 | 266 | // hook in the lesson prerequisite completion message | 
| 267 | -add_action( 'sensei_single_lesson_content_inside_after', array( 'Sensei_Lesson', 'prerequisite_complete_message' ), 20 ); | |
| 267 | +add_action('sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'prerequisite_complete_message'), 20); | |
| 268 | 268 | |
| 269 | 269 | // @since 1.9.0 | 
| 270 | 270 | // hook the single lesson course_signup_link | 
| 271 | -add_action( 'sensei_single_lesson_content_inside_before', array( 'Sensei_Lesson', 'course_signup_link' ), 30 ); | |
| 271 | +add_action('sensei_single_lesson_content_inside_before', array('Sensei_Lesson', 'course_signup_link'), 30); | |
| 272 | 272 | |
| 273 | 273 | // @since 1.9.0 | 
| 274 | 274 | // hook the deprecate breadcrumbs and comments hooks | 
| 275 | -add_action( 'sensei_after_main_content', array( 'Sensei_Templates', 'deprecate_single_lesson_breadcrumbs_and_comments_hooks'), 5 ); | |
| 275 | +add_action('sensei_after_main_content', array('Sensei_Templates', 'deprecate_single_lesson_breadcrumbs_and_comments_hooks'), 5); | |
| 276 | 276 | |
| 277 | 277 | // @since 1.9.0 | 
| 278 | 278 | // Add the quiz specific buttons and notices to the lesson | 
| 279 | -add_action( 'sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'footer_quiz_call_to_action' )); | |
| 279 | +add_action('sensei_single_lesson_content_inside_after', array('Sensei_Lesson', 'footer_quiz_call_to_action')); | |
| 280 | 280 | |
| 281 | 281 | // @since 1.9.0 | 
| 282 | 282 | // hook in the comments on the single lessons page | 
| 283 | -add_action( 'sensei_pagination', array( 'Sensei_Lesson', 'output_comments' ), 90 ); | |
| 283 | +add_action('sensei_pagination', array('Sensei_Lesson', 'output_comments'), 90); | |
| 284 | 284 | |
| 285 | 285 | /********************** | 
| 286 | 286 | * | 
| @@ -290,9 +290,9 @@ discard block | ||
| 290 | 290 | * | 
| 291 | 291 | ************************/ | 
| 292 | 292 | |
| 293 | -add_action( 'sensei_single_message_content_inside_before', array( 'Sensei_Messages', 'the_title' ), 20 ); | |
| 293 | +add_action('sensei_single_message_content_inside_before', array('Sensei_Messages', 'the_title'), 20); | |
| 294 | 294 | |
| 295 | -add_action( 'sensei_single_message_content_inside_before', array( 'Sensei_Messages', 'the_message_sent_by_title' ), 40 ); | |
| 295 | +add_action('sensei_single_message_content_inside_before', array('Sensei_Messages', 'the_message_sent_by_title'), 40); | |
| 296 | 296 | |
| 297 | 297 | /************************* | 
| 298 | 298 | * | 
| @@ -304,19 +304,19 @@ discard block | ||
| 304 | 304 | |
| 305 | 305 | // deprecate the sensei_lesson_archive_header hook | 
| 306 | 306 | // @deprecated since 1.9.0 | 
| 307 | -add_action( 'sensei_loop_lesson_inside_before', array( 'Sensei_Lesson', 'deprecate_sensei_lesson_archive_header_hook' ), 20 ); | |
| 307 | +add_action('sensei_loop_lesson_inside_before', array('Sensei_Lesson', 'deprecate_sensei_lesson_archive_header_hook'), 20); | |
| 308 | 308 | |
| 309 | 309 | // @1.9.0 | 
| 310 | 310 | //The archive title header on the lesson archive loop | 
| 311 | -add_action( 'sensei_loop_lesson_inside_before', array( Sensei()->lesson, 'the_archive_header' ), 20 ); | |
| 311 | +add_action('sensei_loop_lesson_inside_before', array(Sensei()->lesson, 'the_archive_header'), 20); | |
| 312 | 312 | |
| 313 | 313 | // @since 1.9.0 | 
| 314 | 314 | //Output the lesson header on the content-lesson.php which runs inside the lessons loop | 
| 315 | -add_action( 'sensei_content_lesson_inside_before', array( 'Sensei_Lesson', 'the_lesson_meta' ), 20 ); | |
| 315 | +add_action('sensei_content_lesson_inside_before', array('Sensei_Lesson', 'the_lesson_meta'), 20); | |
| 316 | 316 | |
| 317 | 317 | // @since 1.9.0 | 
| 318 | 318 | // output only part of the lesson on the archive | 
| 319 | -add_filter('the_content', array( 'Sensei_Lesson','limit_archive_content' ) ); | |
| 319 | +add_filter('the_content', array('Sensei_Lesson', 'limit_archive_content')); | |
| 320 | 320 | |
| 321 | 321 | /************************** | 
| 322 | 322 | * | 
| @@ -327,15 +327,15 @@ discard block | ||
| 327 | 327 | **************************/ | 
| 328 | 328 | // @since 1.9.0 | 
| 329 | 329 | // deprecate the learner profile content hook as the markup code is added in the template directly. | 
| 330 | -add_action('sensei_learner_profile_content_before', array( 'Sensei_Learner_Profiles', 'deprecate_sensei_learner_profile_content_hook' ) ); | |
| 330 | +add_action('sensei_learner_profile_content_before', array('Sensei_Learner_Profiles', 'deprecate_sensei_learner_profile_content_hook')); | |
| 331 | 331 | |
| 332 | 332 | // @since 1.9.0 | 
| 333 | 333 | // do the sensei complete course action on the learner profiles page. | 
| 334 | -add_action('sensei_learner_profile_content_before', array( 'Sensei_Templates', 'fire_sensei_complete_course_hook' ) ); | |
| 334 | +add_action('sensei_learner_profile_content_before', array('Sensei_Templates', 'fire_sensei_complete_course_hook')); | |
| 335 | 335 | |
| 336 | 336 | // @since 1.9.0 | 
| 337 | 337 | // fire the frontend messages hook before the profile content | 
| 338 | -add_action('sensei_learner_profile_inside_content_before', array( 'Sensei_Templates', 'fire_frontend_messages_hook' ) ); | |
| 338 | +add_action('sensei_learner_profile_inside_content_before', array('Sensei_Templates', 'fire_frontend_messages_hook')); | |
| 339 | 339 | |
| 340 | 340 | |
| 341 | 341 | /********************************** | 
| @@ -348,22 +348,22 @@ discard block | ||
| 348 | 348 | |
| 349 | 349 | // @since 1.9.0 | 
| 350 | 350 | // fire the deprecated hook function within the course-result.php file | 
| 351 | -add_action( 'sensei_course_results_content_before', array('Sensei_Course_Results','deprecate_sensei_course_results_content_hook') ); | |
| 351 | +add_action('sensei_course_results_content_before', array('Sensei_Course_Results', 'deprecate_sensei_course_results_content_hook')); | |
| 352 | 352 | |
| 353 | 353 | // @since 1.9.0 | 
| 354 | 354 | // load the course information on the course results page | 
| 355 | -add_action( 'sensei_course_results_content_inside_before_lessons', array( Sensei()->course_results,'course_info') ); | |
| 355 | +add_action('sensei_course_results_content_inside_before_lessons', array(Sensei()->course_results, 'course_info')); | |
| 356 | 356 | |
| 357 | 357 | // @since 1.9.0 | 
| 358 | -add_action( 'sensei_course_results_content_inside_before', array( Sensei()->course,'course_image') ); | |
| 358 | +add_action('sensei_course_results_content_inside_before', array(Sensei()->course, 'course_image')); | |
| 359 | 359 | |
| 360 | 360 | // @since 1.9.0 | 
| 361 | 361 | // deprecate the course results top hook in favour of a new hook | 
| 362 | -add_action( 'sensei_course_results_content_inside_before', array( 'Sensei_Course_Results', 'deprecate_course_results_top_hook') ); | |
| 362 | +add_action('sensei_course_results_content_inside_before', array('Sensei_Course_Results', 'deprecate_course_results_top_hook')); | |
| 363 | 363 | |
| 364 | 364 | // @since 1.9.0 | 
| 365 | 365 | // Fire the course image hook within the course results page | 
| 366 | -add_action( 'sensei_course_results_content_inside_before', array( 'Sensei_Course_Results', 'fire_course_image_hook') ); | |
| 366 | +add_action('sensei_course_results_content_inside_before', array('Sensei_Course_Results', 'fire_course_image_hook')); | |
| 367 | 367 | |
| 368 | 368 | |
| 369 | 369 | /********************************** | 
| @@ -375,19 +375,19 @@ discard block | ||
| 375 | 375 | ********************************/ | 
| 376 | 376 | // @since 1.9.0 | 
| 377 | 377 | // fire the sensei complete course action on the my courses template | 
| 378 | -add_action( 'sensei_my_courses_before', array( 'Sensei_Templates', 'fire_sensei_complete_course_hook' ) ); | |
| 378 | +add_action('sensei_my_courses_before', array('Sensei_Templates', 'fire_sensei_complete_course_hook')); | |
| 379 | 379 | |
| 380 | 380 | // @since 1.9.0 | 
| 381 | 381 | // fire the sensei frontend messages hook before the my-courses content | 
| 382 | -add_action('sensei_my_courses_content_inside_before', array( 'Sensei_Templates', 'fire_frontend_messages_hook' ) ); | |
| 382 | +add_action('sensei_my_courses_content_inside_before', array('Sensei_Templates', 'fire_frontend_messages_hook')); | |
| 383 | 383 | |
| 384 | 384 | // @since 1.9.0 | 
| 385 | 385 | // deprecate the sensei_before_user_course_content hook | 
| 386 | -add_action('sensei_my_courses_content_inside_before', array( 'Sensei_Templates', 'deprecate_sensei_before_user_course_content_hook' ) ); | |
| 386 | +add_action('sensei_my_courses_content_inside_before', array('Sensei_Templates', 'deprecate_sensei_before_user_course_content_hook')); | |
| 387 | 387 | |
| 388 | 388 | // @since 1.9.0 | 
| 389 | 389 | // deprecate the sensei_after_user_course_content hook | 
| 390 | -add_action('sensei_my_courses_content_inside_after', array( 'Sensei_Templates', 'deprecate_sensei_after_user_course_content_hook' ) ); | |
| 390 | +add_action('sensei_my_courses_content_inside_after', array('Sensei_Templates', 'deprecate_sensei_after_user_course_content_hook')); | |
| 391 | 391 | |
| 392 | 392 | /********************************** | 
| 393 | 393 | * | 
| @@ -399,7 +399,7 @@ discard block | ||
| 399 | 399 | // @since 1.9.0 | 
| 400 | 400 | // deprecate the sensei_login_form hok which was use to load the login form. | 
| 401 | 401 | // This now loads independent of the my-courses template which helps keep templates free from logic | 
| 402 | -add_action( 'sensei_login_form_before', array( 'Sensei_Templates', 'deprecate_sensei_login_form_hook' ) ); | |
| 402 | +add_action('sensei_login_form_before', array('Sensei_Templates', 'deprecate_sensei_login_form_hook')); | |
| 403 | 403 | |
| 404 | 404 | /********************************** | 
| 405 | 405 | * | 
| @@ -410,16 +410,16 @@ discard block | ||
| 410 | 410 | ********************************/ | 
| 411 | 411 | // @since 1.9.0 | 
| 412 | 412 | // Deprecate the archive messages hooks no longer supported | 
| 413 | -add_action( 'sensei_archive_before_message_loop', array( 'Sensei_Templates', 'deprecated_archive_message_hooks' ) ); | |
| 413 | +add_action('sensei_archive_before_message_loop', array('Sensei_Templates', 'deprecated_archive_message_hooks')); | |
| 414 | 414 | |
| 415 | 415 | // @since 1.9.0 | 
| 416 | 416 | // Deprecate the archive messages hooks no longer supported | 
| 417 | -add_action( 'sensei_archive_before_message_loop', array( 'Sensei_Messages', 'the_archive_header' ) ); | |
| 417 | +add_action('sensei_archive_before_message_loop', array('Sensei_Messages', 'the_archive_header')); | |
| 418 | 418 | |
| 419 | 419 | // @since 1.9.0 | 
| 420 | 420 | // output the message title and the message sensei | 
| 421 | -add_action( 'sensei_content_message_before', array( 'Sensei_Messages', 'the_message_title' ), 10, 1 ); | |
| 422 | -add_action( 'sensei_content_message_before', array( 'Sensei_Messages', 'the_message_sender' ), 20 , 1 ); | |
| 421 | +add_action('sensei_content_message_before', array('Sensei_Messages', 'the_message_title'), 10, 1); | |
| 422 | +add_action('sensei_content_message_before', array('Sensei_Messages', 'the_message_sender'), 20, 1); | |
| 423 | 423 | |
| 424 | 424 | /********************************** | 
| 425 | 425 | * | 
| @@ -428,7 +428,7 @@ discard block | ||
| 428 | 428 | * | 
| 429 | 429 | * | 
| 430 | 430 | **********************************/ | 
| 431 | -add_action( 'sensei_loop_course_before', array( 'Sensei_Course', 'course_category_title' ), 70 , 1 ); | |
| 431 | +add_action('sensei_loop_course_before', array('Sensei_Course', 'course_category_title'), 70, 1); | |
| 432 | 432 | |
| 433 | 433 | /********************************** | 
| 434 | 434 | * | 
| @@ -439,20 +439,20 @@ discard block | ||
| 439 | 439 | **********************************/ | 
| 440 | 440 | //@since 1.9.0 | 
| 441 | 441 |  //add a title to the teacher archive page when view site-url/author/{teacher-username} | 
| 442 | -add_action( 'sensei_teacher_archive_course_loop_before', array( 'Sensei_Teacher', 'archive_title' ) ); | |
| 442 | +add_action('sensei_teacher_archive_course_loop_before', array('Sensei_Teacher', 'archive_title')); | |
| 443 | 443 | |
| 444 | 444 | //@since 1.9.0 | 
| 445 | 445 | // remove course meta from the teacher page until it can be refactored to allow only removing the | 
| 446 | 446 | // teacher name and not all lessons | 
| 447 | -add_action( 'sensei_teacher_archive_course_loop_before', array( 'Sensei_Teacher', 'remove_course_meta_on_teacher_archive' ) ); | |
| 447 | +add_action('sensei_teacher_archive_course_loop_before', array('Sensei_Teacher', 'remove_course_meta_on_teacher_archive')); | |
| 448 | 448 | |
| 449 | 449 | /********************************** | 
| 450 | 450 | * | 
| 451 | 451 | * Frontend notices display | 
| 452 | 452 | * | 
| 453 | 453 | **********************************/ | 
| 454 | -add_action( 'sensei_course_results_content_inside_before', array( Sensei()->notices,'maybe_print_notices' ) ); | |
| 455 | -add_action( 'sensei_no_permissions_inside_before_content', array( Sensei()->notices,'maybe_print_notices' ), 90 ); | |
| 456 | -add_action( 'sensei_single_course_content_inside_before', array( Sensei()->notices,'maybe_print_notices' ), 40 ); | |
| 457 | -add_action( 'sensei_single_lesson_content_inside_before', array( Sensei()->notices,'maybe_print_notices' ), 40 ); | |
| 454 | +add_action('sensei_course_results_content_inside_before', array(Sensei()->notices, 'maybe_print_notices')); | |
| 455 | +add_action('sensei_no_permissions_inside_before_content', array(Sensei()->notices, 'maybe_print_notices'), 90); | |
| 456 | +add_action('sensei_single_course_content_inside_before', array(Sensei()->notices, 'maybe_print_notices'), 40); | |
| 457 | +add_action('sensei_single_lesson_content_inside_before', array(Sensei()->notices, 'maybe_print_notices'), 40); | |
| 458 | 458 | |