|
@@ -1,5 +1,5 @@ discard block |
|
|
block discarded – undo |
|
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 Frontend Class |
|
@@ -20,78 +20,78 @@ discard block |
|
|
block discarded – undo |
|
20
|
20
|
* Constructor. |
|
21
|
21
|
* @since 1.0.0 |
|
22
|
22
|
*/ |
|
23
|
|
- public function __construct () { |
|
|
23
|
+ public function __construct() { |
|
24
|
24
|
|
|
25
|
25
|
// Template output actions |
|
26
|
|
- add_action( 'sensei_before_main_content', array( $this, 'sensei_output_content_wrapper' ), 10 ); |
|
27
|
|
- add_action( 'sensei_after_main_content', array( $this, 'sensei_output_content_wrapper_end' ), 10 ); |
|
28
|
|
- add_action( 'sensei_lesson_archive_lesson_title', array( $this, 'sensei_lesson_archive_lesson_title' ), 10 ); |
|
|
26
|
+ add_action('sensei_before_main_content', array($this, 'sensei_output_content_wrapper'), 10); |
|
|
27
|
+ add_action('sensei_after_main_content', array($this, 'sensei_output_content_wrapper_end'), 10); |
|
|
28
|
+ add_action('sensei_lesson_archive_lesson_title', array($this, 'sensei_lesson_archive_lesson_title'), 10); |
|
29
|
29
|
|
|
30
|
30
|
// 1.2.1 |
|
31
|
|
- add_action( 'wp_head', array( $this, 'sensei_complete_lesson' ), 10 ); |
|
32
|
|
- add_action( 'wp_head', array( $this, 'sensei_complete_course' ), 10 ); |
|
33
|
|
- add_action( 'sensei_frontend_messages', array( $this, 'sensei_frontend_messages' ) ); |
|
34
|
|
- add_action( 'sensei_lesson_video', array( $this, 'sensei_lesson_video' ), 10, 1 ); |
|
35
|
|
- add_action( 'sensei_complete_lesson_button', array( $this, 'sensei_complete_lesson_button' ) ); |
|
36
|
|
- add_action( 'sensei_reset_lesson_button', array( $this, 'sensei_reset_lesson_button' ) ); |
|
|
31
|
+ add_action('wp_head', array($this, 'sensei_complete_lesson'), 10); |
|
|
32
|
+ add_action('wp_head', array($this, 'sensei_complete_course'), 10); |
|
|
33
|
+ add_action('sensei_frontend_messages', array($this, 'sensei_frontend_messages')); |
|
|
34
|
+ add_action('sensei_lesson_video', array($this, 'sensei_lesson_video'), 10, 1); |
|
|
35
|
+ add_action('sensei_complete_lesson_button', array($this, 'sensei_complete_lesson_button')); |
|
|
36
|
+ add_action('sensei_reset_lesson_button', array($this, 'sensei_reset_lesson_button')); |
|
37
|
37
|
|
|
38
|
|
- add_action( 'sensei_course_archive_meta', array( $this, 'sensei_course_archive_meta' ) ); |
|
|
38
|
+ add_action('sensei_course_archive_meta', array($this, 'sensei_course_archive_meta')); |
|
39
|
39
|
|
|
40
|
|
- add_action( 'sensei_lesson_tag_main_content', array( $this, 'sensei_lesson_archive_main_content' ), 10 ); |
|
41
|
|
- add_action( 'sensei_no_permissions_main_content', array( $this, 'sensei_no_permissions_main_content' ), 10 ); |
|
|
40
|
+ add_action('sensei_lesson_tag_main_content', array($this, 'sensei_lesson_archive_main_content'), 10); |
|
|
41
|
+ add_action('sensei_no_permissions_main_content', array($this, 'sensei_no_permissions_main_content'), 10); |
|
42
|
42
|
|
|
43
|
|
- add_action( 'sensei_lesson_meta', array( $this, 'sensei_lesson_meta' ), 10 ); |
|
44
|
|
- add_action( 'sensei_single_course_content_inside_before', array( $this, 'sensei_course_start' ), 10 ); |
|
|
43
|
+ add_action('sensei_lesson_meta', array($this, 'sensei_lesson_meta'), 10); |
|
|
44
|
+ add_action('sensei_single_course_content_inside_before', array($this, 'sensei_course_start'), 10); |
|
45
|
45
|
|
|
46
|
46
|
// add_filter( 'get_comments_number', array( $this, 'sensei_lesson_comment_count' ), 1 ); |
|
47
|
|
- add_filter( 'the_title', array( $this, 'sensei_lesson_preview_title' ), 10, 2 ); |
|
|
47
|
+ add_filter('the_title', array($this, 'sensei_lesson_preview_title'), 10, 2); |
|
48
|
48
|
|
|
49
|
49
|
//1.6.2 |
|
50
|
|
- add_filter( 'wp_login_failed', array( $this, 'sensei_login_fail_redirect' ), 10 ); |
|
51
|
|
- add_filter( 'init', array( $this, 'sensei_handle_login_request' ), 10 ); |
|
|
50
|
+ add_filter('wp_login_failed', array($this, 'sensei_login_fail_redirect'), 10); |
|
|
51
|
+ add_filter('init', array($this, 'sensei_handle_login_request'), 10); |
|
52
|
52
|
//1.6.3 |
|
53
|
|
- add_action( 'init', array( $this, 'sensei_process_registration' ), 2 ); |
|
|
53
|
+ add_action('init', array($this, 'sensei_process_registration'), 2); |
|
54
|
54
|
//1.7.0 |
|
55
|
|
- add_action( 'sensei_pagination', array( $this, 'sensei_breadcrumb' ), 80, 1 ); |
|
|
55
|
+ add_action('sensei_pagination', array($this, 'sensei_breadcrumb'), 80, 1); |
|
56
|
56
|
|
|
57
|
57
|
// Fix pagination for course archive pages when filtering by course type |
|
58
|
|
- add_filter( 'pre_get_posts', array( $this, 'sensei_course_archive_pagination' ) ); |
|
|
58
|
+ add_filter('pre_get_posts', array($this, 'sensei_course_archive_pagination')); |
|
59
|
59
|
|
|
60
|
60
|
// Scripts and Styles |
|
61
|
|
- add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
|
62
|
|
- add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
|
61
|
+ add_action('wp_enqueue_scripts', array($this, 'enqueue_styles')); |
|
|
62
|
+ add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
63
|
63
|
|
|
64
|
64
|
// Custom Menu Item filters |
|
65
|
|
- add_filter( 'wp_setup_nav_menu_item', array( $this, 'sensei_setup_nav_menu_item' ) ); |
|
66
|
|
- add_filter( 'wp_nav_menu_objects', array( $this, 'sensei_wp_nav_menu_objects' ) ); |
|
|
65
|
+ add_filter('wp_setup_nav_menu_item', array($this, 'sensei_setup_nav_menu_item')); |
|
|
66
|
+ add_filter('wp_nav_menu_objects', array($this, 'sensei_wp_nav_menu_objects')); |
|
67
|
67
|
// Search Results filters |
|
68
|
|
- add_filter( 'post_class', array( $this, 'sensei_search_results_classes' ), 10 ); |
|
|
68
|
+ add_filter('post_class', array($this, 'sensei_search_results_classes'), 10); |
|
69
|
69
|
// Only show course & lesson excerpts in search results |
|
70
|
|
- add_filter( 'the_content', array( $this, 'sensei_search_results_excerpt' ) ); |
|
|
70
|
+ add_filter('the_content', array($this, 'sensei_search_results_excerpt')); |
|
71
|
71
|
|
|
72
|
72
|
//Use WooCommerce filter to show admin bar to Teachers. |
|
73
|
|
- add_action( 'init', array( $this, 'sensei_show_admin_bar') ); |
|
|
73
|
+ add_action('init', array($this, 'sensei_show_admin_bar')); |
|
74
|
74
|
|
|
75
|
75
|
// Remove course from active courses if an order is cancelled or refunded |
|
76
|
|
- add_action( 'woocommerce_order_status_processing_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 ); |
|
77
|
|
- add_action( 'woocommerce_order_status_completed_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 ); |
|
78
|
|
- add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'remove_active_course' ), 10, 1 ); |
|
79
|
|
- add_action( 'woocommerce_order_status_processing_to_refunded', array( $this, 'remove_active_course' ), 10, 1 ); |
|
80
|
|
- add_action( 'woocommerce_order_status_completed_to_refunded', array( $this, 'remove_active_course' ), 10, 1 ); |
|
81
|
|
- add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'remove_active_course' ), 10, 1 ); |
|
|
76
|
+ add_action('woocommerce_order_status_processing_to_cancelled', array($this, 'remove_active_course'), 10, 1); |
|
|
77
|
+ add_action('woocommerce_order_status_completed_to_cancelled', array($this, 'remove_active_course'), 10, 1); |
|
|
78
|
+ add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'remove_active_course'), 10, 1); |
|
|
79
|
+ add_action('woocommerce_order_status_processing_to_refunded', array($this, 'remove_active_course'), 10, 1); |
|
|
80
|
+ add_action('woocommerce_order_status_completed_to_refunded', array($this, 'remove_active_course'), 10, 1); |
|
|
81
|
+ add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'remove_active_course'), 10, 1); |
|
82
|
82
|
|
|
83
|
83
|
// Make sure correct courses are marked as active for users |
|
84
|
|
- add_action( 'sensei_before_my_courses', array( $this, 'activate_purchased_courses' ), 10, 1 ); |
|
85
|
|
- add_action( 'sensei_single_course_content_inside_before', array( $this, 'activate_purchased_single_course' ), 10 ); |
|
|
84
|
+ add_action('sensei_before_my_courses', array($this, 'activate_purchased_courses'), 10, 1); |
|
|
85
|
+ add_action('sensei_single_course_content_inside_before', array($this, 'activate_purchased_single_course'), 10); |
|
86
|
86
|
|
|
87
|
87
|
// Lesson tags |
|
88
|
|
- add_action( 'sensei_lesson_meta_extra', array( $this, 'lesson_tags_display' ), 10, 1 ); |
|
89
|
|
- add_action( 'pre_get_posts', array( $this, 'lesson_tag_archive_filter' ), 10, 1 ); |
|
90
|
|
- add_filter( 'sensei_lessons_archive_text', array( $this, 'lesson_tag_archive_header' ) ); |
|
91
|
|
- add_action( 'sensei_loop_lesson_inside_before', array( $this, 'lesson_tag_archive_description' ), 11 ); |
|
|
88
|
+ add_action('sensei_lesson_meta_extra', array($this, 'lesson_tags_display'), 10, 1); |
|
|
89
|
+ add_action('pre_get_posts', array($this, 'lesson_tag_archive_filter'), 10, 1); |
|
|
90
|
+ add_filter('sensei_lessons_archive_text', array($this, 'lesson_tag_archive_header')); |
|
|
91
|
+ add_action('sensei_loop_lesson_inside_before', array($this, 'lesson_tag_archive_description'), 11); |
|
92
|
92
|
|
|
93
|
93
|
// Hide Sensei activity comments from lesson and course pages |
|
94
|
|
- add_filter( 'wp_list_comments_args', array( $this, 'hide_sensei_activity' ) ); |
|
|
94
|
+ add_filter('wp_list_comments_args', array($this, 'hide_sensei_activity')); |
|
95
|
95
|
} // End __construct() |
|
96
|
96
|
|
|
97
|
97
|
/** |
|
@@ -101,11 +101,11 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
* @since 1.7.3 |
|
102
|
102
|
* @return array|mixed |
|
103
|
103
|
*/ |
|
104
|
|
- public function __get( $key ) { |
|
|
104
|
+ public function __get($key) { |
|
105
|
105
|
|
|
106
|
|
- if ( 'lesson' == $key || 'course' == $key ) { |
|
107
|
|
- if ( WP_DEBUG ) { |
|
108
|
|
- trigger_error( sprintf( 'Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3' ) ); |
|
|
106
|
+ if ('lesson' == $key || 'course' == $key) { |
|
|
107
|
+ if (WP_DEBUG) { |
|
|
108
|
+ trigger_error(sprintf('Sensei()->frontend->%1$s has been <strong>deprecated</strong> since version %2$s! Please use Sensei()->%1$s to access the instance.', $key, '1.7.3')); |
|
109
|
109
|
} |
|
110
|
110
|
return Sensei()->$key; |
|
111
|
111
|
} |
|
@@ -118,32 +118,32 @@ discard block |
|
|
block discarded – undo |
|
118
|
118
|
* @since 1.0.0 |
|
119
|
119
|
* @return void |
|
120
|
120
|
*/ |
|
121
|
|
- public function enqueue_scripts () { |
|
|
121
|
+ public function enqueue_scripts() { |
|
122
|
122
|
|
|
123
|
123
|
$disable_js = false; |
|
124
|
|
- if ( isset( Sensei()->settings->settings[ 'js_disable' ] ) ) { |
|
125
|
|
- $disable_js = Sensei()->settings->settings[ 'js_disable' ]; |
|
|
124
|
+ if (isset(Sensei()->settings->settings['js_disable'])) { |
|
|
125
|
+ $disable_js = Sensei()->settings->settings['js_disable']; |
|
126
|
126
|
} // End If Statement |
|
127
|
|
- if ( ! $disable_js ) { |
|
|
127
|
+ if ( ! $disable_js) { |
|
128
|
128
|
|
|
129
|
|
- $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
|
129
|
+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
130
|
130
|
|
|
131
|
131
|
// My Courses tabs script |
|
132
|
|
- wp_register_script( Sensei()->token . '-user-dashboard', esc_url( Sensei()->plugin_url . 'assets/js/user-dashboard' . $suffix . '.js' ), array( 'jquery-ui-tabs' ), Sensei()->version, true ); |
|
133
|
|
- wp_enqueue_script( Sensei()->token . '-user-dashboard' ); |
|
|
132
|
+ wp_register_script(Sensei()->token.'-user-dashboard', esc_url(Sensei()->plugin_url.'assets/js/user-dashboard'.$suffix.'.js'), array('jquery-ui-tabs'), Sensei()->version, true); |
|
|
133
|
+ wp_enqueue_script(Sensei()->token.'-user-dashboard'); |
|
134
|
134
|
|
|
135
|
135
|
|
|
136
|
136
|
// Course Archive javascript |
|
137
|
|
- if( is_post_type_archive( 'course' ) ){ |
|
|
137
|
+ if (is_post_type_archive('course')) { |
|
138
|
138
|
|
|
139
|
|
- wp_register_script( 'sensei-course-archive-js', esc_url( Sensei()->plugin_url . 'assets/js/frontend/course-archive' . $suffix . '.js' ), array( 'jquery' ), '1', true ); |
|
140
|
|
- wp_enqueue_script( 'sensei-course-archive-js' ); |
|
|
139
|
+ wp_register_script('sensei-course-archive-js', esc_url(Sensei()->plugin_url.'assets/js/frontend/course-archive'.$suffix.'.js'), array('jquery'), '1', true); |
|
|
140
|
+ wp_enqueue_script('sensei-course-archive-js'); |
|
141
|
141
|
|
|
142
|
142
|
} |
|
143
|
143
|
|
|
144
|
144
|
|
|
145
|
145
|
// Allow additional scripts to be loaded |
|
146
|
|
- do_action( 'sensei_additional_scripts' ); |
|
|
146
|
+ do_action('sensei_additional_scripts'); |
|
147
|
147
|
|
|
148
|
148
|
} // End If Statement |
|
149
|
149
|
|
|
@@ -154,23 +154,23 @@ discard block |
|
|
block discarded – undo |
|
154
|
154
|
* @since 1.0.0 |
|
155
|
155
|
* @return void |
|
156
|
156
|
*/ |
|
157
|
|
- public function enqueue_styles () { |
|
|
157
|
+ public function enqueue_styles() { |
|
158
|
158
|
|
|
159
|
159
|
$disable_styles = false; |
|
160
|
|
- if ( isset( Sensei()->settings->settings[ 'styles_disable' ] ) ) { |
|
161
|
|
- $disable_styles = Sensei()->settings->settings[ 'styles_disable' ]; |
|
|
160
|
+ if (isset(Sensei()->settings->settings['styles_disable'])) { |
|
|
161
|
+ $disable_styles = Sensei()->settings->settings['styles_disable']; |
|
162
|
162
|
} // End If Statement |
|
163
|
163
|
|
|
164
|
164
|
// Add filter for theme overrides |
|
165
|
|
- $disable_styles = apply_filters( 'sensei_disable_styles', $disable_styles ); |
|
|
165
|
+ $disable_styles = apply_filters('sensei_disable_styles', $disable_styles); |
|
166
|
166
|
|
|
167
|
|
- if ( ! $disable_styles ) { |
|
|
167
|
+ if ( ! $disable_styles) { |
|
168
|
168
|
|
|
169
|
|
- wp_register_style( Sensei()->token . '-frontend', Sensei()->plugin_url . 'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen' ); |
|
170
|
|
- wp_enqueue_style( Sensei()->token . '-frontend' ); |
|
|
169
|
+ wp_register_style(Sensei()->token.'-frontend', Sensei()->plugin_url.'assets/css/frontend/sensei.css', '', Sensei()->version, 'screen'); |
|
|
170
|
+ wp_enqueue_style(Sensei()->token.'-frontend'); |
|
171
|
171
|
|
|
172
|
172
|
// Allow additional stylesheets to be loaded |
|
173
|
|
- do_action( 'sensei_additional_styles' ); |
|
|
173
|
+ do_action('sensei_additional_styles'); |
|
174
|
174
|
|
|
175
|
175
|
} // End If Statement |
|
176
|
176
|
|
|
@@ -186,10 +186,10 @@ discard block |
|
|
block discarded – undo |
|
186
|
186
|
* @param string $name (default: '') |
|
187
|
187
|
* @return void |
|
188
|
188
|
*/ |
|
189
|
|
- function sensei_get_template_part( $slug, $name = '' ) { |
|
|
189
|
+ function sensei_get_template_part($slug, $name = '') { |
|
190
|
190
|
|
|
191
|
|
- _deprecated_function( 'class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part' ); |
|
192
|
|
- Sensei_Templates::get_part( $slug, $name ); |
|
|
191
|
+ _deprecated_function('class-woothemes-sensei-frontend.php', '1.9.0', 'Sensei_Templates::get_part'); |
|
|
192
|
+ Sensei_Templates::get_part($slug, $name); |
|
193
|
193
|
|
|
194
|
194
|
} // End sensei_get_template_part() |
|
195
|
195
|
|
|
@@ -204,10 +204,10 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
* @param string $default_path (default: '') |
|
205
|
205
|
* @return void |
|
206
|
206
|
*/ |
|
207
|
|
- function sensei_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) { |
|
|
207
|
+ function sensei_get_template($template_name, $args = array(), $template_path = '', $default_path = '') { |
|
208
|
208
|
|
|
209
|
|
- _deprecated_function( 'sensei_get_template', '1.9.0', 'Sensei_Templates::get_template' ); |
|
210
|
|
- Sensei_Templates::get_template($template_name, $args, $template_path, $default_path ); |
|
|
209
|
+ _deprecated_function('sensei_get_template', '1.9.0', 'Sensei_Templates::get_template'); |
|
|
210
|
+ Sensei_Templates::get_template($template_name, $args, $template_path, $default_path); |
|
211
|
211
|
|
|
212
|
212
|
} // End sensei_get_template() |
|
213
|
213
|
|
|
@@ -221,10 +221,10 @@ discard block |
|
|
block discarded – undo |
|
221
|
221
|
* @param string $default_path (default: '') |
|
222
|
222
|
* @return void |
|
223
|
223
|
*/ |
|
224
|
|
- function sensei_locate_template( $template_name, $template_path = '', $default_path = '' ) { |
|
|
224
|
+ function sensei_locate_template($template_name, $template_path = '', $default_path = '') { |
|
225
|
225
|
|
|
226
|
|
- _deprecated_function( 'sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template' ); |
|
227
|
|
- Sensei_Templates::locate_template( $template_name, $template_path, $default_path ); |
|
|
226
|
+ _deprecated_function('sensei_locate_template', '1.9.0', 'Sensei_Templates::locate_template'); |
|
|
227
|
+ Sensei_Templates::locate_template($template_name, $template_path, $default_path); |
|
228
|
228
|
|
|
229
|
229
|
} // End sensei_locate_template() |
|
230
|
230
|
|
|
@@ -238,20 +238,20 @@ discard block |
|
|
block discarded – undo |
|
238
|
238
|
function sensei_output_content_wrapper() { |
|
239
|
239
|
|
|
240
|
240
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
241
|
|
- $backwards_compatible_wrapper_location = array( |
|
242
|
|
- Sensei()->template_url . 'wrappers/wrapper-start.php', |
|
|
241
|
+ $backwards_compatible_wrapper_location = array( |
|
|
242
|
+ Sensei()->template_url.'wrappers/wrapper-start.php', |
|
243
|
243
|
'wrappers/wrapper-start.php' |
|
244
|
244
|
); |
|
245
|
245
|
|
|
246
|
|
- $template = locate_template( $backwards_compatible_wrapper_location ); |
|
247
|
|
- if( !empty( $template ) ){ |
|
|
246
|
+ $template = locate_template($backwards_compatible_wrapper_location); |
|
|
247
|
+ if ( ! empty($template)) { |
|
248
|
248
|
|
|
249
|
|
- Sensei_Templates::get_template( 'wrappers/wrapper-start.php' ); |
|
|
249
|
+ Sensei_Templates::get_template('wrappers/wrapper-start.php'); |
|
250
|
250
|
return; |
|
251
|
251
|
|
|
252
|
252
|
} |
|
253
|
253
|
|
|
254
|
|
- Sensei_Templates::get_template( 'globals/wrapper-start.php' ); |
|
|
254
|
+ Sensei_Templates::get_template('globals/wrapper-start.php'); |
|
255
|
255
|
|
|
256
|
256
|
} // End sensei_output_content_wrapper() |
|
257
|
257
|
|
|
@@ -265,21 +265,21 @@ discard block |
|
|
block discarded – undo |
|
265
|
265
|
function sensei_output_content_wrapper_end() { |
|
266
|
266
|
|
|
267
|
267
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
268
|
|
- $backwards_compatible_wrapper_location = array( |
|
269
|
|
- Sensei()->template_url . 'wrappers/wrapper-end.php', |
|
|
268
|
+ $backwards_compatible_wrapper_location = array( |
|
|
269
|
+ Sensei()->template_url.'wrappers/wrapper-end.php', |
|
270
|
270
|
'wrappers/wrapper-end.php' |
|
271
|
271
|
); |
|
272
|
272
|
|
|
273
|
|
- $backwards_compatible_template = locate_template( $backwards_compatible_wrapper_location ); |
|
274
|
|
- if( !empty( $backwards_compatible_template ) ){ |
|
|
273
|
+ $backwards_compatible_template = locate_template($backwards_compatible_wrapper_location); |
|
|
274
|
+ if ( ! empty($backwards_compatible_template)) { |
|
275
|
275
|
|
|
276
|
|
- Sensei_Templates::get_template( 'wrappers/wrapper-end.php' ); |
|
|
276
|
+ Sensei_Templates::get_template('wrappers/wrapper-end.php'); |
|
277
|
277
|
return; |
|
278
|
278
|
|
|
279
|
279
|
} |
|
280
|
280
|
|
|
281
|
281
|
|
|
282
|
|
- Sensei_Templates::get_template( 'globals/wrapper-end.php' ); |
|
|
282
|
+ Sensei_Templates::get_template('globals/wrapper-end.php'); |
|
283
|
283
|
|
|
284
|
284
|
} // End sensei_output_content_wrapper_end() |
|
285
|
285
|
|
|
@@ -292,57 +292,57 @@ discard block |
|
|
block discarded – undo |
|
292
|
292
|
*/ |
|
293
|
293
|
public static function load_content_pagination() { |
|
294
|
294
|
|
|
295
|
|
- if( is_singular('course') ) { |
|
|
295
|
+ if (is_singular('course')) { |
|
296
|
296
|
|
|
297
|
297
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
298
|
|
- $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-posts.php' ) ); |
|
299
|
|
- if( !empty( $template ) ){ |
|
|
298
|
+ $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-posts.php')); |
|
|
299
|
+ if ( ! empty($template)) { |
|
300
|
300
|
|
|
301
|
|
- Sensei_Templates::get_template( 'wrappers/pagination-posts.php' ); |
|
|
301
|
+ Sensei_Templates::get_template('wrappers/pagination-posts.php'); |
|
302
|
302
|
return; |
|
303
|
303
|
|
|
304
|
304
|
} |
|
305
|
305
|
|
|
306
|
|
- Sensei_Templates::get_template( 'globals/pagination-posts.php' ); |
|
|
306
|
+ Sensei_Templates::get_template('globals/pagination-posts.php'); |
|
307
|
307
|
|
|
308
|
|
- } elseif( is_singular('lesson') ) { |
|
|
308
|
+ } elseif (is_singular('lesson')) { |
|
309
|
309
|
|
|
310
|
310
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
311
|
|
- $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-lesson.php' ) ); |
|
312
|
|
- if( !empty( $template ) ){ |
|
|
311
|
+ $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-lesson.php')); |
|
|
312
|
+ if ( ! empty($template)) { |
|
313
|
313
|
|
|
314
|
|
- Sensei_Templates::get_template( 'wrappers/pagination-lesson.php' ); |
|
|
314
|
+ Sensei_Templates::get_template('wrappers/pagination-lesson.php'); |
|
315
|
315
|
return; |
|
316
|
316
|
|
|
317
|
317
|
} |
|
318
|
318
|
|
|
319
|
|
- Sensei_Templates::get_template( 'globals/pagination-lesson.php' ); |
|
|
319
|
+ Sensei_Templates::get_template('globals/pagination-lesson.php'); |
|
320
|
320
|
|
|
321
|
|
- } elseif( is_singular('quiz') ) { |
|
|
321
|
+ } elseif (is_singular('quiz')) { |
|
322
|
322
|
|
|
323
|
323
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
324
|
|
- $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination-quiz.php' ) ); |
|
325
|
|
- if( !empty( $template ) ){ |
|
|
324
|
+ $template = locate_template(array(Sensei()->template_url.'wrappers/pagination-quiz.php')); |
|
|
325
|
+ if ( ! empty($template)) { |
|
326
|
326
|
|
|
327
|
|
- Sensei_Templates::get_template( 'wrappers/pagination-quiz.php' ); |
|
|
327
|
+ Sensei_Templates::get_template('wrappers/pagination-quiz.php'); |
|
328
|
328
|
return; |
|
329
|
329
|
|
|
330
|
330
|
} |
|
331
|
331
|
|
|
332
|
|
- Sensei_Templates::get_template( 'globals/pagination-quiz.php' ); |
|
|
332
|
+ Sensei_Templates::get_template('globals/pagination-quiz.php'); |
|
333
|
333
|
|
|
334
|
334
|
} else { |
|
335
|
335
|
|
|
336
|
336
|
// backwards compatibility check for old location under the wrappers directory of the active theme |
|
337
|
|
- $template = locate_template( array( Sensei()->template_url . 'wrappers/pagination.php' ) ); |
|
338
|
|
- if( !empty( $template ) ){ |
|
|
337
|
+ $template = locate_template(array(Sensei()->template_url.'wrappers/pagination.php')); |
|
|
338
|
+ if ( ! empty($template)) { |
|
339
|
339
|
|
|
340
|
|
- Sensei_Templates::get_template( 'wrappers/pagination.php' ); |
|
|
340
|
+ Sensei_Templates::get_template('wrappers/pagination.php'); |
|
341
|
341
|
return; |
|
342
|
342
|
|
|
343
|
343
|
} |
|
344
|
344
|
|
|
345
|
|
- Sensei_Templates::get_template( 'globals/pagination.php' ); |
|
|
345
|
+ Sensei_Templates::get_template('globals/pagination.php'); |
|
346
|
346
|
|
|
347
|
347
|
} // End If Statement |
|
348
|
348
|
|
|
@@ -368,21 +368,21 @@ discard block |
|
|
block discarded – undo |
|
368
|
368
|
* @param object $item |
|
369
|
369
|
* @return object $item |
|
370
|
370
|
*/ |
|
371
|
|
- public function sensei_setup_nav_menu_item( $item ) { |
|
|
371
|
+ public function sensei_setup_nav_menu_item($item) { |
|
372
|
372
|
global $pagenow, $wp_rewrite; |
|
373
|
373
|
|
|
374
|
|
- if( 'nav-menus.php' != $pagenow && !defined('DOING_AJAX') && isset( $item->url ) && 'custom' == $item->type ) { |
|
|
374
|
+ if ('nav-menus.php' != $pagenow && ! defined('DOING_AJAX') && isset($item->url) && 'custom' == $item->type) { |
|
375
|
375
|
|
|
376
|
376
|
// Set up Sensei menu links |
|
377
|
|
- $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] ); |
|
378
|
|
- $my_account_page_id = intval( Sensei()->settings->settings[ 'my_course_page' ] ); |
|
|
377
|
+ $course_page_id = intval(Sensei()->settings->settings['course_page']); |
|
|
378
|
+ $my_account_page_id = intval(Sensei()->settings->settings['my_course_page']); |
|
379
|
379
|
|
|
380
|
380
|
$course_page_url = Sensei_Course::get_courses_page_url(); |
|
381
|
|
- $lesson_archive_url = get_post_type_archive_link( 'lesson' ); |
|
382
|
|
- $my_courses_url = get_permalink( $my_account_page_id ); |
|
383
|
|
- $my_messages_url = get_post_type_archive_link( 'sensei_message' ); |
|
|
381
|
+ $lesson_archive_url = get_post_type_archive_link('lesson'); |
|
|
382
|
+ $my_courses_url = get_permalink($my_account_page_id); |
|
|
383
|
+ $my_messages_url = get_post_type_archive_link('sensei_message'); |
|
384
|
384
|
|
|
385
|
|
- switch ( $item->url ) { |
|
|
385
|
+ switch ($item->url) { |
|
386
|
386
|
case '#senseicourses': |
|
387
|
387
|
$item->url = $course_page_url; |
|
388
|
388
|
break; |
|
@@ -399,7 +399,7 @@ discard block |
|
|
block discarded – undo |
|
399
|
399
|
$item->url = $my_messages_url; |
|
400
|
400
|
// if no archive link exist for sensei_message |
|
401
|
401
|
// set it back to the place holder |
|
402
|
|
- if( ! $item->url ){ |
|
|
402
|
+ if ( ! $item->url) { |
|
403
|
403
|
|
|
404
|
404
|
$item->url = '#senseimymessages'; |
|
405
|
405
|
|
|
@@ -407,21 +407,21 @@ discard block |
|
|
block discarded – undo |
|
407
|
407
|
break; |
|
408
|
408
|
|
|
409
|
409
|
case '#senseilearnerprofile': |
|
410
|
|
- $item->url = esc_url( Sensei()->learner_profiles->get_permalink() ); |
|
|
410
|
+ $item->url = esc_url(Sensei()->learner_profiles->get_permalink()); |
|
411
|
411
|
break; |
|
412
|
412
|
|
|
413
|
413
|
case '#senseiloginlogout': |
|
414
|
|
- $logout_url = wp_logout_url( home_url() ); |
|
|
414
|
+ $logout_url = wp_logout_url(home_url()); |
|
415
|
415
|
// Login link links to the My Courses page, to avoid the WP dashboard. |
|
416
|
416
|
$login_url = $my_courses_url; |
|
417
|
417
|
|
|
418
|
|
- $item->url = ( is_user_logged_in() ? $logout_url : $login_url ); |
|
|
418
|
+ $item->url = (is_user_logged_in() ? $logout_url : $login_url); |
|
419
|
419
|
|
|
420
|
420
|
// determine the menu title login or logout |
|
421
|
|
- if ( is_user_logged_in() ) { |
|
422
|
|
- $menu_title = __( 'Logout' ,'woothemes-sensei'); |
|
|
421
|
+ if (is_user_logged_in()) { |
|
|
422
|
+ $menu_title = __('Logout', 'woothemes-sensei'); |
|
423
|
423
|
} else { |
|
424
|
|
- $menu_title = __( 'Login' ,'woothemes-sensei'); |
|
|
424
|
+ $menu_title = __('Login', 'woothemes-sensei'); |
|
425
|
425
|
} |
|
426
|
426
|
|
|
427
|
427
|
/** |
|
@@ -431,7 +431,7 @@ discard block |
|
|
block discarded – undo |
|
431
|
431
|
* |
|
432
|
432
|
* @param $menu_title |
|
433
|
433
|
*/ |
|
434
|
|
- $item->title = apply_filters( 'sensei_login_logout_menu_title', $menu_title ); |
|
|
434
|
+ $item->title = apply_filters('sensei_login_logout_menu_title', $menu_title); |
|
435
|
435
|
|
|
436
|
436
|
break; |
|
437
|
437
|
|
|
@@ -439,12 +439,12 @@ discard block |
|
|
block discarded – undo |
|
439
|
439
|
break; |
|
440
|
440
|
} |
|
441
|
441
|
|
|
442
|
|
- $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] ); |
|
443
|
|
- $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current ); |
|
444
|
|
- $item_url = untrailingslashit( $item->url ); |
|
445
|
|
- $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) ); |
|
|
442
|
+ $_root_relative_current = untrailingslashit($_SERVER['REQUEST_URI']); |
|
|
443
|
+ $current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_root_relative_current); |
|
|
444
|
+ $item_url = untrailingslashit($item->url); |
|
|
445
|
+ $_indexless_current = untrailingslashit(preg_replace('/'.preg_quote($wp_rewrite->index, '/').'$/', '', $current_url)); |
|
446
|
446
|
// Highlight current menu item |
|
447
|
|
- if ( $item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) { |
|
|
447
|
+ if ($item_url && in_array($item_url, array($current_url, $_indexless_current, $_root_relative_current))) { |
|
448
|
448
|
$item->classes[] = 'current-menu-item current_page_item'; |
|
449
|
449
|
} |
|
450
|
450
|
|
|
@@ -463,26 +463,26 @@ discard block |
|
|
block discarded – undo |
|
463
|
463
|
* @param object $sorted_menu_items |
|
464
|
464
|
* @return object $sorted_menu_items |
|
465
|
465
|
*/ |
|
466
|
|
- public function sensei_wp_nav_menu_objects( $sorted_menu_items ) { |
|
|
466
|
+ public function sensei_wp_nav_menu_objects($sorted_menu_items) { |
|
467
|
467
|
|
|
468
|
|
- foreach( $sorted_menu_items as $k=>$item ) { |
|
|
468
|
+ foreach ($sorted_menu_items as $k=>$item) { |
|
469
|
469
|
|
|
470
|
470
|
// Remove the My Messages link for logged out users or if Private Messages are disabled |
|
471
|
|
- if( ! get_post_type_archive_link( 'sensei_message' ) |
|
472
|
|
- && '#senseimymessages' == $item->url ) { |
|
|
471
|
+ if ( ! get_post_type_archive_link('sensei_message') |
|
|
472
|
+ && '#senseimymessages' == $item->url) { |
|
473
|
473
|
|
|
474
|
|
- if ( !is_user_logged_in() || ( isset( Sensei()->settings->settings['messages_disable'] ) && Sensei()->settings->settings['messages_disable'] ) ) { |
|
|
474
|
+ if ( ! is_user_logged_in() || (isset(Sensei()->settings->settings['messages_disable']) && Sensei()->settings->settings['messages_disable'])) { |
|
475
|
475
|
|
|
476
|
|
- unset( $sorted_menu_items[$k] ); |
|
|
476
|
+ unset($sorted_menu_items[$k]); |
|
477
|
477
|
|
|
478
|
478
|
} |
|
479
|
479
|
} |
|
480
|
480
|
// Remove the My Profile link for logged out users. |
|
481
|
|
- if( Sensei()->learner_profiles->get_permalink() == $item->url ) { |
|
|
481
|
+ if (Sensei()->learner_profiles->get_permalink() == $item->url) { |
|
482
|
482
|
|
|
483
|
|
- if ( !is_user_logged_in() || ! ( isset( Sensei()->settings->settings[ 'learner_profile_enable' ] ) && Sensei()->settings->settings[ 'learner_profile_enable' ] ) ) { |
|
|
483
|
+ if ( ! is_user_logged_in() || ! (isset(Sensei()->settings->settings['learner_profile_enable']) && Sensei()->settings->settings['learner_profile_enable'])) { |
|
484
|
484
|
|
|
485
|
|
- unset( $sorted_menu_items[$k] ); |
|
|
485
|
+ unset($sorted_menu_items[$k]); |
|
486
|
486
|
|
|
487
|
487
|
} |
|
488
|
488
|
} |
|
@@ -494,7 +494,7 @@ discard block |
|
|
block discarded – undo |
|
494
|
494
|
function sensei_search_results_classes($classes) { |
|
495
|
495
|
global $post; |
|
496
|
496
|
// Handle Search Classes for Courses, Lessons, and WC Products |
|
497
|
|
- if ( isset( $post->post_type ) && ( ( 'course' == $post->post_type ) || ( 'lesson' == $post->post_type ) || ( 'product' == $post->post_type ) ) ) { |
|
|
497
|
+ if (isset($post->post_type) && (('course' == $post->post_type) || ('lesson' == $post->post_type) || ('product' == $post->post_type))) { |
|
498
|
498
|
$classes[] = 'post'; |
|
499
|
499
|
} // End If Statement |
|
500
|
500
|
return $classes; |
|
@@ -522,16 +522,16 @@ discard block |
|
|
block discarded – undo |
|
522
|
522
|
* @param bool|false $return |
|
523
|
523
|
* @return string|void |
|
524
|
524
|
*/ |
|
525
|
|
- function sensei_course_image( $course_id, $width = '100', $height = '100', $return = false ) { |
|
|
525
|
+ function sensei_course_image($course_id, $width = '100', $height = '100', $return = false) { |
|
526
|
526
|
|
|
527
|
|
- if ( ! $return ) { |
|
|
527
|
+ if ( ! $return) { |
|
528
|
528
|
|
|
529
|
|
- echo Sensei()->course->course_image( $course_id, $width, $height ); |
|
|
529
|
+ echo Sensei()->course->course_image($course_id, $width, $height); |
|
530
|
530
|
return ''; |
|
531
|
531
|
|
|
532
|
532
|
} // End If Statement |
|
533
|
533
|
|
|
534
|
|
- return Sensei()->course->course_image( $course_id, $width, $height ); |
|
|
534
|
+ return Sensei()->course->course_image($course_id, $width, $height); |
|
535
|
535
|
|
|
536
|
536
|
} // End sensei_course_image() |
|
537
|
537
|
|
|
@@ -546,15 +546,15 @@ discard block |
|
|
block discarded – undo |
|
546
|
546
|
* @param bool|false $widget |
|
547
|
547
|
* @return string |
|
548
|
548
|
*/ |
|
549
|
|
- function sensei_lesson_image( $lesson_id, $width = '100', $height = '100', $return = false, $widget = false ) { |
|
|
549
|
+ function sensei_lesson_image($lesson_id, $width = '100', $height = '100', $return = false, $widget = false) { |
|
550
|
550
|
|
|
551
|
|
- if( ! $return ){ |
|
|
551
|
+ if ( ! $return) { |
|
552
|
552
|
|
|
553
|
|
- echo Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget ); |
|
|
553
|
+ echo Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget); |
|
554
|
554
|
return ''; |
|
555
|
555
|
} |
|
556
|
556
|
|
|
557
|
|
- return Sensei()->lesson->lesson_image( $lesson_id, $width, $height, $widget ); |
|
|
557
|
+ return Sensei()->lesson->lesson_image($lesson_id, $width, $height, $widget); |
|
558
|
558
|
|
|
559
|
559
|
} // End sensei_lesson_image() |
|
560
|
560
|
|
|
@@ -562,20 +562,20 @@ discard block |
|
|
block discarded – undo |
|
562
|
562
|
* @since 1.0.0 |
|
563
|
563
|
* @param WP_Query $query |
|
564
|
564
|
*/ |
|
565
|
|
- function sensei_course_archive_pagination( $query ) { |
|
|
565
|
+ function sensei_course_archive_pagination($query) { |
|
566
|
566
|
|
|
567
|
|
- if( ! is_admin() && $query->is_main_query() && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'newcourses', 'featuredcourses', 'freecourses', 'paidcourses' ) ) ) { |
|
|
567
|
+ if ( ! is_admin() && $query->is_main_query() && isset($_GET['action']) && in_array($_GET['action'], array('newcourses', 'featuredcourses', 'freecourses', 'paidcourses'))) { |
|
568
|
568
|
|
|
569
|
569
|
$amount = 0; |
|
570
|
|
- if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) { |
|
571
|
|
- $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] ); |
|
|
570
|
+ if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) { |
|
|
571
|
+ $amount = absint(Sensei()->settings->settings['course_archive_amount']); |
|
572
|
572
|
} |
|
573
|
573
|
|
|
574
|
|
- if( $amount ) { |
|
575
|
|
- $query->set( 'posts_per_page', $amount ); |
|
|
574
|
+ if ($amount) { |
|
|
575
|
+ $query->set('posts_per_page', $amount); |
|
576
|
576
|
} |
|
577
|
577
|
|
|
578
|
|
- $query->set( 'orderby', 'menu_order date' ); |
|
|
578
|
+ $query->set('orderby', 'menu_order date'); |
|
579
|
579
|
|
|
580
|
580
|
} |
|
581
|
581
|
} |
|
@@ -591,7 +591,7 @@ discard block |
|
|
block discarded – undo |
|
591
|
591
|
function sensei_course_archive_header( ) { |
|
592
|
592
|
|
|
593
|
593
|
trigger_error('This function sensei_course_archive_header has been depricated. Please use: WooThemes_Sensei_Course::course_archive_header '); |
|
594
|
|
- WooThemes_Sensei_Course::archive_header( '', '<header class="archive-header"><h1>', '</h1></header>' ); |
|
|
594
|
+ WooThemes_Sensei_Course::archive_header('', '<header class="archive-header"><h1>', '</h1></header>'); |
|
595
|
595
|
|
|
596
|
596
|
} // sensei_course_archive_header() |
|
597
|
597
|
|
|
@@ -604,15 +604,15 @@ discard block |
|
|
block discarded – undo |
|
604
|
604
|
* @return void |
|
605
|
605
|
*/ |
|
606
|
606
|
public function sensei_lesson_archive_header( ) { |
|
607
|
|
- _deprecated_function( 'WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header' ); |
|
|
607
|
+ _deprecated_function('WooThemes_Sensei_Frontend::sensei_lesson_archive_header', '1.9.0', 'WooThemes_Sensei_Lesson::the_archive_header'); |
|
608
|
608
|
Sensei()->lesson->the_archive_header(); |
|
609
|
609
|
} // sensei_course_archive_header() |
|
610
|
610
|
|
|
611
|
611
|
/** |
|
612
|
612
|
* @deprecated since 1.9.0 |
|
613
|
613
|
*/ |
|
614
|
|
- public function sensei_message_archive_header( ){ |
|
615
|
|
- _deprecated_function('Sensei_Frontend::sensei_message_archive_header','Please use: Sense'); |
|
|
614
|
+ public function sensei_message_archive_header( ) { |
|
|
615
|
+ _deprecated_function('Sensei_Frontend::sensei_message_archive_header', 'Please use: Sense'); |
|
616
|
616
|
Sensei_Messages::the_archive_header(); |
|
617
|
617
|
} // sensei_message_archive_header() |
|
618
|
618
|
|
|
@@ -622,15 +622,15 @@ discard block |
|
|
block discarded – undo |
|
622
|
622
|
* @param WP_Post $post_item |
|
623
|
623
|
* @return void |
|
624
|
624
|
*/ |
|
625
|
|
- function sensei_course_archive_course_title( $post_item ) { |
|
626
|
|
- if ( isset( $post_item->ID ) && ( 0 < $post_item->ID ) ) { |
|
627
|
|
- $post_id = absint( $post_item->ID ); |
|
|
625
|
+ function sensei_course_archive_course_title($post_item) { |
|
|
626
|
+ if (isset($post_item->ID) && (0 < $post_item->ID)) { |
|
|
627
|
+ $post_id = absint($post_item->ID); |
|
628
|
628
|
$post_title = $post_item->post_title; |
|
629
|
629
|
} else { |
|
630
|
630
|
$post_id = get_the_ID(); |
|
631
|
631
|
$post_title = get_the_title(); |
|
632
|
632
|
} // End If Statement |
|
633
|
|
- ?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php |
|
|
633
|
+ ?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php |
|
634
|
634
|
} // End sensei_course_archive_course_title() |
|
635
|
635
|
|
|
636
|
636
|
/** |
|
@@ -641,7 +641,7 @@ discard block |
|
|
block discarded – undo |
|
641
|
641
|
public function sensei_lesson_archive_lesson_title() { |
|
642
|
642
|
$post_id = get_the_ID(); |
|
643
|
643
|
$post_title = get_the_title(); |
|
644
|
|
- ?><header><h2><a href="<?php echo get_permalink( $post_id ); ?>" title="<?php echo esc_attr( $post_title ); ?>"><?php echo $post_title; ?></a></h2></header><?php |
|
|
644
|
+ ?><header><h2><a href="<?php echo get_permalink($post_id); ?>" title="<?php echo esc_attr($post_title); ?>"><?php echo $post_title; ?></a></h2></header><?php |
|
645
|
645
|
} // End sensei_lesson_archive_lesson_title() |
|
646
|
646
|
|
|
647
|
647
|
/** |
|
@@ -650,40 +650,40 @@ discard block |
|
|
block discarded – undo |
|
650
|
650
|
* @param integer $id course, lesson or quiz id |
|
651
|
651
|
* @return void |
|
652
|
652
|
*/ |
|
653
|
|
- public function sensei_breadcrumb( $id = 0 ) { |
|
|
653
|
+ public function sensei_breadcrumb($id = 0) { |
|
654
|
654
|
|
|
655
|
655
|
// Only output on lesson, quiz and taxonomy (module) pages |
|
656
|
|
- if( ! ( is_tax( 'module' ) || is_singular( 'lesson' ) || is_singular( 'quiz' ) ) ) return; |
|
|
656
|
+ if ( ! (is_tax('module') || is_singular('lesson') || is_singular('quiz'))) return; |
|
657
|
657
|
|
|
658
|
|
- if( empty( $id ) ){ |
|
|
658
|
+ if (empty($id)) { |
|
659
|
659
|
|
|
660
|
660
|
$id = get_the_ID(); |
|
661
|
661
|
|
|
662
|
662
|
} |
|
663
|
663
|
|
|
664
|
|
- $sensei_breadcrumb_prefix = __( 'Back to: ', 'woothemes-sensei' ); |
|
665
|
|
- $separator = apply_filters( 'sensei_breadcrumb_separator', '>' ); |
|
|
664
|
+ $sensei_breadcrumb_prefix = __('Back to: ', 'woothemes-sensei'); |
|
|
665
|
+ $separator = apply_filters('sensei_breadcrumb_separator', '>'); |
|
666
|
666
|
|
|
667
|
|
- $html = '<section class="sensei-breadcrumb">' . $sensei_breadcrumb_prefix; |
|
|
667
|
+ $html = '<section class="sensei-breadcrumb">'.$sensei_breadcrumb_prefix; |
|
668
|
668
|
// Lesson |
|
669
|
|
- if ( is_singular( 'lesson' ) && 0 < intval( $id ) ) { |
|
670
|
|
- $course_id = intval( get_post_meta( $id, '_lesson_course', true ) ); |
|
671
|
|
- if( ! $course_id ) { |
|
|
669
|
+ if (is_singular('lesson') && 0 < intval($id)) { |
|
|
670
|
+ $course_id = intval(get_post_meta($id, '_lesson_course', true)); |
|
|
671
|
+ if ( ! $course_id) { |
|
672
|
672
|
return; |
|
673
|
673
|
} |
|
674
|
|
- $html .= '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . __( 'Back to the course', 'woothemes-sensei' ) . '">' . get_the_title( $course_id ) . '</a>'; |
|
|
674
|
+ $html .= '<a href="'.esc_url(get_permalink($course_id)).'" title="'.__('Back to the course', 'woothemes-sensei').'">'.get_the_title($course_id).'</a>'; |
|
675
|
675
|
} // End If Statement |
|
676
|
676
|
// Quiz |
|
677
|
|
- if ( is_singular( 'quiz' ) && 0 < intval( $id ) ) { |
|
678
|
|
- $lesson_id = intval( get_post_meta( $id, '_quiz_lesson', true ) ); |
|
679
|
|
- if( ! $lesson_id ) { |
|
|
677
|
+ if (is_singular('quiz') && 0 < intval($id)) { |
|
|
678
|
+ $lesson_id = intval(get_post_meta($id, '_quiz_lesson', true)); |
|
|
679
|
+ if ( ! $lesson_id) { |
|
680
|
680
|
return; |
|
681
|
681
|
} |
|
682
|
|
- $html .= '<a href="' . esc_url( get_permalink( $lesson_id ) ) . '" title="' . __( 'Back to the lesson', 'woothemes-sensei' ) . '">' . get_the_title( $lesson_id ) . '</a>'; |
|
|
682
|
+ $html .= '<a href="'.esc_url(get_permalink($lesson_id)).'" title="'.__('Back to the lesson', 'woothemes-sensei').'">'.get_the_title($lesson_id).'</a>'; |
|
683
|
683
|
} // End If Statement |
|
684
|
684
|
|
|
685
|
685
|
// Allow other plugins to filter html |
|
686
|
|
- $html = apply_filters ( 'sensei_breadcrumb_output', $html, $separator ); |
|
|
686
|
+ $html = apply_filters('sensei_breadcrumb_output', $html, $separator); |
|
687
|
687
|
$html .= '</section>'; |
|
688
|
688
|
|
|
689
|
689
|
echo $html; |
|
@@ -695,25 +695,25 @@ discard block |
|
|
block discarded – undo |
|
695
|
695
|
*/ |
|
696
|
696
|
public function sensei_lesson_course_signup_link( ) { |
|
697
|
697
|
|
|
698
|
|
- _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link' ); |
|
|
698
|
+ _deprecated_function('sensei_lesson_course_signup_link', '1.9.0', 'WooThemes_Sensei_Lesson::course_signup_link'); |
|
699
|
699
|
WooThemes_Sensei_Lesson::course_signup_link(); |
|
700
|
700
|
} |
|
701
|
701
|
|
|
702
|
|
- public function lesson_tags_display( $lesson_id = 0 ) { |
|
703
|
|
- if( $lesson_id ) { |
|
704
|
|
- $tags = wp_get_post_terms( $lesson_id, 'lesson-tag' ); |
|
705
|
|
- if( $tags && count( $tags ) > 0 ) { |
|
|
702
|
+ public function lesson_tags_display($lesson_id = 0) { |
|
|
703
|
+ if ($lesson_id) { |
|
|
704
|
+ $tags = wp_get_post_terms($lesson_id, 'lesson-tag'); |
|
|
705
|
+ if ($tags && count($tags) > 0) { |
|
706
|
706
|
$tag_list = ''; |
|
707
|
|
- foreach( $tags as $tag ) { |
|
708
|
|
- $tag_link = get_term_link( $tag, 'lesson-tag' ); |
|
709
|
|
- if( ! is_wp_error( $tag_link ) ) { |
|
710
|
|
- if( $tag_list ) { $tag_list .= ', '; } |
|
711
|
|
- $tag_list .= '<a href="' . $tag_link . '">' . $tag->name . '</a>'; |
|
|
707
|
+ foreach ($tags as $tag) { |
|
|
708
|
+ $tag_link = get_term_link($tag, 'lesson-tag'); |
|
|
709
|
+ if ( ! is_wp_error($tag_link)) { |
|
|
710
|
+ if ($tag_list) { $tag_list .= ', '; } |
|
|
711
|
+ $tag_list .= '<a href="'.$tag_link.'">'.$tag->name.'</a>'; |
|
712
|
712
|
} |
|
713
|
713
|
} |
|
714
|
|
- if( $tag_list ) { |
|
|
714
|
+ if ($tag_list) { |
|
715
|
715
|
?><section class="lesson-tags"> |
|
716
|
|
- <?php printf( __( 'Lesson tags: %1$s', 'woothemes-sensei' ), $tag_list ); ?> |
|
|
716
|
+ <?php printf(__('Lesson tags: %1$s', 'woothemes-sensei'), $tag_list); ?> |
|
717
|
717
|
</section><?php |
|
718
|
718
|
} |
|
719
|
719
|
} |
|
@@ -723,51 +723,51 @@ discard block |
|
|
block discarded – undo |
|
723
|
723
|
/** |
|
724
|
724
|
* @param WP_Query $query |
|
725
|
725
|
*/ |
|
726
|
|
- public function lesson_tag_archive_filter( $query ) { |
|
727
|
|
- if( is_tax( 'lesson-tag' ) && $query->is_main_query() ) { |
|
|
726
|
+ public function lesson_tag_archive_filter($query) { |
|
|
727
|
+ if (is_tax('lesson-tag') && $query->is_main_query()) { |
|
728
|
728
|
// Limit to lessons only |
|
729
|
|
- $query->set( 'post_type', 'lesson' ); |
|
|
729
|
+ $query->set('post_type', 'lesson'); |
|
730
|
730
|
|
|
731
|
731
|
// Set order of lessons |
|
732
|
|
- $query->set( 'orderby', 'menu_order' ); |
|
733
|
|
- $query->set( 'order', 'ASC' ); |
|
|
732
|
+ $query->set('orderby', 'menu_order'); |
|
|
733
|
+ $query->set('order', 'ASC'); |
|
734
|
734
|
|
|
735
|
735
|
} |
|
736
|
736
|
} |
|
737
|
737
|
|
|
738
|
|
- public function lesson_tag_archive_header( $title ) { |
|
739
|
|
- if( is_tax( 'lesson-tag' ) ) { |
|
740
|
|
- $title = sprintf( __( 'Lesson tag: %1$s', 'woothemes-sensei' ), apply_filters( 'sensei_lesson_tag_archive_title', get_queried_object()->name ) ); |
|
|
738
|
+ public function lesson_tag_archive_header($title) { |
|
|
739
|
+ if (is_tax('lesson-tag')) { |
|
|
740
|
+ $title = sprintf(__('Lesson tag: %1$s', 'woothemes-sensei'), apply_filters('sensei_lesson_tag_archive_title', get_queried_object()->name)); |
|
741
|
741
|
} |
|
742
|
742
|
return $title; |
|
743
|
743
|
} |
|
744
|
744
|
|
|
745
|
745
|
public function lesson_tag_archive_description() { |
|
746
|
|
- if( is_tax( 'lesson-tag' ) ) { |
|
|
746
|
+ if (is_tax('lesson-tag')) { |
|
747
|
747
|
$tag = get_queried_object(); |
|
748
|
|
- echo '<p class="archive-description lesson-description">' . apply_filters( 'sensei_lesson_tag_archive_description', nl2br( $tag->description ), $tag->term_id ) . '</p>'; |
|
|
748
|
+ echo '<p class="archive-description lesson-description">'.apply_filters('sensei_lesson_tag_archive_description', nl2br($tag->description), $tag->term_id).'</p>'; |
|
749
|
749
|
} |
|
750
|
750
|
} |
|
751
|
751
|
|
|
752
|
752
|
public function sensei_complete_lesson() { |
|
753
|
|
- global $post, $current_user; |
|
|
753
|
+ global $post, $current_user; |
|
754
|
754
|
// Handle Quiz Completion |
|
755
|
|
- if ( isset( $_POST['quiz_action'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_lesson_noonce' ], 'woothemes_sensei_complete_lesson_noonce' ) ) { |
|
|
755
|
+ if (isset($_POST['quiz_action']) && wp_verify_nonce($_POST['woothemes_sensei_complete_lesson_noonce'], 'woothemes_sensei_complete_lesson_noonce')) { |
|
756
|
756
|
|
|
757
|
|
- $sanitized_submit = esc_html( $_POST['quiz_action'] ); |
|
|
757
|
+ $sanitized_submit = esc_html($_POST['quiz_action']); |
|
758
|
758
|
|
|
759
|
759
|
switch ($sanitized_submit) { |
|
760
|
760
|
case 'lesson-complete': |
|
761
|
761
|
|
|
762
|
|
- Sensei_Utils::sensei_start_lesson( $post->ID, $current_user->ID, $complete = true ); |
|
|
762
|
+ Sensei_Utils::sensei_start_lesson($post->ID, $current_user->ID, $complete = true); |
|
763
|
763
|
|
|
764
|
764
|
break; |
|
765
|
765
|
|
|
766
|
766
|
case 'lesson-reset': |
|
767
|
767
|
|
|
768
|
|
- Sensei_Utils::sensei_remove_user_from_lesson( $post->ID, $current_user->ID ); |
|
|
768
|
+ Sensei_Utils::sensei_remove_user_from_lesson($post->ID, $current_user->ID); |
|
769
|
769
|
|
|
770
|
|
- $this->messages = '<div class="sensei-message note">' . __( 'Lesson Reset Successfully.', 'woothemes-sensei' ) . '</div>'; |
|
|
770
|
+ $this->messages = '<div class="sensei-message note">'.__('Lesson Reset Successfully.', 'woothemes-sensei').'</div>'; |
|
771
|
771
|
break; |
|
772
|
772
|
|
|
773
|
773
|
default: |
|
@@ -781,14 +781,14 @@ discard block |
|
|
block discarded – undo |
|
781
|
781
|
} // End sensei_complete_lesson() |
|
782
|
782
|
|
|
783
|
783
|
public function sensei_complete_course() { |
|
784
|
|
- global $post, $current_user, $wp_query; |
|
785
|
|
- if ( isset( $_POST['course_complete'] ) && wp_verify_nonce( $_POST[ 'woothemes_sensei_complete_course_noonce' ], 'woothemes_sensei_complete_course_noonce' ) ) { |
|
|
784
|
+ global $post, $current_user, $wp_query; |
|
|
785
|
+ if (isset($_POST['course_complete']) && wp_verify_nonce($_POST['woothemes_sensei_complete_course_noonce'], 'woothemes_sensei_complete_course_noonce')) { |
|
786
|
786
|
|
|
787
|
|
- $sanitized_submit = esc_html( $_POST['course_complete'] ); |
|
788
|
|
- $sanitized_course_id = absint( esc_html( $_POST['course_complete_id'] ) ); |
|
|
787
|
+ $sanitized_submit = esc_html($_POST['course_complete']); |
|
|
788
|
+ $sanitized_course_id = absint(esc_html($_POST['course_complete_id'])); |
|
789
|
789
|
// Handle submit data |
|
790
|
790
|
switch ($sanitized_submit) { |
|
791
|
|
- case __( 'Mark as Complete', 'woothemes-sensei' ): |
|
|
791
|
+ case __('Mark as Complete', 'woothemes-sensei'): |
|
792
|
792
|
|
|
793
|
793
|
// Add user to course |
|
794
|
794
|
$course_metadata = array( |
|
@@ -796,15 +796,15 @@ discard block |
|
|
block discarded – undo |
|
796
|
796
|
'percent' => 0, // No completed lessons yet |
|
797
|
797
|
'complete' => 0, |
|
798
|
798
|
); |
|
799
|
|
- $activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata ); |
|
|
799
|
+ $activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'in-progress', $course_metadata); |
|
800
|
800
|
|
|
801
|
|
- if ( $activity_logged ) { |
|
|
801
|
+ if ($activity_logged) { |
|
802
|
802
|
// Get all course lessons |
|
803
|
|
- $course_lesson_ids = Sensei()->course->course_lessons( $sanitized_course_id, 'any', 'ids' ); |
|
|
803
|
+ $course_lesson_ids = Sensei()->course->course_lessons($sanitized_course_id, 'any', 'ids'); |
|
804
|
804
|
// Mark all quiz user meta lessons as complete |
|
805
|
|
- foreach ( $course_lesson_ids as $lesson_item_id ){ |
|
|
805
|
+ foreach ($course_lesson_ids as $lesson_item_id) { |
|
806
|
806
|
// Mark lesson as complete |
|
807
|
|
- $activity_logged = Sensei_Utils::sensei_start_lesson( $lesson_item_id, $current_user->ID, $complete = true ); |
|
|
807
|
+ $activity_logged = Sensei_Utils::sensei_start_lesson($lesson_item_id, $current_user->ID, $complete = true); |
|
808
|
808
|
} // End For Loop |
|
809
|
809
|
|
|
810
|
810
|
// Update with final stats |
|
@@ -812,22 +812,22 @@ discard block |
|
|
block discarded – undo |
|
812
|
812
|
'percent' => 100, |
|
813
|
813
|
'complete' => count($course_lesson_ids), |
|
814
|
814
|
); |
|
815
|
|
- $activity_logged = Sensei_Utils::update_course_status( $current_user->ID, $sanitized_course_id, 'complete', $course_metadata ); |
|
|
815
|
+ $activity_logged = Sensei_Utils::update_course_status($current_user->ID, $sanitized_course_id, 'complete', $course_metadata); |
|
816
|
816
|
|
|
817
|
|
- do_action( 'sensei_user_course_end', $current_user->ID, $sanitized_course_id ); |
|
|
817
|
+ do_action('sensei_user_course_end', $current_user->ID, $sanitized_course_id); |
|
818
|
818
|
|
|
819
|
819
|
// Success message |
|
820
|
|
- $this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s marked as complete.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>'; |
|
|
820
|
+ $this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s marked as complete.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>'; |
|
821
|
821
|
} // End If Statement |
|
822
|
822
|
|
|
823
|
823
|
break; |
|
824
|
824
|
|
|
825
|
|
- case __( 'Delete Course', 'woothemes-sensei' ): |
|
|
825
|
+ case __('Delete Course', 'woothemes-sensei'): |
|
826
|
826
|
|
|
827
|
|
- Sensei_Utils::sensei_remove_user_from_course( $sanitized_course_id, $current_user->ID ); |
|
|
827
|
+ Sensei_Utils::sensei_remove_user_from_course($sanitized_course_id, $current_user->ID); |
|
828
|
828
|
|
|
829
|
829
|
// Success message |
|
830
|
|
- $this->messages = '<header class="archive-header"><div class="sensei-message tick">' . sprintf( __( '%1$s deleted.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header>'; |
|
|
830
|
+ $this->messages = '<header class="archive-header"><div class="sensei-message tick">'.sprintf(__('%1$s deleted.', 'woothemes-sensei'), get_the_title($sanitized_course_id)).'</div></header>'; |
|
831
|
831
|
break; |
|
832
|
832
|
|
|
833
|
833
|
default: |
|
@@ -843,25 +843,25 @@ discard block |
|
|
block discarded – undo |
|
843
|
843
|
* @param int $lesson_id |
|
844
|
844
|
* @return array |
|
845
|
845
|
*/ |
|
846
|
|
- public function sensei_get_user_quiz_answers( $lesson_id = 0 ) { |
|
|
846
|
+ public function sensei_get_user_quiz_answers($lesson_id = 0) { |
|
847
|
847
|
global $current_user; |
|
848
|
848
|
|
|
849
|
849
|
$user_answers = array(); |
|
850
|
850
|
|
|
851
|
|
- if ( 0 < intval( $lesson_id ) ) { |
|
852
|
|
- $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions( $lesson_id ); |
|
853
|
|
- foreach( $lesson_quiz_questions as $question ) { |
|
854
|
|
- $answer = maybe_unserialize( base64_decode( Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content' ) ) ) ); |
|
855
|
|
- $user_answers[ $question->ID ] = $answer; |
|
|
851
|
+ if (0 < intval($lesson_id)) { |
|
|
852
|
+ $lesson_quiz_questions = Sensei()->lesson->lesson_quiz_questions($lesson_id); |
|
|
853
|
+ foreach ($lesson_quiz_questions as $question) { |
|
|
854
|
+ $answer = maybe_unserialize(base64_decode(Sensei_Utils::sensei_get_activity_value(array('post_id' => $question->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_user_answer', 'field' => 'comment_content')))); |
|
|
855
|
+ $user_answers[$question->ID] = $answer; |
|
856
|
856
|
} |
|
857
|
857
|
} |
|
858
|
858
|
|
|
859
|
859
|
return $user_answers; |
|
860
|
860
|
} // End sensei_get_user_quiz_answers() |
|
861
|
861
|
|
|
862
|
|
- public function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) { |
|
863
|
|
- _deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" ); |
|
864
|
|
- return Sensei_Utils::user_completed_lesson( $post_id, $user_id ); |
|
|
862
|
+ public function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) { |
|
|
863
|
+ _deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()"); |
|
|
864
|
+ return Sensei_Utils::user_completed_lesson($post_id, $user_id); |
|
865
|
865
|
} // End sensei_has_user_completed_lesson() |
|
866
|
866
|
|
|
867
|
867
|
/** |
|
@@ -871,14 +871,14 @@ discard block |
|
|
block discarded – undo |
|
871
|
871
|
Sensei()->notices->print_notices(); |
|
872
|
872
|
} // End sensei_frontend_messages() |
|
873
|
873
|
|
|
874
|
|
- public function sensei_lesson_video( $post_id = 0 ) { |
|
875
|
|
- if ( 0 < intval( $post_id ) ) { |
|
876
|
|
- $lesson_video_embed = get_post_meta( $post_id, '_lesson_video_embed', true ); |
|
877
|
|
- if ( 'http' == substr( $lesson_video_embed, 0, 4) ) { |
|
|
874
|
+ public function sensei_lesson_video($post_id = 0) { |
|
|
875
|
+ if (0 < intval($post_id)) { |
|
|
876
|
+ $lesson_video_embed = get_post_meta($post_id, '_lesson_video_embed', true); |
|
|
877
|
+ if ('http' == substr($lesson_video_embed, 0, 4)) { |
|
878
|
878
|
// V2 - make width and height a setting for video embed |
|
879
|
|
- $lesson_video_embed = wp_oembed_get( esc_url( $lesson_video_embed )/*, array( 'width' => 100 , 'height' => 100)*/ ); |
|
|
879
|
+ $lesson_video_embed = wp_oembed_get(esc_url($lesson_video_embed)/*, array( 'width' => 100 , 'height' => 100)*/); |
|
880
|
880
|
} // End If Statement |
|
881
|
|
- if ( '' != $lesson_video_embed ) { |
|
|
881
|
+ if ('' != $lesson_video_embed) { |
|
882
|
882
|
?><div class="video"><?php echo html_entity_decode($lesson_video_embed); ?></div><?php |
|
883
|
883
|
} // End If Statement |
|
884
|
884
|
} // End If Statement |
|
@@ -890,19 +890,19 @@ discard block |
|
|
block discarded – undo |
|
890
|
890
|
$quiz_id = 0; |
|
891
|
891
|
|
|
892
|
892
|
// Lesson quizzes |
|
893
|
|
- $quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID ); |
|
|
893
|
+ $quiz_id = Sensei()->lesson->lesson_quizzes($post->ID); |
|
894
|
894
|
$pass_required = true; |
|
895
|
|
- if( $quiz_id ) { |
|
|
895
|
+ if ($quiz_id) { |
|
896
|
896
|
// Get quiz pass setting |
|
897
|
|
- $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); |
|
|
897
|
+ $pass_required = get_post_meta($quiz_id, '_pass_required', true); |
|
898
|
898
|
} |
|
899
|
|
- if( ! $quiz_id || ( $quiz_id && ! $pass_required ) ) { |
|
|
899
|
+ if ( ! $quiz_id || ($quiz_id && ! $pass_required)) { |
|
900
|
900
|
?> |
|
901
|
|
- <form class="lesson_button_form" method="POST" action="<?php echo esc_url( get_permalink() ); ?>"> |
|
|
901
|
+ <form class="lesson_button_form" method="POST" action="<?php echo esc_url(get_permalink()); ?>"> |
|
902
|
902
|
<input type="hidden" |
|
903
|
903
|
name="woothemes_sensei_complete_lesson_noonce" |
|
904
|
904
|
id="woothemes_sensei_complete_lesson_noonce" |
|
905
|
|
- value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>" |
|
|
905
|
+ value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>" |
|
906
|
906
|
/> |
|
907
|
907
|
|
|
908
|
908
|
<input type="hidden" name="quiz_action" value="lesson-complete" /> |
|
@@ -910,7 +910,7 @@ discard block |
|
|
block discarded – undo |
|
910
|
910
|
<input type="submit" |
|
911
|
911
|
name="quiz_complete" |
|
912
|
912
|
class="quiz-submit complete" |
|
913
|
|
- value="<?php _e( 'Complete Lesson', 'woothemes-sensei' ); ?>"/> |
|
|
913
|
+ value="<?php _e('Complete Lesson', 'woothemes-sensei'); ?>"/> |
|
914
|
914
|
|
|
915
|
915
|
</form> |
|
916
|
916
|
<?php |
|
@@ -923,25 +923,25 @@ discard block |
|
|
block discarded – undo |
|
923
|
923
|
$quiz_id = 0; |
|
924
|
924
|
|
|
925
|
925
|
// Lesson quizzes |
|
926
|
|
- $quiz_id = Sensei()->lesson->lesson_quizzes( $post->ID ); |
|
|
926
|
+ $quiz_id = Sensei()->lesson->lesson_quizzes($post->ID); |
|
927
|
927
|
$reset_allowed = true; |
|
928
|
|
- if( $quiz_id ) { |
|
|
928
|
+ if ($quiz_id) { |
|
929
|
929
|
// Get quiz pass setting |
|
930
|
|
- $reset_allowed = get_post_meta( $quiz_id, '_enable_quiz_reset', true ); |
|
|
930
|
+ $reset_allowed = get_post_meta($quiz_id, '_enable_quiz_reset', true); |
|
931
|
931
|
} |
|
932
|
|
- if ( ! $quiz_id || !empty($reset_allowed) ) { |
|
|
932
|
+ if ( ! $quiz_id || ! empty($reset_allowed)) { |
|
933
|
933
|
?> |
|
934
|
|
- <form method="POST" action="<?php echo esc_url( get_permalink() ); ?>"> |
|
|
934
|
+ <form method="POST" action="<?php echo esc_url(get_permalink()); ?>"> |
|
935
|
935
|
|
|
936
|
936
|
<input |
|
937
|
937
|
type="hidden" |
|
938
|
|
- name="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>" |
|
939
|
|
- id="<?php echo esc_attr( 'woothemes_sensei_complete_lesson_noonce' ); ?>" |
|
940
|
|
- value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_complete_lesson_noonce' ) ); ?>" /> |
|
|
938
|
+ name="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>" |
|
|
939
|
+ id="<?php echo esc_attr('woothemes_sensei_complete_lesson_noonce'); ?>" |
|
|
940
|
+ value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_complete_lesson_noonce')); ?>" /> |
|
941
|
941
|
|
|
942
|
942
|
<input type="hidden" name="quiz_action" value="lesson-reset" /> |
|
943
|
943
|
|
|
944
|
|
- <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e( 'Reset Lesson', 'woothemes-sensei' ); ?>"/> |
|
|
944
|
+ <input type="submit" name="quiz_complete" class="quiz-submit reset" value="<?php _e('Reset Lesson', 'woothemes-sensei'); ?>"/> |
|
945
|
945
|
|
|
946
|
946
|
</form> |
|
947
|
947
|
<?php |
|
@@ -964,23 +964,23 @@ discard block |
|
|
block discarded – undo |
|
964
|
964
|
$post_title = get_the_title(); |
|
965
|
965
|
$author_display_name = get_the_author(); |
|
966
|
966
|
$author_id = get_the_author_meta('ID'); |
|
967
|
|
- $category_output = get_the_term_list( $post_id, 'course-category', '', ', ', '' ); |
|
968
|
|
- $free_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $post_id ) ); |
|
|
967
|
+ $category_output = get_the_term_list($post_id, 'course-category', '', ', ', ''); |
|
|
968
|
+ $free_lesson_count = intval(Sensei()->course->course_lesson_preview_count($post_id)); |
|
969
|
969
|
?><section class="entry"> |
|
970
|
970
|
<p class="sensei-course-meta"> |
|
971
|
|
- <?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?> |
|
972
|
|
- <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span> |
|
|
971
|
+ <?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?> |
|
|
972
|
+ <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span> |
|
973
|
973
|
<?php } // End If Statement ?> |
|
974
|
|
- <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count( $post_id ) . ' ' . __( 'Lessons', 'woothemes-sensei' ); ?></span> |
|
975
|
|
- <?php if ( '' != $category_output ) { ?> |
|
976
|
|
- <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span> |
|
|
974
|
+ <span class="course-lesson-count"><?php echo Sensei()->course->course_lesson_count($post_id).' '.__('Lessons', 'woothemes-sensei'); ?></span> |
|
|
975
|
+ <?php if ('' != $category_output) { ?> |
|
|
976
|
+ <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span> |
|
977
|
977
|
<?php } // End If Statement ?> |
|
978
|
|
- <?php sensei_simple_course_price( $post_id ); ?> |
|
|
978
|
+ <?php sensei_simple_course_price($post_id); ?> |
|
979
|
979
|
</p> |
|
980
|
980
|
<p class="course-excerpt"><?php the_excerpt(); ?></p> |
|
981
|
|
- <?php if ( 0 < $free_lesson_count ) { |
|
982
|
|
- $free_lessons = sprintf( __( 'You can access %d of this course\'s lessons for free', 'woothemes-sensei' ), $free_lesson_count ); ?> |
|
983
|
|
- <p class="sensei-free-lessons"><a href="<?php echo get_permalink( $post_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?></a> - <?php echo $free_lessons; ?></p> |
|
|
981
|
+ <?php if (0 < $free_lesson_count) { |
|
|
982
|
+ $free_lessons = sprintf(__('You can access %d of this course\'s lessons for free', 'woothemes-sensei'), $free_lesson_count); ?> |
|
|
983
|
+ <p class="sensei-free-lessons"><a href="<?php echo get_permalink($post_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?></a> - <?php echo $free_lessons; ?></p> |
|
984
|
984
|
<?php } ?> |
|
985
|
985
|
</section><?php |
|
986
|
986
|
} // End sensei_course_archive_meta() |
|
@@ -1003,33 +1003,33 @@ discard block |
|
|
block discarded – undo |
|
1003
|
1003
|
* @deprecated since 1.9.0 |
|
1004
|
1004
|
*/ |
|
1005
|
1005
|
public function sensei_message_archive_main_content() { |
|
1006
|
|
- _deprecated_function( 'Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed' ); |
|
|
1006
|
+ _deprecated_function('Sensei_Frontend::sensei_message_archive_main_content', 'This method is no longer needed'); |
|
1007
|
1007
|
} // End sensei_lesson_archive_main_content() |
|
1008
|
1008
|
|
|
1009
|
1009
|
/** |
|
1010
|
1010
|
* @deprecated since 1.9.0 |
|
1011
|
1011
|
*/ |
|
1012
|
1012
|
public function sensei_no_permissions_main_content() { |
|
1013
|
|
- _deprecated_function( 'Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed' ); |
|
|
1013
|
+ _deprecated_function('Sensei_Frontend::sensei_no_permissions_main_content', 'This method is no longer needed'); |
|
1014
|
1014
|
} // End sensei_no_permissions_main_content() |
|
1015
|
1015
|
|
|
1016
|
1016
|
public function sensei_course_category_main_content() { |
|
1017
|
1017
|
global $post; |
|
1018
|
|
- if ( have_posts() ) { ?> |
|
|
1018
|
+ if (have_posts()) { ?> |
|
1019
|
1019
|
|
|
1020
|
1020
|
<section id="main-course" class="course-container"> |
|
1021
|
1021
|
|
|
1022
|
|
- <?php do_action( 'sensei_course_archive_header' ); ?> |
|
|
1022
|
+ <?php do_action('sensei_course_archive_header'); ?> |
|
1023
|
1023
|
|
|
1024
|
|
- <?php while ( have_posts() ) { the_post(); ?> |
|
|
1024
|
+ <?php while (have_posts()) { the_post(); ?> |
|
1025
|
1025
|
|
|
1026
|
|
- <article class="<?php echo join( ' ', get_post_class( array( 'course', 'post' ), get_the_ID() ) ); ?>"> |
|
|
1026
|
+ <article class="<?php echo join(' ', get_post_class(array('course', 'post'), get_the_ID())); ?>"> |
|
1027
|
1027
|
|
|
1028
|
|
- <?php sensei_do_deprecated_action('sensei_course_image','1.9.0', 'sensei_single_course_content_inside_before', get_the_ID() ); ?> |
|
|
1028
|
+ <?php sensei_do_deprecated_action('sensei_course_image', '1.9.0', 'sensei_single_course_content_inside_before', get_the_ID()); ?> |
|
1029
|
1029
|
|
|
1030
|
|
- <?php sensei_do_deprecated_action( 'sensei_course_archive_course_title','1.9.0','sensei_course_content_inside_before', $post ); ?> |
|
|
1030
|
+ <?php sensei_do_deprecated_action('sensei_course_archive_course_title', '1.9.0', 'sensei_course_content_inside_before', $post); ?> |
|
1031
|
1031
|
|
|
1032
|
|
- <?php do_action( 'sensei_course_archive_meta' ); ?> |
|
|
1032
|
+ <?php do_action('sensei_course_archive_meta'); ?> |
|
1033
|
1033
|
|
|
1034
|
1034
|
</article> |
|
1035
|
1035
|
|
|
@@ -1041,7 +1041,7 @@ discard block |
|
|
block discarded – undo |
|
1041
|
1041
|
|
|
1042
|
1042
|
<p> |
|
1043
|
1043
|
|
|
1044
|
|
- <?php _e( 'No courses found that match your selection.', 'woothemes-sensei' ); ?> |
|
|
1044
|
+ <?php _e('No courses found that match your selection.', 'woothemes-sensei'); ?> |
|
1045
|
1045
|
|
|
1046
|
1046
|
</p> |
|
1047
|
1047
|
|
|
@@ -1058,12 +1058,12 @@ discard block |
|
|
block discarded – undo |
|
1058
|
1058
|
<div class="col-1"> |
|
1059
|
1059
|
<?php |
|
1060
|
1060
|
// output the actual form markup |
|
1061
|
|
- Sensei_Templates::get_template( 'user/login-form.php'); |
|
|
1061
|
+ Sensei_Templates::get_template('user/login-form.php'); |
|
1062
|
1062
|
?> |
|
1063
|
1063
|
</div> |
|
1064
|
1064
|
|
|
1065
|
1065
|
<?php |
|
1066
|
|
- if ( get_option('users_can_register') ) { |
|
|
1066
|
+ if (get_option('users_can_register')) { |
|
1067
|
1067
|
|
|
1068
|
1068
|
// get current url |
|
1069
|
1069
|
$action_url = get_permalink(); |
|
@@ -1071,38 +1071,38 @@ discard block |
|
|
block discarded – undo |
|
1071
|
1071
|
?> |
|
1072
|
1072
|
|
|
1073
|
1073
|
<div class="col-2"> |
|
1074
|
|
- <h2><?php _e( 'Register', 'woothemes-sensei' ); ?></h2> |
|
|
1074
|
+ <h2><?php _e('Register', 'woothemes-sensei'); ?></h2> |
|
1075
|
1075
|
|
|
1076
|
|
- <form method="post" class="register" action="<?php echo esc_url( $action_url ); ?>" > |
|
|
1076
|
+ <form method="post" class="register" action="<?php echo esc_url($action_url); ?>" > |
|
1077
|
1077
|
|
|
1078
|
|
- <?php do_action( 'sensei_register_form_start' ); ?> |
|
|
1078
|
+ <?php do_action('sensei_register_form_start'); ?> |
|
1079
|
1079
|
|
|
1080
|
1080
|
<p class="form-row form-row-wide"> |
|
1081
|
|
- <label for="sensei_reg_username"><?php _e( 'Username', 'woothemes-sensei' ); ?> <span class="required">*</span></label> |
|
1082
|
|
- <input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty( $_POST['sensei_reg_username'] ) ) esc_attr_e( $_POST['sensei_reg_username'] ); ?>" /> |
|
|
1081
|
+ <label for="sensei_reg_username"><?php _e('Username', 'woothemes-sensei'); ?> <span class="required">*</span></label> |
|
|
1082
|
+ <input type="text" class="input-text" name="sensei_reg_username" id="sensei_reg_username" value="<?php if ( ! empty($_POST['sensei_reg_username'])) esc_attr_e($_POST['sensei_reg_username']); ?>" /> |
|
1083
|
1083
|
</p> |
|
1084
|
1084
|
|
|
1085
|
1085
|
<p class="form-row form-row-wide"> |
|
1086
|
|
- <label for="sensei_reg_email"><?php _e( 'Email address', 'woothemes-sensei' ); ?> <span class="required">*</span></label> |
|
1087
|
|
- <input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty( $_POST['sensei_reg_email'] ) ) esc_attr_e( $_POST['sensei_reg_email'] ); ?>" /> |
|
|
1086
|
+ <label for="sensei_reg_email"><?php _e('Email address', 'woothemes-sensei'); ?> <span class="required">*</span></label> |
|
|
1087
|
+ <input type="email" class="input-text" name="sensei_reg_email" id="sensei_reg_email" value="<?php if ( ! empty($_POST['sensei_reg_email'])) esc_attr_e($_POST['sensei_reg_email']); ?>" /> |
|
1088
|
1088
|
</p> |
|
1089
|
1089
|
|
|
1090
|
1090
|
<p class="form-row form-row-wide"> |
|
1091
|
|
- <label for="sensei_reg_password"><?php _e( 'Password', 'woothemes-sensei' ); ?> <span class="required">*</span></label> |
|
1092
|
|
- <input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty( $_POST['sensei_reg_password'] ) ) esc_attr_e( $_POST['sensei_reg_password'] ); ?>" /> |
|
|
1091
|
+ <label for="sensei_reg_password"><?php _e('Password', 'woothemes-sensei'); ?> <span class="required">*</span></label> |
|
|
1092
|
+ <input type="password" class="input-text" name="sensei_reg_password" id="sensei_reg_password" value="<?php if ( ! empty($_POST['sensei_reg_password'])) esc_attr_e($_POST['sensei_reg_password']); ?>" /> |
|
1093
|
1093
|
</p> |
|
1094
|
1094
|
|
|
1095
|
1095
|
<!-- Spam Trap --> |
|
1096
|
|
- <div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'woothemes-sensei' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div> |
|
|
1096
|
+ <div style="left:-999em; position:absolute;"><label for="trap"><?php _e('Anti-spam', 'woothemes-sensei'); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div> |
|
1097
|
1097
|
|
|
1098
|
|
- <?php do_action( 'sensei_register_form_fields' ); ?> |
|
1099
|
|
- <?php do_action( 'register_form' ); ?> |
|
|
1098
|
+ <?php do_action('sensei_register_form_fields'); ?> |
|
|
1099
|
+ <?php do_action('register_form'); ?> |
|
1100
|
1100
|
|
|
1101
|
1101
|
<p class="form-row"> |
|
1102
|
|
- <input type="submit" class="button" name="register" value="<?php _e( 'Register', 'woothemes-sensei' ); ?>" /> |
|
|
1102
|
+ <input type="submit" class="button" name="register" value="<?php _e('Register', 'woothemes-sensei'); ?>" /> |
|
1103
|
1103
|
</p> |
|
1104
|
1104
|
|
|
1105
|
|
- <?php do_action( 'sensei_register_form_end' ); ?> |
|
|
1105
|
+ <?php do_action('sensei_register_form_end'); ?> |
|
1106
|
1106
|
|
|
1107
|
1107
|
</form> |
|
1108
|
1108
|
</div> |
|
@@ -1115,17 +1115,17 @@ discard block |
|
|
block discarded – undo |
|
1115
|
1115
|
<?php |
|
1116
|
1116
|
} // End sensei_login_form() |
|
1117
|
1117
|
|
|
1118
|
|
- public function sensei_lesson_meta( $post_id = 0 ) { |
|
|
1118
|
+ public function sensei_lesson_meta($post_id = 0) { |
|
1119
|
1119
|
global $post; |
|
1120
|
|
- if ( 0 < intval( $post_id ) ) { |
|
1121
|
|
- $lesson_course_id = absint( get_post_meta( $post_id, '_lesson_course', true ) ); |
|
|
1120
|
+ if (0 < intval($post_id)) { |
|
|
1121
|
+ $lesson_course_id = absint(get_post_meta($post_id, '_lesson_course', true)); |
|
1122
|
1122
|
?><section class="entry"> |
|
1123
|
1123
|
<p class="sensei-course-meta"> |
|
1124
|
|
- <?php if ( isset( Sensei()->settings->settings[ 'lesson_author' ] ) && ( Sensei()->settings->settings[ 'lesson_author' ] ) ) { ?> |
|
1125
|
|
- <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><?php the_author_link(); ?></span> |
|
|
1124
|
+ <?php if (isset(Sensei()->settings->settings['lesson_author']) && (Sensei()->settings->settings['lesson_author'])) { ?> |
|
|
1125
|
+ <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><?php the_author_link(); ?></span> |
|
1126
|
1126
|
<?php } ?> |
|
1127
|
|
- <?php if ( 0 < intval( $lesson_course_id ) ) { ?> |
|
1128
|
|
- <span class="lesson-course"><?php echo ' ' . sprintf( __( 'Part of: %s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $lesson_course_id ) ) . '" title="' . __( 'View course', 'woothemes-sensei' ) . '"><em>' . get_the_title( $lesson_course_id ) . '</em></a>' ); ?></span> |
|
|
1127
|
+ <?php if (0 < intval($lesson_course_id)) { ?> |
|
|
1128
|
+ <span class="lesson-course"><?php echo ' '.sprintf(__('Part of: %s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($lesson_course_id)).'" title="'.__('View course', 'woothemes-sensei').'"><em>'.get_the_title($lesson_course_id).'</em></a>'); ?></span> |
|
1129
|
1129
|
<?php } ?> |
|
1130
|
1130
|
</p> |
|
1131
|
1131
|
<p class="lesson-excerpt"><?php the_excerpt( ); ?></p> |
|
@@ -1133,36 +1133,36 @@ discard block |
|
|
block discarded – undo |
|
1133
|
1133
|
} // End If Statement |
|
1134
|
1134
|
} // sensei_lesson_meta() |
|
1135
|
1135
|
|
|
1136
|
|
- public function sensei_lesson_preview_title_text( $course_id ) { |
|
|
1136
|
+ public function sensei_lesson_preview_title_text($course_id) { |
|
1137
|
1137
|
|
|
1138
|
|
- $preview_text = __( ' (Preview)', 'woothemes-sensei' ); |
|
|
1138
|
+ $preview_text = __(' (Preview)', 'woothemes-sensei'); |
|
1139
|
1139
|
|
|
1140
|
1140
|
//if this is a paid course |
|
1141
|
|
- if ( Sensei_WC::is_woocommerce_active() ) { |
|
1142
|
|
- $wc_post_id = get_post_meta( $course_id, '_course_woocommerce_product', true ); |
|
1143
|
|
- if ( 0 < $wc_post_id ) { |
|
1144
|
|
- $preview_text = __( ' (Free Preview)', 'woothemes-sensei' ); |
|
|
1141
|
+ if (Sensei_WC::is_woocommerce_active()) { |
|
|
1142
|
+ $wc_post_id = get_post_meta($course_id, '_course_woocommerce_product', true); |
|
|
1143
|
+ if (0 < $wc_post_id) { |
|
|
1144
|
+ $preview_text = __(' (Free Preview)', 'woothemes-sensei'); |
|
1145
|
1145
|
} // End If Statement |
|
1146
|
1146
|
} |
|
1147
|
1147
|
return $preview_text; |
|
1148
|
1148
|
} |
|
1149
|
1149
|
|
|
1150
|
|
- public function sensei_lesson_preview_title( $title = '', $id = 0 ) { |
|
|
1150
|
+ public function sensei_lesson_preview_title($title = '', $id = 0) { |
|
1151
|
1151
|
global $post, $current_user; |
|
1152
|
1152
|
|
|
1153
|
1153
|
// Limit to lessons and check if lesson ID matches filtered post ID |
|
1154
|
1154
|
// @see https://github.com/woothemes/sensei/issues/574 |
|
1155
|
|
- if( isset( $post->ID ) && $id == $post->ID && 'lesson' == get_post_type( $post ) ) { |
|
|
1155
|
+ if (isset($post->ID) && $id == $post->ID && 'lesson' == get_post_type($post)) { |
|
1156
|
1156
|
|
|
1157
|
1157
|
// Limit to main query only |
|
1158
|
|
- if( is_main_query() ) { |
|
|
1158
|
+ if (is_main_query()) { |
|
1159
|
1159
|
|
|
1160
|
1160
|
// Get the course ID |
|
1161
|
|
- $course_id = get_post_meta( $post->ID, '_lesson_course', true ); |
|
|
1161
|
+ $course_id = get_post_meta($post->ID, '_lesson_course', true); |
|
1162
|
1162
|
|
|
1163
|
1163
|
// Check if the user is taking the course |
|
1164
|
|
- if( is_singular( 'lesson' ) && Sensei_Utils::is_preview_lesson( $post->ID ) && ! Sensei_Utils::user_started_course( $course_id, $current_user->ID ) && $post->ID == $id ) { |
|
1165
|
|
- $title .= ' ' . $this->sensei_lesson_preview_title_text( $course_id ); |
|
|
1164
|
+ if (is_singular('lesson') && Sensei_Utils::is_preview_lesson($post->ID) && ! Sensei_Utils::user_started_course($course_id, $current_user->ID) && $post->ID == $id) { |
|
|
1165
|
+ $title .= ' '.$this->sensei_lesson_preview_title_text($course_id); |
|
1166
|
1166
|
} |
|
1167
|
1167
|
} |
|
1168
|
1168
|
} |
|
@@ -1173,23 +1173,23 @@ discard block |
|
|
block discarded – undo |
|
1173
|
1173
|
global $post, $current_user; |
|
1174
|
1174
|
|
|
1175
|
1175
|
// Check if the user is taking the course |
|
1176
|
|
- $is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID ); |
|
|
1176
|
+ $is_user_taking_course = Sensei_Utils::user_started_course($post->ID, $current_user->ID); |
|
1177
|
1177
|
// Handle user starting the course |
|
1178
|
|
- if ( isset( $_POST['course_start'] ) |
|
1179
|
|
- && wp_verify_nonce( $_POST[ 'woothemes_sensei_start_course_noonce' ], 'woothemes_sensei_start_course_noonce' ) |
|
1180
|
|
- && !$is_user_taking_course ) { |
|
|
1178
|
+ if (isset($_POST['course_start']) |
|
|
1179
|
+ && wp_verify_nonce($_POST['woothemes_sensei_start_course_noonce'], 'woothemes_sensei_start_course_noonce') |
|
|
1180
|
+ && ! $is_user_taking_course) { |
|
1181
|
1181
|
|
|
1182
|
1182
|
// Start the course |
|
1183
|
|
- $activity_logged = Sensei_Utils::user_start_course( $current_user->ID, $post->ID ); |
|
|
1183
|
+ $activity_logged = Sensei_Utils::user_start_course($current_user->ID, $post->ID); |
|
1184
|
1184
|
$this->data = new stdClass(); |
|
1185
|
1185
|
$this->data->is_user_taking_course = false; |
|
1186
|
|
- if ( $activity_logged ) { |
|
|
1186
|
+ if ($activity_logged) { |
|
1187
|
1187
|
$this->data->is_user_taking_course = true; |
|
1188
|
1188
|
|
|
1189
|
1189
|
// Refresh page to avoid re-posting |
|
1190
|
1190
|
?> |
|
1191
|
1191
|
|
|
1192
|
|
- <script type="text/javascript"> window.location = '<?php echo get_permalink( $post->ID ); ?>'; </script> |
|
|
1192
|
+ <script type="text/javascript"> window.location = '<?php echo get_permalink($post->ID); ?>'; </script> |
|
1193
|
1193
|
|
|
1194
|
1194
|
<?php |
|
1195
|
1195
|
} // End If Statement |
|
@@ -1200,15 +1200,15 @@ discard block |
|
|
block discarded – undo |
|
1200
|
1200
|
* @deprecated since 1.9.0 |
|
1201
|
1201
|
*/ |
|
1202
|
1202
|
public function sensei_course_meta() { |
|
1203
|
|
- _deprecated_function( 'Sensei_Frontend::sensei_course_meta', '1.9.0' , 'Sensei_Course::the_course_meta()' ); |
|
1204
|
|
- Sensei()->course->the_course_meta( get_post() ); |
|
|
1203
|
+ _deprecated_function('Sensei_Frontend::sensei_course_meta', '1.9.0', 'Sensei_Course::the_course_meta()'); |
|
|
1204
|
+ Sensei()->course->the_course_meta(get_post()); |
|
1205
|
1205
|
} // End sensei_course_meta() |
|
1206
|
1206
|
|
|
1207
|
1207
|
/** |
|
1208
|
1208
|
* @deprecated since 1.9.0 |
|
1209
|
1209
|
*/ |
|
1210
|
1210
|
public function sensei_course_meta_video() { |
|
1211
|
|
- _deprecated_function( 'Sensei_Frontend::sensei_course_meta_video', '1.9.0' , 'Sensei_Course::the_course_video()' ); |
|
|
1211
|
+ _deprecated_function('Sensei_Frontend::sensei_course_meta_video', '1.9.0', 'Sensei_Course::the_course_video()'); |
|
1212
|
1212
|
Sensei_Course::the_course_video(); |
|
1213
|
1213
|
} // End sensei_course_meta_video() |
|
1214
|
1214
|
|
|
@@ -1223,12 +1223,12 @@ discard block |
|
|
block discarded – undo |
|
1223
|
1223
|
public function sensei_woocommerce_in_cart_message() { |
|
1224
|
1224
|
global $post, $woocommerce; |
|
1225
|
1225
|
|
|
1226
|
|
- $wc_post_id = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) ); |
|
1227
|
|
- $user_course_status_id = Sensei_Utils::user_started_course($post->ID , get_current_user_id() ); |
|
1228
|
|
- if ( 0 < intval( $wc_post_id ) && ! $user_course_status_id ) { |
|
|
1226
|
+ $wc_post_id = absint(get_post_meta($post->ID, '_course_woocommerce_product', true)); |
|
|
1227
|
+ $user_course_status_id = Sensei_Utils::user_started_course($post->ID, get_current_user_id()); |
|
|
1228
|
+ if (0 < intval($wc_post_id) && ! $user_course_status_id) { |
|
1229
|
1229
|
|
|
1230
|
|
- if ( Sensei_WC::is_product_in_cart( $wc_post_id ) ) { |
|
1231
|
|
- echo '<div class="sensei-message info">' . sprintf( __('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei') . '</div>', '<a class="cart-complete" href="' . $woocommerce->cart->get_checkout_url() . '" title="' . __('complete the purchase', 'woothemes-sensei') . '">' . __('complete the purchase', 'woothemes-sensei') . '</a>' ); |
|
|
1230
|
+ if (Sensei_WC::is_product_in_cart($wc_post_id)) { |
|
|
1231
|
+ echo '<div class="sensei-message info">'.sprintf(__('You have already added this Course to your cart. Please %1$s to access the course.', 'woothemes-sensei').'</div>', '<a class="cart-complete" href="'.$woocommerce->cart->get_checkout_url().'" title="'.__('complete the purchase', 'woothemes-sensei').'">'.__('complete the purchase', 'woothemes-sensei').'</a>'); |
|
1232
|
1232
|
} // End If Statement |
|
1233
|
1233
|
|
|
1234
|
1234
|
} // End If Statement |
|
@@ -1236,7 +1236,7 @@ discard block |
|
|
block discarded – undo |
|
1236
|
1236
|
} // End sensei_woocommerce_in_cart_message() |
|
1237
|
1237
|
|
|
1238
|
1238
|
// Deprecated |
|
1239
|
|
- public function sensei_lesson_comment_count( $count ) { |
|
|
1239
|
+ public function sensei_lesson_comment_count($count) { |
|
1240
|
1240
|
return $count; |
|
1241
|
1241
|
} // End sensei_lesson_comment_count() |
|
1242
|
1242
|
|
|
@@ -1245,11 +1245,11 @@ discard block |
|
|
block discarded – undo |
|
1245
|
1245
|
* @param string $content Original content |
|
1246
|
1246
|
* @return string Modified content |
|
1247
|
1247
|
*/ |
|
1248
|
|
- public function sensei_search_results_excerpt( $content ) { |
|
|
1248
|
+ public function sensei_search_results_excerpt($content) { |
|
1249
|
1249
|
global $post; |
|
1250
|
1250
|
|
|
1251
|
|
- if( is_search() && in_array( $post->post_type, array( 'course', 'lesson' ) ) ) { |
|
1252
|
|
- $content = '<p class="course-excerpt">' . the_excerpt( ) . '</p>'; |
|
|
1251
|
+ if (is_search() && in_array($post->post_type, array('course', 'lesson'))) { |
|
|
1252
|
+ $content = '<p class="course-excerpt">'.the_excerpt( ).'</p>'; |
|
1253
|
1253
|
} |
|
1254
|
1254
|
|
|
1255
|
1255
|
return $content; |
|
@@ -1260,11 +1260,11 @@ discard block |
|
|
block discarded – undo |
|
1260
|
1260
|
* @param integer $order_id ID of order |
|
1261
|
1261
|
* @return void |
|
1262
|
1262
|
*/ |
|
1263
|
|
- public function remove_active_course( $order_id ) { |
|
1264
|
|
- $order = new WC_Order( $order_id ); |
|
|
1263
|
+ public function remove_active_course($order_id) { |
|
|
1264
|
+ $order = new WC_Order($order_id); |
|
1265
|
1265
|
|
|
1266
|
|
- foreach ( $order->get_items() as $item ) { |
|
1267
|
|
- if ( isset( $item['variation_id'] ) && ( 0 < $item['variation_id'] ) ) { |
|
|
1266
|
+ foreach ($order->get_items() as $item) { |
|
|
1267
|
+ if (isset($item['variation_id']) && (0 < $item['variation_id'])) { |
|
1268
|
1268
|
// If item has variation_id then its a variation of the product |
|
1269
|
1269
|
$item_id = $item['variation_id']; |
|
1270
|
1270
|
} else { |
|
@@ -1272,11 +1272,11 @@ discard block |
|
|
block discarded – undo |
|
1272
|
1272
|
$item_id = $item['product_id']; |
|
1273
|
1273
|
} |
|
1274
|
1274
|
|
|
1275
|
|
- if ( $item_id > 0 ) { |
|
|
1275
|
+ if ($item_id > 0) { |
|
1276
|
1276
|
|
|
1277
|
|
- $user_id = get_post_meta( $order_id, '_customer_user', true ); |
|
|
1277
|
+ $user_id = get_post_meta($order_id, '_customer_user', true); |
|
1278
|
1278
|
|
|
1279
|
|
- if( $user_id ) { |
|
|
1279
|
+ if ($user_id) { |
|
1280
|
1280
|
|
|
1281
|
1281
|
// Get all courses for product |
|
1282
|
1282
|
$args = array( |
|
@@ -1292,13 +1292,13 @@ discard block |
|
|
block discarded – undo |
|
1292
|
1292
|
'order' => 'ASC', |
|
1293
|
1293
|
'fields' => 'ids', |
|
1294
|
1294
|
); |
|
1295
|
|
- $course_ids = get_posts( $args ); |
|
|
1295
|
+ $course_ids = get_posts($args); |
|
1296
|
1296
|
|
|
1297
|
|
- if( $course_ids && count( $course_ids ) > 0 ) { |
|
1298
|
|
- foreach( $course_ids as $course_id ) { |
|
|
1297
|
+ if ($course_ids && count($course_ids) > 0) { |
|
|
1298
|
+ foreach ($course_ids as $course_id) { |
|
1299
|
1299
|
|
|
1300
|
1300
|
// Remove all course user meta |
|
1301
|
|
- Sensei_Utils::sensei_remove_user_from_course( $course_id, $user_id ); |
|
|
1301
|
+ Sensei_Utils::sensei_remove_user_from_course($course_id, $user_id); |
|
1302
|
1302
|
|
|
1303
|
1303
|
} // End For Loop |
|
1304
|
1304
|
} // End If Statement |
|
@@ -1314,16 +1314,16 @@ discard block |
|
|
block discarded – undo |
|
1314
|
1314
|
* @param integer $user_id User ID |
|
1315
|
1315
|
* @return void |
|
1316
|
1316
|
*/ |
|
1317
|
|
- public function activate_purchased_courses( $user_id = 0 ) { |
|
|
1317
|
+ public function activate_purchased_courses($user_id = 0) { |
|
1318
|
1318
|
|
|
1319
|
|
- if( $user_id ) { |
|
|
1319
|
+ if ($user_id) { |
|
1320
|
1320
|
|
|
1321
|
|
- if( Sensei_WC::is_woocommerce_active() ) { |
|
|
1321
|
+ if (Sensei_WC::is_woocommerce_active()) { |
|
1322
|
1322
|
|
|
1323
|
1323
|
// Get all user's orders |
|
1324
|
1324
|
$order_args = array( |
|
1325
|
1325
|
'post_type' => 'shop_order', |
|
1326
|
|
- 'post_status' => array( 'wc-processing', 'wc-completed' ), |
|
|
1326
|
+ 'post_status' => array('wc-processing', 'wc-completed'), |
|
1327
|
1327
|
'posts_per_page' => -1, |
|
1328
|
1328
|
'meta_query' => array( |
|
1329
|
1329
|
array( |
|
@@ -1333,25 +1333,25 @@ discard block |
|
|
block discarded – undo |
|
1333
|
1333
|
), |
|
1334
|
1334
|
); |
|
1335
|
1335
|
|
|
1336
|
|
- $orders = get_posts( $order_args ); |
|
|
1336
|
+ $orders = get_posts($order_args); |
|
1337
|
1337
|
|
|
1338
|
1338
|
$product_ids = array(); |
|
1339
|
1339
|
$order_ids = array(); |
|
1340
|
1340
|
|
|
1341
|
|
- foreach( $orders as $post_id ) { |
|
|
1341
|
+ foreach ($orders as $post_id) { |
|
1342
|
1342
|
|
|
1343
|
1343
|
// Only process each order once |
|
1344
|
|
- $processed = get_post_meta( $post_id, 'sensei_products_processed', true ); |
|
|
1344
|
+ $processed = get_post_meta($post_id, 'sensei_products_processed', true); |
|
1345
|
1345
|
|
|
1346
|
|
- if( $processed && $processed == 'processed' ) { |
|
|
1346
|
+ if ($processed && $processed == 'processed') { |
|
1347
|
1347
|
continue; |
|
1348
|
1348
|
} |
|
1349
|
1349
|
|
|
1350
|
1350
|
// Get course product IDs from order |
|
1351
|
|
- $order = new WC_Order( $post_id ); |
|
|
1351
|
+ $order = new WC_Order($post_id); |
|
1352
|
1352
|
|
|
1353
|
1353
|
$items = $order->get_items(); |
|
1354
|
|
- foreach( $items as $item ) { |
|
|
1354
|
+ foreach ($items as $item) { |
|
1355
|
1355
|
if (isset($item['variation_id']) && $item['variation_id'] > 0) { |
|
1356
|
1356
|
$item_id = $item['variation_id']; |
|
1357
|
1357
|
$product_type = 'variation'; |
|
@@ -1365,7 +1365,7 @@ discard block |
|
|
block discarded – undo |
|
1365
|
1365
|
$order_ids[] = $post_id; |
|
1366
|
1366
|
} |
|
1367
|
1367
|
|
|
1368
|
|
- if( count( $product_ids ) > 0 ) { |
|
|
1368
|
+ if (count($product_ids) > 0) { |
|
1369
|
1369
|
|
|
1370
|
1370
|
// Get all courses from user's orders |
|
1371
|
1371
|
$course_args = array( |
|
@@ -1382,31 +1382,31 @@ discard block |
|
|
block discarded – undo |
|
1382
|
1382
|
'order' => 'ASC', |
|
1383
|
1383
|
'fields' => 'ids', |
|
1384
|
1384
|
); |
|
1385
|
|
- $course_ids = get_posts( $course_args ); |
|
|
1385
|
+ $course_ids = get_posts($course_args); |
|
1386
|
1386
|
|
|
1387
|
|
- foreach( $course_ids as $course_id ) { |
|
|
1387
|
+ foreach ($course_ids as $course_id) { |
|
1388
|
1388
|
|
|
1389
|
|
- $user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id ); |
|
|
1389
|
+ $user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id); |
|
1390
|
1390
|
|
|
1391
|
1391
|
// Ignore course if already completed |
|
1392
|
|
- if( Sensei_Utils::user_completed_course( $user_course_status ) ) { |
|
|
1392
|
+ if (Sensei_Utils::user_completed_course($user_course_status)) { |
|
1393
|
1393
|
continue; |
|
1394
|
1394
|
} |
|
1395
|
1395
|
|
|
1396
|
1396
|
// Ignore course if already started |
|
1397
|
|
- if( $user_course_status ) { |
|
|
1397
|
+ if ($user_course_status) { |
|
1398
|
1398
|
continue; |
|
1399
|
1399
|
} |
|
1400
|
1400
|
|
|
1401
|
1401
|
// Mark course as started by user |
|
1402
|
|
- Sensei_Utils::user_start_course( $user_id, $course_id ); |
|
|
1402
|
+ Sensei_Utils::user_start_course($user_id, $course_id); |
|
1403
|
1403
|
} |
|
1404
|
1404
|
} |
|
1405
|
1405
|
|
|
1406
|
|
- if( count( $order_ids ) > 0 ) { |
|
1407
|
|
- foreach( $order_ids as $order_id ) { |
|
|
1406
|
+ if (count($order_ids) > 0) { |
|
|
1407
|
+ foreach ($order_ids as $order_id) { |
|
1408
|
1408
|
// Mark order as processed |
|
1409
|
|
- update_post_meta( $order_id, 'sensei_products_processed', 'processed' ); |
|
|
1409
|
+ update_post_meta($order_id, 'sensei_products_processed', 'processed'); |
|
1410
|
1410
|
} |
|
1411
|
1411
|
} |
|
1412
|
1412
|
} |
|
@@ -1420,28 +1420,28 @@ discard block |
|
|
block discarded – undo |
|
1420
|
1420
|
public function activate_purchased_single_course() { |
|
1421
|
1421
|
global $post, $current_user; |
|
1422
|
1422
|
|
|
1423
|
|
- if( Sensei_WC::is_woocommerce_active() ) { |
|
|
1423
|
+ if (Sensei_WC::is_woocommerce_active()) { |
|
1424
|
1424
|
|
|
1425
|
|
- if( ! is_user_logged_in() ) return; |
|
1426
|
|
- if( ! isset( $post->ID ) ) return; |
|
|
1425
|
+ if ( ! is_user_logged_in()) return; |
|
|
1426
|
+ if ( ! isset($post->ID)) return; |
|
1427
|
1427
|
|
|
1428
|
1428
|
$user_id = $current_user->ID; |
|
1429
|
1429
|
$course_id = $post->ID; |
|
1430
|
|
- $course_product_id = (int) get_post_meta( $course_id, '_course_woocommerce_product', true ); |
|
1431
|
|
- if( ! $course_product_id ) { |
|
|
1430
|
+ $course_product_id = (int) get_post_meta($course_id, '_course_woocommerce_product', true); |
|
|
1431
|
+ if ( ! $course_product_id) { |
|
1432
|
1432
|
return; |
|
1433
|
1433
|
} |
|
1434
|
1434
|
|
|
1435
|
|
- $user_course_status = Sensei_Utils::user_course_status( intval($course_id), $user_id ); |
|
|
1435
|
+ $user_course_status = Sensei_Utils::user_course_status(intval($course_id), $user_id); |
|
1436
|
1436
|
|
|
1437
|
1437
|
// Ignore course if already completed |
|
1438
|
|
- if( Sensei_Utils::user_completed_course( $user_course_status ) ) { |
|
|
1438
|
+ if (Sensei_Utils::user_completed_course($user_course_status)) { |
|
1439
|
1439
|
|
|
1440
|
1440
|
return; |
|
1441
|
1441
|
} |
|
1442
|
1442
|
|
|
1443
|
1443
|
// Ignore course if already started |
|
1444
|
|
- if( $user_course_status ) { |
|
|
1444
|
+ if ($user_course_status) { |
|
1445
|
1445
|
return; |
|
1446
|
1446
|
} |
|
1447
|
1447
|
|
|
@@ -1449,7 +1449,7 @@ discard block |
|
|
block discarded – undo |
|
1449
|
1449
|
$order_args = array( |
|
1450
|
1450
|
'post_type' => 'shop_order', |
|
1451
|
1451
|
'posts_per_page' => -1, |
|
1452
|
|
- 'post_status' => array( 'wc-processing', 'wc-completed' ), |
|
|
1452
|
+ 'post_status' => array('wc-processing', 'wc-completed'), |
|
1453
|
1453
|
'meta_query' => array( |
|
1454
|
1454
|
array( |
|
1455
|
1455
|
'key' => '_customer_user', |
|
@@ -1458,28 +1458,28 @@ discard block |
|
|
block discarded – undo |
|
1458
|
1458
|
), |
|
1459
|
1459
|
'fields' => 'ids', |
|
1460
|
1460
|
); |
|
1461
|
|
- $orders = get_posts( $order_args ); |
|
|
1461
|
+ $orders = get_posts($order_args); |
|
1462
|
1462
|
|
|
1463
|
|
- foreach( $orders as $order_post_id ) { |
|
|
1463
|
+ foreach ($orders as $order_post_id) { |
|
1464
|
1464
|
|
|
1465
|
1465
|
// Get course product IDs from order |
|
1466
|
|
- $order = new WC_Order( $order_post_id ); |
|
|
1466
|
+ $order = new WC_Order($order_post_id); |
|
1467
|
1467
|
|
|
1468
|
1468
|
$items = $order->get_items(); |
|
1469
|
|
- foreach( $items as $item ) { |
|
|
1469
|
+ foreach ($items as $item) { |
|
1470
|
1470
|
|
|
1471
|
|
- $product = wc_get_product( $item['product_id'] ); |
|
|
1471
|
+ $product = wc_get_product($item['product_id']); |
|
1472
|
1472
|
|
|
1473
|
1473
|
// handle product bundles |
|
1474
|
|
- if( is_object( $product ) && $product->is_type('bundle') ){ |
|
|
1474
|
+ if (is_object($product) && $product->is_type('bundle')) { |
|
1475
|
1475
|
|
|
1476
|
|
- $bundled_product = new WC_Product_Bundle( $product->id ); |
|
|
1476
|
+ $bundled_product = new WC_Product_Bundle($product->id); |
|
1477
|
1477
|
$bundled_items = $bundled_product->get_bundled_items(); |
|
1478
|
1478
|
|
|
1479
|
|
- foreach( $bundled_items as $bundled_item ){ |
|
|
1479
|
+ foreach ($bundled_items as $bundled_item) { |
|
1480
|
1480
|
|
|
1481
|
|
- if( $bundled_item->product_id == $course_product_id ) { |
|
1482
|
|
- Sensei_Utils::user_start_course( $user_id, $course_id ); |
|
|
1481
|
+ if ($bundled_item->product_id == $course_product_id) { |
|
|
1482
|
+ Sensei_Utils::user_start_course($user_id, $course_id); |
|
1483
|
1483
|
return; |
|
1484
|
1484
|
} |
|
1485
|
1485
|
|
|
@@ -1488,8 +1488,8 @@ discard block |
|
|
block discarded – undo |
|
1488
|
1488
|
} else { |
|
1489
|
1489
|
|
|
1490
|
1490
|
// handle regular products |
|
1491
|
|
- if( $item['product_id'] == $course_product_id ) { |
|
1492
|
|
- Sensei_Utils::user_start_course( $user_id, $course_id ); |
|
|
1491
|
+ if ($item['product_id'] == $course_product_id) { |
|
|
1492
|
+ Sensei_Utils::user_start_course($user_id, $course_id); |
|
1493
|
1493
|
return; |
|
1494
|
1494
|
} |
|
1495
|
1495
|
|
|
@@ -1505,9 +1505,9 @@ discard block |
|
|
block discarded – undo |
|
1505
|
1505
|
* @param array $args Default arguments |
|
1506
|
1506
|
* @return array Modified arguments |
|
1507
|
1507
|
*/ |
|
1508
|
|
- public function hide_sensei_activity( $args = array() ) { |
|
|
1508
|
+ public function hide_sensei_activity($args = array()) { |
|
1509
|
1509
|
|
|
1510
|
|
- if( is_singular( 'lesson' ) || is_singular( 'course' ) ) { |
|
|
1510
|
+ if (is_singular('lesson') || is_singular('course')) { |
|
1511
|
1511
|
$args['type'] = 'comment'; |
|
1512
|
1512
|
} |
|
1513
|
1513
|
|
|
@@ -1524,9 +1524,9 @@ discard block |
|
|
block discarded – undo |
|
1524
|
1524
|
|
|
1525
|
1525
|
//if not posted from the sensei login form let |
|
1526
|
1526
|
// WordPress or any other party handle the failed request |
|
1527
|
|
- if( ! isset( $_REQUEST['form'] ) || 'sensei-login' != $_REQUEST['form'] ){ |
|
|
1527
|
+ if ( ! isset($_REQUEST['form']) || 'sensei-login' != $_REQUEST['form']) { |
|
1528
|
1528
|
|
|
1529
|
|
- return ; |
|
|
1529
|
+ return; |
|
1530
|
1530
|
|
|
1531
|
1531
|
} |
|
1532
|
1532
|
|
|
@@ -1534,9 +1534,9 @@ discard block |
|
|
block discarded – undo |
|
1534
|
1534
|
$referrer = add_query_arg('login', false, $_SERVER['HTTP_REFERER']); |
|
1535
|
1535
|
|
|
1536
|
1536
|
// if there's a valid referrer, and it's not the default log-in screen |
|
1537
|
|
- if(!empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin')){ |
|
|
1537
|
+ if ( ! empty($referrer) && ! strstr($referrer, 'wp-login') && ! strstr($referrer, 'wp-admin')) { |
|
1538
|
1538
|
// let's append some information (login=failed) to the URL for the theme to use |
|
1539
|
|
- wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) ); |
|
|
1539
|
+ wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer))); |
|
1540
|
1540
|
exit; |
|
1541
|
1541
|
} |
|
1542
|
1542
|
}// End sensei_login_fail_redirect_to_front_end_login |
|
@@ -1549,10 +1549,10 @@ discard block |
|
|
block discarded – undo |
|
1549
|
1549
|
function sensei_handle_login_request( ) { |
|
1550
|
1550
|
|
|
1551
|
1551
|
// Check that it is a sensei login request and if it has a valid nonce |
|
1552
|
|
- if( isset( $_REQUEST['form'] ) && 'sensei-login' == $_REQUEST['form'] ) { |
|
|
1552
|
+ if (isset($_REQUEST['form']) && 'sensei-login' == $_REQUEST['form']) { |
|
1553
|
1553
|
|
|
1554
|
1554
|
// Validate the login request nonce |
|
1555
|
|
- if( !wp_verify_nonce( $_REQUEST['_wpnonce'], 'sensei-login' ) ){ |
|
|
1555
|
+ if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'sensei-login')) { |
|
1556
|
1556
|
return; |
|
1557
|
1557
|
} |
|
1558
|
1558
|
|
|
@@ -1560,48 +1560,48 @@ discard block |
|
|
block discarded – undo |
|
1560
|
1560
|
$referrer = $_REQUEST['_wp_http_referer']; |
|
1561
|
1561
|
//$redirect = $_REQUEST['_sensei_redirect']; |
|
1562
|
1562
|
|
|
1563
|
|
- if ( ( isset( $_REQUEST['log'] ) && !empty( $_REQUEST['log'] ) ) |
|
1564
|
|
- && ( isset( $_REQUEST['pwd'] ) && !empty( $_REQUEST['pwd'] ) ) ){ |
|
|
1563
|
+ if ((isset($_REQUEST['log']) && ! empty($_REQUEST['log'])) |
|
|
1564
|
+ && (isset($_REQUEST['pwd']) && ! empty($_REQUEST['pwd']))) { |
|
1565
|
1565
|
|
|
1566
|
1566
|
// when the user has entered a password or username do the sensei login |
|
1567
|
1567
|
$creds = array(); |
|
1568
|
1568
|
|
|
1569
|
1569
|
// check if the requests login is an email address |
|
1570
|
|
- if( is_email( trim( $_REQUEST['log'] ) ) ){ |
|
|
1570
|
+ if (is_email(trim($_REQUEST['log']))) { |
|
1571
|
1571
|
// query wordpress for the users details |
|
1572
|
|
- $user = get_user_by( 'email', sanitize_email( $_REQUEST['log'] ) ); |
|
|
1572
|
+ $user = get_user_by('email', sanitize_email($_REQUEST['log'])); |
|
1573
|
1573
|
|
|
1574
|
1574
|
// validate the user object |
|
1575
|
|
- if( !$user ){ |
|
|
1575
|
+ if ( ! $user) { |
|
1576
|
1576
|
|
|
1577
|
1577
|
// the email doesnt exist |
|
1578
|
|
- wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) ); |
|
|
1578
|
+ wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer))); |
|
1579
|
1579
|
exit; |
|
1580
|
1580
|
|
|
1581
|
1581
|
} |
|
1582
|
1582
|
|
|
1583
|
1583
|
//assigne the username to the creds array for further processing |
|
1584
|
|
- $creds['user_login'] = $user->user_login ; |
|
|
1584
|
+ $creds['user_login'] = $user->user_login; |
|
1585
|
1585
|
|
|
1586
|
|
- }else{ |
|
|
1586
|
+ } else { |
|
1587
|
1587
|
|
|
1588
|
1588
|
// process this as a default username login |
|
1589
|
|
- $creds['user_login'] = sanitize_text_field( $_REQUEST['log'] ) ; |
|
|
1589
|
+ $creds['user_login'] = sanitize_text_field($_REQUEST['log']); |
|
1590
|
1590
|
|
|
1591
|
1591
|
} |
|
1592
|
1592
|
|
|
1593
|
1593
|
// get setup the rest of the creds array |
|
1594
|
|
- $creds['user_password'] = sanitize_text_field( $_REQUEST['pwd'] ); |
|
1595
|
|
- $creds['remember'] = isset( $_REQUEST['rememberme'] ) ? true : false ; |
|
|
1594
|
+ $creds['user_password'] = sanitize_text_field($_REQUEST['pwd']); |
|
|
1595
|
+ $creds['remember'] = isset($_REQUEST['rememberme']) ? true : false; |
|
1596
|
1596
|
|
|
1597
|
1597
|
//attempt logging in with the given details |
|
1598
|
1598
|
$secure_cookie = is_ssl() ? true : false; |
|
1599
|
|
- $user = wp_signon( $creds, $secure_cookie ); |
|
|
1599
|
+ $user = wp_signon($creds, $secure_cookie); |
|
1600
|
1600
|
|
|
1601
|
|
- if ( is_wp_error($user) ){ // on login failure |
|
1602
|
|
- wp_redirect( esc_url_raw( add_query_arg('login', 'failed', $referrer) ) ); |
|
|
1601
|
+ if (is_wp_error($user)) { // on login failure |
|
|
1602
|
+ wp_redirect(esc_url_raw(add_query_arg('login', 'failed', $referrer))); |
|
1603
|
1603
|
exit; |
|
1604
|
|
- }else{ // on login success |
|
|
1604
|
+ } else { // on login success |
|
1605
|
1605
|
|
|
1606
|
1606
|
/** |
|
1607
|
1607
|
* change the redirect url programatically |
|
@@ -1611,21 +1611,21 @@ discard block |
|
|
block discarded – undo |
|
1611
|
1611
|
* @param string $referrer the page where the current url wheresensei login form was posted from |
|
1612
|
1612
|
*/ |
|
1613
|
1613
|
|
|
1614
|
|
- $success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg( 'login', $referrer ) ); |
|
|
1614
|
+ $success_redirect_url = apply_filters('sesei_login_success_redirect_url', remove_query_arg('login', $referrer)); |
|
1615
|
1615
|
|
|
1616
|
|
- wp_redirect( esc_url_raw( $success_redirect_url ) ); |
|
|
1616
|
+ wp_redirect(esc_url_raw($success_redirect_url)); |
|
1617
|
1617
|
exit; |
|
1618
|
1618
|
|
|
1619
|
1619
|
} // end is_wp_error($user) |
|
1620
|
1620
|
|
|
1621
|
|
- }else{ // if username or password is empty |
|
|
1621
|
+ } else { // if username or password is empty |
|
1622
|
1622
|
|
|
1623
|
|
- wp_redirect( esc_url_raw( add_query_arg('login', 'emptyfields', $referrer) ) ); |
|
|
1623
|
+ wp_redirect(esc_url_raw(add_query_arg('login', 'emptyfields', $referrer))); |
|
1624
|
1624
|
exit; |
|
1625
|
1625
|
|
|
1626
|
1626
|
} // end if username $_REQUEST['log'] and password $_REQUEST['pwd'] is empty |
|
1627
|
1627
|
|
|
1628
|
|
- }elseif( ( isset( $_GET['login'] ) ) ) { |
|
|
1628
|
+ }elseif ((isset($_GET['login']))) { |
|
1629
|
1629
|
// else if this request is a redircect from a previously faile login request |
|
1630
|
1630
|
$this->login_message_process(); |
|
1631
|
1631
|
|
|
@@ -1644,87 +1644,87 @@ discard block |
|
|
block discarded – undo |
|
1644
|
1644
|
* @return void redirect |
|
1645
|
1645
|
* |
|
1646
|
1646
|
*/ |
|
1647
|
|
- public function sensei_process_registration(){ |
|
|
1647
|
+ public function sensei_process_registration() { |
|
1648
|
1648
|
global $current_user; |
|
1649
|
1649
|
// check the for the sensei specific registration requests |
|
1650
|
|
- if( !isset( $_POST['sensei_reg_username'] ) && ! isset( $_POST['sensei_reg_email'] ) && !isset( $_POST['sensei_reg_password'] )){ |
|
|
1650
|
+ if ( ! isset($_POST['sensei_reg_username']) && ! isset($_POST['sensei_reg_email']) && ! isset($_POST['sensei_reg_password'])) { |
|
1651
|
1651
|
// exit if this is not a sensei registration request |
|
1652
|
|
- return ; |
|
|
1652
|
+ return; |
|
1653
|
1653
|
} |
|
1654
|
1654
|
// check for spam throw cheating huh |
|
1655
|
|
- if( isset( $_POST['email_2'] ) && '' !== $_POST['email_2'] ){ |
|
|
1655
|
+ if (isset($_POST['email_2']) && '' !== $_POST['email_2']) { |
|
1656
|
1656
|
$message = 'Error: The spam field should be empty'; |
|
1657
|
|
- Sensei()->notices->add_notice( $message, 'alert'); |
|
|
1657
|
+ Sensei()->notices->add_notice($message, 'alert'); |
|
1658
|
1658
|
return; |
|
1659
|
1659
|
} |
|
1660
|
1660
|
|
|
1661
|
1661
|
// retreive form variables |
|
1662
|
|
- $new_user_name = sanitize_user( $_POST['sensei_reg_username'] ); |
|
1663
|
|
- $new_user_email = $_POST['sensei_reg_email']; |
|
1664
|
|
- $new_user_password = $_POST['sensei_reg_password']; |
|
|
1662
|
+ $new_user_name = sanitize_user($_POST['sensei_reg_username']); |
|
|
1663
|
+ $new_user_email = $_POST['sensei_reg_email']; |
|
|
1664
|
+ $new_user_password = $_POST['sensei_reg_password']; |
|
1665
|
1665
|
|
|
1666
|
1666
|
// Check the username |
|
1667
|
1667
|
$username_error_notice = ''; |
|
1668
|
|
- if ( $new_user_name == '' ) { |
|
1669
|
|
- $username_error_notice = __( '<strong>ERROR</strong>: Please enter a username.' ); |
|
1670
|
|
- } elseif ( ! validate_username( $new_user_name ) ) { |
|
1671
|
|
- $username_error_notice = __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ); |
|
1672
|
|
- } elseif ( username_exists( $new_user_name ) ) { |
|
1673
|
|
- $username_error_notice = __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ); |
|
|
1668
|
+ if ($new_user_name == '') { |
|
|
1669
|
+ $username_error_notice = __('<strong>ERROR</strong>: Please enter a username.'); |
|
|
1670
|
+ } elseif ( ! validate_username($new_user_name)) { |
|
|
1671
|
+ $username_error_notice = __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'); |
|
|
1672
|
+ } elseif (username_exists($new_user_name)) { |
|
|
1673
|
+ $username_error_notice = __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'); |
|
1674
|
1674
|
} |
|
1675
|
1675
|
|
|
1676
|
1676
|
// exit on username error |
|
1677
|
|
- if( '' !== $username_error_notice ){ |
|
1678
|
|
- Sensei()->notices->add_notice( $username_error_notice , 'alert'); |
|
|
1677
|
+ if ('' !== $username_error_notice) { |
|
|
1678
|
+ Sensei()->notices->add_notice($username_error_notice, 'alert'); |
|
1679
|
1679
|
return; |
|
1680
|
1680
|
} |
|
1681
|
1681
|
|
|
1682
|
1682
|
// Check the e-mail address |
|
1683
|
1683
|
$email_error_notice = ''; |
|
1684
|
|
- if ( $new_user_email == '' ) { |
|
1685
|
|
- $email_error_notice = __( '<strong>ERROR</strong>: Please type your e-mail address.' ); |
|
1686
|
|
- } elseif ( ! is_email( $new_user_email ) ) { |
|
1687
|
|
- $email_error_notice = __( '<strong>ERROR</strong>: The email address isn’t correct.' ); |
|
1688
|
|
- } elseif ( email_exists( $new_user_email ) ) { |
|
1689
|
|
- $email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ); |
|
|
1684
|
+ if ($new_user_email == '') { |
|
|
1685
|
+ $email_error_notice = __('<strong>ERROR</strong>: Please type your e-mail address.'); |
|
|
1686
|
+ } elseif ( ! is_email($new_user_email)) { |
|
|
1687
|
+ $email_error_notice = __('<strong>ERROR</strong>: The email address isn’t correct.'); |
|
|
1688
|
+ } elseif (email_exists($new_user_email)) { |
|
|
1689
|
+ $email_error_notice = __('<strong>ERROR</strong>: This email is already registered, please choose another one.'); |
|
1690
|
1690
|
} |
|
1691
|
1691
|
|
|
1692
|
1692
|
// exit on email address error |
|
1693
|
|
- if( '' !== $email_error_notice ){ |
|
1694
|
|
- Sensei()->notices->add_notice( $email_error_notice , 'alert'); |
|
|
1693
|
+ if ('' !== $email_error_notice) { |
|
|
1694
|
+ Sensei()->notices->add_notice($email_error_notice, 'alert'); |
|
1695
|
1695
|
return; |
|
1696
|
1696
|
} |
|
1697
|
1697
|
|
|
1698
|
1698
|
//check user password |
|
1699
|
1699
|
|
|
1700
|
1700
|
// exit on email address error |
|
1701
|
|
- if( empty( $new_user_password ) ){ |
|
1702
|
|
- Sensei()->notices->add_notice( __( '<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.' ) , 'alert'); |
|
|
1701
|
+ if (empty($new_user_password)) { |
|
|
1702
|
+ Sensei()->notices->add_notice(__('<strong>ERROR</strong>: The password field may not be empty, please enter a secure password.'), 'alert'); |
|
1703
|
1703
|
return; |
|
1704
|
1704
|
} |
|
1705
|
1705
|
|
|
1706
|
1706
|
// register user |
|
1707
|
|
- $user_id = wp_create_user( $new_user_name, $new_user_password, $new_user_email ); |
|
1708
|
|
- if ( ! $user_id || is_wp_error( $user_id ) ) { |
|
1709
|
|
- Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn\'t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ), 'alert'); |
|
|
1707
|
+ $user_id = wp_create_user($new_user_name, $new_user_password, $new_user_email); |
|
|
1708
|
+ if ( ! $user_id || is_wp_error($user_id)) { |
|
|
1709
|
+ Sensei()->notices->add_notice(sprintf(__('<strong>ERROR</strong>: Couldn\'t register you… please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')), 'alert'); |
|
1710
|
1710
|
} |
|
1711
|
1711
|
|
|
1712
|
1712
|
// notify the user |
|
1713
|
|
- wp_new_user_notification( $user_id, $new_user_password ); |
|
|
1713
|
+ wp_new_user_notification($user_id, $new_user_password); |
|
1714
|
1714
|
|
|
1715
|
1715
|
// set global current user aka log the user in |
|
1716
|
|
- $current_user = get_user_by( 'id', $user_id ); |
|
1717
|
|
- wp_set_auth_cookie( $user_id, true ); |
|
|
1716
|
+ $current_user = get_user_by('id', $user_id); |
|
|
1717
|
+ wp_set_auth_cookie($user_id, true); |
|
1718
|
1718
|
|
|
1719
|
1719
|
// Redirect |
|
1720
|
1720
|
global $wp; |
|
1721
|
|
- if ( wp_get_referer() ) { |
|
1722
|
|
- $redirect = esc_url( wp_get_referer() ); |
|
|
1721
|
+ if (wp_get_referer()) { |
|
|
1722
|
+ $redirect = esc_url(wp_get_referer()); |
|
1723
|
1723
|
} else { |
|
1724
|
|
- $redirect = esc_url( home_url( $wp->request ) ); |
|
|
1724
|
+ $redirect = esc_url(home_url($wp->request)); |
|
1725
|
1725
|
} |
|
1726
|
1726
|
|
|
1727
|
|
- wp_redirect( apply_filters( 'sensei_registration_redirect', $redirect ) ); |
|
|
1727
|
+ wp_redirect(apply_filters('sensei_registration_redirect', $redirect)); |
|
1728
|
1728
|
exit; |
|
1729
|
1729
|
|
|
1730
|
1730
|
} // end sensei_process_registration)() |
|
@@ -1735,23 +1735,23 @@ discard block |
|
|
block discarded – undo |
|
1735
|
1735
|
* @return void redirect |
|
1736
|
1736
|
* @since 1.7.0 |
|
1737
|
1737
|
*/ |
|
1738
|
|
- public function login_message_process(){ |
|
|
1738
|
+ public function login_message_process() { |
|
1739
|
1739
|
|
|
1740
|
1740
|
// setup the message variables |
|
1741
|
1741
|
$message = ''; |
|
1742
|
1742
|
|
|
1743
|
1743
|
//only output message if the url contains login=failed and login=emptyfields |
|
1744
|
1744
|
|
|
1745
|
|
- if( $_GET['login'] == 'failed' ){ |
|
|
1745
|
+ if ($_GET['login'] == 'failed') { |
|
1746
|
1746
|
|
|
1747
|
|
- $message = __('Incorrect login details', 'woothemes-sensei' ); |
|
|
1747
|
+ $message = __('Incorrect login details', 'woothemes-sensei'); |
|
1748
|
1748
|
|
|
1749
|
|
- }elseif( $_GET['login'] == 'emptyfields' ){ |
|
|
1749
|
+ }elseif ($_GET['login'] == 'emptyfields') { |
|
1750
|
1750
|
|
|
1751
|
|
- $message= __('Please enter your username and password', 'woothemes-sensei' ); |
|
|
1751
|
+ $message = __('Please enter your username and password', 'woothemes-sensei'); |
|
1752
|
1752
|
} |
|
1753
|
1753
|
|
|
1754
|
|
- Sensei()->notices->add_notice( $message, 'alert'); |
|
|
1754
|
+ Sensei()->notices->add_notice($message, 'alert'); |
|
1755
|
1755
|
|
|
1756
|
1756
|
}// end login_message_process |
|
1757
|
1757
|
|
|
@@ -1763,11 +1763,11 @@ discard block |
|
|
block discarded – undo |
|
1763
|
1763
|
* @return void redirect |
|
1764
|
1764
|
* |
|
1765
|
1765
|
*/ |
|
1766
|
|
- public function sensei_show_admin_bar () { |
|
|
1766
|
+ public function sensei_show_admin_bar() { |
|
1767
|
1767
|
|
|
1768
|
1768
|
if (current_user_can('edit_courses')) { |
|
1769
|
1769
|
|
|
1770
|
|
- add_filter( 'woocommerce_disable_admin_bar', '__return_false', 10, 1); |
|
|
1770
|
+ add_filter('woocommerce_disable_admin_bar', '__return_false', 10, 1); |
|
1771
|
1771
|
|
|
1772
|
1772
|
} |
|
1773
|
1773
|
|
|
@@ -1780,4 +1780,4 @@ discard block |
|
|
block discarded – undo |
|
1780
|
1780
|
* @ignore only for backward compatibility |
|
1781
|
1781
|
* @since 1.9.0 |
|
1782
|
1782
|
*/ |
|
1783
|
|
-class WooThemes_Sensei_Frontend extends Sensei_Frontend{} |
|
|
1783
|
+class WooThemes_Sensei_Frontend extends Sensei_Frontend {} |