@@ -17,270 +17,270 @@ |
||
17 | 17 | */ |
18 | 18 | class Sensei_Shortcode_Teachers implements Sensei_Shortcode_Interface { |
19 | 19 | |
20 | - /** |
|
21 | - * @var WP_User_Query keeps a reference to the user query created |
|
22 | - */ |
|
23 | - protected $user_query; |
|
20 | + /** |
|
21 | + * @var WP_User_Query keeps a reference to the user query created |
|
22 | + */ |
|
23 | + protected $user_query; |
|
24 | 24 | |
25 | - /** |
|
26 | - * @var which user id's to include |
|
27 | - */ |
|
28 | - protected $include; |
|
25 | + /** |
|
26 | + * @var which user id's to include |
|
27 | + */ |
|
28 | + protected $include; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @var which user id's to exclude |
|
32 | - */ |
|
33 | - protected $exclude; |
|
30 | + /** |
|
31 | + * @var which user id's to exclude |
|
32 | + */ |
|
33 | + protected $exclude; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Setup the shortcode object |
|
37 | - * |
|
38 | - * @since 1.9.0 |
|
39 | - * @param array $attributes |
|
40 | - * @param string $content |
|
41 | - * @param string $shortcode the shortcode that was called for this instance |
|
42 | - */ |
|
43 | - public function __construct( $attributes, $content, $shortcode ){ |
|
35 | + /** |
|
36 | + * Setup the shortcode object |
|
37 | + * |
|
38 | + * @since 1.9.0 |
|
39 | + * @param array $attributes |
|
40 | + * @param string $content |
|
41 | + * @param string $shortcode the shortcode that was called for this instance |
|
42 | + */ |
|
43 | + public function __construct( $attributes, $content, $shortcode ){ |
|
44 | 44 | |
45 | - $include = isset( $attributes['include'] ) ? explode( ',', $attributes['include'] ) : ''; |
|
46 | - $exclude = isset( $attributes['exclude'] ) ? explode( ',', $attributes['exclude'] ) : ''; |
|
45 | + $include = isset( $attributes['include'] ) ? explode( ',', $attributes['include'] ) : ''; |
|
46 | + $exclude = isset( $attributes['exclude'] ) ? explode( ',', $attributes['exclude'] ) : ''; |
|
47 | 47 | |
48 | - // convert teacher usernames given to the id |
|
49 | - $this->include = $this->convert_usernames_to_ids( $include ); |
|
50 | - $this->exclude = $this->convert_usernames_to_ids( $exclude ); |
|
48 | + // convert teacher usernames given to the id |
|
49 | + $this->include = $this->convert_usernames_to_ids( $include ); |
|
50 | + $this->exclude = $this->convert_usernames_to_ids( $exclude ); |
|
51 | 51 | |
52 | - $this->setup_teacher_query(); |
|
52 | + $this->setup_teacher_query(); |
|
53 | 53 | |
54 | - } |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * |
|
58 | - * Setup the user query that will be used in the render method |
|
59 | - * |
|
60 | - * @since 1.9.0 |
|
61 | - */ |
|
62 | - protected function setup_teacher_query(){ |
|
56 | + /** |
|
57 | + * |
|
58 | + * Setup the user query that will be used in the render method |
|
59 | + * |
|
60 | + * @since 1.9.0 |
|
61 | + */ |
|
62 | + protected function setup_teacher_query(){ |
|
63 | 63 | |
64 | - $user_query_args = array( |
|
65 | - 'role' => 'teacher', |
|
66 | - ); |
|
64 | + $user_query_args = array( |
|
65 | + 'role' => 'teacher', |
|
66 | + ); |
|
67 | 67 | |
68 | - $this->user_query = new WP_User_Query( $user_query_args ); |
|
68 | + $this->user_query = new WP_User_Query( $user_query_args ); |
|
69 | 69 | |
70 | - }// end setup _course_query |
|
70 | + }// end setup _course_query |
|
71 | 71 | |
72 | - /** |
|
73 | - * Rendering the shortcode this class is responsible for. |
|
74 | - * |
|
75 | - * @return string $content |
|
76 | - */ |
|
77 | - public function render(){ |
|
72 | + /** |
|
73 | + * Rendering the shortcode this class is responsible for. |
|
74 | + * |
|
75 | + * @return string $content |
|
76 | + */ |
|
77 | + public function render(){ |
|
78 | 78 | |
79 | - $all_users = $this->user_query->get_results(); |
|
80 | - // if the user has specified more users add them as well. |
|
81 | - if( ! empty( $this->include ) ){ |
|
79 | + $all_users = $this->user_query->get_results(); |
|
80 | + // if the user has specified more users add them as well. |
|
81 | + if( ! empty( $this->include ) ){ |
|
82 | 82 | |
83 | - $included_users_query = new WP_User_Query( array( 'include' => $this->include ) ); |
|
84 | - $included_users = $included_users_query->get_results(); |
|
85 | - if( ! empty( $included_users ) ){ |
|
83 | + $included_users_query = new WP_User_Query( array( 'include' => $this->include ) ); |
|
84 | + $included_users = $included_users_query->get_results(); |
|
85 | + if( ! empty( $included_users ) ){ |
|
86 | 86 | |
87 | - $merged_users = array_merge( $all_users, $included_users ); |
|
88 | - $all_users = $this->users_unique( $merged_users ); |
|
89 | - $all_users = $this->users_sort( $all_users ); |
|
87 | + $merged_users = array_merge( $all_users, $included_users ); |
|
88 | + $all_users = $this->users_unique( $merged_users ); |
|
89 | + $all_users = $this->users_sort( $all_users ); |
|
90 | 90 | |
91 | - } |
|
91 | + } |
|
92 | 92 | |
93 | - } |
|
93 | + } |
|
94 | 94 | |
95 | - // exclude the users not wanted |
|
96 | - if( ! empty( $this->exclude ) ){ |
|
95 | + // exclude the users not wanted |
|
96 | + if( ! empty( $this->exclude ) ){ |
|
97 | 97 | |
98 | - $all_users = $this->exclude_users( $all_users, $this->exclude ); |
|
98 | + $all_users = $this->exclude_users( $all_users, $this->exclude ); |
|
99 | 99 | |
100 | - } |
|
100 | + } |
|
101 | 101 | |
102 | - if( ! count( $all_users )> 0 ){ |
|
103 | - return ''; |
|
104 | - } |
|
102 | + if( ! count( $all_users )> 0 ){ |
|
103 | + return ''; |
|
104 | + } |
|
105 | 105 | |
106 | 106 | |
107 | - $users_output = ''; |
|
107 | + $users_output = ''; |
|
108 | 108 | |
109 | - foreach ( $all_users as $user ) { |
|
109 | + foreach ( $all_users as $user ) { |
|
110 | 110 | |
111 | - $user_display_name = $this->get_user_public_name( $user ); |
|
111 | + $user_display_name = $this->get_user_public_name( $user ); |
|
112 | 112 | |
113 | - /** |
|
114 | - * Sensei teachers shortcode list item filter |
|
115 | - * |
|
116 | - * @since 1.9.0 |
|
117 | - * |
|
118 | - * @param string $teacher_li the html for the teacher li |
|
119 | - * @param WP_User $user |
|
120 | - */ |
|
121 | - $users_output .= apply_filters( 'sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'. get_author_posts_url( $user->ID ) . '">'. $user_display_name . '<a/></li>', $user ); |
|
113 | + /** |
|
114 | + * Sensei teachers shortcode list item filter |
|
115 | + * |
|
116 | + * @since 1.9.0 |
|
117 | + * |
|
118 | + * @param string $teacher_li the html for the teacher li |
|
119 | + * @param WP_User $user |
|
120 | + */ |
|
121 | + $users_output .= apply_filters( 'sensei_teachers_shortcode_list_item', '<li class="teacher"><a href="'. get_author_posts_url( $user->ID ) . '">'. $user_display_name . '<a/></li>', $user ); |
|
122 | 122 | |
123 | - } |
|
123 | + } |
|
124 | 124 | |
125 | - return '<ul class="sensei-teachers">' . $users_output . '</ul>'; |
|
125 | + return '<ul class="sensei-teachers">' . $users_output . '</ul>'; |
|
126 | 126 | |
127 | - }// end render |
|
127 | + }// end render |
|
128 | 128 | |
129 | - /** |
|
130 | - * remove duplicate user objects from and array of users |
|
131 | - * |
|
132 | - * @since 1.9.0 |
|
133 | - * |
|
134 | - * @param array $users{ |
|
135 | - * @type WP_User |
|
136 | - * } |
|
137 | - * |
|
138 | - * @return array $unique_users { |
|
139 | - * @type WP_User |
|
140 | - * } |
|
141 | - */ |
|
142 | - public function users_unique( $users ){ |
|
129 | + /** |
|
130 | + * remove duplicate user objects from and array of users |
|
131 | + * |
|
132 | + * @since 1.9.0 |
|
133 | + * |
|
134 | + * @param array $users{ |
|
135 | + * @type WP_User |
|
136 | + * } |
|
137 | + * |
|
138 | + * @return array $unique_users { |
|
139 | + * @type WP_User |
|
140 | + * } |
|
141 | + */ |
|
142 | + public function users_unique( $users ){ |
|
143 | 143 | |
144 | - $array_unique_users_ids = array(); |
|
145 | - foreach( $users as $index => $user ){ |
|
144 | + $array_unique_users_ids = array(); |
|
145 | + foreach( $users as $index => $user ){ |
|
146 | 146 | |
147 | - if( in_array( $user->ID, $array_unique_users_ids) ){ |
|
147 | + if( in_array( $user->ID, $array_unique_users_ids) ){ |
|
148 | 148 | |
149 | - // exclude this user as it is already in the list |
|
150 | - unset( $users[ $index ] ); |
|
149 | + // exclude this user as it is already in the list |
|
150 | + unset( $users[ $index ] ); |
|
151 | 151 | |
152 | - }else{ |
|
152 | + }else{ |
|
153 | 153 | |
154 | - // add teh user to the list of users |
|
155 | - $array_unique_users_ids[] = $user->ID; |
|
154 | + // add teh user to the list of users |
|
155 | + $array_unique_users_ids[] = $user->ID; |
|
156 | 156 | |
157 | - } |
|
157 | + } |
|
158 | 158 | |
159 | - } |
|
159 | + } |
|
160 | 160 | |
161 | - return $users; |
|
161 | + return $users; |
|
162 | 162 | |
163 | - }// end users_unique |
|
163 | + }// end users_unique |
|
164 | 164 | |
165 | - /** |
|
166 | - * Exclude users based ont he ids given. |
|
167 | - * |
|
168 | - * @since 1.9.0 |
|
169 | - * |
|
170 | - * @param array $users |
|
171 | - * @param array $exclude_ids |
|
172 | - * @return array |
|
173 | - */ |
|
174 | - public function exclude_users( $users, $exclude_ids ){ |
|
165 | + /** |
|
166 | + * Exclude users based ont he ids given. |
|
167 | + * |
|
168 | + * @since 1.9.0 |
|
169 | + * |
|
170 | + * @param array $users |
|
171 | + * @param array $exclude_ids |
|
172 | + * @return array |
|
173 | + */ |
|
174 | + public function exclude_users( $users, $exclude_ids ){ |
|
175 | 175 | |
176 | - foreach( $users as $index => $user ){ |
|
176 | + foreach( $users as $index => $user ){ |
|
177 | 177 | |
178 | - if( in_array( $user->ID, $exclude_ids ) ){ |
|
178 | + if( in_array( $user->ID, $exclude_ids ) ){ |
|
179 | 179 | |
180 | - // remove the user from the list |
|
181 | - unset( $users[ $index ] ); |
|
180 | + // remove the user from the list |
|
181 | + unset( $users[ $index ] ); |
|
182 | 182 | |
183 | - } |
|
183 | + } |
|
184 | 184 | |
185 | - } |
|
185 | + } |
|
186 | 186 | |
187 | - return $users; |
|
187 | + return $users; |
|
188 | 188 | |
189 | - }// end exclude_users |
|
189 | + }// end exclude_users |
|
190 | 190 | |
191 | - /** |
|
192 | - * Convert mixed array of user id and user names to only be an array of user_ids |
|
193 | - * |
|
194 | - * @param array $users |
|
195 | - * @return array $users_ids |
|
196 | - */ |
|
197 | - public function convert_usernames_to_ids( $users ){ |
|
191 | + /** |
|
192 | + * Convert mixed array of user id and user names to only be an array of user_ids |
|
193 | + * |
|
194 | + * @param array $users |
|
195 | + * @return array $users_ids |
|
196 | + */ |
|
197 | + public function convert_usernames_to_ids( $users ){ |
|
198 | 198 | |
199 | - // backup |
|
200 | - $users_ids = array(); |
|
199 | + // backup |
|
200 | + $users_ids = array(); |
|
201 | 201 | |
202 | - if ( is_array($users) ) { |
|
202 | + if ( is_array($users) ) { |
|
203 | 203 | |
204 | - foreach ($users as $user_id_or_username) { |
|
204 | + foreach ($users as $user_id_or_username) { |
|
205 | 205 | |
206 | - if (!is_numeric($user_id_or_username)) { |
|
206 | + if (!is_numeric($user_id_or_username)) { |
|
207 | 207 | |
208 | - $user_name = $user_id_or_username; |
|
209 | - $user = get_user_by('login', $user_name); |
|
208 | + $user_name = $user_id_or_username; |
|
209 | + $user = get_user_by('login', $user_name); |
|
210 | 210 | |
211 | - if (is_a($user, 'WP_User')) { |
|
212 | - $users_ids[] = $user->ID; |
|
213 | - } |
|
211 | + if (is_a($user, 'WP_User')) { |
|
212 | + $users_ids[] = $user->ID; |
|
213 | + } |
|
214 | 214 | |
215 | - } else { |
|
215 | + } else { |
|
216 | 216 | |
217 | - $user_id = $user_id_or_username; |
|
218 | - $users_ids[] = $user_id; |
|
217 | + $user_id = $user_id_or_username; |
|
218 | + $users_ids[] = $user_id; |
|
219 | 219 | |
220 | - } |
|
220 | + } |
|
221 | 221 | |
222 | - } |
|
223 | - } |
|
222 | + } |
|
223 | + } |
|
224 | 224 | |
225 | - return $users_ids; |
|
226 | - } |
|
225 | + return $users_ids; |
|
226 | + } |
|
227 | 227 | |
228 | - /** |
|
229 | - * Returns the first name and last name or the display name of a user. |
|
230 | - * |
|
231 | - * @since 1.9.0 |
|
232 | - * |
|
233 | - * @param $user |
|
234 | - * @return string $user_public_name |
|
235 | - */ |
|
236 | - public function get_user_public_name( $user ){ |
|
228 | + /** |
|
229 | + * Returns the first name and last name or the display name of a user. |
|
230 | + * |
|
231 | + * @since 1.9.0 |
|
232 | + * |
|
233 | + * @param $user |
|
234 | + * @return string $user_public_name |
|
235 | + */ |
|
236 | + public function get_user_public_name( $user ){ |
|
237 | 237 | |
238 | - if (!empty($user->first_name) && !empty($user->last_name)) { |
|
238 | + if (!empty($user->first_name) && !empty($user->last_name)) { |
|
239 | 239 | |
240 | - $user_public_name = $user->first_name . ' ' . $user->last_name; |
|
240 | + $user_public_name = $user->first_name . ' ' . $user->last_name; |
|
241 | 241 | |
242 | - } |
|
242 | + } |
|
243 | 243 | |
244 | - else { |
|
244 | + else { |
|
245 | 245 | |
246 | - $user_public_name = $user->display_name; |
|
246 | + $user_public_name = $user->display_name; |
|
247 | 247 | |
248 | - } |
|
248 | + } |
|
249 | 249 | |
250 | - return $user_public_name; |
|
251 | - } |
|
250 | + return $user_public_name; |
|
251 | + } |
|
252 | 252 | |
253 | - /** |
|
254 | - * |
|
255 | - * Sort user objects by user display |
|
256 | - * |
|
257 | - * @since 1.9.0 |
|
258 | - * |
|
259 | - * @param $users |
|
260 | - * @return array $sorted_users |
|
261 | - */ |
|
262 | - public function users_sort( $users ){ |
|
253 | + /** |
|
254 | + * |
|
255 | + * Sort user objects by user display |
|
256 | + * |
|
257 | + * @since 1.9.0 |
|
258 | + * |
|
259 | + * @param $users |
|
260 | + * @return array $sorted_users |
|
261 | + */ |
|
262 | + public function users_sort( $users ){ |
|
263 | 263 | |
264 | - $sorted_users = $users; |
|
264 | + $sorted_users = $users; |
|
265 | 265 | |
266 | - uasort( $sorted_users, array( $this, 'custom_user_sort' ) ); |
|
266 | + uasort( $sorted_users, array( $this, 'custom_user_sort' ) ); |
|
267 | 267 | |
268 | - return $sorted_users; |
|
269 | - } |
|
268 | + return $sorted_users; |
|
269 | + } |
|
270 | 270 | |
271 | - /** |
|
272 | - * Used in the uasort function to sort users by title |
|
273 | - * |
|
274 | - * @since 1.9.0 |
|
275 | - * |
|
276 | - * @param $user_1 |
|
277 | - * @param $user_2 |
|
278 | - * @return int |
|
279 | - */ |
|
280 | - public function custom_user_sort($user_1, $user_2){ |
|
271 | + /** |
|
272 | + * Used in the uasort function to sort users by title |
|
273 | + * |
|
274 | + * @since 1.9.0 |
|
275 | + * |
|
276 | + * @param $user_1 |
|
277 | + * @param $user_2 |
|
278 | + * @return int |
|
279 | + */ |
|
280 | + public function custom_user_sort($user_1, $user_2){ |
|
281 | 281 | |
282 | - return strcasecmp( $this->get_user_public_name( $user_1 ), $this->get_user_public_name( $user_2 ) ); |
|
282 | + return strcasecmp( $this->get_user_public_name( $user_1 ), $this->get_user_public_name( $user_2 ) ); |
|
283 | 283 | |
284 | - }// end custom_user_sort |
|
284 | + }// end custom_user_sort |
|
285 | 285 | |
286 | 286 | }// end class |
287 | 287 | \ No newline at end of file |
@@ -24,135 +24,135 @@ |
||
24 | 24 | */ |
25 | 25 | class Sensei_Shortcode_Course_Categories implements Sensei_Shortcode_Interface { |
26 | 26 | |
27 | - /** |
|
28 | - * @var array list of taxonomy terms. |
|
29 | - */ |
|
30 | - protected $sensei_course_taxonomy_terms; |
|
27 | + /** |
|
28 | + * @var array list of taxonomy terms. |
|
29 | + */ |
|
30 | + protected $sensei_course_taxonomy_terms; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Setup the shortcode object |
|
34 | - * |
|
35 | - * @since 1.9.0 |
|
36 | - * @param array $attributes |
|
37 | - * @param string $content |
|
38 | - * @param string $shortcode the shortcode that was called for this instance |
|
39 | - */ |
|
40 | - public function __construct( $attributes, $content, $shortcode ){ |
|
32 | + /** |
|
33 | + * Setup the shortcode object |
|
34 | + * |
|
35 | + * @since 1.9.0 |
|
36 | + * @param array $attributes |
|
37 | + * @param string $content |
|
38 | + * @param string $shortcode the shortcode that was called for this instance |
|
39 | + */ |
|
40 | + public function __construct( $attributes, $content, $shortcode ){ |
|
41 | 41 | |
42 | - $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name'; |
|
43 | - $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC'; |
|
44 | - $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100'; |
|
45 | - $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : ''; |
|
42 | + $this->orderby = isset( $attributes['orderby'] ) ? $attributes['orderby'] : 'name'; |
|
43 | + $this->order = isset( $attributes['order'] ) ? $attributes['order'] : 'ASC'; |
|
44 | + $this->number = isset( $attributes['number'] ) ? $attributes['number'] : '100'; |
|
45 | + $this->parent = isset( $attributes['parent'] ) ? $attributes['parent'] : ''; |
|
46 | 46 | |
47 | - $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : ''; |
|
48 | - $this->include = $this->generate_term_ids( $include ); |
|
47 | + $include = isset( $attributes['include'] ) ? explode( ',' , $attributes['include'] ) : ''; |
|
48 | + $this->include = $this->generate_term_ids( $include ); |
|
49 | 49 | |
50 | - $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : ''; |
|
51 | - $this->exclude = $this->generate_term_ids( $exclude ); |
|
50 | + $exclude = isset( $attributes['exclude'] ) ? explode( ',' , $attributes['exclude'] ) : ''; |
|
51 | + $this->exclude = $this->generate_term_ids( $exclude ); |
|
52 | 52 | |
53 | - // make sure we handle string true/false values correctly with respective defaults |
|
54 | - $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false'; |
|
55 | - $this->hide_empty = 'true' == $hide_empty ? true: false; |
|
53 | + // make sure we handle string true/false values correctly with respective defaults |
|
54 | + $hide_empty = isset( $attributes['hide_empty'] ) ? $attributes['hide_empty'] : 'false'; |
|
55 | + $this->hide_empty = 'true' == $hide_empty ? true: false; |
|
56 | 56 | |
57 | - $this->setup_course_categories(); |
|
57 | + $this->setup_course_categories(); |
|
58 | 58 | |
59 | - } |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * create the messages query . |
|
63 | - * |
|
64 | - * @return mixed |
|
65 | - */ |
|
66 | - public function setup_course_categories(){ |
|
61 | + /** |
|
62 | + * create the messages query . |
|
63 | + * |
|
64 | + * @return mixed |
|
65 | + */ |
|
66 | + public function setup_course_categories(){ |
|
67 | 67 | |
68 | - $args = array( |
|
69 | - 'orderby' => $this->orderby, |
|
70 | - 'order' => $this->order, |
|
71 | - 'exclude' => $this->exclude, |
|
72 | - 'include' => $this->include, |
|
73 | - 'number' => $this->number, |
|
74 | - 'parent' => $this->parent, |
|
75 | - 'hide_empty' => $this->hide_empty, |
|
76 | - 'fields' => 'all', |
|
77 | - ); |
|
68 | + $args = array( |
|
69 | + 'orderby' => $this->orderby, |
|
70 | + 'order' => $this->order, |
|
71 | + 'exclude' => $this->exclude, |
|
72 | + 'include' => $this->include, |
|
73 | + 'number' => $this->number, |
|
74 | + 'parent' => $this->parent, |
|
75 | + 'hide_empty' => $this->hide_empty, |
|
76 | + 'fields' => 'all', |
|
77 | + ); |
|
78 | 78 | |
79 | - $this->sensei_course_taxonomy_terms = get_terms('course-category', $args); |
|
79 | + $this->sensei_course_taxonomy_terms = get_terms('course-category', $args); |
|
80 | 80 | |
81 | - } |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * Rendering the shortcode this class is responsible for. |
|
85 | - * |
|
86 | - * @return string $content |
|
87 | - */ |
|
88 | - public function render(){ |
|
83 | + /** |
|
84 | + * Rendering the shortcode this class is responsible for. |
|
85 | + * |
|
86 | + * @return string $content |
|
87 | + */ |
|
88 | + public function render(){ |
|
89 | 89 | |
90 | - if( empty( $this->sensei_course_taxonomy_terms ) ){ |
|
90 | + if( empty( $this->sensei_course_taxonomy_terms ) ){ |
|
91 | 91 | |
92 | - return __( 'No course categories found.', 'woothemes-sensei' ); |
|
92 | + return __( 'No course categories found.', 'woothemes-sensei' ); |
|
93 | 93 | |
94 | - } |
|
94 | + } |
|
95 | 95 | |
96 | - $terms_html = ''; |
|
96 | + $terms_html = ''; |
|
97 | 97 | |
98 | - //set the wp_query to the current messages query |
|
99 | - $terms_html .= '<ul class="sensei course-categories">'; |
|
100 | - foreach( $this->sensei_course_taxonomy_terms as $category ){ |
|
98 | + //set the wp_query to the current messages query |
|
99 | + $terms_html .= '<ul class="sensei course-categories">'; |
|
100 | + foreach( $this->sensei_course_taxonomy_terms as $category ){ |
|
101 | 101 | |
102 | - $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name . '</a>'; |
|
103 | - $terms_html .= '<li class="sensei course-category" >' . $category_link . '</li>'; |
|
102 | + $category_link = '<a href="'. get_term_link( $category ) . '">' . $category->name . '</a>'; |
|
103 | + $terms_html .= '<li class="sensei course-category" >' . $category_link . '</li>'; |
|
104 | 104 | |
105 | - } |
|
106 | - $terms_html .= '<ul>'; |
|
105 | + } |
|
106 | + $terms_html .= '<ul>'; |
|
107 | 107 | |
108 | - return $terms_html; |
|
108 | + return $terms_html; |
|
109 | 109 | |
110 | - }// end render |
|
110 | + }// end render |
|
111 | 111 | |
112 | - /** |
|
113 | - * Convert an array of mixed ids, slugs or names to only the id's of those terms |
|
114 | - * |
|
115 | - * @since 1.9.0 |
|
116 | - * |
|
117 | - * @param array $category_ids |
|
118 | - * @return array |
|
119 | - */ |
|
120 | - public function generate_term_ids( $categories = array() ){ |
|
112 | + /** |
|
113 | + * Convert an array of mixed ids, slugs or names to only the id's of those terms |
|
114 | + * |
|
115 | + * @since 1.9.0 |
|
116 | + * |
|
117 | + * @param array $category_ids |
|
118 | + * @return array |
|
119 | + */ |
|
120 | + public function generate_term_ids( $categories = array() ){ |
|
121 | 121 | |
122 | - $cat_ids = array(); |
|
122 | + $cat_ids = array(); |
|
123 | 123 | |
124 | - if ( is_array($categories) ) { |
|
125 | - foreach ($categories as $cat) { |
|
124 | + if ( is_array($categories) ) { |
|
125 | + foreach ($categories as $cat) { |
|
126 | 126 | |
127 | - if (!is_numeric($cat)) { |
|
127 | + if (!is_numeric($cat)) { |
|
128 | 128 | |
129 | - // try the slug |
|
130 | - $term = get_term_by('slug', $cat, 'course-category'); |
|
129 | + // try the slug |
|
130 | + $term = get_term_by('slug', $cat, 'course-category'); |
|
131 | 131 | |
132 | - // if the slug didn't work try the name |
|
133 | - if (!$term) { |
|
132 | + // if the slug didn't work try the name |
|
133 | + if (!$term) { |
|
134 | 134 | |
135 | - $term = get_term_by('name', $cat, 'course-category'); |
|
135 | + $term = get_term_by('name', $cat, 'course-category'); |
|
136 | 136 | |
137 | - } |
|
137 | + } |
|
138 | 138 | |
139 | - if ($term) { |
|
140 | - $cat_ids[] = $term->term_id; |
|
141 | - } |
|
139 | + if ($term) { |
|
140 | + $cat_ids[] = $term->term_id; |
|
141 | + } |
|
142 | 142 | |
143 | - } else { |
|
143 | + } else { |
|
144 | 144 | |
145 | - $cat_ids[] = $cat; |
|
145 | + $cat_ids[] = $cat; |
|
146 | 146 | |
147 | - } |
|
147 | + } |
|
148 | 148 | |
149 | - } |
|
149 | + } |
|
150 | 150 | |
151 | - } |
|
151 | + } |
|
152 | 152 | |
153 | - return $cat_ids; |
|
153 | + return $cat_ids; |
|
154 | 154 | |
155 | - }// end generate_term_ids |
|
155 | + }// end generate_term_ids |
|
156 | 156 | |
157 | 157 | }// end class |
158 | 158 |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | |
42 | 42 | /** |
43 | 43 | * Display output to the admin view |
44 | - * |
|
45 | - * This view is shown when grading a quiz for a single user in admin under grading |
|
46 | - * |
|
44 | + * |
|
45 | + * This view is shown when grading a quiz for a single user in admin under grading |
|
46 | + * |
|
47 | 47 | * @since 1.3.0 |
48 | 48 | * @return html |
49 | 49 | */ |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | $user_quiz_grade_total = 0; |
58 | 58 | $quiz_grade_total = 0; |
59 | 59 | $quiz_grade = 0; |
60 | - $lesson_id = $this->lesson_id; |
|
61 | - $user_id = $this->user_id; |
|
60 | + $lesson_id = $this->lesson_id; |
|
61 | + $user_id = $this->user_id; |
|
62 | 62 | |
63 | 63 | ?><form name="<?php esc_attr_e( 'quiz_' . $this->quiz_id ); ?>" action="" method="post"> |
64 | 64 | <?php wp_nonce_field( 'sensei_manual_grading', '_wp_sensei_manual_grading_nonce' ); ?> |
@@ -206,11 +206,11 @@ discard block |
||
206 | 206 | <p class="user-answer"><?php |
207 | 207 | foreach ( $user_answer_content as $_user_answer ) { |
208 | 208 | |
209 | - if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){ |
|
209 | + if( 'multi-line' == Sensei()->question->get_question_type( $question->ID ) ){ |
|
210 | 210 | |
211 | - $_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) ); |
|
211 | + $_user_answer = htmlspecialchars_decode( nl2br( esc_html($_user_answer) ) ); |
|
212 | 212 | |
213 | - } |
|
213 | + } |
|
214 | 214 | |
215 | 215 | echo apply_filters( 'sensei_answer_text', $_user_answer ) . "<br>"; |
216 | 216 | } |
@@ -86,7 +86,7 @@ |
||
86 | 86 | if ( WooThemes_Sensei_Utils::sensei_is_woocommerce_activated() ) { |
87 | 87 | global $woocommerce; |
88 | 88 | if( version_compare( $woocommerce->version, $version, ">=" ) ) { |
89 | - return true; |
|
89 | + return true; |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | return false; |
@@ -162,8 +162,8 @@ |
||
162 | 162 | $sortable[$id] = $data; |
163 | 163 | } |
164 | 164 | |
165 | - $primary = $this->get_primary_column_name(); |
|
166 | - $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); |
|
165 | + $primary = $this->get_primary_column_name(); |
|
166 | + $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); |
|
167 | 167 | |
168 | 168 | return $this->_column_headers; |
169 | 169 | } |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | '1.7.2' => array( 'auto' => array( 'index_comment_status_field' => array( 'title' => __( 'Add database index to comment statuses', 'woothemes-sensei' ), 'desc' => __( 'This indexes the comment statuses in the database, which will speed up all Sensei activity queries.', 'woothemes-sensei' ) ), ), |
71 | 71 | /*'manual' => array( 'remove_legacy_comments' => array( 'title' => __( 'Remove legacy Sensei activity types', 'woothemes-sensei' ), 'desc' => __( 'This removes all legacy (pre-1.7) Sensei activity types - only run this update once the update to v1.7 is complete and everything is stable.', 'woothemes-sensei' ) ) )*/ |
72 | 72 | ), |
73 | - '1.8.0' => array( 'auto' => array( 'enhance_teacher_role' => array( 'title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.' ), ), |
|
74 | - 'manual' => array() |
|
75 | - ), |
|
73 | + '1.8.0' => array( 'auto' => array( 'enhance_teacher_role' => array( 'title' => 'Enhance the \'Teacher\' role', 'desc' => 'Adds the ability for a \'Teacher\' to create courses, lessons , quizes and manage their learners.' ), ), |
|
74 | + 'manual' => array() |
|
75 | + ), |
|
76 | 76 | ); |
77 | 77 | |
78 | 78 | $this->updates = apply_filters( 'sensei_upgrade_functions', $this->updates, $this->updates ); |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } // End For Loop |
330 | 330 | } // End For Loop |
331 | 331 | |
332 | - $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update |
|
332 | + $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update |
|
333 | 333 | update_option( $this->token . '-upgrades', $this->updates_run ); |
334 | 334 | return true; |
335 | 335 | |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | */ |
447 | 447 | private function set_update_run( $update ) { |
448 | 448 | array_push( $this->updates_run, $update ); |
449 | - $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update |
|
449 | + $this->updates_run = array_unique( $this->updates_run ); // we only need one reference per update |
|
450 | 450 | update_option( $this->token . '-upgrades', $this->updates_run ); |
451 | 451 | } |
452 | 452 | |
@@ -918,11 +918,11 @@ discard block |
||
918 | 918 | update_post_meta( $lesson->ID, '_order_' . $course_id, 0 ); |
919 | 919 | } |
920 | 920 | |
921 | - $module = Sensei()->modules->get_lesson_module( $lesson->ID ); |
|
921 | + $module = Sensei()->modules->get_lesson_module( $lesson->ID ); |
|
922 | 922 | |
923 | - if( $module ) { |
|
924 | - update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 ); |
|
925 | - } |
|
923 | + if( $module ) { |
|
924 | + update_post_meta( $lesson->ID, '_order_module_' . $module->term_id, 0 ); |
|
925 | + } |
|
926 | 926 | |
927 | 927 | } |
928 | 928 | |
@@ -1732,22 +1732,22 @@ discard block |
||
1732 | 1732 | |
1733 | 1733 | } |
1734 | 1734 | |
1735 | - /** |
|
1736 | - * WooThemes_Sensei_Updates::enhance_teacher_role |
|
1737 | - * |
|
1738 | - * This runs the update to create the teacher role |
|
1739 | - * @access public |
|
1740 | - * @since 1.8.0 |
|
1741 | - * @return bool; |
|
1742 | - */ |
|
1743 | - public function enhance_teacher_role ( ) { |
|
1744 | - |
|
1745 | - require_once('class-sensei-teacher.php'); |
|
1746 | - $teacher = new Sensei_Teacher(); |
|
1747 | - $teacher->create_role(); |
|
1748 | - return true; |
|
1749 | - |
|
1750 | - }// end enhance_teacher_role |
|
1735 | + /** |
|
1736 | + * WooThemes_Sensei_Updates::enhance_teacher_role |
|
1737 | + * |
|
1738 | + * This runs the update to create the teacher role |
|
1739 | + * @access public |
|
1740 | + * @since 1.8.0 |
|
1741 | + * @return bool; |
|
1742 | + */ |
|
1743 | + public function enhance_teacher_role ( ) { |
|
1744 | + |
|
1745 | + require_once('class-sensei-teacher.php'); |
|
1746 | + $teacher = new Sensei_Teacher(); |
|
1747 | + $teacher->create_role(); |
|
1748 | + return true; |
|
1749 | + |
|
1750 | + }// end enhance_teacher_role |
|
1751 | 1751 | |
1752 | 1752 | } // End Class |
1753 | 1753 |
@@ -201,7 +201,7 @@ |
||
201 | 201 | |
202 | 202 | if( 'complete' == $item->comment_approved ) { |
203 | 203 | |
204 | - $status = __( 'Completed', 'woothemes-sensei' ); |
|
204 | + $status = __( 'Completed', 'woothemes-sensei' ); |
|
205 | 205 | $status_class = 'graded'; |
206 | 206 | |
207 | 207 | $course_end_date = $item->comment_date; |
@@ -1,90 +1,90 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | if ( ! defined( 'ABSPATH' ) ) exit; |
3 | 3 | /** |
4 | - * The Template for displaying all single course meta information. |
|
5 | - * |
|
6 | - * Override this template by copying it to yourtheme/sensei/single-course/course-lessons.php |
|
7 | - * |
|
8 | - * @author Automattic |
|
9 | - * @package Sensei |
|
10 | - * @category Templates |
|
11 | - * @version 1.9.0 |
|
12 | - */ |
|
4 | + * The Template for displaying all single course meta information. |
|
5 | + * |
|
6 | + * Override this template by copying it to yourtheme/sensei/single-course/course-lessons.php |
|
7 | + * |
|
8 | + * @author Automattic |
|
9 | + * @package Sensei |
|
10 | + * @category Templates |
|
11 | + * @version 1.9.0 |
|
12 | + */ |
|
13 | 13 | ?> |
14 | 14 | |
15 | 15 | <section class="course-lessons"> |
16 | 16 | |
17 | 17 | <?php |
18 | 18 | |
19 | - /** |
|
20 | - * Actions just before the sensei single course lessons loop begins |
|
21 | - * |
|
22 | - * @hooked WooThemes_Sensei_Course::load_single_course_lessons_query |
|
23 | - * @since 1.9.0 |
|
24 | - */ |
|
25 | - do_action( 'sensei_single_course_lessons_before' ); |
|
19 | + /** |
|
20 | + * Actions just before the sensei single course lessons loop begins |
|
21 | + * |
|
22 | + * @hooked WooThemes_Sensei_Course::load_single_course_lessons_query |
|
23 | + * @since 1.9.0 |
|
24 | + */ |
|
25 | + do_action( 'sensei_single_course_lessons_before' ); |
|
26 | 26 | |
27 | - ?> |
|
27 | + ?> |
|
28 | 28 | |
29 | 29 | <?php |
30 | 30 | |
31 | - //lessons loaded into loop in the sensei_single_course_lessons_before hook |
|
32 | - if( have_posts() ): |
|
31 | + //lessons loaded into loop in the sensei_single_course_lessons_before hook |
|
32 | + if( have_posts() ): |
|
33 | 33 | |
34 | - // start course lessons loop |
|
35 | - while ( have_posts() ): the_post(); ?> |
|
34 | + // start course lessons loop |
|
35 | + while ( have_posts() ): the_post(); ?> |
|
36 | 36 | |
37 | 37 | <article <?php post_class(); ?> > |
38 | 38 | |
39 | 39 | <?php |
40 | 40 | |
41 | - /** |
|
42 | - * The hook is inside the course lesson on the single course. It fires |
|
43 | - * for each lesson. It is just before the lesson excerpt. |
|
44 | - * |
|
45 | - * @since 1.9.0 |
|
46 | - * |
|
47 | - * @param $lessons_id |
|
48 | - * |
|
49 | - * @hooked WooThemes_Sensei_Lesson::the_lesson_meta - 5 |
|
50 | - * @hooked WooThemes_Sensei_Lesson::the_lesson_thumbnail - 8 |
|
51 | - * |
|
52 | - */ |
|
53 | - do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() ); |
|
54 | - |
|
55 | - ?> |
|
41 | + /** |
|
42 | + * The hook is inside the course lesson on the single course. It fires |
|
43 | + * for each lesson. It is just before the lesson excerpt. |
|
44 | + * |
|
45 | + * @since 1.9.0 |
|
46 | + * |
|
47 | + * @param $lessons_id |
|
48 | + * |
|
49 | + * @hooked WooThemes_Sensei_Lesson::the_lesson_meta - 5 |
|
50 | + * @hooked WooThemes_Sensei_Lesson::the_lesson_thumbnail - 8 |
|
51 | + * |
|
52 | + */ |
|
53 | + do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() ); |
|
54 | + |
|
55 | + ?> |
|
56 | 56 | |
57 | 57 | <section class="entry"> |
58 | 58 | |
59 | 59 | <?php |
60 | - /** |
|
61 | - * Output all course lessons. If none found for this course |
|
62 | - * a notice will be displayed. What is displayed |
|
63 | - * is manipulated via a |
|
64 | - */ |
|
65 | - the_excerpt(); |
|
66 | - ?> |
|
60 | + /** |
|
61 | + * Output all course lessons. If none found for this course |
|
62 | + * a notice will be displayed. What is displayed |
|
63 | + * is manipulated via a |
|
64 | + */ |
|
65 | + the_excerpt(); |
|
66 | + ?> |
|
67 | 67 | |
68 | 68 | </section> |
69 | 69 | |
70 | 70 | <?php |
71 | 71 | |
72 | - /** |
|
73 | - * The hook is inside the course lesson on the single course. It is just before the lesson closing markup. |
|
74 | - * It fires for each lesson. |
|
75 | - * |
|
76 | - * @since 1.9.0 |
|
77 | - */ |
|
78 | - do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() ); |
|
72 | + /** |
|
73 | + * The hook is inside the course lesson on the single course. It is just before the lesson closing markup. |
|
74 | + * It fires for each lesson. |
|
75 | + * |
|
76 | + * @since 1.9.0 |
|
77 | + */ |
|
78 | + do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() ); |
|
79 | 79 | |
80 | - ?> |
|
80 | + ?> |
|
81 | 81 | |
82 | 82 | </article> |
83 | 83 | |
84 | 84 | <?php |
85 | - // end course lessons loop |
|
86 | - endwhile; |
|
87 | - ?> |
|
85 | + // end course lessons loop |
|
86 | + endwhile; |
|
87 | + ?> |
|
88 | 88 | |
89 | 89 | <?php else: ?> |
90 | 90 | |
@@ -94,15 +94,15 @@ discard block |
||
94 | 94 | |
95 | 95 | <?php |
96 | 96 | |
97 | - /** |
|
98 | - * Actions just before the sensei single course lessons loop begins |
|
99 | - * |
|
100 | - * @hooked WooThemes_Sensei_Course::reset_single_course_query |
|
101 | - * |
|
102 | - * @since 1.9.0 |
|
103 | - */ |
|
104 | - do_action( 'sensei_single_course_lessons_after' ); |
|
97 | + /** |
|
98 | + * Actions just before the sensei single course lessons loop begins |
|
99 | + * |
|
100 | + * @hooked WooThemes_Sensei_Course::reset_single_course_query |
|
101 | + * |
|
102 | + * @since 1.9.0 |
|
103 | + */ |
|
104 | + do_action( 'sensei_single_course_lessons_after' ); |
|
105 | 105 | |
106 | - ?> |
|
106 | + ?> |
|
107 | 107 | |
108 | 108 | </section> |
@@ -14,11 +14,11 @@ |
||
14 | 14 | |
15 | 15 | <?php |
16 | 16 | |
17 | - /** |
|
18 | - * Get the question data with the current quiz id |
|
19 | - * All data is loaded in this array to keep the template clean. |
|
20 | - */ |
|
21 | - $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() ); |
|
17 | + /** |
|
18 | + * Get the question data with the current quiz id |
|
19 | + * All data is loaded in this array to keep the template clean. |
|
20 | + */ |
|
21 | + $question_data = WooThemes_Sensei_Question::get_template_data( sensei_get_the_question_id(), get_the_ID() ); |
|
22 | 22 | |
23 | 23 | ?> |
24 | 24 |