@@ -111,7 +111,7 @@ |
||
| 111 | 111 | * @since 1.9.0 |
| 112 | 112 | * |
| 113 | 113 | * @param $title |
| 114 | - * @param $shortcode_specific_override |
|
| 114 | + * @param string $shortcode_specific_override |
|
| 115 | 115 | * @return string |
| 116 | 116 | */ |
| 117 | 117 | public static function generate_shortcode_courses( $title , $shortcode_specific_override ){ |
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | * |
| 23 | 23 | * @since 1.9.0 |
| 24 | 24 | */ |
| 25 | - public static function init(){ |
|
| 25 | + public static function init() { |
|
| 26 | 26 | |
| 27 | - add_shortcode( 'allcourses', array( __CLASS__, 'all_courses' ) ); |
|
| 28 | - add_shortcode( 'newcourses', array( __CLASS__,'new_courses' ) ); |
|
| 29 | - add_shortcode( 'featuredcourses', array( __CLASS__,'featured_courses') ); |
|
| 30 | - add_shortcode( 'freecourses', array( __CLASS__,'free_courses') ); |
|
| 31 | - add_shortcode( 'paidcourses', array( __CLASS__,'paid_courses') ); |
|
| 32 | - add_shortcode( 'usercourses', array( __CLASS__,'user_courses' ) ); |
|
| 27 | + add_shortcode('allcourses', array(__CLASS__, 'all_courses')); |
|
| 28 | + add_shortcode('newcourses', array(__CLASS__, 'new_courses')); |
|
| 29 | + add_shortcode('featuredcourses', array(__CLASS__, 'featured_courses')); |
|
| 30 | + add_shortcode('freecourses', array(__CLASS__, 'free_courses')); |
|
| 31 | + add_shortcode('paidcourses', array(__CLASS__, 'paid_courses')); |
|
| 32 | + add_shortcode('usercourses', array(__CLASS__, 'user_courses')); |
|
| 33 | 33 | |
| 34 | 34 | } |
| 35 | 35 | /** |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | * @param mixed $content (default: null) |
| 43 | 43 | * @return string |
| 44 | 44 | */ |
| 45 | - public static function all_courses( $atts, $content = null ) { |
|
| 45 | + public static function all_courses($atts, $content = null) { |
|
| 46 | 46 | |
| 47 | - return self::generate_shortcode_courses( '', 'allcourses' ); // all courses but no title |
|
| 47 | + return self::generate_shortcode_courses('', 'allcourses'); // all courses but no title |
|
| 48 | 48 | |
| 49 | 49 | } // all_courses() |
| 50 | 50 | |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | * @param mixed $content (default: null) |
| 57 | 57 | * @return string |
| 58 | 58 | */ |
| 59 | - public static function paid_courses( $atts, $content = null ) { |
|
| 59 | + public static function paid_courses($atts, $content = null) { |
|
| 60 | 60 | |
| 61 | - return self::generate_shortcode_courses( __( 'Paid Courses', 'woothemes-sensei' ), 'paidcourses' ); |
|
| 61 | + return self::generate_shortcode_courses(__('Paid Courses', 'woothemes-sensei'), 'paidcourses'); |
|
| 62 | 62 | |
| 63 | 63 | } // End paid_courses() |
| 64 | 64 | |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | * @param mixed $content (default: null) |
| 72 | 72 | * @return string |
| 73 | 73 | */ |
| 74 | - public static function featured_courses( $atts, $content = null ) { |
|
| 74 | + public static function featured_courses($atts, $content = null) { |
|
| 75 | 75 | |
| 76 | - return self::generate_shortcode_courses( __( 'Featured Courses', 'woothemes-sensei' ), 'featuredcourses' ); |
|
| 76 | + return self::generate_shortcode_courses(__('Featured Courses', 'woothemes-sensei'), 'featuredcourses'); |
|
| 77 | 77 | |
| 78 | 78 | } // End featured_courses() |
| 79 | 79 | |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | * @param mixed $content (default: null) |
| 86 | 86 | * @return string |
| 87 | 87 | */ |
| 88 | - public static function free_courses( $atts, $content = null ) { |
|
| 88 | + public static function free_courses($atts, $content = null) { |
|
| 89 | 89 | |
| 90 | - return self::generate_shortcode_courses( __( 'Free Courses', 'woothemes-sensei' ), 'freecourses' ); |
|
| 90 | + return self::generate_shortcode_courses(__('Free Courses', 'woothemes-sensei'), 'freecourses'); |
|
| 91 | 91 | |
| 92 | 92 | } // End free_courses() |
| 93 | 93 | |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | * @param mixed $content (default: null) |
| 100 | 100 | * @return string |
| 101 | 101 | */ |
| 102 | - public static function new_courses( $atts, $content = null ) { |
|
| 102 | + public static function new_courses($atts, $content = null) { |
|
| 103 | 103 | |
| 104 | - return self::generate_shortcode_courses( __( 'New Courses', 'woothemes-sensei' ), 'newcourses' ); |
|
| 104 | + return self::generate_shortcode_courses(__('New Courses', 'woothemes-sensei'), 'newcourses'); |
|
| 105 | 105 | |
| 106 | 106 | } // End new_courses() |
| 107 | 107 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * @param $shortcode_specific_override |
| 115 | 115 | * @return string |
| 116 | 116 | */ |
| 117 | - public static function generate_shortcode_courses( $title , $shortcode_specific_override ){ |
|
| 117 | + public static function generate_shortcode_courses($title, $shortcode_specific_override) { |
|
| 118 | 118 | |
| 119 | 119 | global $shortcode_override, $posts_array; |
| 120 | 120 | |
@@ -122,9 +122,9 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | // do not show this short code if there is a shortcode int he url and |
| 124 | 124 | // this specific shortcode is not the one requested in the ur. |
| 125 | - $specific_shortcode_requested = isset( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : ''; |
|
| 126 | - if( ! empty( $specific_shortcode_requested) && |
|
| 127 | - $specific_shortcode_requested != $shortcode_override ){ |
|
| 125 | + $specific_shortcode_requested = isset($_GET['action']) ? sanitize_text_field($_GET['action']) : ''; |
|
| 126 | + if ( ! empty($specific_shortcode_requested) && |
|
| 127 | + $specific_shortcode_requested != $shortcode_override) { |
|
| 128 | 128 | |
| 129 | 129 | return ''; |
| 130 | 130 | |
@@ -136,15 +136,15 @@ discard block |
||
| 136 | 136 | $courses = ob_get_clean(); |
| 137 | 137 | |
| 138 | 138 | $content = ''; |
| 139 | - if( count( $posts_array ) > 0 ){ |
|
| 139 | + if (count($posts_array) > 0) { |
|
| 140 | 140 | |
| 141 | - $before = empty($title)? '' : '<header class="archive-header"><h2>'. $title .'</h2></header>'; |
|
| 141 | + $before = empty($title) ? '' : '<header class="archive-header"><h2>'.$title.'</h2></header>'; |
|
| 142 | 142 | $before .= '<section id="main-course" class="course-container">'; |
| 143 | 143 | |
| 144 | 144 | $after = '</section>'; |
| 145 | 145 | |
| 146 | 146 | //assemble |
| 147 | - $content = $before . $courses . $after; |
|
| 147 | + $content = $before.$courses.$after; |
|
| 148 | 148 | |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,19 +161,19 @@ discard block |
||
| 161 | 161 | * @param mixed $content (default: null) |
| 162 | 162 | * @return string |
| 163 | 163 | */ |
| 164 | - public static function user_courses( $atts, $content = null ) { |
|
| 164 | + public static function user_courses($atts, $content = null) { |
|
| 165 | 165 | global $shortcode_override; |
| 166 | - extract( shortcode_atts( array( 'amount' => 0 ), $atts ) ); |
|
| 166 | + extract(shortcode_atts(array('amount' => 0), $atts)); |
|
| 167 | 167 | |
| 168 | 168 | $shortcode_override = 'usercourses'; |
| 169 | 169 | |
| 170 | 170 | ob_start(); |
| 171 | 171 | |
| 172 | - if( is_user_logged_in() ){ |
|
| 172 | + if (is_user_logged_in()) { |
|
| 173 | 173 | |
| 174 | - Sensei_Templates::get_template( 'user/my-courses.php' ); |
|
| 174 | + Sensei_Templates::get_template('user/my-courses.php'); |
|
| 175 | 175 | |
| 176 | - }else{ |
|
| 176 | + } else { |
|
| 177 | 177 | |
| 178 | 178 | Sensei()->frontend->sensei_login_form(); |
| 179 | 179 | |
@@ -189,54 +189,54 @@ discard block |
||
| 189 | 189 | * loop-course.php for the old shortcodes. |
| 190 | 190 | * @since 1.9.0 |
| 191 | 191 | */ |
| 192 | - public static function initialise_legacy_course_loop(){ |
|
| 192 | + public static function initialise_legacy_course_loop() { |
|
| 193 | 193 | |
| 194 | 194 | global $post, $wp_query, $shortcode_override, $course_excludes; |
| 195 | 195 | |
| 196 | 196 | // Handle Query Type |
| 197 | 197 | $query_type = ''; |
| 198 | 198 | |
| 199 | - if ( isset( $_GET[ 'action' ] ) && ( '' != esc_html( $_GET[ 'action' ] ) ) ) { |
|
| 200 | - $query_type = esc_html( $_GET[ 'action' ] ); |
|
| 199 | + if (isset($_GET['action']) && ('' != esc_html($_GET['action']))) { |
|
| 200 | + $query_type = esc_html($_GET['action']); |
|
| 201 | 201 | } // End If Statement |
| 202 | 202 | |
| 203 | - if ( '' != $shortcode_override ) { |
|
| 203 | + if ('' != $shortcode_override) { |
|
| 204 | 204 | $query_type = $shortcode_override; |
| 205 | 205 | } // End If Statement |
| 206 | 206 | |
| 207 | - if ( !is_array( $course_excludes ) ) { $course_excludes = array(); } |
|
| 207 | + if ( ! is_array($course_excludes)) { $course_excludes = array(); } |
|
| 208 | 208 | |
| 209 | 209 | // Check that query returns results |
| 210 | 210 | // Handle Pagination |
| 211 | - $paged = $wp_query->get( 'paged' ); |
|
| 212 | - $paged = empty( $paged ) ? 1 : $paged; |
|
| 211 | + $paged = $wp_query->get('paged'); |
|
| 212 | + $paged = empty($paged) ? 1 : $paged; |
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | 215 | // Check for pagination settings |
| 216 | - if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) { |
|
| 216 | + if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) { |
|
| 217 | 217 | |
| 218 | - $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] ); |
|
| 218 | + $amount = absint(Sensei()->settings->settings['course_archive_amount']); |
|
| 219 | 219 | |
| 220 | 220 | } else { |
| 221 | 221 | |
| 222 | - $amount = $wp_query->get( 'posts_per_page' ); |
|
| 222 | + $amount = $wp_query->get('posts_per_page'); |
|
| 223 | 223 | |
| 224 | 224 | } // End If Statement |
| 225 | 225 | |
| 226 | 226 | // This is not a paginated page (or it's simply the first page of a paginated page/post) |
| 227 | 227 | |
| 228 | 228 | global $posts_array; |
| 229 | - $course_includes = array(); |
|
| 229 | + $course_includes = array(); |
|
| 230 | 230 | |
| 231 | - $query_args = Sensei()->course->get_archive_query_args( $shortcode_override, $amount, $course_includes, $course_excludes ); |
|
| 232 | - $course_query = new WP_Query( $query_args ); |
|
| 231 | + $query_args = Sensei()->course->get_archive_query_args($shortcode_override, $amount, $course_includes, $course_excludes); |
|
| 232 | + $course_query = new WP_Query($query_args); |
|
| 233 | 233 | $posts_array = $course_query->get_posts(); |
| 234 | 234 | |
| 235 | 235 | // output the courses |
| 236 | - if( ! empty( $posts_array ) ) { |
|
| 236 | + if ( ! empty($posts_array)) { |
|
| 237 | 237 | |
| 238 | 238 | //output all courses for current query |
| 239 | - self::loop_courses( $course_query, $amount ); |
|
| 239 | + self::loop_courses($course_query, $amount); |
|
| 240 | 240 | |
| 241 | 241 | } |
| 242 | 242 | |
@@ -249,31 +249,31 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @param WP_Query $course_query |
| 251 | 251 | */ |
| 252 | - public static function loop_courses( $course_query, $amount ){ |
|
| 252 | + public static function loop_courses($course_query, $amount) { |
|
| 253 | 253 | |
| 254 | 254 | global $shortcode_override, $posts_array, $post, $wp_query, $shortcode_override, $course_excludes, $course_includes; |
| 255 | 255 | |
| 256 | - if ( count( $course_query->get_posts() ) > 0 ) { |
|
| 256 | + if (count($course_query->get_posts()) > 0) { |
|
| 257 | 257 | |
| 258 | - do_action( 'sensei_course_archive_header', $shortcode_override ); |
|
| 258 | + do_action('sensei_course_archive_header', $shortcode_override); |
|
| 259 | 259 | |
| 260 | - foreach ( $course_query->get_posts() as $course){ |
|
| 260 | + foreach ($course_query->get_posts() as $course) { |
|
| 261 | 261 | |
| 262 | 262 | // Make sure the other loops dont include the same post twice! |
| 263 | - array_push( $course_excludes, $course->ID ); |
|
| 263 | + array_push($course_excludes, $course->ID); |
|
| 264 | 264 | |
| 265 | 265 | // output the course markup |
| 266 | - self::the_course( $course->ID ); |
|
| 266 | + self::the_course($course->ID); |
|
| 267 | 267 | |
| 268 | 268 | } // End For Loop |
| 269 | 269 | |
| 270 | 270 | // More and Prev links |
| 271 | - $posts_array_query = new WP_Query(Sensei()->course->course_query( $shortcode_override, $amount, $course_includes, $course_excludes ) ); |
|
| 271 | + $posts_array_query = new WP_Query(Sensei()->course->course_query($shortcode_override, $amount, $course_includes, $course_excludes)); |
|
| 272 | 272 | $posts_array = $posts_array_query->get_posts(); |
| 273 | 273 | $max_pages = $course_query->found_posts / $amount; |
| 274 | - if ( '' != $shortcode_override && ( $max_pages > $course_query->get( 'paged' ) ) ) { |
|
| 274 | + if ('' != $shortcode_override && ($max_pages > $course_query->get('paged'))) { |
|
| 275 | 275 | |
| 276 | - switch( $shortcode_override ){ |
|
| 276 | + switch ($shortcode_override) { |
|
| 277 | 277 | case 'paidcourses': |
| 278 | 278 | $filter = 'paid'; |
| 279 | 279 | break; |
@@ -289,22 +289,22 @@ discard block |
||
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | $quer_args = array(); |
| 292 | - $quer_args[ 'paged' ] = '2'; |
|
| 293 | - if( !empty( $filter ) ){ |
|
| 294 | - $quer_args[ 'course_filter' ] = $filter; |
|
| 292 | + $quer_args['paged'] = '2'; |
|
| 293 | + if ( ! empty($filter)) { |
|
| 294 | + $quer_args['course_filter'] = $filter; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | - $course_pagination_link = get_post_type_archive_link( 'course' ); |
|
| 298 | - $more_link_text = esc_html( Sensei()->settings->settings[ 'course_archive_more_link_text' ] ); |
|
| 299 | - $more_link_url = esc_url( add_query_arg( $quer_args, $course_pagination_link ) ); |
|
| 297 | + $course_pagination_link = get_post_type_archive_link('course'); |
|
| 298 | + $more_link_text = esc_html(Sensei()->settings->settings['course_archive_more_link_text']); |
|
| 299 | + $more_link_url = esc_url(add_query_arg($quer_args, $course_pagination_link)); |
|
| 300 | 300 | |
| 301 | 301 | // next/more |
| 302 | 302 | $html = '<div class="navigation"><div class="nav-next">'; |
| 303 | - $html .= '<a href="' . $more_link_url . '">'; |
|
| 303 | + $html .= '<a href="'.$more_link_url.'">'; |
|
| 304 | 304 | $html .= $more_link_text; |
| 305 | 305 | $html .= '<span class="meta-nav"></span></a></div>'; |
| 306 | 306 | |
| 307 | - echo apply_filters( 'course_archive_next_link', $html ); |
|
| 307 | + echo apply_filters('course_archive_next_link', $html); |
|
| 308 | 308 | |
| 309 | 309 | } // End If Statement |
| 310 | 310 | |
@@ -316,23 +316,23 @@ discard block |
||
| 316 | 316 | * |
| 317 | 317 | * @param $course_id |
| 318 | 318 | */ |
| 319 | - public static function the_course( $course_id ){ |
|
| 319 | + public static function the_course($course_id) { |
|
| 320 | 320 | |
| 321 | 321 | // Get meta data |
| 322 | - $course = get_post( $course_id ); |
|
| 323 | - $user_info = get_userdata( absint( $course->post_author ) ); |
|
| 324 | - $author_link = get_author_posts_url( absint( $course->post_author ) ); |
|
| 322 | + $course = get_post($course_id); |
|
| 323 | + $user_info = get_userdata(absint($course->post_author)); |
|
| 324 | + $author_link = get_author_posts_url(absint($course->post_author)); |
|
| 325 | 325 | $author_display_name = $user_info->display_name; |
| 326 | 326 | $author_id = $course->post_author; |
| 327 | - $category_output = get_the_term_list( $course_id, 'course-category', '', ', ', '' ); |
|
| 328 | - $preview_lesson_count = intval( Sensei()->course->course_lesson_preview_count( $course_id ) ); |
|
| 329 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, get_current_user_id() ); |
|
| 327 | + $category_output = get_the_term_list($course_id, 'course-category', '', ', ', ''); |
|
| 328 | + $preview_lesson_count = intval(Sensei()->course->course_lesson_preview_count($course_id)); |
|
| 329 | + $is_user_taking_course = Sensei_Utils::user_started_course($course_id, get_current_user_id()); |
|
| 330 | 330 | ?> |
| 331 | 331 | |
| 332 | - <article class="<?php echo esc_attr( join( ' ', get_post_class( array( 'course', 'post' ), $course_id ) ) ); ?>"> |
|
| 332 | + <article class="<?php echo esc_attr(join(' ', get_post_class(array('course', 'post'), $course_id))); ?>"> |
|
| 333 | 333 | <?php |
| 334 | 334 | // so that legacy shortcodes work with the party plugins that wants to hook in |
| 335 | - do_action('sensei_course_content_before',$course->ID ); |
|
| 335 | + do_action('sensei_course_content_before', $course->ID); |
|
| 336 | 336 | ?> |
| 337 | 337 | <div class="course-content"> |
| 338 | 338 | |
@@ -348,19 +348,19 @@ discard block |
||
| 348 | 348 | |
| 349 | 349 | <p class="sensei-course-meta"> |
| 350 | 350 | |
| 351 | - <?php if ( isset( Sensei()->settings->settings[ 'course_author' ] ) && ( Sensei()->settings->settings[ 'course_author' ] ) ) { ?> |
|
| 352 | - <span class="course-author"><?php _e( 'by ', 'woothemes-sensei' ); ?><a href="<?php echo $author_link; ?>" title="<?php echo esc_attr( $author_display_name ); ?>"><?php echo esc_html( $author_display_name ); ?></a></span> |
|
| 351 | + <?php if (isset(Sensei()->settings->settings['course_author']) && (Sensei()->settings->settings['course_author'])) { ?> |
|
| 352 | + <span class="course-author"><?php _e('by ', 'woothemes-sensei'); ?><a href="<?php echo $author_link; ?>" title="<?php echo esc_attr($author_display_name); ?>"><?php echo esc_html($author_display_name); ?></a></span> |
|
| 353 | 353 | <?php } // End If Statement ?> |
| 354 | 354 | |
| 355 | 355 | <span class="course-lesson-count"> |
| 356 | - <?php echo Sensei()->course->course_lesson_count( $course_id ) . ' ' . __( 'Lessons', 'woothemes-sensei' ); ?> |
|
| 356 | + <?php echo Sensei()->course->course_lesson_count($course_id).' '.__('Lessons', 'woothemes-sensei'); ?> |
|
| 357 | 357 | </span> |
| 358 | 358 | |
| 359 | - <?php if ( '' != $category_output ) { ?> |
|
| 360 | - <span class="course-category"><?php echo sprintf( __( 'in %s', 'woothemes-sensei' ), $category_output ); ?></span> |
|
| 359 | + <?php if ('' != $category_output) { ?> |
|
| 360 | + <span class="course-category"><?php echo sprintf(__('in %s', 'woothemes-sensei'), $category_output); ?></span> |
|
| 361 | 361 | <?php } // End If Statement ?> |
| 362 | 362 | |
| 363 | - <?php sensei_simple_course_price( $course_id ); ?> |
|
| 363 | + <?php sensei_simple_course_price($course_id); ?> |
|
| 364 | 364 | |
| 365 | 365 | </p> |
| 366 | 366 | |
@@ -368,10 +368,10 @@ discard block |
||
| 368 | 368 | |
| 369 | 369 | </p> |
| 370 | 370 | |
| 371 | - <?php if ( 0 < $preview_lesson_count && !$is_user_taking_course ) { |
|
| 372 | - $preview_lessons = sprintf( __( '(%d preview lessons)', 'woothemes-sensei' ), $preview_lesson_count ); ?> |
|
| 371 | + <?php if (0 < $preview_lesson_count && ! $is_user_taking_course) { |
|
| 372 | + $preview_lessons = sprintf(__('(%d preview lessons)', 'woothemes-sensei'), $preview_lesson_count); ?> |
|
| 373 | 373 | <p class="sensei-free-lessons"> |
| 374 | - <a href="<?php echo get_permalink( $course_id ); ?>"><?php _e( 'Preview this course', 'woothemes-sensei' ) ?> |
|
| 374 | + <a href="<?php echo get_permalink($course_id); ?>"><?php _e('Preview this course', 'woothemes-sensei') ?> |
|
| 375 | 375 | </a> - <?php echo $preview_lessons; ?> |
| 376 | 376 | </p> |
| 377 | 377 | <?php } ?> |